From 9cf6b054731b0ebf027a6cb705370fa4503530af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=BF=97=E6=81=92?= <842328916@qq.com>
Date: Fri, 10 Oct 2025 23:49:37 +0800
Subject: [PATCH] =?UTF-8?q?dtp-traceId-=E9=87=8D=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E4=BB=A5=E9=80=82=E9=85=8D=E5=91=8A=E8=AD=A6=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accompany-admin-web/src/main/resources/logback-spring.xml   | 2 +-
 .../main/java/com/accompany/common/aop/ApiRequestLogAspect.java | 2 +-
 .../src/main/resources/logback-spring.xml                       | 2 +-
 .../accompany-oauth2-web/src/main/resources/logback-spring.xml  | 2 +-
 .../src/main/resources/logback-spring.xml                       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/accompany-admin/accompany-admin-web/src/main/resources/logback-spring.xml b/accompany-admin/accompany-admin-web/src/main/resources/logback-spring.xml
index d6a95ee07..a14bf6656 100644
--- a/accompany-admin/accompany-admin-web/src/main/resources/logback-spring.xml
+++ b/accompany-admin/accompany-admin-web/src/main/resources/logback-spring.xml
@@ -7,7 +7,7 @@
 
 	<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
 	<property name="LOG_HOME" value="/data/java/weblog/accompany-admin"/>
-	<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%X{trace_id}] %-5level %logger{36} %line - %msg%n" />
+	<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%X{traceId}] %-5level %logger{36} %line - %msg%n" />
 
 	<!--写入日志到控制台的appender,用默认的,但是要去掉charset,否则windows下tomcat下乱码-->
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/aop/ApiRequestLogAspect.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/aop/ApiRequestLogAspect.java
index 8c1f5be02..9c76d0753 100644
--- a/accompany-base/accompany-core/src/main/java/com/accompany/common/aop/ApiRequestLogAspect.java
+++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/aop/ApiRequestLogAspect.java
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 @Component
 public class ApiRequestLogAspect {
 
-    public static final String TRACE_ID = "trace_id";
+    public static final String TRACE_ID = "traceId";
 
     @Autowired
     private ObjectMapper objectMapper;
diff --git a/accompany-business/accompany-business-web/src/main/resources/logback-spring.xml b/accompany-business/accompany-business-web/src/main/resources/logback-spring.xml
index fadccddc6..5bb616a01 100644
--- a/accompany-business/accompany-business-web/src/main/resources/logback-spring.xml
+++ b/accompany-business/accompany-business-web/src/main/resources/logback-spring.xml
@@ -7,7 +7,7 @@
 
 	<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
 	<property name="LOG_HOME" value="/data/java/weblog/accompany-business"/>
-	<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%X{trace_id}] %-5level %logger{36} %line - %msg%n" />
+	<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%X{traceId}] %-5level %logger{36} %line - %msg%n" />
 
 	<!--写入日志到控制台的appender,用默认的,但是要去掉charset,否则windows下tomcat下乱码-->
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/resources/logback-spring.xml b/accompany-oauth2/accompany-oauth2-web/src/main/resources/logback-spring.xml
index 2451864dc..8a68e6308 100644
--- a/accompany-oauth2/accompany-oauth2-web/src/main/resources/logback-spring.xml
+++ b/accompany-oauth2/accompany-oauth2-web/src/main/resources/logback-spring.xml
@@ -7,7 +7,7 @@
 
 	<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
 	<property name="LOG_HOME" value="/data/java/weblog/accompany-oauth2"/>
-	<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%X{trace_id}] %-5level %logger{36} %line - %msg%n" />
+	<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%X{traceId}] %-5level %logger{36} %line - %msg%n" />
 
 	<!--写入日志到控制台的appender,用默认的,但是要去掉charset,否则windows下tomcat下乱码-->
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
diff --git a/accompany-scheduler/accompany-scheduler-web/src/main/resources/logback-spring.xml b/accompany-scheduler/accompany-scheduler-web/src/main/resources/logback-spring.xml
index 3585faaac..1baaa7028 100644
--- a/accompany-scheduler/accompany-scheduler-web/src/main/resources/logback-spring.xml
+++ b/accompany-scheduler/accompany-scheduler-web/src/main/resources/logback-spring.xml
@@ -7,7 +7,7 @@
 
 	<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
 	<property name="LOG_HOME" value="/data/java/weblog/accompany-scheduler"/>
-	<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%X{trace_id}] %-5level %logger{36} %line - %msg%n" />
+	<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%X{traceId}] %-5level %logger{36} %line - %msg%n" />
 
 	<!--写入日志到控制台的appender,用默认的,但是要去掉charset,否则windows下tomcat下乱码-->
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">