From 68e57803f3386ab4f5211dd30e4d8ade9d24f0a4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:08 +0800
Subject: [PATCH] update 适配 springboot-admin 改为最新 spring-security 写法
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java | 93 +++++++++++++++++++++++++++++-----------------
1 files changed, 58 insertions(+), 35 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
index b76961a..40f2d27 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
@@ -3,13 +3,16 @@
import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.exception.NotPermissionException;
import cn.dev33.satoken.exception.NotRoleException;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpStatus;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.exception.DemoModeException;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.StreamUtils;
import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.MyBatisSystemException;
import org.springframework.context.support.DefaultMessageSourceResolvable;
+import org.springframework.dao.DuplicateKeyException;
import org.springframework.validation.BindException;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -19,7 +22,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
-import java.util.stream.Collectors;
/**
* 鍏ㄥ眬寮傚父澶勭悊鍣�
@@ -31,115 +33,136 @@
public class GlobalExceptionHandler {
/**
- * 鏉冮檺鏍￠獙寮傚父
+ * 鏉冮檺鐮佸紓甯�
*/
@ExceptionHandler(NotPermissionException.class)
- public AjaxResult<Void> handleAccessDeniedException(NotPermissionException e, HttpServletRequest request) {
+ public R<Void> handleNotPermissionException(NotPermissionException e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
- log.error("璇锋眰鍦板潃'{}',鏉冮檺鏍￠獙澶辫触'{}'", requestURI, e.getMessage());
- return AjaxResult.error(HttpStatus.HTTP_FORBIDDEN, "娌℃湁鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉�");
+ log.error("璇锋眰鍦板潃'{}',鏉冮檺鐮佹牎楠屽け璐�'{}'", requestURI, e.getMessage());
+ return R.fail(HttpStatus.HTTP_FORBIDDEN, "娌℃湁璁块棶鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉�");
}
/**
- * 瑙掕壊鏍￠獙寮傚父
+ * 瑙掕壊鏉冮檺寮傚父
*/
@ExceptionHandler(NotRoleException.class)
- public AjaxResult<Void> handleAccessDeniedException(NotRoleException e, HttpServletRequest request) {
+ public R<Void> handleNotRoleException(NotRoleException e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
- log.error("璇锋眰鍦板潃'{}',瑙掕壊鏍￠獙澶辫触'{}'", requestURI, e.getMessage());
- return AjaxResult.error(HttpStatus.HTTP_FORBIDDEN, "娌℃湁瑙掕壊锛岃鑱旂郴绠＄悊鍛樻巿鏉�");
+ log.error("璇锋眰鍦板潃'{}',瑙掕壊鏉冮檺鏍￠獙澶辫触'{}'", requestURI, e.getMessage());
+ return R.fail(HttpStatus.HTTP_FORBIDDEN, "娌℃湁璁块棶鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉�");
}
/**
* 璁よ瘉澶辫触
*/
@ExceptionHandler(NotLoginException.class)
- public AjaxResult<Void> handleAccessDeniedException(NotLoginException e, HttpServletRequest request) {
+ public R<Void> handleNotLoginException(NotLoginException e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
log.error("璇锋眰鍦板潃'{}',璁よ瘉澶辫触'{}',鏃犳硶璁块棶绯荤粺璧勬簮", requestURI, e.getMessage());
- return AjaxResult.error(HttpStatus.HTTP_UNAUTHORIZED, StringUtils.format("璇锋眰鍦板潃'{}',璁よ瘉澶辫触'{}',鏃犳硶璁块棶绯荤粺璧勬簮", requestURI));
+ return R.fail(HttpStatus.HTTP_UNAUTHORIZED, "璁よ瘉澶辫触锛屾棤娉曡闂郴缁熻祫婧�");
}
/**
* 璇锋眰鏂瑰紡涓嶆敮鎸�
*/
@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
- public AjaxResult<Void> handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,
+ public R<Void> handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,
HttpServletRequest request) {
String requestURI = request.getRequestURI();
log.error("璇锋眰鍦板潃'{}',涓嶆敮鎸�'{}'璇锋眰", requestURI, e.getMethod());
- return AjaxResult.error(e.getMessage());
+ return R.fail(e.getMessage());
+ }
+
+ /**
+ * 涓婚敭鎴朥NIQUE绱㈠紩锛屾暟鎹噸澶嶅紓甯�
+ */
+ @ExceptionHandler(DuplicateKeyException.class)
+ public R<Void> handleDuplicateKeyException(DuplicateKeyException e, HttpServletRequest request) {
+ String requestURI = request.getRequestURI();
+ log.error("璇锋眰鍦板潃'{}',鏁版嵁搴撲腑宸插瓨鍦ㄨ褰�'{}'", requestURI, e.getMessage());
+ return R.fail("鏁版嵁搴撲腑宸插瓨鍦ㄨ璁板綍锛岃鑱旂郴绠＄悊鍛樼‘璁�");
+ }
+
+ /**
+ * Mybatis绯荤粺寮傚父 閫氱敤澶勭悊
+ */
+ @ExceptionHandler(MyBatisSystemException.class)
+ public R<Void> handleCannotFindDataSourceException(MyBatisSystemException e, HttpServletRequest request) {
+ String requestURI = request.getRequestURI();
+ String message = e.getMessage();
+ if (message.contains("CannotFindDataSourceException")) {
+ log.error("璇锋眰鍦板潃'{}', 鏈壘鍒版暟鎹簮", requestURI);
+ return R.fail("鏈壘鍒版暟鎹簮锛岃鑱旂郴绠＄悊鍛樼‘璁�");
+ }
+ log.error("璇锋眰鍦板潃'{}', Mybatis绯荤粺寮傚父", requestURI, e);
+ return R.fail(message);
}
/**
* 涓氬姟寮傚父
*/
@ExceptionHandler(ServiceException.class)
- public AjaxResult<Void> handleServiceException(ServiceException e, HttpServletRequest request) {
+ public R<Void> handleServiceException(ServiceException e, HttpServletRequest request) {
log.error(e.getMessage(), e);
Integer code = e.getCode();
- return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
+ return ObjectUtil.isNotNull(code) ? R.fail(code, e.getMessage()) : R.fail(e.getMessage());
}
/**
* 鎷︽埅鏈煡鐨勮繍琛屾椂寮傚父
*/
@ExceptionHandler(RuntimeException.class)
- public AjaxResult<Void> handleRuntimeException(RuntimeException e, HttpServletRequest request) {
+ public R<Void> handleRuntimeException(RuntimeException e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
log.error("璇锋眰鍦板潃'{}',鍙戠敓鏈煡寮傚父.", requestURI, e);
- return AjaxResult.error(e.getMessage());
+ return R.fail(e.getMessage());
}
/**
* 绯荤粺寮傚父
*/
@ExceptionHandler(Exception.class)
- public AjaxResult<Void> handleException(Exception e, HttpServletRequest request) {
+ public R<Void> handleException(Exception e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
log.error("璇锋眰鍦板潃'{}',鍙戠敓绯荤粺寮傚父.", requestURI, e);
- return AjaxResult.error(e.getMessage());
+ return R.fail(e.getMessage());
}
/**
* 鑷畾涔夐獙璇佸紓甯�
*/
@ExceptionHandler(BindException.class)
- public AjaxResult<Void> handleBindException(BindException e) {
+ public R<Void> handleBindException(BindException e) {
log.error(e.getMessage(), e);
- String message = e.getAllErrors().stream()
- .map(DefaultMessageSourceResolvable::getDefaultMessage)
- .collect(Collectors.joining(", "));
- return AjaxResult.error(message);
+ String message = StreamUtils.join(e.getAllErrors(), DefaultMessageSourceResolvable::getDefaultMessage, ", ");
+ return R.fail(message);
}
/**
* 鑷畾涔夐獙璇佸紓甯�
*/
@ExceptionHandler(ConstraintViolationException.class)
- public AjaxResult<Void> constraintViolationException(ConstraintViolationException e) {
+ public R<Void> constraintViolationException(ConstraintViolationException e) {
log.error(e.getMessage(), e);
- String message = e.getConstraintViolations().stream()
- .map(ConstraintViolation::getMessage)
- .collect(Collectors.joining(", "));
- return AjaxResult.error(message);
+ String message = StreamUtils.join(e.getConstraintViolations(), ConstraintViolation::getMessage, ", ");
+ return R.fail(message);
}
/**
* 鑷畾涔夐獙璇佸紓甯�
*/
@ExceptionHandler(MethodArgumentNotValidException.class)
- public AjaxResult<Void> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
+ public R<Void> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
log.error(e.getMessage(), e);
String message = e.getBindingResult().getFieldError().getDefaultMessage();
- return AjaxResult.error(message);
+ return R.fail(message);
}
/**
* 婕旂ず妯″紡寮傚父
*/
@ExceptionHandler(DemoModeException.class)
- public AjaxResult<Void> handleDemoModeException(DemoModeException e) {
- return AjaxResult.error("婕旂ず妯″紡锛屼笉鍏佽鎿嶄綔");
+ public R<Void> handleDemoModeException(DemoModeException e) {
+ return R.fail("婕旂ず妯″紡锛屼笉鍏佽鎿嶄綔");
}
}
--
Gitblit v1.9.3