From 2782c369c9317c916b4b63ea9589c8588ce7ed7f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 30 四月 2024 16:25:51 +0800
Subject: [PATCH] update 优化 常规web异常状态码
---
ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/GlobalExceptionHandler.java | 74 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 20 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/GlobalExceptionHandler.java
index ca4c3cb..f2e573f 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/GlobalExceptionHandler.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/GlobalExceptionHandler.java
@@ -5,21 +5,23 @@
import cn.dev33.satoken.exception.NotRoleException;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpStatus;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.exception.DemoModeException;
-import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.utils.StreamUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.exception.base.BaseException;
+import org.dromara.common.core.utils.StreamUtils;
import org.springframework.context.support.DefaultMessageSourceResolvable;
import org.springframework.validation.BindException;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingPathVariableException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.ConstraintViolationException;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
+import org.springframework.web.servlet.NoHandlerFoundException;
/**
* 鍏ㄥ眬寮傚父澶勭悊鍣�
@@ -68,7 +70,7 @@
HttpServletRequest request) {
String requestURI = request.getRequestURI();
log.error("璇锋眰鍦板潃'{}',涓嶆敮鎸�'{}'璇锋眰", requestURI, e.getMethod());
- return R.fail(e.getMessage());
+ return R.fail(HttpStatus.HTTP_BAD_METHOD, e.getMessage());
}
/**
@@ -76,9 +78,48 @@
*/
@ExceptionHandler(ServiceException.class)
public R<Void> handleServiceException(ServiceException e, HttpServletRequest request) {
- log.error(e.getMessage(), e);
+ log.error(e.getMessage());
Integer code = e.getCode();
return ObjectUtil.isNotNull(code) ? R.fail(code, e.getMessage()) : R.fail(e.getMessage());
+ }
+
+ /**
+ * 涓氬姟寮傚父
+ */
+ @ExceptionHandler(BaseException.class)
+ public R<Void> handleBaseException(BaseException e, HttpServletRequest request) {
+ log.error(e.getMessage());
+ return R.fail(e.getMessage());
+ }
+
+ /**
+ * 璇锋眰璺緞涓己灏戝繀闇�鐨勮矾寰勫彉閲�
+ */
+ @ExceptionHandler(MissingPathVariableException.class)
+ public R<Void> handleMissingPathVariableException(MissingPathVariableException e, HttpServletRequest request) {
+ String requestURI = request.getRequestURI();
+ log.error("璇锋眰璺緞涓己灏戝繀闇�鐨勮矾寰勫彉閲�'{}',鍙戠敓绯荤粺寮傚父.", requestURI);
+ return R.fail(String.format("璇锋眰璺緞涓己灏戝繀闇�鐨勮矾寰勫彉閲廩%s]", e.getVariableName()));
+ }
+
+ /**
+ * 璇锋眰鍙傛暟绫诲瀷涓嶅尮閰�
+ */
+ @ExceptionHandler(MethodArgumentTypeMismatchException.class)
+ public R<Void> handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e, HttpServletRequest request) {
+ String requestURI = request.getRequestURI();
+ log.error("璇锋眰鍙傛暟绫诲瀷涓嶅尮閰�'{}',鍙戠敓绯荤粺寮傚父.", requestURI);
+ return R.fail(String.format("璇锋眰鍙傛暟绫诲瀷涓嶅尮閰嶏紝鍙傛暟[%s]瑕佹眰绫诲瀷涓猴細'%s'锛屼絾杈撳叆鍊间负锛�'%s'", e.getName(), e.getRequiredType().getName(), e.getValue()));
+ }
+
+ /**
+ * 鎵句笉鍒拌矾鐢�
+ */
+ @ExceptionHandler(NoHandlerFoundException.class)
+ public R<Void> handleNoHandlerFoundException(NoHandlerFoundException e, HttpServletRequest request) {
+ String requestURI = request.getRequestURI();
+ log.error("璇锋眰鍦板潃'{}'涓嶅瓨鍦�.", requestURI);
+ return R.fail(HttpStatus.HTTP_NOT_FOUND, e.getMessage());
}
/**
@@ -106,7 +147,7 @@
*/
@ExceptionHandler(BindException.class)
public R<Void> handleBindException(BindException e) {
- log.error(e.getMessage(), e);
+ log.error(e.getMessage());
String message = StreamUtils.join(e.getAllErrors(), DefaultMessageSourceResolvable::getDefaultMessage, ", ");
return R.fail(message);
}
@@ -116,7 +157,7 @@
*/
@ExceptionHandler(ConstraintViolationException.class)
public R<Void> constraintViolationException(ConstraintViolationException e) {
- log.error(e.getMessage(), e);
+ log.error(e.getMessage());
String message = StreamUtils.join(e.getConstraintViolations(), ConstraintViolation::getMessage, ", ");
return R.fail(message);
}
@@ -126,16 +167,9 @@
*/
@ExceptionHandler(MethodArgumentNotValidException.class)
public R<Void> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
- log.error(e.getMessage(), e);
+ log.error(e.getMessage());
String message = e.getBindingResult().getFieldError().getDefaultMessage();
return R.fail(message);
}
- /**
- * 婕旂ず妯″紡寮傚父
- */
- @ExceptionHandler(DemoModeException.class)
- public R<Void> handleDemoModeException(DemoModeException e) {
- return R.fail("婕旂ず妯″紡锛屼笉鍏佽鎿嶄綔");
- }
}
--
Gitblit v1.9.3