From 5131ec0cfad2d8ed49fdb089e91a854f3212da5c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 2 Feb 2021 18:11:59 +0800
Subject: [PATCH] =?UTF-8?q?tokenDto=E5=A2=9E=E5=8A=A0customerId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/security/dto/BaseTokenDto.java   |  2 ++
 .../java/com/epmet/auth/InternalAuthProcessor.java | 14 +++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/BaseTokenDto.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/BaseTokenDto.java
index c3065c7200..f50f2f1d2d 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/BaseTokenDto.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/BaseTokenDto.java
@@ -24,6 +24,8 @@ public class BaseTokenDto {
      */
     private String token;
 
+    private String customerId;
+
     public BaseTokenDto() {
     }
 
diff --git a/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java b/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
index 2ee22426f6..30e8d2b457 100644
--- a/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
+++ b/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
@@ -105,11 +105,15 @@ public class InternalAuthProcessor extends AuthProcessor {
         if (baseTokenDto != null) {
             String redisKey = baseTokenDto.getApp() + "-" + baseTokenDto.getClient() + "-" + baseTokenDto.getUserId();
             logger.info("redisKey=" + redisKey);
-            exchange.getRequest().mutate()
-                    .header(Constant.APP_USER_KEY, redisKey)
-                    .header(AppClientConstant.APP,baseTokenDto.getApp())
-                    .header(AppClientConstant.CLIENT,baseTokenDto.getClient())
-                    .header(AppClientConstant.USER_ID,baseTokenDto.getUserId());
+
+            ServerHttpRequest.Builder builder = exchange.getRequest().mutate();
+            builder.header(Constant.APP_USER_KEY, redisKey);
+            builder.header(AppClientConstant.APP,baseTokenDto.getApp());
+            builder.header(AppClientConstant.CLIENT,baseTokenDto.getClient());
+            builder.header(AppClientConstant.USER_ID,baseTokenDto.getUserId());
+            if (StringUtils.isNotBlank(baseTokenDto.getCustomerId())) {
+                builder.header(AppClientConstant.CUSTOMER_ID,baseTokenDto.getCustomerId());
+            }
 
             if (StringUtils.equals(baseTokenDto.getApp(), "gov")) {//工作端
                 if(StringUtils.isNotBlank(customerId)){