From 86f5244c26ad590b6bfcb00f2332ad6be87323d7 Mon Sep 17 00:00:00 2001
From: xking <git@x47.cn>
Date: Wed, 24 Jul 2024 15:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20logback=20=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                     | 17 ++++++++++++++---
 src/main/java/cn/wudashan/util/MDCUtil.java |  2 +-
 src/main/resources/logback.xml              | 11 +++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/logback.xml

diff --git a/pom.xml b/pom.xml
index 9c654a6..e11127b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,11 +10,22 @@
 
 
     <dependencies>
+<!--  apache.logging 与 logback 二选一     -->
 
+
+<!--        <dependency>-->
+<!--            <groupId>org.apache.logging.log4j</groupId>-->
+<!--            <artifactId>log4j-slf4j-impl</artifactId>-->
+<!--            <version>2.20.0</version>-->
+<!--        </dependency>-->
+
+
+
+        <!--1.3.x  最后一个支持java1.8 的大版本 -->
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.20.0</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.3.14</version>
         </dependency>
 
     </dependencies>
diff --git a/src/main/java/cn/wudashan/util/MDCUtil.java b/src/main/java/cn/wudashan/util/MDCUtil.java
index 903755d..bb544ef 100644
--- a/src/main/java/cn/wudashan/util/MDCUtil.java
+++ b/src/main/java/cn/wudashan/util/MDCUtil.java
@@ -41,7 +41,7 @@ public class MDCUtil {
 
     public static void putRequestId() {
         try {
-            MDC.put(REQUEST_ID, UUID.randomUUID().toString());
+            MDC.put(REQUEST_ID, UUID.randomUUID().toString().replace("-",""));
         } catch (RuntimeException ignored) {}
     }
 
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
new file mode 100644
index 0000000..2be83ad
--- /dev/null
+++ b/src/main/resources/logback.xml
@@ -0,0 +1,11 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X [%thread] %-5level %logger{36}.%method:%L %kvp %msg%n</pattern>
+<!--            <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread] %logger{32}.%method:%L - %msg%n</pattern>-->
+        </encoder>
+    </appender>
+    <root level="debug">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file