From 36a11d78a2517b523fcf6b6ec622f3f0767f553f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 11:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java | 7 ++++---
1 files changed, 4 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..f03a834 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,6 @@
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;
@@ -24,7 +24,8 @@
public ResultMessage handleException(Exception ex) {
log.error(ex.getMessage());
ex.printStackTrace();
- return ResultMessage.fail(Constants.CODE_OPERATION_FAILED, "������������");
+
+ return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), ResponseCodeEnum.FAIL.getMsg());
}
/**
@@ -34,7 +35,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