Merge branch 'dev_add_customer_id' into dev_temp

epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java

@@ -105,12 +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())
-                    .header(AppClientConstant.CUSTOMER_ID,baseTokenDto.getCustomerId());
+
+            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.equalsAny(baseTokenDto.getApp(), AppClientConstant.APP_GOV, AppClientConstant.APP_RESI)) {//工作端/居民端
                 if(StringUtils.isNotBlank(customerId)){