From 5e23b5966d393f1eb94bca82498e09a67274e321 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 15 Mar 2021 08:24:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java b/screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java
index b43234f..2e62d5b 100644
--- a/screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java
+++ b/screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java
@@ -2,6 +2,7 @@
import com.moral.constant.Constants;
import com.moral.constant.ResultMessage;
+import com.moral.exception.TokenException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -22,7 +23,7 @@
@ResponseStatus(HttpStatus.OK)
public ResultMessage handleException(Exception ex) {
log.error(ex.getMessage());
- log.error(ex.getStackTrace().toString());
+ ex.printStackTrace();
return ResultMessage.fail(Constants.CODE_OPERATION_FAILED, "������������");
}
@@ -36,4 +37,14 @@
return ResultMessage.fail(Constants.CODE_OPERATION_FAILED, "������������������������");
}
+ /**
+ * ������TokenException������
+ */
+ @ExceptionHandler({TokenException.class})
+ @ResponseBody
+ @ResponseStatus(HttpStatus.OK)
+ public ResultMessage handleTokenException(TokenException ex) {
+ return ResultMessage.fail(ex.getCode(),ex.getMsg());
+ }
+
}
--
Gitblit v1.8.0