From 7e2f3abca2f5bb83459f809b8e7195b361e0a372 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 07 Oct 2023 12:00:30 +0800
Subject: [PATCH] ci:补充提交
---
screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java b/screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java
index dd4bddf..f2136d1 100644
--- a/screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java
+++ b/screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java
@@ -1,14 +1,24 @@
package com.moral.api.exception;
+import com.alibaba.druid.wall.violation.ErrorCode;
+import com.moral.api.utils.StringUtils;
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.context.support.DefaultMessageSourceResolvable;
import org.springframework.http.HttpStatus;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
@ControllerAdvice
@@ -32,7 +42,23 @@
@ResponseBody
@ResponseStatus(HttpStatus.OK)
public ResultMessage handleUserNotExistException(BusinessException ex) {
- return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), "������������������������");
+ return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), ex.getMsg());
}
+ @ExceptionHandler
+ public ResultMessage exceptionHandler(MethodArgumentNotValidException e){
+ List<String> collect = e.getBindingResult().getFieldErrors().stream().map(DefaultMessageSourceResolvable::getDefaultMessage)
+ .collect(Collectors.toList());
+ return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), StringUtils.join(collect, ","));
+ }
+
+ /**
+ * ������TokenException������
+ */
+ @ExceptionHandler({TokenException.class})
+ @ResponseBody
+ @ResponseStatus(HttpStatus.OK)
+ public ResultMessage handleTokenException(TokenException ex) {
+ return ResultMessage.fail(ex.getCode(),ex.getMsg());
+ }
}
--
Gitblit v1.8.0