Merge remote-tracking branch 'remotes/origin/release'

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 # 使用现有网络

epmet-gateway/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.22
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.23
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

epmet-gateway/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.22
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.23
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

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>

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);