zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-08-18 20:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

7.0.0.M1

Browse Source
This commit is contained in:
choweli
2025-04-15 17:02:41 +08:00
parent b0e37e3ef3
commit 22d487624d
2867 changed files with 9839 additions and 10677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-log/pom.xml
View File

@@ -23,9 +23,9 @@
<packaging>jar</packaging>
<parent>
<groupId>org.dromara.hutool</groupId>
<groupId>cn.hutool.v7</groupId>
<artifactId>hutool-parent</artifactId>
<version>6.0.0-M22</version>
<version>7.0.0.M1</version>
</parent>
<artifactId>hutool-log</artifactId>
@@ -33,7 +33,7 @@
<description>Hutool 日志封装</description>
<properties>
<Automatic-Module-Name>org.dromara.hutool.log</Automatic-Module-Name>
<Automatic-Module-Name>cn.hutool.v7.log</Automatic-Module-Name>
<!-- versions -->
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.5.12</logback.version>
@@ -49,7 +49,7 @@
<dependencies>
<dependency>
<groupId>org.dromara.hutool</groupId>
<groupId>cn.hutool.v7</groupId>
<artifactId>hutool-core</artifactId>
<version>${project.parent.version}</version>
</dependency>

4
hutool-log/src/main/java/org/dromara/hutool/log/AbsLogEngine.java → hutool-log/src/main/java/cn/hutool/v7/log/AbsLogEngine.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.log;
package cn.hutool.v7.log;
import org.dromara.hutool.log.engine.LogEngine;
import cn.hutool.v7.log.engine.LogEngine;
/**
* 抽象日期引擎<br>

8
hutool-log/src/main/java/org/dromara/hutool/log/AbstractLog.java → hutool-log/src/main/java/cn/hutool/v7/log/AbstractLog.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.dromara.hutool.log;
package cn.hutool.v7.log;
import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.log.level.Level;
import cn.hutool.v7.core.exception.ExceptionUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.log.level.Level;
import java.io.Serializable;

16
hutool-log/src/main/java/org/dromara/hutool/log/Log.java → hutool-log/src/main/java/cn/hutool/v7/log/Log.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.log;
package cn.hutool.v7.log;
import org.dromara.hutool.core.lang.caller.CallerUtil;
import org.dromara.hutool.log.level.DebugLog;
import org.dromara.hutool.log.level.ErrorLog;
import org.dromara.hutool.log.level.InfoLog;
import org.dromara.hutool.log.level.Level;
import org.dromara.hutool.log.level.TraceLog;
import org.dromara.hutool.log.level.WarnLog;
import cn.hutool.v7.core.lang.caller.CallerUtil;
import cn.hutool.v7.log.level.DebugLog;
import cn.hutool.v7.log.level.ErrorLog;
import cn.hutool.v7.log.level.InfoLog;
import cn.hutool.v7.log.level.Level;
import cn.hutool.v7.log.level.TraceLog;
import cn.hutool.v7.log.level.WarnLog;
/**
* 日志统一接口

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

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.log;
package cn.hutool.v7.log;
import org.dromara.hutool.log.engine.LogEngineFactory;
import cn.hutool.v7.log.engine.LogEngineFactory;
/**
* 日志简单工厂类，提供带有缓存的日志对象创建

8
hutool-log/src/main/java/org/dromara/hutool/log/LogUtil.java → hutool-log/src/main/java/cn/hutool/v7/log/LogUtil.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.dromara.hutool.log;
package cn.hutool.v7.log;
import org.dromara.hutool.core.lang.caller.CallerUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.log.level.Level;
import cn.hutool.v7.core.lang.caller.CallerUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.log.level.Level;
/**
* 静态日志类，用于在不引入日志对象的情况下打印日志

6
hutool-log/src/main/java/org/dromara/hutool/log/engine/LogEngine.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/LogEngine.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine;
package cn.hutool.v7.log.engine;
import org.dromara.hutool.core.lang.Singleton;
import org.dromara.hutool.log.Log;
import cn.hutool.v7.core.lang.Singleton;
import cn.hutool.v7.log.Log;
/**
* 日期引擎接口

24
hutool-log/src/main/java/org/dromara/hutool/log/engine/LogEngineFactory.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/LogEngineFactory.java
View File

@@ -14,19 +14,19 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine;
package cn.hutool.v7.log.engine;
import org.dromara.hutool.core.io.resource.ResourceUtil;
import org.dromara.hutool.core.lang.Singleton;
import org.dromara.hutool.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.spi.SpiUtil;
import org.dromara.hutool.log.LogFactory;
import org.dromara.hutool.log.engine.commons.ApacheCommonsLogEngine;
import org.dromara.hutool.log.engine.console.ConsoleLogEngine;
import org.dromara.hutool.log.engine.jdk.JdkLogEngine;
import org.dromara.hutool.log.engine.log4j.Log4jLogEngine;
import org.dromara.hutool.log.engine.log4j2.Log4j2LogEngine;
import org.dromara.hutool.log.engine.slf4j.Slf4jLogEngine;
import cn.hutool.v7.core.io.resource.ResourceUtil;
import cn.hutool.v7.core.lang.Singleton;
import cn.hutool.v7.core.reflect.ConstructorUtil;
import cn.hutool.v7.core.spi.SpiUtil;
import cn.hutool.v7.log.LogFactory;
import cn.hutool.v7.log.engine.commons.ApacheCommonsLogEngine;
import cn.hutool.v7.log.engine.console.ConsoleLogEngine;
import cn.hutool.v7.log.engine.jdk.JdkLogEngine;
import cn.hutool.v7.log.engine.log4j.Log4jLogEngine;
import cn.hutool.v7.log.engine.log4j2.Log4j2LogEngine;
import cn.hutool.v7.log.engine.slf4j.Slf4jLogEngine;
import java.net.URL;

8
hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLog.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.commons;
package cn.hutool.v7.log.engine.commons;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.log.AbstractLog;
import org.dromara.hutool.log.level.Level;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.log.AbstractLog;
import cn.hutool.v7.log.level.Level;
/**
* Apache Commons Logging

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

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.commons;
package cn.hutool.v7.log.engine.commons;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.Log4JLogger;
import org.dromara.hutool.log.engine.log4j.Log4jLog;
import cn.hutool.v7.log.engine.log4j.Log4jLog;
/**
* Apache Commons Logging for Log4j

6
hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLogEngine.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLogEngine.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.commons;
package cn.hutool.v7.log.engine.commons;
import org.dromara.hutool.log.AbsLogEngine;
import org.dromara.hutool.log.Log;
import cn.hutool.v7.log.AbsLogEngine;
import cn.hutool.v7.log.Log;
/**
* Apache Commons Logging

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

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.log.engine.commons;
package cn.hutool.v7.log.engine.commons;

14
hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLog.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleColorLog.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.console;
package cn.hutool.v7.log.engine.console;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.lang.ansi.Ansi4BitColor;
import org.dromara.hutool.core.lang.ansi.AnsiEncoder;
import org.dromara.hutool.core.reflect.ClassUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.log.level.Level;
import cn.hutool.v7.core.date.DateUtil;
import cn.hutool.v7.core.lang.ansi.Ansi4BitColor;
import cn.hutool.v7.core.lang.ansi.AnsiEncoder;
import cn.hutool.v7.core.reflect.ClassUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.log.level.Level;
import java.util.function.Function;

6
hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLogEngine.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleColorLogEngine.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.console;
package cn.hutool.v7.log.engine.console;
import org.dromara.hutool.log.AbsLogEngine;
import org.dromara.hutool.log.Log;
import cn.hutool.v7.log.AbsLogEngine;
import cn.hutool.v7.log.Log;
/**
* 利用System.out.println()打印彩色日志

16
hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLog.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleLog.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.console;
package cn.hutool.v7.log.engine.console;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.Console;
import org.dromara.hutool.core.map.Dict;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.log.AbstractLog;
import org.dromara.hutool.log.level.Level;
import cn.hutool.v7.core.date.DateUtil;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.lang.Console;
import cn.hutool.v7.core.map.Dict;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.log.AbstractLog;
import cn.hutool.v7.log.level.Level;
/**
* 利用System.out.println()打印日志

6
hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLogEngine.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleLogEngine.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.console;
package cn.hutool.v7.log.engine.console;
import org.dromara.hutool.log.AbsLogEngine;
import org.dromara.hutool.log.Log;
import cn.hutool.v7.log.AbsLogEngine;
import cn.hutool.v7.log.Log;
/**
* 利用System.out.println()打印日志

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

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.log.engine.console;
package cn.hutool.v7.log.engine.console;

8
hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLog.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/JbossLog.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.jboss;
package cn.hutool.v7.log.engine.jboss;
import org.jboss.logging.Logger;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.log.AbstractLog;
import org.dromara.hutool.log.level.Level;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.log.AbstractLog;
import cn.hutool.v7.log.level.Level;
/**
* <a href="https://github.com/jboss-logging">Jboss-Logging</a> log.

6
hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLogEngine.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/JbossLogEngine.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.jboss;
package cn.hutool.v7.log.engine.jboss;
import org.dromara.hutool.log.AbsLogEngine;
import org.dromara.hutool.log.Log;
import cn.hutool.v7.log.AbsLogEngine;
import cn.hutool.v7.log.Log;
/**
* <a href="https://github.com/jboss-logging">Jboss-Logging</a> log.

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

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.log.engine.jboss;
package cn.hutool.v7.log.engine.jboss;

8
hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLog.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/jdk/JdkLog.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.jdk;
package cn.hutool.v7.log.engine.jdk;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.log.AbstractLog;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.log.AbstractLog;
/**
* <a href="http://java.sun.com/javase/6/docs/technotes/guides/logging/index.html">java.util.logging</a> log.
@@ -109,7 +109,7 @@ public class JdkLog extends AbstractLog {
// ------------------------------------------------------------------------- Log
@Override
public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
public void log(final String fqcn, final cn.hutool.v7.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
final Level jdkLevel;
switch (level) {
case TRACE:

12
hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLogEngine.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/jdk/JdkLogEngine.java
View File

@@ -14,16 +14,16 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.jdk;
package cn.hutool.v7.log.engine.jdk;
import java.io.InputStream;
import java.util.logging.LogManager;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.resource.ResourceUtil;
import org.dromara.hutool.core.lang.Console;
import org.dromara.hutool.log.AbsLogEngine;
import org.dromara.hutool.log.Log;
import cn.hutool.v7.core.io.IoUtil;
import cn.hutool.v7.core.io.resource.ResourceUtil;
import cn.hutool.v7.core.lang.Console;
import cn.hutool.v7.log.AbsLogEngine;
import cn.hutool.v7.log.Log;
/**
* JDK日志工厂类

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

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.log.engine.jdk;
package cn.hutool.v7.log.engine.jdk;

18
hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLog.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j/Log4jLog.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.log4j;
package cn.hutool.v7.log.engine.log4j;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.log.AbstractLog;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.log.AbstractLog;
/**
* <a href="http://logging.apache.org/log4j/1.2/index.html">Apache Log4J</a> log.<br>
@@ -74,7 +74,7 @@ public class Log4jLog extends AbstractLog {
@Override
public void trace(final String fqcn, final Throwable t, final String format, final Object... arguments) {
log(fqcn, org.dromara.hutool.log.level.Level.TRACE, t, format, arguments);
log(fqcn, cn.hutool.v7.log.level.Level.TRACE, t, format, arguments);
}
// ------------------------------------------------------------------------- Debug
@@ -85,7 +85,7 @@ public class Log4jLog extends AbstractLog {
@Override
public void debug(final String fqcn, final Throwable t, final String format, final Object... arguments) {
log(fqcn, org.dromara.hutool.log.level.Level.DEBUG, t, format, arguments);
log(fqcn, cn.hutool.v7.log.level.Level.DEBUG, t, format, arguments);
}
// ------------------------------------------------------------------------- Info
@Override
@@ -95,7 +95,7 @@ public class Log4jLog extends AbstractLog {
@Override
public void info(final String fqcn, final Throwable t, final String format, final Object... arguments) {
log(fqcn, org.dromara.hutool.log.level.Level.INFO, t, format, arguments);
log(fqcn, cn.hutool.v7.log.level.Level.INFO, t, format, arguments);
}
// ------------------------------------------------------------------------- Warn
@@ -106,7 +106,7 @@ public class Log4jLog extends AbstractLog {
@Override
public void warn(final String fqcn, final Throwable t, final String format, final Object... arguments) {
log(fqcn, org.dromara.hutool.log.level.Level.WARN, t, format, arguments);
log(fqcn, cn.hutool.v7.log.level.Level.WARN, t, format, arguments);
}
// ------------------------------------------------------------------------- Error
@@ -117,12 +117,12 @@ public class Log4jLog extends AbstractLog {
@Override
public void error(final String fqcn, final Throwable t, final String format, final Object... arguments) {
log(fqcn, org.dromara.hutool.log.level.Level.ERROR, t, format, arguments);
log(fqcn, cn.hutool.v7.log.level.Level.ERROR, t, format, arguments);
}
// ------------------------------------------------------------------------- Log
@Override
public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
public void log(final String fqcn, final cn.hutool.v7.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
final Level log4jLevel;
switch (level) {
case TRACE:

6
hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLogEngine.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j/Log4jLogEngine.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.log4j;
package cn.hutool.v7.log.engine.log4j;
import org.dromara.hutool.log.AbsLogEngine;
import org.dromara.hutool.log.Log;
import cn.hutool.v7.log.AbsLogEngine;
import cn.hutool.v7.log.Log;
/**
* <a href="http://logging.apache.org/log4j/1.2/index.html">Apache Log4J</a> log.<br>

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

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.log.engine.log4j;
package cn.hutool.v7.log.engine.log4j;

8
hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2Log.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2Log.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.log4j2;
package cn.hutool.v7.log.engine.log4j2;
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.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.log.AbstractLog;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.log.AbstractLog;
/**
* <a href="http://logging.apache.org/log4j/2.x/index.html">Apache Log4J 2</a> log.<br>
@@ -124,7 +124,7 @@ public class Log4j2Log extends AbstractLog {
// ------------------------------------------------------------------------- Log
@Override
public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
public void log(final String fqcn, final cn.hutool.v7.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
final Level log4j2Level;
switch (level) {
case TRACE:

6
hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2LogEngine.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2LogEngine.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.log4j2;
package cn.hutool.v7.log.engine.log4j2;
import org.dromara.hutool.log.AbsLogEngine;
import org.dromara.hutool.log.Log;
import cn.hutool.v7.log.AbsLogEngine;
import cn.hutool.v7.log.Log;
/**
* <a href="http://logging.apache.org/log4j/2.x/index.html">Apache Log4J 2</a> log.<br>

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

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.log.engine.log4j2;
package cn.hutool.v7.log.engine.log4j2;

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

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.log.engine;
package cn.hutool.v7.log.engine;

8
hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLog.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLog.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.slf4j;
package cn.hutool.v7.log.engine.slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.spi.LocationAwareLogger;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.log.AbstractLog;
import org.dromara.hutool.log.level.Level;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.log.AbstractLog;
import cn.hutool.v7.log.level.Level;
/**
* <a href="http://www.slf4j.org/">SLF4J</a> log.<br>

6
hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLogEngine.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLogEngine.java
View File

@@ -14,17 +14,17 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.slf4j;
package cn.hutool.v7.log.engine.slf4j;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
import org.dromara.hutool.log.AbsLogEngine;
import cn.hutool.v7.log.AbsLogEngine;
import org.slf4j.LoggerFactory;
import org.slf4j.helpers.NOPLoggerFactory;
import org.dromara.hutool.log.Log;
import cn.hutool.v7.log.Log;
/**
* <a href="http://www.slf4j.org/">SLF4J</a> log.<br>

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

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.log.engine.slf4j;
package cn.hutool.v7.log.engine.slf4j;

14
hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.tinylog;
package cn.hutool.v7.log.engine.tinylog;
import org.dromara.hutool.log.AbstractLog;
import cn.hutool.v7.log.AbstractLog;
import org.pmw.tinylog.Level;
import org.pmw.tinylog.LogEntryForwarder;
import org.pmw.tinylog.Logger;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.array.ArrayUtil;
import cn.hutool.v7.core.text.StrUtil;
/**
* <a href="http://www.tinylog.org/">tinylog</a> log.<br>
@@ -122,12 +122,12 @@ public class TinyLog extends AbstractLog {
// ------------------------------------------------------------------------- Log
@Override
public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
public void log(final String fqcn, final cn.hutool.v7.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
logIfEnabled(fqcn, toTinyLevel(level), t, format, arguments);
}
@Override
public boolean isEnabled(final org.dromara.hutool.log.level.Level level) {
public boolean isEnabled(final cn.hutool.v7.log.level.Level level) {
return this.level <= toTinyLevel(level).ordinal();
}
@@ -155,7 +155,7 @@ public class TinyLog extends AbstractLog {
* @return Tinylog的Level
* @since 4.0.3
*/
private Level toTinyLevel(final org.dromara.hutool.log.level.Level level) {
private Level toTinyLevel(final cn.hutool.v7.log.level.Level level) {
final Level tinyLevel;
switch (level) {
case TRACE:

14
hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog2.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.tinylog;
package cn.hutool.v7.log.engine.tinylog;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.log.AbstractLog;
import cn.hutool.v7.core.array.ArrayUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.log.AbstractLog;
import org.tinylog.Level;
import org.tinylog.configuration.Configuration;
import org.tinylog.format.AdvancedMessageFormatter;
@@ -130,12 +130,12 @@ public class TinyLog2 extends AbstractLog {
// ------------------------------------------------------------------------- Log
@Override
public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
public void log(final String fqcn, final cn.hutool.v7.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
logIfEnabled(fqcn, toTinyLevel(level), t, format, arguments);
}
@Override
public boolean isEnabled(final org.dromara.hutool.log.level.Level level) {
public boolean isEnabled(final cn.hutool.v7.log.level.Level level) {
return this.level <= toTinyLevel(level).ordinal();
}
@@ -164,7 +164,7 @@ public class TinyLog2 extends AbstractLog {
* @return Tinylog的Level
* @since 4.0.3
*/
private Level toTinyLevel(final org.dromara.hutool.log.level.Level level) {
private Level toTinyLevel(final cn.hutool.v7.log.level.Level level) {
final Level tinyLevel;
switch (level) {
case TRACE:

6
hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2Engine.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog2Engine.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.tinylog;
package cn.hutool.v7.log.engine.tinylog;
import org.dromara.hutool.log.AbsLogEngine;
import org.dromara.hutool.log.Log;
import cn.hutool.v7.log.AbsLogEngine;
import cn.hutool.v7.log.Log;
/**
* <a href="http://www.tinylog.org/">TinyLog2</a> log.<br>

6
hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLogEngine.java → hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLogEngine.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.log.engine.tinylog;
package cn.hutool.v7.log.engine.tinylog;
import org.dromara.hutool.log.AbsLogEngine;
import org.dromara.hutool.log.Log;
import cn.hutool.v7.log.AbsLogEngine;
import cn.hutool.v7.log.Log;
/**
* <a href="http://www.tinylog.org/">TinyLog</a> log.<br>

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

@@ -20,4 +20,4 @@
*
* @author Looly
*/
package org.dromara.hutool.log.engine.tinylog;
package cn.hutool.v7.log.engine.tinylog;

2
hutool-log/src/main/java/org/dromara/hutool/log/level/DebugLog.java → hutool-log/src/main/java/cn/hutool/v7/log/level/DebugLog.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.log.level;
package cn.hutool.v7.log.level;
/**
* DEBUG级别日志接口

2
hutool-log/src/main/java/org/dromara/hutool/log/level/ErrorLog.java → hutool-log/src/main/java/cn/hutool/v7/log/level/ErrorLog.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.log.level;
package cn.hutool.v7.log.level;
/**
* ERROR级别日志接口

2
hutool-log/src/main/java/org/dromara/hutool/log/level/InfoLog.java → hutool-log/src/main/java/cn/hutool/v7/log/level/InfoLog.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.log.level;
package cn.hutool.v7.log.level;
/**
* INFO级别日志接口

2
hutool-log/src/main/java/org/dromara/hutool/log/level/Level.java → hutool-log/src/main/java/cn/hutool/v7/log/level/Level.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.log.level;
package cn.hutool.v7.log.level;
/**
* 日志等级

2
hutool-log/src/main/java/org/dromara/hutool/log/level/TraceLog.java → hutool-log/src/main/java/cn/hutool/v7/log/level/TraceLog.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.log.level;
package cn.hutool.v7.log.level;
/**
* TRACE级别日志接口

2
hutool-log/src/main/java/org/dromara/hutool/log/level/WarnLog.java → hutool-log/src/main/java/cn/hutool/v7/log/level/WarnLog.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.log.level;
package cn.hutool.v7.log.level;
/**
* WARN级别日志接口

2
hutool-log/src/main/java/org/dromara/hutool/log/level/package-info.java → hutool-log/src/main/java/cn/hutool/v7/log/level/package-info.java
View File

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.log.level;
package cn.hutool.v7.log.level;

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

@@ -21,4 +21,4 @@
* @author Looly
*
*/
package org.dromara.hutool.log;
package cn.hutool.v7.log;

14
hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.engine.LogEngine → hutool-log/src/main/resources/META-INF/services/cn.hutool.v7.log.engine.LogEngine
View File

@@ -14,10 +14,10 @@
# limitations under the License.
#
org.dromara.hutool.log.engine.slf4j.Slf4jLogEngine
org.dromara.hutool.log.engine.log4j2.Log4j2LogEngine
org.dromara.hutool.log.engine.log4j.Log4jLogEngine
org.dromara.hutool.log.engine.commons.ApacheCommonsLogEngine
org.dromara.hutool.log.engine.tinylog.TinyLog2Engine
org.dromara.hutool.log.engine.tinylog.TinyLogEngine
org.dromara.hutool.log.engine.jboss.JbossLogEngine
cn.hutool.v7.log.engine.slf4j.Slf4jLogEngine
cn.hutool.v7.log.engine.log4j2.Log4j2LogEngine
cn.hutool.v7.log.engine.log4j.Log4jLogEngine
cn.hutool.v7.log.engine.commons.ApacheCommonsLogEngine
cn.hutool.v7.log.engine.tinylog.TinyLog2Engine
cn.hutool.v7.log.engine.tinylog.TinyLogEngine
cn.hutool.v7.log.engine.jboss.JbossLogEngine

24
hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java → hutool-log/src/test/java/cn/hutool/v7/log/CustomLogTest.java
View File

@@ -14,19 +14,19 @@
* limitations under the License.
*/
package org.dromara.hutool.log;
package cn.hutool.v7.log;
import org.dromara.hutool.log.engine.LogEngine;
import org.dromara.hutool.log.engine.LogEngineFactory;
import org.dromara.hutool.log.engine.commons.ApacheCommonsLogEngine;
import org.dromara.hutool.log.engine.console.ConsoleLogEngine;
import org.dromara.hutool.log.engine.jboss.JbossLogEngine;
import org.dromara.hutool.log.engine.jdk.JdkLogEngine;
import org.dromara.hutool.log.engine.log4j.Log4jLogEngine;
import org.dromara.hutool.log.engine.log4j2.Log4j2LogEngine;
import org.dromara.hutool.log.engine.slf4j.Slf4jLogEngine;
import org.dromara.hutool.log.engine.tinylog.TinyLog2Engine;
import org.dromara.hutool.log.engine.tinylog.TinyLogEngine;
import cn.hutool.v7.log.engine.LogEngine;
import cn.hutool.v7.log.engine.LogEngineFactory;
import cn.hutool.v7.log.engine.commons.ApacheCommonsLogEngine;
import cn.hutool.v7.log.engine.console.ConsoleLogEngine;
import cn.hutool.v7.log.engine.jboss.JbossLogEngine;
import cn.hutool.v7.log.engine.jdk.JdkLogEngine;
import cn.hutool.v7.log.engine.log4j.Log4jLogEngine;
import cn.hutool.v7.log.engine.log4j2.Log4j2LogEngine;
import cn.hutool.v7.log.engine.slf4j.Slf4jLogEngine;
import cn.hutool.v7.log.engine.tinylog.TinyLog2Engine;
import cn.hutool.v7.log.engine.tinylog.TinyLogEngine;
import org.junit.jupiter.api.Test;
/**

4
hutool-log/src/test/java/org/dromara/hutool/log/LogTest.java → hutool-log/src/test/java/cn/hutool/v7/log/LogTest.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.log;
package cn.hutool.v7.log;
import org.dromara.hutool.log.level.Level;
import cn.hutool.v7.log.level.Level;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

10
hutool-log/src/test/java/org/dromara/hutool/log/LogUtilTest.java → hutool-log/src/test/java/cn/hutool/v7/log/LogUtilTest.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.dromara.hutool.log;
package cn.hutool.v7.log;
import org.dromara.hutool.log.engine.LogEngineFactory;
import org.dromara.hutool.log.engine.console.ConsoleColorLogEngine;
import org.dromara.hutool.log.engine.console.ConsoleLogEngine;
import org.dromara.hutool.log.engine.log4j2.Log4j2LogEngine;
import cn.hutool.v7.log.engine.LogEngineFactory;
import cn.hutool.v7.log.engine.console.ConsoleColorLogEngine;
import cn.hutool.v7.log.engine.console.ConsoleLogEngine;
import cn.hutool.v7.log.engine.log4j2.Log4j2LogEngine;
import org.junit.jupiter.api.Test;
public class LogUtilTest {

2
hutool-log/src/test/java/org/dromara/hutool/log/StaticLogTest.java → hutool-log/src/test/java/cn/hutool/v7/log/StaticLogTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.log;
package cn.hutool.v7.log;
import org.junit.jupiter.api.Test;