From bc146e63576e9ad94d4aaf3adf62ac1e1dc76823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 10 Mar 2023 17:30:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91FeignConfig?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/config/FeignConfig.java     | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/java/com/jero/config/FeignConfig.java b/jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/java/com/jero/config/FeignConfig.java
index f5b73e94..820f33d5 100644
--- a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/java/com/jero/config/FeignConfig.java
+++ b/jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/java/com/jero/config/FeignConfig.java
@@ -55,10 +55,7 @@ public class FeignConfig {
                 HttpServletRequest request = attributes.getRequest();
                 log.debug("Feign request: {}", request.getRequestURI());
                 // 将token信息放入header中
-                String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
-                if(token==null || "".equals(token)){
-                    token = request.getParameter("token");
-                }
+                String token = getToken(request);
                 log.debug("Feign request token: {}", token);
                 requestTemplate.header(CommonConstant.X_ACCESS_TOKEN, token);
 
@@ -69,9 +66,7 @@ public class FeignConfig {
                         log.info(requestTemplate.path());
                         log.info(requestTemplate.method());
                         String queryLine = requestTemplate.queryLine();
-                        if(queryLine!=null && queryLine.startsWith("?")){
-                            queryLine = queryLine.substring(1);
-                        }
+                        queryLine = getQueryLine(queryLine);
                         log.info(queryLine);
                         if(requestTemplate.body()!=null){
                             log.info(new String(requestTemplate.body()));
@@ -94,6 +89,20 @@ public class FeignConfig {
         };
     }
 
+    private String getQueryLine(String queryLine) {
+        if(queryLine!=null && queryLine.startsWith("?")){
+            queryLine = queryLine.substring(1);
+        }
+        return queryLine;
+    }
+
+    private String getToken(HttpServletRequest request) {
+        String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
+        if(token==null || "".equals(token)){
+            token = request.getParameter("token");
+        }
+        return token;
+    }
 
 
     /**