) bean.getClass();
- return JSONUtil.toBean(sensitiveFilter(jsonText, isGreedMatch, sensitiveProcessor), c);
- }
-
/**
* 处理过滤文本中的敏感词，默认替换成*
*
diff --git a/hutool-dfa/src/main/java/cn/hutool/dfa/StopChar.java b/hutool-core/src/main/java/cn/hutool/core/text/dfa/StopChar.java
similarity index 98%
rename from hutool-dfa/src/main/java/cn/hutool/dfa/StopChar.java
rename to hutool-core/src/main/java/cn/hutool/core/text/dfa/StopChar.java
index 9aaa7b6a9..9aadb7659 100644
--- a/hutool-dfa/src/main/java/cn/hutool/dfa/StopChar.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/dfa/StopChar.java
@@ -1,4 +1,4 @@
-package cn.hutool.dfa;
+package cn.hutool.core.text.dfa;
import java.util.Set;
@@ -6,7 +6,7 @@ import cn.hutool.core.collection.CollUtil;
/**
* 过滤词及一些简单处理
- *
+ *
* @author Looly
*/
public class StopChar {
@@ -31,7 +31,7 @@ public class StopChar {
/**
* 判断指定的词是否是不处理的词。 如果参数为空，则返回true，因为空也属于不处理的字符。
- *
+ *
* @param ch 指定的词
* @return 是否是不处理的词
*/
@@ -41,7 +41,7 @@ public class StopChar {
/**
* 是否为合法字符（待处理字符）
- *
+ *
* @param ch 指定的词
* @return 是否为合法字符（待处理字符）
*/
diff --git a/hutool-dfa/src/main/java/cn/hutool/dfa/WordTree.java b/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java
similarity index 99%
rename from hutool-dfa/src/main/java/cn/hutool/dfa/WordTree.java
rename to hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java
index b52133be7..4e71a8d57 100644
--- a/hutool-dfa/src/main/java/cn/hutool/dfa/WordTree.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java
@@ -1,4 +1,4 @@
-package cn.hutool.dfa;
+package cn.hutool.core.text.dfa;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Filter;
diff --git a/hutool-dfa/src/main/java/cn/hutool/dfa/package-info.java b/hutool-core/src/main/java/cn/hutool/core/text/dfa/package-info.java
similarity index 91%
rename from hutool-dfa/src/main/java/cn/hutool/dfa/package-info.java
rename to hutool-core/src/main/java/cn/hutool/core/text/dfa/package-info.java
index 24f68dbd5..749e71c98 100644
--- a/hutool-dfa/src/main/java/cn/hutool/dfa/package-info.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/dfa/package-info.java
@@ -2,8 +2,8 @@
* DFA全称为：Deterministic Finite Automaton,即确定有穷自动机。
* 解释起来原理其实也不难，就是用所有关键字构造一棵树，然后用正文遍历这棵树，遍历到叶子节点即表示文章中存在这个关键字。
* 我们暂且忽略构建关键词树的时间，每次查找正文只需要O(n)复杂度就可以搞定。
- *
+ *
* @author looly
*
*/
-package cn.hutool.dfa;
\ No newline at end of file
+package cn.hutool.core.text.dfa;
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/EscapeUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java
similarity index 95%
rename from hutool-core/src/main/java/cn/hutool/core/util/EscapeUtil.java
rename to hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java
index f2b3dee92..4e19c3b4d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/EscapeUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java
@@ -1,16 +1,12 @@
-package cn.hutool.core.util;
+package cn.hutool.core.text.escape;
import cn.hutool.core.lang.Filter;
-import cn.hutool.core.text.escape.Html4Escape;
-import cn.hutool.core.text.escape.Html4Unescape;
-import cn.hutool.core.text.escape.XmlEscape;
-import cn.hutool.core.text.escape.XmlUnescape;
+import cn.hutool.core.util.StrUtil;
/**
* 转义和反转义工具类Escape / Unescape
* escape采用ISO Latin字符集对指定的字符串进行编码。
* 所有的空格符、标点符号、特殊字符以及其他非ASCII字符都将被转化成%xx格式的字符编码(xx等于该字符在字符集表里面的编码的16进制数字)。
- * TODO 6.x迁移到core.text.escape包下
*
* @author xiaoleilu
*/
diff --git a/hutool-script/src/main/java/cn/hutool/script/ScriptUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ScriptUtil.java
old mode 100755
new mode 100644
similarity index 83%
rename from hutool-script/src/main/java/cn/hutool/script/ScriptUtil.java
rename to hutool-core/src/main/java/cn/hutool/core/util/ScriptUtil.java
index de674545c..982b2be12
--- a/hutool-script/src/main/java/cn/hutool/script/ScriptUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ScriptUtil.java
@@ -1,7 +1,7 @@
-package cn.hutool.script;
+package cn.hutool.core.util;
+import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.map.WeakConcurrentMap;
-import cn.hutool.core.util.StrUtil;
import javax.script.Bindings;
import javax.script.Compilable;
@@ -53,15 +53,6 @@ public class ScriptUtil {
return engine;
}
- /**
- * 获得非单例的 Javascript引擎 {@link JavaScriptEngine}
- *
- * @return {@link JavaScriptEngine}
- */
- public static JavaScriptEngine getJavaScriptEngine() {
- return new JavaScriptEngine();
- }
-
/**
* 获得单例的JavaScript引擎
*
@@ -160,23 +151,23 @@ public class ScriptUtil {
*
* @param script 脚本内容
* @return 执行结果
- * @throws ScriptRuntimeException 脚本异常
+ * @throws UtilException 脚本异常
* @since 5.3.6
*/
- public static Invocable evalInvocable(String script) throws ScriptRuntimeException {
+ public static Invocable evalInvocable(String script) throws UtilException {
final ScriptEngine jsEngine = getJsEngine();
final Object eval;
try {
eval = jsEngine.eval(script);
} catch (ScriptException e) {
- throw new ScriptRuntimeException(e);
+ throw new UtilException(e);
}
if(eval instanceof Invocable){
return (Invocable)eval;
} else if(jsEngine instanceof Invocable){
return (Invocable)jsEngine;
}
- throw new ScriptRuntimeException("Script is not invocable !");
+ throw new UtilException("Script is not invocable !");
}
/**
@@ -184,14 +175,14 @@ public class ScriptUtil {
*
* @param script 脚本内容
* @return 执行结果
- * @throws ScriptRuntimeException 脚本异常
+ * @throws UtilException 脚本异常
* @since 3.2.0
*/
- public static Object eval(String script) throws ScriptRuntimeException {
+ public static Object eval(String script) throws UtilException {
try {
return getJsEngine().eval(script);
} catch (ScriptException e) {
- throw new ScriptRuntimeException(e);
+ throw new UtilException(e);
}
}
@@ -201,14 +192,14 @@ public class ScriptUtil {
* @param script 脚本内容
* @param context 脚本上下文
* @return 执行结果
- * @throws ScriptRuntimeException 脚本异常
+ * @throws UtilException 脚本异常
* @since 3.2.0
*/
- public static Object eval(String script, ScriptContext context) throws ScriptRuntimeException {
+ public static Object eval(String script, ScriptContext context) throws UtilException {
try {
return getJsEngine().eval(script, context);
} catch (ScriptException e) {
- throw new ScriptRuntimeException(e);
+ throw new UtilException(e);
}
}
@@ -218,14 +209,14 @@ public class ScriptUtil {
* @param script 脚本内容
* @param bindings 绑定的参数
* @return 执行结果
- * @throws ScriptRuntimeException 脚本异常
+ * @throws UtilException 脚本异常
* @since 3.2.0
*/
- public static Object eval(String script, Bindings bindings) throws ScriptRuntimeException {
+ public static Object eval(String script, Bindings bindings) throws UtilException {
try {
return getJsEngine().eval(script, bindings);
} catch (ScriptException e) {
- throw new ScriptRuntimeException(e);
+ throw new UtilException(e);
}
}
@@ -243,7 +234,7 @@ public class ScriptUtil {
try {
return eval.invokeFunction(func, args);
} catch (ScriptException | NoSuchMethodException e) {
- throw new ScriptRuntimeException(e);
+ throw new UtilException(e);
}
}
@@ -252,14 +243,14 @@ public class ScriptUtil {
*
* @param script 脚本内容
* @return {@link CompiledScript}
- * @throws ScriptRuntimeException 脚本异常
+ * @throws UtilException 脚本异常
* @since 3.2.0
*/
- public static CompiledScript compile(String script) throws ScriptRuntimeException {
+ public static CompiledScript compile(String script) throws UtilException {
try {
return compile(getJsEngine(), script);
} catch (ScriptException e) {
- throw new ScriptRuntimeException(e);
+ throw new UtilException(e);
}
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
index a6ccc3e06..d0dbe0221 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
@@ -9,6 +9,7 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.map.BiMap;
import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.text.escape.EscapeUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
diff --git a/hutool-cache/src/test/java/cn/hutool/cache/CacheConcurrentTest.java b/hutool-core/src/test/java/cn/hutool/core/cache/CacheConcurrentTest.java
similarity index 94%
rename from hutool-cache/src/test/java/cn/hutool/cache/CacheConcurrentTest.java
rename to hutool-core/src/test/java/cn/hutool/core/cache/CacheConcurrentTest.java
index 22445b28b..37dc0ec27 100644
--- a/hutool-cache/src/test/java/cn/hutool/cache/CacheConcurrentTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/cache/CacheConcurrentTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.cache;
+package cn.hutool.core.cache;
-import cn.hutool.cache.impl.FIFOCache;
-import cn.hutool.cache.impl.LRUCache;
-import cn.hutool.cache.impl.WeakCache;
+import cn.hutool.core.cache.impl.FIFOCache;
+import cn.hutool.core.cache.impl.LRUCache;
+import cn.hutool.core.cache.impl.WeakCache;
import cn.hutool.core.lang.Console;
import cn.hutool.core.thread.ConcurrencyTester;
import cn.hutool.core.thread.ThreadUtil;
diff --git a/hutool-cache/src/test/java/cn/hutool/cache/CacheTest.java b/hutool-core/src/test/java/cn/hutool/core/cache/CacheTest.java
similarity index 98%
rename from hutool-cache/src/test/java/cn/hutool/cache/CacheTest.java
rename to hutool-core/src/test/java/cn/hutool/core/cache/CacheTest.java
index 1509cd56d..b3624f2ef 100644
--- a/hutool-cache/src/test/java/cn/hutool/cache/CacheTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/cache/CacheTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.cache;
+package cn.hutool.core.cache;
-import cn.hutool.cache.impl.TimedCache;
+import cn.hutool.core.cache.impl.TimedCache;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.RandomUtil;
diff --git a/hutool-cache/src/test/java/cn/hutool/cache/FileCacheTest.java b/hutool-core/src/test/java/cn/hutool/core/cache/FileCacheTest.java
similarity index 77%
rename from hutool-cache/src/test/java/cn/hutool/cache/FileCacheTest.java
rename to hutool-core/src/test/java/cn/hutool/core/cache/FileCacheTest.java
index eaadb83db..d21c914d0 100644
--- a/hutool-cache/src/test/java/cn/hutool/cache/FileCacheTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/cache/FileCacheTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.cache;
+package cn.hutool.core.cache;
import org.junit.Assert;
import org.junit.Test;
-import cn.hutool.cache.file.LFUFileCache;
+import cn.hutool.core.cache.file.LFUFileCache;
/**
* 文件缓存单元测试
diff --git a/hutool-cache/src/test/java/cn/hutool/cache/LRUCacheTest.java b/hutool-core/src/test/java/cn/hutool/core/cache/LRUCacheTest.java
similarity index 90%
rename from hutool-cache/src/test/java/cn/hutool/cache/LRUCacheTest.java
rename to hutool-core/src/test/java/cn/hutool/core/cache/LRUCacheTest.java
index fdc6ea4be..8f5b20ca3 100644
--- a/hutool-cache/src/test/java/cn/hutool/cache/LRUCacheTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/cache/LRUCacheTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.cache;
+package cn.hutool.core.cache;
-import cn.hutool.cache.impl.LRUCache;
+import cn.hutool.core.cache.impl.LRUCache;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.RandomUtil;
import org.junit.Assert;
@@ -10,7 +10,7 @@ import org.junit.Test;
import java.util.concurrent.CountDownLatch;
/**
- * 见：https://github.com/dromara/hutool/issues/1895
+ * 见：https://github.com/dromara/hutool/issues/1895
* 并发问题测试，在5.7.15前，LRUCache存在并发问题，多线程get后，map结构变更，导致null的位置不确定，
* 并可能引起死锁。
*/
diff --git a/hutool-cache/src/test/java/cn/hutool/cache/WeakCacheTest.java b/hutool-core/src/test/java/cn/hutool/core/cache/WeakCacheTest.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-cache/src/test/java/cn/hutool/cache/WeakCacheTest.java
rename to hutool-core/src/test/java/cn/hutool/core/cache/WeakCacheTest.java
index f61ed77b7..ff3b8f65d
--- a/hutool-cache/src/test/java/cn/hutool/cache/WeakCacheTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/cache/WeakCacheTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.cache;
+package cn.hutool.core.cache;
-import cn.hutool.cache.impl.WeakCache;
+import cn.hutool.core.cache.impl.WeakCache;
import cn.hutool.core.lang.Console;
import org.junit.Assert;
import org.junit.Ignore;
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java
index 18cd78b14..aa4ad0eab 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java
@@ -6,7 +6,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.TypeReference;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ByteUtil;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Getter;
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java b/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java
index ccdcc6aba..cf5deeced 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java
@@ -1,7 +1,7 @@
package cn.hutool.core.io.checksum;
import cn.hutool.core.io.checksum.crc16.CRC16XModem;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.StrUtil;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java
index 5577a1bb5..1d75bbe2c 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java
@@ -2,7 +2,7 @@ package cn.hutool.core.lang.hash;
import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import org.junit.Assert;
diff --git a/hutool-bloomFilter/src/test/java/cn/hutool/bloomfilter/BitMapBloomFilterTest.java b/hutool-core/src/test/java/cn/hutool/core/text/bloomfilter/BitMapBloomFilterTest.java
similarity index 76%
rename from hutool-bloomFilter/src/test/java/cn/hutool/bloomfilter/BitMapBloomFilterTest.java
rename to hutool-core/src/test/java/cn/hutool/core/text/bloomfilter/BitMapBloomFilterTest.java
index ad104d632..2a984cdaa 100644
--- a/hutool-bloomFilter/src/test/java/cn/hutool/bloomfilter/BitMapBloomFilterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/bloomfilter/BitMapBloomFilterTest.java
@@ -1,12 +1,11 @@
-package cn.hutool.bloomfilter;
+package cn.hutool.core.text.bloomfilter;
+import cn.hutool.core.map.bitMap.IntMap;
+import cn.hutool.core.map.bitMap.LongMap;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
-import cn.hutool.bloomfilter.bitMap.IntMap;
-import cn.hutool.bloomfilter.bitMap.LongMap;
-
public class BitMapBloomFilterTest {
@Test
@@ -23,10 +22,10 @@ public class BitMapBloomFilterTest {
@Test
@Ignore
- public void testIntMap(){
+ public void testIntMap() {
IntMap intMap = new IntMap();
- for (int i = 0 ; i < 32; i++) {
+ for (int i = 0; i < 32; i++) {
intMap.add(i);
}
intMap.remove(30);
@@ -39,10 +38,10 @@ public class BitMapBloomFilterTest {
@Test
@Ignore
- public void testLongMap(){
+ public void testLongMap() {
LongMap longMap = new LongMap();
- for (int i = 0 ; i < 64; i++) {
+ for (int i = 0; i < 64; i++) {
longMap.add(i);
}
longMap.remove(30);
diff --git a/hutool-dfa/src/test/java/cn/hutool/dfa/DfaTest.java b/hutool-core/src/test/java/cn/hutool/core/text/dfa/DfaTest.java
similarity index 99%
rename from hutool-dfa/src/test/java/cn/hutool/dfa/DfaTest.java
rename to hutool-core/src/test/java/cn/hutool/core/text/dfa/DfaTest.java
index f185fac31..a21b1dd17 100644
--- a/hutool-dfa/src/test/java/cn/hutool/dfa/DfaTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/dfa/DfaTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.dfa;
+package cn.hutool.core.text.dfa;
import cn.hutool.core.collection.CollUtil;
import org.junit.Assert;
diff --git a/hutool-dfa/src/test/java/cn/hutool/dfa/SensitiveUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/text/dfa/SensitiveUtilTest.java
similarity index 83%
rename from hutool-dfa/src/test/java/cn/hutool/dfa/SensitiveUtilTest.java
rename to hutool-core/src/test/java/cn/hutool/core/text/dfa/SensitiveUtilTest.java
index 5bbbe9f23..f1b76b8d2 100644
--- a/hutool-dfa/src/test/java/cn/hutool/dfa/SensitiveUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/dfa/SensitiveUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.dfa;
+package cn.hutool.core.text.dfa;
import cn.hutool.core.collection.ListUtil;
import lombok.Data;
@@ -22,8 +22,8 @@ public class SensitiveUtilTest {
bean.setStr("我有一颗$大土^豆，刚出锅的");
bean.setNum(100);
SensitiveUtil.init(wordList);
- bean = SensitiveUtil.sensitiveFilter(bean, true, null);
- Assert.assertEquals(bean.getStr(), "我有一颗$****，***的");
+ String beanStr = SensitiveUtil.sensitiveFilter(bean.getStr(), true, null);
+ Assert.assertEquals("我有一颗$****，***的", beanStr);
}
@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/EscapeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/EscapeUtilTest.java
index 23e1c7fc4..ec9276acc 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/EscapeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/EscapeUtilTest.java
@@ -1,5 +1,6 @@
package cn.hutool.core.util;
+import cn.hutool.core.text.escape.EscapeUtil;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java
index 0eed42588..1d30f6a7f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java
@@ -1,5 +1,6 @@
package cn.hutool.core.util;
+import cn.hutool.core.codec.HexUtil;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-script/src/test/java/cn/hutool/script/test/ScriptUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ScriptUtilTest.java
similarity index 50%
rename from hutool-script/src/test/java/cn/hutool/script/test/ScriptUtilTest.java
rename to hutool-core/src/test/java/cn/hutool/core/util/ScriptUtilTest.java
index 9da861c4e..090a05a98 100644
--- a/hutool-script/src/test/java/cn/hutool/script/test/ScriptUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ScriptUtilTest.java
@@ -1,18 +1,16 @@
-package cn.hutool.script.test;
+package cn.hutool.core.util;
+import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.script.ScriptRuntimeException;
-import cn.hutool.script.ScriptUtil;
import org.junit.Assert;
import org.junit.Test;
import javax.script.CompiledScript;
-import javax.script.ScriptEngine;
import javax.script.ScriptException;
/**
* 脚本单元测试类
- *
+ *
* @author looly
*
*/
@@ -24,7 +22,7 @@ public class ScriptUtilTest {
try {
script.eval();
} catch (ScriptException e) {
- throw new ScriptRuntimeException(e);
+ throw new UtilException(e);
}
}
@@ -38,22 +36,4 @@ public class ScriptUtilTest {
final Object result = ScriptUtil.invoke(ResourceUtil.readUtf8Str("filter1.js"), "filter1", 2, 1);
Assert.assertTrue((Boolean) result);
}
-
- @Test
- public void pythonTest() throws ScriptException {
- final ScriptEngine pythonEngine = ScriptUtil.getPythonEngine();
- pythonEngine.eval("print('Hello Python')");
- }
-
- @Test
- public void luaTest() throws ScriptException {
- final ScriptEngine engine = ScriptUtil.getLuaEngine();
- engine.eval("print('Hello Lua')");
- }
-
- @Test
- public void groovyTest() throws ScriptException {
- final ScriptEngine engine = ScriptUtil.getGroovyEngine();
- engine.eval("println 'Hello Groovy'");
- }
}
diff --git a/hutool-script/src/test/resources/filter1.js b/hutool-core/src/test/resources/filter1.js
similarity index 100%
rename from hutool-script/src/test/resources/filter1.js
rename to hutool-core/src/test/resources/filter1.js
diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml
index 946cda803..56c3c955b 100755
--- a/hutool-cron/pom.xml
+++ b/hutool-cron/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.8.0.M5
+ 6.0.0.M1
hutool-cron
diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml
index 85466e6af..5515f8f5b 100755
--- a/hutool-crypto/pom.xml
+++ b/hutool-crypto/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.8.0.M5
+ 6.0.0.M1
hutool-crypto
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
index 575cbb377..ca507f8bb 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
@@ -3,7 +3,7 @@ package cn.hutool.crypto;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.asymmetric.AsymmetricAlgorithm;
import cn.hutool.crypto.asymmetric.RSA;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java
index 4e091e8b4..984886b68 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java
@@ -5,7 +5,7 @@ import cn.hutool.core.codec.Base64;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.StrUtil;
import java.io.InputStream;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SM2.java b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SM2.java
index d84f99d5a..7820f60d6 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SM2.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SM2.java
@@ -1,7 +1,7 @@
package cn.hutool.crypto.asymmetric;
import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.crypto.BCUtil;
import cn.hutool.crypto.CryptoException;
import cn.hutool.crypto.ECKeyUtil;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java
index c1eb53255..0e261320f 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java
@@ -4,7 +4,7 @@ import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.CryptoException;
import cn.hutool.crypto.SecureUtil;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java
index 8bad73888..1923ab2a6 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java
@@ -5,7 +5,7 @@ import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.CryptoException;
import cn.hutool.crypto.SecureUtil;
@@ -22,7 +22,7 @@ import java.security.Provider;
/**
* 摘要算法
* 注意：此对象实例化后为非线程安全！
- *
+ *
* @author Looly
*
*/
@@ -40,7 +40,7 @@ public class Digester implements Serializable {
// ------------------------------------------------------------------------------------------- Constructor start
/**
* 构造
- *
+ *
* @param algorithm 算法枚举
*/
public Digester(DigestAlgorithm algorithm) {
@@ -49,7 +49,7 @@ public class Digester implements Serializable {
/**
* 构造
- *
+ *
* @param algorithm 算法枚举
*/
public Digester(String algorithm) {
@@ -58,7 +58,7 @@ public class Digester implements Serializable {
/**
* 构造
- *
+ *
* @param algorithm 算法
* @param provider 算法提供者，null表示JDK默认，可以引入Bouncy Castle等来提供更多算法支持
* @since 4.5.1
@@ -69,7 +69,7 @@ public class Digester implements Serializable {
/**
* 构造
- *
+ *
* @param algorithm 算法
* @param provider 算法提供者，null表示JDK默认，可以引入Bouncy Castle等来提供更多算法支持
* @since 4.5.1
@@ -81,7 +81,7 @@ public class Digester implements Serializable {
/**
* 初始化
- *
+ *
* @param algorithm 算法
* @param provider 算法提供者，null表示JDK默认，可以引入Bouncy Castle等来提供更多算法支持
* @return Digester
@@ -99,10 +99,10 @@ public class Digester implements Serializable {
}
return this;
}
-
+
/**
* 设置加盐内容
- *
+ *
* @param salt 盐值
* @return this
* @since 4.4.3
@@ -115,18 +115,18 @@ public class Digester implements Serializable {
/**
* 设置加盐的位置，只有盐值存在时有效
* 加盐的位置指盐位于数据byte数组中的位置，例如：
- *
+ *
*
* data: 0123456
*
- *
+ *
* 则当saltPosition = 2时，盐位于data的1和2中间，即第二个空隙，即：
- *
+ *
*
* data: 01[salt]23456
*
- *
- *
+ *
+ *
* @param saltPosition 盐的位置
* @return this
* @since 4.4.3
@@ -138,7 +138,7 @@ public class Digester implements Serializable {
/**
* 设置重复计算摘要值次数
- *
+ *
* @param digestCount 摘要值次数
* @return this
*/
@@ -149,7 +149,7 @@ public class Digester implements Serializable {
/**
* 重置{@link MessageDigest}
- *
+ *
* @return this
* @since 4.5.1
*/
@@ -161,7 +161,7 @@ public class Digester implements Serializable {
// ------------------------------------------------------------------------------------------- Digest
/**
* 生成文件摘要
- *
+ *
* @param data 被摘要数据
* @param charsetName 编码
* @return 摘要
@@ -169,10 +169,10 @@ public class Digester implements Serializable {
public byte[] digest(String data, String charsetName) {
return digest(data, CharsetUtil.charset(charsetName));
}
-
+
/**
* 生成文件摘要
- *
+ *
* @param data 被摘要数据
* @param charset 编码
* @return 摘要
@@ -184,7 +184,7 @@ public class Digester implements Serializable {
/**
* 生成文件摘要
- *
+ *
* @param data 被摘要数据
* @return 摘要
*/
@@ -194,7 +194,7 @@ public class Digester implements Serializable {
/**
* 生成文件摘要，并转为16进制字符串
- *
+ *
* @param data 被摘要数据
* @param charsetName 编码
* @return 摘要
@@ -202,10 +202,10 @@ public class Digester implements Serializable {
public String digestHex(String data, String charsetName) {
return digestHex(data, CharsetUtil.charset(charsetName));
}
-
+
/**
* 生成文件摘要，并转为16进制字符串
- *
+ *
* @param data 被摘要数据
* @param charset 编码
* @return 摘要
@@ -217,7 +217,7 @@ public class Digester implements Serializable {
/**
* 生成文件摘要
- *
+ *
* @param data 被摘要数据
* @return 摘要
*/
@@ -228,7 +228,7 @@ public class Digester implements Serializable {
/**
* 生成文件摘要
* 使用默认缓存大小，见 {@link IoUtil#DEFAULT_BUFFER_SIZE}
- *
+ *
* @param file 被摘要文件
* @return 摘要bytes
* @throws CryptoException Cause by IOException
@@ -246,7 +246,7 @@ public class Digester implements Serializable {
/**
* 生成文件摘要，并转为16进制字符串
* 使用默认缓存大小，见 {@link IoUtil#DEFAULT_BUFFER_SIZE}
- *
+ *
* @param file 被摘要文件
* @return 摘要
*/
@@ -256,7 +256,7 @@ public class Digester implements Serializable {
/**
* 生成摘要，考虑加盐和重复摘要次数
- *
+ *
* @param data 数据bytes
* @return 摘要bytes
*/
@@ -284,7 +284,7 @@ public class Digester implements Serializable {
/**
* 生成摘要，并转为16进制字符串
- *
+ *
* @param data 被摘要数据
* @return 摘要
*/
@@ -294,7 +294,7 @@ public class Digester implements Serializable {
/**
* 生成摘要，使用默认缓存大小，见 {@link IoUtil#DEFAULT_BUFFER_SIZE}
- *
+ *
* @param data {@link InputStream} 数据流
* @return 摘要bytes
*/
@@ -305,7 +305,7 @@ public class Digester implements Serializable {
/**
* 生成摘要，并转为16进制字符串
* 使用默认缓存大小，见 {@link IoUtil#DEFAULT_BUFFER_SIZE}
- *
+ *
* @param data 被摘要数据
* @return 摘要
*/
@@ -315,7 +315,7 @@ public class Digester implements Serializable {
/**
* 生成摘要
- *
+ *
* @param data {@link InputStream} 数据流
* @param bufferLength 缓存长度，不足1使用 {@link IoUtil#DEFAULT_BUFFER_SIZE} 做为默认值
* @return 摘要bytes
@@ -325,7 +325,7 @@ public class Digester implements Serializable {
if (bufferLength < 1) {
bufferLength = IoUtil.DEFAULT_BUFFER_SIZE;
}
-
+
byte[] result;
try {
if (ArrayUtil.isEmpty(this.salt)) {
@@ -336,14 +336,14 @@ public class Digester implements Serializable {
} catch (IOException e) {
throw new IORuntimeException(e);
}
-
+
return resetAndRepeatDigest(result);
}
/**
* 生成摘要，并转为16进制字符串
* 使用默认缓存大小，见 {@link IoUtil#DEFAULT_BUFFER_SIZE}
- *
+ *
* @param data 被摘要数据
* @param bufferLength 缓存长度，不足1使用 {@link IoUtil#DEFAULT_BUFFER_SIZE} 做为默认值
* @return 摘要
@@ -354,7 +354,7 @@ public class Digester implements Serializable {
/**
* 获得 {@link MessageDigest}
- *
+ *
* @return {@link MessageDigest}
*/
public MessageDigest getDigest() {
@@ -363,7 +363,7 @@ public class Digester implements Serializable {
/**
* 获取散列长度，0表示不支持此方法
- *
+ *
* @return 散列长度，0表示不支持此方法
* @since 4.5.0
*/
@@ -374,7 +374,7 @@ public class Digester implements Serializable {
// -------------------------------------------------------------------------------- Private method start
/**
* 生成摘要
- *
+ *
* @param data {@link InputStream} 数据流
* @param bufferLength 缓存长度，不足1使用 {@link IoUtil#DEFAULT_BUFFER_SIZE} 做为默认值
* @return 摘要bytes
@@ -391,7 +391,7 @@ public class Digester implements Serializable {
/**
* 生成摘要
- *
+ *
* @param data {@link InputStream} 数据流
* @param bufferLength 缓存长度，不足1使用 {@link IoUtil#DEFAULT_BUFFER_SIZE} 做为默认值
* @return 摘要bytes
@@ -430,7 +430,7 @@ public class Digester implements Serializable {
/**
* 生成摘要
- *
+ *
* @param datas 数据bytes
* @return 摘要bytes
* @since 4.4.3
@@ -447,7 +447,7 @@ public class Digester implements Serializable {
/**
* 重复计算摘要，取决于{@link #digestCount} 值
* 每次计算摘要前都会重置{@link #digest}
- *
+ *
* @param digestData 第一次摘要过的数据
* @return 摘要
*/
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java
index 5ebe191ab..3a144398b 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java
@@ -4,7 +4,7 @@ import cn.hutool.core.codec.Base64;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.CryptoException;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/PBKDF2.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/PBKDF2.java
index 059660afe..c2e4a1b54 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/PBKDF2.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/PBKDF2.java
@@ -1,6 +1,6 @@
package cn.hutool.crypto.symmetric;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.crypto.KeyUtil;
import javax.crypto.SecretKey;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java
index 0b736d4fc..4f304ee94 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java
@@ -2,7 +2,7 @@ package cn.hutool.crypto.symmetric;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.CryptoException;
import cn.hutool.crypto.SecureUtil;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
index ea4a7756d..1fbf9217b 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
@@ -5,7 +5,7 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.Opt;
import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.CipherMode;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java
index 3d227718a..99f127775 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java
@@ -4,7 +4,7 @@ import cn.hutool.core.codec.Base64;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.StrUtil;
import java.io.InputStream;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java
index a8351c341..693632ae9 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java
@@ -1,10 +1,9 @@
package cn.hutool.crypto.test.asymmetric;
import cn.hutool.core.codec.Base64;
-import cn.hutool.core.lang.Console;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.KeyUtil;
@@ -12,8 +11,6 @@ import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.asymmetric.AsymmetricAlgorithm;
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
-import cn.hutool.crypto.asymmetric.Sign;
-import cn.hutool.crypto.asymmetric.SignAlgorithm;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java
index 3e852793d..dec459218 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java
@@ -2,7 +2,7 @@ package cn.hutool.crypto.test.asymmetric;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.ECKeyUtil;
import cn.hutool.crypto.KeyUtil;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java
index b860854f2..11477364d 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java
@@ -1,7 +1,7 @@
package cn.hutool.crypto.test.symmetric;
import cn.hutool.core.codec.Base64;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.crypto.KeyUtil;
import cn.hutool.crypto.Mode;
diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
index 19a80bed4..81665ee0b 100755
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.8.0.M5
+ 6.0.0.M1
hutool-db
diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml
deleted file mode 100755
index 05e50a60e..000000000
--- a/hutool-dfa/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
- 4.0.0
-
- jar
-
-
- cn.hutool
- hutool-parent
- 5.8.0.M5
-
-
- hutool-dfa
- ${project.artifactId}
- Hutool 基于DFA的关键词查找
-
-
-
- cn.hutool
- hutool-json
- ${project.parent.version}
-
-
-
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index 4b13a50db..93482b39a 100755
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.8.0.M5
+ 6.0.0.M1
hutool-extra
@@ -41,6 +41,11 @@
hutool-core
${project.parent.version}
+
+ cn.hutool
+ hutool-swing
+ ${project.parent.version}
+
cn.hutool
hutool-setting
@@ -472,5 +477,12 @@
compile
true
+
+
+ com.github.oshi
+ oshi-core
+ 6.1.6
+ provided
+
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/ProxyUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/ProxyUtil.java
similarity index 95%
rename from hutool-aop/src/main/java/cn/hutool/aop/ProxyUtil.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/ProxyUtil.java
index 92bd4760d..6afe9094b 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/ProxyUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/ProxyUtil.java
@@ -1,12 +1,12 @@
-package cn.hutool.aop;
+package cn.hutool.extra.aop;
+
+import cn.hutool.extra.aop.aspects.Aspect;
+import cn.hutool.extra.aop.proxy.ProxyFactory;
+import cn.hutool.core.util.ClassUtil;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
-import cn.hutool.aop.aspects.Aspect;
-import cn.hutool.aop.proxy.ProxyFactory;
-import cn.hutool.core.util.ClassUtil;
-
/**
* 代理工具类
* @author Looly
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/aspects/Aspect.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/Aspect.java
similarity index 97%
rename from hutool-aop/src/main/java/cn/hutool/aop/aspects/Aspect.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/Aspect.java
index 9463fc764..9d4cd7d64 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/aspects/Aspect.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/Aspect.java
@@ -1,4 +1,4 @@
-package cn.hutool.aop.aspects;
+package cn.hutool.extra.aop.aspects;
import java.lang.reflect.Method;
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/aspects/SimpleAspect.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/SimpleAspect.java
similarity index 95%
rename from hutool-aop/src/main/java/cn/hutool/aop/aspects/SimpleAspect.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/SimpleAspect.java
index e1309050b..cd946c154 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/aspects/SimpleAspect.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/SimpleAspect.java
@@ -1,4 +1,4 @@
-package cn.hutool.aop.aspects;
+package cn.hutool.extra.aop.aspects;
import java.io.Serializable;
import java.lang.reflect.Method;
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/aspects/TimeIntervalAspect.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/TimeIntervalAspect.java
similarity index 95%
rename from hutool-aop/src/main/java/cn/hutool/aop/aspects/TimeIntervalAspect.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/TimeIntervalAspect.java
index 5a4fe69cf..af0375af8 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/aspects/TimeIntervalAspect.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/TimeIntervalAspect.java
@@ -1,4 +1,4 @@
-package cn.hutool.aop.aspects;
+package cn.hutool.extra.aop.aspects;
import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.lang.Console;
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/aspects/package-info.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/package-info.java
similarity index 69%
rename from hutool-aop/src/main/java/cn/hutool/aop/aspects/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/package-info.java
index fab914fbd..438fc0100 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/aspects/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/package-info.java
@@ -4,4 +4,4 @@
* @author looly
*
*/
-package cn.hutool.aop.aspects;
\ No newline at end of file
+package cn.hutool.extra.aop.aspects;
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/interceptor/CglibInterceptor.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/CglibInterceptor.java
similarity index 94%
rename from hutool-aop/src/main/java/cn/hutool/aop/interceptor/CglibInterceptor.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/CglibInterceptor.java
index f0f7f9e90..ac5a12d0c 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/interceptor/CglibInterceptor.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/CglibInterceptor.java
@@ -1,6 +1,6 @@
-package cn.hutool.aop.interceptor;
+package cn.hutool.extra.aop.interceptor;
-import cn.hutool.aop.aspects.Aspect;
+import cn.hutool.extra.aop.aspects.Aspect;
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/interceptor/JdkInterceptor.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/JdkInterceptor.java
similarity index 94%
rename from hutool-aop/src/main/java/cn/hutool/aop/interceptor/JdkInterceptor.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/JdkInterceptor.java
index 88b50e487..8700a9b97 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/interceptor/JdkInterceptor.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/JdkInterceptor.java
@@ -1,6 +1,6 @@
-package cn.hutool.aop.interceptor;
+package cn.hutool.extra.aop.interceptor;
-import cn.hutool.aop.aspects.Aspect;
+import cn.hutool.extra.aop.aspects.Aspect;
import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.util.ReflectUtil;
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/interceptor/SpringCglibInterceptor.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/SpringCglibInterceptor.java
similarity index 94%
rename from hutool-aop/src/main/java/cn/hutool/aop/interceptor/SpringCglibInterceptor.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/SpringCglibInterceptor.java
index 8db483469..eb3b36f96 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/interceptor/SpringCglibInterceptor.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/SpringCglibInterceptor.java
@@ -1,6 +1,6 @@
-package cn.hutool.aop.interceptor;
+package cn.hutool.extra.aop.interceptor;
-import cn.hutool.aop.aspects.Aspect;
+import cn.hutool.extra.aop.aspects.Aspect;
import org.springframework.cglib.proxy.MethodInterceptor;
import org.springframework.cglib.proxy.MethodProxy;
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/interceptor/package-info.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/package-info.java
similarity index 57%
rename from hutool-aop/src/main/java/cn/hutool/aop/interceptor/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/package-info.java
index 54c58158f..97351c4a6 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/interceptor/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/package-info.java
@@ -4,4 +4,4 @@
* @author looly
*
*/
-package cn.hutool.aop.interceptor;
\ No newline at end of file
+package cn.hutool.extra.aop.interceptor;
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/package-info.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/package-info.java
similarity index 75%
rename from hutool-aop/src/main/java/cn/hutool/aop/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/package-info.java
index 3b2d2a93a..0129ab989 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/package-info.java
@@ -4,4 +4,4 @@
* @author looly
*
*/
-package cn.hutool.aop;
\ No newline at end of file
+package cn.hutool.extra.aop;
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/proxy/CglibProxyFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/CglibProxyFactory.java
similarity index 69%
rename from hutool-aop/src/main/java/cn/hutool/aop/proxy/CglibProxyFactory.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/CglibProxyFactory.java
index d7510035c..95cff73f0 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/proxy/CglibProxyFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/CglibProxyFactory.java
@@ -1,16 +1,15 @@
-package cn.hutool.aop.proxy;
+package cn.hutool.extra.aop.proxy;
-import cn.hutool.aop.aspects.Aspect;
-import cn.hutool.aop.interceptor.CglibInterceptor;
+import cn.hutool.extra.aop.aspects.Aspect;
+import cn.hutool.extra.aop.interceptor.CglibInterceptor;
import net.sf.cglib.proxy.Enhancer;
/**
* 基于Cglib的切面代理工厂
*
* @author looly
- *
*/
-public class CglibProxyFactory extends ProxyFactory{
+public class CglibProxyFactory extends ProxyFactory {
private static final long serialVersionUID = 1L;
@Override
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/proxy/JdkProxyFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/JdkProxyFactory.java
similarity index 69%
rename from hutool-aop/src/main/java/cn/hutool/aop/proxy/JdkProxyFactory.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/JdkProxyFactory.java
index 91a5a7129..7cfb64886 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/proxy/JdkProxyFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/JdkProxyFactory.java
@@ -1,8 +1,8 @@
-package cn.hutool.aop.proxy;
+package cn.hutool.extra.aop.proxy;
-import cn.hutool.aop.ProxyUtil;
-import cn.hutool.aop.aspects.Aspect;
-import cn.hutool.aop.interceptor.JdkInterceptor;
+import cn.hutool.extra.aop.ProxyUtil;
+import cn.hutool.extra.aop.aspects.Aspect;
+import cn.hutool.extra.aop.interceptor.JdkInterceptor;
/**
* JDK实现的切面代理
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/proxy/ProxyFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java
similarity index 95%
rename from hutool-aop/src/main/java/cn/hutool/aop/proxy/ProxyFactory.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java
index 96d988971..39cd56303 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/proxy/ProxyFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java
@@ -1,6 +1,6 @@
-package cn.hutool.aop.proxy;
+package cn.hutool.extra.aop.proxy;
-import cn.hutool.aop.aspects.Aspect;
+import cn.hutool.extra.aop.aspects.Aspect;
import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.ServiceLoaderUtil;
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/proxy/SpringCglibProxyFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/SpringCglibProxyFactory.java
similarity index 78%
rename from hutool-aop/src/main/java/cn/hutool/aop/proxy/SpringCglibProxyFactory.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/SpringCglibProxyFactory.java
index caa43e596..dcaaa8ff0 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/proxy/SpringCglibProxyFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/SpringCglibProxyFactory.java
@@ -1,7 +1,7 @@
-package cn.hutool.aop.proxy;
+package cn.hutool.extra.aop.proxy;
-import cn.hutool.aop.aspects.Aspect;
-import cn.hutool.aop.interceptor.SpringCglibInterceptor;
+import cn.hutool.extra.aop.aspects.Aspect;
+import cn.hutool.extra.aop.interceptor.SpringCglibInterceptor;
import org.springframework.cglib.proxy.Enhancer;
/**
diff --git a/hutool-aop/src/main/java/cn/hutool/aop/proxy/package-info.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/package-info.java
similarity index 57%
rename from hutool-aop/src/main/java/cn/hutool/aop/proxy/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/package-info.java
index b75feeeab..fc12782c1 100644
--- a/hutool-aop/src/main/java/cn/hutool/aop/proxy/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/package-info.java
@@ -4,4 +4,4 @@
* @author looly
*
*/
-package cn.hutool.aop.proxy;
\ No newline at end of file
+package cn.hutool.extra.aop.proxy;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
index 36e048d2b..32593bafd 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
@@ -1,8 +1,8 @@
package cn.hutool.extra.qrcode;
import cn.hutool.core.codec.Base64;
-import cn.hutool.core.img.Img;
-import cn.hutool.core.img.ImgUtil;
+import cn.hutool.swing.img.Img;
+import cn.hutool.swing.img.ImgUtil;
import cn.hutool.core.util.CharsetUtil;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.Binarizer;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java
index 0c2789c87..76319984d 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java
@@ -1,6 +1,6 @@
package cn.hutool.extra.qrcode;
-import cn.hutool.core.img.ImgUtil;
+import cn.hutool.swing.img.ImgUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.CharsetUtil;
import com.google.zxing.BarcodeFormat;
diff --git a/hutool-system/src/main/java/cn/hutool/system/HostInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/HostInfo.java
similarity index 92%
rename from hutool-system/src/main/java/cn/hutool/system/HostInfo.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/HostInfo.java
index fa289d838..4b477acbf 100644
--- a/hutool-system/src/main/java/cn/hutool/system/HostInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/HostInfo.java
@@ -1,4 +1,4 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import cn.hutool.core.net.NetUtil;
@@ -29,7 +29,7 @@ public class HostInfo implements Serializable {
* 取得当前主机的名称。
*
*
- * 例如："webserver1"
+ * 例如：{@code "webserver1"}
*
*
* @return 主机名
@@ -42,7 +42,7 @@ public class HostInfo implements Serializable {
* 取得当前主机的地址。
*
*
- * 例如："192.168.0.1"
+ * 例如：{@code "192.168.0.1"}
*
*
* @return 主机地址
diff --git a/hutool-system/src/main/java/cn/hutool/system/JavaInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/JavaInfo.java
similarity index 59%
rename from hutool-system/src/main/java/cn/hutool/system/JavaInfo.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/JavaInfo.java
index 256cfdee2..2aa2f2c37 100644
--- a/hutool-system/src/main/java/cn/hutool/system/JavaInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/JavaInfo.java
@@ -1,4 +1,4 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ReUtil;
@@ -32,12 +32,12 @@ public class JavaInfo implements Serializable {
private final boolean IS_JAVA_12 = getJavaVersionMatches("12");
/**
- * 取得当前Java impl.的版本（取自系统属性：java.version）。
+ * 取得当前Java impl.的版本（取自系统属性：{@code java.version}）。
*
*
- * 例如Sun JDK 1.4.2："1.4.2"
+ * 例如Sun JDK 1.4.2：{@code "1.4.2"}
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
* @since Java 1.1
*/
public final String getVersion() {
@@ -45,35 +45,35 @@ public class JavaInfo implements Serializable {
}
/**
- * 取得当前Java impl.的版本（取自系统属性：java.version）。
+ * 取得当前Java impl.的版本（取自系统属性：{@code java.version}）。
*
*
* 例如：
*
*
- * - JDK 1.2：
1.2f。
- * - JDK 1.3.1：
1.31f
+ * - JDK 1.2：{@code 1.2f}。
+ * - JDK 1.3.1：{@code 1.31f}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回0。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code 0}。
*/
public final float getVersionFloat() {
return JAVA_VERSION_FLOAT;
}
/**
- * 取得当前Java impl.的版本（取自系统属性：java.version），java10及其之后的版本返回值为4位。
+ * 取得当前Java impl.的版本（取自系统属性：{@code java.version}），java10及其之后的版本返回值为4位。
*
*
* 例如：
*
*
- * - JDK 1.2：
120。
- * - JDK 1.3.1：
131
- * - JDK 11.0.2：
1102
+ * - JDK 1.2：{@code 120}。
+ * - JDK 1.3.1：{@code 131}
+ * - JDK 11.0.2：{@code 1102}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回0。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code 0}。
* @since Java 1.1
*/
public final int getVersionInt() {
@@ -81,9 +81,9 @@ public class JavaInfo implements Serializable {
}
/**
- * 取得当前Java impl.的版本的float值。
+ * 取得当前Java impl.的版本的{@code float}值。
*
- * @return Java版本的float值或0
+ * @return Java版本的float值或{@code 0}
*/
private float getJavaVersionAsFloat() {
if (JAVA_VERSION == null) {
@@ -98,9 +98,9 @@ public class JavaInfo implements Serializable {
}
/**
- * 取得当前Java impl.的版本的int值。
+ * 取得当前Java impl.的版本的{@code int}值。
*
- * @return Java版本的int值或0
+ * @return Java版本的int值或{@code 0}
*/
private int getJavaVersionAsInt() {
if (JAVA_VERSION == null) {
@@ -121,12 +121,12 @@ public class JavaInfo implements Serializable {
}
/**
- * 取得当前Java impl.的厂商（取自系统属性：java.vendor）。
+ * 取得当前Java impl.的厂商（取自系统属性：{@code java.vendor}）。
*
*
- * 例如Sun JDK 1.4.2："Sun Microsystems Inc."
+ * 例如Sun JDK 1.4.2：{@code "Sun Microsystems Inc."}
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
* @since Java 1.1
*/
public final String getVendor() {
@@ -134,12 +134,12 @@ public class JavaInfo implements Serializable {
}
/**
- * 取得当前Java impl.的厂商网站的URL（取自系统属性：java.vendor.url）。
+ * 取得当前Java impl.的厂商网站的URL（取自系统属性：{@code java.vendor.url}）。
*
*
- * 例如Sun JDK 1.4.2："http://java.sun.com/"
+ * 例如Sun JDK 1.4.2：{@code "http://java.sun.com/"}
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
* @since Java 1.1
*/
public final String getVendorURL() {
@@ -150,9 +150,9 @@ public class JavaInfo implements Serializable {
* 判断当前Java的版本。
*
*
- * 如果不能取得系统属性java.version（因为Java安全限制），则总是返回 false
+ * 如果不能取得系统属性{@code java.version}（因为Java安全限制），则总是返回 {@code false}
*
- * @return 如果当前Java版本为1.1，则返回true
+ * @return 如果当前Java版本为1.1，则返回{@code true}
*/
public final boolean isJava1_1() {
return IS_JAVA_1_1;
@@ -162,9 +162,9 @@ public class JavaInfo implements Serializable {
* 判断当前Java的版本。
*
*
- * 如果不能取得系统属性java.version（因为Java安全限制），则总是返回 false
+ * 如果不能取得系统属性{@code java.version}（因为Java安全限制），则总是返回 {@code false}
*
- * @return 如果当前Java版本为1.2，则返回true
+ * @return 如果当前Java版本为1.2，则返回{@code true}
*/
public final boolean isJava1_2() {
return IS_JAVA_1_2;
@@ -174,9 +174,9 @@ public class JavaInfo implements Serializable {
* 判断当前Java的版本。
*
*
- * 如果不能取得系统属性java.version（因为Java安全限制），则总是返回 false
+ * 如果不能取得系统属性{@code java.version}（因为Java安全限制），则总是返回 {@code false}
*
- * @return 如果当前Java版本为1.3，则返回true
+ * @return 如果当前Java版本为1.3，则返回{@code true}
*/
public final boolean isJava1_3() {
return IS_JAVA_1_3;
@@ -186,9 +186,9 @@ public class JavaInfo implements Serializable {
* 判断当前Java的版本。
*
*
- * 如果不能取得系统属性java.version（因为Java安全限制），则总是返回 false
+ * 如果不能取得系统属性{@code java.version}（因为Java安全限制），则总是返回 {@code false}
*
- * @return 如果当前Java版本为1.4，则返回true
+ * @return 如果当前Java版本为1.4，则返回{@code true}
*/
public final boolean isJava1_4() {
return IS_JAVA_1_4;
@@ -198,9 +198,9 @@ public class JavaInfo implements Serializable {
* 判断当前Java的版本。
*
*
- * 如果不能取得系统属性java.version（因为Java安全限制），则总是返回 false
+ * 如果不能取得系统属性{@code java.version}（因为Java安全限制），则总是返回 {@code false}
*
- * @return 如果当前Java版本为1.5，则返回true
+ * @return 如果当前Java版本为1.5，则返回{@code true}
*/
public final boolean isJava1_5() {
return IS_JAVA_1_5;
@@ -210,9 +210,9 @@ public class JavaInfo implements Serializable {
* 判断当前Java的版本。
*
*
- * 如果不能取得系统属性java.version（因为Java安全限制），则总是返回 false
+ * 如果不能取得系统属性{@code java.version}（因为Java安全限制），则总是返回 {@code false}
*
- * @return 如果当前Java版本为1.6，则返回true
+ * @return 如果当前Java版本为1.6，则返回{@code true}
*/
public final boolean isJava1_6() {
return IS_JAVA_1_6;
@@ -222,9 +222,9 @@ public class JavaInfo implements Serializable {
* 判断当前Java的版本。
*
*
- * 如果不能取得系统属性java.version（因为Java安全限制），则总是返回 false
+ * 如果不能取得系统属性{@code java.version}（因为Java安全限制），则总是返回 {@code false}
*
- * @return 如果当前Java版本为1.7，则返回true
+ * @return 如果当前Java版本为1.7，则返回{@code true}
*/
public final boolean isJava1_7() {
return IS_JAVA_1_7;
@@ -234,9 +234,9 @@ public class JavaInfo implements Serializable {
* 判断当前Java的版本。
*
*
- * 如果不能取得系统属性java.version（因为Java安全限制），则总是返回 false
+ * 如果不能取得系统属性{@code java.version}（因为Java安全限制），则总是返回 {@code false}
*
- * @return 如果当前Java版本为1.8，则返回true
+ * @return 如果当前Java版本为1.8，则返回{@code true}
*/
public final boolean isJava1_8() {
return IS_JAVA_1_8;
@@ -246,9 +246,9 @@ public class JavaInfo implements Serializable {
* 判断当前Java的版本。
*
*
- * 如果不能取得系统属性java.version（因为Java安全限制），则总是返回 false
+ * 如果不能取得系统属性{@code java.version}（因为Java安全限制），则总是返回 {@code false}
*
- * @return 如果当前Java版本为9，则返回true
+ * @return 如果当前Java版本为9，则返回{@code true}
*/
public final boolean isJava9() {
return IS_JAVA_9;
@@ -258,9 +258,9 @@ public class JavaInfo implements Serializable {
* 判断当前Java的版本。
*
*
- * 如果不能取得系统属性java.version（因为Java安全限制），则总是返回 false
+ * 如果不能取得系统属性{@code java.version}（因为Java安全限制），则总是返回 {@code false}
*
- * @return 如果当前Java版本为10，则返回true
+ * @return 如果当前Java版本为10，则返回{@code true}
*/
public final boolean isJava10() {
return IS_JAVA_10;
@@ -270,9 +270,9 @@ public class JavaInfo implements Serializable {
* 判断当前Java的版本。
*
*
- * 如果不能取得系统属性java.version（因为Java安全限制），则总是返回 false
+ * 如果不能取得系统属性{@code java.version}（因为Java安全限制），则总是返回 {@code false}
*
- * @return 如果当前Java版本为11，则返回true
+ * @return 如果当前Java版本为11，则返回{@code true}
*/
public final boolean isJava11() {
return IS_JAVA_11;
@@ -282,9 +282,9 @@ public class JavaInfo implements Serializable {
* 判断当前Java的版本。
*
*
- * 如果不能取得系统属性java.version（因为Java安全限制），则总是返回 false
+ * 如果不能取得系统属性{@code java.version}（因为Java安全限制），则总是返回 {@code false}
*
- * @return 如果当前Java版本为12，则返回true
+ * @return 如果当前Java版本为12，则返回{@code true}
*/
public final boolean isJava12() {
return IS_JAVA_12;
@@ -294,7 +294,7 @@ public class JavaInfo implements Serializable {
* 匹配当前Java的版本。
*
* @param versionPrefix Java版本前缀
- * @return 如果版本匹配，则返回true
+ * @return 如果版本匹配，则返回{@code true}
*/
private boolean getJavaVersionMatches(String versionPrefix) {
if (JAVA_VERSION == null) {
@@ -312,12 +312,12 @@ public class JavaInfo implements Serializable {
*
*
*
- * - 测试JDK 1.2：
isJavaVersionAtLeast(1.2f)
- * - 测试JDK 1.2.1：
isJavaVersionAtLeast(1.31f)
+ * - 测试JDK 1.2：{@code isJavaVersionAtLeast(1.2f)}
+ * - 测试JDK 1.2.1：{@code isJavaVersionAtLeast(1.31f)}
*
*
* @param requiredVersion 需要的版本
- * @return 如果当前Java版本大于或等于指定的版本，则返回true
+ * @return 如果当前Java版本大于或等于指定的版本，则返回{@code true}
*/
public final boolean isJavaVersionAtLeast(float requiredVersion) {
return getVersionFloat() >= requiredVersion;
@@ -331,12 +331,12 @@ public class JavaInfo implements Serializable {
*
*
*
- * - 测试JDK 1.2：
isJavaVersionAtLeast(120)
- * - 测试JDK 1.2.1：
isJavaVersionAtLeast(131)
+ * - 测试JDK 1.2：{@code isJavaVersionAtLeast(120)}
+ * - 测试JDK 1.2.1：{@code isJavaVersionAtLeast(131)}
*
*
* @param requiredVersion 需要的版本
- * @return 如果当前Java版本大于或等于指定的版本，则返回true
+ * @return 如果当前Java版本大于或等于指定的版本，则返回{@code true}
*/
public final boolean isJavaVersionAtLeast(int requiredVersion) {
return getVersionInt() >= requiredVersion;
diff --git a/hutool-system/src/main/java/cn/hutool/system/JavaRuntimeInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/JavaRuntimeInfo.java
similarity index 69%
rename from hutool-system/src/main/java/cn/hutool/system/JavaRuntimeInfo.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/JavaRuntimeInfo.java
index bbfa02be4..08f2f6262 100644
--- a/hutool-system/src/main/java/cn/hutool/system/JavaRuntimeInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/JavaRuntimeInfo.java
@@ -1,4 +1,4 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import cn.hutool.core.util.StrUtil;
@@ -28,22 +28,22 @@ public class JavaRuntimeInfo implements Serializable{
}
/**
- * JVM is 32M or 64M
+ * JVM is 32M {@code or} 64M
*
- * @return 32 or 64
+ * @return 32 {@code or} 64
*/
public final String getSunArchDataModel() {
return SUN_ARCH_DATA_MODEL;
}
/**
- * 取得当前JRE的名称（取自系统属性：java.runtime.name）。
+ * 取得当前JRE的名称（取自系统属性：{@code java.runtime.name}）。
*
*
- * 例如Sun JDK 1.4.2： "Java(TM) 2 Runtime Environment, Standard Edition"
+ * 例如Sun JDK 1.4.2： {@code "Java(TM) 2 Runtime Environment, Standard Edition"}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
*
* @since Java 1.3
*/
@@ -52,13 +52,13 @@ public class JavaRuntimeInfo implements Serializable{
}
/**
- * 取得当前JRE的版本（取自系统属性：java.runtime.version）。
+ * 取得当前JRE的版本（取自系统属性：{@code java.runtime.version}）。
*
*
- * 例如Sun JDK 1.4.2："1.4.2-b28"
+ * 例如Sun JDK 1.4.2：{@code "1.4.2-b28"}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
*
* @since Java 1.3
*/
@@ -67,13 +67,13 @@ public class JavaRuntimeInfo implements Serializable{
}
/**
- * 取得当前JRE的安装目录（取自系统属性：java.home）。
+ * 取得当前JRE的安装目录（取自系统属性：{@code java.home}）。
*
*
- * 例如Sun JDK 1.4.2："/opt/jdk1.4.2/jre"
+ * 例如Sun JDK 1.4.2：{@code "/opt/jdk1.4.2/jre"}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
*
* @since Java 1.1
*/
@@ -82,13 +82,13 @@ public class JavaRuntimeInfo implements Serializable{
}
/**
- * 取得当前JRE的扩展目录列表（取自系统属性：java.ext.dirs）。
+ * 取得当前JRE的扩展目录列表（取自系统属性：{@code java.ext.dirs}）。
*
*
- * 例如Sun JDK 1.4.2："/opt/jdk1.4.2/jre/lib/ext:..."
+ * 例如Sun JDK 1.4.2：{@code "/opt/jdk1.4.2/jre/lib/ext:..."}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
*
* @since Java 1.3
*/
@@ -97,13 +97,13 @@ public class JavaRuntimeInfo implements Serializable{
}
/**
- * 取得当前JRE的endorsed目录列表（取自系统属性：java.endorsed.dirs）。
+ * 取得当前JRE的endorsed目录列表（取自系统属性：{@code java.endorsed.dirs}）。
*
*
- * 例如Sun JDK 1.4.2："/opt/jdk1.4.2/jre/lib/endorsed:..."
+ * 例如Sun JDK 1.4.2：{@code "/opt/jdk1.4.2/jre/lib/endorsed:..."}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
*
* @since Java 1.4
*/
@@ -112,13 +112,13 @@ public class JavaRuntimeInfo implements Serializable{
}
/**
- * 取得当前JRE的系统classpath（取自系统属性：java.class.path）。
+ * 取得当前JRE的系统classpath（取自系统属性：{@code java.class.path}）。
*
*
- * 例如："/home/admin/myclasses:/home/admin/..."
+ * 例如：{@code "/home/admin/myclasses:/home/admin/..."}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
*
* @since Java 1.1
*/
@@ -127,13 +127,13 @@ public class JavaRuntimeInfo implements Serializable{
}
/**
- * 取得当前JRE的系统classpath（取自系统属性：java.class.path）。
+ * 取得当前JRE的系统classpath（取自系统属性：{@code java.class.path}）。
*
*
- * 例如："/home/admin/myclasses:/home/admin/..."
+ * 例如：{@code "/home/admin/myclasses:/home/admin/..."}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
*
* @since Java 1.1
*/
@@ -142,13 +142,13 @@ public class JavaRuntimeInfo implements Serializable{
}
/**
- * 取得当前JRE的class文件格式的版本（取自系统属性：java.class.version）。
+ * 取得当前JRE的class文件格式的版本（取自系统属性：{@code java.class.version}）。
*
*
- * 例如Sun JDK 1.4.2："48.0"
+ * 例如Sun JDK 1.4.2：{@code "48.0"}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
*
* @since Java 1.1
*/
@@ -157,13 +157,13 @@ public class JavaRuntimeInfo implements Serializable{
}
/**
- * 取得当前JRE的library搜索路径（取自系统属性：java.library.path）。
+ * 取得当前JRE的library搜索路径（取自系统属性：{@code java.library.path}）。
*
*
- * 例如Sun JDK 1.4.2："/opt/jdk1.4.2/bin:..."
+ * 例如Sun JDK 1.4.2：{@code "/opt/jdk1.4.2/bin:..."}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
*
*/
public final String getLibraryPath() {
@@ -171,13 +171,13 @@ public class JavaRuntimeInfo implements Serializable{
}
/**
- * 取得当前JRE的library搜索路径（取自系统属性：java.library.path）。
+ * 取得当前JRE的library搜索路径（取自系统属性：{@code java.library.path}）。
*
*
- * 例如Sun JDK 1.4.2："/opt/jdk1.4.2/bin:..."
+ * 例如Sun JDK 1.4.2：{@code "/opt/jdk1.4.2/bin:..."}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
*
*
*/
@@ -186,13 +186,13 @@ public class JavaRuntimeInfo implements Serializable{
}
/**
- * 取得当前JRE的URL协议packages列表（取自系统属性：java.library.path）。
+ * 取得当前JRE的URL协议packages列表（取自系统属性：{@code java.library.path}）。
*
*
- * 例如Sun JDK 1.4.2："sun.net.www.protocol|..."
+ * 例如Sun JDK 1.4.2：{@code "sun.net.www.protocol|..."}
*
*
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
*
*
*/
diff --git a/hutool-system/src/main/java/cn/hutool/system/JavaSpecInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/JavaSpecInfo.java
similarity index 66%
rename from hutool-system/src/main/java/cn/hutool/system/JavaSpecInfo.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/JavaSpecInfo.java
index e5bc8544e..688db20ca 100644
--- a/hutool-system/src/main/java/cn/hutool/system/JavaSpecInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/JavaSpecInfo.java
@@ -1,4 +1,4 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import java.io.Serializable;
@@ -13,28 +13,28 @@ public class JavaSpecInfo implements Serializable{
private final String JAVA_SPECIFICATION_VENDOR = SystemUtil.get("java.specification.vendor", false);
/**
- * 取得当前Java Spec.的名称（取自系统属性：java.specification.name）。
- *
+ * 取得当前Java Spec.的名称（取自系统属性：{@code java.specification.name}）。
+ *
*
- * 例如Sun JDK 1.4.2："Java Platform API Specification"
+ * 例如Sun JDK 1.4.2：{@code "Java Platform API Specification"}
*
- *
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
- *
+ *
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
+ *
*/
public final String getName() {
return JAVA_SPECIFICATION_NAME;
}
/**
- * 取得当前Java Spec.的版本（取自系统属性：java.specification.version）。
- *
+ * 取得当前Java Spec.的版本（取自系统属性：{@code java.specification.version}）。
+ *
*
- * 例如Sun JDK 1.4.2："1.4"
+ * 例如Sun JDK 1.4.2：{@code "1.4"}
*
- *
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
- *
+ *
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
+ *
* @since Java 1.3
*/
public final String getVersion() {
@@ -42,14 +42,14 @@ public class JavaSpecInfo implements Serializable{
}
/**
- * 取得当前Java Spec.的厂商（取自系统属性：java.specification.vendor）。
- *
+ * 取得当前Java Spec.的厂商（取自系统属性：{@code java.specification.vendor}）。
+ *
*
- * 例如Sun JDK 1.4.2："Sun Microsystems Inc."
+ * 例如Sun JDK 1.4.2：{@code "Sun Microsystems Inc."}
*
- *
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
- *
+ *
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
+ *
*/
public final String getVendor() {
return JAVA_SPECIFICATION_VENDOR;
@@ -57,7 +57,7 @@ public class JavaSpecInfo implements Serializable{
/**
* 将Java Specification的信息转换成字符串。
- *
+ *
* @return JVM spec.的字符串表示
*/
@Override
diff --git a/hutool-system/src/main/java/cn/hutool/system/JvmInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/JvmInfo.java
similarity index 64%
rename from hutool-system/src/main/java/cn/hutool/system/JvmInfo.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/JvmInfo.java
index 9e55b8fd5..b995df7bb 100644
--- a/hutool-system/src/main/java/cn/hutool/system/JvmInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/JvmInfo.java
@@ -1,4 +1,4 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import java.io.Serializable;
@@ -14,56 +14,56 @@ public class JvmInfo implements Serializable{
private final String JAVA_VM_INFO = SystemUtil.get("java.vm.info", false);
/**
- * 取得当前JVM impl.的名称（取自系统属性：java.vm.name）。
- *
+ * 取得当前JVM impl.的名称（取自系统属性：{@code java.vm.name}）。
+ *
*
- * 例如Sun JDK 1.4.2："Java HotSpot(TM) Client VM"
+ * 例如Sun JDK 1.4.2：{@code "Java HotSpot(TM) Client VM"}
*
- *
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
- *
+ *
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
+ *
*/
public final String getName() {
return JAVA_VM_NAME;
}
/**
- * 取得当前JVM impl.的版本（取自系统属性：java.vm.version）。
- *
+ * 取得当前JVM impl.的版本（取自系统属性：{@code java.vm.version}）。
+ *
*
- * 例如Sun JDK 1.4.2："1.4.2-b28"
+ * 例如Sun JDK 1.4.2：{@code "1.4.2-b28"}
*
- *
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
- *
+ *
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
+ *
*/
public final String getVersion() {
return JAVA_VM_VERSION;
}
/**
- * 取得当前JVM impl.的厂商（取自系统属性：java.vm.vendor）。
- *
+ * 取得当前JVM impl.的厂商（取自系统属性：{@code java.vm.vendor}）。
+ *
*
- * 例如Sun JDK 1.4.2："Sun Microsystems Inc."
+ * 例如Sun JDK 1.4.2：{@code "Sun Microsystems Inc."}
*
- *
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
- *
+ *
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
+ *
*/
public final String getVendor() {
return JAVA_VM_VENDOR;
}
/**
- * 取得当前JVM impl.的信息（取自系统属性：java.vm.info）。
- *
+ * 取得当前JVM impl.的信息（取自系统属性：{@code java.vm.info}）。
+ *
*
- * 例如Sun JDK 1.4.2："mixed mode"
+ * 例如Sun JDK 1.4.2：{@code "mixed mode"}
*
- *
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
- *
+ *
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
+ *
*/
public final String getInfo() {
return JAVA_VM_INFO;
@@ -71,7 +71,7 @@ public class JvmInfo implements Serializable{
/**
* 将Java Virutal Machine Implementation的信息转换成字符串。
- *
+ *
* @return JVM impl.的字符串表示
*/
@Override
diff --git a/hutool-system/src/main/java/cn/hutool/system/JvmSpecInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/JvmSpecInfo.java
similarity index 66%
rename from hutool-system/src/main/java/cn/hutool/system/JvmSpecInfo.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/JvmSpecInfo.java
index d3f1738d0..84f80f0cd 100644
--- a/hutool-system/src/main/java/cn/hutool/system/JvmSpecInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/JvmSpecInfo.java
@@ -1,4 +1,4 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import java.io.Serializable;
@@ -13,42 +13,42 @@ public class JvmSpecInfo implements Serializable{
private final String JAVA_VM_SPECIFICATION_VENDOR = SystemUtil.get("java.vm.specification.vendor", false);
/**
- * 取得当前JVM spec.的名称（取自系统属性：java.vm.specification.name）。
- *
+ * 取得当前JVM spec.的名称（取自系统属性：{@code java.vm.specification.name}）。
+ *
*
- * 例如Sun JDK 1.4.2："Java Virtual Machine Specification"
+ * 例如Sun JDK 1.4.2：{@code "Java Virtual Machine Specification"}
*
- *
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
- *
+ *
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
+ *
*/
public final String getName() {
return JAVA_VM_SPECIFICATION_NAME;
}
/**
- * 取得当前JVM spec.的版本（取自系统属性：java.vm.specification.version）。
- *
+ * 取得当前JVM spec.的版本（取自系统属性：{@code java.vm.specification.version}）。
+ *
*
- * 例如Sun JDK 1.4.2："1.0"
+ * 例如Sun JDK 1.4.2：{@code "1.0"}
*
- *
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
- *
+ *
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
+ *
*/
public final String getVersion() {
return JAVA_VM_SPECIFICATION_VERSION;
}
/**
- * 取得当前JVM spec.的厂商（取自系统属性：java.vm.specification.vendor）。
- *
+ * 取得当前JVM spec.的厂商（取自系统属性：{@code java.vm.specification.vendor}）。
+ *
*
- * 例如Sun JDK 1.4.2："Sun Microsystems Inc."
+ * 例如Sun JDK 1.4.2：{@code "Sun Microsystems Inc."}
*
- *
- * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回null。
- *
+ *
+ * @return 属性值，如果不能取得（因为Java安全限制）或值不存在，则返回{@code null}。
+ *
*/
public final String getVendor() {
return JAVA_VM_SPECIFICATION_VENDOR;
@@ -56,7 +56,7 @@ public class JvmSpecInfo implements Serializable{
/**
* 将Java Virutal Machine Specification的信息转换成字符串。
- *
+ *
* @return JVM spec.的字符串表示
*/
@Override
diff --git a/hutool-system/src/main/java/cn/hutool/system/OsInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/OsInfo.java
similarity index 99%
rename from hutool-system/src/main/java/cn/hutool/system/OsInfo.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/OsInfo.java
index 7d7337e47..c626c4053 100644
--- a/hutool-system/src/main/java/cn/hutool/system/OsInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/OsInfo.java
@@ -1,4 +1,4 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import java.io.Serializable;
diff --git a/hutool-system/src/main/java/cn/hutool/system/RuntimeInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/RuntimeInfo.java
similarity index 98%
rename from hutool-system/src/main/java/cn/hutool/system/RuntimeInfo.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/RuntimeInfo.java
index 8da0828dd..4f85ed0ac 100644
--- a/hutool-system/src/main/java/cn/hutool/system/RuntimeInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/RuntimeInfo.java
@@ -1,4 +1,4 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import cn.hutool.core.io.FileUtil;
diff --git a/hutool-system/src/main/java/cn/hutool/system/SystemPropsKeys.java b/hutool-extra/src/main/java/cn/hutool/extra/system/SystemPropsKeys.java
similarity index 98%
rename from hutool-system/src/main/java/cn/hutool/system/SystemPropsKeys.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/SystemPropsKeys.java
index 07307b665..1e0ca63f4 100644
--- a/hutool-system/src/main/java/cn/hutool/system/SystemPropsKeys.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/SystemPropsKeys.java
@@ -1,4 +1,4 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
/**
* 系统属性名称常量池
diff --git a/hutool-system/src/main/java/cn/hutool/system/SystemUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/system/SystemUtil.java
similarity index 98%
rename from hutool-system/src/main/java/cn/hutool/system/SystemUtil.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/SystemUtil.java
index 6a561b727..cbdd6a157 100644
--- a/hutool-system/src/main/java/cn/hutool/system/SystemUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/SystemUtil.java
@@ -1,4 +1,4 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Singleton;
@@ -20,7 +20,7 @@ import java.util.List;
/**
* Java的System类封装工具类。
- * 参考：http://blog.csdn.net/zhongweijian/article/details/7619383
+ * 参考：http://blog.csdn.net/zhongweijian/article/details/7619383
*
* @author Looly
*/
diff --git a/hutool-system/src/main/java/cn/hutool/system/UserInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/UserInfo.java
similarity index 99%
rename from hutool-system/src/main/java/cn/hutool/system/UserInfo.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/UserInfo.java
index 7a52566b2..ab9b66e78 100644
--- a/hutool-system/src/main/java/cn/hutool/system/UserInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/UserInfo.java
@@ -1,4 +1,4 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import cn.hutool.core.util.StrUtil;
diff --git a/hutool-system/src/main/java/cn/hutool/system/oshi/CpuInfo.java b/hutool-extra/src/main/java/cn/hutool/extra/system/oshi/CpuInfo.java
similarity index 99%
rename from hutool-system/src/main/java/cn/hutool/system/oshi/CpuInfo.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/oshi/CpuInfo.java
index c9d3fdb47..48e66458a 100644
--- a/hutool-system/src/main/java/cn/hutool/system/oshi/CpuInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/oshi/CpuInfo.java
@@ -1,4 +1,4 @@
-package cn.hutool.system.oshi;
+package cn.hutool.extra.system.oshi;
import cn.hutool.core.util.NumberUtil;
import oshi.hardware.CentralProcessor;
diff --git a/hutool-system/src/main/java/cn/hutool/system/oshi/CpuTicks.java b/hutool-extra/src/main/java/cn/hutool/extra/system/oshi/CpuTicks.java
similarity index 98%
rename from hutool-system/src/main/java/cn/hutool/system/oshi/CpuTicks.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/oshi/CpuTicks.java
index 634c31ffd..62a5a86e7 100644
--- a/hutool-system/src/main/java/cn/hutool/system/oshi/CpuTicks.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/oshi/CpuTicks.java
@@ -1,4 +1,4 @@
-package cn.hutool.system.oshi;
+package cn.hutool.extra.system.oshi;
import oshi.hardware.CentralProcessor;
import oshi.util.Util;
diff --git a/hutool-system/src/main/java/cn/hutool/system/oshi/OshiUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/system/oshi/OshiUtil.java
similarity index 96%
rename from hutool-system/src/main/java/cn/hutool/system/oshi/OshiUtil.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/oshi/OshiUtil.java
index 3da3a517f..330d4f7d0 100644
--- a/hutool-system/src/main/java/cn/hutool/system/oshi/OshiUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/oshi/OshiUtil.java
@@ -1,4 +1,4 @@
-package cn.hutool.system.oshi;
+package cn.hutool.extra.system.oshi;
import oshi.SystemInfo;
import oshi.hardware.CentralProcessor;
@@ -21,7 +21,7 @@ import java.util.List;
* 2、硬件信息
*
*
- * 相关内容见：https://github.com/oshi/oshi
+ * 相关内容见：https://github.com/oshi/oshi
*
* @author Looly
* @since 4.6.4
diff --git a/hutool-system/src/main/java/cn/hutool/system/oshi/package-info.java b/hutool-extra/src/main/java/cn/hutool/extra/system/oshi/package-info.java
similarity index 70%
rename from hutool-system/src/main/java/cn/hutool/system/oshi/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/oshi/package-info.java
index d30612772..d5e3832cd 100644
--- a/hutool-system/src/main/java/cn/hutool/system/oshi/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/oshi/package-info.java
@@ -1,8 +1,8 @@
/**
* Oshi库封装
* https://github.com/oshi/oshi
- *
+ *
* @author Looly
* @since 4.6.4
*/
-package cn.hutool.system.oshi;
\ No newline at end of file
+package cn.hutool.extra.system.oshi;
diff --git a/hutool-system/src/main/java/cn/hutool/system/package-info.java b/hutool-extra/src/main/java/cn/hutool/extra/system/package-info.java
similarity index 78%
rename from hutool-system/src/main/java/cn/hutool/system/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/extra/system/package-info.java
index 7de599f0d..cef4ea918 100644
--- a/hutool-system/src/main/java/cn/hutool/system/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/system/package-info.java
@@ -1,7 +1,7 @@
/**
* System模块主要获取系统、JVM、内存、CPU等信息，以便动态监测系统状态
- *
+ *
* @author looly
*
*/
-package cn.hutool.system;
\ No newline at end of file
+package cn.hutool.extra.system;
diff --git a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.aop.proxy.ProxyFactory b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.aop.proxy.ProxyFactory
new file mode 100644
index 000000000..8541a2eaa
--- /dev/null
+++ b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.aop.proxy.ProxyFactory
@@ -0,0 +1,3 @@
+cn.hutool.extra.aop.proxy.CglibProxyFactory
+cn.hutool.extra.aop.proxy.SpringCglibProxyFactory
+cn.hutool.extra.aop.proxy.JdkProxyFactory
diff --git a/hutool-aop/src/test/java/cn/hutool/aop/test/AopTest.java b/hutool-extra/src/test/java/cn/hutool/extra/aop/AopTest.java
similarity index 92%
rename from hutool-aop/src/test/java/cn/hutool/aop/test/AopTest.java
rename to hutool-extra/src/test/java/cn/hutool/extra/aop/AopTest.java
index 079858775..73f8a69c1 100644
--- a/hutool-aop/src/test/java/cn/hutool/aop/test/AopTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/aop/AopTest.java
@@ -1,8 +1,7 @@
-package cn.hutool.aop.test;
+package cn.hutool.extra.aop;
-import cn.hutool.aop.ProxyUtil;
-import cn.hutool.aop.aspects.TimeIntervalAspect;
import cn.hutool.core.lang.Console;
+import cn.hutool.extra.aop.aspects.TimeIntervalAspect;
import lombok.Data;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
index 30dde68d6..5af960c89 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
@@ -1,7 +1,7 @@
package cn.hutool.extra.qrcode;
import cn.hutool.core.codec.Base64;
-import cn.hutool.core.img.ImgUtil;
+import cn.hutool.swing.img.ImgUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Console;
import com.google.zxing.BarcodeFormat;
diff --git a/hutool-system/src/test/java/cn/hutool/system/OshiPrintTest.java b/hutool-extra/src/test/java/cn/hutool/extra/system/OshiPrintTest.java
similarity index 73%
rename from hutool-system/src/test/java/cn/hutool/system/OshiPrintTest.java
rename to hutool-extra/src/test/java/cn/hutool/extra/system/OshiPrintTest.java
index 5be58e42b..be1597199 100644
--- a/hutool-system/src/test/java/cn/hutool/system/OshiPrintTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/system/OshiPrintTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import cn.hutool.core.lang.Console;
-import cn.hutool.system.oshi.OshiUtil;
+import cn.hutool.extra.system.oshi.OshiUtil;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/hutool-system/src/test/java/cn/hutool/system/OshiTest.java b/hutool-extra/src/test/java/cn/hutool/extra/system/OshiTest.java
similarity index 63%
rename from hutool-system/src/test/java/cn/hutool/system/OshiTest.java
rename to hutool-extra/src/test/java/cn/hutool/extra/system/OshiTest.java
index 2bddf3b0b..915a688e4 100644
--- a/hutool-system/src/test/java/cn/hutool/system/OshiTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/system/OshiTest.java
@@ -1,15 +1,15 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import cn.hutool.core.lang.Console;
-import cn.hutool.system.oshi.CpuInfo;
-import cn.hutool.system.oshi.OshiUtil;
+import cn.hutool.extra.system.oshi.CpuInfo;
+import cn.hutool.extra.system.oshi.OshiUtil;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import oshi.software.os.OSProcess;
/**
- * 测试参考：https://github.com/oshi/oshi/blob/master/oshi-core/src/test/java/oshi/SystemInfoTest.java
+ * 测试参考：https://github.com/oshi/oshi/blob/master/oshi-core/src/test/java/oshi/SystemInfoTest.java
*/
public class OshiTest {
@@ -33,8 +33,8 @@ public class OshiTest {
@Test
@Ignore
- public void getUsedTest(){
- while (true){
+ public void getUsedTest() {
+ while (true) {
Console.log(OshiUtil.getCpuInfo().getUsed());
}
}
diff --git a/hutool-system/src/test/java/cn/hutool/system/SystemUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/system/SystemUtilTest.java
similarity index 97%
rename from hutool-system/src/test/java/cn/hutool/system/SystemUtilTest.java
rename to hutool-extra/src/test/java/cn/hutool/extra/system/SystemUtilTest.java
index 0602d835f..5919a8ae3 100644
--- a/hutool-system/src/test/java/cn/hutool/system/SystemUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/system/SystemUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.system;
+package cn.hutool.extra.system;
import org.junit.Assert;
import org.junit.Ignore;
diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml
index 8ddc534f7..63a4a7dc3 100755
--- a/hutool-http/pom.xml
+++ b/hutool-http/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.8.0.M5
+ 6.0.0.M1
hutool-http
diff --git a/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java b/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java
index b34ec1fe0..bdb5d801c 100644
--- a/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java
@@ -1,6 +1,6 @@
package cn.hutool.http;
-import cn.hutool.core.util.EscapeUtil;
+import cn.hutool.core.text.escape.EscapeUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil;
diff --git a/hutool-http/src/test/java/cn/hutool/http/server/BlankServerTest.java b/hutool-http/src/test/java/cn/hutool/http/server/BlankServerTest.java
index c39bfab75..2e44643a9 100644
--- a/hutool-http/src/test/java/cn/hutool/http/server/BlankServerTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/server/BlankServerTest.java
@@ -1,6 +1,5 @@
package cn.hutool.http.server;
-import cn.hutool.core.swing.DesktopUtil;
import cn.hutool.http.ContentType;
import cn.hutool.http.HttpUtil;
@@ -9,7 +8,5 @@ public class BlankServerTest {
HttpUtil.createServer(8888)
.addAction("/", (req, res)-> res.write("Hello Hutool Server", ContentType.JSON.getValue()))
.start();
-
- DesktopUtil.browse("http://localhost:8888/");
}
}
diff --git a/hutool-http/src/test/java/cn/hutool/http/server/DocServerTest.java b/hutool-http/src/test/java/cn/hutool/http/server/DocServerTest.java
index 1648b56ca..3776bfd83 100644
--- a/hutool-http/src/test/java/cn/hutool/http/server/DocServerTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/server/DocServerTest.java
@@ -1,6 +1,5 @@
package cn.hutool.http.server;
-import cn.hutool.core.swing.DesktopUtil;
import cn.hutool.http.HttpUtil;
public class DocServerTest {
@@ -10,7 +9,5 @@ public class DocServerTest {
// 设置默认根目录，
.setRoot("D:\\workspace\\site\\hutool-site")
.start();
-
- DesktopUtil.browse("http://localhost/");
}
}
diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml
index 0c3b52525..6c412360d 100755
--- a/hutool-json/pom.xml
+++ b/hutool-json/pom.xml
@@ -9,18 +9,35 @@
cn.hutool
hutool-parent
- 5.8.0.M5
+ 6.0.0.M1
hutool-json
${project.artifactId}
Hutool JSON封装
+
+
+ 1.70
+
+
cn.hutool
hutool-core
${project.parent.version}
+
+ cn.hutool
+ hutool-crypto
+ ${project.parent.version}
+
+
+
+ org.bouncycastle
+ bcprov-jdk15to18
+ ${bouncycastle.version}
+ test
+
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java b/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java
index 7938ed3c6..85108d2f3 100755
--- a/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java
@@ -6,7 +6,7 @@ import cn.hutool.core.lang.TypeReference;
import cn.hutool.core.map.MapWrapper;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ClassUtil;
-import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.TypeUtil;
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/Claims.java b/hutool-json/src/main/java/cn/hutool/json/jwt/Claims.java
similarity index 98%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/Claims.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/Claims.java
index 39fd05db7..5ae1d1a84 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/Claims.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/Claims.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.lang.Assert;
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java b/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java
similarity index 96%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java
index 7e2708fa4..6109b6c03 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollUtil;
@@ -9,10 +9,10 @@ import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
-import cn.hutool.jwt.signers.AlgorithmUtil;
-import cn.hutool.jwt.signers.JWTSigner;
-import cn.hutool.jwt.signers.JWTSignerUtil;
-import cn.hutool.jwt.signers.NoneJWTSigner;
+import cn.hutool.json.jwt.signers.AlgorithmUtil;
+import cn.hutool.json.jwt.signers.JWTSigner;
+import cn.hutool.json.jwt.signers.JWTSignerUtil;
+import cn.hutool.json.jwt.signers.NoneJWTSigner;
import java.nio.charset.Charset;
import java.security.Key;
@@ -31,7 +31,7 @@ import java.util.Map;
*
*
*
- * 详细介绍见；https://www.jianshu.com/p/576dbf44b2ae
+ * 详细介绍见；https://www.jianshu.com/p/576dbf44b2ae
*
*
* @author looly
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTException.java b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTException.java
similarity index 97%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/JWTException.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/JWTException.java
index 4cd488f82..44ccc85ce 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTException.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTException.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.util.StrUtil;
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTHeader.java b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTHeader.java
similarity index 97%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/JWTHeader.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/JWTHeader.java
index 914f6248f..ef55b6457 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTHeader.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTHeader.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
import java.util.Map;
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTPayload.java b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTPayload.java
similarity index 85%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/JWTPayload.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/JWTPayload.java
index 52e716b44..21ffbc9cc 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTPayload.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTPayload.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
import java.util.Map;
@@ -12,7 +12,7 @@ import java.util.Map;
* 私有的声明
*
*
- * 详细介绍见：https://www.jianshu.com/p/576dbf44b2ae
+ * 详细介绍见：https://www.jianshu.com/p/576dbf44b2ae
*
* @author looly
* @since 5.7.0
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTUtil.java b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTUtil.java
similarity index 96%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/JWTUtil.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/JWTUtil.java
index 07f486e6e..8032cd4f4 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTUtil.java
@@ -1,6 +1,6 @@
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
-import cn.hutool.jwt.signers.JWTSigner;
+import cn.hutool.json.jwt.signers.JWTSigner;
import java.util.Map;
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTValidator.java b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTValidator.java
similarity index 98%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/JWTValidator.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/JWTValidator.java
index 77f7c2591..3dabb96fc 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTValidator.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTValidator.java
@@ -1,10 +1,10 @@
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.exceptions.ValidateException;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.jwt.signers.JWTSigner;
-import cn.hutool.jwt.signers.NoneJWTSigner;
+import cn.hutool.json.jwt.signers.JWTSigner;
+import cn.hutool.json.jwt.signers.NoneJWTSigner;
import java.util.Date;
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/RegisteredPayload.java b/hutool-json/src/main/java/cn/hutool/json/jwt/RegisteredPayload.java
similarity index 98%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/RegisteredPayload.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/RegisteredPayload.java
index f0c0fc8e0..ebab18a40 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/RegisteredPayload.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/RegisteredPayload.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
import java.util.Date;
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/package-info.java b/hutool-json/src/main/java/cn/hutool/json/jwt/package-info.java
similarity index 57%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/package-info.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/package-info.java
index f2670a9ed..d7d6359f4 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/package-info.java
@@ -1,4 +1,4 @@
/**
* JSON Web Token (JWT)封装
*/
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/AlgorithmUtil.java b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AlgorithmUtil.java
similarity index 98%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/signers/AlgorithmUtil.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/signers/AlgorithmUtil.java
index 1aa8e2b1e..b2d51111b 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/AlgorithmUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AlgorithmUtil.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt.signers;
+package cn.hutool.json.jwt.signers;
import cn.hutool.core.map.BiMap;
import cn.hutool.core.util.ObjectUtil;
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/AsymmetricJWTSigner.java b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AsymmetricJWTSigner.java
similarity index 98%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/signers/AsymmetricJWTSigner.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/signers/AsymmetricJWTSigner.java
index 4d9a4cb34..8700b665c 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/AsymmetricJWTSigner.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AsymmetricJWTSigner.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt.signers;
+package cn.hutool.json.jwt.signers;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.CharsetUtil;
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/HMacJWTSigner.java b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/HMacJWTSigner.java
similarity index 97%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/signers/HMacJWTSigner.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/signers/HMacJWTSigner.java
index daa50b2f1..e21ae7019 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/HMacJWTSigner.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/HMacJWTSigner.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt.signers;
+package cn.hutool.json.jwt.signers;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil;
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSigner.java b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSigner.java
similarity index 96%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSigner.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSigner.java
index b6301a4bd..4b8f37bac 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSigner.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSigner.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt.signers;
+package cn.hutool.json.jwt.signers;
/**
* JWT签名接口封装，通过实现此接口，完成不同算法的签名功能
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSignerUtil.java b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSignerUtil.java
similarity index 99%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSignerUtil.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSignerUtil.java
index 82076ad23..fc1b4b7eb 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSignerUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSignerUtil.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt.signers;
+package cn.hutool.json.jwt.signers;
import cn.hutool.core.lang.Assert;
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/NoneJWTSigner.java b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/NoneJWTSigner.java
similarity index 94%
rename from hutool-jwt/src/main/java/cn/hutool/jwt/signers/NoneJWTSigner.java
rename to hutool-json/src/main/java/cn/hutool/json/jwt/signers/NoneJWTSigner.java
index 39a3e4442..c9e89c62e 100644
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/NoneJWTSigner.java
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/NoneJWTSigner.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt.signers;
+package cn.hutool.json.jwt.signers;
import cn.hutool.core.util.StrUtil;
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/package-info.java b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/package-info.java
new file mode 100644
index 000000000..86732c2b4
--- /dev/null
+++ b/hutool-json/src/main/java/cn/hutool/json/jwt/signers/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * JWT签名封装
+ */
+package cn.hutool.json.jwt.signers;
diff --git a/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java b/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java
index fa6dd1e34..597da6adc 100644
--- a/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java
+++ b/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java
@@ -2,7 +2,7 @@ package cn.hutool.json.xml;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.EscapeUtil;
+import cn.hutool.core.text.escape.EscapeUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONException;
diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTSignerTest.java b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTSignerTest.java
similarity index 95%
rename from hutool-jwt/src/test/java/cn/hutool/jwt/JWTSignerTest.java
rename to hutool-json/src/test/java/cn/hutool/json/jwt/JWTSignerTest.java
index c0e0d622b..f84eef44e 100644
--- a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTSignerTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTSignerTest.java
@@ -1,10 +1,10 @@
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
import cn.hutool.core.date.DateUtil;
import cn.hutool.crypto.KeyUtil;
-import cn.hutool.jwt.signers.AlgorithmUtil;
-import cn.hutool.jwt.signers.JWTSigner;
-import cn.hutool.jwt.signers.JWTSignerUtil;
+import cn.hutool.json.jwt.signers.AlgorithmUtil;
+import cn.hutool.json.jwt.signers.JWTSigner;
+import cn.hutool.json.jwt.signers.JWTSignerUtil;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTTest.java b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java
similarity index 97%
rename from hutool-jwt/src/test/java/cn/hutool/jwt/JWTTest.java
rename to hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java
index 70204f20b..4ab34e784 100644
--- a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.jwt.signers.JWTSignerUtil;
+import cn.hutool.json.jwt.signers.JWTSignerUtil;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTUtilTest.java b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTUtilTest.java
similarity index 98%
rename from hutool-jwt/src/test/java/cn/hutool/jwt/JWTUtilTest.java
rename to hutool-json/src/test/java/cn/hutool/json/jwt/JWTUtilTest.java
index 9ff5efc07..925eda40c 100644
--- a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTUtilTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTValidatorTest.java b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTValidatorTest.java
similarity index 96%
rename from hutool-jwt/src/test/java/cn/hutool/jwt/JWTValidatorTest.java
rename to hutool-json/src/test/java/cn/hutool/json/jwt/JWTValidatorTest.java
index b3df4faff..97b9f14a1 100644
--- a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTValidatorTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTValidatorTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.jwt;
+package cn.hutool.json.jwt;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.exceptions.ValidateException;
-import cn.hutool.jwt.signers.JWTSignerUtil;
+import cn.hutool.json.jwt.signers.JWTSignerUtil;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-jwt/pom.xml b/hutool-jwt/pom.xml
deleted file mode 100755
index 3a4ef4229..000000000
--- a/hutool-jwt/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
- 4.0.0
-
- jar
-
-
- cn.hutool
- hutool-parent
- 5.8.0.M5
-
-
- hutool-jwt
- ${project.artifactId}
- JWT生成、解析和验证实现
-
-
-
- 1.70
-
-
-
-
- cn.hutool
- hutool-json
- ${project.parent.version}
-
-
- cn.hutool
- hutool-crypto
- ${project.parent.version}
-
-
-
- org.bouncycastle
- bcprov-jdk15to18
- ${bouncycastle.version}
- test
-
-
-
diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/package-info.java b/hutool-jwt/src/main/java/cn/hutool/jwt/signers/package-info.java
deleted file mode 100644
index c3665e9a3..000000000
--- a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * JWT签名封装
- */
-package cn.hutool.jwt.signers;
diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml
index fc5eee676..d057945a4 100755
--- a/hutool-log/pom.xml
+++ b/hutool-log/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.8.0.M5
+ 6.0.0.M1
hutool-log
diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml
index e45c87948..d938e057d 100755
--- a/hutool-poi/pom.xml
+++ b/hutool-poi/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.8.0.M5
+ 6.0.0.M1
hutool-poi
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvBaseReader.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/text/csv/CsvBaseReader.java
rename to hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java
index 2ac2f9186..6026d0440 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvBaseReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IORuntimeException;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvConfig.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvConfig.java
similarity index 98%
rename from hutool-core/src/main/java/cn/hutool/core/text/csv/CsvConfig.java
rename to hutool-poi/src/main/java/cn/hutool/poi/csv/CsvConfig.java
index 7798995ce..aff52204d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvConfig.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvConfig.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import cn.hutool.core.util.CharUtil;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvData.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvData.java
similarity index 97%
rename from hutool-core/src/main/java/cn/hutool/core/text/csv/CsvData.java
rename to hutool-poi/src/main/java/cn/hutool/poi/csv/CsvData.java
index 1bf31a92e..73841ce2d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvData.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvData.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import java.io.Serializable;
import java.util.Collections;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvParser.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/text/csv/CsvParser.java
rename to hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java
index 46cd9e3c1..b701106d4 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvParser.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import cn.hutool.core.collection.ComputeIter;
import cn.hutool.core.io.IORuntimeException;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvReadConfig.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReadConfig.java
similarity index 98%
rename from hutool-core/src/main/java/cn/hutool/core/text/csv/CsvReadConfig.java
rename to hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReadConfig.java
index 5ad7c7d85..7a6bebfd3 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvReadConfig.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReadConfig.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import java.io.Serializable;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvReader.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReader.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/text/csv/CsvReader.java
rename to hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReader.java
index 15065cb8f..18c284ebc 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReader.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IORuntimeException;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRow.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvRow.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRow.java
rename to hutool-poi/src/main/java/cn/hutool/poi/csv/CsvRow.java
index fcc37f54a..7cb0857a4 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRow.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvRow.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.Assert;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRowHandler.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvRowHandler.java
similarity index 88%
rename from hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRowHandler.java
rename to hutool-poi/src/main/java/cn/hutool/poi/csv/CsvRowHandler.java
index c5a50146a..465177041 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRowHandler.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvRowHandler.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
/**
* CSV的行处理器，实现此接口用于按照行处理数据
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvUtil.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/text/csv/CsvUtil.java
rename to hutool-poi/src/main/java/cn/hutool/poi/csv/CsvUtil.java
index ea1840076..dc80cd286 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvUtil.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import java.io.File;
import java.io.Reader;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriteConfig.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriteConfig.java
similarity index 97%
rename from hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriteConfig.java
rename to hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriteConfig.java
index eff5b6430..690920a04 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriteConfig.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriteConfig.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import cn.hutool.core.util.CharUtil;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java
rename to hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java
index 5c386214e..093514c72 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.ArrayIter;
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/package-info.java b/hutool-poi/src/main/java/cn/hutool/poi/csv/package-info.java
similarity index 81%
rename from hutool-core/src/main/java/cn/hutool/core/text/csv/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/poi/csv/package-info.java
index 7863d5c06..8b82adee7 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/csv/package-info.java
@@ -5,4 +5,4 @@
* @author looly
*
*/
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvParserTest.java b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java
similarity index 98%
rename from hutool-core/src/test/java/cn/hutool/core/text/csv/CsvParserTest.java
rename to hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java
index e8fc851e8..4fb3857c4 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvParserTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.StrUtil;
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvReaderTest.java b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvReaderTest.java
similarity index 99%
rename from hutool-core/src/test/java/cn/hutool/core/text/csv/CsvReaderTest.java
rename to hutool-poi/src/test/java/cn/hutool/poi/csv/CsvReaderTest.java
index 291f8b26f..f8e3e5e30 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvReaderTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvReaderTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import cn.hutool.core.annotation.Alias;
import cn.hutool.core.collection.CollUtil;
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java
similarity index 99%
rename from hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java
rename to hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java
index bad09cdd9..cfae4b775 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.ListUtil;
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvWriterTest.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java
rename to hutool-poi/src/test/java/cn/hutool/poi/csv/CsvWriterTest.java
index ed4416209..e879faecc
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvWriterTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.text.csv;
+package cn.hutool.poi.csv;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Console;
diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml
deleted file mode 100755
index 5dceb2244..000000000
--- a/hutool-script/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
- 4.0.0
-
- jar
-
-
- cn.hutool
- hutool-parent
- 5.8.0.M5
-
-
- hutool-script
- ${project.artifactId}
- Hutool 脚本执行封装
-
-
- 2.7.2
- 3.0.1
- 3.0.10
-
-
-
-
- cn.hutool
- hutool-core
- ${project.parent.version}
-
-
- org.python
- jython
- ${jython.version}
- provided
-
-
- org.luaj
- luaj-jse
- ${luaj.version}
- provided
-
-
- org.codehaus.groovy
- groovy-all
- ${groovy.version}
- pom
- provided
-
-
- junit
- junit
-
-
-
-
-
diff --git a/hutool-script/src/main/java/cn/hutool/script/FullSupportScriptEngine.java b/hutool-script/src/main/java/cn/hutool/script/FullSupportScriptEngine.java
deleted file mode 100644
index eae1d330e..000000000
--- a/hutool-script/src/main/java/cn/hutool/script/FullSupportScriptEngine.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package cn.hutool.script;
-
-import java.io.Reader;
-
-import javax.script.Bindings;
-import javax.script.Compilable;
-import javax.script.CompiledScript;
-import javax.script.Invocable;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineFactory;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-
-import cn.hutool.core.util.StrUtil;
-
-/**
- * 全功能引擎类，支持Compilable和Invocable
- *
- * @author Looly
- *
- */
-public class FullSupportScriptEngine implements ScriptEngine, Compilable, Invocable {
-
- ScriptEngine engine;
-
- /**
- * 构造
- *
- * @param engine 脚本引擎
- */
- public FullSupportScriptEngine(ScriptEngine engine) {
- this.engine = engine;
- }
-
- /**
- * 构造
- *
- * @param nameOrExtOrMime 脚本名或者脚本语言扩展名或者MineType
- */
- public FullSupportScriptEngine(String nameOrExtOrMime) {
- final ScriptEngineManager manager = new ScriptEngineManager();
- ScriptEngine engine = manager.getEngineByName(nameOrExtOrMime);
- if (null == engine) {
- engine = manager.getEngineByExtension(nameOrExtOrMime);
- }
- if (null == engine) {
- engine = manager.getEngineByMimeType(nameOrExtOrMime);
- }
- if (null == engine) {
- throw new NullPointerException(StrUtil.format("Script for [{}] not support !", nameOrExtOrMime));
- }
- this.engine = engine;
- }
-
- // ----------------------------------------------------------------------------------------------- Invocable
- @Override
- public Object invokeMethod(Object thiz, String name, Object... args) throws ScriptException, NoSuchMethodException {
- return ((Invocable) engine).invokeMethod(thiz, name, args);
- }
-
- @Override
- public Object invokeFunction(String name, Object... args) throws ScriptException, NoSuchMethodException {
- return ((Invocable) engine).invokeFunction(name, args);
- }
-
- @Override
- public T getInterface(Class clasz) {
- return ((Invocable) engine).getInterface(clasz);
- }
-
- @Override
- public T getInterface(Object thiz, Class clasz) {
- return ((Invocable) engine).getInterface(thiz, clasz);
- }
-
- // ----------------------------------------------------------------------------------------------- Compilable
- @Override
- public CompiledScript compile(String script) throws ScriptException {
- return ((Compilable) engine).compile(script);
- }
-
- @Override
- public CompiledScript compile(Reader script) throws ScriptException {
- return ((Compilable) engine).compile(script);
- }
-
- // ----------------------------------------------------------------------------------------------- ScriptEngine
- @Override
- public Object eval(String script, ScriptContext context) throws ScriptException {
- return engine.eval(script, context);
- }
-
- @Override
- public Object eval(Reader reader, ScriptContext context) throws ScriptException {
- return engine.eval(reader, context);
- }
-
- @Override
- public Object eval(String script) throws ScriptException {
- return engine.eval(script);
- }
-
- @Override
- public Object eval(Reader reader) throws ScriptException {
- return engine.eval(reader);
- }
-
- @Override
- public Object eval(String script, Bindings n) throws ScriptException {
- return engine.eval(script, n);
- }
-
- @Override
- public Object eval(Reader reader, Bindings n) throws ScriptException {
- return engine.eval(reader, n);
- }
-
- @Override
- public void put(String key, Object value) {
- engine.put(key, value);
- }
-
- @Override
- public Object get(String key) {
- return engine.get(key);
- }
-
- @Override
- public Bindings getBindings(int scope) {
- return engine.getBindings(scope);
- }
-
- @Override
- public void setBindings(Bindings bindings, int scope) {
- engine.setBindings(bindings, scope);
- }
-
- @Override
- public Bindings createBindings() {
- return engine.createBindings();
- }
-
- @Override
- public ScriptContext getContext() {
- return engine.getContext();
- }
-
- @Override
- public void setContext(ScriptContext context) {
- engine.setContext(context);
- }
-
- @Override
- public ScriptEngineFactory getFactory() {
- return engine.getFactory();
- }
-
-}
diff --git a/hutool-script/src/main/java/cn/hutool/script/JavaScriptEngine.java b/hutool-script/src/main/java/cn/hutool/script/JavaScriptEngine.java
deleted file mode 100644
index 76557e7e0..000000000
--- a/hutool-script/src/main/java/cn/hutool/script/JavaScriptEngine.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package cn.hutool.script;
-
-import javax.script.Bindings;
-import javax.script.Compilable;
-import javax.script.CompiledScript;
-import javax.script.Invocable;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngineFactory;
-import javax.script.ScriptException;
-import java.io.Reader;
-
-/**
- * Javascript引擎类
- *
- * @author Looly
- */
-public class JavaScriptEngine extends FullSupportScriptEngine {
-
- public JavaScriptEngine() {
- super(ScriptUtil.createJsEngine());
- }
-
- /**
- * 引擎实例
- *
- * @return 引擎实例
- */
- public static JavaScriptEngine instance() {
- return new JavaScriptEngine();
- }
-
- //----------------------------------------------------------------------------------------------- Invocable
- @Override
- public Object invokeMethod(Object thiz, String name, Object... args) throws ScriptException, NoSuchMethodException {
- return ((Invocable) engine).invokeMethod(thiz, name, args);
- }
-
- @Override
- public Object invokeFunction(String name, Object... args) throws ScriptException, NoSuchMethodException {
- return ((Invocable) engine).invokeFunction(name, args);
- }
-
- @Override
- public T getInterface(Class clasz) {
- return ((Invocable) engine).getInterface(clasz);
- }
-
- @Override
- public T getInterface(Object thiz, Class clasz) {
- return ((Invocable) engine).getInterface(thiz, clasz);
- }
-
- //----------------------------------------------------------------------------------------------- Compilable
- @Override
- public CompiledScript compile(String script) throws ScriptException {
- return ((Compilable) engine).compile(script);
- }
-
- @Override
- public CompiledScript compile(Reader script) throws ScriptException {
- return ((Compilable) engine).compile(script);
- }
-
- //----------------------------------------------------------------------------------------------- ScriptEngine
- @Override
- public Object eval(String script, ScriptContext context) throws ScriptException {
- return engine.eval(script, context);
- }
-
- @Override
- public Object eval(Reader reader, ScriptContext context) throws ScriptException {
- return engine.eval(reader, context);
- }
-
- @Override
- public Object eval(String script) throws ScriptException {
- return engine.eval(script);
- }
-
- @Override
- public Object eval(Reader reader) throws ScriptException {
- return engine.eval(reader);
- }
-
- @Override
- public Object eval(String script, Bindings n) throws ScriptException {
- return engine.eval(script, n);
- }
-
- @Override
- public Object eval(Reader reader, Bindings n) throws ScriptException {
- return engine.eval(reader, n);
- }
-
- @Override
- public void put(String key, Object value) {
- engine.put(key, value);
- }
-
- @Override
- public Object get(String key) {
- return engine.get(key);
- }
-
- @Override
- public Bindings getBindings(int scope) {
- return engine.getBindings(scope);
- }
-
- @Override
- public void setBindings(Bindings bindings, int scope) {
- engine.setBindings(bindings, scope);
- }
-
- @Override
- public Bindings createBindings() {
- return engine.createBindings();
- }
-
- @Override
- public ScriptContext getContext() {
- return engine.getContext();
- }
-
- @Override
- public void setContext(ScriptContext context) {
- engine.setContext(context);
- }
-
- @Override
- public ScriptEngineFactory getFactory() {
- return engine.getFactory();
- }
-
-}
diff --git a/hutool-script/src/main/java/cn/hutool/script/ScriptRuntimeException.java b/hutool-script/src/main/java/cn/hutool/script/ScriptRuntimeException.java
deleted file mode 100644
index 48b62e085..000000000
--- a/hutool-script/src/main/java/cn/hutool/script/ScriptRuntimeException.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package cn.hutool.script;
-
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
-
-import javax.script.ScriptException;
-
-/**
- * 脚本运行时异常
- *
- * @author xiaoleilu
- */
-public class ScriptRuntimeException extends RuntimeException {
- private static final long serialVersionUID = 8247610319171014183L;
-
- private String fileName;
- private int lineNumber = -1;
- private int columnNumber = -1;
-
- public ScriptRuntimeException(Throwable e) {
- super(ExceptionUtil.getMessage(e), e);
- }
-
- public ScriptRuntimeException(String message) {
- super(message);
- }
-
- public ScriptRuntimeException(String messageTemplate, Object... params) {
- super(StrUtil.format(messageTemplate, params));
- }
-
- public ScriptRuntimeException(String message, Throwable throwable) {
- super(message, throwable);
- }
-
- public ScriptRuntimeException(String message, Throwable throwable, boolean enableSuppression, boolean writableStackTrace) {
- super(message, throwable, enableSuppression, writableStackTrace);
- }
-
- public ScriptRuntimeException(Throwable throwable, String messageTemplate, Object... params) {
- super(StrUtil.format(messageTemplate, params), throwable);
- }
-
- /**
- * Creates a {@code ScriptException} with message, filename and linenumber to be used in error messages.
- *
- * @param message The string to use in the message
- * @param fileName The file or resource name describing the location of a script error causing the {@code ScriptException} to be thrown.
- * @param lineNumber A line number describing the location of a script error causing the {@code ScriptException} to be thrown.
- */
- public ScriptRuntimeException(String message, String fileName, int lineNumber) {
- super(message);
- this.fileName = fileName;
- this.lineNumber = lineNumber;
- }
-
- /**
- * {@code ScriptException} constructor specifying message, filename, line number and column number.
- *
- * @param message The message.
- * @param fileName The filename
- * @param lineNumber the line number.
- * @param columnNumber the column number.
- */
- public ScriptRuntimeException(String message, String fileName, int lineNumber, int columnNumber) {
- super(message);
- this.fileName = fileName;
- this.lineNumber = lineNumber;
- this.columnNumber = columnNumber;
- }
-
- public ScriptRuntimeException(ScriptException e) {
- super(e);
- this.fileName = e.getFileName();
- this.lineNumber = e.getLineNumber();
- this.columnNumber = e.getColumnNumber();
- }
-
- /**
- * Returns a message containing the String passed to a constructor as well as line and column numbers and filename if any of these are known.
- *
- * @return The error message.
- */
- @Override
- public String getMessage() {
- StringBuilder ret = new StringBuilder().append(super.getMessage());
- if (fileName != null) {
- ret.append(" in ").append(fileName);
- if (lineNumber != -1) {
- ret.append(" at line number ").append(lineNumber);
- }
-
- if (columnNumber != -1) {
- ret.append(" at column number ").append(columnNumber);
- }
- }
-
- return ret.toString();
- }
-
- /**
- * Get the line number on which an error occurred.
- *
- * @return The line number. Returns -1 if a line number is unavailable.
- */
- public int getLineNumber() {
- return lineNumber;
- }
-
- /**
- * Get the column number on which an error occurred.
- *
- * @return The column number. Returns -1 if a column number is unavailable.
- */
- public int getColumnNumber() {
- return columnNumber;
- }
-
- /**
- * Get the source of the script causing the error.
- *
- * @return The file name of the script or some other string describing the script source. May return some implementation-defined string such as <unknown> if a description of the
- * source is unavailable.
- */
- public String getFileName() {
- return fileName;
- }
-}
diff --git a/hutool-script/src/main/java/cn/hutool/script/package-info.java b/hutool-script/src/main/java/cn/hutool/script/package-info.java
deleted file mode 100644
index 0ae0e32f6..000000000
--- a/hutool-script/src/main/java/cn/hutool/script/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Script模块主要针对Java的javax.script封装，可以运行Javascript脚本。
- *
- * @author looly
- *
- */
-package cn.hutool.script;
\ No newline at end of file
diff --git a/hutool-script/src/test/java/cn/hutool/script/test/NashornDeepTest.java b/hutool-script/src/test/java/cn/hutool/script/test/NashornDeepTest.java
deleted file mode 100644
index a2499f041..000000000
--- a/hutool-script/src/test/java/cn/hutool/script/test/NashornDeepTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.hutool.script.test;
-
-
-import cn.hutool.core.io.resource.ResourceUtil;
-import org.junit.Assert;
-
-import javax.script.Invocable;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-
-public class NashornDeepTest {
-
- public static void main(String[] args) throws ScriptException, NoSuchMethodException {
- ScriptEngine engine = new ScriptEngineManager().getEngineByName("js");
-
- engine.eval(ResourceUtil.readUtf8Str("filter1.js"));
-
- final Object filter1 = ((Invocable) engine).invokeFunction("filter1", 1, 2);
- Assert.assertFalse((Boolean) filter1);
- }
-}
diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml
index 1a8a2e7fe..afc5f116c 100755
--- a/hutool-setting/pom.xml
+++ b/hutool-setting/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.8.0.M5
+ 6.0.0.M1
hutool-setting
diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml
index 9e0a00aa2..1f9c38ed4 100755
--- a/hutool-socket/pom.xml
+++ b/hutool-socket/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.8.0.M5
+ 6.0.0.M1
hutool-socket
diff --git a/hutool-captcha/pom.xml b/hutool-swing/pom.xml
old mode 100755
new mode 100644
similarity index 83%
rename from hutool-captcha/pom.xml
rename to hutool-swing/pom.xml
index 157efcfb4..604b363ee
--- a/hutool-captcha/pom.xml
+++ b/hutool-swing/pom.xml
@@ -9,12 +9,12 @@
cn.hutool
hutool-parent
- 5.8.0.M5
+ 6.0.0.M1
- hutool-captcha
+ hutool-swing
${project.artifactId}
- Hutool 验证码工具
+ Hutool swing桌面相关封装
diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/DesktopUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/DesktopUtil.java
similarity index 98%
rename from hutool-core/src/main/java/cn/hutool/core/swing/DesktopUtil.java
rename to hutool-swing/src/main/java/cn/hutool/swing/DesktopUtil.java
index da9d2afde..f65ac940f 100644
--- a/hutool-core/src/main/java/cn/hutool/core/swing/DesktopUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/DesktopUtil.java
@@ -1,13 +1,13 @@
-package cn.hutool.core.swing;
+package cn.hutool.swing;
+
+import cn.hutool.core.io.IORuntimeException;
+import cn.hutool.core.util.URLUtil;
import java.awt.Desktop;
import java.io.File;
import java.io.IOException;
import java.net.URI;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.util.URLUtil;
-
/**
* 桌面相关工具（平台相关）
* Desktop 类允许 Java 应用程序启动已在本机桌面上注册的关联应用程序，以处理 URI 或文件。
diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/RobotUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/RobotUtil.java
similarity index 98%
rename from hutool-core/src/main/java/cn/hutool/core/swing/RobotUtil.java
rename to hutool-swing/src/main/java/cn/hutool/swing/RobotUtil.java
index 430ffbd2a..7ed3be0a5 100644
--- a/hutool-core/src/main/java/cn/hutool/core/swing/RobotUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/RobotUtil.java
@@ -1,7 +1,7 @@
-package cn.hutool.core.swing;
+package cn.hutool.swing;
import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.img.ImgUtil;
+import cn.hutool.swing.img.ImgUtil;
import cn.hutool.core.swing.clipboard.ClipboardUtil;
import java.awt.AWTException;
diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/ScreenUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/ScreenUtil.java
similarity index 98%
rename from hutool-core/src/main/java/cn/hutool/core/swing/ScreenUtil.java
rename to hutool-swing/src/main/java/cn/hutool/swing/ScreenUtil.java
index 047eabb5f..7aedb7f9f 100644
--- a/hutool-core/src/main/java/cn/hutool/core/swing/ScreenUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/ScreenUtil.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.swing;
+package cn.hutool.swing;
import java.awt.Dimension;
import java.awt.Rectangle;
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/AbstractCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/AbstractCaptcha.java
similarity index 96%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/AbstractCaptcha.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/AbstractCaptcha.java
index 85ebcd295..436b70d08 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/AbstractCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/AbstractCaptcha.java
@@ -1,9 +1,9 @@
-package cn.hutool.captcha;
+package cn.hutool.swing.captcha;
-import cn.hutool.captcha.generator.CodeGenerator;
-import cn.hutool.captcha.generator.RandomGenerator;
+import cn.hutool.swing.captcha.generator.CodeGenerator;
+import cn.hutool.swing.captcha.generator.RandomGenerator;
import cn.hutool.core.codec.Base64;
-import cn.hutool.core.img.ImgUtil;
+import cn.hutool.swing.img.ImgUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/CaptchaUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/CaptchaUtil.java
similarity index 98%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/CaptchaUtil.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/CaptchaUtil.java
index dcca26e3b..e95f7101b 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/CaptchaUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/CaptchaUtil.java
@@ -1,4 +1,4 @@
-package cn.hutool.captcha;
+package cn.hutool.swing.captcha;
/**
* 图形验证码工具
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/CircleCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java
similarity index 95%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/CircleCaptcha.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java
index 9e16a90b5..0ef03a62c 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/CircleCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java
@@ -1,7 +1,7 @@
-package cn.hutool.captcha;
+package cn.hutool.swing.captcha;
-import cn.hutool.core.img.GraphicsUtil;
-import cn.hutool.core.img.ImgUtil;
+import cn.hutool.swing.img.GraphicsUtil;
+import cn.hutool.swing.img.ImgUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/GifCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/GifCaptcha.java
similarity index 98%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/GifCaptcha.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/GifCaptcha.java
index 2d996693c..b46feb208 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/GifCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/GifCaptcha.java
@@ -1,7 +1,7 @@
-package cn.hutool.captcha;
+package cn.hutool.swing.captcha;
-import cn.hutool.core.img.gif.AnimatedGifEncoder;
+import cn.hutool.swing.img.gif.AnimatedGifEncoder;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/ICaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/ICaptcha.java
similarity index 95%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/ICaptcha.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/ICaptcha.java
index 68c16c728..7fb88c4c4 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/ICaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/ICaptcha.java
@@ -1,4 +1,4 @@
-package cn.hutool.captcha;
+package cn.hutool.swing.captcha;
import java.io.OutputStream;
import java.io.Serializable;
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/LineCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java
similarity index 95%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/LineCaptcha.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java
index 8bf337635..ed31a87eb 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/LineCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java
@@ -1,4 +1,9 @@
-package cn.hutool.captcha;
+package cn.hutool.swing.captcha;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.swing.img.GraphicsUtil;
+import cn.hutool.swing.img.ImgUtil;
import java.awt.Color;
import java.awt.Graphics;
@@ -7,11 +12,6 @@ import java.awt.Image;
import java.awt.image.BufferedImage;
import java.util.concurrent.ThreadLocalRandom;
-import cn.hutool.core.img.GraphicsUtil;
-import cn.hutool.core.img.ImgUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.RandomUtil;
-
/**
* 使用干扰线方式生成的图形验证码
*
@@ -93,4 +93,4 @@ public class LineCaptcha extends AbstractCaptcha {
}
}
// ----------------------------------------------------------------------------------------------------- Private method start
-}
\ No newline at end of file
+}
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/ShearCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java
similarity index 97%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/ShearCaptcha.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java
index 0f43dcc1d..8304a841c 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/ShearCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java
@@ -1,7 +1,7 @@
-package cn.hutool.captcha;
+package cn.hutool.swing.captcha;
-import cn.hutool.core.img.GraphicsUtil;
-import cn.hutool.core.img.ImgUtil;
+import cn.hutool.swing.img.GraphicsUtil;
+import cn.hutool.swing.img.ImgUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/AbstractGenerator.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/AbstractGenerator.java
similarity index 96%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/generator/AbstractGenerator.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/AbstractGenerator.java
index 1470a7764..159473acd 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/AbstractGenerator.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/AbstractGenerator.java
@@ -1,4 +1,4 @@
-package cn.hutool.captcha.generator;
+package cn.hutool.swing.captcha.generator;
import cn.hutool.core.util.RandomUtil;
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/CodeGenerator.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/CodeGenerator.java
similarity index 92%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/generator/CodeGenerator.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/CodeGenerator.java
index 6fbc97563..c18133d9e 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/CodeGenerator.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/CodeGenerator.java
@@ -1,4 +1,4 @@
-package cn.hutool.captcha.generator;
+package cn.hutool.swing.captcha.generator;
import java.io.Serializable;
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/MathGenerator.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/MathGenerator.java
similarity index 97%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/generator/MathGenerator.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/MathGenerator.java
index 7395b3ee5..b8cef9f0e 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/MathGenerator.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/MathGenerator.java
@@ -1,4 +1,4 @@
-package cn.hutool.captcha.generator;
+package cn.hutool.swing.captcha.generator;
import cn.hutool.core.math.Calculator;
import cn.hutool.core.util.CharUtil;
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/RandomGenerator.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/RandomGenerator.java
similarity index 96%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/generator/RandomGenerator.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/RandomGenerator.java
index 5aa0ca985..6fa92eda0 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/RandomGenerator.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/RandomGenerator.java
@@ -1,4 +1,4 @@
-package cn.hutool.captcha.generator;
+package cn.hutool.swing.captcha.generator;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/package-info.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/package-info.java
similarity index 63%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/generator/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/package-info.java
index c3fbf77a1..380611638 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/package-info.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/package-info.java
@@ -4,4 +4,4 @@
* @author looly
* @since 4.1.2
*/
-package cn.hutool.captcha.generator;
\ No newline at end of file
+package cn.hutool.swing.captcha.generator;
diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/package-info.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/package-info.java
similarity index 62%
rename from hutool-captcha/src/main/java/cn/hutool/captcha/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/swing/captcha/package-info.java
index c23501f5d..0301a4452 100644
--- a/hutool-captcha/src/main/java/cn/hutool/captcha/package-info.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/package-info.java
@@ -4,4 +4,4 @@
* @author looly
*
*/
-package cn.hutool.captcha;
\ No newline at end of file
+package cn.hutool.swing.captcha;
diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardListener.java b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardListener.java
similarity index 100%
rename from hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardListener.java
rename to hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardListener.java
diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardMonitor.java b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java
similarity index 100%
rename from hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardMonitor.java
rename to hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java
diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardUtil.java
similarity index 100%
rename from hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardUtil.java
rename to hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardUtil.java
diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ImageSelection.java b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ImageSelection.java
similarity index 100%
rename from hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ImageSelection.java
rename to hutool-swing/src/main/java/cn/hutool/swing/clipboard/ImageSelection.java
diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/StrClipboardListener.java b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/StrClipboardListener.java
similarity index 100%
rename from hutool-core/src/main/java/cn/hutool/core/swing/clipboard/StrClipboardListener.java
rename to hutool-swing/src/main/java/cn/hutool/swing/clipboard/StrClipboardListener.java
diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/package-info.java b/hutool-swing/src/main/java/cn/hutool/swing/clipboard/package-info.java
similarity index 100%
rename from hutool-core/src/main/java/cn/hutool/core/swing/clipboard/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/swing/clipboard/package-info.java
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/BackgroundRemoval.java b/hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/img/BackgroundRemoval.java
rename to hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java
index 92c43f666..d77a30c37 100644
--- a/hutool-core/src/main/java/cn/hutool/core/img/BackgroundRemoval.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java
@@ -1,8 +1,9 @@
-package cn.hutool.core.img;
+package cn.hutool.swing.img;
import cn.hutool.core.io.FileTypeUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.swing.img.ImgUtil;
import javax.imageio.ImageIO;
import javax.swing.ImageIcon;
@@ -351,4 +352,4 @@ public class BackgroundRemoval {
}
return false;
}
-}
\ No newline at end of file
+}
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/FontUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/img/FontUtil.java
similarity index 98%
rename from hutool-core/src/main/java/cn/hutool/core/img/FontUtil.java
rename to hutool-swing/src/main/java/cn/hutool/swing/img/FontUtil.java
index 2a940339d..4e634b349 100644
--- a/hutool-core/src/main/java/cn/hutool/core/img/FontUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/FontUtil.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.img;
+package cn.hutool.swing.img;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.io.IORuntimeException;
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/GraphicsUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/img/GraphicsUtil.java
rename to hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java
index 79cf288d2..dcb12c0d6 100644
--- a/hutool-core/src/main/java/cn/hutool/core/img/GraphicsUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.img;
+package cn.hutool.swing.img;
import cn.hutool.core.util.ObjectUtil;
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/Img.java b/hutool-swing/src/main/java/cn/hutool/swing/img/Img.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/img/Img.java
rename to hutool-swing/src/main/java/cn/hutool/swing/img/Img.java
index 754ce85ef..920974c3a 100644
--- a/hutool-core/src/main/java/cn/hutool/core/img/Img.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/Img.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.img;
+package cn.hutool.swing.img;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IORuntimeException;
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java
rename to hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java
index 7fc019675..3253b017e 100644
--- a/hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.img;
+package cn.hutool.swing.img;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.convert.Convert;
@@ -63,7 +63,7 @@ import java.util.Random;
/**
* 图片处理工具类：
* 功能：缩放图像、切割图像、旋转、图像类型转换、彩色转黑白、文字水印、图片水印等
- * 参考：http://blog.csdn.net/zhangzhikaixinya/article/details/8459400
+ * 参考：http://blog.csdn.net/zhangzhikaixinya/article/details/8459400
*
* @author Looly
*/
@@ -1046,7 +1046,7 @@ public class ImgUtil {
/**
* 旋转图片为指定角度
- * 来自：http://blog.51cto.com/cping1982/130066
+ * 来自：http://blog.51cto.com/cping1982/130066
*
* @param image 目标图像
* @param degree 旋转角度
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/ScaleType.java b/hutool-swing/src/main/java/cn/hutool/swing/img/ScaleType.java
similarity index 100%
rename from hutool-core/src/main/java/cn/hutool/core/img/ScaleType.java
rename to hutool-swing/src/main/java/cn/hutool/swing/img/ScaleType.java
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/gif/AnimatedGifEncoder.java b/hutool-swing/src/main/java/cn/hutool/swing/img/gif/AnimatedGifEncoder.java
similarity index 98%
rename from hutool-core/src/main/java/cn/hutool/core/img/gif/AnimatedGifEncoder.java
rename to hutool-swing/src/main/java/cn/hutool/swing/img/gif/AnimatedGifEncoder.java
index f1cf8df40..30329508d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/img/gif/AnimatedGifEncoder.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/gif/AnimatedGifEncoder.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.img.gif;
+package cn.hutool.swing.img.gif;
import java.awt.Color;
import java.awt.Graphics2D;
@@ -22,7 +22,7 @@ import java.io.OutputStream;
* e.finish();
*
*
- * 来自：https://github.com/rtyley/animated-gif-lib-for-java
+ * 来自：https://github.com/rtyley/animated-gif-lib-for-java
*
* @author Kevin Weiner, FM Software
* @version 1.03 November 2003
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/gif/GifDecoder.java b/hutool-swing/src/main/java/cn/hutool/swing/img/gif/GifDecoder.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/img/gif/GifDecoder.java
rename to hutool-swing/src/main/java/cn/hutool/swing/img/gif/GifDecoder.java
index ecbb6450e..56637ea61 100644
--- a/hutool-core/src/main/java/cn/hutool/core/img/gif/GifDecoder.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/gif/GifDecoder.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.img.gif;
+package cn.hutool.swing.img.gif;
import cn.hutool.core.io.IoUtil;
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/gif/LZWEncoder.java b/hutool-swing/src/main/java/cn/hutool/swing/img/gif/LZWEncoder.java
similarity index 99%
rename from hutool-core/src/main/java/cn/hutool/core/img/gif/LZWEncoder.java
rename to hutool-swing/src/main/java/cn/hutool/swing/img/gif/LZWEncoder.java
index 129821b91..a7459adf8 100644
--- a/hutool-core/src/main/java/cn/hutool/core/img/gif/LZWEncoder.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/gif/LZWEncoder.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.img.gif;
+package cn.hutool.swing.img.gif;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/gif/NeuQuant.java b/hutool-swing/src/main/java/cn/hutool/swing/img/gif/NeuQuant.java
similarity index 91%
rename from hutool-core/src/main/java/cn/hutool/core/img/gif/NeuQuant.java
rename to hutool-swing/src/main/java/cn/hutool/swing/img/gif/NeuQuant.java
index 09faae944..4753a49c2 100644
--- a/hutool-core/src/main/java/cn/hutool/core/img/gif/NeuQuant.java
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/gif/NeuQuant.java
@@ -1,26 +1,4 @@
-package cn.hutool.core.img.gif;
-
-/* NeuQuant Neural-Net Quantization Algorithm
- * ------------------------------------------
- *
- * Copyright (c) 1994 Anthony Dekker
- *
- * NEUQUANT Neural-Net quantization algorithm by Anthony Dekker, 1994.
- * See "Kohonen neural networks for optimal colour quantization"
- * in "Network: Computation in Neural Systems" Vol. 5 (1994) pp 351-367.
- * for a discussion of the algorithm.
- *
- * Any party obtaining a copy of these files from the author, directly or
- * indirectly, is granted, free of charge, a full and unrestricted irrevocable,
- * world-wide, paid up, royalty-free, nonexclusive right and license to deal
- * in this software and documentation files (the "Software"), including without
- * limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons who receive
- * copies from any such party to do so, with the only requirement being
- * that this copyright notice remain intact.
- */
-
-// Ported to Java 12/00 K Weiner
+package cn.hutool.swing.img.gif;
/**
* NeuQuant Neural-Net Quantization Algorithm
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/gif/package-info.java b/hutool-swing/src/main/java/cn/hutool/swing/img/gif/package-info.java
new file mode 100644
index 000000000..e0280645d
--- /dev/null
+++ b/hutool-swing/src/main/java/cn/hutool/swing/img/gif/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * GIF处理，来自：https://github.com/rtyley/animated-gif-lib-for-java
+ *
+ * @author looly
+ *
+ */
+package cn.hutool.swing.img.gif;
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/package-info.java b/hutool-swing/src/main/java/cn/hutool/swing/img/package-info.java
similarity index 100%
rename from hutool-core/src/main/java/cn/hutool/core/img/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/swing/img/package-info.java
diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/package-info.java b/hutool-swing/src/main/java/cn/hutool/swing/package-info.java
similarity index 100%
rename from hutool-core/src/main/java/cn/hutool/core/swing/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/swing/package-info.java
diff --git a/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardMonitorTest.java b/hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java
similarity index 100%
rename from hutool-core/src/test/java/cn/hutool/core/swing/ClipboardMonitorTest.java
rename to hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java
diff --git a/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardUtilTest.java b/hutool-swing/src/test/java/cn/hutool/swing/ClipboardUtilTest.java
similarity index 100%
rename from hutool-core/src/test/java/cn/hutool/core/swing/ClipboardUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/swing/ClipboardUtilTest.java
diff --git a/hutool-core/src/test/java/cn/hutool/core/swing/DesktopUtilTest.java b/hutool-swing/src/test/java/cn/hutool/swing/DesktopUtilTest.java
similarity index 84%
rename from hutool-core/src/test/java/cn/hutool/core/swing/DesktopUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/swing/DesktopUtilTest.java
index ebcd222f6..561dc520a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/swing/DesktopUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/swing/DesktopUtilTest.java
@@ -1,10 +1,10 @@
-package cn.hutool.core.swing;
+package cn.hutool.swing;
import org.junit.Ignore;
import org.junit.Test;
public class DesktopUtilTest {
-
+
@Test
@Ignore
public void browseTest() {
diff --git a/hutool-core/src/test/java/cn/hutool/core/swing/RobotUtilTest.java b/hutool-swing/src/test/java/cn/hutool/swing/RobotUtilTest.java
similarity index 79%
rename from hutool-core/src/test/java/cn/hutool/core/swing/RobotUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/swing/RobotUtilTest.java
index e0c7f5574..553f02d71 100644
--- a/hutool-core/src/test/java/cn/hutool/core/swing/RobotUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/swing/RobotUtilTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.core.swing;
-
-import org.junit.Ignore;
-import org.junit.Test;
+package cn.hutool.swing;
import cn.hutool.core.io.FileUtil;
+import cn.hutool.swing.RobotUtil;
+import org.junit.Ignore;
+import org.junit.Test;
public class RobotUtilTest {
diff --git a/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java b/hutool-swing/src/test/java/cn/hutool/swing/captcha/CaptchaTest.java
similarity index 97%
rename from hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java
rename to hutool-swing/src/test/java/cn/hutool/swing/captcha/CaptchaTest.java
index 965cbc1e7..f381a58a6 100644
--- a/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/swing/captcha/CaptchaTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.captcha;
+package cn.hutool.swing.captcha;
-import cn.hutool.captcha.generator.MathGenerator;
+import cn.hutool.swing.captcha.generator.MathGenerator;
import cn.hutool.core.lang.Console;
import org.junit.Assert;
import org.junit.Ignore;
diff --git a/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaUtilTest.java b/hutool-swing/src/test/java/cn/hutool/swing/captcha/CaptchaUtilTest.java
similarity index 86%
rename from hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/swing/captcha/CaptchaUtilTest.java
index d57cc393d..5ae8f314e 100644
--- a/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/swing/captcha/CaptchaUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.captcha;
+package cn.hutool.swing.captcha;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/hutool-captcha/src/test/java/cn/hutool/captcha/GeneratorTest.java b/hutool-swing/src/test/java/cn/hutool/swing/captcha/GeneratorTest.java
similarity index 74%
rename from hutool-captcha/src/test/java/cn/hutool/captcha/GeneratorTest.java
rename to hutool-swing/src/test/java/cn/hutool/swing/captcha/GeneratorTest.java
index 999be5c52..9314396f1 100644
--- a/hutool-captcha/src/test/java/cn/hutool/captcha/GeneratorTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/swing/captcha/GeneratorTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.captcha;
+package cn.hutool.swing.captcha;
-import cn.hutool.captcha.generator.MathGenerator;
+import cn.hutool.swing.captcha.generator.MathGenerator;
import org.junit.Test;
public class GeneratorTest {
diff --git a/hutool-core/src/test/java/cn/hutool/core/img/FontUtilTest.java b/hutool-swing/src/test/java/cn/hutool/swing/img/FontUtilTest.java
similarity index 88%
rename from hutool-core/src/test/java/cn/hutool/core/img/FontUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/swing/img/FontUtilTest.java
index f126d925e..873fa75ba 100644
--- a/hutool-core/src/test/java/cn/hutool/core/img/FontUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/swing/img/FontUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.img;
+package cn.hutool.swing.img;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java b/hutool-swing/src/test/java/cn/hutool/swing/img/ImgTest.java
similarity index 98%
rename from hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java
rename to hutool-swing/src/test/java/cn/hutool/swing/img/ImgTest.java
index 09a52a681..d443a00ca 100644
--- a/hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/swing/img/ImgTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.core.img;
+package cn.hutool.swing.img;
import cn.hutool.core.io.FileTypeUtil;
import cn.hutool.core.io.FileUtil;
diff --git a/hutool-core/src/test/java/cn/hutool/core/img/ImgUtilTest.java b/hutool-swing/src/test/java/cn/hutool/swing/img/ImgUtilTest.java
similarity index 98%
rename from hutool-core/src/test/java/cn/hutool/core/img/ImgUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/swing/img/ImgUtilTest.java
index a91e3de6a..0fafbaee5 100644
--- a/hutool-core/src/test/java/cn/hutool/core/img/ImgUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/swing/img/ImgUtilTest.java
@@ -1,6 +1,7 @@
-package cn.hutool.core.img;
+package cn.hutool.swing.img;
import cn.hutool.core.io.FileUtil;
+import cn.hutool.swing.img.ImgUtil;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml
deleted file mode 100755
index 2f557d049..000000000
--- a/hutool-system/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
- 4.0.0
-
- jar
-
-
- cn.hutool
- hutool-parent
- 5.8.0.M5
-
-
- hutool-system
- ${project.artifactId}
- Hutool 系统调用（Runtime）、系统监控封装
-
-
- 1.7.36
-
-
-
-
- cn.hutool
- hutool-core
- ${project.parent.version}
-
-
-
- com.github.oshi
- oshi-core
- 6.1.6
- provided
-
-
- org.slf4j
- slf4j-simple
- ${slf4j.version}
- test
-
-
-
diff --git a/pom.xml b/pom.xml
index 089982238..18a492452 100755
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
cn.hutool
hutool-parent
- 5.8.0.M5
+ 6.0.0.M1
hutool
Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。
https://github.com/dromara/hutool
@@ -16,25 +16,18 @@
hutool-all
hutool-bom
- hutool-aop
- hutool-bloomFilter
- hutool-cache
hutool-core
hutool-cron
hutool-crypto
hutool-db
- hutool-dfa
hutool-extra
hutool-http
hutool-log
- hutool-script
hutool-setting
- hutool-system
hutool-json
hutool-poi
- hutool-captcha
hutool-socket
- hutool-jwt
+ hutool-swing
@@ -148,6 +141,14 @@
+
+ org.codehaus.mojo
+ versions-maven-plugin
+ 2.10.0
+
+ false
+
+
org.codehaus.mojo