From 5de9fd1086c12ed0112b7f93969075a1a15c39e4 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 7 Jul 2020 13:26:12 +0800
Subject: [PATCH] =?UTF-8?q?gateway=E8=B0=83=E6=95=B4=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E5=8F=B7=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/deploy/docker-compose-dev.yml                   | 2 +-
 epmet-gateway/pom.xml                                         | 2 +-
 .../java/com/epmet/filter/CpAuthGatewayFilterFactory.java     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml
index 8487a0e13f..757bce4583 100644
--- a/epmet-gateway/deploy/docker-compose-dev.yml
+++ b/epmet-gateway/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.22
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.23
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 94cd5f1f1f..c7b9d62cb6 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.22</version>
+    <version>0.3.23</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
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 75cb2d2151..1b2c7b6d9b 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
@@ -123,7 +123,8 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 					return response(exchange,new Result<>().error(e.getCode(),e.getMsg()));
 				}
 			}
-
+			//添加流水号
+			exchange.getRequest().mutate().header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{getTransactionSerial()});
 			if (baseTokenDto != null) {
 				String redisKey = baseTokenDto.getApp() + "-" + baseTokenDto.getClient() + "-" + baseTokenDto.getUserId();
 				logger.info("redisKey=" + redisKey);
@@ -132,7 +133,6 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 						.header(AppClientConstant.APP,baseTokenDto.getApp())
 						.header(AppClientConstant.CLIENT,baseTokenDto.getClient())
 						.header(AppClientConstant.USER_ID,baseTokenDto.getUserId())
-						.header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{getTransactionSerial()})
 						;
 				if(StringUtils.equals(baseTokenDto.getApp(),"gov")){
 					exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID,customerId);