add cr

2025-07-21 15:09:48 +08:00 · 2023-09-21 18:08:54 +08:00
parent bf4833b7ac
commit 8d7b890b3e
613 changed files with 7234 additions and 126 deletions
--- a/hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java
+++ b/hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java
@@ -1,3 +1,15 @@
+/*
+ * Copyright (c) 2023 looly(loolly@aliyun.com)
+ * Hutool is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *          https://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
 package org.dromara.hutool.log;

 import org.dromara.hutool.log.engine.LogEngine;
--- a/hutool-log/src/test/java/org/dromara/hutool/log/LogTest.java
+++ b/hutool-log/src/test/java/org/dromara/hutool/log/LogTest.java
@@ -1,3 +1,15 @@
+/*
+ * Copyright (c) 2023 looly(loolly@aliyun.com)
+ * Hutool is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *          https://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
 package org.dromara.hutool.log;

 import org.dromara.hutool.log.level.Level;
--- a/hutool-log/src/test/java/org/dromara/hutool/log/LogUtilTest.java
+++ b/hutool-log/src/test/java/org/dromara/hutool/log/LogUtilTest.java
@@ -1,3 +1,15 @@
+/*
+ * Copyright (c) 2023 looly(loolly@aliyun.com)
+ * Hutool is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *          https://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
 package org.dromara.hutool.log;

 import org.dromara.hutool.log.engine.LogEngineFactory;
--- a/hutool-log/src/test/resources/example/log4j2.xml
+++ b/hutool-log/src/test/resources/example/log4j2.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--
+  ~ Copyright (c) 2023 looly(loolly@aliyun.com)
+  ~ Hutool is licensed under Mulan PSL v2.
+  ~ You can use this software according to the terms and conditions of the Mulan PSL v2.
+  ~ You may obtain a copy of Mulan PSL v2 at:
+  ~          https://license.coscl.org.cn/MulanPSL2
+  ~ THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+  ~ EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+  ~ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+  ~ See the Mulan PSL v2 for more details.
+  -->
+
 <!-- @see http://www.cnblogs.com/hanfight/p/5721855.html -->
 <!-- status : 这个用于设置log4j2自身内部的信息输出,可以不设置,当设置成trace时,会看到log4j2内部各种详细输出 monitorInterval : Log4j能够自动检测修改配置文件和重新配置本身, 设置间隔秒数。 -->
 <Configuration status="WARN" monitorInterval="600">
@@ -69,4 +81,4 @@

 	</Loggers>

-</Configuration>
+</Configuration>
--- a/hutool-log/src/test/resources/log4j.properties
+++ b/hutool-log/src/test/resources/log4j.properties
@@ -1,6 +1,18 @@
+#
+# Copyright (c) 2023 looly(loolly@aliyun.com)
+# Hutool is licensed under Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#          https://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+# See the Mulan PSL v2 for more details.
+#
+
 log4j.rootLogger=debug,STDOUT

 log4j.additivity.org.apache=true
 log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
 log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
-log4j.appender.STDOUT.layout.ConversionPattern=[%d{HH:mm:ss,SSS}][%5p] %c:%L - %m%n
+log4j.appender.STDOUT.layout.ConversionPattern=[%d{HH:mm:ss,SSS}][%5p] %c:%L - %m%n
--- a/hutool-log/src/test/resources/log4j2.xml
+++ b/hutool-log/src/test/resources/log4j2.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--
+  ~ Copyright (c) 2023 looly(loolly@aliyun.com)
+  ~ Hutool is licensed under Mulan PSL v2.
+  ~ You can use this software according to the terms and conditions of the Mulan PSL v2.
+  ~ You may obtain a copy of Mulan PSL v2 at:
+  ~          https://license.coscl.org.cn/MulanPSL2
+  ~ THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+  ~ EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+  ~ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+  ~ See the Mulan PSL v2 for more details.
+  -->
+
 <!-- @see http://www.cnblogs.com/hanfight/p/5721855.html -->
 <!-- status : 这个用于设置log4j2自身内部的信息输出,可以不设置,当设置成trace时,会看到log4j2内部各种详细输出 monitorInterval : Log4j能够自动检测修改配置文件和重新配置本身, 设置间隔秒数。 -->
 <Configuration status="WARN" monitorInterval="600">
@@ -21,4 +33,4 @@
 		</root>
 	</Loggers>

-</Configuration>
+</Configuration>
--- a/hutool-log/src/test/resources/logback.xml
+++ b/hutool-log/src/test/resources/logback.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>

+<!--
+  ~ Copyright (c) 2023 looly(loolly@aliyun.com)
+  ~ Hutool is licensed under Mulan PSL v2.
+  ~ You can use this software according to the terms and conditions of the Mulan PSL v2.
+  ~ You may obtain a copy of Mulan PSL v2 at:
+  ~          https://license.coscl.org.cn/MulanPSL2
+  ~ THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+  ~ EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+  ~ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+  ~ See the Mulan PSL v2 for more details.
+  -->
+
 <configuration scan="false">
 	<property name="format" value="%d{HH:mm:ss.SSS} [%thread] %-5level %c:%L- %msg%n" />

@@ -9,9 +21,9 @@
 			<pattern>${format}</pattern>
 		</encoder>
 	</appender>
-	
+
 	<root level="debug">
 		<appender-ref ref="STDOUT" />
 	</root>

-</configuration>
+</configuration>
--- a/hutool-log/src/test/resources/logging.properties
+++ b/hutool-log/src/test/resources/logging.properties
@@ -1,3 +1,15 @@
+#
+# Copyright (c) 2023 looly(loolly@aliyun.com)
+# Hutool is licensed under Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#          https://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+# See the Mulan PSL v2 for more details.
+#
+
 #-----------------------------------------------------------------------------------------------------------
 # == JDK Logging \u914d\u7f6e\u6587\u4ef6 ==
 #Level\u7684\u4e94\u4e2a\u7b49\u7ea7
@@ -8,7 +20,7 @@
 # FINE
 # FINER
 # FINEST
-# 
+#
 #-----------------------------------------------------------------------------------------------------------

 # \u65e5\u5fd7\u683c\u5f0f
@@ -36,4 +48,4 @@ java.util.logging.FileHandler.append=true

 # \u6267\u884c\u7684LogHandler\uff0c\u4f7f\u7528\u9017\u53f7\u9694\u5f00
 #handlers= java.util.logging.ConsoleHandler,java.util.logging.FileHandler
-handlers= java.util.logging.ConsoleHandler
+handlers= java.util.logging.ConsoleHandler
--- a/hutool-log/src/test/resources/tinylog.properties
+++ b/hutool-log/src/test/resources/tinylog.properties
@@ -1,3 +1,15 @@
+#
+# Copyright (c) 2023 looly(loolly@aliyun.com)
+# Hutool is licensed under Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#          https://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+# See the Mulan PSL v2 for more details.
+#
+
 #-----------------------------------------------------------------------------------------------------------
 # == TinyLog \u914d\u7f6e\u6587\u4ef6 ==
 # \u914d\u7f6e\u89c1\uff1ahttp://www.tinylog.org/configuration#file
@@ -10,4 +22,4 @@ writer = console
 tinylog.level = debug
 # \u65e5\u5fd7\u6253\u5370\u683c\u5f0f
 tinylog.format = [{date:HH:mm:ss}][{level}] {class}:{line} - {message}
-writer.format = [{date:HH:mm:ss}][{level}] {class}:{line} - {message}
+writer.format = [{date:HH:mm:ss}][{level}] {class}:{line} - {message}