From 63889136999cbc056eeb38c978ed75aef90121cf Mon Sep 17 00:00:00 2001
From: hongqiaowei <hongqiaowei@163.com>
Date: Thu, 25 Nov 2021 13:32:23 +0800
Subject: [PATCH] Add dedicated Line client id config

---
 .../src/main/java/we/config/SystemConfig.java  | 18 ++++++++++++++++++
 .../DedicatedLineHttpHandler.java              |  7 ++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/fizz-core/src/main/java/we/config/SystemConfig.java b/fizz-core/src/main/java/we/config/SystemConfig.java
index a427868..73b8678 100644
--- a/fizz-core/src/main/java/we/config/SystemConfig.java
+++ b/fizz-core/src/main/java/we/config/SystemConfig.java
@@ -25,6 +25,7 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import we.util.Consts;
+import we.util.UUIDUtil;
 import we.util.WebUtils;
 
 import javax.annotation.PostConstruct;
@@ -54,6 +55,7 @@ public class SystemConfig {
     public  static  final  String   FIZZ_DL_ID                        = "fizz-dl-id";
     public  static  final  String   FIZZ_DL_SIGN                      = "fizz-dl-sign";
     public  static  final  String   FIZZ_DL_TS                        = "fizz-dl-ts";
+    public  static  final  String   FIZZ_DL_CLIENT                    = "fizz-dl-client";
 
     public  static  final  String   FIZZ_APP_ID                       = "fizz-appid";
     public  static  final  String   FIZZ_SIGN                         = "fizz-sign";
@@ -117,6 +119,8 @@ public class SystemConfig {
     @Value("${fizz.dedicated-line.client.request.crypto:true}")
     private boolean fizzDedicatedLineClientRequestCrypto;
 
+    private String fizzDedicatedLineClientId;
+
     public int fizzDedicatedLineClientRequestTimeout() {
         return fizzDedicatedLineClientRequestTimeout;
     }
@@ -137,6 +141,20 @@ public class SystemConfig {
         return fizzDedicatedLineClientRequestCrypto;
     }
 
+    @Value("${fizz.dedicated-line.client.id:}")
+    public void setFizzDedicatedLineClientId(String id) {
+        if (StringUtils.isBlank(id)) {
+            fizzDedicatedLineClientId = UUIDUtil.getUUID();
+        } else {
+            fizzDedicatedLineClientId = id;
+        }
+        log.info("fizz dedicated line client id: {}", fizzDedicatedLineClientId);
+    }
+
+    public String fizzDedicatedLineClientId() {
+        return fizzDedicatedLineClientId;
+    }
+
 
 
     public String fizzTraceIdHeader() {
diff --git a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineHttpHandler.java b/fizz-core/src/main/java/we/dedicated_line/DedicatedLineHttpHandler.java
index 548b48e..aaabf12 100644
--- a/fizz-core/src/main/java/we/dedicated_line/DedicatedLineHttpHandler.java
+++ b/fizz-core/src/main/java/we/dedicated_line/DedicatedLineHttpHandler.java
@@ -257,9 +257,10 @@ class DedicatedLineHttpHandler implements HttpHandler {
         String sign       = DedicatedLineUtils.sign(pairCodeId, timestamp, secretKey);
 
         HttpHeaders writableHttpHeaders = HttpHeaders.writableHttpHeaders(headers);
-        writableHttpHeaders.set(SystemConfig.FIZZ_DL_ID,   pairCodeId);
-        writableHttpHeaders.set(SystemConfig.FIZZ_DL_TS,   timestamp);
-        writableHttpHeaders.set(SystemConfig.FIZZ_DL_SIGN, sign);
+        writableHttpHeaders.set(SystemConfig.FIZZ_DL_ID,     pairCodeId);
+        writableHttpHeaders.set(SystemConfig.FIZZ_DL_TS,     timestamp);
+        writableHttpHeaders.set(SystemConfig.FIZZ_DL_SIGN,   sign);
+        writableHttpHeaders.set(SystemConfig.FIZZ_DL_CLIENT, systemConfig.fizzDedicatedLineClientId());
         return writableHttpHeaders;
     }