|
|
@@ -1,9 +1,11 @@
|
|
|
package org.dromara.server.consume.controller.v2;
|
|
|
|
|
|
+import cn.hutool.json.JSONUtil;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.dromara.common.core.api.ReturnResult;
|
|
|
import org.dromara.common.core.domain.R;
|
|
|
+import org.dromara.common.core.domain.model.ErrorResult;
|
|
|
import org.dromara.server.consume.business.TermBusiness;
|
|
|
import org.dromara.server.consume.domain.vo.yc.TermToken;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
@@ -26,7 +28,6 @@ public class AuthController {
|
|
|
public Object getTermToken(@PathVariable("termId") Long termId, @RequestHeader(name = "admin") String admin,
|
|
|
@RequestHeader(name = "pwd") String pwd) {
|
|
|
final String logPrefix = String.format("[获取设备TokenV2]-[termId:%s]", termId);
|
|
|
- log.info("{}-[开始]", logPrefix);
|
|
|
long startTime = System.currentTimeMillis();
|
|
|
|
|
|
try {
|
|
|
@@ -40,19 +41,17 @@ public class AuthController {
|
|
|
|
|
|
// 3. 处理业务结果
|
|
|
if (R.isError(mapResult)) {
|
|
|
- log.error("{}-[业务失败: {}]", logPrefix, mapResult.getMsg());
|
|
|
+ log.error("{}-[失败: {}]", logPrefix, mapResult.getMsg());
|
|
|
return new ReturnResult(false, 500, "获取Token失败: " + mapResult.getMsg(), null, startTime);
|
|
|
}
|
|
|
-
|
|
|
+ log.info("{}-[成功:{}]-[耗时: {} ms]", logPrefix, JSONUtil.toJsonStr(mapResult.getData()), System.currentTimeMillis() - startTime);
|
|
|
return new ReturnResult(true, 200, "获取成功", mapResult.getData(), startTime);
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
// 4. 异常处理
|
|
|
log.error("{}-[系统异常: {}]-[详情: {}]",
|
|
|
- logPrefix, e.getClass().getSimpleName(), e.getMessage(), e);
|
|
|
- return new ReturnResult(false, 503, "服务暂时不可用,请稍后重试", null, startTime);
|
|
|
- }finally {
|
|
|
- log.info("{}-[结束,耗时: {}ms]", logPrefix, System.currentTimeMillis() - startTime);
|
|
|
+ logPrefix, e.getClass().getSimpleName(), e.getMessage(), e);
|
|
|
+ return ErrorResult.innternalErrorResponse("服务暂时不可用,请稍后重试");
|
|
|
}
|
|
|
}
|
|
|
}
|