lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-24 18:04:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2023-04-03 19:21:53 +08:00
parent 4d752ece91
commit 4357d1b81f
39 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hutool-log/src/main/java/org/dromara/hutool/log/GlobalLogFactory.java
View File

@ -12,12 +12,12 @@
package org.dromara.hutool.log;
import org.dromara.hutool.log.dialect.commons.ApacheCommonsLogFactory;
import org.dromara.hutool.log.dialect.console.ConsoleLogFactory;
import org.dromara.hutool.log.dialect.jdk.JdkLogFactory;
import org.dromara.hutool.log.dialect.log4j.Log4jLogFactory;
import org.dromara.hutool.log.dialect.log4j2.Log4j2LogFactory;
import org.dromara.hutool.log.dialect.slf4j.Slf4jLogFactory;
import org.dromara.hutool.log.engine.commons.ApacheCommonsLogFactory;
import org.dromara.hutool.log.engine.console.ConsoleLogFactory;
import org.dromara.hutool.log.engine.jdk.JdkLogFactory;
import org.dromara.hutool.log.engine.log4j.Log4jLogFactory;
import org.dromara.hutool.log.engine.log4j2.Log4j2LogFactory;
import org.dromara.hutool.log.engine.slf4j.Slf4jLogFactory;
/**
* 全局日志工厂类<br>

4
hutool-log/src/main/java/org/dromara/hutool/log/LogFactory.java
View File

@ -16,8 +16,8 @@ import org.dromara.hutool.core.io.resource.ResourceUtil;
import org.dromara.hutool.core.lang.caller.CallerUtil;
import org.dromara.hutool.core.map.SafeConcurrentHashMap;
import org.dromara.hutool.core.util.ServiceLoaderUtil;
import org.dromara.hutool.log.dialect.console.ConsoleLogFactory;
import org.dromara.hutool.log.dialect.jdk.JdkLogFactory;
import org.dromara.hutool.log.engine.console.ConsoleLogFactory;
import org.dromara.hutool.log.engine.jdk.JdkLogFactory;
import java.net.URL;
import java.util.Map;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.commons;
package org.dromara.hutool.log.engine.commons;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

4
hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog4JLog.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog4JLog.java
View File

@ -10,12 +10,12 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.commons;
package org.dromara.hutool.log.engine.commons;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.Log4JLogger;
import org.dromara.hutool.log.dialect.log4j.Log4jLog;
import org.dromara.hutool.log.engine.log4j.Log4jLog;
/**
* Apache Commons Logging for Log4j

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLogFactory.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLogFactory.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.commons;
package org.dromara.hutool.log.engine.commons;
import org.dromara.hutool.log.Log;
import org.dromara.hutool.log.LogFactory;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/package-info.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/package-info.java
View File

@ -16,4 +16,4 @@
* @author looly
*
*/
package org.dromara.hutool.log.dialect.commons;
package org.dromara.hutool.log.engine.commons;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLog.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLog.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.console;
package org.dromara.hutool.log.engine.console;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.lang.ansi.Ansi4BitColor;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLogFactory.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLogFactory.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.console;
package org.dromara.hutool.log.engine.console;
import org.dromara.hutool.log.Log;
import org.dromara.hutool.log.LogFactory;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLog.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLog.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.console;
package org.dromara.hutool.log.engine.console;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.lang.Assert;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLogFactory.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLogFactory.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.console;
package org.dromara.hutool.log.engine.console;
import org.dromara.hutool.log.Log;
import org.dromara.hutool.log.LogFactory;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/package-info.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/console/package-info.java
View File

@ -16,4 +16,4 @@
* @author looly
*
*/
package org.dromara.hutool.log.dialect.console;
package org.dromara.hutool.log.engine.console;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLog.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLog.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.jboss;
package org.dromara.hutool.log.engine.jboss;
import org.jboss.logging.Logger;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLogFactory.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLogFactory.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.jboss;
package org.dromara.hutool.log.engine.jboss;
import org.dromara.hutool.log.Log;
import org.dromara.hutool.log.LogFactory;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/package-info.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/package-info.java
View File

