From 54acd649311ea0f50d16220afa58707b8bc997ec Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 18 Aug 2021 17:04:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9:CPAuthxxx=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=93=E5=8D=B0header=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=99gateway=E6=97=A5=E5=BF=97=E7=BB=91=E5=AE=9AtranSerail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filter/CpAuthGatewayFilterFactory.java    | 60 +++++++++++++------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
index 6513d27f04..538467d2e1 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
@@ -68,18 +68,25 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
                 return chain.filter(exchange);
             }
 
-            //1.添加流水号
             ServerHttpRequest request = exchange.getRequest();
-            List<String> tranSerials = request.getHeaders().get(AppClientConstant.TRANSACTION_SERIAL_KEY);
-            if (CollectionUtils.isEmpty(tranSerials) || StringUtils.isBlank(tranSerials.get(0))) {
-                request.mutate().header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{getTransactionSerial()});
+
+            //0.添加流水号
+            String tranSerial = getTranserialFromRequestHeader(request);
+            if (StringUtils.isBlank(tranSerial)) {
+                tranSerial = generateTransactionSerial();
+                // 设置当前线程名
+                request.mutate().header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{tranSerial});
             }
+            Thread.currentThread().setName(tranSerial);
+
+            //1.打印请求信息
+            logRequest(request);
 
             //2.获取请求路径，参数
             String requestUri = request.getPath().pathWithinApplication().value();
             MultiValueMap<String, String> queryParams = request.getQueryParams();
             String queryParamsStr = convertQueryParams2String(queryParams);
-            logger.info("CpAuthGatewayFilterFactory当前requestUri=[" + requestUri.concat(queryParamsStr) + "],CpAuthGatewayFilterFactory拦截成功,客户端Id:{}", IpUtils.getClientIp(request));
+            logger.info("当前requestUri=[" + requestUri.concat(queryParamsStr) + "],客户端Id:{}", IpUtils.getClientIp(request));
 
             //3.认证
             String authType = getAuthType(request);
@@ -109,6 +116,36 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
         };
     }
 
+    /**
+     * @Description 打印请求头
+      * @param  request 请求
+     * @return  void
+     * @author wxz
+     * @date 2021.08.18 11:18:00
+     */
+    private void logRequest(ServerHttpRequest request) {
+        HttpHeaders headers = request.getHeaders();
+        StringBuilder sb = new StringBuilder("请求头：");
+        for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+            String headerKey = entry.getKey();
+            List<String> headerValue = entry.getValue();
+            sb.append(headerKey).append(":").append(headerValue).append(",");
+        }
+        logger.info(sb.toString());
+    }
+
+    /**
+     * @Description 从request请求头中获取传递过来的流水号
+      * @param request
+     * @return  java.lang.String
+     * @author wxz
+     * @date 2021.08.18 15:55:30
+     */
+    private String getTranserialFromRequestHeader(ServerHttpRequest request) {
+        List<String> tranSerials = request.getHeaders().get(AppClientConstant.TRANSACTION_SERIAL_KEY);
+        return CollectionUtils.isEmpty(tranSerials) ? null : tranSerials.get(0);
+    }
+
     /**
      * @return
      * @Description 将url参数转化为String
@@ -181,23 +218,12 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
         return AuthTypeConstant.AUTH_TYPE_INTERNAL;
     }
 
-    /**
-     * 获取请求头
-     *
-     * @param request
-     * @return
-     */
-    private String getHeader(ServerHttpRequest request, String headerName) {
-        HttpHeaders headers = request.getHeaders();
-        return headers.getFirst(headerName);
-    }
-
     /**
      * 获取事务流水号
      *
      * @return
      */
-    public static String getTransactionSerial() {
+    public static String generateTransactionSerial() {
         String[] letterPool = {"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n"
                 , "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"};