From 95c01301f65379e7634e4619bf4c49186aa5be41 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 07 二月 2025 14:19:28 +0800
Subject: [PATCH] !644 同步修复一些问题 Merge pull request !644 from 疯狂的狮子Li/dev
---
ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 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 16d24fc..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;
@@ -43,27 +42,25 @@
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());
- } else {
- // 鏄惁鏈夋敞瑙ｏ紝鏈夊氨鎶ラ敊锛屾病鏈夋斁琛�
- if (ObjectUtil.isNotNull(apiEncrypt)) {
- HandlerExceptionResolver exceptionResolver = SpringUtils.getBean("handlerExceptionResolver", HandlerExceptionResolver.class);
- exceptionResolver.resolveException(
- servletRequest, servletResponse, null,
- new ServiceException("娌℃湁璁块棶鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉�", HttpStatus.FORBIDDEN));
- return;
- }
+ // 鏄惁涓� 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);
@@ -102,7 +99,7 @@
}
}
} catch (Exception e) {
- throw new RuntimeException(e);
+ return null;
}
return null;
}
--
Gitblit v1.9.3