@ -16,4 +16,4 @@
* @author looly
*
*/
package org.dromara.hutool.log.dialect.jboss;
package org.dromara.hutool.log.engine.jboss;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLog.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLog.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.jdk;
package org.dromara.hutool.log.engine.jdk;
import java.util.logging.Level;
import java.util.logging.LogRecord;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLogFactory.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLogFactory.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.jdk;
package org.dromara.hutool.log.engine.jdk;
import java.io.InputStream;
import java.util.logging.LogManager;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/package-info.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/package-info.java
View File

@ -16,4 +16,4 @@
* @author looly
*
*/
package org.dromara.hutool.log.dialect.jdk;
package org.dromara.hutool.log.engine.jdk;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLog.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLog.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.log4j;
package org.dromara.hutool.log.engine.log4j;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLogFactory.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLogFactory.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.log4j;
package org.dromara.hutool.log.engine.log4j;
import org.dromara.hutool.log.Log;
import org.dromara.hutool.log.LogFactory;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/package-info.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/package-info.java
View File

@ -16,4 +16,4 @@
* @author looly
*
*/
package org.dromara.hutool.log.dialect.log4j;
package org.dromara.hutool.log.engine.log4j;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2Log.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2Log.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.log4j2;
package org.dromara.hutool.log.engine.log4j2;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2LogFactory.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2LogFactory.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.log4j2;
package org.dromara.hutool.log.engine.log4j2;
import org.dromara.hutool.log.Log;
import org.dromara.hutool.log.LogFactory;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/package-info.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/package-info.java
View File

@ -16,4 +16,4 @@
* @author looly
*
*/
package org.dromara.hutool.log.dialect.log4j2;
package org.dromara.hutool.log.engine.log4j2;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLog.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLog.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.logtube;
package org.dromara.hutool.log.engine.logtube;
import org.dromara.hutool.core.exceptions.ExceptionUtil;
import org.dromara.hutool.core.text.StrUtil;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLogFactory.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLogFactory.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.logtube;
package org.dromara.hutool.log.engine.logtube;
import org.dromara.hutool.log.Log;
import org.dromara.hutool.log.LogFactory;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/package-info.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/package-info.java
View File

@ -16,4 +16,4 @@
* @author looly
*
*/
package org.dromara.hutool.log.dialect.logtube;
package org.dromara.hutool.log.engine.logtube;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/package-info.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/package-info.java
View File

@ -16,4 +16,4 @@
* @author looly
*
*/
package org.dromara.hutool.log.dialect;
package org.dromara.hutool.log.engine;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLog.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLog.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.slf4j;
package org.dromara.hutool.log.engine.slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLogFactory.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLogFactory.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.slf4j;
package org.dromara.hutool.log.engine.slf4j;
import java.io.OutputStream;
import java.io.PrintStream;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/package-info.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/package-info.java
View File

@ -16,4 +16,4 @@
* @author looly
*
*/
package org.dromara.hutool.log.dialect.slf4j;
package org.dromara.hutool.log.engine.slf4j;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.tinylog;
package org.dromara.hutool.log.engine.tinylog;
import org.dromara.hutool.log.AbstractLog;
import org.pmw.tinylog.Level;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.tinylog;
package org.dromara.hutool.log.engine.tinylog;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.text.StrUtil;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2Factory.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2Factory.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.tinylog;
package org.dromara.hutool.log.engine.tinylog;
import org.dromara.hutool.log.Log;
import org.dromara.hutool.log.LogFactory;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLogFactory.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLogFactory.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.log.dialect.tinylog;
package org.dromara.hutool.log.engine.tinylog;
import org.dromara.hutool.log.Log;
import org.dromara.hutool.log.LogFactory;

2
hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/package-info.java → hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/package-info.java
View File

@ -16,4 +16,4 @@
*
* @author looly
*/
package org.dromara.hutool.log.dialect.tinylog;
package org.dromara.hutool.log.engine.tinylog;

