diff --git a/fine-druid/src/main/java/com/fr/third/alibaba/druid/filter/logging/Slf4jLogFilter.java b/fine-druid/src/main/java/com/fr/third/alibaba/druid/filter/logging/Slf4jLogFilter.java index 359adc6be..9eab4f3d5 100644 --- a/fine-druid/src/main/java/com/fr/third/alibaba/druid/filter/logging/Slf4jLogFilter.java +++ b/fine-druid/src/main/java/com/fr/third/alibaba/druid/filter/logging/Slf4jLogFilter.java @@ -15,8 +15,8 @@ */ package com.fr.third.alibaba.druid.filter.logging; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; public class Slf4jLogFilter extends LogFilter { diff --git a/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/LogFactory.java b/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/LogFactory.java index fa831f17e..1bc9592e2 100644 --- a/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/LogFactory.java +++ b/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/LogFactory.java @@ -26,7 +26,7 @@ public class LogFactory { String logType= System.getProperty("druid.logType"); if(logType != null){ if(logType.equalsIgnoreCase("slf4j")){ - tryImplementation("org.slf4j.Logger", "SLF4JImpl"); + tryImplementation("com.fr.third.slf4j.Logger", "SLF4JImpl"); }else if(logType.equalsIgnoreCase("log4j")){ tryImplementation("org.apache.log4j.Logger", "Log4jImpl"); }else if(logType.equalsIgnoreCase("log4j2")){ @@ -38,13 +38,13 @@ public class LogFactory { tryImplementation("java.util.logging.Logger", "Jdk14LoggingImpl"); } } + tryImplementation("com.fr.third.slf4j.Logger", "SLF4JImpl"); // 优先选择log4j2防止漏洞 tryImplementation("com.fr.third.apache.logging.log4j.Logger", "FRLog4j2Impl"); // 优先选择log4j,而非Apache Common Logging. 因为后者无法设置真实Log调用者的信息 tryImplementation("com.fr.third.apache.log4j.Logger", "FRLog4jImpl"); tryImplementation("org.apache.log4j.Logger", "Log4jImpl"); tryImplementation("org.apache.logging.log4j.Logger", "Log4j2Impl"); - tryImplementation("org.slf4j.Logger", "SLF4JImpl"); tryImplementation("org.apache.commons.logging.LogFactory", "JakartaCommonsLoggingImpl"); tryImplementation("java.util.logging.Logger", "Jdk14LoggingImpl"); diff --git a/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/SLF4JImpl.java b/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/SLF4JImpl.java index 427c505b9..1e5c5ff91 100644 --- a/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/SLF4JImpl.java +++ b/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/SLF4JImpl.java @@ -15,9 +15,9 @@ */ package com.fr.third.alibaba.druid.support.logging; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.spi.LocationAwareLogger; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; +import com.fr.third.slf4j.spi.LocationAwareLogger; public class SLF4JImpl implements Log {