From 3e9e47f1333abe943daee0241546c50979e1390f Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Fri, 29 Mar 2024 16:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/securitycontrol/gateway/filter/AuthFilter.java    | 3 +--
 .../filter/RsaDecryptResponseGatewayFilterFactory.java    | 8 ++++----
 .../gateway/filter/ValidateCodeFilter.java                | 2 --
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/AuthFilter.java b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/AuthFilter.java
index 8222018..e07d005 100644
--- a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/AuthFilter.java
+++ b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/AuthFilter.java
@@ -45,8 +45,7 @@ public class AuthFilter implements GlobalFilter, Ordered
     @Autowired
     private RedisService redisService;
     @Override
-    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
-    {
+    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         ServerHttpRequest request = exchange.getRequest();
         ServerHttpRequest.Builder mutate = request.mutate();
 
diff --git a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java
index 1ef0526..6097d14 100644
--- a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java
+++ b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java
@@ -41,16 +41,17 @@ class RsaDecryptResponseGatewayFilterFactory extends AbstractGatewayFilterFactor
     @Value("${system.jm}")
     public    boolean AQ_JM;
 
+    public final static String heard_name="decrypt";
 
     @Override
     public GatewayFilter apply(Object config) {
         return (exchange, chain) -> {
+            System.err.println("进入拦截器");
             ServerHttpRequest serverHttpRequest = exchange.getRequest();
-            String head= serverHttpRequest.getHeaders().getFirst("decrypt");
-            if(StringHelper.isNotEmpty(head)&& "decrypt".equals(head)){
+            String head= serverHttpRequest.getHeaders().getFirst(heard_name);
+            if(StringHelper.isNotEmpty(head)&& heard_name.equals(head)){
                   return chain.filter(exchange);
             }
-
             if(!AQ_JM){
                 return chain.filter(exchange);
             }
@@ -83,7 +84,6 @@ class RsaDecryptResponseGatewayFilterFactory extends AbstractGatewayFilterFactor
                 }
                 //未强制加密
                 return chain.filter(exchange);
-
              //   return CommonConstant.buildResponse(exchange, HttpStatus.BAD_REQUEST.value(), "请求参数不能为空");
 
             }
diff --git a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/ValidateCodeFilter.java b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/ValidateCodeFilter.java
index 257c643..177ea21 100644
--- a/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/ValidateCodeFilter.java
+++ b/securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/ValidateCodeFilter.java
@@ -44,13 +44,11 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object>
     {
         return (exchange, chain) -> {
             ServerHttpRequest request = exchange.getRequest();
-
             // 非登录/注册请求或验证码关闭，不处理
             if (!StringUtils.containsAnyIgnoreCase(request.getURI().getPath(), VALIDATE_URL) || !captchaProperties.getEnabled())
             {
                 return chain.filter(exchange);
             }
-
             try
             {
                 String rspStr = resolveBodyFromRequest(request);