16
hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.LogFactory
View File

@ -10,11 +10,11 @@
# See the Mulan PSL v2 for more details.
#
org.dromara.hutool.log.dialect.logtube.LogTubeLogFactory
org.dromara.hutool.log.dialect.slf4j.Slf4jLogFactory
org.dromara.hutool.log.dialect.log4j2.Log4j2LogFactory
org.dromara.hutool.log.dialect.log4j.Log4jLogFactory
org.dromara.hutool.log.dialect.commons.ApacheCommonsLogFactory
org.dromara.hutool.log.dialect.tinylog.TinyLog2Factory
org.dromara.hutool.log.dialect.tinylog.TinyLogFactory
org.dromara.hutool.log.dialect.jboss.JbossLogFactory
org.dromara.hutool.log.engine.logtube.LogTubeLogFactory
org.dromara.hutool.log.engine.slf4j.Slf4jLogFactory
org.dromara.hutool.log.engine.log4j2.Log4j2LogFactory
org.dromara.hutool.log.engine.log4j.Log4jLogFactory
org.dromara.hutool.log.engine.commons.ApacheCommonsLogFactory
org.dromara.hutool.log.engine.tinylog.TinyLog2Factory
org.dromara.hutool.log.engine.tinylog.TinyLogFactory
org.dromara.hutool.log.engine.jboss.JbossLogFactory

18
hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java
View File

@ -1,14 +1,14 @@
package org.dromara.hutool.log;
import org.dromara.hutool.log.dialect.commons.ApacheCommonsLogFactory;
import org.dromara.hutool.log.dialect.console.ConsoleLogFactory;
import org.dromara.hutool.log.dialect.jboss.JbossLogFactory;
import org.dromara.hutool.log.dialect.jdk.JdkLogFactory;
import org.dromara.hutool.log.dialect.log4j.Log4jLogFactory;
import org.dromara.hutool.log.dialect.log4j2.Log4j2LogFactory;
import org.dromara.hutool.log.dialect.slf4j.Slf4jLogFactory;
import org.dromara.hutool.log.dialect.tinylog.TinyLog2Factory;
import org.dromara.hutool.log.dialect.tinylog.TinyLogFactory;
import org.dromara.hutool.log.engine.commons.ApacheCommonsLogFactory;
import org.dromara.hutool.log.engine.console.ConsoleLogFactory;
import org.dromara.hutool.log.engine.jboss.JbossLogFactory;
import org.dromara.hutool.log.engine.jdk.JdkLogFactory;
import org.dromara.hutool.log.engine.log4j.Log4jLogFactory;
import org.dromara.hutool.log.engine.log4j2.Log4j2LogFactory;
import org.dromara.hutool.log.engine.slf4j.Slf4jLogFactory;
import org.dromara.hutool.log.engine.tinylog.TinyLog2Factory;
import org.dromara.hutool.log.engine.tinylog.TinyLogFactory;
import org.junit.jupiter.api.Test;
/**

2
hutool-log/src/test/java/org/dromara/hutool/log/LogTubeTest.java
View File

@ -1,6 +1,6 @@
package org.dromara.hutool.log;
import org.dromara.hutool.log.dialect.logtube.LogTubeLogFactory;
import org.dromara.hutool.log.engine.logtube.LogTubeLogFactory;
import org.junit.jupiter.api.Test;
public class LogTubeTest {

4
hutool-log/src/test/java/org/dromara/hutool/log/StaticLogTest.java
View File

@ -1,7 +1,7 @@
package org.dromara.hutool.log;
import org.dromara.hutool.log.dialect.console.ConsoleColorLogFactory;
import org.dromara.hutool.log.dialect.console.ConsoleLogFactory;
import org.dromara.hutool.log.engine.console.ConsoleColorLogFactory;
import org.dromara.hutool.log.engine.console.ConsoleLogFactory;
import org.junit.jupiter.api.Test;
public class StaticLogTest {