From bb6856a82a588f05040b0410a9747ae8029bb3be Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Fri, 13 Oct 2023 10:06:51 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral 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