From f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 f9293f8..768a250 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
@@ -1,7 +1,10 @@
package com.moral.api.exception;
import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
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;
import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -11,6 +14,7 @@
@ControllerAdvice
@ResponseBody
+@Slf4j
public class GlobalExceptionHandler {
/**
* ������������������
@@ -19,7 +23,9 @@
@ResponseBody
@ResponseStatus(HttpStatus.OK)
public ResultMessage handleException(Exception ex) {
- return ResultMessage.fail(Constants.CODE_OPERATION_FAILED, "������������");
+ log.error(ex.getMessage());
+ ex.printStackTrace();
+ return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), ResponseCodeEnum.FAIL.getMsg());
}
/**
@@ -29,7 +35,17 @@
@ResponseBody
@ResponseStatus(HttpStatus.OK)
public ResultMessage handleUserNotExistException(BusinessException ex) {
- return ResultMessage.fail(Constants.CODE_OPERATION_FAILED, "������������������������");
+ return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), "������������������������");
+ }
+
+ /**
+ * ������TokenException������
+ */
+ @ExceptionHandler({TokenException.class})
+ @ResponseBody
+ @ResponseStatus(HttpStatus.OK)
+ public ResultMessage handleTokenException(TokenException ex) {
+ return ResultMessage.fail(ex.getCode(),ex.getMsg());
}
}
--
Gitblit v1.8.0