From 39c6e9b5e6006053d42c0c8d4dc777add9257ae6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 11 May 2021 15:20:18 +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 | 8 +++++---
1 files changed, 5 insertions(+), 3 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 2e62d5b..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,6 +1,7 @@
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;
@@ -22,9 +23,10 @@
@ResponseBody
@ResponseStatus(HttpStatus.OK)
public ResultMessage handleException(Exception ex) {
- log.error(ex.getMessage());
+ // log.error(ex.getMessage());
ex.printStackTrace();
- return ResultMessage.fail(Constants.CODE_OPERATION_FAILED, "������������");
+
+ return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), ResponseCodeEnum.FAIL.getMsg());
}
/**
@@ -34,7 +36,7 @@
@ResponseBody
@ResponseStatus(HttpStatus.OK)
public ResultMessage handleUserNotExistException(BusinessException ex) {
- return ResultMessage.fail(Constants.CODE_OPERATION_FAILED, "������������������������");
+ return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), "������������������������");
}
/**
--
Gitblit v1.8.0