From 4e9e91b55a2f6666ad7141eca267f270b7b64b78 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Tue, 5 Sep 2023 18:22:13 +0800
Subject: [PATCH] Release 3.0.5.4

---
 ...bstractSignatureValidationInterceptor.java | 26 +++++--------------
 pom.xml                                       |  2 +-
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/support/signature/AbstractSignatureValidationInterceptor.java b/commons/web-common/src/main/java/com/schbrain/common/web/support/signature/AbstractSignatureValidationInterceptor.java
index 8501aa3..a29fdf0 100644
--- a/commons/web-common/src/main/java/com/schbrain/common/web/support/signature/AbstractSignatureValidationInterceptor.java
+++ b/commons/web-common/src/main/java/com/schbrain/common/web/support/signature/AbstractSignatureValidationInterceptor.java
@@ -2,7 +2,6 @@ package com.schbrain.common.web.support.signature;
 
 import cn.hutool.crypto.digest.DigestUtil;
 import com.schbrain.common.util.StreamUtils;
-import com.schbrain.common.web.servlet.ContentCachingRequest;
 import com.schbrain.common.web.support.BaseHandlerInterceptor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.method.HandlerMethod;
@@ -15,7 +14,6 @@ import java.util.Objects;
 
 import static cn.hutool.core.text.StrPool.UNDERLINE;
 import static com.schbrain.common.web.utils.RequestContentCachingUtils.getRequestBody;
-import static org.springframework.web.util.WebUtils.getNativeRequest;
 
 public abstract class AbstractSignatureValidationInterceptor<T extends SignatureContext> extends BaseHandlerInterceptor {
 
@@ -26,12 +24,10 @@ public abstract class AbstractSignatureValidationInterceptor<T extends Signature
 
     @Override
     protected boolean preHandle(HttpServletRequest request, HttpServletResponse response, HandlerMethod handler) {
-        ContentCachingRequest wrappedRequest = getWrappedRequest(request);
-
-        String appKey = wrappedRequest.getHeader(SCH_APP_KEY);
-        String timestamp = wrappedRequest.getHeader(SCH_TIMESTAMP);
-        String signature = wrappedRequest.getHeader(SCH_SIGNATURE);
-        String expireTime = wrappedRequest.getHeader(SCH_EXPIRE_TIME);
+        String appKey = request.getHeader(SCH_APP_KEY);
+        String timestamp = request.getHeader(SCH_TIMESTAMP);
+        String signature = request.getHeader(SCH_SIGNATURE);
+        String expireTime = request.getHeader(SCH_EXPIRE_TIME);
 
         // 空校验
         if (StringUtils.isAnyBlank(appKey, timestamp, signature, expireTime)) {
@@ -49,9 +45,9 @@ public abstract class AbstractSignatureValidationInterceptor<T extends Signature
             throw new SignatureValidationException("appSecret不存在！");
         }
 
-        String requestUri = wrappedRequest.getRequestURI();
-        String queryString = wrappedRequest.getQueryString();
-        String requestBody = getRequestBody(wrappedRequest);
+        String requestUri = request.getRequestURI();
+        String queryString = request.getQueryString();
+        String requestBody = getRequestBody(request);
 
         // 校验签名
         String calculatedSignature = signParams(requestUri, queryString, requestBody, timestamp, appKey, context.getAppSecret());
@@ -76,12 +72,4 @@ public abstract class AbstractSignatureValidationInterceptor<T extends Signature
 
     protected abstract T getSignatureContext(String appKey);
 
-    private ContentCachingRequest getWrappedRequest(HttpServletRequest request) {
-        ContentCachingRequest wrapper = getNativeRequest(request, ContentCachingRequest.class);
-        if (wrapper == null) {
-            throw new SignatureValidationException("请求异常");
-        }
-        return wrapper;
-    }
-
 }
diff --git a/pom.xml b/pom.xml
index 4e583da..fe812ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
     </distributionManagement>
 
     <properties>
-        <revision>3.0.5.3</revision>
+        <revision>3.0.5.4</revision>
         <java.version>11</java.version>
         <!-- 2th part versions -->
         <schbrain-apollo.version>${revision}</schbrain-apollo.version>
-- 
GitLab