From 943a2364c76db4c4e570e0d0219a81b6caa9bffc Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 13 May 2021 14:27:08 +0800
Subject: [PATCH] deivce相关接口

---
 screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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..417e830 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,9 @@
 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;
@@ -21,9 +23,10 @@
     @ResponseBody
     @ResponseStatus(HttpStatus.OK)
     public ResultMessage handleException(Exception ex) {
-        log.error(ex.getMessage());
-        log.error(ex.getStackTrace().toString());
-        return  ResultMessage.fail(Constants.CODE_OPERATION_FAILED, "������������");
+       // log.error(ex.getMessage());
+        ex.printStackTrace();
+
+        return  ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), ResponseCodeEnum.FAIL.getMsg());
     }
 
     /**
@@ -33,7 +36,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