From eb9bcf3c86aee5fce749a97f1a4941a42f9483be Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 21 Jul 2020 15:56:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E7=AB=AFtoken?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0customerId?=
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   | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml
index 451de14e3d..702ce1f34e 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.26
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.27
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 646f95428e..dadaab41ed 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.26</version>
+    <version>0.3.27</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 1b2c7b6d9b..7aec3a7f6f 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
@@ -134,8 +134,10 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 						.header(AppClientConstant.CLIENT,baseTokenDto.getClient())
 						.header(AppClientConstant.USER_ID,baseTokenDto.getUserId())
 						;
-				if(StringUtils.equals(baseTokenDto.getApp(),"gov")){
-					exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID,customerId);
+				if (StringUtils.equals(baseTokenDto.getApp(), "gov")) {//工作端
+					exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID, customerId);
+				} else if (StringUtils.equals(baseTokenDto.getApp(), "public")) {//公众号端
+					exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID, customerId);
 				}
 				ServerHttpRequest build = exchange.getRequest().mutate().build();
 				return chain.filter(exchange.mutate().request(build).build());