Merge branch 'master' of http://192.168.168.218/wcyuee/szpt

src/main/java/com/zksy/szpt/config/WebConfig.java

@@ -54,16 +54,16 @@ public class WebConfig implements WebMvcConfigurer {
      *
      * @return
      */
-//    @Bean
-//    public FilterRegistrationBean getFilter1Registration(@Qualifier("signatureVerificationFilter") SignatureVerificationFilter signatureVerificationFilter) {
-//        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
-//        filterRegistrationBean.setFilter(signatureVerificationFilter);
-//        //设置过滤器名称和路径，在过滤器类写了的话，这里不用重复写
-//        filterRegistrationBean.setName("filter");
-//        filterRegistrationBean.addUrlPatterns("/rest/*");
-//        //设置过滤器执行顺序，数字越小，越早进行过滤，也可设置为负数
-//        filterRegistrationBean.setOrder(1);
-//        return filterRegistrationBean;
-//    }
+    @Bean
+    public FilterRegistrationBean getFilter1Registration(@Qualifier("signatureVerificationFilter") SignatureVerificationFilter signatureVerificationFilter) {
+        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
+        filterRegistrationBean.setFilter(signatureVerificationFilter);
+        //设置过滤器名称和路径，在过滤器类写了的话，这里不用重复写
+        filterRegistrationBean.setName("filter");
+        filterRegistrationBean.addUrlPatterns("/rest/*");
+        //设置过滤器执行顺序，数字越小，越早进行过滤，也可设置为负数
+        filterRegistrationBean.setOrder(1);
+        return filterRegistrationBean;
+    }
 
 }

src/main/java/com/zksy/szpt/filter/SignatureVerificationFilter.java

@@ -32,7 +32,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-//@Component
+@Component
 public class SignatureVerificationFilter extends OncePerRequestFilter {
 
     public Logger logger = LoggerFactory.getLogger(SignatureVerificationFilter.class);
@@ -122,7 +122,8 @@ public class SignatureVerificationFilter extends OncePerRequestFilter {
         String data = String.format("%s%s%s%s", appId, nonce, timestampStr, body);
         String generatedSignature = DigestUtil.md5Hex(data);
         if (!generatedSignature.equals(sign)) {
-            write(response, "签名有误,generatedSignature:" + generatedSignature + ",sign: " + sign + ",appId:" + appId + ",nonce:" + nonce + ",timestamp:" + timestampStr);
+            logger.warn("签名有误,generatedSignature:{},sign:{},appId:{},nonce:{},timestampStr:{}", generatedSignature, sign, appId, nonce, timestampStr);
+            write(response, "签名有误,sign: " + sign + ",appId:" + appId + ",nonce:" + nonce + ",timestamp:" + timestampStr);
             return false;
         }
 

src/test/java/com/zksy/szpt/MainTest.java

@@ -29,7 +29,7 @@ public class MainTest {
     String nonce = "2";
     String timestampStr = "21";
     String appId = "1872576325743943682";
-    String appSecret = "2";
+    String appSecret = "21";
 
 
     @Resource