diff --git a/pom.xml b/pom.xml index bff06ebf0..c393d40b7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 17 17 17 - 1.2.0-beta2 + 1.2.0-beta3 4.1.114.Final 5.8.32 3.5.9 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;