From 20ca3788dda28df4cd5a8684c1172e93596b955b Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Fri, 28 Jun 2024 17:43:08 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20Client=20API=20Feign=20=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=A2=9E=E5=8A=A0=20header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkflowEngineClientAutoConfiguration.java       |  5 +++--
 .../client/config/WorkflowRequestInterceptor.java    | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/config/WorkflowEngineClientAutoConfiguration.java b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/config/WorkflowEngineClientAutoConfiguration.java
index 18029b184..abfde80e5 100644
--- a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/config/WorkflowEngineClientAutoConfiguration.java
+++ b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/config/WorkflowEngineClientAutoConfiguration.java
@@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Nullable;
@@ -199,8 +200,8 @@ public class WorkflowEngineClientAutoConfiguration {
     }
 
     @Bean
-    public RequestInterceptor workflowRequestInterceptor(String serviceVersion) {
-        return new WorkflowRequestInterceptor(serviceVersion);
+    public RequestInterceptor workflowRequestInterceptor(String serviceVersion, Environment environment) {
+        return new WorkflowRequestInterceptor(serviceVersion, environment);
     }
 
 }
diff --git a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/config/WorkflowRequestInterceptor.java b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/config/WorkflowRequestInterceptor.java
index ea35fc79f..a5c831343 100644
--- a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/config/WorkflowRequestInterceptor.java
+++ b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/config/WorkflowRequestInterceptor.java
@@ -3,6 +3,7 @@ package cn.axzo.workflow.client.config;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import feign.Target;
+import org.springframework.core.env.Environment;
 
 /**
  * 通用的 Feign 请求拦截器
@@ -12,14 +13,16 @@ import feign.Target;
  */
 public class WorkflowRequestInterceptor implements RequestInterceptor {
     private final String serviceVersion;
+    private final Environment environment;
 
-    public WorkflowRequestInterceptor(String serviceVersion) {
+    public WorkflowRequestInterceptor(String serviceVersion, Environment environment) {
         this.serviceVersion = serviceVersion;
+        this.environment = environment;
     }
 
-    public static final String HEADER_HTTP_CLIENT = "http-client";
-    public static final String HEADER_HTTP_CLIENT_VALUE = "workflowEngine-feign";
-    public static final String HEADER_API_VERSION = "service-version";
+    public static final String HEADER_HTTP_CLIENT = "Http-Client";
+    public static final String HEADER_HTTP_CLIENT_VALUE = "WorkflowEngine-Feign";
+    public static final String HEADER_API_VERSION = "Service-Version";
     public static final String HEADER_SERVER_NAME = "X-SERVER-NAME";
 
 
@@ -31,6 +34,7 @@ public class WorkflowRequestInterceptor implements RequestInterceptor {
                 || apiClassPath.contains("cn.axzo.workflow.client.feign.manage")) {
             requestTemplate.header(HEADER_HTTP_CLIENT, HEADER_HTTP_CLIENT_VALUE);
             requestTemplate.header(HEADER_API_VERSION, serviceVersion);
+            requestTemplate.header(HEADER_SERVER_NAME, environment.getProperty("spring.application.name"));
         }
     }
 }