From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X

---
 ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java |   58 ++++++++++++++++++++++++++--------------------------------
 1 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
index 22c5543..79d58da 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
@@ -11,7 +11,6 @@
 import org.dromara.common.encrypt.annotation.ApiEncrypt;
 import org.dromara.common.encrypt.properties.ApiDecryptProperties;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerExceptionResolver;
 import org.springframework.web.servlet.HandlerExecutionChain;
@@ -36,47 +35,43 @@
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
         HttpServletRequest servletRequest = (HttpServletRequest) request;
         HttpServletResponse servletResponse = (HttpServletResponse) response;
-
-        boolean encryptFlag = false;
+        // 鑾峰彇鍔犲瘑娉ㄨВ
+        ApiEncrypt apiEncrypt = this.getApiEncryptAnnotation(servletRequest);
+        boolean responseFlag = apiEncrypt != null && apiEncrypt.response();
         ServletRequest requestWrapper = null;
         ServletResponse responseWrapper = null;
         EncryptResponseBodyWrapper responseBodyWrapper = null;
 
-        // 鏄惁涓� json 璇锋眰
-        if (StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) {
-            // 鏄惁涓� put 鎴栬�� post 璇锋眰
-            if (HttpMethod.PUT.matches(servletRequest.getMethod()) || HttpMethod.POST.matches(servletRequest.getMethod())) {
-                // 鏄惁瀛樺湪鍔犲瘑鏍囧ご
-                String headerValue = servletRequest.getHeader(properties.getHeaderFlag());
-                if (StringUtils.isNotBlank(headerValue)) {
-                    // 璇锋眰瑙ｅ瘑
-                    requestWrapper = new DecryptRequestBodyWrapper(servletRequest, properties.getPrivateKey(), properties.getHeaderFlag());
-                    // 鑾峰彇鍔犲瘑娉ㄨВ
-                    ApiEncrypt apiEncrypt = this.getApiEncryptAnnotation(servletRequest);
-                    if (ObjectUtil.isNotNull(apiEncrypt)) {
-                        // 鍝嶅簲鍔犲瘑鏍囧織
-                        encryptFlag = apiEncrypt.response();
-                    } else {
-                        // 鏄惁鏈夋敞瑙ｏ紝鏈夊氨鎶ラ敊锛屾病鏈夋斁琛�
-                        HandlerExceptionResolver exceptionResolver = SpringUtils.getBean(HandlerExceptionResolver.class);
-                        exceptionResolver.resolveException(
-                            servletRequest, servletResponse, null,
-                            new ServiceException("娌℃湁璁块棶鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉�", HttpStatus.FORBIDDEN));
-                    }
-                }
-                // 鍒ゆ柇鏄惁鍝嶅簲鍔犲瘑
-                if (encryptFlag) {
-                    responseBodyWrapper = new EncryptResponseBodyWrapper(servletResponse);
-                    responseWrapper = responseBodyWrapper;
+        // 鏄惁涓� put 鎴栬�� post 璇锋眰
+        if (HttpMethod.PUT.matches(servletRequest.getMethod()) || HttpMethod.POST.matches(servletRequest.getMethod())) {
+            // 鏄惁瀛樺湪鍔犲瘑鏍囧ご
+            String headerValue = servletRequest.getHeader(properties.getHeaderFlag());
+            if (StringUtils.isNotBlank(headerValue)) {
+                // 璇锋眰瑙ｅ瘑
+                requestWrapper = new DecryptRequestBodyWrapper(servletRequest, properties.getPrivateKey(), properties.getHeaderFlag());
+            } else {
+                // 鏄惁鏈夋敞瑙ｏ紝鏈夊氨鎶ラ敊锛屾病鏈夋斁琛�
+                if (ObjectUtil.isNotNull(apiEncrypt)) {
+                    HandlerExceptionResolver exceptionResolver = SpringUtils.getBean("handlerExceptionResolver", HandlerExceptionResolver.class);
+                    exceptionResolver.resolveException(
+                        servletRequest, servletResponse, null,
+                        new ServiceException("娌℃湁璁块棶鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉�", HttpStatus.FORBIDDEN));
+                    return;
                 }
             }
+        }
+
+        // 鍒ゆ柇鏄惁鍝嶅簲鍔犲瘑
+        if (responseFlag) {
+            responseBodyWrapper = new EncryptResponseBodyWrapper(servletResponse);
+            responseWrapper = responseBodyWrapper;
         }
 
         chain.doFilter(
             ObjectUtil.defaultIfNull(requestWrapper, request),
             ObjectUtil.defaultIfNull(responseWrapper, response));
 
-        if (encryptFlag) {
+        if (responseFlag) {
             servletResponse.reset();
             // 瀵瑰師濮嬪唴瀹瑰姞瀵�
             String encryptContent = responseBodyWrapper.getEncryptContent(
@@ -94,7 +89,6 @@
         // 鑾峰彇娉ㄨВ
         try {
             HandlerExecutionChain mappingHandler = handlerMapping.getHandler(servletRequest);
-            System.out.println(mappingHandler);
             if (ObjectUtil.isNotNull(mappingHandler)) {
                 Object handler = mappingHandler.getHandler();
                 if (ObjectUtil.isNotNull(handler)) {
@@ -105,7 +99,7 @@
                 }
             }
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            return null;
         }
         return null;
     }

--
Gitblit v1.9.3