From f8ad529cc0bd3f682af8c5a6893de1811e921b4b Mon Sep 17 00:00:00 2001
From: wodeyangzipingpingwuqi <zhengweilins@foxmail.com>
Date: Mon, 4 Nov 2024 13:46:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(1.2.0-beta3):=201=E3=80=81=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E6=97=A5=E5=BF=97=E4=B8=8A=E6=8A=A5=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=20org.apache.log4j.MDC=E4=BF=AE=E6=94=B9=E4=B8=BAorg.?=
 =?UTF-8?q?slf4j.MDC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 .../snailjob/client/common/appender/SnailLog4j2Appender.java    | 2 +-
 .../aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index bff06ebf0..c393d40b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         <java.version>17</java.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <revision>1.2.0-beta2</revision>
+        <revision>1.2.0-beta3</revision>
         <netty-all.version>4.1.114.Final</netty-all.version>
         <hutool-all.version>5.8.32</hutool-all.version>
         <mybatis-plus.version>3.5.9</mybatis-plus.version>
diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/appender/SnailLog4j2Appender.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/appender/SnailLog4j2Appender.java
index dae8a5045..35be919db 100644
--- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/appender/SnailLog4j2Appender.java
+++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/appender/SnailLog4j2Appender.java
@@ -19,7 +19,6 @@ import com.aizuda.snailjob.client.common.log.support.SnailJobLogManager;
 import com.aizuda.snailjob.client.common.rpc.client.NettyChannel;
 import com.aizuda.snailjob.common.log.constant.LogFieldConstants;
 import com.aizuda.snailjob.common.log.dto.LogContentDTO;
-import org.apache.log4j.MDC;
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.Layout;
 import org.apache.logging.log4j.core.LogEvent;
@@ -30,6 +29,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginElement;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
 import org.apache.logging.log4j.core.util.Booleans;
 import org.apache.logging.log4j.core.util.Throwables;
+import org.slf4j.MDC;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java
index 75ec793ee..c1b02ea77 100644
--- a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java
+++ b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java
@@ -4,11 +4,11 @@ import cn.hutool.core.util.StrUtil;
 import com.aizuda.snailjob.common.log.constant.LogFieldConstants;
 import com.aizuda.snailjob.common.log.dialect.AbstractLog;
 import com.aizuda.snailjob.common.log.factory.LogFactory;
-import org.apache.log4j.MDC;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.spi.AbstractLogger;
+import org.slf4j.MDC;
 
 import java.io.Serial;