From 654a78d93b309508cde7d4e8357e1a4bab7eb790 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 7 Nov 2023 21:20:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=97=A5=E5=BF=97=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 iot-gateway/src/main/resources/bootstrap.yml      |  2 +-
 .../api/filter/LogbackMDCPatternConverter.java    | 15 +++++++++++++++
 .../filter/TraceIdMDCPatternLogbackLayout.java    | 10 ++++++++++
 .../src/main/resources/logback-spring.xml         |  4 ++--
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogbackMDCPatternConverter.java
 create mode 100644 iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/TraceIdMDCPatternLogbackLayout.java

diff --git a/iot-gateway/src/main/resources/bootstrap.yml b/iot-gateway/src/main/resources/bootstrap.yml
index ec17f21..e0b0a0e 100644
--- a/iot-gateway/src/main/resources/bootstrap.yml
+++ b/iot-gateway/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
 spring:
   application:
     name: qiuguo-iot-gateway
diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogbackMDCPatternConverter.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogbackMDCPatternConverter.java
new file mode 100644
index 0000000..fa2bae6
--- /dev/null
+++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogbackMDCPatternConverter.java
@@ -0,0 +1,15 @@
+package com.qiuguo.iot.user.api.filter;
+
+import ch.qos.logback.classic.pattern.MDCConverter;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+public class LogbackMDCPatternConverter extends MDCConverter {
+    @Override
+    public void start() {
+        super.start();
+    }
+    @Override
+    public String convert(ILoggingEvent iLoggingEvent) {
+        return super.convert(iLoggingEvent);
+    }
+}
diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/TraceIdMDCPatternLogbackLayout.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/TraceIdMDCPatternLogbackLayout.java
new file mode 100644
index 0000000..1da6ef5
--- /dev/null
+++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/TraceIdMDCPatternLogbackLayout.java
@@ -0,0 +1,10 @@
+package com.qiuguo.iot.user.api.filter;
+
+import ch.qos.logback.classic.PatternLayout;
+
+public class TraceIdMDCPatternLogbackLayout extends PatternLayout {
+    static {
+        defaultConverterMap.put("X", LogbackMDCPatternConverter.class.getName());
+        defaultConverterMap.put("mdc", LogbackMDCPatternConverter.class.getName());
+    }
+}
diff --git a/iot-modules/iot-box-user-api/src/main/resources/logback-spring.xml b/iot-modules/iot-box-user-api/src/main/resources/logback-spring.xml
index c5702be..c91a281 100644
--- a/iot-modules/iot-box-user-api/src/main/resources/logback-spring.xml
+++ b/iot-modules/iot-box-user-api/src/main/resources/logback-spring.xml
@@ -38,7 +38,7 @@
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.TraceIdMDCPatternLogbackLayout">
+            <layout class="com.qiuguo.iot.user.api.filter.TraceIdMDCPatternLogbackLayout">
                 <Pattern>${PATTERN}</Pattern>
             </layout>
         </encoder>
@@ -47,7 +47,7 @@
     <!--  skywalking采集日志  -->
     <appender name="SKYWALKING" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.TraceIdMDCPatternLogbackLayout">
+            <layout class="com.qiuguo.iot.user.api.filter.TraceIdMDCPatternLogbackLayout">
                 <Pattern>${SKY_PATTERN}</Pattern>
             </layout>
         </encoder>