From 6410a8408df46a00da654fdfe1ed75514ef6430e Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Fri, 8 Sep 2023 22:43:48 +0800
Subject: [PATCH] Set traceId from request header

---
 .../signature/AbstractSignatureValidationInterceptor.java   | 6 ++++++
 pom.xml                                                     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/support/signature/AbstractSignatureValidationInterceptor.java b/commons/web-common/src/main/java/com/schbrain/common/web/support/signature/AbstractSignatureValidationInterceptor.java
index a29fdf0..d9d9e51 100644
--- a/commons/web-common/src/main/java/com/schbrain/common/web/support/signature/AbstractSignatureValidationInterceptor.java
+++ b/commons/web-common/src/main/java/com/schbrain/common/web/support/signature/AbstractSignatureValidationInterceptor.java
@@ -2,6 +2,7 @@ package com.schbrain.common.web.support.signature;
 
 import cn.hutool.crypto.digest.DigestUtil;
 import com.schbrain.common.util.StreamUtils;
+import com.schbrain.common.util.TraceIdUtils;
 import com.schbrain.common.web.support.BaseHandlerInterceptor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.method.HandlerMethod;
@@ -29,6 +30,11 @@ public abstract class AbstractSignatureValidationInterceptor<T extends Signature
         String signature = request.getHeader(SCH_SIGNATURE);
         String expireTime = request.getHeader(SCH_EXPIRE_TIME);
 
+        String traceId = request.getHeader(TraceIdUtils.TRACE_ID);
+        if (StringUtils.isNotBlank(traceId)) {
+            TraceIdUtils.set(traceId);
+        }
+
         // 空校验
         if (StringUtils.isAnyBlank(appKey, timestamp, signature, expireTime)) {
             throw new SignatureValidationException("签名参数为空！");
diff --git a/pom.xml b/pom.xml
index 573bb66..676d1c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
     </distributionManagement>
 
     <properties>
-        <revision>3.0.5.4</revision>
+        <revision>3.0.6-SNAPSHOT</revision>
         <java.version>11</java.version>
         <!-- 2th part versions -->
         <schbrain-apollo.version>${revision}</schbrain-apollo.version>
-- 
GitLab