diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index adaa4509d..03a930bb7 100755 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -19,7 +19,7 @@ jar - cn.hutool + org.dromara.hutool hutool-parent 6.0.0.M3 diff --git a/hutool-all/src/main/java/cn/hutool/Hutool.java b/hutool-all/src/main/java/org/dromara/hutool/Hutool.java similarity index 91% rename from hutool-all/src/main/java/cn/hutool/Hutool.java rename to hutool-all/src/main/java/org/dromara/hutool/Hutool.java index a6c2aa6b5..697016978 100644 --- a/hutool-all/src/main/java/cn/hutool/Hutool.java +++ b/hutool-all/src/main/java/org/dromara/hutool/Hutool.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool; +package org.dromara.hutool; -import cn.hutool.core.lang.ConsoleTable; -import cn.hutool.core.reflect.ClassUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.lang.ConsoleTable; +import org.dromara.hutool.core.reflect.ClassUtil; +import org.dromara.hutool.core.text.StrUtil; import java.util.Set; @@ -60,7 +60,7 @@ public class Hutool { * @since 5.5.2 */ public static Set> getAllUtils() { - return ClassUtil.scanPackage("cn.hutool", + return ClassUtil.scanPackage("org.dromara.hutool", (clazz) -> (false == clazz.isInterface()) && StrUtil.endWith(clazz.getSimpleName(), "Util")); } diff --git a/hutool-all/src/main/java/cn/hutool/package-info.java b/hutool-all/src/main/java/org/dromara/hutool/package-info.java similarity index 97% rename from hutool-all/src/main/java/cn/hutool/package-info.java rename to hutool-all/src/main/java/org/dromara/hutool/package-info.java index 26cdf69e8..38d088079 100644 --- a/hutool-all/src/main/java/cn/hutool/package-info.java +++ b/hutool-all/src/main/java/org/dromara/hutool/package-info.java @@ -23,4 +23,4 @@ * * @author looly */ -package cn.hutool; +package org.dromara.hutool; diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index fc87ebb62..0025acd7a 100755 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -19,7 +19,7 @@ pom - cn.hutool + org.dromara.hutool hutool-parent 6.0.0.M3 diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index a03de5404..4b93fd533 100755 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -19,7 +19,7 @@ jar - cn.hutool + org.dromara.hutool hutool-parent 6.0.0.M3 @@ -29,7 +29,7 @@ Hutool核心，包括集合、字符串、Bean等工具 - cn.hutool.core + org.dromara.hutool.core diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/lock/package-info.java b/hutool-core/src/main/java/cn/hutool/core/thread/lock/package-info.java deleted file mode 100644 index 79af03e04..000000000 --- a/hutool-core/src/main/java/cn/hutool/core/thread/lock/package-info.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2023 looly(loolly@aliyun.com) - * Hutool is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -/** - * 锁的实现 - * - * @author looly - * - */ -package cn.hutool.core.thread.lock; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/Alias.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/Alias.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/annotation/Alias.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/Alias.java index e481f5bd7..fef3a0772 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/Alias.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/Alias.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; import java.lang.annotation.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotatedElementUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotatedElementUtil.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/annotation/AnnotatedElementUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotatedElementUtil.java index b5f7418ab..56622a7d2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotatedElementUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotatedElementUtil.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.map.WeakConcurrentMap; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.lang.annotation.Annotation; import java.lang.annotation.Inherited; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationMapping.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMapping.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationMapping.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMapping.java index 25f34e100..1e7528021 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationMapping.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMapping.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationMappingProxy.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMappingProxy.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationMappingProxy.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMappingProxy.java index 6d7f5755f..28ece18d3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationMappingProxy.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMappingProxy.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.map.SafeConcurrentHashMap; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.text.CharSequenceUtil; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationHandler; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationProxy.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationProxy.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationProxy.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationProxy.java index c545d50fe..52fbc9338 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationProxy.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationProxy.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.Serializable; import java.lang.annotation.Annotation; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java index 42aa0c887..294e4722a --- a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java @@ -10,20 +10,20 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.func.LambdaInfo; -import cn.hutool.core.lang.func.LambdaUtil; -import cn.hutool.core.lang.func.SerFunction; -import cn.hutool.core.map.WeakConcurrentMap; -import cn.hutool.core.reflect.FieldUtil; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.func.LambdaInfo; +import org.dromara.hutool.core.lang.func.LambdaUtil; +import org.dromara.hutool.core.lang.func.SerFunction; +import org.dromara.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.reflect.FieldUtil; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.lang.annotation.*; import java.lang.reflect.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java index 5cbfd74fe..4f3d14402 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.map.TableMap; +import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.map.TableMap; import java.io.Serializable; import java.lang.annotation.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/GenericAnnotationMapping.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/GenericAnnotationMapping.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/annotation/GenericAnnotationMapping.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/GenericAnnotationMapping.java index 4ac3c9cc4..ee1d1916b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/GenericAnnotationMapping.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/GenericAnnotationMapping.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.reflect.ClassUtil; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.reflect.ClassUtil; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.text.CharSequenceUtil; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/HierarchicalAnnotatedElements.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElements.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/annotation/HierarchicalAnnotatedElements.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElements.java index 22bbaf536..52f126721 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/HierarchicalAnnotatedElements.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElements.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.reflect.ClassUtil; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.reflect.ClassUtil; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/MetaAnnotatedElement.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/MetaAnnotatedElement.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/annotation/MetaAnnotatedElement.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/MetaAnnotatedElement.java index 5c7bfdf64..aff4e837b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/MetaAnnotatedElement.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/MetaAnnotatedElement.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.stream.EasyStream; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.stream.EasyStream; +import org.dromara.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.lang.annotation.Annotation; import java.lang.annotation.Inherited; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/PropIgnore.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/PropIgnore.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/annotation/PropIgnore.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/PropIgnore.java index d756caf4d..92d9464f9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/PropIgnore.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/PropIgnore.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/RepeatableAnnotationCollector.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollector.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/annotation/RepeatableAnnotationCollector.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollector.java index b1cb813f5..09d08b635 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/RepeatableAnnotationCollector.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollector.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.map.WeakConcurrentMap; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.text.CharSequenceUtil; import java.lang.annotation.Annotation; import java.lang.annotation.Repeatable; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/RepeatableMetaAnnotatedElement.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/RepeatableMetaAnnotatedElement.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/annotation/RepeatableMetaAnnotatedElement.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/RepeatableMetaAnnotatedElement.java index 5f960160d..031115880 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/RepeatableMetaAnnotatedElement.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/RepeatableMetaAnnotatedElement.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/ResolvedAnnotationMapping.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMapping.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/annotation/ResolvedAnnotationMapping.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMapping.java index 9130d54d9..5d7324ea4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/ResolvedAnnotationMapping.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMapping.java @@ -10,15 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.map.multi.Graph; -import cn.hutool.core.reflect.ClassUtil; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.map.multi.Graph; +import org.dromara.hutool.core.reflect.ClassUtil; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/annotation/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/annotation/package-info.java index 089be89e6..f164a028a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/annotation/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; diff --git a/hutool-core/src/main/java/cn/hutool/core/array/ArrayUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/array/ArrayUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java index dd3100d3d..9f18f61ce --- a/hutool-core/src/main/java/cn/hutool/core/array/ArrayUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java @@ -10,21 +10,21 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.array; +package org.dromara.hutool.core.array; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.collection.UniqueKeySet; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.comparator.CompareUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.text.StrJoiner; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.UniqueKeySet; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.text.StrJoiner; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.util.RandomUtil; import java.lang.reflect.Array; import java.nio.ByteBuffer; diff --git a/hutool-core/src/main/java/cn/hutool/core/array/ArrayWrapper.java b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/array/ArrayWrapper.java rename to hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java index fff3a3ce9..41f72b541 --- a/hutool-core/src/main/java/cn/hutool/core/array/ArrayWrapper.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java @@ -1,9 +1,9 @@ -package cn.hutool.core.array; +package org.dromara.hutool.core.array; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.func.Wrapper; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.func.Wrapper; +import org.dromara.hutool.core.util.ObjUtil; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/array/PrimitiveArrayUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/array/PrimitiveArrayUtil.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/array/PrimitiveArrayUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/array/PrimitiveArrayUtil.java index d873cfba9..174a8a727 100644 --- a/hutool-core/src/main/java/cn/hutool/core/array/PrimitiveArrayUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/array/PrimitiveArrayUtil.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.array; +package org.dromara.hutool.core.array; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.util.RandomUtil; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/array/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/array/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/array/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/array/package-info.java index 589142777..f377afbdf --- a/hutool-core/src/main/java/cn/hutool/core/array/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/array/package-info.java @@ -15,4 +15,4 @@ * * @author looly */ -package cn.hutool.core.array; +package org.dromara.hutool.core.array; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanDesc.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDesc.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/bean/BeanDesc.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDesc.java index d510829d0..ca7d0e65d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanDesc.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDesc.java @@ -10,15 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.map.CaseInsensitiveMap; -import cn.hutool.core.reflect.FieldUtil; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.reflect.ModifierUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.BooleanUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.map.CaseInsensitiveMap; +import org.dromara.hutool.core.reflect.FieldUtil; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.reflect.ModifierUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.BooleanUtil; import java.io.Serializable; import java.lang.reflect.Field; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanDescCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDescCache.java old mode 100755 new mode 100644 similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/bean/BeanDescCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDescCache.java index 417502e64..258320b24 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanDescCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDescCache.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.lang.func.SerSupplier; -import cn.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.lang.func.SerSupplier; +import org.dromara.hutool.core.map.WeakConcurrentMap; /** * Bean属性缓存
diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanException.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/bean/BeanException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java index 147745cb8..ec0db384a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exceptions.ExceptionUtil; +import org.dromara.hutool.core.text.StrUtil; /** * Bean异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanInfoCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanInfoCache.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/bean/BeanInfoCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanInfoCache.java index 5892b3107..9d0e7c3be --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanInfoCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanInfoCache.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.lang.func.SerSupplier; -import cn.hutool.core.map.ReferenceConcurrentMap; -import cn.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.lang.func.SerSupplier; +import org.dromara.hutool.core.map.ReferenceConcurrentMap; +import org.dromara.hutool.core.map.WeakConcurrentMap; import java.beans.PropertyDescriptor; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanPath.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanPath.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/bean/BeanPath.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanPath.java index 966451b80..5b055fe23 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanPath.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanPath.java @@ -10,17 +10,17 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.CharUtil; import java.io.Serializable; import java.util.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java index a8f884a3e..eec392df1 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java @@ -10,25 +10,25 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.bean.copier.BeanCopier; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.bean.copier.ValueProvider; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.mutable.MutableEntry; -import cn.hutool.core.map.CaseInsensitiveMap; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.reflect.ClassUtil; -import cn.hutool.core.reflect.ConstructorUtil; -import cn.hutool.core.reflect.FieldUtil; -import cn.hutool.core.reflect.ModifierUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.bean.copier.BeanCopier; +import org.dromara.hutool.core.bean.copier.CopyOptions; +import org.dromara.hutool.core.bean.copier.ValueProvider; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.lang.mutable.MutableEntry; +import org.dromara.hutool.core.map.CaseInsensitiveMap; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.reflect.ClassUtil; +import org.dromara.hutool.core.reflect.ConstructorUtil; +import org.dromara.hutool.core.reflect.FieldUtil; +import org.dromara.hutool.core.reflect.ModifierUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.beans.BeanInfo; import java.beans.IntrospectionException; @@ -759,8 +759,8 @@ public class BeanUtil { /** * 给定的Bean的类名是否匹配指定类名字符串
- * 如果isSimple为{@code true}，则只匹配类名而忽略包名，例如：cn.hutool.TestEntity只匹配TestEntity
- * 如果isSimple为{@code false}，则匹配包括包名的全类名，例如：cn.hutool.TestEntity匹配cn.hutool.TestEntity + * 如果isSimple为{@code true}，则只匹配类名而忽略包名，例如：org.dromara.hutool.TestEntity只匹配TestEntity
+ * 如果isSimple为{@code false}，则匹配包括包名的全类名，例如：org.dromara.hutool.TestEntity匹配org.dromara.hutool.TestEntity * * @param bean Bean * @param beanClassName Bean的类名 diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/DynaBean.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/DynaBean.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/bean/DynaBean.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/DynaBean.java index b441a6579..fa6e65e49 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/DynaBean.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/DynaBean.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.exceptions.CloneRuntimeException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.reflect.ClassUtil; -import cn.hutool.core.reflect.ConstructorUtil; -import cn.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.exceptions.CloneRuntimeException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.reflect.ClassUtil; +import org.dromara.hutool.core.reflect.ConstructorUtil; +import org.dromara.hutool.core.reflect.MethodUtil; import java.io.Serializable; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/NullWrapperBean.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/NullWrapperBean.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/bean/NullWrapperBean.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/NullWrapperBean.java index 5341ec4fa..133eaf643 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/NullWrapperBean.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/NullWrapperBean.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; /** * 为了解决反射过程中,需要传递null参数,但是会丢失参数类型而设立的包装类 diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/PropDesc.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/PropDesc.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/bean/PropDesc.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/PropDesc.java index 5fb0a2c30..2f2810162 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/PropDesc.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/PropDesc.java @@ -10,16 +10,16 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.annotation.AnnotationUtil; -import cn.hutool.core.annotation.PropIgnore; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.func.LambdaUtil; -import cn.hutool.core.reflect.FieldUtil; -import cn.hutool.core.reflect.ModifierUtil; -import cn.hutool.core.reflect.ReflectUtil; -import cn.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.annotation.AnnotationUtil; +import org.dromara.hutool.core.annotation.PropIgnore; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.lang.func.LambdaUtil; +import org.dromara.hutool.core.reflect.FieldUtil; +import org.dromara.hutool.core.reflect.ModifierUtil; +import org.dromara.hutool.core.reflect.ReflectUtil; +import org.dromara.hutool.core.reflect.TypeUtil; import java.beans.Transient; import java.lang.reflect.Field; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/AbsCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/AbsCopier.java old mode 100755 new mode 100644 similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/bean/copier/AbsCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/AbsCopier.java index eb5b436b4..1415b0737 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/AbsCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/AbsCopier.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean.copier; +package org.dromara.hutool.core.bean.copier; -import cn.hutool.core.lang.copier.Copier; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.lang.copier.Copier; +import org.dromara.hutool.core.util.ObjUtil; /** * 抽象的对象拷贝封装，提供来源对象、目标对象持有 diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanCopier.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanCopier.java index 5c044f399..14645b08a --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanCopier.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean.copier; +package org.dromara.hutool.core.bean.copier; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.copier.Copier; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.copier.Copier; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanToBeanCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToBeanCopier.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanToBeanCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToBeanCopier.java index d1e5d17bd..47f2a95b6 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanToBeanCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToBeanCopier.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean.copier; +package org.dromara.hutool.core.bean.copier; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.PropDesc; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.mutable.MutableEntry; -import cn.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.bean.PropDesc; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.mutable.MutableEntry; +import org.dromara.hutool.core.reflect.TypeUtil; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanToMapCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToMapCopier.java old mode 100755 new mode 100644 similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanToMapCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToMapCopier.java index 5ca99dcb8..bdff74653 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanToMapCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToMapCopier.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean.copier; +package org.dromara.hutool.core.bean.copier; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.PropDesc; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.mutable.MutableEntry; -import cn.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.bean.PropDesc; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.mutable.MutableEntry; +import org.dromara.hutool.core.reflect.TypeUtil; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/CopyOptions.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/CopyOptions.java index 830ce30c9..959b8e59e --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/CopyOptions.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean.copier; +package org.dromara.hutool.core.bean.copier; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.convert.Converter; -import cn.hutool.core.lang.func.LambdaUtil; -import cn.hutool.core.lang.func.SerFunction; -import cn.hutool.core.lang.mutable.MutableEntry; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.convert.Converter; +import org.dromara.hutool.core.lang.func.LambdaUtil; +import org.dromara.hutool.core.lang.func.SerFunction; +import org.dromara.hutool.core.lang.mutable.MutableEntry; +import org.dromara.hutool.core.array.ArrayUtil; import java.io.Serializable; import java.lang.reflect.Field; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToBeanCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToBeanCopier.java old mode 100755 new mode 100644 similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToBeanCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToBeanCopier.java index e649cc541..e2fa5631d --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToBeanCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToBeanCopier.java @@ -10,16 +10,16 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean.copier; +package org.dromara.hutool.core.bean.copier; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.PropDesc; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.mutable.MutableEntry; -import cn.hutool.core.map.CaseInsensitiveMap; -import cn.hutool.core.map.MapWrapper; -import cn.hutool.core.reflect.TypeUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.bean.PropDesc; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.mutable.MutableEntry; +import org.dromara.hutool.core.map.CaseInsensitiveMap; +import org.dromara.hutool.core.map.MapWrapper; +import org.dromara.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.text.StrUtil; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToMapCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToMapCopier.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToMapCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToMapCopier.java index 21f43a985..c6c03c3ea --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToMapCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToMapCopier.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean.copier; +package org.dromara.hutool.core.bean.copier; -import cn.hutool.core.lang.mutable.MutableEntry; -import cn.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.lang.mutable.MutableEntry; +import org.dromara.hutool.core.reflect.TypeUtil; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/ValueProvider.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProvider.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/bean/copier/ValueProvider.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProvider.java index 3764497ef..382025a6e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/ValueProvider.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProvider.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean.copier; +package org.dromara.hutool.core.bean.copier; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/ValueProviderToBeanCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProviderToBeanCopier.java old mode 100755 new mode 100644 similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/bean/copier/ValueProviderToBeanCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProviderToBeanCopier.java index 14b61e792..1d0e784b6 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/ValueProviderToBeanCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProviderToBeanCopier.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean.copier; +package org.dromara.hutool.core.bean.copier; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.PropDesc; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.mutable.MutableEntry; -import cn.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.bean.PropDesc; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.mutable.MutableEntry; +import org.dromara.hutool.core.reflect.TypeUtil; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/bean/copier/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/package-info.java index f8453f9d7..27d5d6982 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.bean.copier; +package org.dromara.hutool.core.bean.copier; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/provider/DynaBeanValueProvider.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/DynaBeanValueProvider.java similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/bean/copier/provider/DynaBeanValueProvider.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/DynaBeanValueProvider.java index 22636de66..12ae5a728 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/provider/DynaBeanValueProvider.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/DynaBeanValueProvider.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.bean.copier.provider; +package org.dromara.hutool.core.bean.copier.provider; -import cn.hutool.core.bean.DynaBean; -import cn.hutool.core.bean.copier.ValueProvider; -import cn.hutool.core.convert.Convert; +import org.dromara.hutool.core.bean.DynaBean; +import org.dromara.hutool.core.bean.copier.ValueProvider; +import org.dromara.hutool.core.convert.Convert; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/provider/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/package-info.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/bean/copier/provider/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/package-info.java index ea9f2f688..abb0177cb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/provider/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.bean.copier.provider; +package org.dromara.hutool.core.bean.copier.provider; diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/bean/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/bean/package-info.java index 5d6959632..41bfb2be9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/Cache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/Cache.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/cache/Cache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/Cache.java index ecf9c2c0e..fbb66b5e3 --- a/hutool-core/src/main/java/cn/hutool/core/cache/Cache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/Cache.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache; +package org.dromara.hutool.core.cache; -import cn.hutool.core.cache.impl.CacheObj; -import cn.hutool.core.lang.func.SerSupplier; +import org.dromara.hutool.core.cache.impl.CacheObj; +import org.dromara.hutool.core.lang.func.SerSupplier; import java.io.Serializable; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/CacheListener.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/CacheListener.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/cache/CacheListener.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/CacheListener.java index 40bb1dbaf..707f31f8c --- a/hutool-core/src/main/java/cn/hutool/core/cache/CacheListener.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/CacheListener.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache; +package org.dromara.hutool.core.cache; /** * 缓存监听，用于实现缓存操作时的回调监听，例如缓存对象的移除事件等 diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/CacheUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/CacheUtil.java old mode 100755 new mode 100644 similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/cache/CacheUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/CacheUtil.java index fed549f15..fed065dd8 --- a/hutool-core/src/main/java/cn/hutool/core/cache/CacheUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/CacheUtil.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache; +package org.dromara.hutool.core.cache; -import cn.hutool.core.cache.impl.FIFOCache; -import cn.hutool.core.cache.impl.LFUCache; -import cn.hutool.core.cache.impl.LRUCache; -import cn.hutool.core.cache.impl.NoCache; -import cn.hutool.core.cache.impl.TimedCache; -import cn.hutool.core.cache.impl.WeakCache; +import org.dromara.hutool.core.cache.impl.FIFOCache; +import org.dromara.hutool.core.cache.impl.LFUCache; +import org.dromara.hutool.core.cache.impl.LRUCache; +import org.dromara.hutool.core.cache.impl.NoCache; +import org.dromara.hutool.core.cache.impl.TimedCache; +import org.dromara.hutool.core.cache.impl.WeakCache; /** * 缓存工具类 diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/GlobalPruneTimer.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/GlobalPruneTimer.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/cache/GlobalPruneTimer.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/GlobalPruneTimer.java index e379bb7e8..d8388d6fb --- a/hutool-core/src/main/java/cn/hutool/core/cache/GlobalPruneTimer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/GlobalPruneTimer.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache; +package org.dromara.hutool.core.cache; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.text.StrUtil; import java.util.List; import java.util.concurrent.ScheduledExecutorService; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/SimpleCache.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/SimpleCache.java index 833f845ec..bf7c44fd7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/cache/SimpleCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/SimpleCache.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache; +package org.dromara.hutool.core.cache; -import cn.hutool.core.collection.iter.TransIter; -import cn.hutool.core.lang.func.SerSupplier; -import cn.hutool.core.lang.mutable.Mutable; -import cn.hutool.core.lang.mutable.MutableObj; -import cn.hutool.core.map.SafeConcurrentHashMap; -import cn.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.collection.iter.TransIter; +import org.dromara.hutool.core.lang.func.SerSupplier; +import org.dromara.hutool.core.lang.mutable.Mutable; +import org.dromara.hutool.core.lang.mutable.MutableObj; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.map.WeakConcurrentMap; import java.io.Serializable; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/file/AbstractFileCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/AbstractFileCache.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/cache/file/AbstractFileCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/file/AbstractFileCache.java index 3feb63936..0f6f5f09e --- a/hutool-core/src/main/java/cn/hutool/core/cache/file/AbstractFileCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/AbstractFileCache.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.file; +package org.dromara.hutool.core.cache.file; -import cn.hutool.core.cache.Cache; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.cache.Cache; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.IORuntimeException; import java.io.File; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/file/LFUFileCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/LFUFileCache.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/cache/file/LFUFileCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/file/LFUFileCache.java index b6e6786b2..ba2ca372a --- a/hutool-core/src/main/java/cn/hutool/core/cache/file/LFUFileCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/LFUFileCache.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.file; +package org.dromara.hutool.core.cache.file; -import cn.hutool.core.cache.Cache; -import cn.hutool.core.cache.impl.LFUCache; +import org.dromara.hutool.core.cache.Cache; +import org.dromara.hutool.core.cache.impl.LFUCache; import java.io.File; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/file/LRUFileCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/LRUFileCache.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/cache/file/LRUFileCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/file/LRUFileCache.java index abbacfb9e..a08542928 --- a/hutool-core/src/main/java/cn/hutool/core/cache/file/LRUFileCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/LRUFileCache.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.file; +package org.dromara.hutool.core.cache.file; -import cn.hutool.core.cache.Cache; -import cn.hutool.core.cache.impl.LRUCache; +import org.dromara.hutool.core.cache.Cache; +import org.dromara.hutool.core.cache.impl.LRUCache; import java.io.File; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/file/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/cache/file/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/file/package-info.java index 1e799f4aa..19f054aff --- a/hutool-core/src/main/java/cn/hutool/core/cache/file/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.cache.file; +package org.dromara.hutool.core.cache.file; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/AbstractCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/AbstractCache.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/AbstractCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/AbstractCache.java index 8839bc0fd..caf0b68cd --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/AbstractCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/AbstractCache.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; -import cn.hutool.core.cache.Cache; -import cn.hutool.core.cache.CacheListener; -import cn.hutool.core.lang.func.SerSupplier; -import cn.hutool.core.lang.mutable.Mutable; -import cn.hutool.core.lang.mutable.MutableObj; -import cn.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.cache.Cache; +import org.dromara.hutool.core.cache.CacheListener; +import org.dromara.hutool.core.lang.func.SerSupplier; +import org.dromara.hutool.core.lang.mutable.Mutable; +import org.dromara.hutool.core.lang.mutable.MutableObj; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; import java.util.Iterator; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/CacheObj.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObj.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/CacheObj.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObj.java index 44c07335e..a4544419d --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/CacheObj.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObj.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; -import cn.hutool.core.date.DateUtil; +import org.dromara.hutool.core.date.DateUtil; import java.io.Serializable; import java.util.Date; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/CacheObjIterator.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObjIterator.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/CacheObjIterator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObjIterator.java index a43acc020..d4814c41f --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/CacheObjIterator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObjIterator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; import java.io.Serializable; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/CacheValuesIterator.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheValuesIterator.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/CacheValuesIterator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheValuesIterator.java index 2006b6ccc..62a4090e0 --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/CacheValuesIterator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheValuesIterator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; import java.io.Serializable; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/FIFOCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/FIFOCache.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/FIFOCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/FIFOCache.java index 5f5d37d1c..81ae5dcf9 --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/FIFOCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/FIFOCache.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/LFUCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LFUCache.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/LFUCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LFUCache.java index c795f0f2e..14c502a84 --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/LFUCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LFUCache.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; import java.util.HashMap; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/LRUCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LRUCache.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/LRUCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LRUCache.java index 931a93074..0214f4fae --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/LRUCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LRUCache.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; -import cn.hutool.core.lang.mutable.Mutable; -import cn.hutool.core.map.FixedLinkedHashMap; +import org.dromara.hutool.core.lang.mutable.Mutable; +import org.dromara.hutool.core.map.FixedLinkedHashMap; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/NoCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/NoCache.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/NoCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/NoCache.java index b8dd72472..d68a30b36 --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/NoCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/NoCache.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; -import cn.hutool.core.cache.Cache; -import cn.hutool.core.lang.func.SerSupplier; +import org.dromara.hutool.core.cache.Cache; +import org.dromara.hutool.core.lang.func.SerSupplier; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/ReentrantCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/ReentrantCache.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/ReentrantCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/ReentrantCache.java index 40f792ac3..9748bdb5a --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/ReentrantCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/ReentrantCache.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; -import cn.hutool.core.collection.iter.CopiedIter; +import org.dromara.hutool.core.collection.iter.CopiedIter; import java.util.Iterator; import java.util.concurrent.locks.ReentrantLock; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/StampedCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/StampedCache.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/StampedCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/StampedCache.java index 45adaaf91..be2b0f766 --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/StampedCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/StampedCache.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; -import cn.hutool.core.collection.iter.CopiedIter; +import org.dromara.hutool.core.collection.iter.CopiedIter; import java.util.Iterator; import java.util.concurrent.locks.StampedLock; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/TimedCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/TimedCache.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/TimedCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/TimedCache.java index 6611a4a05..c39697993 --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/TimedCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/TimedCache.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; -import cn.hutool.core.cache.GlobalPruneTimer; -import cn.hutool.core.lang.mutable.Mutable; +import org.dromara.hutool.core.cache.GlobalPruneTimer; +import org.dromara.hutool.core.lang.mutable.Mutable; import java.util.HashMap; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/WeakCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/WeakCache.java old mode 100755 new mode 100644 similarity index 87% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/WeakCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/WeakCache.java index 4651562fd..3e5604790 --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/WeakCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/WeakCache.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; -import cn.hutool.core.cache.CacheListener; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.lang.mutable.Mutable; -import cn.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.cache.CacheListener; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.lang.mutable.Mutable; +import org.dromara.hutool.core.map.WeakConcurrentMap; import java.lang.ref.Reference; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/impl/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/cache/impl/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/package-info.java index 17b539998..c4309cee8 --- a/hutool-core/src/main/java/cn/hutool/core/cache/impl/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.cache.impl; +package org.dromara.hutool.core.cache.impl; diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/package-info.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/cache/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/cache/package-info.java index 50d0e2cbc..9a08d3bc0 --- a/hutool-core/src/main/java/cn/hutool/core/cache/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.cache; +package org.dromara.hutool.core.cache; diff --git a/hutool-core/src/main/java/cn/hutool/core/classloader/ClassLoaderUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/classloader/ClassLoaderUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java index d3be19cbf..55a68d0fe 100644 --- a/hutool-core/src/main/java/cn/hutool/core/classloader/ClassLoaderUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java @@ -10,16 +10,16 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.classloader; +package org.dromara.hutool.core.classloader; -import cn.hutool.core.convert.BasicType; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.map.SafeConcurrentHashMap; -import cn.hutool.core.text.CharPool; -import cn.hutool.core.text.StrTrimer; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.convert.BasicType; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.text.CharPool; +import org.dromara.hutool.core.text.StrTrimer; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharUtil; import java.io.File; import java.lang.reflect.Array; diff --git a/hutool-core/src/main/java/cn/hutool/core/classloader/JarClassLoader.java b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/classloader/JarClassLoader.java rename to hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java index 9cdcb1366..17574057a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/classloader/JarClassLoader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.classloader; +package org.dromara.hutool.core.classloader; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.net.url.URLUtil; -import cn.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.reflect.MethodUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/classloader/ResourceClassLoader.java b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ResourceClassLoader.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/classloader/ResourceClassLoader.java rename to hutool-core/src/main/java/org/dromara/hutool/core/classloader/ResourceClassLoader.java index f1bc1adf2..8a11a8b34 100644 --- a/hutool-core/src/main/java/cn/hutool/core/classloader/ResourceClassLoader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ResourceClassLoader.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.classloader; +package org.dromara.hutool.core.classloader; -import cn.hutool.core.io.resource.Resource; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.io.resource.Resource; +import org.dromara.hutool.core.util.ObjUtil; import java.security.SecureClassLoader; import java.util.HashMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/classloader/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/classloader/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/classloader/package-info.java index 31d403400..657f3158f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/classloader/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.classloader; +package org.dromara.hutool.core.classloader; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Caesar.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Caesar.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/codec/Caesar.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/Caesar.java index 067ae3b1b..37271bf53 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Caesar.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Caesar.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; /** * 凯撒密码实现
diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Decoder.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Decoder.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/codec/Decoder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/Decoder.java index 76fb453c4..6c00cb543 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Decoder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Decoder.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; /** * 解码接口 diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Encoder.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Encoder.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/codec/Encoder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/Encoder.java index 3ba4b9e67..a73baadc6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Encoder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Encoder.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; /** * 编码接口 diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Hashids.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/codec/Hashids.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java index ea4695001..9fde50ecd --- a/hutool-core/src/main/java/cn/hutool/core/codec/Hashids.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; import java.math.BigInteger; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/HexUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/HexUtil.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/codec/HexUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/HexUtil.java index 6a475df38..8be0fc924 --- a/hutool-core/src/main/java/cn/hutool/core/codec/HexUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/HexUtil.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; -import cn.hutool.core.codec.binary.Base16Codec; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.codec.binary.Base16Codec; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.awt.Color; import java.math.BigInteger; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Morse.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/codec/Morse.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java index 9c639137d..5af6e9dc4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Morse.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.util.CharUtil; import java.util.HashMap; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Number128.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Number128.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/codec/Number128.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/Number128.java index c6ebe1d44..9c70bc335 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Number128.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Number128.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/PercentCodec.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/PercentCodec.java index 8ccc05b21..0b5e6006a --- a/hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/PercentCodec.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; -import cn.hutool.core.codec.binary.Base16Codec; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.CharPool; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.codec.binary.Base16Codec; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.CharPool; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.CharUtil; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -179,7 +179,7 @@ public class PercentCodec implements Encoder, Serializable { * @author looly * @since 6.0.0 */ - public static class Builder implements cn.hutool.core.lang.builder.Builder { + public static class Builder implements org.dromara.hutool.core.lang.builder.Builder { private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/PunyCode.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/codec/PunyCode.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java index e705ee0d6..a53e01561 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/PunyCode.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.util.CharUtil; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/RadixUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/RadixUtil.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/codec/RadixUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/RadixUtil.java index 6ebe14cd3..cc4f23915 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/RadixUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/RadixUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; /** * 进制转换工具类，可以转换为任意进制 diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Rot.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Rot.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/codec/Rot.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/Rot.java index 2824fc5e9..9953123a6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Rot.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Rot.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; /** * RotN（rotate by N places），回转N位密码，是一种简易的替换式密码，也是过去在古罗马开发的凯撒加密的一种变体。
diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base16Codec.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base16Codec.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/codec/binary/Base16Codec.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base16Codec.java index fb404bf4a..0f9971655 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base16Codec.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base16Codec.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.binary; +package org.dromara.hutool.core.codec.binary; -import cn.hutool.core.codec.Decoder; -import cn.hutool.core.codec.Encoder; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.codec.Decoder; +import org.dromara.hutool.core.codec.Encoder; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.text.StrUtil; /** * Base16（Hex）编码解码器
diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base32.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base32.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/codec/binary/Base32.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base32.java index 2eba56d43..68d915dce 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base32.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base32.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.binary; +package org.dromara.hutool.core.codec.binary; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base32Codec.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base32Codec.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/codec/binary/Base32Codec.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base32Codec.java index 1cf0a17e5..b0bd5dede 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base32Codec.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base32Codec.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.binary; +package org.dromara.hutool.core.codec.binary; -import cn.hutool.core.codec.Decoder; -import cn.hutool.core.codec.Encoder; +import org.dromara.hutool.core.codec.Decoder; +import org.dromara.hutool.core.codec.Encoder; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base58.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/codec/binary/Base58.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java index df0dd7f03..82d8728b9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base58.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.binary; +package org.dromara.hutool.core.codec.binary; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.exceptions.ValidateException; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.ValidateException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base58Codec.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58Codec.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/codec/binary/Base58Codec.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58Codec.java index 8fd40c759..1804dab7e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base58Codec.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58Codec.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.binary; +package org.dromara.hutool.core.codec.binary; -import cn.hutool.core.codec.Decoder; -import cn.hutool.core.codec.Encoder; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.codec.Decoder; +import org.dromara.hutool.core.codec.Encoder; +import org.dromara.hutool.core.text.StrUtil; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base62.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base62.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/codec/binary/Base62.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base62.java index 48d3a56d1..49672f45f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base62.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base62.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.binary; +package org.dromara.hutool.core.codec.binary; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base62Codec.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base62Codec.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/codec/binary/Base62Codec.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base62Codec.java index bdd1f7f5d..dd870c8c5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base62Codec.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base62Codec.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.binary; +package org.dromara.hutool.core.codec.binary; -import cn.hutool.core.codec.Decoder; -import cn.hutool.core.codec.Encoder; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.codec.Decoder; +import org.dromara.hutool.core.codec.Encoder; +import org.dromara.hutool.core.array.ArrayUtil; import java.io.ByteArrayOutputStream; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base64.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/codec/binary/Base64.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64.java index 481dbf019..4412f244f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base64.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.binary; +package org.dromara.hutool.core.codec.binary; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base64Decoder.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64Decoder.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/codec/binary/Base64Decoder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64Decoder.java index 4a821c4a9..434c7b8c6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/binary/Base64Decoder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64Decoder.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.binary; +package org.dromara.hutool.core.codec.binary; -import cn.hutool.core.codec.Decoder; -import cn.hutool.core.lang.mutable.MutableInt; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.codec.Decoder; +import org.dromara.hutool.core.lang.mutable.MutableInt; +import org.dromara.hutool.core.array.ArrayUtil; /** * Base64解码实现
diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/binary/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/codec/binary/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/package-info.java index e9edd9188..e1c8722cd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/binary/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/package-info.java @@ -20,4 +20,4 @@ *
  • Base64
    • * */ -package cn.hutool.core.codec.binary; +package org.dromara.hutool.core.codec.binary; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/CityHash.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/CityHash.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/CityHash.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/CityHash.java index b6e8cd2a4..68b2d76f7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/CityHash.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/CityHash.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; -import cn.hutool.core.codec.Number128; -import cn.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.codec.Number128; +import org.dromara.hutool.core.util.ByteUtil; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/ConsistentHash.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/ConsistentHash.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/ConsistentHash.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/ConsistentHash.java index 6737b9a1a..0b8881469 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/ConsistentHash.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/ConsistentHash.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; import java.io.Serializable; import java.util.Collection; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/Hash128.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash128.java old mode 100755 new mode 100644 similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/Hash128.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash128.java index 5829e0eaa..06277bcee --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/Hash128.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash128.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; -import cn.hutool.core.codec.Encoder; -import cn.hutool.core.codec.Number128; +import org.dromara.hutool.core.codec.Encoder; +import org.dromara.hutool.core.codec.Number128; /** * Hash计算接口 diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/Hash32.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash32.java old mode 100755 new mode 100644 similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/Hash32.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash32.java index 287a1dab5..c077f23d5 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/Hash32.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash32.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; -import cn.hutool.core.codec.Encoder; +import org.dromara.hutool.core.codec.Encoder; /** * Hash计算接口 diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/Hash64.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash64.java old mode 100755 new mode 100644 similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/Hash64.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash64.java index 51f0f1e31..06c16be82 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/Hash64.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash64.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; -import cn.hutool.core.codec.Encoder; +import org.dromara.hutool.core.codec.Encoder; /** * Hash计算接口 diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/HashUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/HashUtil.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/HashUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/HashUtil.java index 9aab87f69..f31bdfd52 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/HashUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/HashUtil.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; -import cn.hutool.core.codec.Number128; -import cn.hutool.core.codec.hash.metro.MetroHash128; -import cn.hutool.core.codec.hash.metro.MetroHash64; +import org.dromara.hutool.core.codec.Number128; +import org.dromara.hutool.core.codec.hash.metro.MetroHash128; +import org.dromara.hutool.core.codec.hash.metro.MetroHash64; /** * Hash算法大全
    diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/KetamaHash.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/KetamaHash.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/KetamaHash.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/KetamaHash.java index 92fc2d72f..47cc83c54 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/KetamaHash.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/KetamaHash.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/MurmurHash.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/MurmurHash.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/MurmurHash.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/MurmurHash.java index 9a5b8bf6f..38e5fdb25 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/MurmurHash.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/MurmurHash.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; -import cn.hutool.core.codec.Number128; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.codec.Number128; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.nio.ByteOrder; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/Simhash.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Simhash.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/Simhash.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Simhash.java index b745ff03e..869411c53 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/Simhash.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Simhash.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; import java.math.BigInteger; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/AbstractMetroHash.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/AbstractMetroHash.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/AbstractMetroHash.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/AbstractMetroHash.java index 8b6f07014..cb18af17a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/AbstractMetroHash.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/AbstractMetroHash.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash.metro; +package org.dromara.hutool.core.codec.hash.metro; import java.nio.ByteBuffer; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/MetroHash.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/MetroHash.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash.java index 0fbc8228e..323f52572 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/MetroHash.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash.metro; +package org.dromara.hutool.core.codec.hash.metro; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/MetroHash128.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash128.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/MetroHash128.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash128.java index 51203c1e8..05bbd96a0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/MetroHash128.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash128.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash.metro; +package org.dromara.hutool.core.codec.hash.metro; -import cn.hutool.core.codec.Number128; -import cn.hutool.core.codec.hash.Hash128; +import org.dromara.hutool.core.codec.Number128; +import org.dromara.hutool.core.codec.hash.Hash128; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/MetroHash64.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash64.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/MetroHash64.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash64.java index d9eaf1b3c..16b2151b2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/MetroHash64.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash64.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.codec.hash.metro; +package org.dromara.hutool.core.codec.hash.metro; -import cn.hutool.core.codec.hash.Hash64; +import org.dromara.hutool.core.codec.hash.Hash64; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/package-info.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/package-info.java index 5de950a7b..530ed4f5c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/metro/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/package-info.java @@ -17,4 +17,4 @@ * * @author postamar, looly */ -package cn.hutool.core.codec.hash.metro; +package org.dromara.hutool.core.codec.hash.metro; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/hash/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/codec/hash/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/package-info.java index fb7471e1c..3d9fa486e --- a/hutool-core/src/main/java/cn/hutool/core/codec/hash/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/codec/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/codec/package-info.java index 78137dbc0..22dbcfd7b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/codec/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/BoundedPriorityQueue.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/BoundedPriorityQueue.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/collection/BoundedPriorityQueue.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/BoundedPriorityQueue.java index 753619879..f3b127571 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/BoundedPriorityQueue.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/BoundedPriorityQueue.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; import java.util.ArrayList; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CheckedLinkedBlockingQueue.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CheckedLinkedBlockingQueue.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/collection/CheckedLinkedBlockingQueue.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/CheckedLinkedBlockingQueue.java index 9e5254866..6e8623244 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CheckedLinkedBlockingQueue.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CheckedLinkedBlockingQueue.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; import java.util.Collection; import java.util.concurrent.LinkedBlockingQueue; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollStreamUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollStreamUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/collection/CollStreamUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/CollStreamUtil.java index 91cf1de49..183e17280 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CollStreamUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollStreamUtil.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.stream.CollectorUtil; -import cn.hutool.core.stream.StreamUtil; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.stream.CollectorUtil; +import org.dromara.hutool.core.stream.StreamUtil; import java.util.Collection; import java.util.HashMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java index 0ded0c382..c90645f65 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java @@ -10,30 +10,30 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.codec.hash.Hash32; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.collection.iter.IteratorEnumeration; -import cn.hutool.core.comparator.CompareUtil; -import cn.hutool.core.comparator.PinyinComparator; -import cn.hutool.core.comparator.PropertyComparator; -import cn.hutool.core.convert.CompositeConverter; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.func.SerBiConsumer; -import cn.hutool.core.lang.func.SerConsumer3; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.reflect.ConstructorUtil; -import cn.hutool.core.reflect.FieldUtil; -import cn.hutool.core.reflect.TypeUtil; -import cn.hutool.core.stream.StreamUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.codec.hash.Hash32; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.collection.iter.IteratorEnumeration; +import org.dromara.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.comparator.PinyinComparator; +import org.dromara.hutool.core.comparator.PropertyComparator; +import org.dromara.hutool.core.convert.CompositeConverter; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.func.SerBiConsumer; +import org.dromara.hutool.core.lang.func.SerConsumer3; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.reflect.ConstructorUtil; +import org.dromara.hutool.core.reflect.FieldUtil; +import org.dromara.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.stream.StreamUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.lang.reflect.Type; import java.util.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollectionOperation.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollectionOperation.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/collection/CollectionOperation.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/CollectionOperation.java index f6627433d..340421e69 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CollectionOperation.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollectionOperation.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/ConcurrentHashSet.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/ConcurrentHashSet.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/collection/ConcurrentHashSet.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/ConcurrentHashSet.java index da0983645..4796cb489 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/ConcurrentHashSet.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/ConcurrentHashSet.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; import java.util.Collection; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/ListUtil.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/ListUtil.java index 7f87ec73c..161a7a78e --- a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/ListUtil.java @@ -10,19 +10,19 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.collection.iter.EnumerationIter; -import cn.hutool.core.collection.partition.AvgPartition; -import cn.hutool.core.collection.partition.Partition; -import cn.hutool.core.collection.partition.RandomAccessAvgPartition; -import cn.hutool.core.collection.partition.RandomAccessPartition; -import cn.hutool.core.comparator.PinyinComparator; -import cn.hutool.core.comparator.PropertyComparator; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.page.PageInfo; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.iter.EnumerationIter; +import org.dromara.hutool.core.collection.partition.AvgPartition; +import org.dromara.hutool.core.collection.partition.Partition; +import org.dromara.hutool.core.collection.partition.RandomAccessAvgPartition; +import org.dromara.hutool.core.collection.partition.RandomAccessPartition; +import org.dromara.hutool.core.comparator.PinyinComparator; +import org.dromara.hutool.core.comparator.PropertyComparator; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.page.PageInfo; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/MemorySafeLinkedBlockingQueue.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueue.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/collection/MemorySafeLinkedBlockingQueue.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueue.java index 0ac83a8b1..b13437f27 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/MemorySafeLinkedBlockingQueue.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueue.java @@ -9,10 +9,10 @@ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.thread.SimpleScheduler; -import cn.hutool.core.util.RuntimeUtil; +import org.dromara.hutool.core.thread.SimpleScheduler; +import org.dromara.hutool.core.util.RuntimeUtil; import java.util.Collection; import java.util.concurrent.LinkedBlockingQueue; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/RingIndexUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/RingIndexUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/collection/RingIndexUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/RingIndexUtil.java index 8fbff8547..c4ee41d59 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/RingIndexUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/RingIndexUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/SetFromMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/SetFromMap.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/collection/SetFromMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/SetFromMap.java index 1c4319c36..c47845698 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/SetFromMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/SetFromMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; import java.io.IOException; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/SetUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/SetUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/collection/SetUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/SetUtil.java index afbe36195..a7e9c73cd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/SetUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/SetUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.util.Collection; import java.util.Collections; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/SpliteratorUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/SpliteratorUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/collection/SpliteratorUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/SpliteratorUtil.java index 441339882..248229974 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/SpliteratorUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/SpliteratorUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; import java.util.Spliterator; import java.util.function.Function; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/TransCollection.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/TransCollection.java index b2efc726e..819ff0281 --- a/hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/TransCollection.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.lang.Assert; import java.util.AbstractCollection; import java.util.Collection; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/TransSpliterator.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/TransSpliterator.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/collection/TransSpliterator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/TransSpliterator.java index aa48a08da..8615fff14 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/TransSpliterator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/TransSpliterator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; import java.util.Spliterator; import java.util.function.Consumer; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/UniqueKeySet.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/UniqueKeySet.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/collection/UniqueKeySet.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/UniqueKeySet.java index 715cb8916..a2a0c7a4c --- a/hutool-core/src/main/java/cn/hutool/core/collection/UniqueKeySet.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/UniqueKeySet.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.map.MapBuilder; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.map.MapBuilder; +import org.dromara.hutool.core.util.ObjUtil; import java.io.Serializable; import java.util.AbstractSet; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/ArrayIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ArrayIter.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/ArrayIter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ArrayIter.java index f1eeaf08d..24a81cff0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/ArrayIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ArrayIter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import java.io.Serializable; import java.lang.reflect.Array; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/ComputeIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ComputeIter.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/ComputeIter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ComputeIter.java index bded3857b..74cf2eaba 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/ComputeIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ComputeIter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/CopiedIter.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/CopiedIter.java index 4d3188364..eaf98f1ed 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/CopiedIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/CopiedIter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.io.Serializable; import java.util.Collections; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/EnumerationIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/EnumerationIter.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/EnumerationIter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/EnumerationIter.java index 917e3f193..44f5f9c25 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/EnumerationIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/EnumerationIter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import java.io.Serializable; import java.util.Enumeration; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/FilterIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/FilterIter.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/FilterIter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/FilterIter.java index cf63b45a3..f11ca845c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/FilterIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/FilterIter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterChain.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterChain.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/IterChain.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterChain.java index 293e24bde..2feff06fe 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterChain.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterChain.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; -import cn.hutool.core.lang.Chain; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.lang.Chain; +import org.dromara.hutool.core.array.ArrayUtil; import java.util.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterUtil.java index 717f2830a..3ecdeba6b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterUtil.java @@ -10,16 +10,16 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.reflect.FieldUtil; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.text.StrJoiner; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.reflect.FieldUtil; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.text.StrJoiner; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.ObjUtil; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterableIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterableIter.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/IterableIter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterableIter.java index 5ce6da0d1..ee53ee111 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterableIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterableIter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IteratorEnumeration.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IteratorEnumeration.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/IteratorEnumeration.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IteratorEnumeration.java index 067231f04..a2471da54 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IteratorEnumeration.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IteratorEnumeration.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import java.io.Serializable; import java.util.Enumeration; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/LineIter.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/LineIter.java index 4bfb4c5d6..8fefacc43 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/LineIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/LineIter.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.lang.Assert; import java.io.BufferedReader; import java.io.Closeable; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/NodeListIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/NodeListIter.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/NodeListIter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/NodeListIter.java index af5bcc78c..0892d488c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/NodeListIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/NodeListIter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/PartitionIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/PartitionIter.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/PartitionIter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/PartitionIter.java index 98ec93155..6b1aaa858 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/PartitionIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/PartitionIter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/ResettableIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ResettableIter.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/ResettableIter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ResettableIter.java index ba4be4788..14b7ae1d4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/ResettableIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ResettableIter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/TransIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/TransIter.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/TransIter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/TransIter.java index 0c5c2984b..633b763e8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/TransIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/TransIter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.util.Iterator; import java.util.function.Function; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/package-info.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/collection/iter/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/package-info.java index a0a06bef6..12b6c073c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/collection/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/package-info.java index 94b487ca5..e230a0f9b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/partition/AvgPartition.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/AvgPartition.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/collection/partition/AvgPartition.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/AvgPartition.java index c2c4d67c6..7f863a178 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/partition/AvgPartition.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/AvgPartition.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.partition; +package org.dromara.hutool.core.collection.partition; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/partition/Partition.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/Partition.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/collection/partition/Partition.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/Partition.java index e7eefd425..6799a7b12 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/partition/Partition.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/Partition.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.partition; +package org.dromara.hutool.core.collection.partition; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.util.AbstractList; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessAvgPartition.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/RandomAccessAvgPartition.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessAvgPartition.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/RandomAccessAvgPartition.java index dc5f0ae2f..a35abd227 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessAvgPartition.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/RandomAccessAvgPartition.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.partition; +package org.dromara.hutool.core.collection.partition; import java.util.List; import java.util.RandomAccess; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessPartition.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/RandomAccessPartition.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessPartition.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/RandomAccessPartition.java index 25e0b4d71..ac09e83d3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/partition/RandomAccessPartition.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/RandomAccessPartition.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.collection.partition; +package org.dromara.hutool.core.collection.partition; import java.util.List; import java.util.RandomAccess; diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/partition/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/package-info.java old mode 100755 new mode 100644 similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/collection/partition/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/package-info.java index 07211c6f0..be68cc39a --- a/hutool-core/src/main/java/cn/hutool/core/collection/partition/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/package-info.java @@ -15,4 +15,4 @@ * * @author looly */ -package cn.hutool.core.collection.partition; +package org.dromara.hutool.core.collection.partition; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/ComparatorChain.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorChain.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/comparator/ComparatorChain.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorChain.java index 7b206c873..809f99254 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/ComparatorChain.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorChain.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; -import cn.hutool.core.lang.Chain; +import org.dromara.hutool.core.lang.Chain; import java.io.Serializable; import java.util.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/ComparatorException.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/comparator/ComparatorException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java index e4a2c817b..797380fbc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/ComparatorException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; -import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exceptions.ExceptionUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 比较异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/CompareUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/CompareUtil.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/comparator/CompareUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/CompareUtil.java index 0547227eb..8d358125d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/CompareUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/CompareUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.util.Comparator; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/FieldComparator.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/FieldComparator.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/comparator/FieldComparator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/FieldComparator.java index 228047c19..33f840d8f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/FieldComparator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/FieldComparator.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.reflect.FieldUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.reflect.FieldUtil; +import org.dromara.hutool.core.text.StrUtil; import java.lang.reflect.Field; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/FieldsComparator.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/FieldsComparator.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/comparator/FieldsComparator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/FieldsComparator.java index 48445311c..25d2c01c0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/FieldsComparator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/FieldsComparator.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.reflect.FieldUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.reflect.FieldUtil; import java.lang.reflect.Field; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/FuncComparator.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/FuncComparator.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/comparator/FuncComparator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/FuncComparator.java index 9fc4676b4..6794b8fa8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/FuncComparator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/FuncComparator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; import java.util.function.Function; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/IndexedComparator.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/IndexedComparator.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/comparator/IndexedComparator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/IndexedComparator.java index 97d1cc40b..f1f153e86 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/IndexedComparator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/IndexedComparator.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.array.ArrayUtil; import java.util.Comparator; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/InstanceComparator.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/InstanceComparator.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/comparator/InstanceComparator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/InstanceComparator.java index 356d74a05..08a4bfc7f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/InstanceComparator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/InstanceComparator.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.util.Comparator; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/NullComparator.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/NullComparator.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/comparator/NullComparator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/NullComparator.java index 38aa24179..794710f30 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/NullComparator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/NullComparator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; import java.io.Serializable; import java.util.Comparator; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/PinyinComparator.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/PinyinComparator.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/comparator/PinyinComparator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/PinyinComparator.java index 21c8d7c44..bf8909fe1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/PinyinComparator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/PinyinComparator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; import java.io.Serializable; import java.text.Collator; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/PropertyComparator.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/PropertyComparator.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/comparator/PropertyComparator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/PropertyComparator.java index 4a8a7dfa1..532f6a192 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/PropertyComparator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/PropertyComparator.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; -import cn.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.bean.BeanUtil; /** * Bean属性排序器
    diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/StrLengthComparator.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/StrLengthComparator.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/comparator/StrLengthComparator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/StrLengthComparator.java index 0558ff482..46238df76 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/StrLengthComparator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/StrLengthComparator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; import java.util.Comparator; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/VersionComparator.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/VersionComparator.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/comparator/VersionComparator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/VersionComparator.java index 6f12268a6..02fc66928 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/VersionComparator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/VersionComparator.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.io.Serializable; import java.util.Comparator; diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/comparator/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/comparator/package-info.java index 7a8c6e763..c15097b41 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/Deflate.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/Deflate.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/compress/Deflate.java rename to hutool-core/src/main/java/org/dromara/hutool/core/compress/Deflate.java index 326c4fd33..4bf28afce --- a/hutool-core/src/main/java/cn/hutool/core/compress/Deflate.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/Deflate.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; import java.io.Closeable; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/Gzip.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/Gzip.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/compress/Gzip.java rename to hutool-core/src/main/java/org/dromara/hutool/core/compress/Gzip.java index aaa6c565e..6d5c9af2d --- a/hutool-core/src/main/java/cn/hutool/core/compress/Gzip.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/Gzip.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; import java.io.Closeable; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/InflaterInputStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/InflaterInputStream.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/compress/InflaterInputStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/compress/InflaterInputStream.java index f5f397bc7..ad25a729c --- a/hutool-core/src/main/java/cn/hutool/core/compress/InflaterInputStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/InflaterInputStream.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IORuntimeException; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipCopyVisitor.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipCopyVisitor.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/compress/ZipCopyVisitor.java rename to hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipCopyVisitor.java index 9e8e2c036..ed1e0913f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipCopyVisitor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipCopyVisitor.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.IOException; import java.nio.file.CopyOption; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipFileResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipFileResource.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/compress/ZipFileResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipFileResource.java index 8f7c3a4c8..e5ddcacd6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipFileResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipFileResource.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.IoUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipReader.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipReader.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/compress/ZipReader.java rename to hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipReader.java index c3c7848a8..1b056ed8d --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipReader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipReader.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.Closeable; import java.io.File; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipResource.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/compress/ZipResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipResource.java index a93c00bbc..fdcb982e2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipResource.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; import java.io.Closeable; import java.io.InputStream; @@ -45,7 +45,7 @@ public interface ZipResource extends Closeable { /** * 获取指定{@link ZipEntry}对应的文件流 * - * @param entry @link ZipEntry} + * @param entry {@link ZipEntry} * @return 文件流 */ InputStream get(ZipEntry entry); diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipSecurityUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipSecurityUtil.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/compress/ZipSecurityUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipSecurityUtil.java index 2fb488896..d77a648c9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipSecurityUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipSecurityUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.exceptions.ValidateException; +import org.dromara.hutool.core.exceptions.ValidateException; import java.util.zip.ZipEntry; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipStreamResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipStreamResource.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/compress/ZipStreamResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipStreamResource.java index 06853af74..1fc13becc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipStreamResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipStreamResource.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/compress/ZipUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java index 1337a6bd3..0c4dbad3d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java @@ -10,24 +10,24 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.collection.iter.EnumerationIter; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.file.FileNameUtil; -import cn.hutool.core.io.file.FileSystemUtil; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.file.PathUtil; -import cn.hutool.core.io.resource.Resource; -import cn.hutool.core.io.stream.FastByteArrayOutputStream; -import cn.hutool.core.io.stream.LimitedInputStream; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.iter.EnumerationIter; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.file.FileNameUtil; +import org.dromara.hutool.core.io.file.FileSystemUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.file.PathUtil; +import org.dromara.hutool.core.io.resource.Resource; +import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream; +import org.dromara.hutool.core.io.stream.LimitedInputStream; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.io.*; import java.nio.charset.Charset; @@ -46,7 +46,7 @@ import java.util.zip.ZipOutputStream; * 压缩工具类 * * @author Looly - * @see cn.hutool.core.compress.ZipWriter + * @see ZipWriter */ public class ZipUtil { diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipWriter.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/compress/ZipWriter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java index 9f23eb88e..5fbdaa999 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipWriter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.resource.Resource; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.resource.Resource; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.Closeable; import java.io.File; diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/compress/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/compress/package-info.java index a213a3a08..e9b50f395 --- a/hutool-core/src/main/java/cn/hutool/core/compress/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/package-info.java @@ -16,4 +16,4 @@ * @author looly * @since 5.7.8 */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/AbstractConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/AbstractConverter.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/convert/AbstractConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/AbstractConverter.java index 46b971152..e64e4b31a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/AbstractConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/AbstractConverter.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.reflect.TypeUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.CharUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/BasicType.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/BasicType.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/convert/BasicType.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/BasicType.java index ec0982bea..b51f87937 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/BasicType.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/BasicType.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.map.BiMap; +import org.dromara.hutool.core.map.BiMap; import java.util.HashMap; import java.util.Set; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/CastUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/CastUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/convert/CastUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/CastUtil.java index 792400738..9e28f6ea6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/CastUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/CastUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.util.Collection; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/CompositeConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/CompositeConverter.java similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/convert/CompositeConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/CompositeConverter.java index b015742a3..163534e06 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/CompositeConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/CompositeConverter.java @@ -10,19 +10,19 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.convert.impl.ArrayConverter; -import cn.hutool.core.convert.impl.BeanConverter; -import cn.hutool.core.convert.impl.CollectionConverter; -import cn.hutool.core.convert.impl.EnumConverter; -import cn.hutool.core.convert.impl.MapConverter; -import cn.hutool.core.convert.impl.NumberConverter; -import cn.hutool.core.convert.impl.PrimitiveConverter; -import cn.hutool.core.reflect.TypeReference; -import cn.hutool.core.reflect.TypeUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.convert.impl.ArrayConverter; +import org.dromara.hutool.core.convert.impl.BeanConverter; +import org.dromara.hutool.core.convert.impl.CollectionConverter; +import org.dromara.hutool.core.convert.impl.EnumConverter; +import org.dromara.hutool.core.convert.impl.MapConverter; +import org.dromara.hutool.core.convert.impl.NumberConverter; +import org.dromara.hutool.core.convert.impl.PrimitiveConverter; +import org.dromara.hutool.core.reflect.TypeReference; +import org.dromara.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.lang.reflect.Type; import java.util.Collection; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/Convert.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/convert/Convert.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/Convert.java index bed86c776..5bc197738 --- a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/Convert.java @@ -10,20 +10,20 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.codec.HexUtil; -import cn.hutool.core.convert.impl.CollectionConverter; -import cn.hutool.core.convert.impl.EnumConverter; -import cn.hutool.core.convert.impl.MapConverter; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.reflect.TypeReference; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.UnicodeUtil; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.codec.HexUtil; +import org.dromara.hutool.core.convert.impl.CollectionConverter; +import org.dromara.hutool.core.convert.impl.EnumConverter; +import org.dromara.hutool.core.convert.impl.MapConverter; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.reflect.TypeReference; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.UnicodeUtil; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/ConvertException.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/convert/ConvertException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java index 8cc7f3809..b252b11ab 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/ConvertException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exceptions.ExceptionUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 转换异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/Converter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/Converter.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/convert/Converter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/Converter.java index 3aff57814..2c8b0f6b4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/Converter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/Converter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/NumberChineseFormatter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberChineseFormatter.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/convert/NumberChineseFormatter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberChineseFormatter.java index 104a27b6b..0a11c82c2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/NumberChineseFormatter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberChineseFormatter.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/NumberWordFormatter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberWordFormatter.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/convert/NumberWordFormatter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberWordFormatter.java index 79ef08370..22d7d63ae 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/NumberWordFormatter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberWordFormatter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 将浮点数类型的number转换成英语的表达方式
    diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/RegisterConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/RegisterConverter.java similarity index 81% rename from hutool-core/src/main/java/cn/hutool/core/convert/RegisterConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/RegisterConverter.java index f53fe772c..1fd0a8cf3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/RegisterConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/RegisterConverter.java @@ -10,38 +10,38 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.convert.impl.AtomicBooleanConverter; -import cn.hutool.core.convert.impl.AtomicIntegerArrayConverter; -import cn.hutool.core.convert.impl.AtomicLongArrayConverter; -import cn.hutool.core.convert.impl.AtomicReferenceConverter; -import cn.hutool.core.convert.impl.BooleanConverter; -import cn.hutool.core.convert.impl.CalendarConverter; -import cn.hutool.core.convert.impl.CharacterConverter; -import cn.hutool.core.convert.impl.CharsetConverter; -import cn.hutool.core.convert.impl.ClassConverter; -import cn.hutool.core.convert.impl.CurrencyConverter; -import cn.hutool.core.convert.impl.DateConverter; -import cn.hutool.core.convert.impl.DurationConverter; -import cn.hutool.core.convert.impl.LocaleConverter; -import cn.hutool.core.convert.impl.OptConverter; -import cn.hutool.core.convert.impl.OptionalConverter; -import cn.hutool.core.convert.impl.PathConverter; -import cn.hutool.core.convert.impl.PeriodConverter; -import cn.hutool.core.convert.impl.ReferenceConverter; -import cn.hutool.core.convert.impl.StackTraceElementConverter; -import cn.hutool.core.convert.impl.StringConverter; -import cn.hutool.core.convert.impl.TemporalAccessorConverter; -import cn.hutool.core.convert.impl.TimeZoneConverter; -import cn.hutool.core.convert.impl.URIConverter; -import cn.hutool.core.convert.impl.URLConverter; -import cn.hutool.core.convert.impl.UUIDConverter; -import cn.hutool.core.convert.impl.XMLGregorianCalendarConverter; -import cn.hutool.core.convert.impl.ZoneIdConverter; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.convert.impl.AtomicBooleanConverter; +import org.dromara.hutool.core.convert.impl.AtomicIntegerArrayConverter; +import org.dromara.hutool.core.convert.impl.AtomicLongArrayConverter; +import org.dromara.hutool.core.convert.impl.AtomicReferenceConverter; +import org.dromara.hutool.core.convert.impl.BooleanConverter; +import org.dromara.hutool.core.convert.impl.CalendarConverter; +import org.dromara.hutool.core.convert.impl.CharacterConverter; +import org.dromara.hutool.core.convert.impl.CharsetConverter; +import org.dromara.hutool.core.convert.impl.ClassConverter; +import org.dromara.hutool.core.convert.impl.CurrencyConverter; +import org.dromara.hutool.core.convert.impl.DateConverter; +import org.dromara.hutool.core.convert.impl.DurationConverter; +import org.dromara.hutool.core.convert.impl.LocaleConverter; +import org.dromara.hutool.core.convert.impl.OptConverter; +import org.dromara.hutool.core.convert.impl.OptionalConverter; +import org.dromara.hutool.core.convert.impl.PathConverter; +import org.dromara.hutool.core.convert.impl.PeriodConverter; +import org.dromara.hutool.core.convert.impl.ReferenceConverter; +import org.dromara.hutool.core.convert.impl.StackTraceElementConverter; +import org.dromara.hutool.core.convert.impl.StringConverter; +import org.dromara.hutool.core.convert.impl.TemporalAccessorConverter; +import org.dromara.hutool.core.convert.impl.TimeZoneConverter; +import org.dromara.hutool.core.convert.impl.URIConverter; +import org.dromara.hutool.core.convert.impl.URLConverter; +import org.dromara.hutool.core.convert.impl.UUIDConverter; +import org.dromara.hutool.core.convert.impl.XMLGregorianCalendarConverter; +import org.dromara.hutool.core.convert.impl.ZoneIdConverter; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; import javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ArrayConverter.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ArrayConverter.java index e6f08b68f..773bbda23 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ArrayConverter.java @@ -10,17 +10,17 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.codec.binary.Base64; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.io.SerializeUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.codec.binary.Base64; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.io.SerializeUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.ByteUtil; import java.io.Serializable; import java.lang.reflect.Array; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicBooleanConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicBooleanConverter.java similarity index 87% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicBooleanConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicBooleanConverter.java index 32a616106..e229c8b7f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicBooleanConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicBooleanConverter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.util.BooleanUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.util.BooleanUtil; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicIntegerArrayConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicIntegerArrayConverter.java similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicIntegerArrayConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicIntegerArrayConverter.java index b8e67f1bf..63df59e0f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicIntegerArrayConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicIntegerArrayConverter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.convert.Convert; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.Convert; import java.util.concurrent.atomic.AtomicIntegerArray; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicLongArrayConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicLongArrayConverter.java similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicLongArrayConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicLongArrayConverter.java index 15c475abc..bb3a757d2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicLongArrayConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicLongArrayConverter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.convert.Convert; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.Convert; import java.util.concurrent.atomic.AtomicLongArray; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicReferenceConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicReferenceConverter.java similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicReferenceConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicReferenceConverter.java index 9714a589a..e698f741a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/AtomicReferenceConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicReferenceConverter.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.convert.CompositeConverter; -import cn.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.CompositeConverter; +import org.dromara.hutool.core.reflect.TypeUtil; import java.lang.reflect.Type; import java.util.concurrent.atomic.AtomicReference; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/BeanConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/BeanConverter.java similarity index 80% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/BeanConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/BeanConverter.java index 1c5611eba..caa3a5b2f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/BeanConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/BeanConverter.java @@ -10,19 +10,19 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.BeanCopier; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.bean.copier.ValueProvider; -import cn.hutool.core.convert.ConvertException; -import cn.hutool.core.convert.Converter; -import cn.hutool.core.io.SerializeUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.map.MapProxy; -import cn.hutool.core.reflect.ConstructorUtil; -import cn.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.bean.copier.BeanCopier; +import org.dromara.hutool.core.bean.copier.CopyOptions; +import org.dromara.hutool.core.bean.copier.ValueProvider; +import org.dromara.hutool.core.convert.ConvertException; +import org.dromara.hutool.core.convert.Converter; +import org.dromara.hutool.core.io.SerializeUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.map.MapProxy; +import org.dromara.hutool.core.reflect.ConstructorUtil; +import org.dromara.hutool.core.reflect.TypeUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/BooleanConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/BooleanConverter.java similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/BooleanConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/BooleanConverter.java index d67f28f19..b8fcb2680 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/BooleanConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/BooleanConverter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.util.BooleanUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.util.BooleanUtil; /** * 布尔转换器 diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CalendarConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CalendarConverter.java similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/CalendarConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CalendarConverter.java index 3089c5e03..c736ed037 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CalendarConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CalendarConverter.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.text.StrUtil; import javax.xml.datatype.XMLGregorianCalendar; import java.util.Calendar; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CastConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CastConverter.java similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/CastConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CastConverter.java index 6af005a7c..c031e7686 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CastConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CastConverter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.convert.ConvertException; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.ConvertException; /** * 强转转换器 diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CharacterConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CharacterConverter.java similarity index 83% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/CharacterConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CharacterConverter.java index 172331f4c..d6fa4ab37 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CharacterConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CharacterConverter.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.util.BooleanUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 字符转换器 diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CharsetConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CharsetConverter.java similarity index 85% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/CharsetConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CharsetConverter.java index cb2e28f75..920731ffa 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CharsetConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CharsetConverter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.util.CharsetUtil; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ClassConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ClassConverter.java similarity index 88% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/ClassConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ClassConverter.java index fad8b737d..10c291315 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ClassConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ClassConverter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; /** * 类转换器
    diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CollectionConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CollectionConverter.java similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/CollectionConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CollectionConverter.java index 3fad2bba8..57a8e3641 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CollectionConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CollectionConverter.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Converter; -import cn.hutool.core.reflect.TypeReference; -import cn.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.convert.Converter; +import org.dromara.hutool.core.reflect.TypeReference; +import org.dromara.hutool.core.reflect.TypeUtil; import java.lang.reflect.Type; import java.util.Collection; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CurrencyConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CurrencyConverter.java similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/CurrencyConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CurrencyConverter.java index b545ccd86..0bdf9e2f2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CurrencyConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CurrencyConverter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.AbstractConverter; import java.util.Currency; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/DateConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DateConverter.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/DateConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DateConverter.java index ee4d080b4..76b028725 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/DateConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DateConverter.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.convert.ConvertException; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.ConvertException; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.text.StrUtil; import java.time.temporal.TemporalAccessor; import java.util.Calendar; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/DurationConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DurationConverter.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/DurationConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DurationConverter.java index 246eaebc1..a464c1e70 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/DurationConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DurationConverter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.AbstractConverter; import java.time.Duration; import java.time.temporal.TemporalAmount; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/EnumConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EnumConverter.java old mode 100755 new mode 100644 similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/EnumConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EnumConverter.java index 51e077d93..1edd41708 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/EnumConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EnumConverter.java @@ -10,17 +10,17 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.convert.ConvertException; -import cn.hutool.core.lang.EnumItem; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.map.WeakConcurrentMap; -import cn.hutool.core.reflect.ClassUtil; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.reflect.ModifierUtil; -import cn.hutool.core.util.EnumUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.ConvertException; +import org.dromara.hutool.core.lang.EnumItem; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.reflect.ClassUtil; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.reflect.ModifierUtil; +import org.dromara.hutool.core.util.EnumUtil; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/LocaleConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/LocaleConverter.java similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/LocaleConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/LocaleConverter.java index deefcadc1..41a96c76f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/LocaleConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/LocaleConverter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.text.StrUtil; import java.util.Locale; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/MapConverter.java similarity index 87% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/MapConverter.java index 468013d07..74609ec1d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/MapConverter.java @@ -10,16 +10,16 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.convert.ConvertException; -import cn.hutool.core.convert.CompositeConverter; -import cn.hutool.core.convert.Converter; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.reflect.TypeReference; -import cn.hutool.core.reflect.TypeUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.convert.ConvertException; +import org.dromara.hutool.core.convert.CompositeConverter; +import org.dromara.hutool.core.convert.Converter; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.reflect.TypeReference; +import org.dromara.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/NumberConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/NumberConverter.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/NumberConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/NumberConverter.java index 336535e6c..2f09b8488 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/NumberConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/NumberConverter.java @@ -10,15 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.convert.ConvertException; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.ConvertException; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.BooleanUtil; +import org.dromara.hutool.core.util.ByteUtil; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/OptConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/OptConverter.java similarity index 85% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/OptConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/OptConverter.java index d2642dcb5..a4614011a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/OptConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/OptConverter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.lang.Opt; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.lang.Opt; /** * diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/OptionalConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/OptionalConverter.java similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/OptionalConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/OptionalConverter.java index ba684e236..2da1e967a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/OptionalConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/OptionalConverter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.AbstractConverter; import java.util.Optional; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/PathConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PathConverter.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/PathConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PathConverter.java index 56ae0293d..370a50fb9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/PathConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PathConverter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.AbstractConverter; import java.io.File; import java.net.URI; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/PeriodConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PeriodConverter.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/PeriodConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PeriodConverter.java index b0dbf4766..2f7611f2d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/PeriodConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PeriodConverter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.AbstractConverter; import java.time.Period; import java.time.temporal.TemporalAmount; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/PrimitiveConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PrimitiveConverter.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/PrimitiveConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PrimitiveConverter.java index fa9d9cbf8..9972ba3a5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/PrimitiveConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PrimitiveConverter.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.convert.ConvertException; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.convert.ConvertException; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.util.function.Function; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ReferenceConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ReferenceConverter.java similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/ReferenceConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ReferenceConverter.java index 1d3261f12..853d2da26 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ReferenceConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ReferenceConverter.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.convert.CompositeConverter; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.CompositeConverter; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.reflect.TypeUtil; import java.lang.ref.Reference; import java.lang.ref.SoftReference; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/StackTraceElementConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/StackTraceElementConverter.java similarity index 87% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/StackTraceElementConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/StackTraceElementConverter.java index fbcf7bc10..1e3986c20 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/StackTraceElementConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/StackTraceElementConverter.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/StringConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/StringConverter.java similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/StringConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/StringConverter.java index 912c1cecf..da1cfee25 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/StringConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/StringConverter.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.convert.ConvertException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.XmlUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.ConvertException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.XmlUtil; import java.io.InputStream; import java.io.Reader; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TemporalAccessorConverter.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TemporalAccessorConverter.java index 767c9d233..f9f8180a7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TemporalAccessorConverter.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.date.format.GlobalCustomFormat; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.date.format.GlobalCustomFormat; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.time.DayOfWeek; import java.time.Instant; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/TimeZoneConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TimeZoneConverter.java similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/TimeZoneConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TimeZoneConverter.java index 894d102f2..d50eb2d4f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/TimeZoneConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TimeZoneConverter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.date.ZoneUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.date.ZoneUtil; import java.time.ZoneId; import java.util.TimeZone; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/URIConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/URIConverter.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/URIConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/URIConverter.java index 25916f516..ed914ba28 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/URIConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/URIConverter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.AbstractConverter; import java.io.File; import java.net.URI; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/URLConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/URLConverter.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/URLConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/URLConverter.java index edca25230..5b2e6894e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/URLConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/URLConverter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.AbstractConverter; import java.io.File; import java.net.URI; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/UUIDConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/UUIDConverter.java similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/UUIDConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/UUIDConverter.java index ba707762b..81773922e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/UUIDConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/UUIDConverter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.AbstractConverter; import java.util.UUID; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/XMLGregorianCalendarConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/XMLGregorianCalendarConverter.java old mode 100755 new mode 100644 similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/XMLGregorianCalendarConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/XMLGregorianCalendarConverter.java index 21399caba..872c8e7fb --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/XMLGregorianCalendarConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/XMLGregorianCalendarConverter.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.convert.ConvertException; -import cn.hutool.core.date.DateException; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.convert.ConvertException; +import org.dromara.hutool.core.date.DateException; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.text.StrUtil; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ZoneIdConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ZoneIdConverter.java similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/ZoneIdConverter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ZoneIdConverter.java index db9a73f00..a8db0df16 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ZoneIdConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ZoneIdConverter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; -import cn.hutool.core.convert.AbstractConverter; -import cn.hutool.core.date.ZoneUtil; +import org.dromara.hutool.core.convert.AbstractConverter; +import org.dromara.hutool.core.date.ZoneUtil; import java.time.ZoneId; import java.util.TimeZone; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/convert/impl/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/package-info.java index b1e6a3eed..9bb3fb6d1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.convert.impl; +package org.dromara.hutool.core.convert.impl; diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/convert/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/convert/package-info.java index 888ea33bf..9a5d7694c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/BetweenFormatter.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/BetweenFormatter.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/BetweenFormatter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/BetweenFormatter.java index 3e8a01c1e..33e91e931 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/BetweenFormatter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/BetweenFormatter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/CalendarUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/CalendarUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/date/CalendarUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/CalendarUtil.java index 7b8976ae1..bdf2cfc06 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/CalendarUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/CalendarUtil.java @@ -10,16 +10,16 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.comparator.CompareUtil; -import cn.hutool.core.convert.NumberChineseFormatter; -import cn.hutool.core.date.format.GlobalCustomFormat; -import cn.hutool.core.date.format.parser.DateParser; -import cn.hutool.core.date.format.parser.FastDateParser; -import cn.hutool.core.date.format.parser.PositionDateParser; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.convert.NumberChineseFormatter; +import org.dromara.hutool.core.date.format.GlobalCustomFormat; +import org.dromara.hutool.core.date.format.parser.DateParser; +import org.dromara.hutool.core.date.format.parser.FastDateParser; +import org.dromara.hutool.core.date.format.parser.PositionDateParser; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ObjUtil; import javax.xml.datatype.XMLGregorianCalendar; import java.text.ParsePosition; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateBetween.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateBetween.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/DateBetween.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/DateBetween.java index 4f8ec61a7..f3a3d660a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateBetween.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateBetween.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.io.Serializable; import java.util.Calendar; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateException.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateException.java similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/date/DateException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/DateException.java index 31c1f20d6..32519ec31 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateException.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exceptions.ExceptionUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 工具类异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateField.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateField.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/DateField.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/DateField.java index 5b0e5c5b2..34e3b3857 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateField.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateField.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import java.util.Calendar; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateModifier.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateModifier.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/DateModifier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/DateModifier.java index 66d8add22..139b7cc9d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateModifier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateModifier.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.util.Calendar; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DatePattern.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DatePattern.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/date/DatePattern.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/DatePattern.java index cd8fdef5e..a0bb9b755 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DatePattern.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DatePattern.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.date.format.FastDateFormat; -import cn.hutool.core.date.format.parser.CSTDateParser; +import org.dromara.hutool.core.date.format.FastDateFormat; +import org.dromara.hutool.core.date.format.parser.CSTDateParser; import java.time.ZoneId; import java.time.format.DateTimeFormatter; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateRange.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateRange.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/date/DateRange.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/DateRange.java index 2b8e78a3e..839a8e7e9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateRange.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateRange.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.lang.range.Range; +import org.dromara.hutool.core.lang.range.Range; import java.util.Date; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateTime.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateTime.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/DateTime.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/DateTime.java index 7da3a0c11..dfac5b29a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateTime.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateTime.java @@ -10,17 +10,17 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.date.format.DatePrinter; -import cn.hutool.core.date.format.FastDateFormat; -import cn.hutool.core.date.format.GlobalCustomFormat; -import cn.hutool.core.date.format.parser.DateParser; -import cn.hutool.core.date.format.parser.PositionDateParser; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.util.SystemUtil; +import org.dromara.hutool.core.date.format.DatePrinter; +import org.dromara.hutool.core.date.format.FastDateFormat; +import org.dromara.hutool.core.date.format.GlobalCustomFormat; +import org.dromara.hutool.core.date.format.parser.DateParser; +import org.dromara.hutool.core.date.format.parser.PositionDateParser; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.util.SystemUtil; import java.sql.Timestamp; import java.text.DateFormat; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUnit.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateUnit.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/DateUnit.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/DateUnit.java index 69b89b567..145c2d85b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateUnit.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateUnit.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import java.time.temporal.ChronoUnit; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateUtil.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/DateUtil.java index 2b48637bf..2d3b7dc3f --- a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateUtil.java @@ -10,20 +10,21 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.comparator.CompareUtil; -import cn.hutool.core.date.format.DatePrinter; -import cn.hutool.core.date.format.FastDateFormat; -import cn.hutool.core.date.format.GlobalCustomFormat; -import cn.hutool.core.date.format.parser.*; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.regex.PatternPool; -import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.date.format.DatePrinter; +import org.dromara.hutool.core.date.format.FastDateFormat; +import org.dromara.hutool.core.date.format.GlobalCustomFormat; +import org.dromara.hutool.core.date.format.parser.*; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.regex.PatternPool; +import org.dromara.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.date.format.parser.*; import javax.xml.datatype.XMLGregorianCalendar; import java.text.DateFormat; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/LocalTimeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/LocalTimeUtil.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/date/LocalTimeUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/LocalTimeUtil.java index 570ead89b..9a53ac178 --- a/hutool-core/src/main/java/cn/hutool/core/date/LocalTimeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/LocalTimeUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import java.time.LocalTime; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/Month.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/Month.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/date/Month.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/Month.java index ee4324ffd..35352eb75 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/Month.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/Month.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.array.ArrayUtil; import java.time.format.TextStyle; import java.util.Calendar; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/Quarter.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/Quarter.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/date/Quarter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/Quarter.java index 1c71ce88e..2b7a592a4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/Quarter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/Quarter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; /** * 季度枚举 diff --git a/hutool-core/src/main/java/cn/hutool/core/date/StopWatch.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/StopWatch.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/StopWatch.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/StopWatch.java index d42ac9645..54b56c12b --- a/hutool-core/src/main/java/cn/hutool/core/date/StopWatch.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/StopWatch.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.text.StrUtil; import java.text.NumberFormat; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/SystemClock.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/SystemClock.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/SystemClock.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/SystemClock.java index 1a0c77330..992c414b8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/SystemClock.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/SystemClock.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import java.sql.Timestamp; import java.util.concurrent.Executors; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/TemporalAccessorUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalAccessorUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/TemporalAccessorUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalAccessorUtil.java index 871423ce5..c690f5c4c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/TemporalAccessorUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalAccessorUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.date.format.GlobalCustomFormat; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.date.format.GlobalCustomFormat; +import org.dromara.hutool.core.text.StrUtil; import java.time.DayOfWeek; import java.time.Instant; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/TemporalUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalUtil.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/date/TemporalUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalUtil.java index 1859303fb..1e42fc888 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/TemporalUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import java.time.DayOfWeek; import java.time.Duration; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/TimeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/TimeUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/TimeUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/TimeUtil.java index 3bbc5d9b1..9f3b0095c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/TimeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/TimeUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.date.format.GlobalCustomFormat; -import cn.hutool.core.lang.func.LambdaUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.date.format.GlobalCustomFormat; +import org.dromara.hutool.core.lang.func.LambdaUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.time.*; import java.time.chrono.ChronoLocalDate; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/Week.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/Week.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/date/Week.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/Week.java index 0c6099641..48a0f189a --- a/hutool-core/src/main/java/cn/hutool/core/date/Week.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/Week.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.array.ArrayUtil; import java.time.DayOfWeek; import java.util.Calendar; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/Zodiac.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/Zodiac.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/date/Zodiac.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/Zodiac.java index fdaa7c794..a4073b553 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/Zodiac.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/Zodiac.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.util.Calendar; import java.util.Date; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/ZoneUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/ZoneUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/date/ZoneUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/ZoneUtil.java index dba37a291..5a0dd6737 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/ZoneUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/ZoneUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import java.time.ZoneId; import java.util.TimeZone; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/chinese/ChineseDate.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDate.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/date/chinese/ChineseDate.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDate.java index 699c80680..25b75bdba 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/chinese/ChineseDate.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDate.java @@ -10,15 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.chinese; +package org.dromara.hutool.core.date.chinese; -import cn.hutool.core.convert.NumberChineseFormatter; -import cn.hutool.core.date.CalendarUtil; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.date.TimeUtil; -import cn.hutool.core.date.Zodiac; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.convert.NumberChineseFormatter; +import org.dromara.hutool.core.date.CalendarUtil; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.date.TimeUtil; +import org.dromara.hutool.core.date.Zodiac; +import org.dromara.hutool.core.text.StrUtil; import java.time.LocalDate; import java.util.Calendar; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/chinese/ChineseMonth.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseMonth.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/date/chinese/ChineseMonth.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseMonth.java index c6fa2ae86..5a2ae6a40 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/chinese/ChineseMonth.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseMonth.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.chinese; +package org.dromara.hutool.core.date.chinese; /** * 农历月份表示 diff --git a/hutool-core/src/main/java/cn/hutool/core/date/chinese/GanZhi.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/GanZhi.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/chinese/GanZhi.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/GanZhi.java index 59fe5a262..eab5e4a5d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/chinese/GanZhi.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/GanZhi.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.chinese; +package org.dromara.hutool.core.date.chinese; import java.time.LocalDate; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/chinese/LunarFestival.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarFestival.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/date/chinese/LunarFestival.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarFestival.java index 9364ffa9a..e93e45f3f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/chinese/LunarFestival.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarFestival.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.chinese; +package org.dromara.hutool.core.date.chinese; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.map.TableMap; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.map.TableMap; import java.util.List; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/chinese/LunarInfo.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarInfo.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/date/chinese/LunarInfo.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarInfo.java index 5702386ed..ca9f0a8c3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/chinese/LunarInfo.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarInfo.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.chinese; +package org.dromara.hutool.core.date.chinese; import java.time.LocalDate; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/chinese/SolarTerms.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/SolarTerms.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/chinese/SolarTerms.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/SolarTerms.java index 81161e939..4b6e77467 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/chinese/SolarTerms.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/SolarTerms.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.chinese; +package org.dromara.hutool.core.date.chinese; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.text.StrUtil; import java.time.LocalDate; import java.util.Date; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/chinese/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/date/chinese/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/package-info.java index 27c69a8c4..7f02199ae 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/chinese/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.date.chinese; +package org.dromara.hutool.core.date.chinese; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/DateBasic.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DateBasic.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/date/format/DateBasic.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/DateBasic.java index bf65bc83e..00aa54a6b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/DateBasic.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DateBasic.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format; +package org.dromara.hutool.core.date.format; import java.util.Locale; import java.util.TimeZone; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/DatePrinter.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DatePrinter.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/format/DatePrinter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/DatePrinter.java index 385eda88d..29ff07880 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/DatePrinter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DatePrinter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format; +package org.dromara.hutool.core.date.format; import java.util.Calendar; import java.util.Date; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/DefaultDateBasic.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DefaultDateBasic.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/date/format/DefaultDateBasic.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/DefaultDateBasic.java index 0719fc053..b4028e848 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/DefaultDateBasic.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DefaultDateBasic.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format; +package org.dromara.hutool.core.date.format; import java.io.Serializable; import java.util.Locale; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/FastDateFormat.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/FastDateFormat.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/format/FastDateFormat.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/FastDateFormat.java index 3ba20f546..13c1f8191 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/FastDateFormat.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/FastDateFormat.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format; +package org.dromara.hutool.core.date.format; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.format.parser.FastDateParser; -import cn.hutool.core.date.format.parser.PositionDateParser; +import org.dromara.hutool.core.date.DatePattern; +import org.dromara.hutool.core.date.format.parser.FastDateParser; +import org.dromara.hutool.core.date.format.parser.PositionDateParser; import java.text.DateFormat; import java.text.FieldPosition; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/FastDatePrinter.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/FastDatePrinter.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/date/format/FastDatePrinter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/FastDatePrinter.java index 75971d4eb..e13518345 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/FastDatePrinter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/FastDatePrinter.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format; +package org.dromara.hutool.core.date.format; -import cn.hutool.core.date.DateException; -import cn.hutool.core.date.format.parser.FastDateParser; -import cn.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.date.DateException; +import org.dromara.hutool.core.date.format.parser.FastDateParser; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/FormatCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/FormatCache.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/date/format/FormatCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/FormatCache.java index 4c0c841bb..e9473441a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/FormatCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/FormatCache.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format; +package org.dromara.hutool.core.date.format; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Tuple; -import cn.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Tuple; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; import java.text.DateFormat; import java.text.Format; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/GlobalCustomFormat.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/GlobalCustomFormat.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/date/format/GlobalCustomFormat.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/GlobalCustomFormat.java index 33106f02c..9c4bbd3e4 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/GlobalCustomFormat.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/GlobalCustomFormat.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format; +package org.dromara.hutool.core.date.format; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; import java.time.temporal.TemporalAccessor; import java.util.Date; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/SimpleDateBasic.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/SimpleDateBasic.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/format/SimpleDateBasic.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/SimpleDateBasic.java index 89cd5418b..e2eee109b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/SimpleDateBasic.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/SimpleDateBasic.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format; +package org.dromara.hutool.core.date.format; import java.io.Serializable; import java.util.Locale; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/date/format/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/package-info.java index 33691eb18..d1f3fb251 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.date.format; +package org.dromara.hutool.core.date.format; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/CSTDateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/CSTDateParser.java similarity index 84% rename from hutool-core/src/main/java/cn/hutool/core/date/format/parser/CSTDateParser.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/CSTDateParser.java index 188ad0cb6..2a37516ac 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/CSTDateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/CSTDateParser.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format.parser; +package org.dromara.hutool.core.date.format.parser; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.format.DefaultDateBasic; +import org.dromara.hutool.core.date.DatePattern; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.format.DefaultDateBasic; /** * CST日期字符串（JDK的Date对象toString默认格式）解析，支持格式类似于； diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/DateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/DateParser.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/date/format/parser/DateParser.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/DateParser.java index 336133e44..c4fc99fb6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/DateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/DateParser.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format.parser; +package org.dromara.hutool.core.date.format.parser; -import cn.hutool.core.date.format.DateBasic; +import org.dromara.hutool.core.date.format.DateBasic; import java.text.ParseException; import java.util.Date; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/FastDateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/FastDateParser.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/format/parser/FastDateParser.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/FastDateParser.java index afcbe82fd..7ff35545e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/FastDateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/FastDateParser.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format.parser; +package org.dromara.hutool.core.date.format.parser; -import cn.hutool.core.date.format.FastDateFormat; -import cn.hutool.core.date.format.FastDatePrinter; -import cn.hutool.core.date.format.SimpleDateBasic; -import cn.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.date.format.FastDateFormat; +import org.dromara.hutool.core.date.format.FastDatePrinter; +import org.dromara.hutool.core.date.format.SimpleDateBasic; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/ISO8601DateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/ISO8601DateParser.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/date/format/parser/ISO8601DateParser.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/ISO8601DateParser.java index 87824da32..9da7db266 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/ISO8601DateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/ISO8601DateParser.java @@ -10,15 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format.parser; +package org.dromara.hutool.core.date.format.parser; -import cn.hutool.core.date.DateException; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.format.DefaultDateBasic; -import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.date.DateException; +import org.dromara.hutool.core.date.DatePattern; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.format.DefaultDateBasic; +import org.dromara.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharUtil; /** * ISO8601日期字符串（JDK的Date对象toString默认格式）解析，支持格式； diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/NormalDateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/NormalDateParser.java similarity index 84% rename from hutool-core/src/main/java/cn/hutool/core/date/format/parser/NormalDateParser.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/NormalDateParser.java index c59ba99c2..0e0133f47 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/NormalDateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/NormalDateParser.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format.parser; +package org.dromara.hutool.core.date.format.parser; -import cn.hutool.core.date.DateException; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.format.DefaultDateBasic; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.date.DateException; +import org.dromara.hutool.core.date.DatePattern; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.format.DefaultDateBasic; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharUtil; /** * 标准日期字符串解析，支持格式； diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/PatternsDateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PatternsDateParser.java similarity index 88% rename from hutool-core/src/main/java/cn/hutool/core/date/format/parser/PatternsDateParser.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PatternsDateParser.java index 63de2aff0..809af3c0f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/PatternsDateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PatternsDateParser.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format.parser; +package org.dromara.hutool.core.date.format.parser; -import cn.hutool.core.date.CalendarUtil; -import cn.hutool.core.date.DateException; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.format.DefaultDateBasic; +import org.dromara.hutool.core.date.CalendarUtil; +import org.dromara.hutool.core.date.DateException; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.format.DefaultDateBasic; import java.util.Calendar; import java.util.Locale; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/PositionDateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PositionDateParser.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/date/format/parser/PositionDateParser.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PositionDateParser.java index 2eee88001..db7008f49 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/PositionDateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PositionDateParser.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format.parser; +package org.dromara.hutool.core.date.format.parser; import java.text.ParsePosition; import java.util.Calendar; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/PureDateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PureDateParser.java similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/date/format/parser/PureDateParser.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PureDateParser.java index fd8237b52..2ec2ad193 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/PureDateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PureDateParser.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format.parser; +package org.dromara.hutool.core.date.format.parser; -import cn.hutool.core.date.DateException; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.format.DefaultDateBasic; +import org.dromara.hutool.core.date.DateException; +import org.dromara.hutool.core.date.DatePattern; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.format.DefaultDateBasic; /** * 纯数字的日期字符串解析，支持格式包括； diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/TimeParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/TimeParser.java similarity index 81% rename from hutool-core/src/main/java/cn/hutool/core/date/format/parser/TimeParser.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/TimeParser.java index 4b8382e22..08500cc2f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/TimeParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/TimeParser.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.date.format.parser; +package org.dromara.hutool.core.date.format.parser; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.date.format.DefaultDateBasic; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.date.DatePattern; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.date.format.DefaultDateBasic; +import org.dromara.hutool.core.text.StrUtil; /** * 时间日期字符串，日期默认为当天，支持格式类似于； diff --git a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/package-info.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/date/format/parser/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/package-info.java index 0ca9181bf..4026e39d1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/format/parser/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.date.format.parser; +package org.dromara.hutool.core.date.format.parser; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/date/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/date/package-info.java index fbae97020..e76058938 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/CloneRuntimeException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/CloneRuntimeException.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/exceptions/CloneRuntimeException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/exceptions/CloneRuntimeException.java index a6b761d7b..5a0c6344d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/CloneRuntimeException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/CloneRuntimeException.java @@ -10,10 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.exceptions; +package org.dromara.hutool.core.exceptions; -import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 克隆异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/DependencyException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/DependencyException.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/exceptions/DependencyException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/exceptions/DependencyException.java index 60489bbc5..29dbdc1e3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/DependencyException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/DependencyException.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.exceptions; +package org.dromara.hutool.core.exceptions; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 依赖异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/ExceptionUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ExceptionUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/exceptions/ExceptionUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ExceptionUtil.java index f6c95b8b2..9b51cd5d6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/ExceptionUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ExceptionUtil.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.exceptions; +package org.dromara.hutool.core.exceptions; -import cn.hutool.core.io.stream.FastByteArrayOutputStream; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.reflect.ConstructorUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.reflect.ConstructorUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.CharUtil; import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/InvocationTargetRuntimeException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/InvocationTargetRuntimeException.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/exceptions/InvocationTargetRuntimeException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/exceptions/InvocationTargetRuntimeException.java index 718c69f09..c90992049 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/InvocationTargetRuntimeException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/InvocationTargetRuntimeException.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.exceptions; +package org.dromara.hutool.core.exceptions; /** * InvocationTargetException的运行时异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/NotInitedException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/NotInitedException.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/exceptions/NotInitedException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/exceptions/NotInitedException.java index 4559a791e..419ad378c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/NotInitedException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/NotInitedException.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.exceptions; +package org.dromara.hutool.core.exceptions; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 未初始化异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/StatefulException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/StatefulException.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/exceptions/StatefulException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/exceptions/StatefulException.java index c83becc91..5d6db5267 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/StatefulException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/StatefulException.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.exceptions; +package org.dromara.hutool.core.exceptions; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 带有状态码的异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/UtilException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/UtilException.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/exceptions/UtilException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/exceptions/UtilException.java index 8b1780e1e..f78861fb1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/UtilException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/UtilException.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.exceptions; +package org.dromara.hutool.core.exceptions; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 工具类异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/ValidateException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ValidateException.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/exceptions/ValidateException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ValidateException.java index b471a63d7..e0139bc74 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/ValidateException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ValidateException.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.exceptions; +package org.dromara.hutool.core.exceptions; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 验证异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/exceptions/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/exceptions/package-info.java index 65312e7bb..40b866e82 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.exceptions; +package org.dromara.hutool.core.exceptions; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/AppendableWriter.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/AppendableWriter.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/io/AppendableWriter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/AppendableWriter.java index 9325b6dfc..704332f91 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/AppendableWriter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/AppendableWriter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; import java.io.Closeable; import java.io.Flushable; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/BomReader.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/BomReader.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/io/BomReader.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/BomReader.java index 76346c1c9..39b287b6a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/BomReader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/BomReader.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.io.stream.BOMInputStream; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.io.stream.BOMInputStream; +import org.dromara.hutool.core.lang.Assert; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/BufferUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/BufferUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/BufferUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/BufferUtil.java index f333d1b8a..712234401 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/BufferUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/BufferUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.nio.ByteBuffer; import java.nio.CharBuffer; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/ByteOrderMark.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/ByteOrderMark.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/ByteOrderMark.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/ByteOrderMark.java index 081cda175..4aeb01b13 --- a/hutool-core/src/main/java/cn/hutool/core/io/ByteOrderMark.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/ByteOrderMark.java @@ -1,8 +1,8 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.Serializable; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/CharsetDetector.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/CharsetDetector.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/CharsetDetector.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/CharsetDetector.java index e442d4d40..8bb2a40ea 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/CharsetDetector.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/CharsetDetector.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/CircularByteBuffer.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/CircularByteBuffer.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/io/CircularByteBuffer.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/CircularByteBuffer.java index 71069f36f..18ec4f27d --- a/hutool-core/src/main/java/cn/hutool/core/io/CircularByteBuffer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/CircularByteBuffer.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FastByteBuffer.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/FastByteBuffer.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/io/FastByteBuffer.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/FastByteBuffer.java index 5238ccb3f..af3ce180f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/FastByteBuffer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/FastByteBuffer.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; /** * 代码移植自blade
    diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FastStringWriter.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/FastStringWriter.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/io/FastStringWriter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/FastStringWriter.java index 0a1930adb..7f5f60f64 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/FastStringWriter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/FastStringWriter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; import java.io.Writer; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/IORuntimeException.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/IORuntimeException.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/IORuntimeException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/IORuntimeException.java index bd50486cd..dcdd175ca 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/IORuntimeException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/IORuntimeException.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exceptions.ExceptionUtil; +import org.dromara.hutool.core.text.StrUtil; /** * IO运行时异常，常用于对IOException的包装 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java index fdc27da5f..d32942bb6 --- a/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java @@ -10,22 +10,22 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.codec.HexUtil; -import cn.hutool.core.collection.iter.LineIter; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.copy.FileChannelCopier; -import cn.hutool.core.io.copy.ReaderWriterCopier; -import cn.hutool.core.io.copy.StreamCopier; -import cn.hutool.core.io.stream.FastByteArrayOutputStream; -import cn.hutool.core.io.stream.StreamReader; -import cn.hutool.core.io.stream.StreamWriter; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.func.SerConsumer; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.codec.HexUtil; +import org.dromara.hutool.core.collection.iter.LineIter; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.copy.FileChannelCopier; +import org.dromara.hutool.core.io.copy.ReaderWriterCopier; +import org.dromara.hutool.core.io.copy.StreamCopier; +import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream; +import org.dromara.hutool.core.io.stream.StreamReader; +import org.dromara.hutool.core.io.stream.StreamWriter; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.func.SerConsumer; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/LineReader.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/LineReader.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java index 01b655aad..7f9e2adfd --- a/hutool-core/src/main/java/cn/hutool/core/io/LineReader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.collection.iter.ComputeIter; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.collection.iter.ComputeIter; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/NioUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/NioUtil.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/io/NioUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/NioUtil.java index 44c8aa00e..a3355c1cf 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/NioUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/NioUtil.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.io.copy.ChannelCopier; -import cn.hutool.core.io.copy.FileChannelCopier; -import cn.hutool.core.io.stream.FastByteArrayOutputStream; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.copy.ChannelCopier; +import org.dromara.hutool.core.io.copy.FileChannelCopier; +import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/ReaderWrapper.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/ReaderWrapper.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/ReaderWrapper.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/ReaderWrapper.java index ab9663c57..e3b5f658a --- a/hutool-core/src/main/java/cn/hutool/core/io/ReaderWrapper.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/ReaderWrapper.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.func.Wrapper; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.func.Wrapper; import java.io.IOException; import java.io.Reader; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/SerializeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/io/SerializeUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java index 6bb06ce75..a9479dee5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/SerializeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.stream.FastByteArrayOutputStream; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream; import java.io.ByteArrayInputStream; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/StreamProgress.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/StreamProgress.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/StreamProgress.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/StreamProgress.java index 3e224a74b..2659924f0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/StreamProgress.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/StreamProgress.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; /** * Stream进度条
    diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/CRC16.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/CRC16.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/CRC16.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/CRC16.java index 94200af9f..4da8f0279 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/CRC16.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/CRC16.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum; +package org.dromara.hutool.core.io.checksum; -import cn.hutool.core.io.checksum.crc16.CRC16Checksum; -import cn.hutool.core.io.checksum.crc16.CRC16IBM; +import org.dromara.hutool.core.io.checksum.crc16.CRC16Checksum; +import org.dromara.hutool.core.io.checksum.crc16.CRC16IBM; import java.io.Serializable; import java.util.zip.Checksum; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/CRC8.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/CRC8.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/CRC8.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/CRC8.java index 3add7b56d..e4f1e23ce 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/CRC8.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/CRC8.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum; +package org.dromara.hutool.core.io.checksum; import java.io.Serializable; import java.util.zip.Checksum; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/ChecksumUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/ChecksumUtil.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/ChecksumUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/ChecksumUtil.java index 37f8408c7..c8295d7d0 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/ChecksumUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/ChecksumUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum; +package org.dromara.hutool.core.io.checksum; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.stream.EmptyOutputStream; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.stream.EmptyOutputStream; +import org.dromara.hutool.core.lang.Assert; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Ansi.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Ansi.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Ansi.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Ansi.java index 99844ff79..9b24773a8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Ansi.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Ansi.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum.crc16; +package org.dromara.hutool.core.io.checksum.crc16; /** * CRC16_ANSI diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16CCITT.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16CCITT.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16CCITT.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16CCITT.java index b3cd3625c..0422357d6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16CCITT.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16CCITT.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum.crc16; +package org.dromara.hutool.core.io.checksum.crc16; /** * CRC16_CCITT：多项式x16+x12+x5+1（0x1021），初始值0x0000，低位在前，高位在后，结果与0x0000异或 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16CCITTFalse.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16CCITTFalse.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16CCITTFalse.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16CCITTFalse.java index 56ecc56d7..c45c29dcc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16CCITTFalse.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16CCITTFalse.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum.crc16; +package org.dromara.hutool.core.io.checksum.crc16; /** * CRC16_CCITT_FALSE：多项式x16+x12+x5+1（0x1021），初始值0xFFFF，低位在后，高位在前，结果与0x0000异或 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Checksum.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Checksum.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Checksum.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Checksum.java index 19f565c9b..e1aa18557 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Checksum.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Checksum.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum.crc16; +package org.dromara.hutool.core.io.checksum.crc16; -import cn.hutool.core.codec.HexUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.codec.HexUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.Serializable; import java.util.zip.Checksum; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16DNP.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16DNP.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16DNP.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16DNP.java index c9094807e..da51d63ae 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16DNP.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16DNP.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum.crc16; +package org.dromara.hutool.core.io.checksum.crc16; /** * CRC16_DNP：多项式x16+x13+x12+x11+x10+x8+x6+x5+x2+1（0x3D65），初始值0x0000，低位在前，高位在后，结果与0xFFFF异或 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16IBM.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16IBM.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16IBM.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16IBM.java index de91114a5..4746e4347 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16IBM.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16IBM.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum.crc16; +package org.dromara.hutool.core.io.checksum.crc16; /** * CRC16_IBM：多项式x16+x15+x2+1（0x8005），初始值0x0000，低位在前，高位在后，结果与0x0000异或 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Maxim.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Maxim.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Maxim.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Maxim.java index 900912a89..50fc74c58 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Maxim.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Maxim.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum.crc16; +package org.dromara.hutool.core.io.checksum.crc16; /** * CRC16_MAXIM：多项式x16+x15+x2+1（0x8005），初始值0x0000，低位在前，高位在后，结果与0xFFFF异或 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Modbus.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Modbus.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Modbus.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Modbus.java index adf8bb45c..2eec98ba8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Modbus.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Modbus.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum.crc16; +package org.dromara.hutool.core.io.checksum.crc16; /** * CRC-16 (Modbus) diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16USB.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16USB.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16USB.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16USB.java index e50712e72..a16d54f73 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16USB.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16USB.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum.crc16; +package org.dromara.hutool.core.io.checksum.crc16; /** * CRC16_USB：多项式x16+x15+x2+1（0x8005），初始值0xFFFF，低位在前，高位在后，结果与0xFFFF异或 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16X25.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16X25.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16X25.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16X25.java index 549789c0f..d4eb08127 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16X25.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16X25.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum.crc16; +package org.dromara.hutool.core.io.checksum.crc16; /** * CRC16_X25：多项式x16+x12+x5+1（0x1021），初始值0xffff，低位在前，高位在后，结果与0xFFFF异或 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16XModem.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16XModem.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16XModem.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16XModem.java index 60e114075..eeb644ab1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16XModem.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16XModem.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.checksum.crc16; +package org.dromara.hutool.core.io.checksum.crc16; /** * CRC-CCITT (XModem) diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/package-info.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/package-info.java index 00bcdf7ad..70bcd974e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.io.checksum.crc16; +package org.dromara.hutool.core.io.checksum.crc16; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/package-info.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/checksum/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/package-info.java index 2f8e57593..b189662fe 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/checksum/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.io.checksum; +package org.dromara.hutool.core.io.checksum; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/copy/ChannelCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/ChannelCopier.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/copy/ChannelCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/copy/ChannelCopier.java index c3bb51eea..fbcd85840 --- a/hutool-core/src/main/java/cn/hutool/core/io/copy/ChannelCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/ChannelCopier.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.copy; +package org.dromara.hutool.core.io.copy; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.StreamProgress; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.StreamProgress; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/copy/FileChannelCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/FileChannelCopier.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/copy/FileChannelCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/copy/FileChannelCopier.java index 37fc11b58..2a9d8d964 --- a/hutool-core/src/main/java/cn/hutool/core/io/copy/FileChannelCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/FileChannelCopier.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.copy; +package org.dromara.hutool.core.io.copy; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/copy/IoCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/IoCopier.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/copy/IoCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/copy/IoCopier.java index 8570fa3fb..1b88f8a4d --- a/hutool-core/src/main/java/cn/hutool/core/io/copy/IoCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/IoCopier.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.copy; +package org.dromara.hutool.core.io.copy; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.StreamProgress; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.StreamProgress; /** * IO拷贝抽象，可自定义包括缓存、进度条等信息
    diff --git a/hutool-core/src/main/java/cn/hutool/core/io/copy/ReaderWriterCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/ReaderWriterCopier.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/copy/ReaderWriterCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/copy/ReaderWriterCopier.java index 1beee2c01..3eecbf2d3 --- a/hutool-core/src/main/java/cn/hutool/core/io/copy/ReaderWriterCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/ReaderWriterCopier.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.copy; +package org.dromara.hutool.core.io.copy; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.StreamProgress; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.StreamProgress; +import org.dromara.hutool.core.lang.Assert; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/copy/StreamCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/StreamCopier.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/copy/StreamCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/copy/StreamCopier.java index 3ab4cfb4a..6df71b636 --- a/hutool-core/src/main/java/cn/hutool/core/io/copy/StreamCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/StreamCopier.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.copy; +package org.dromara.hutool.core.io.copy; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.StreamProgress; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.StreamProgress; +import org.dromara.hutool.core.lang.Assert; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/copy/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/io/copy/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/copy/package-info.java index c4393d791..80264862a --- a/hutool-core/src/main/java/cn/hutool/core/io/copy/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/package-info.java @@ -16,4 +16,4 @@ * @author looly * @since 5.7.8 */ -package cn.hutool.core.io.copy; +package org.dromara.hutool.core.io.copy; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileAppender.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileAppender.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/io/file/FileAppender.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileAppender.java index de9f8f415..13464c712 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileAppender.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileAppender.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.thread.lock.LockUtil; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.thread.lock.LockUtil; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.io.File; import java.io.PrintWriter; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileMagicNumber.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMagicNumber.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/io/file/FileMagicNumber.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMagicNumber.java index 6225fed99..e4246205f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileMagicNumber.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMagicNumber.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.math.BigInteger; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileMode.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMode.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/file/FileMode.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMode.java index e4eb7cdb7..4cd0acad9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileMode.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMode.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; /** * 文件读写模式，常用于RandomAccessFile diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java index c32acfd98..fc0f3a387 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java @@ -10,15 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.net.url.URLUtil; -import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.SystemUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.SystemUtil; import java.io.File; import java.util.LinkedList; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java index 658c6ddf2..1a3f0c15f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java @@ -10,15 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.func.SerConsumer; -import cn.hutool.core.lang.func.SerFunction; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.lang.func.SerConsumer; +import org.dromara.hutool.core.lang.func.SerFunction; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.*; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileSystemUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileSystemUtil.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/io/file/FileSystemUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileSystemUtil.java index 74a9c9633..3ccc53001 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileSystemUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileSystemUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.IOException; import java.net.URI; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileTypeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileTypeUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/file/FileTypeUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileTypeUtil.java index b676f11b7..363baed8a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileTypeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileTypeUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.codec.HexUtil; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.codec.HexUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/file/FileUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java index cf44bb63f..48e095e8c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java @@ -10,29 +10,29 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.compress.ZipUtil; -import cn.hutool.core.io.BomReader; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.io.stream.BOMInputStream; -import cn.hutool.core.io.unit.DataSizeUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.func.SerConsumer; -import cn.hutool.core.lang.func.SerFunction; -import cn.hutool.core.net.url.URLUtil; -import cn.hutool.core.reflect.ClassUtil; -import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.util.SystemUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.compress.ZipUtil; +import org.dromara.hutool.core.io.BomReader; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.resource.ResourceUtil; +import org.dromara.hutool.core.io.stream.BOMInputStream; +import org.dromara.hutool.core.io.unit.DataSizeUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.func.SerConsumer; +import org.dromara.hutool.core.lang.func.SerFunction; +import org.dromara.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.reflect.ClassUtil; +import org.dromara.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.util.SystemUtil; import java.io.*; import java.net.URI; @@ -704,7 +704,7 @@ public class FileUtil extends PathUtil { */ public static void del(final File file) throws IORuntimeException { Assert.notNull(file, "File must be not null!"); - PathUtil.del(file.toPath()); + del(file.toPath()); } /** @@ -729,7 +729,7 @@ public class FileUtil extends PathUtil { */ public static void clean(final File directory) throws IORuntimeException { Assert.notNull(directory, "File must be not null!"); - PathUtil.clean(directory.toPath()); + clean(directory.toPath()); } /** @@ -942,7 +942,7 @@ public class FileUtil extends PathUtil { public static File copy(final File src, final File target, final boolean isOverride) throws IORuntimeException { Assert.notNull(src, "Src file must be not null!"); Assert.notNull(target, "target file must be not null!"); - return PathUtil.copy( + return copy( src.toPath(), target.toPath(), isOverride ? new CopyOption[]{StandardCopyOption.REPLACE_EXISTING} : new CopyOption[]{}) @@ -968,7 +968,7 @@ public class FileUtil extends PathUtil { public static File copyContent(final File src, final File target, final boolean isOverride) throws IORuntimeException { Assert.notNull(src, "Src file must be not null!"); Assert.notNull(target, "target file must be not null!"); - return PathUtil.copyContent( + return copyContent( src.toPath(), target.toPath(), isOverride ? new CopyOption[]{StandardCopyOption.REPLACE_EXISTING} : new CopyOption[]{}) @@ -1611,7 +1611,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static byte[] readBytes(final File file) throws IORuntimeException { - return FileReader.of(file).readBytes(); + return org.dromara.hutool.core.io.file.FileReader.of(file).readBytes(); } /** @@ -1658,7 +1658,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static String readString(final File file, final Charset charset) throws IORuntimeException { - return FileReader.of(file, charset).readString(); + return org.dromara.hutool.core.io.file.FileReader.of(file, charset).readString(); } /** @@ -1751,7 +1751,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static > T readLines(final File file, final Charset charset, final T collection) throws IORuntimeException { - return FileReader.of(file, charset).readLines(collection); + return org.dromara.hutool.core.io.file.FileReader.of(file, charset).readLines(collection); } /** @@ -1882,7 +1882,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static void readLines(final File file, final Charset charset, final SerConsumer lineHandler) throws IORuntimeException { - FileReader.of(file, charset).readLines(lineHandler); + org.dromara.hutool.core.io.file.FileReader.of(file, charset).readLines(lineHandler); } /** @@ -1998,7 +1998,7 @@ public class FileUtil extends PathUtil { * @since 3.1.1 */ public static T read(final File file, final Charset charset, final SerFunction readerHandler) throws IORuntimeException { - return FileReader.of(file, charset).read(readerHandler); + return org.dromara.hutool.core.io.file.FileReader.of(file, charset).read(readerHandler); } // endregion @@ -2055,7 +2055,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static BufferedWriter getWriter(final File file, final Charset charset, final boolean isAppend) throws IORuntimeException { - return FileWriter.of(file, charset).getWriter(isAppend); + return org.dromara.hutool.core.io.file.FileWriter.of(file, charset).getWriter(isAppend); } /** @@ -2152,7 +2152,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static File writeString(final String content, final File file, final Charset charset) throws IORuntimeException { - return FileWriter.of(file, charset).write(content); + return org.dromara.hutool.core.io.file.FileWriter.of(file, charset).write(content); } /** @@ -2204,7 +2204,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static File appendString(final String content, final File file, final Charset charset) throws IORuntimeException { - return FileWriter.of(file, charset).append(content); + return org.dromara.hutool.core.io.file.FileWriter.of(file, charset).append(content); } /** @@ -2353,7 +2353,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static File writeLines(final Collection list, final File file, final Charset charset, final boolean isAppend) throws IORuntimeException { - return FileWriter.of(file, charset).writeLines(list, isAppend); + return org.dromara.hutool.core.io.file.FileWriter.of(file, charset).writeLines(list, isAppend); } /** @@ -2368,7 +2368,7 @@ public class FileUtil extends PathUtil { * @since 4.0.5 */ public static File writeUtf8Map(final Map map, final File file, final String kvSeparator, final boolean isAppend) throws IORuntimeException { - return FileWriter.of(file, CharsetUtil.UTF_8).writeMap(map, kvSeparator, isAppend); + return org.dromara.hutool.core.io.file.FileWriter.of(file, CharsetUtil.UTF_8).writeMap(map, kvSeparator, isAppend); } /** @@ -2384,7 +2384,7 @@ public class FileUtil extends PathUtil { * @since 4.0.5 */ public static File writeMap(final Map map, final File file, final Charset charset, final String kvSeparator, final boolean isAppend) throws IORuntimeException { - return FileWriter.of(file, charset).writeMap(map, kvSeparator, isAppend); + return org.dromara.hutool.core.io.file.FileWriter.of(file, charset).writeMap(map, kvSeparator, isAppend); } /** @@ -2424,7 +2424,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static File writeBytes(final byte[] data, final File dest, final int off, final int len, final boolean isAppend) throws IORuntimeException { - return FileWriter.of(dest).write(data, off, len, isAppend); + return org.dromara.hutool.core.io.file.FileWriter.of(dest).write(data, off, len, isAppend); } /** @@ -2451,7 +2451,7 @@ public class FileUtil extends PathUtil { * @since 5.5.6 */ public static File writeFromStream(final InputStream in, final File dest, final boolean isCloseIn) throws IORuntimeException { - return FileWriter.of(dest).writeFromStream(in, isCloseIn); + return org.dromara.hutool.core.io.file.FileWriter.of(dest).writeFromStream(in, isCloseIn); } /** @@ -2476,7 +2476,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 */ public static long writeToStream(final File file, final OutputStream out) throws IORuntimeException { - return FileReader.of(file).writeToStream(out); + return org.dromara.hutool.core.io.file.FileReader.of(file).writeToStream(out); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileWrapper.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWrapper.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/file/FileWrapper.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWrapper.java index 3ca14cfe2..aebee7402 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileWrapper.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWrapper.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.lang.func.Wrapper; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.lang.func.Wrapper; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.File; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWriter.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWriter.java index 4dab0c4f8..7712172df 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWriter.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.BufferedOutputStream; import java.io.BufferedWriter; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/LineReadWatcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/LineReadWatcher.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/io/file/LineReadWatcher.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/LineReadWatcher.java index 55b3ad309..f592d85c7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/LineReadWatcher.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/LineReadWatcher.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.watch.SimpleWatcher; -import cn.hutool.core.lang.func.SerConsumer; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.watch.SimpleWatcher; +import org.dromara.hutool.core.lang.func.SerConsumer; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/LineSeparator.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/LineSeparator.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/file/LineSeparator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/LineSeparator.java index 6b865936b..ad526d2e0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/LineSeparator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/LineSeparator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; /** * 换行符枚举
    diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/PathCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathCopier.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/io/file/PathCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathCopier.java index 4570cd6ae..eab2566ae --- a/hutool-core/src/main/java/cn/hutool/core/io/file/PathCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathCopier.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.file.visitor.CopyVisitor; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.copier.SrcToDestCopier; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.file.visitor.CopyVisitor; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.copier.SrcToDestCopier; +import org.dromara.hutool.core.util.ObjUtil; import java.io.IOException; import java.nio.file.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/PathDeleter.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathDeleter.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/file/PathDeleter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathDeleter.java index 72397360b..600a81dd4 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/PathDeleter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathDeleter.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.file.visitor.DelVisitor; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.file.visitor.DelVisitor; +import org.dromara.hutool.core.lang.Assert; import java.io.IOException; import java.nio.file.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/PathMover.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/io/file/PathMover.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java index 8780d0359..f2b482299 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/PathMover.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.file.visitor.MoveVisitor; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.file.visitor.MoveVisitor; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.io.IOException; import java.nio.file.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/PathUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/io/file/PathUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathUtil.java index b79ec9143..2d5b6cfb8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/PathUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.*; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java index dde06ffcb..15d3a13f6 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/Tailer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java @@ -10,16 +10,16 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.date.DateUnit; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Console; -import cn.hutool.core.lang.func.SerConsumer; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.date.DateUnit; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.lang.func.SerConsumer; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/file/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/package-info.java index ff0cc97e1..466d22dd7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/CopyVisitor.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/CopyVisitor.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/file/visitor/CopyVisitor.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/CopyVisitor.java index 6b2810baf..e058364f1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/CopyVisitor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/CopyVisitor.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file.visitor; +package org.dromara.hutool.core.io.file.visitor; -import cn.hutool.core.io.file.PathUtil; +import org.dromara.hutool.core.io.file.PathUtil; import java.io.IOException; import java.nio.file.CopyOption; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/DelVisitor.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/DelVisitor.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/file/visitor/DelVisitor.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/DelVisitor.java index 6a92f22d8..9b8ac690f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/DelVisitor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/DelVisitor.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file.visitor; +package org.dromara.hutool.core.io.file.visitor; import java.io.IOException; import java.nio.file.FileVisitResult; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/MoveVisitor.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/MoveVisitor.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/file/visitor/MoveVisitor.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/MoveVisitor.java index 391e8e286..a54545591 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/MoveVisitor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/MoveVisitor.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.file.visitor; +package org.dromara.hutool.core.io.file.visitor; -import cn.hutool.core.io.file.PathUtil; +import org.dromara.hutool.core.io.file.PathUtil; import java.io.IOException; import java.nio.file.CopyOption; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/package-info.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/file/visitor/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/package-info.java index 2a6445069..7cbab46bf 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/visitor/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.io.file.visitor; +package org.dromara.hutool.core.io.file.visitor; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/package-info.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/io/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/package-info.java index e6b37af03..dfbaa47ec 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/BytesResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/BytesResource.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/BytesResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/BytesResource.java index 9b7975856..e0f5ed4b6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/BytesResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/BytesResource.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.text.StrUtil; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/CharSequenceResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/CharSequenceResource.java similarity index 88% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/CharSequenceResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/CharSequenceResource.java index 8d86d46e6..c52fa02c0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/CharSequenceResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/CharSequenceResource.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.*; import java.net.URL; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/ClassPathResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ClassPathResource.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/ClassPathResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ClassPathResource.java index 974658228..81f2cac35 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/ClassPathResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ClassPathResource.java @@ -10,15 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.file.FileNameUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.net.url.URLUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.file.FileNameUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.net.URL; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/FileObjectResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/FileObjectResource.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/FileObjectResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/FileObjectResource.java index 9524c276e..f23f20ff3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/FileObjectResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/FileObjectResource.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; import javax.tools.FileObject; import java.io.BufferedReader; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/FileResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/FileResource.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/FileResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/FileResource.java index 5d205b523..606bb4af9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/FileResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/FileResource.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.net.url.URLUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/HttpResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/HttpResource.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/HttpResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/HttpResource.java index b531d7fbf..688f01e1d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/HttpResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/HttpResource.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.io.InputStream; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/InputStreamResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/InputStreamResource.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/InputStreamResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/InputStreamResource.java index f57a1c922..6a84c291b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/InputStreamResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/InputStreamResource.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; import java.io.InputStream; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/MultiFileResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/MultiFileResource.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/MultiFileResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/MultiFileResource.java index 02b3efcab..c79de8d8e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/MultiFileResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/MultiFileResource.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; import java.io.File; import java.nio.file.Path; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/MultiResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/MultiResource.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/MultiResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/MultiResource.java index 877e6c774..4794af8fb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/MultiResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/MultiResource.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.io.IORuntimeException; import java.io.BufferedReader; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/NoResourceException.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/NoResourceException.java similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/NoResourceException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/NoResourceException.java index 41fbb27f9..0d877348c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/NoResourceException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/NoResourceException.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exceptions.ExceptionUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.text.StrUtil; /** * 资源文件或资源不存在异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/Resource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/Resource.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/Resource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/Resource.java index 061efa7f3..164914ff4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/Resource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/Resource.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.BufferedReader; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ResourceUtil.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ResourceUtil.java index 197481320..e157a5a32 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ResourceUtil.java @@ -10,17 +10,17 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.collection.iter.EnumerationIter; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.net.url.URLUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.iter.EnumerationIter; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.io.BufferedReader; import java.io.File; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/StringResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/StringResource.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/StringResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/StringResource.java index 53cc05504..5646fc3c4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/StringResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/StringResource.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/UrlResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/UrlResource.java old mode 100755 new mode 100644 similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/UrlResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/UrlResource.java index 480c042f6..7e961d82a --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/UrlResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/UrlResource.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.file.FileNameUtil; -import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.file.FileNameUtil; +import org.dromara.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.net.url.URLUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/VfsResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/VfsResource.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/VfsResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/VfsResource.java index ae340ca66..0f04eca83 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/VfsResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/VfsResource.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.reflect.MethodUtil; import java.io.InputStream; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/WebAppResource.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/WebAppResource.java similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/WebAppResource.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/WebAppResource.java index 6c10ab245..43fb6736b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/WebAppResource.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/WebAppResource.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; import java.io.File; -import cn.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.file.FileUtil; /** * Web root资源访问对象 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/io/resource/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/resource/package-info.java index 31308d529..8d8d53a49 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/resource/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/BOMInputStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/BOMInputStream.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/stream/BOMInputStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/stream/BOMInputStream.java index fa0319372..ca0df4412 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/BOMInputStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/BOMInputStream.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.stream; +package org.dromara.hutool.core.io.stream; -import cn.hutool.core.io.ByteOrderMark; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.io.ByteOrderMark; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/EmptyInputStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/EmptyInputStream.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/stream/EmptyInputStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/stream/EmptyInputStream.java index 02326868e..ba29356b7 --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/EmptyInputStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/EmptyInputStream.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.stream; +package org.dromara.hutool.core.io.stream; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/EmptyOutputStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/EmptyOutputStream.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/stream/EmptyOutputStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/stream/EmptyOutputStream.java index 2e7760041..17ed4463f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/EmptyOutputStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/EmptyOutputStream.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.stream; +package org.dromara.hutool.core.io.stream; import java.io.OutputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/FastByteArrayOutputStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/FastByteArrayOutputStream.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/stream/FastByteArrayOutputStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/stream/FastByteArrayOutputStream.java index 19bec7605..cc7498444 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/FastByteArrayOutputStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/FastByteArrayOutputStream.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.stream; +package org.dromara.hutool.core.io.stream; -import cn.hutool.core.io.FastByteBuffer; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.io.FastByteBuffer; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.io.IOException; import java.io.OutputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/LimitedInputStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/LimitedInputStream.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/stream/LimitedInputStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/stream/LimitedInputStream.java index a5405ba3d..a86661c8e --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/LimitedInputStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/LimitedInputStream.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.stream; +package org.dromara.hutool.core.io.stream; import java.io.FilterInputStream; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/StrInputStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StrInputStream.java old mode 100755 new mode 100644 similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/io/stream/StrInputStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StrInputStream.java index 8bab20264..7a730cdf4 --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/StrInputStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StrInputStream.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.stream; +package org.dromara.hutool.core.io.stream; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.ByteArrayInputStream; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/StreamReader.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamReader.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/io/stream/StreamReader.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamReader.java index c55fe0b52..8978ffc72 --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/StreamReader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamReader.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.stream; +package org.dromara.hutool.core.io.stream; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; import java.io.FileInputStream; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/StreamWriter.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamWriter.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/io/stream/StreamWriter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamWriter.java index a1257c2bd..e5dec72d9 --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/StreamWriter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamWriter.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.stream; +package org.dromara.hutool.core.io.stream; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.IOException; import java.io.ObjectOutputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/SyncInputStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/SyncInputStream.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/stream/SyncInputStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/stream/SyncInputStream.java index 5ee9e1f35..43a828402 --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/SyncInputStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/SyncInputStream.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.stream; +package org.dromara.hutool.core.io.stream; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.StreamProgress; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.StreamProgress; +import org.dromara.hutool.core.text.StrUtil; import java.io.ByteArrayInputStream; import java.io.EOFException; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/ValidateObjectInputStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/ValidateObjectInputStream.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/stream/ValidateObjectInputStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/stream/ValidateObjectInputStream.java index ba9cb075b..cf48a54de 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/ValidateObjectInputStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/ValidateObjectInputStream.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.stream; +package org.dromara.hutool.core.io.stream; -import cn.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.CollUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/stream/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/io/stream/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/stream/package-info.java index 8b2b5ea61..8d091547e --- a/hutool-core/src/main/java/cn/hutool/core/io/stream/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/package-info.java @@ -15,4 +15,4 @@ * * @author looly */ -package cn.hutool.core.io.stream; +package org.dromara.hutool.core.io.stream; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/unit/DataSize.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSize.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/io/unit/DataSize.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSize.java index 2c71ce1bb..1519c03e3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/unit/DataSize.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSize.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.unit; +package org.dromara.hutool.core.io.unit; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; import java.math.BigDecimal; import java.util.regex.Matcher; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/unit/DataSizeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSizeUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/unit/DataSizeUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSizeUtil.java index e5eb8c61e..dd6e247d6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/unit/DataSizeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSizeUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.unit; +package org.dromara.hutool.core.io.unit; import java.text.DecimalFormat; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/unit/DataUnit.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataUnit.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/unit/DataUnit.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataUnit.java index 1922c2cbc..b24500f9b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/unit/DataUnit.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataUnit.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.unit; +package org.dromara.hutool.core.io.unit; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 数据单位封装

    diff --git a/hutool-core/src/main/java/cn/hutool/core/io/unit/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/unit/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/unit/package-info.java index 6cfc12782..004b310d5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/unit/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/package-info.java @@ -16,4 +16,4 @@ * @author looly * @since 5.3.10 */ -package cn.hutool.core.io.unit; +package org.dromara.hutool.core.io.unit; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/SimpleWatcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/SimpleWatcher.java similarity index 80% rename from hutool-core/src/main/java/cn/hutool/core/io/watch/SimpleWatcher.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/watch/SimpleWatcher.java index 1ea8326c0..3b62c8bcc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/SimpleWatcher.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/SimpleWatcher.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.watch; +package org.dromara.hutool.core.io.watch; -import cn.hutool.core.io.watch.watchers.IgnoreWatcher; +import org.dromara.hutool.core.io.watch.watchers.IgnoreWatcher; /** * 空白WatchListener
    @@ -20,6 +20,6 @@ import cn.hutool.core.io.watch.watchers.IgnoreWatcher; * @author Looly * */ -public class SimpleWatcher extends IgnoreWatcher{ +public class SimpleWatcher extends IgnoreWatcher { } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchException.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchException.java similarity index 89% rename from hutool-core/src/main/java/cn/hutool/core/io/watch/WatchException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchException.java index e9be9fdb8..aecfc0b69 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchException.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.watch; +package org.dromara.hutool.core.io.watch; -import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exceptions.ExceptionUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 监听异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchKind.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchKind.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/watch/WatchKind.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchKind.java index b20a8fa74..2e31705d3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchKind.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchKind.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.watch; +package org.dromara.hutool.core.io.watch; import java.nio.file.StandardWatchEventKinds; import java.nio.file.WatchEvent; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchMonitor.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/watch/WatchMonitor.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java index dac83e0da..7e3c1fc59 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchMonitor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.watch; +package org.dromara.hutool.core.io.watch; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.file.PathUtil; -import cn.hutool.core.io.watch.watchers.WatcherChain; -import cn.hutool.core.net.url.URLUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.file.PathUtil; +import org.dromara.hutool.core.io.watch.watchers.WatcherChain; +import org.dromara.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharUtil; import java.io.File; import java.net.URI; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchServer.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchServer.java index 52477c79b..868f13833 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchServer.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.watch; +package org.dromara.hutool.core.io.watch; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.func.SerBiConsumer; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.lang.func.SerBiConsumer; +import org.dromara.hutool.core.array.ArrayUtil; import java.io.Closeable; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/io/watch/WatchUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchUtil.java index 01527c184..66756b112 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.watch; +package org.dromara.hutool.core.io.watch; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.net.url.URLUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/Watcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/Watcher.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/io/watch/Watcher.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/watch/Watcher.java index 0e1a1aea2..0c9da561e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/Watcher.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/Watcher.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.watch; +package org.dromara.hutool.core.io.watch; import java.nio.file.Path; import java.nio.file.WatchEvent; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/io/watch/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/watch/package-info.java index 8a18f193d..73cc87ea3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.io.watch; +package org.dromara.hutool.core.io.watch; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/DelayWatcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/DelayWatcher.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/DelayWatcher.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/DelayWatcher.java index e0d56e28a..7869a04b1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/DelayWatcher.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/DelayWatcher.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.watch.watchers; +package org.dromara.hutool.core.io.watch.watchers; -import cn.hutool.core.collection.ConcurrentHashSet; -import cn.hutool.core.io.watch.Watcher; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.collection.ConcurrentHashSet; +import org.dromara.hutool.core.io.watch.Watcher; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.thread.ThreadUtil; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/IgnoreWatcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/IgnoreWatcher.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/IgnoreWatcher.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/IgnoreWatcher.java index 63703ebb6..8942afa95 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/IgnoreWatcher.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/IgnoreWatcher.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.watch.watchers; +package org.dromara.hutool.core.io.watch.watchers; import java.nio.file.Path; import java.nio.file.WatchEvent; -import cn.hutool.core.io.watch.Watcher; +import org.dromara.hutool.core.io.watch.Watcher; /** * 跳过所有事件处理Watcher
    diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/WatcherChain.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/WatcherChain.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/WatcherChain.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/WatcherChain.java index b085a1e01..1d1682dec 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/WatcherChain.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/WatcherChain.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.io.watch.watchers; +package org.dromara.hutool.core.io.watch.watchers; -import cn.hutool.core.io.watch.Watcher; -import cn.hutool.core.lang.Chain; +import org.dromara.hutool.core.io.watch.Watcher; +import org.dromara.hutool.core.lang.Chain; import java.nio.file.Path; import java.nio.file.WatchEvent; @@ -28,7 +28,7 @@ import java.util.List; * @author Looly * @since 3.1.0 */ -public class WatcherChain implements Watcher, Chain{ +public class WatcherChain implements Watcher, Chain { /** 观察者列表 */ final private List chain; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/package-info.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/package-info.java index a781c9341..1bf937903 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.io.watch.watchers; +package org.dromara.hutool.core.io.watch.watchers; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Assert.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/lang/Assert.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/Assert.java index 41ba026ac..c6a9f9e01 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Assert.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.util.Map; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Chain.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Chain.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/Chain.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/Chain.java index db82b8e6c..20dd57bde 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Chain.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Chain.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; /** * 责任链接口 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Console.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Console.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/Console.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/Console.java index 02beead47..b2978548d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Console.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Console.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.StrUtil; import java.util.Scanner; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ConsoleTable.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ConsoleTable.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/ConsoleTable.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/ConsoleTable.java index 8820f8d76..6e4387888 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ConsoleTable.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ConsoleTable.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.StrUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/DefaultSegment.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/DefaultSegment.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/DefaultSegment.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/DefaultSegment.java index d4ab0f4ef..a9da46e8c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/DefaultSegment.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/DefaultSegment.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 片段默认实现 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/EnumItem.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/EnumItem.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/EnumItem.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/EnumItem.java index 0415392aa..5522c956a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/EnumItem.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/EnumItem.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/Opt.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java index 7dc1012c4..6be44df98 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java @@ -9,11 +9,11 @@ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.func.SerSupplier; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.lang.func.SerSupplier; +import org.dromara.hutool.core.text.StrUtil; import java.util.Collection; import java.util.NoSuchElementException; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Segment.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Segment.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/lang/Segment.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/Segment.java index 54ad2705c..6a0edbdfc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Segment.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Segment.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.math.NumberUtil; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Singleton.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/Singleton.java index 88a18fbab..786a03e74 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Singleton.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.lang.func.SerSupplier; -import cn.hutool.core.map.SafeConcurrentHashMap; -import cn.hutool.core.reflect.ConstructorUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.lang.func.SerSupplier; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.reflect.ConstructorUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.util.Set; import java.util.stream.Collectors; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Tuple.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Tuple.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/lang/Tuple.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/Tuple.java index c14bd423f..232a51fe5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Tuple.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Tuple.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.collection.iter.ArrayIter; -import cn.hutool.core.exceptions.CloneRuntimeException; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.iter.ArrayIter; +import org.dromara.hutool.core.exceptions.CloneRuntimeException; +import org.dromara.hutool.core.array.ArrayUtil; import java.io.Serializable; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Validator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/Validator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java index 6d0ea3508..2f4c9896d --- a/hutool-core/src/main/java/cn/hutool/core/lang/Validator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java @@ -10,19 +10,19 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.exceptions.ValidateException; -import cn.hutool.core.regex.PatternPool; -import cn.hutool.core.regex.RegexPool; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.CreditCodeUtil; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.IdcardUtil; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.exceptions.ValidateException; +import org.dromara.hutool.core.regex.PatternPool; +import org.dromara.hutool.core.regex.RegexPool; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.CreditCodeUtil; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.IdcardUtil; import java.net.MalformedURLException; import java.nio.charset.Charset; @@ -30,8 +30,6 @@ import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static cn.hutool.core.regex.PatternPool.*; - /** * 字段验证器（验证器），分两种类型的验证： * @@ -332,7 +330,7 @@ public class Validator { * @return 是否为英文字母 、数字和下划线 */ public static boolean isGeneral(final CharSequence value) { - return isMatchRegex(GENERAL, value); + return isMatchRegex(PatternPool.GENERAL, value); } /** @@ -568,7 +566,7 @@ public class Validator { * @return 是否为货币 */ public static boolean isMoney(final CharSequence value) { - return isMatchRegex(MONEY, value); + return isMatchRegex(PatternPool.MONEY, value); } /** @@ -595,7 +593,7 @@ public class Validator { * @return 是否为邮政编码（中国） */ public static boolean isZipCode(final CharSequence value) { - return isMatchRegex(ZIP_CODE, value); + return isMatchRegex(PatternPool.ZIP_CODE, value); } /** @@ -621,7 +619,7 @@ public class Validator { * @return true为可用邮箱地址 */ public static boolean isEmail(final CharSequence value) { - return isMatchRegex(EMAIL, value); + return isMatchRegex(PatternPool.EMAIL, value); } /** @@ -647,7 +645,7 @@ public class Validator { * @return 是否为手机号码（中国） */ public static boolean isMobile(final CharSequence value) { - return isMatchRegex(MOBILE, value); + return isMatchRegex(PatternPool.MOBILE, value); } /** @@ -742,7 +740,7 @@ public class Validator { * @return 是否为生日 */ public static boolean isBirthday(final CharSequence value) { - final Matcher matcher = BIRTHDAY.matcher(value); + final Matcher matcher = PatternPool.BIRTHDAY.matcher(value); if (matcher.find()) { final int year = Integer.parseInt(matcher.group(1)); final int month = Integer.parseInt(matcher.group(3)); @@ -775,7 +773,7 @@ public class Validator { * @return 是否为IPV4地址 */ public static boolean isIpv4(final CharSequence value) { - return isMatchRegex(IPV4, value); + return isMatchRegex(PatternPool.IPV4, value); } /** @@ -801,7 +799,7 @@ public class Validator { * @return 是否为IPV6地址 */ public static boolean isIpv6(final CharSequence value) { - return isMatchRegex(IPV6, value); + return isMatchRegex(PatternPool.IPV6, value); } /** @@ -856,7 +854,7 @@ public class Validator { * @since 3.0.6 */ public static boolean isPlateNumber(final CharSequence value) { - return isMatchRegex(PLATE_NUMBER, value); + return isMatchRegex(PatternPool.PLATE_NUMBER, value); } /** @@ -954,7 +952,7 @@ public class Validator { * @return 是否为中文字、英文字母、数字和下划线 */ public static boolean isGeneralWithChinese(final CharSequence value) { - return isMatchRegex(GENERAL_WITH_CHINESE, value); + return isMatchRegex(PatternPool.GENERAL_WITH_CHINESE, value); } /** @@ -981,7 +979,7 @@ public class Validator { * @return 是否为UUID */ public static boolean isUUID(final CharSequence value) { - return isMatchRegex(UUID, value) || isMatchRegex(UUID_SIMPLE, value); + return isMatchRegex(PatternPool.UUID, value) || isMatchRegex(PatternPool.UUID_SIMPLE, value); } /** @@ -1109,7 +1107,7 @@ public class Validator { * @since 5.6.3 */ public static boolean isCarVin(final CharSequence value) { - return isMatchRegex(CAR_VIN, value); + return isMatchRegex(PatternPool.CAR_VIN, value); } /** @@ -1140,7 +1138,7 @@ public class Validator { * @since 5.6.3 */ public static boolean isCarDrivingLicence(final CharSequence value) { - return isMatchRegex(CAR_DRIVING_LICENCE, value); + return isMatchRegex(PatternPool.CAR_DRIVING_LICENCE, value); } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/WeightRandom.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/WeightRandom.java index bb568dc88..7c718893f --- a/hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/WeightRandom.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.util.RandomUtil; import java.io.Serializable; import java.util.Random; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java index c7c1fcdad..1308e4376 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.ansi; +package org.dromara.hutool.core.lang.ansi; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * ANSI背景颜色枚举 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitColor.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi4BitColor.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitColor.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi4BitColor.java index a7dc79103..04d39905a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitColor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi4BitColor.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.ansi; +package org.dromara.hutool.core.lang.ansi; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * ANSI标准颜色 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi8BitColor.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi8BitColor.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi8BitColor.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi8BitColor.java index 694dced6d..d45ed453f --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi8BitColor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi8BitColor.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.ansi; +package org.dromara.hutool.core.lang.ansi; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.util.ObjUtil; /** * ANSI 8-bit前景或背景色（即8位编码，共256种颜色（2^8） ）
    diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiElement.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiElement.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiElement.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiElement.java index ee73960d7..0c9885480 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiElement.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiElement.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.ansi; +package org.dromara.hutool.core.lang.ansi; /** * ANSI可转义节点接口，实现为ANSI颜色等 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiEncoder.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiEncoder.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiEncoder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiEncoder.java index bf3ccf50f..5a2c7ffe2 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiEncoder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiEncoder.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.ansi; +package org.dromara.hutool.core.lang.ansi; /** * 生成ANSI格式的编码输出 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiStyle.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiStyle.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiStyle.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiStyle.java index 7c8509296..074c1166d --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiStyle.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiStyle.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.ansi; +package org.dromara.hutool.core.lang.ansi; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * ANSI文本样式风格枚举 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/ansi/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/package-info.java index d63d8c760..7494e52a5 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/package-info.java @@ -15,4 +15,4 @@ * * @author spring, looly */ -package cn.hutool.core.lang.ansi; +package org.dromara.hutool.core.lang.ansi; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/builder/Builder.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/Builder.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/lang/builder/Builder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/Builder.java index d9df6b00a..fe18dd382 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/builder/Builder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/Builder.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.builder; +package org.dromara.hutool.core.lang.builder; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/builder/GenericBuilder.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/GenericBuilder.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/builder/GenericBuilder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/GenericBuilder.java index e3f7ac30d..3e20bd53d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/builder/GenericBuilder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/GenericBuilder.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.builder; +package org.dromara.hutool.core.lang.builder; -import cn.hutool.core.lang.func.SerConsumer3; +import org.dromara.hutool.core.lang.func.SerConsumer3; import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/builder/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/builder/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/package-info.java index 3343ff904..dcbfac652 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/builder/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/package-info.java @@ -17,4 +17,4 @@ * @author looly * */ -package cn.hutool.core.lang.builder; +package org.dromara.hutool.core.lang.builder; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/Caller.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/Caller.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/caller/Caller.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/Caller.java index 98d1032fd..ccd7fcc6b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/caller/Caller.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/Caller.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.caller; +package org.dromara.hutool.core.lang.caller; /** * 调用者接口
    diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/CallerUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/CallerUtil.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/caller/CallerUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/CallerUtil.java index afab85718..ae83906b1 --- a/hutool-core/src/main/java/cn/hutool/core/lang/caller/CallerUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/CallerUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.caller; +package org.dromara.hutool.core.lang.caller; /** * 调用者。可以通过此类的方法获取调用者、多级调用者以及判断是否被调用 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/SecurityManagerCaller.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/SecurityManagerCaller.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/lang/caller/SecurityManagerCaller.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/SecurityManagerCaller.java index b2c88b634..68c35586a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/caller/SecurityManagerCaller.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/SecurityManagerCaller.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.caller; +package org.dromara.hutool.core.lang.caller; import java.io.Serializable; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.array.ArrayUtil; /** * {@link SecurityManager} 方式获取调用者 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/StackTraceCaller.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/StackTraceCaller.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/caller/StackTraceCaller.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/StackTraceCaller.java index 22a05e8f7..8c70eee26 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/caller/StackTraceCaller.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/StackTraceCaller.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.caller; +package org.dromara.hutool.core.lang.caller; import java.io.Serializable; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; /** * 通过StackTrace方式获取调用者。此方式效率最低，不推荐使用 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/package-info.java index 338178a8a..e1895da44 --- a/hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.lang.caller; +package org.dromara.hutool.core.lang.caller; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/copier/Copier.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/Copier.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/lang/copier/Copier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/Copier.java index 55f895c3b..e62b61d9b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/copier/Copier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/Copier.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.copier; +package org.dromara.hutool.core.lang.copier; /** * 拷贝接口 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/SrcToDestCopier.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/SrcToDestCopier.java index b0158598c..70a6063b4 --- a/hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/SrcToDestCopier.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.copier; +package org.dromara.hutool.core.lang.copier; import java.io.Serializable; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/package-info.java index fa94428fe..51e71cd67 --- a/hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.lang.copier; +package org.dromara.hutool.core.lang.copier; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/ComposeFunction.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/ComposeFunction.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/ComposeFunction.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/ComposeFunction.java index 0366a689b..9ea3507d4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/ComposeFunction.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/ComposeFunction.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.io.Serializable; import java.util.function.Function; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/FunctionPool.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/FunctionPool.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/FunctionPool.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/FunctionPool.java index 313e62ae5..1ed6873ba 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/FunctionPool.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/FunctionPool.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.reflect.ConstructorUtil; -import cn.hutool.core.util.JdkUtil; +import org.dromara.hutool.core.reflect.ConstructorUtil; +import org.dromara.hutool.core.util.JdkUtil; import java.lang.reflect.Constructor; import java.util.function.BiFunction; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaFactory.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/LambdaFactory.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaFactory.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/LambdaFactory.java index bc9558af5..3c91c412a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaFactory.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/LambdaFactory.java @@ -10,13 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.mutable.MutableEntry; -import cn.hutool.core.map.WeakConcurrentMap; -import cn.hutool.core.reflect.*; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.mutable.MutableEntry; +import org.dromara.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.reflect.*; +import org.dromara.hutool.core.reflect.*; import java.io.Serializable; import java.lang.invoke.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaInfo.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/LambdaInfo.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaInfo.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/LambdaInfo.java index 4f9eea682..9475ae800 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaInfo.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/LambdaInfo.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrPool; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrPool; import java.lang.invoke.SerializedLambda; import java.lang.reflect.Constructor; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/LambdaUtil.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/LambdaUtil.java index 7551b89d8..251634d00 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/LambdaUtil.java @@ -10,15 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.map.WeakConcurrentMap; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.reflect.ReflectUtil; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.reflect.ReflectUtil; import java.io.Serializable; import java.lang.invoke.SerializedLambda; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/PredicateUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/PredicateUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/PredicateUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/PredicateUtil.java index ed4deee66..666f69611 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/PredicateUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/PredicateUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.stream.StreamUtil; +import org.dromara.hutool.core.stream.StreamUtil; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerBiConsumer.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerBiConsumer.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/SerBiConsumer.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerBiConsumer.java index 124c0a2c8..cfa5fc22b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerBiConsumer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerBiConsumer.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerBiFunction.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerBiFunction.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/SerBiFunction.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerBiFunction.java index 3828e3a05..55949976b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerBiFunction.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerBiFunction.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerBiPredicate.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerBiPredicate.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/SerBiPredicate.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerBiPredicate.java index d4e746a46..fc889fad5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerBiPredicate.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerBiPredicate.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerBinaryOperator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerBinaryOperator.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/SerBinaryOperator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerBinaryOperator.java index f80fa3c08..d38d9815b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerBinaryOperator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerBinaryOperator.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.io.Serializable; import java.util.Comparator; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerConsumer.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerConsumer.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/SerConsumer.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerConsumer.java index 813067641..413f458e6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerConsumer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerConsumer.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerConsumer3.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerConsumer3.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/SerConsumer3.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerConsumer3.java index f7c948ba8..e7d62f08a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerConsumer3.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerConsumer3.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerFunction.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerFunction.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/SerFunction.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerFunction.java index 794ea469a..5e2242c13 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerFunction.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerFunction.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.io.Serializable; import java.util.function.Function; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerPredicate.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerPredicate.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/SerPredicate.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerPredicate.java index 338d40bf0..41ddcb4db 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerPredicate.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerPredicate.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerRunnable.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerRunnable.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/SerRunnable.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerRunnable.java index 35f28f4a6..29faba6a0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerRunnable.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerRunnable.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.io.Serializable; import java.util.stream.Stream; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerSupplier.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerSupplier.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/SerSupplier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerSupplier.java index 45fe092a1..851a09838 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerSupplier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerSupplier.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.io.Serializable; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerUnaryOperator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerUnaryOperator.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/SerUnaryOperator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerUnaryOperator.java index 244ca97d3..cd903f37f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/SerUnaryOperator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/SerUnaryOperator.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.io.Serializable; import java.util.function.Function; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/Wrapper.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/Wrapper.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/Wrapper.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/Wrapper.java index 4b11e790d..9dc5272ba --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/Wrapper.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/Wrapper.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; /** * 包装接口 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/package-info.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/func/package-info.java index ff4fa885b..28bf21e04 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/func/package-info.java @@ -19,4 +19,4 @@ * @author looly * */ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/Generator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/Generator.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/lang/generator/Generator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/Generator.java index 97ad78c51..57aa0889f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/generator/Generator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/Generator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.generator; +package org.dromara.hutool.core.lang.generator; /** * 生成器泛型接口
    diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectGenerator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectGenerator.java similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectGenerator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectGenerator.java index d81c4f519..3901c4ea2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectGenerator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectGenerator.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.generator; +package org.dromara.hutool.core.lang.generator; -import cn.hutool.core.reflect.ConstructorUtil; +import org.dromara.hutool.core.reflect.ConstructorUtil; /** * 对象生成器，通过指定对象的Class类型，调用next方法时生成新的对象。 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectIdGenerator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectIdGenerator.java old mode 100755 new mode 100644 similarity index 88% rename from hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectIdGenerator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectIdGenerator.java index f3aac41a7..5bbececd0 --- a/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectIdGenerator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectIdGenerator.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.generator; +package org.dromara.hutool.core.lang.generator; -import cn.hutool.core.lang.id.ObjectId; +import org.dromara.hutool.core.lang.id.ObjectId; /** * ObjectId生成器 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/SnowflakeGenerator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/SnowflakeGenerator.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/lang/generator/SnowflakeGenerator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/SnowflakeGenerator.java index 5627a9c47..d79ffe09a --- a/hutool-core/src/main/java/cn/hutool/core/lang/generator/SnowflakeGenerator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/SnowflakeGenerator.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.generator; +package org.dromara.hutool.core.lang.generator; -import cn.hutool.core.lang.id.Snowflake; +import org.dromara.hutool.core.lang.id.Snowflake; /** * Snowflake生成器
    diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/UUIDGenerator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/UUIDGenerator.java old mode 100755 new mode 100644 similarity index 88% rename from hutool-core/src/main/java/cn/hutool/core/lang/generator/UUIDGenerator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/UUIDGenerator.java index 9389e8090..4cb151179 --- a/hutool-core/src/main/java/cn/hutool/core/lang/generator/UUIDGenerator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/UUIDGenerator.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.generator; +package org.dromara.hutool.core.lang.generator; -import cn.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.lang.id.IdUtil; /** * UUID生成器 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/package-info.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/package-info.java index 4d7d01cce..aab5fa361 --- a/hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.lang.generator; +package org.dromara.hutool.core.lang.generator; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/getter/GroupedTypeGetter.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/GroupedTypeGetter.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/getter/GroupedTypeGetter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/GroupedTypeGetter.java index 75c6cf657..dd9ea76a2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/getter/GroupedTypeGetter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/GroupedTypeGetter.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.getter; +package org.dromara.hutool.core.lang.getter; -import cn.hutool.core.convert.Convert; +import org.dromara.hutool.core.convert.Convert; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/getter/TypeGetter.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/TypeGetter.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/getter/TypeGetter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/TypeGetter.java index 0de0c76ab..9fa3c8885 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/getter/TypeGetter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/TypeGetter.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.getter; +package org.dromara.hutool.core.lang.getter; -import cn.hutool.core.convert.CompositeConverter; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.convert.Converter; +import org.dromara.hutool.core.convert.CompositeConverter; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.convert.Converter; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/getter/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/getter/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/package-info.java index 9fb5f58b5..79fca1649 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/getter/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.lang.getter; +package org.dromara.hutool.core.lang.getter; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/IdUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/IdUtil.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/id/IdUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/id/IdUtil.java index 71950158e..abcfb36fc --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/IdUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/IdUtil.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.id; +package org.dromara.hutool.core.lang.id; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Singleton; -import cn.hutool.core.net.NetUtil; -import cn.hutool.core.util.RuntimeUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Singleton; +import org.dromara.hutool.core.net.NetUtil; +import org.dromara.hutool.core.util.RuntimeUtil; /** * ID生成器工具类，此工具类中主要封装： diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/NanoId.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/id/NanoId.java index c2969dbc1..aabe58c11 --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/NanoId.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.id; +package org.dromara.hutool.core.lang.id; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.util.RandomUtil; import java.security.SecureRandom; import java.util.Random; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/ObjectId.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/ObjectId.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/id/ObjectId.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/id/ObjectId.java index 8edd7cc2e..2cf10a071 --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/ObjectId.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/ObjectId.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.id; +package org.dromara.hutool.core.lang.id; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.RandomUtil; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/Pid.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Pid.java old mode 100755 new mode 100644 similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/lang/id/Pid.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Pid.java index 47c546ee9..55bc16e10 --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/Pid.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Pid.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.id; +package org.dromara.hutool.core.lang.id; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.text.StrUtil; import java.lang.management.ManagementFactory; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/Snowflake.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Snowflake.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/id/Snowflake.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Snowflake.java index 4dfabf614..b8b8e035b --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/Snowflake.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Snowflake.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.id; +package org.dromara.hutool.core.lang.id; -import cn.hutool.core.date.SystemClock; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.date.SystemClock; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.Serializable; import java.util.Date; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/UUID.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/UUID.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/lang/id/UUID.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/id/UUID.java index 81ae5635a..335648d77 --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/UUID.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/UUID.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.id; +package org.dromara.hutool.core.lang.id; -import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.text.StrUtil; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/id/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/id/package-info.java index 2fc9a92a8..313846c32 --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/package-info.java @@ -16,4 +16,4 @@ * @author looly * @since 5.7.5 */ -package cn.hutool.core.lang.id; +package org.dromara.hutool.core.lang.id; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/intern/Intern.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/Intern.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/intern/Intern.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/Intern.java index 0aa1d6f67..a7a266f13 --- a/hutool-core/src/main/java/cn/hutool/core/lang/intern/Intern.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/Intern.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.intern; +package org.dromara.hutool.core.lang.intern; /** * 规范化表示形式封装
    diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/intern/InternUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/InternUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/intern/InternUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/InternUtil.java index f5f6180e9..6e1b3df98 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/intern/InternUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/InternUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.intern; +package org.dromara.hutool.core.lang.intern; /** * 规范化对象生成工具 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/intern/StringIntern.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/StringIntern.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/lang/intern/StringIntern.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/StringIntern.java index aaf230c74..7a5d487f9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/intern/StringIntern.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/StringIntern.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.intern; +package org.dromara.hutool.core.lang.intern; /** * JDK中默认的字符串规范化实现 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/intern/WeakIntern.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/WeakIntern.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/lang/intern/WeakIntern.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/WeakIntern.java index 35648dc61..0295cec13 --- a/hutool-core/src/main/java/cn/hutool/core/lang/intern/WeakIntern.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/WeakIntern.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.intern; +package org.dromara.hutool.core.lang.intern; -import cn.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.map.WeakConcurrentMap; import java.lang.ref.WeakReference; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/intern/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/package-info.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/lang/intern/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/package-info.java index dc3e555c9..3a3b08a82 --- a/hutool-core/src/main/java/cn/hutool/core/lang/intern/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/package-info.java @@ -17,4 +17,4 @@ * * @author looly */ -package cn.hutool.core.lang.intern; +package org.dromara.hutool.core.lang.intern; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/AtomicLoader.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/AtomicLoader.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/loader/AtomicLoader.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/AtomicLoader.java index 9292656b2..c29d40861 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/loader/AtomicLoader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/AtomicLoader.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.loader; +package org.dromara.hutool.core.lang.loader; import java.io.Serializable; import java.util.concurrent.atomic.AtomicReference; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyFunLoader.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/LazyFunLoader.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyFunLoader.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/LazyFunLoader.java index 90aab5a8e..d0fe260e1 --- a/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyFunLoader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/LazyFunLoader.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.loader; +package org.dromara.hutool.core.lang.loader; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyLoader.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/LazyLoader.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyLoader.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/LazyLoader.java index 0a952e414..f6a940730 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyLoader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/LazyLoader.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.loader; +package org.dromara.hutool.core.lang.loader; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/Loader.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/Loader.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/loader/Loader.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/Loader.java index 11df6bcd2..22fd2f56f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/loader/Loader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/Loader.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.loader; +package org.dromara.hutool.core.lang.loader; /** * 对象加载抽象接口
    diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/package-info.java index e614a4b93..9d331020c --- a/hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.lang.loader; +package org.dromara.hutool.core.lang.loader; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/Mutable.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/Mutable.java index ac6860288..b6ef0d702 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/Mutable.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.mutable; +package org.dromara.hutool.core.lang.mutable; /** * 提供可变值类型接口 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableBool.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableBool.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableBool.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableBool.java index a591ba114..f4cddc919 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableBool.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableBool.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.mutable; +package org.dromara.hutool.core.lang.mutable; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableByte.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableByte.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableByte.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableByte.java index f79a05ea3..c0d72a0cc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableByte.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableByte.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.mutable; +package org.dromara.hutool.core.lang.mutable; -import cn.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.comparator.CompareUtil; /** * 可变 {@code byte} 类型 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableDouble.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableDouble.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableDouble.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableDouble.java index 83dd609c4..a647a11b8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableDouble.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableDouble.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.mutable; +package org.dromara.hutool.core.lang.mutable; -import cn.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.comparator.CompareUtil; /** * 可变 {@code double} 类型 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableEntry.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableEntry.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableEntry.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableEntry.java index a1faa1942..5e64adf00 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableEntry.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableEntry.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.mutable; +package org.dromara.hutool.core.lang.mutable; -import cn.hutool.core.map.AbsEntry; +import org.dromara.hutool.core.map.AbsEntry; import java.io.Serializable; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableFloat.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableFloat.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableFloat.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableFloat.java index 18545d5ca..771a489f2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableFloat.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableFloat.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.mutable; +package org.dromara.hutool.core.lang.mutable; -import cn.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.comparator.CompareUtil; /** * 可变 {@code float} 类型 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableInt.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableInt.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableInt.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableInt.java index 05eaba5c3..0da6dda56 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableInt.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableInt.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.mutable; +package org.dromara.hutool.core.lang.mutable; -import cn.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.comparator.CompareUtil; /** * 可变 {@code int} 类型 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableLong.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableLong.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableLong.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableLong.java index ca0f2f065..7f43fa4e1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableLong.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableLong.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.mutable; +package org.dromara.hutool.core.lang.mutable; -import cn.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.comparator.CompareUtil; /** * 可变 {@code long} 类型 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableObj.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableObj.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableObj.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableObj.java index 013485b64..2a87e8a02 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableObj.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableObj.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.mutable; +package org.dromara.hutool.core.lang.mutable; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableShort.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableShort.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableShort.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableShort.java index 8147a56b0..cb293d627 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableShort.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableShort.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.mutable; +package org.dromara.hutool.core.lang.mutable; -import cn.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.comparator.CompareUtil; /** * 可变 {@code short} 类型 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/lang/mutable/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/package-info.java index 2c3d69a12..3ceda18c7 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.lang.mutable; +package org.dromara.hutool.core.lang.mutable; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/package-info.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/lang/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/package-info.java index 8b469f371..aeb23ef34 --- a/hutool-core/src/main/java/cn/hutool/core/lang/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/page/NavigatePageInfo.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/NavigatePageInfo.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/page/NavigatePageInfo.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/page/NavigatePageInfo.java index c391eea37..47b23322f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/page/NavigatePageInfo.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/NavigatePageInfo.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.page; +package org.dromara.hutool.core.lang.page; /** * 导航分页信息类
    diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/page/PageInfo.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/PageInfo.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/page/PageInfo.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/page/PageInfo.java index 238c7d749..88b7517c6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/page/PageInfo.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/PageInfo.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.page; +package org.dromara.hutool.core.lang.page; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.DefaultSegment; -import cn.hutool.core.lang.Segment; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.DefaultSegment; +import org.dromara.hutool.core.lang.Segment; /** * 分页信息，通过提供的总数、页码、每页记录数等信息，计算总页数等信息
    diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/page/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/package-info.java similarity index 72% rename from hutool-core/src/main/java/cn/hutool/core/lang/page/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/page/package-info.java index 65be7089d..0e1e47a65 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/page/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/package-info.java @@ -13,10 +13,10 @@ /** * 提供分页信息封装，主要包括： *

      - *
    • {@link cn.hutool.core.lang.page.PageInfo}: 提供分页信息。
      • - *
    • {@link cn.hutool.core.lang.page.NavigatePageInfo}: 提供分页导航信息。
      • + *
    • {@link org.dromara.hutool.core.lang.page.PageInfo}: 提供分页信息。
      • + *
    • {@link org.dromara.hutool.core.lang.page.NavigatePageInfo}: 提供分页导航信息。
      • *
    * * @author looly */ -package cn.hutool.core.lang.page; +package org.dromara.hutool.core.lang.page; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/range/Bound.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Bound.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/lang/range/Bound.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Bound.java index 954ea8304..6cbe1be8e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/range/Bound.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Bound.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; import java.util.Objects; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/range/BoundType.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundType.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/range/BoundType.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundType.java index 1eabdb1f4..629b49d54 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/range/BoundType.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundType.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; /** * 边界类型枚举 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/range/BoundedRange.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/lang/range/BoundedRange.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java index 784126510..eeadaf2ac 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/range/BoundedRange.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.util.Objects; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/range/BoundedRangeOperation.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRangeOperation.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/range/BoundedRangeOperation.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRangeOperation.java index cd63e1160..170fcb1bb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/range/BoundedRangeOperation.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRangeOperation.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; -import cn.hutool.core.comparator.CompareUtil; -import cn.hutool.core.lang.Opt; +import org.dromara.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.lang.Opt; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/range/FiniteBound.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/FiniteBound.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/range/FiniteBound.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/range/FiniteBound.java index 757f76857..8a182d699 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/range/FiniteBound.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/FiniteBound.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/range/NoneLowerBound.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/NoneLowerBound.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/range/NoneLowerBound.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/range/NoneLowerBound.java index 4faf635b1..5d58235e9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/range/NoneLowerBound.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/NoneLowerBound.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; /** * 无限小的左边界 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/range/NoneUpperBound.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/NoneUpperBound.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/lang/range/NoneUpperBound.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/range/NoneUpperBound.java index 317175d82..62392753e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/range/NoneUpperBound.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/NoneUpperBound.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; /** * 无限大的右边界 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/range/Range.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Range.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/range/Range.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Range.java index 26d33e42f..0640c08f9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/range/Range.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Range.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.thread.lock.NoLock; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.thread.lock.NoLock; import java.io.Serializable; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/range/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/package-info.java similarity index 70% rename from hutool-core/src/main/java/cn/hutool/core/lang/range/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/lang/range/package-info.java index dc8603011..012f9eeb0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/range/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/package-info.java @@ -13,10 +13,10 @@ /** * 提供区间和边界封装，主要包括： *
      - *
    • {@link cn.hutool.core.lang.range.Bound}: 提供边界的抽象表示，包括边界范围、开闭区间等。
      • - *
    • {@link cn.hutool.core.lang.range.Range}: 提供可迭代的区间。
      • + *
    • {@link org.dromara.hutool.core.lang.range.Bound}: 提供边界的抽象表示，包括边界范围、开闭区间等。
      • + *
    • {@link org.dromara.hutool.core.lang.range.Range}: 提供可迭代的区间。
      • *
    * * @author huangchengxing, looly */ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/AbsEntry.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/AbsEntry.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/map/AbsEntry.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/AbsEntry.java index d302b70b9..38fbeae42 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/AbsEntry.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/AbsEntry.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/BiMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/BiMap.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/map/BiMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/BiMap.java index a87a7754a..28e0ca3cf 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/BiMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/BiMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import java.util.Map; import java.util.function.BiFunction; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/CamelCaseLinkedMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/CamelCaseLinkedMap.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/map/CamelCaseLinkedMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/CamelCaseLinkedMap.java index 2f74e660d..16ec76a4e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/CamelCaseLinkedMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/CamelCaseLinkedMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import java.util.LinkedHashMap; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/CamelCaseMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/CamelCaseMap.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/map/CamelCaseMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/CamelCaseMap.java index e4ab498d7..acf3ed552 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/CamelCaseMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/CamelCaseMap.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.Serializable; import java.util.HashMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveLinkedMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveLinkedMap.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveLinkedMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveLinkedMap.java index ae669da1c..be6a9885a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveLinkedMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveLinkedMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import java.util.LinkedHashMap; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveMap.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveMap.java index b1d1865aa..ff337eccc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import java.io.Serializable; import java.util.HashMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveTreeMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveTreeMap.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveTreeMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveTreeMap.java index a878cb6da..14c2d9231 --- a/hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveTreeMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveTreeMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import java.util.Comparator; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/CustomKeyMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/CustomKeyMap.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/map/CustomKeyMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/CustomKeyMap.java index 6c4a70f93..fa8498ab1 --- a/hutool-core/src/main/java/cn/hutool/core/map/CustomKeyMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/CustomKeyMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/Dict.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/map/Dict.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java index 3fbfa097f..8c3f0319d --- a/hutool-core/src/main/java/cn/hutool/core/map/Dict.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java @@ -10,20 +10,20 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.bean.BeanPath; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.exceptions.CloneRuntimeException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.func.LambdaInfo; -import cn.hutool.core.lang.func.LambdaUtil; -import cn.hutool.core.lang.func.SerFunction; -import cn.hutool.core.lang.func.SerSupplier; -import cn.hutool.core.lang.getter.TypeGetter; +import org.dromara.hutool.core.bean.BeanPath; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.bean.copier.CopyOptions; +import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.exceptions.CloneRuntimeException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.func.LambdaInfo; +import org.dromara.hutool.core.lang.func.LambdaUtil; +import org.dromara.hutool.core.lang.func.SerFunction; +import org.dromara.hutool.core.lang.func.SerSupplier; +import org.dromara.hutool.core.lang.getter.TypeGetter; import java.lang.reflect.Type; import java.util.Arrays; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/FixedLinkedHashMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/FixedLinkedHashMap.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/map/FixedLinkedHashMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/FixedLinkedHashMap.java index 9982dbe34..87da6a045 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/FixedLinkedHashMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/FixedLinkedHashMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import java.util.LinkedHashMap; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/ForestMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/ForestMap.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/map/ForestMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/ForestMap.java index e9f79a09d..b618f0892 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/ForestMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/ForestMap.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.util.ObjUtil; import java.util.Collection; import java.util.Collections; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/FuncKeyMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/FuncKeyMap.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/map/FuncKeyMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/FuncKeyMap.java index c32e70581..9422d5092 --- a/hutool-core/src/main/java/cn/hutool/core/map/FuncKeyMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/FuncKeyMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import java.util.Map; import java.util.function.Function; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/FuncMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/FuncMap.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/map/FuncMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/FuncMap.java index 9717a6e5b..ff5de0655 --- a/hutool-core/src/main/java/cn/hutool/core/map/FuncMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/FuncMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import java.util.Map; import java.util.function.Function; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/LinkedForestMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/LinkedForestMap.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/map/LinkedForestMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/LinkedForestMap.java index 0bf611021..65ea8e03d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/LinkedForestMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/LinkedForestMap.java @@ -10,15 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.func.Wrapper; -import cn.hutool.core.reflect.ClassUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.func.Wrapper; +import org.dromara.hutool.core.reflect.ClassUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapBuilder.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapBuilder.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/map/MapBuilder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/MapBuilder.java index 7b5d3172c..1be3dd5e5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapBuilder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapBuilder.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.lang.builder.Builder; +import org.dromara.hutool.core.lang.builder.Builder; import java.util.Map; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapGetUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapGetUtil.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/map/MapGetUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/MapGetUtil.java index d52cd4c98..1bbf0f224 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapGetUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapGetUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.reflect.TypeReference; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.reflect.TypeReference; import java.util.Date; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapJoiner.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapJoiner.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/map/MapJoiner.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/MapJoiner.java index 58f438a2d..67f066a2f --- a/hutool-core/src/main/java/cn/hutool/core/map/MapJoiner.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapJoiner.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.text.StrJoiner; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.text.StrJoiner; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.util.Iterator; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapProxy.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/MapProxy.java index 1a458fb80..919115580 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapProxy.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.getter.TypeGetter; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.BooleanUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.lang.getter.TypeGetter; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.BooleanUtil; import java.io.Serializable; import java.lang.reflect.InvocationHandler; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapUtil.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/MapUtil.java index 6a59c96a2..07bd93cf1 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapUtil.java @@ -10,17 +10,17 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.collection.iter.ArrayIter; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.reflect.ConstructorUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.iter.ArrayIter; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.reflect.ConstructorUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.util.*; import java.util.Map.Entry; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapWrapper.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapWrapper.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/map/MapWrapper.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/MapWrapper.java index 59ade5f30..9d65d665b --- a/hutool-core/src/main/java/cn/hutool/core/map/MapWrapper.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapWrapper.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.func.Wrapper; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.func.Wrapper; +import org.dromara.hutool.core.util.ObjUtil; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/ReferenceConcurrentMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/ReferenceConcurrentMap.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/map/ReferenceConcurrentMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/ReferenceConcurrentMap.java index a1d73833b..8c2d8439f --- a/hutool-core/src/main/java/cn/hutool/core/map/ReferenceConcurrentMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/ReferenceConcurrentMap.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.util.ReferenceUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.util.ReferenceUtil; import java.io.Serializable; import java.lang.ref.Reference; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/SafeConcurrentHashMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/SafeConcurrentHashMap.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/map/SafeConcurrentHashMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/SafeConcurrentHashMap.java index 46ce0e88b..b1bec098f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/SafeConcurrentHashMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/SafeConcurrentHashMap.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.util.JdkUtil; +import org.dromara.hutool.core.util.JdkUtil; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/TableMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/TableMap.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/map/TableMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/TableMap.java index 81564f623..60f1ba9e4 --- a/hutool-core/src/main/java/cn/hutool/core/map/TableMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/TableMap.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/TolerantMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/TolerantMap.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/map/TolerantMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/TolerantMap.java index e9f0d1b05..df054ca0d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/TolerantMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/TolerantMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import java.util.HashMap; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/TransMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/TransMap.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/map/TransMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/TransMap.java index 95f1c0181..97e80e434 --- a/hutool-core/src/main/java/cn/hutool/core/map/TransMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/TransMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import java.util.Map; import java.util.function.BiFunction; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/TreeEntry.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/TreeEntry.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/map/TreeEntry.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/TreeEntry.java index 8a45e5853..83eff3916 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/TreeEntry.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/TreeEntry.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.util.Map; import java.util.function.Consumer; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/WeakConcurrentMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/WeakConcurrentMap.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/map/WeakConcurrentMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/WeakConcurrentMap.java index f99a83d48..1ec3b3fae --- a/hutool-core/src/main/java/cn/hutool/core/map/WeakConcurrentMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/WeakConcurrentMap.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.util.ReferenceUtil; +import org.dromara.hutool.core.util.ReferenceUtil; import java.lang.ref.Reference; import java.util.concurrent.ConcurrentMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/AbsCollValueMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsCollValueMap.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/map/multi/AbsCollValueMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsCollValueMap.java index 27a8d6605..d65a581e2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/AbsCollValueMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsCollValueMap.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map.multi; +package org.dromara.hutool.core.map.multi; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.map.MapWrapper; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.map.MapWrapper; +import org.dromara.hutool.core.util.ObjUtil; import java.util.Collection; import java.util.HashMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/AbsTable.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsTable.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/map/multi/AbsTable.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsTable.java index bd013f3b0..a12d526c1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/AbsTable.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsTable.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map.multi; +package org.dromara.hutool.core.map.multi; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.collection.iter.TransIter; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.collection.iter.TransIter; +import org.dromara.hutool.core.util.ObjUtil; import java.io.Serializable; import java.util.AbstractCollection; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/CollectionValueMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/CollectionValueMap.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/map/multi/CollectionValueMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/multi/CollectionValueMap.java index 0d02f4016..d3dae5649 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/CollectionValueMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/CollectionValueMap.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map.multi; +package org.dromara.hutool.core.map.multi; -import cn.hutool.core.lang.func.SerSupplier; +import org.dromara.hutool.core.lang.func.SerSupplier; import java.util.ArrayList; import java.util.Collection; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/Graph.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/Graph.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/map/multi/Graph.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/multi/Graph.java index eb1edd67c..50601916c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/Graph.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/Graph.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map.multi; +package org.dromara.hutool.core.map.multi; -import cn.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.CollUtil; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/ListValueMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/ListValueMap.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/map/multi/ListValueMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/multi/ListValueMap.java index 7f7a698ae..ff13f1ec3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/ListValueMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/ListValueMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map.multi; +package org.dromara.hutool.core.map.multi; import java.util.*; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/MultiValueMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/MultiValueMap.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/map/multi/MultiValueMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/multi/MultiValueMap.java index cf2eb86ad..e7f5f1968 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/MultiValueMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/MultiValueMap.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map.multi; +package org.dromara.hutool.core.map.multi; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.util.*; import java.util.function.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/RowKeyTable.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/RowKeyTable.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/map/multi/RowKeyTable.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/multi/RowKeyTable.java index 7388783b6..38b2a76e5 --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/RowKeyTable.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/RowKeyTable.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map.multi; +package org.dromara.hutool.core.map.multi; -import cn.hutool.core.lang.builder.Builder; -import cn.hutool.core.collection.iter.ComputeIter; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.collection.iter.TransIter; -import cn.hutool.core.map.AbsEntry; -import cn.hutool.core.map.MapUtil; +import org.dromara.hutool.core.lang.builder.Builder; +import org.dromara.hutool.core.collection.iter.ComputeIter; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.collection.iter.TransIter; +import org.dromara.hutool.core.map.AbsEntry; +import org.dromara.hutool.core.map.MapUtil; import java.util.AbstractMap; import java.util.AbstractSet; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/SetValueMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/SetValueMap.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/map/multi/SetValueMap.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/multi/SetValueMap.java index ddf347e3b..25e60b244 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/SetValueMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/SetValueMap.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map.multi; +package org.dromara.hutool.core.map.multi; import java.util.*; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/Table.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/Table.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/map/multi/Table.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/multi/Table.java index d73e2dae0..03bce62da --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/Table.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/Table.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.map.multi; +package org.dromara.hutool.core.map.multi; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.lang.func.SerConsumer3; -import cn.hutool.core.map.MapUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.lang.func.SerConsumer3; +import org.dromara.hutool.core.map.MapUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/multi/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/package-info.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/map/multi/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/multi/package-info.java index e46d69b8f..4333228ce 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/multi/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/package-info.java @@ -35,4 +35,4 @@ * @author looly * */ -package cn.hutool.core.map.multi; +package org.dromara.hutool.core.map.multi; diff --git a/hutool-core/src/main/java/cn/hutool/core/map/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/map/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/map/package-info.java index a52d7a9ee..52ac7c916 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; diff --git a/hutool-core/src/main/java/cn/hutool/core/math/Arrangement.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/Arrangement.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/math/Arrangement.java rename to hutool-core/src/main/java/org/dromara/hutool/core/math/Arrangement.java index 8c96ef188..585cd681d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/math/Arrangement.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/Arrangement.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/math/BitStatusUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/BitStatusUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/math/BitStatusUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/math/BitStatusUtil.java index 48082cd37..9efc8caed 100644 --- a/hutool-core/src/main/java/cn/hutool/core/math/BitStatusUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/BitStatusUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; /** * 通过位运算表示状态的工具类
    diff --git a/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/Calculator.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/math/Calculator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/math/Calculator.java index 9de6feb26..887e83bc0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/Calculator.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; import java.math.BigDecimal; import java.util.Collections; diff --git a/hutool-core/src/main/java/cn/hutool/core/math/Combination.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/Combination.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/math/Combination.java rename to hutool-core/src/main/java/org/dromara/hutool/core/math/Combination.java index 3cdf77596..365dc8ac2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/math/Combination.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/Combination.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/math/MathUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/MathUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/math/MathUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/math/MathUtil.java index 92c56a15d..cef595290 100644 --- a/hutool-core/src/main/java/cn/hutool/core/math/MathUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/MathUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; import java.math.BigInteger; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/math/Money.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/Money.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/math/Money.java rename to hutool-core/src/main/java/org/dromara/hutool/core/math/Money.java index 02ec22cbf..29c281299 100644 --- a/hutool-core/src/main/java/cn/hutool/core/math/Money.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/Money.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.File; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/math/NumberUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberUtil.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/math/NumberUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/math/NumberUtil.java index 8f7a8da93..6c72030cd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/math/NumberUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberUtil.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.comparator.CompareUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharUtil; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/hutool-core/src/main/java/cn/hutool/core/math/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/math/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/math/package-info.java index e7ccdb8c8..68a532cc1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/math/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Pool.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Pool.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/net/Ipv4Pool.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Pool.java index 451900697..83a9faa8d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Pool.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Pool.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * Ip相关常量 diff --git a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java index 05dfad990..9a881b232 --- a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.regex.PatternPool; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.regex.PatternPool; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.util.CharUtil; import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/LocalPortGenerator.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/LocalPortGenerator.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/net/LocalPortGenerator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/LocalPortGenerator.java index 7787d29a3..dd8087454 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/LocalPortGenerator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/LocalPortGenerator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/MaskBit.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/MaskBit.java similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/net/MaskBit.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/MaskBit.java index 1ddb281a4..c911b607d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/MaskBit.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/MaskBit.java @@ -10,16 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.map.BiMap; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.map.BiMap; import java.util.HashMap; -import static cn.hutool.core.net.Ipv4Pool.IPV4_MASK_BIT_MAX; -import static cn.hutool.core.net.Ipv4Pool.IPV4_NUM_MAX; - /** * 掩码位和掩码之间的Map对应 * @@ -99,6 +96,6 @@ public class MaskBit { */ public static long getMaskIpLong(final int maskBit) { Assert.isTrue(MASK_BIT_MAP.containsKey(maskBit), "非法的掩码位数：{}", maskBit); - return (IPV4_NUM_MAX << (IPV4_MASK_BIT_MAX - maskBit)) & IPV4_NUM_MAX; + return (Ipv4Pool.IPV4_NUM_MAX << (Ipv4Pool.IPV4_MASK_BIT_MAX - maskBit)) & Ipv4Pool.IPV4_NUM_MAX; } } diff --git a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java index 8991adeea..8b06c5d01 --- a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java @@ -10,18 +10,18 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.iter.EnumerationIter; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.JNDIUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.iter.EnumerationIter; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.JNDIUtil; +import org.dromara.hutool.core.util.RandomUtil; import javax.naming.NamingException; import javax.naming.directory.Attribute; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/UserPassAuthenticator.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/UserPassAuthenticator.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/net/UserPassAuthenticator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/UserPassAuthenticator.java index 0aacca085..3af0a0735 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/UserPassAuthenticator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/UserPassAuthenticator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; import java.net.Authenticator; import java.net.PasswordAuthentication; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/multipart/MultipartFormData.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/MultipartFormData.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/net/multipart/MultipartFormData.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/MultipartFormData.java index 2ed3a89d8..205fdc86a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/multipart/MultipartFormData.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/MultipartFormData.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.multipart; +package org.dromara.hutool.core.net.multipart; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.map.multi.ListValueMap; -import cn.hutool.core.map.multi.MultiValueMap; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.map.multi.ListValueMap; +import org.dromara.hutool.core.map.multi.MultiValueMap; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/multipart/MultipartRequestInputStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/MultipartRequestInputStream.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/net/multipart/MultipartRequestInputStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/MultipartRequestInputStream.java index 926bc11bd..1031b8bd1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/multipart/MultipartRequestInputStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/MultipartRequestInputStream.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.multipart; +package org.dromara.hutool.core.net.multipart; -import cn.hutool.core.io.stream.FastByteArrayOutputStream; +import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFile.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFile.java index 2e54d310f..99b909d14 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFile.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.multipart; +package org.dromara.hutool.core.net.multipart; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.file.FileNameUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.file.FileNameUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFileHeader.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFileHeader.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFileHeader.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFileHeader.java index c4389eb69..6c80d68f8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFileHeader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFileHeader.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.multipart; +package org.dromara.hutool.core.net.multipart; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 上传的文件的头部信息
    diff --git a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadSetting.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadSetting.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadSetting.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadSetting.java index dba41d049..d12ba255e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadSetting.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadSetting.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.multipart; +package org.dromara.hutool.core.net.multipart; /** * 上传文件设定文件 diff --git a/hutool-core/src/main/java/cn/hutool/core/net/multipart/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/package-info.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/net/multipart/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/package-info.java index 1a7f77bc8..a3a7bd347 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/multipart/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.net.multipart; +package org.dromara.hutool.core.net.multipart; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/net/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/package-info.java index 45c78078f..57ed9a0cc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLContextBuilder.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLContextBuilder.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLContextBuilder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLContextBuilder.java index b9546a9f2..594d82004 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLContextBuilder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLContextBuilder.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.ssl; +package org.dromara.hutool.core.net.ssl; -import cn.hutool.core.lang.builder.Builder; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.lang.builder.Builder; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.text.StrUtil; import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLProtocols.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLProtocols.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLProtocols.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLProtocols.java index bcc3aa00c..07cdbc443 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLProtocols.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLProtocols.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.ssl; +package org.dromara.hutool.core.net.ssl; /** * SSL或TLS协议 diff --git a/hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLUtil.java index 8ffde20a8..41d42ef97 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/ssl/SSLUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.ssl; +package org.dromara.hutool.core.net.ssl; -import cn.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IORuntimeException; import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/ssl/TrustAnyHostnameVerifier.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyHostnameVerifier.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/net/ssl/TrustAnyHostnameVerifier.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyHostnameVerifier.java index a1a1e7dd8..b0ad8324b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/ssl/TrustAnyHostnameVerifier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyHostnameVerifier.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.ssl; +package org.dromara.hutool.core.net.ssl; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/ssl/TrustAnyTrustManager.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyTrustManager.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/net/ssl/TrustAnyTrustManager.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyTrustManager.java index 8b119eb4b..ed92238ac 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/ssl/TrustAnyTrustManager.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyTrustManager.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.ssl; +package org.dromara.hutool.core.net.ssl; import javax.net.ssl.SSLEngine; import javax.net.ssl.X509ExtendedTrustManager; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/ssl/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/net/ssl/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/package-info.java index 728de4c21..e6a9212bc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/ssl/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/package-info.java @@ -15,4 +15,4 @@ * * @author looly */ -package cn.hutool.core.net.ssl; +package org.dromara.hutool.core.net.ssl; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/FormUrlencoded.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/FormUrlencoded.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/net/url/FormUrlencoded.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/url/FormUrlencoded.java index 0436e8b5d..0ffd3e994 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/url/FormUrlencoded.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/FormUrlencoded.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.url; +package org.dromara.hutool.core.net.url; -import cn.hutool.core.codec.PercentCodec; +import org.dromara.hutool.core.codec.PercentCodec; /** * application/x-www-form-urlencoded，遵循W3C HTML Form content types规范，如空格须转+，+须被编码
    diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/RFC3986.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/RFC3986.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/net/url/RFC3986.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/url/RFC3986.java index 327a5bd82..d3e867b64 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/url/RFC3986.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/RFC3986.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.url; +package org.dromara.hutool.core.net.url; -import cn.hutool.core.codec.PercentCodec; +import org.dromara.hutool.core.codec.PercentCodec; /** * RFC3986 编码实现
    diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/URLDecoder.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLDecoder.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/net/url/URLDecoder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLDecoder.java index 6130e89f0..591bf704e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/url/URLDecoder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLDecoder.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.url; +package org.dromara.hutool.core.net.url; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.ByteArrayOutputStream; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/URLEncoder.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLEncoder.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/net/url/URLEncoder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLEncoder.java index 8f89f488f..7b1cfd437 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/url/URLEncoder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLEncoder.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.url; +package org.dromara.hutool.core.net.url; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/URLUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/net/url/URLUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLUtil.java index 14003a83b..0a376f00a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/url/URLUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLUtil.java @@ -10,17 +10,17 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.url; +package org.dromara.hutool.core.net.url; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.io.file.FileNameUtil; -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.io.file.FileNameUtil; +import org.dromara.hutool.core.io.resource.ResourceUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.BufferedReader; import java.io.File; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlBuilder.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlBuilder.java index 16f456228..9e1f5007c --- a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlBuilder.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.url; +package org.dromara.hutool.core.net.url; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.builder.Builder; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.builder.Builder; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.net.MalformedURLException; import java.net.URI; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java index 66b9e1f97..792d18b84 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java @@ -10,15 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.url; +package org.dromara.hutool.core.net.url; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.nio.charset.Charset; import java.util.LinkedList; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlQuery.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQuery.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/net/url/UrlQuery.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQuery.java index 53f9050ed..b139148e0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlQuery.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQuery.java @@ -10,15 +10,15 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.url; +package org.dromara.hutool.core.net.url; -import cn.hutool.core.codec.PercentCodec; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.map.TableMap; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.codec.PercentCodec; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.map.TableMap; +import org.dromara.hutool.core.text.StrUtil; import java.nio.charset.Charset; import java.util.Iterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlQueryUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQueryUtil.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/net/url/UrlQueryUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQueryUtil.java index 3883f4730..803a419ef --- a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlQueryUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQueryUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.net.url; +package org.dromara.hutool.core.net.url; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.nio.charset.Charset; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/net/url/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/net/url/package-info.java index f4489c1a0..163238536 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/url/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/package-info.java @@ -16,4 +16,4 @@ * @author looly * @since 5.3.1 */ -package cn.hutool.core.net.url; +package org.dromara.hutool.core.net.url; diff --git a/hutool-core/src/main/java/cn/hutool/core/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/package-info.java index 931881829..2a2e9115e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core; +package org.dromara.hutool.core; diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/ActualTypeMapperPool.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ActualTypeMapperPool.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/reflect/ActualTypeMapperPool.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/ActualTypeMapperPool.java index 0a9a9ae8d..e6ccf8fce 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/ActualTypeMapperPool.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ActualTypeMapperPool.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.map.WeakConcurrentMap; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/ClassScanner.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/reflect/ClassScanner.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java index 68f594613..676c11253 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/ClassScanner.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java @@ -10,20 +10,20 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.iter.EnumerationIter; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.file.FileNameUtil; -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.net.url.URLDecoder; -import cn.hutool.core.net.url.URLUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.SystemUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.iter.EnumerationIter; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.file.FileNameUtil; +import org.dromara.hutool.core.io.resource.ResourceUtil; +import org.dromara.hutool.core.net.url.URLDecoder; +import org.dromara.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.SystemUtil; import java.io.File; import java.io.IOException; @@ -433,7 +433,7 @@ public class ClassScanner implements Serializable { addIfAccept(loadClass(className)); } } else if (classLen > packageLen) { - //检查类名是否以指定包名为前缀，包名后加.（避免类似于cn.hutool.A和cn.hutool.ATest这类类名引起的歧义） + //检查类名是否以指定包名为前缀，包名后加.（避免类似于org.dromara.hutool.A和org.dromara.hutool.ATest这类类名引起的歧义） if (".".equals(this.packageNameWithDot) || className.startsWith(this.packageNameWithDot)) { addIfAccept(loadClass(className)); } diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/ClassUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/reflect/ClassUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java index 921e57473..1f1a5bca8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/ClassUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java @@ -10,21 +10,21 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.bean.NullWrapperBean; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.convert.BasicType; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.net.url.URLDecoder; -import cn.hutool.core.net.url.URLUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.bean.NullWrapperBean; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.convert.BasicType; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.resource.ResourceUtil; +import org.dromara.hutool.core.net.url.URLDecoder; +import org.dromara.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.IOException; import java.lang.annotation.Annotation; @@ -127,7 +127,7 @@ public class ClassUtil { /** * 获取完整类名的短格式如：
    - * cn.hutool.core.text.StrUtil -》c.h.c.u.StrUtil + * text.org.dromara.hutool.core.StrUtil -》c.h.c.u.StrUtil * * @param className 类名 * @return 短格式类名 diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/ConstructorUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ConstructorUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/reflect/ConstructorUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/ConstructorUtil.java index c94e14e28..8b5f9680a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/ConstructorUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ConstructorUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.map.WeakConcurrentMap; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.array.ArrayUtil; import java.lang.reflect.Array; import java.lang.reflect.Constructor; diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/FieldUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/reflect/FieldUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java index c1dbf77ef..6e9e45350 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/FieldUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java @@ -10,16 +10,16 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.annotation.Alias; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.map.WeakConcurrentMap; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.annotation.Alias; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/LookupFactory.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/LookupFactory.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/reflect/LookupFactory.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/LookupFactory.java index e8f6f1dc0..95e255d39 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/LookupFactory.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/LookupFactory.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.caller.CallerUtil; -import cn.hutool.core.util.JdkUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.caller.CallerUtil; +import org.dromara.hutool.core.util.JdkUtil; import java.lang.invoke.MethodHandles; import java.lang.reflect.Constructor; diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/MethodHandleUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodHandleUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/reflect/MethodHandleUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodHandleUtil.java index 6c8af096c..61d8d9282 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/MethodHandleUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodHandleUtil.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/MethodUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/reflect/MethodUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java index 2090835f1..7af37776f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/MethodUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java @@ -10,20 +10,20 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.bean.NullWrapperBean; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.collection.UniqueKeySet; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.exceptions.InvocationTargetRuntimeException; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Singleton; -import cn.hutool.core.map.WeakConcurrentMap; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.bean.NullWrapperBean; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.UniqueKeySet; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.exceptions.InvocationTargetRuntimeException; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Singleton; +import org.dromara.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/ModifierUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/reflect/ModifierUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java index 0147e0665..2701421c5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/ModifierUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.array.ArrayUtil; import java.lang.reflect.Field; import java.lang.reflect.Member; diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/NullType.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/NullType.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/reflect/NullType.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/NullType.java index c0b86bcb8..01a1ebe41 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/NullType.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/NullType.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/ParameterizedTypeImpl.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ParameterizedTypeImpl.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/reflect/ParameterizedTypeImpl.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/ParameterizedTypeImpl.java index d3dc8fed4..3d34a8364 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/ParameterizedTypeImpl.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ParameterizedTypeImpl.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.io.Serializable; import java.lang.reflect.ParameterizedType; diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/ReflectUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ReflectUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/reflect/ReflectUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/ReflectUtil.java index 3aa650ee1..d96ed31fd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/ReflectUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ReflectUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; import java.lang.reflect.*; import java.security.AccessController; @@ -22,7 +22,7 @@ import java.security.PrivilegedAction; *

    * 本工具类，v6.x进行了重构，原来{@link ReflectUtil}中的方法大部分被移动到了 * {@link FieldUtil}、{@link MethodUtil}、{@link ModifierUtil}、{@link ConstructorUtil}等中， - * 其他相关方法请参考cn.hutool.core.reflect包下的类,相关类 + * 其他相关方法请参考org.dromara.hutool.core.reflect包下的类,相关类 *

    *

    常用方法变更

    *
      diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/TypeReference.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeReference.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/reflect/TypeReference.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeReference.java index 1b13834a2..c7999a672 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/TypeReference.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeReference.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/TypeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/reflect/TypeUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java index fab2e8707..86ec1b7d5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/TypeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -327,7 +327,7 @@ public class TypeUtil { * 获取泛型变量和泛型实际类型的对应关系Map，例如： * * 
      -	 *     T    cn.hutool.test.User
+	 *     T    org.dromara.hutool.test.User
 	 *     E    java.lang.Integer
 	 *
      * diff --git a/hutool-core/src/main/java/cn/hutool/core/reflect/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/reflect/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/reflect/package-info.java index f9757be05..89e6078a8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/reflect/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/package-info.java @@ -16,4 +16,4 @@ * @author looly * @since 5.4.2 */ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; diff --git a/hutool-core/src/main/java/cn/hutool/core/regex/PatternPool.java b/hutool-core/src/main/java/org/dromara/hutool/core/regex/PatternPool.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/regex/PatternPool.java rename to hutool-core/src/main/java/org/dromara/hutool/core/regex/PatternPool.java index a290225ef..339747eb3 --- a/hutool-core/src/main/java/cn/hutool/core/regex/PatternPool.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/regex/PatternPool.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.regex; +package org.dromara.hutool.core.regex; -import cn.hutool.core.map.WeakConcurrentMap; +import org.dromara.hutool.core.map.WeakConcurrentMap; import java.util.regex.Pattern; diff --git a/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java index af534f7d1..bfff66ab3 --- a/hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java @@ -10,20 +10,20 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.regex; +package org.dromara.hutool.core.regex; -import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.comparator.CompareUtil; -import cn.hutool.core.comparator.StrLengthComparator; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Validator; -import cn.hutool.core.lang.func.SerFunction; -import cn.hutool.core.lang.mutable.Mutable; -import cn.hutool.core.lang.mutable.MutableObj; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.comparator.StrLengthComparator; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Validator; +import org.dromara.hutool.core.lang.func.SerFunction; +import org.dromara.hutool.core.lang.mutable.Mutable; +import org.dromara.hutool.core.lang.mutable.MutableObj; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.text.StrUtil; import java.util.*; import java.util.function.Consumer; diff --git a/hutool-core/src/main/java/cn/hutool/core/regex/RegexPool.java b/hutool-core/src/main/java/org/dromara/hutool/core/regex/RegexPool.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/regex/RegexPool.java rename to hutool-core/src/main/java/org/dromara/hutool/core/regex/RegexPool.java index df8139d76..6cdfdb4ff --- a/hutool-core/src/main/java/cn/hutool/core/regex/RegexPool.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/regex/RegexPool.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.regex; +package org.dromara.hutool.core.regex; /** * 常用正则表达式字符串池 diff --git a/hutool-core/src/main/java/cn/hutool/core/regex/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/regex/package-info.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/regex/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/regex/package-info.java index bfaee33c0..128a1801a --- a/hutool-core/src/main/java/cn/hutool/core/regex/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/regex/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.regex; +package org.dromara.hutool.core.regex; diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/AbstractEnhancedWrappedStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/AbstractEnhancedWrappedStream.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/stream/AbstractEnhancedWrappedStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/AbstractEnhancedWrappedStream.java index 2ad328dbf..91d21ac36 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/AbstractEnhancedWrappedStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/AbstractEnhancedWrappedStream.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; import java.util.Objects; import java.util.stream.Stream; diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/CollectorUtil.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/CollectorUtil.java index 81aa4f623..5e690d2d7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/CollectorUtil.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; import java.util.*; import java.util.function.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/EasyStream.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/EasyStream.java index 4b7422b24..5d88479e7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/EasyStream.java @@ -10,13 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; + +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.ObjUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.ObjUtil; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; @@ -415,7 +416,7 @@ public class EasyStream extends AbstractEnhancedWrappedStream extends Consumer, cn.hutool.core.lang.builder.Builder> { + public interface Builder extends Consumer, org.dromara.hutool.core.lang.builder.Builder> { /** * Adds an element to the unwrap being built. diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/EntryStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/EntryStream.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/stream/EntryStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/EntryStream.java index 088b8753e..ab905bb5f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/EntryStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/EntryStream.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; -import cn.hutool.core.collection.ConcurrentHashSet; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.map.multi.RowKeyTable; -import cn.hutool.core.map.multi.Table; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.ConcurrentHashSet; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.map.multi.RowKeyTable; +import org.dromara.hutool.core.map.multi.Table; +import org.dromara.hutool.core.util.ObjUtil; import java.util.*; import java.util.function.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/SimpleCollector.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/SimpleCollector.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/stream/SimpleCollector.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/SimpleCollector.java index daeb6d042..efcc627a8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/SimpleCollector.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/SimpleCollector.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; import java.util.Set; import java.util.function.BiConsumer; diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/StreamUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/StreamUtil.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/stream/StreamUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/StreamUtil.java index ff1b8acef..d54781fc3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/StreamUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/StreamUtil.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.stream.spliterators.DropWhileSpliterator; -import cn.hutool.core.stream.spliterators.IterateSpliterator; -import cn.hutool.core.stream.spliterators.TakeWhileSpliterator; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.stream.spliterators.DropWhileSpliterator; +import org.dromara.hutool.core.stream.spliterators.IterateSpliterator; +import org.dromara.hutool.core.stream.spliterators.TakeWhileSpliterator; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/TerminableWrappedStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/TerminableWrappedStream.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/stream/TerminableWrappedStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/TerminableWrappedStream.java index 3de7125dd..1fc622393 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/TerminableWrappedStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/TerminableWrappedStream.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.lang.mutable.MutableInt; -import cn.hutool.core.lang.mutable.MutableObj; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.lang.mutable.MutableInt; +import org.dromara.hutool.core.lang.mutable.MutableObj; +import org.dromara.hutool.core.array.ArrayUtil; import java.util.*; import java.util.function.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/TransformableWrappedStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/TransformableWrappedStream.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/stream/TransformableWrappedStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/TransformableWrappedStream.java index 00172811c..efd4b3028 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/TransformableWrappedStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/TransformableWrappedStream.java @@ -10,16 +10,16 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.lang.Console; -import cn.hutool.core.lang.mutable.MutableInt; -import cn.hutool.core.lang.mutable.MutableObj; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.map.SafeConcurrentHashMap; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.lang.mutable.MutableInt; +import org.dromara.hutool.core.lang.mutable.MutableObj; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.array.ArrayUtil; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/WrappedStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/WrappedStream.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/stream/WrappedStream.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/WrappedStream.java index f46102c4f..6a75b23ac 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/WrappedStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/WrappedStream.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; import java.util.*; import java.util.function.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/stream/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/package-info.java index bc4128f25..10b6ead9d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/package-info.java @@ -15,4 +15,4 @@ * * @author Looly, VampireAchao, huangchengxing, emptypoint */ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/spliterators/DropWhileSpliterator.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/DropWhileSpliterator.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/stream/spliterators/DropWhileSpliterator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/DropWhileSpliterator.java index 2ded6dc4c..4496e5760 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/spliterators/DropWhileSpliterator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/DropWhileSpliterator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.stream.spliterators; +package org.dromara.hutool.core.stream.spliterators; import java.util.Comparator; import java.util.Spliterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/spliterators/IterateSpliterator.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/IterateSpliterator.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/stream/spliterators/IterateSpliterator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/IterateSpliterator.java index cfa5e847b..99a63fb37 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/spliterators/IterateSpliterator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/IterateSpliterator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.stream.spliterators; +package org.dromara.hutool.core.stream.spliterators; import java.util.Objects; import java.util.Spliterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/spliterators/TakeWhileSpliterator.java b/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/TakeWhileSpliterator.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/stream/spliterators/TakeWhileSpliterator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/TakeWhileSpliterator.java index c40e410e3..8512a64b7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/spliterators/TakeWhileSpliterator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/TakeWhileSpliterator.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.stream.spliterators; +package org.dromara.hutool.core.stream.spliterators; import java.util.Comparator; import java.util.Spliterator; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/ASCIIStrCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/ASCIIStrCache.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/text/ASCIIStrCache.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/ASCIIStrCache.java index 457e86ae8..6732731a9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/ASCIIStrCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/ASCIIStrCache.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; /** * ASCII字符对应的字符串缓存 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/AntPathMatcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/AntPathMatcher.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/text/AntPathMatcher.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/AntPathMatcher.java index 15c54c853..a4f1003fc --- a/hutool-core/src/main/java/cn/hutool/core/text/AntPathMatcher.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/AntPathMatcher.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.map.SafeConcurrentHashMap; -import cn.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.text.split.SplitUtil; import java.util.ArrayList; import java.util.Comparator; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/CharPool.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharPool.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/text/CharPool.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/CharPool.java index 91db152a2..4191e49ac 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/CharPool.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharPool.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; /** * 常用字符常量 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java index c45b1fdb3..d7b50d064 --- a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java @@ -10,24 +10,28 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.comparator.VersionComparator; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.func.SerFunction; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.text.finder.CharFinder; -import cn.hutool.core.text.finder.CharMatcherFinder; -import cn.hutool.core.text.finder.Finder; -import cn.hutool.core.text.finder.StrFinder; -import cn.hutool.core.text.replacer.RangeReplacerByChar; -import cn.hutool.core.text.replacer.RangeReplacerByStr; -import cn.hutool.core.text.replacer.SearchReplacer; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.util.*; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.comparator.VersionComparator; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.func.SerFunction; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.text.finder.CharFinder; +import org.dromara.hutool.core.text.finder.CharMatcherFinder; +import org.dromara.hutool.core.text.finder.Finder; +import org.dromara.hutool.core.text.finder.StrFinder; +import org.dromara.hutool.core.text.replacer.RangeReplacerByChar; +import org.dromara.hutool.core.text.replacer.RangeReplacerByStr; +import org.dromara.hutool.core.text.replacer.SearchReplacer; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.util.*; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.nio.charset.Charset; import java.text.MessageFormat; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/MaskingUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/MaskingUtil.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/text/MaskingUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/MaskingUtil.java index 2df4f2ca5..1b9b7915f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/MaskingUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/MaskingUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharUtil; /** * 数据脱敏（Data Masking）工具类，对某些敏感信息（比如，身份证号、手机号、卡号、姓名、地址、邮箱等 ）屏蔽敏感数据。
      diff --git a/hutool-core/src/main/java/cn/hutool/core/text/NamingCase.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/NamingCase.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/text/NamingCase.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/NamingCase.java index 5e64d4973..9cd35b55d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/NamingCase.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/NamingCase.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharUtil; /** * 命名规则封装，主要是针对驼峰风格命名、连接符命名等的封装 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/PasswdStrength.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/PasswdStrength.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/text/PasswdStrength.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/PasswdStrength.java index 23a8934b7..504fc7f86 --- a/hutool-core/src/main/java/cn/hutool/core/text/PasswdStrength.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/PasswdStrength.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; /** * 检测密码强度
      diff --git a/hutool-core/src/main/java/cn/hutool/core/text/PlaceholderParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/PlaceholderParser.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/text/PlaceholderParser.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/PlaceholderParser.java index 302ca5fc4..83f1ae8f1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/PlaceholderParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/PlaceholderParser.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.util.CharUtil; import java.util.Objects; import java.util.function.UnaryOperator; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrChecker.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrChecker.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/text/StrChecker.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/StrChecker.java index 05f88a289..997b94898 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/StrChecker.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrChecker.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.CharUtil; import java.util.function.Predicate; @@ -502,7 +502,7 @@ public class StrChecker { * @since 3.2.3 */ public static boolean isAllCharMatch(final CharSequence value, final Predicate matcher) { - if (StrUtil.isBlank(value)) { + if (isBlank(value)) { return false; } for (int i = value.length(); --i >= 0; ) { diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrFormatter.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/StrFormatter.java index 27618ccc1..96a3f3b46 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrFormatter.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.CharUtil; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrJoiner.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/StrJoiner.java index 51470b708..5a02f7ff3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/StrJoiner.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrJoiner.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.collection.iter.ArrayIter; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.iter.ArrayIter; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.io.IOException; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrMatcher.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/StrMatcher.java index b927e2af6..b27896fd6 --- a/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrMatcher.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.map.MapUtil; +import org.dromara.hutool.core.map.MapUtil; import java.util.ArrayList; import java.util.HashMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrPool.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrPool.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/text/StrPool.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/StrPool.java index 9df57ad5a..7152d1d78 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/StrPool.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrPool.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; /** * 常用字符串常量定义 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrRegionMatcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrRegionMatcher.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/text/StrRegionMatcher.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/StrRegionMatcher.java index 9eb739e1d..b32f216b8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/StrRegionMatcher.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrRegionMatcher.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; import java.io.Serializable; import java.util.function.BiPredicate; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrRepeater.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrRepeater.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/text/StrRepeater.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/StrRepeater.java index ba5dd59e1..ff3f5bdde 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/StrRepeater.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrRepeater.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; /** * 字符串或字符重复器
      diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrTrimer.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/text/StrTrimer.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java index b4abf6c51..23b99bd3c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/StrTrimer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.CharUtil; import java.io.Serializable; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/text/StrUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/StrUtil.java index e78da5f1f..833e48742 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/StrUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.CharsetUtil; import java.io.StringReader; import java.io.StringWriter; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/TextSimilarity.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/TextSimilarity.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/text/TextSimilarity.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/TextSimilarity.java index 3c52a49e8..1705510a7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/TextSimilarity.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/TextSimilarity.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.math.NumberUtil; /** * 文本相似度计算
      diff --git a/hutool-core/src/main/java/cn/hutool/core/text/UnicodeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/UnicodeUtil.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/text/UnicodeUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/UnicodeUtil.java index 8fd83d5ea..ebff088b7 --- a/hutool-core/src/main/java/cn/hutool/core/text/UnicodeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/UnicodeUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.codec.HexUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.codec.HexUtil; /** * 提供Unicode字符串和普通字符串之间的转换 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloom/AbstractFilter.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/AbstractFilter.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/text/bloom/AbstractFilter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/AbstractFilter.java index 2e011db66..ca78f37de 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloom/AbstractFilter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/AbstractFilter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.bloom; +package org.dromara.hutool.core.text.bloom; import java.util.BitSet; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloom/BloomFilter.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/BloomFilter.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/text/bloom/BloomFilter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/BloomFilter.java index dc05728d3..076181a56 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloom/BloomFilter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/BloomFilter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.bloom; +package org.dromara.hutool.core.text.bloom; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloom/CombinedBloomFilter.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/CombinedBloomFilter.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/text/bloom/CombinedBloomFilter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/CombinedBloomFilter.java index 06a6bf617..4f24c63e6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloom/CombinedBloomFilter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/CombinedBloomFilter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.bloom; +package org.dromara.hutool.core.text.bloom; /** * 组合BloomFilter 实现
      diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloom/FuncFilter.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/FuncFilter.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/text/bloom/FuncFilter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/FuncFilter.java index 46601cada..b1baecffe 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloom/FuncFilter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/FuncFilter.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.bloom; +package org.dromara.hutool.core.text.bloom; import java.util.function.Function; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/bloom/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/text/bloom/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/package-info.java index 823e2c394..204ed9ccc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/bloom/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.text.bloom; +package org.dromara.hutool.core.text.bloom; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/dfa/FoundWord.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/FoundWord.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/text/dfa/FoundWord.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/FoundWord.java index 7ce534d21..cb6c425df --- a/hutool-core/src/main/java/cn/hutool/core/text/dfa/FoundWord.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/FoundWord.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.dfa; +package org.dromara.hutool.core.text.dfa; -import cn.hutool.core.lang.DefaultSegment; +import org.dromara.hutool.core.lang.DefaultSegment; /** *

      diff --git a/hutool-core/src/main/java/cn/hutool/core/text/dfa/NFA.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/NFA.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/text/dfa/NFA.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/NFA.java index 0b2fc0b54..8042793cd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/dfa/NFA.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/NFA.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.dfa; +package org.dromara.hutool.core.text.dfa; import java.util.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/dfa/SensitiveProcessor.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveProcessor.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/text/dfa/SensitiveProcessor.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveProcessor.java index 83ba9db98..3fb13afbc --- a/hutool-core/src/main/java/cn/hutool/core/text/dfa/SensitiveProcessor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveProcessor.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.dfa; +package org.dromara.hutool.core.text.dfa; /** * @author 肖海斌 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/dfa/SensitiveUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveUtil.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/text/dfa/SensitiveUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveUtil.java index 6e75f8ed7..b5a794379 --- a/hutool-core/src/main/java/cn/hutool/core/text/dfa/SensitiveUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.dfa; +package org.dromara.hutool.core.text.dfa; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.thread.ThreadUtil; import java.util.Collection; import java.util.HashMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/dfa/StopChar.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/text/dfa/StopChar.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java index c598ef8b4..7b4b55150 --- a/hutool-core/src/main/java/cn/hutool/core/text/dfa/StopChar.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.dfa; +package org.dromara.hutool.core.text.dfa; -import cn.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.SetUtil; import java.util.Set; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java index 88e447dbf..de4b204ec --- a/hutool-core/src/main/java/cn/hutool/core/text/dfa/WordTree.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.dfa; +package org.dromara.hutool.core.text.dfa; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.text.StrUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/dfa/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/package-info.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/text/dfa/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/package-info.java index 8b13fa72e..a02383a15 --- a/hutool-core/src/main/java/cn/hutool/core/text/dfa/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/package-info.java @@ -18,4 +18,4 @@ * @author looly * */ -package cn.hutool.core.text.dfa; +package org.dromara.hutool.core.text.dfa; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/EscapeUtil.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/escape/EscapeUtil.java index 49ae0d1fc..35c82ac72 --- a/hutool-core/src/main/java/cn/hutool/core/text/escape/EscapeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/EscapeUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.escape; +package org.dromara.hutool.core.text.escape; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/escape/Html4Escape.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/Html4Escape.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/text/escape/Html4Escape.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/escape/Html4Escape.java index 4481569f3..7690a371f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/escape/Html4Escape.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/Html4Escape.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.escape; +package org.dromara.hutool.core.text.escape; -import cn.hutool.core.text.replacer.LookupReplacer; +import org.dromara.hutool.core.text.replacer.LookupReplacer; /** * HTML4的ESCAPE diff --git a/hutool-core/src/main/java/cn/hutool/core/text/escape/Html4Unescape.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/Html4Unescape.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/text/escape/Html4Unescape.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/escape/Html4Unescape.java index 527359f13..09081ebee 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/escape/Html4Unescape.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/Html4Unescape.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.escape; +package org.dromara.hutool.core.text.escape; -import cn.hutool.core.text.replacer.LookupReplacer; +import org.dromara.hutool.core.text.replacer.LookupReplacer; /** * HTML4的UNESCAPE diff --git a/hutool-core/src/main/java/cn/hutool/core/text/escape/InternalEscapeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/InternalEscapeUtil.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/text/escape/InternalEscapeUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/escape/InternalEscapeUtil.java index c04aebcb6..9d042488d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/escape/InternalEscapeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/InternalEscapeUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.escape; +package org.dromara.hutool.core.text.escape; /** * 内部Escape工具类 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/escape/NumericEntityUnescaper.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/NumericEntityUnescaper.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/text/escape/NumericEntityUnescaper.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/escape/NumericEntityUnescaper.java index 8803c32fe..d68dd3f3e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/escape/NumericEntityUnescaper.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/NumericEntityUnescaper.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.escape; +package org.dromara.hutool.core.text.escape; -import cn.hutool.core.text.replacer.StrReplacer; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.replacer.StrReplacer; +import org.dromara.hutool.core.util.CharUtil; /** * 形如'的反转义器 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/escape/XmlEscape.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/XmlEscape.java similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/text/escape/XmlEscape.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/escape/XmlEscape.java index b7e1cce3e..64bca6cb1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/escape/XmlEscape.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/XmlEscape.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.escape; +package org.dromara.hutool.core.text.escape; -import cn.hutool.core.text.replacer.LookupReplacer; -import cn.hutool.core.text.replacer.ReplacerChain; +import org.dromara.hutool.core.text.replacer.LookupReplacer; +import org.dromara.hutool.core.text.replacer.ReplacerChain; /** * XML特殊字符转义
      diff --git a/hutool-core/src/main/java/cn/hutool/core/text/escape/XmlUnescape.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/XmlUnescape.java similarity index 86% rename from hutool-core/src/main/java/cn/hutool/core/text/escape/XmlUnescape.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/escape/XmlUnescape.java index ca750eaaf..49299a4d8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/escape/XmlUnescape.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/XmlUnescape.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.escape; +package org.dromara.hutool.core.text.escape; -import cn.hutool.core.text.replacer.LookupReplacer; -import cn.hutool.core.text.replacer.ReplacerChain; +import org.dromara.hutool.core.text.replacer.LookupReplacer; +import org.dromara.hutool.core.text.replacer.ReplacerChain; /** * XML的UNESCAPE diff --git a/hutool-core/src/main/java/cn/hutool/core/text/escape/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/text/escape/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/escape/package-info.java index 2e9c5128b..c15d5cf8b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/escape/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.text.escape; +package org.dromara.hutool.core.text.escape; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/finder/CharFinder.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharFinder.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/text/finder/CharFinder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharFinder.java index 2d75e4c63..b8955b56d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/finder/CharFinder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharFinder.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.finder; +package org.dromara.hutool.core.text.finder; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.util.CharUtil; /** * 字符查找器
      diff --git a/hutool-core/src/main/java/cn/hutool/core/text/finder/CharMatcherFinder.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharMatcherFinder.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/text/finder/CharMatcherFinder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharMatcherFinder.java index b5d34d2de..0c658c486 --- a/hutool-core/src/main/java/cn/hutool/core/text/finder/CharMatcherFinder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharMatcherFinder.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.finder; +package org.dromara.hutool.core.text.finder; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/finder/Finder.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/Finder.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/text/finder/Finder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/finder/Finder.java index b825cef43..861ff784a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/finder/Finder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/Finder.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.finder; +package org.dromara.hutool.core.text.finder; /** * 字符串查找接口，通过调用{@link #start(int)}查找开始位置，再调用{@link #end(int)}找结束位置 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/finder/LengthFinder.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/LengthFinder.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/text/finder/LengthFinder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/finder/LengthFinder.java index 9f117b29d..d87604bc2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/finder/LengthFinder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/LengthFinder.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.finder; +package org.dromara.hutool.core.text.finder; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; /** * 固定长度查找器
      diff --git a/hutool-core/src/main/java/cn/hutool/core/text/finder/PatternFinder.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/PatternFinder.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/text/finder/PatternFinder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/finder/PatternFinder.java index 7806d8cc1..50324564d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/finder/PatternFinder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/PatternFinder.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.finder; +package org.dromara.hutool.core.text.finder; -import cn.hutool.core.regex.PatternPool; +import org.dromara.hutool.core.regex.PatternPool; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/finder/StrFinder.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/StrFinder.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/text/finder/StrFinder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/finder/StrFinder.java index 7d076fbc0..bc61f8b27 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/finder/StrFinder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/StrFinder.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.finder; +package org.dromara.hutool.core.text.finder; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.CharSequenceUtil; /** * 字符串查找器 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/finder/TextFinder.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/TextFinder.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/text/finder/TextFinder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/finder/TextFinder.java index 7292e08df..5e5da82e7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/finder/TextFinder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/TextFinder.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.finder; +package org.dromara.hutool.core.text.finder; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/finder/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/package-info.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/text/finder/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/finder/package-info.java index a74ce24e3..cb03f6dac 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/finder/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/package-info.java @@ -22,4 +22,4 @@ * @author looly * */ -package cn.hutool.core.text.finder; +package org.dromara.hutool.core.text.finder; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/text/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/package-info.java index 3492288e2..fcd268a02 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/replacer/LookupReplacer.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/LookupReplacer.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/text/replacer/LookupReplacer.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/LookupReplacer.java index fc020d1be..bba6d4668 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/replacer/LookupReplacer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/LookupReplacer.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.replacer; +package org.dromara.hutool.core.text.replacer; import java.util.HashMap; import java.util.HashSet; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/replacer/RangeReplacerByChar.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/RangeReplacerByChar.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/text/replacer/RangeReplacerByChar.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/RangeReplacerByChar.java index 0da00f263..e40556243 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/replacer/RangeReplacerByChar.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/RangeReplacerByChar.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.replacer; +package org.dromara.hutool.core.text.replacer; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 区间字符串替换，指定区间，将区间中的所有字符去除，替换为指定的字符，字符重复次数为区间长度，即替换后字符串长度不变
      diff --git a/hutool-core/src/main/java/cn/hutool/core/text/replacer/RangeReplacerByStr.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/RangeReplacerByStr.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/text/replacer/RangeReplacerByStr.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/RangeReplacerByStr.java index 9901bc657..8843f6e52 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/replacer/RangeReplacerByStr.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/RangeReplacerByStr.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.replacer; +package org.dromara.hutool.core.text.replacer; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 区间字符串替换，指定区间，将区间中的所有字符去除，替换为指定的字符串，字符串只重复一次
      diff --git a/hutool-core/src/main/java/cn/hutool/core/text/replacer/ReplacerChain.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/ReplacerChain.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/text/replacer/ReplacerChain.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/ReplacerChain.java index c17b4fc7c..b42e61d3b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/replacer/ReplacerChain.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/ReplacerChain.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.replacer; +package org.dromara.hutool.core.text.replacer; -import cn.hutool.core.lang.Chain; +import org.dromara.hutool.core.lang.Chain; import java.util.Iterator; import java.util.LinkedList; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/replacer/SearchReplacer.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/SearchReplacer.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/text/replacer/SearchReplacer.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/SearchReplacer.java index d08d67d9b..92e2eb5ca 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/replacer/SearchReplacer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/SearchReplacer.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.replacer; +package org.dromara.hutool.core.text.replacer; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.finder.Finder; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.finder.Finder; /** * 查找替换器
      diff --git a/hutool-core/src/main/java/cn/hutool/core/text/replacer/StrReplacer.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/StrReplacer.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/text/replacer/StrReplacer.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/StrReplacer.java index 0f49f375d..fa6a24d0b --- a/hutool-core/src/main/java/cn/hutool/core/text/replacer/StrReplacer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/StrReplacer.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.replacer; +package org.dromara.hutool.core.text.replacer; import java.io.Serializable; import java.util.function.UnaryOperator; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/replacer/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/package-info.java similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/text/replacer/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/package-info.java index 3a2cc282a..36036599f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/replacer/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.text.replacer; +package org.dromara.hutool.core.text.replacer; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitIter.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitIter.java index 61c0de928..3f63c9b8f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/split/SplitIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitIter.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.split; +package org.dromara.hutool.core.text.split; -import cn.hutool.core.collection.iter.ComputeIter; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.finder.TextFinder; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.collection.iter.ComputeIter; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.finder.TextFinder; +import org.dromara.hutool.core.text.StrUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/split/SplitUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/text/split/SplitUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java index a8cf0135c..bac573213 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/split/SplitUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java @@ -10,15 +10,16 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.text.split; +package org.dromara.hutool.core.text.split; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.regex.PatternPool; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.finder.*; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.regex.PatternPool; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.finder.*; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.text.finder.*; import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/text/split/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/split/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/text/split/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/text/split/package-info.java index e9b08a8fa..73986d536 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/split/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/split/package-info.java @@ -15,4 +15,4 @@ * * @author looly */ -package cn.hutool.core.text.split; +package org.dromara.hutool.core.text.split; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/AsyncUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/AsyncUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/thread/AsyncUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/AsyncUtil.java index f7e13c0b5..b7b5e87b4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/AsyncUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/AsyncUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; import java.lang.reflect.UndeclaredThrowableException; import java.util.concurrent.CompletableFuture; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/BlockPolicy.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/BlockPolicy.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/thread/BlockPolicy.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/BlockPolicy.java index f223b90c5..33a1d40b2 --- a/hutool-core/src/main/java/cn/hutool/core/thread/BlockPolicy.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/BlockPolicy.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.RejectedExecutionHandler; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ConcurrencyTester.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ConcurrencyTester.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/thread/ConcurrencyTester.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/ConcurrencyTester.java index e7b37f5df..160e3373b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/ConcurrencyTester.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ConcurrencyTester.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; -import cn.hutool.core.date.StopWatch; +import org.dromara.hutool.core.date.StopWatch; import java.io.Closeable; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/DelegatedExecutorService.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/DelegatedExecutorService.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/thread/DelegatedExecutorService.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/DelegatedExecutorService.java index 8736a8f94..cd42449f9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/DelegatedExecutorService.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/DelegatedExecutorService.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.Assert; import java.util.Collection; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ExecutorBuilder.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ExecutorBuilder.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/thread/ExecutorBuilder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/ExecutorBuilder.java index dc062e87d..d32e68b4e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/ExecutorBuilder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ExecutorBuilder.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; -import cn.hutool.core.lang.builder.Builder; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.lang.builder.Builder; +import org.dromara.hutool.core.util.ObjUtil; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/FinalizableDelegatedExecutorService.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/FinalizableDelegatedExecutorService.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/thread/FinalizableDelegatedExecutorService.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/FinalizableDelegatedExecutorService.java index 4c7410063..097cae27a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/FinalizableDelegatedExecutorService.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/FinalizableDelegatedExecutorService.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; import java.util.concurrent.ExecutorService; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/GlobalThreadPool.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/GlobalThreadPool.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/thread/GlobalThreadPool.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/GlobalThreadPool.java index 87a6a4a59..3b096cc08 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/GlobalThreadPool.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/GlobalThreadPool.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/NamedThreadFactory.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/NamedThreadFactory.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/thread/NamedThreadFactory.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/NamedThreadFactory.java index 10ba3276b..0c235a441 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/NamedThreadFactory.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/NamedThreadFactory.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; import java.lang.Thread.UncaughtExceptionHandler; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 线程创建工厂类，此工厂可选配置： diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/RejectPolicy.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/RejectPolicy.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/thread/RejectPolicy.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/RejectPolicy.java index cefca7c07..f35618a16 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/RejectPolicy.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/RejectPolicy.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ThreadPoolExecutor; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/SemaphoreRunnable.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/SemaphoreRunnable.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/thread/SemaphoreRunnable.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/SemaphoreRunnable.java index 3043802fd..953952fcd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/SemaphoreRunnable.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/SemaphoreRunnable.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; import java.util.concurrent.Semaphore; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/SimpleScheduler.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/SimpleScheduler.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/thread/SimpleScheduler.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/SimpleScheduler.java index e9a2aa578..7f6105a4e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/SimpleScheduler.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/SimpleScheduler.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; -import cn.hutool.core.util.RuntimeUtil; +import org.dromara.hutool.core.util.RuntimeUtil; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/SyncFinisher.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/SyncFinisher.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/thread/SyncFinisher.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/SyncFinisher.java index 7c97b15e9..18cdd380b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/SyncFinisher.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/SyncFinisher.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; -import cn.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.exceptions.UtilException; import java.io.Closeable; import java.util.LinkedHashSet; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadException.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadException.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/thread/ThreadException.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadException.java index 8cf1c7ff3..68e8a710b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadException.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; -import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exceptions.ExceptionUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 工具类异常 diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadFactoryBuilder.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadFactoryBuilder.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/thread/ThreadFactoryBuilder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadFactoryBuilder.java index 6301250e9..fe76df639 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadFactoryBuilder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadFactoryBuilder.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; -import cn.hutool.core.lang.builder.Builder; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.lang.builder.Builder; +import org.dromara.hutool.core.text.StrUtil; import java.lang.Thread.UncaughtExceptionHandler; import java.util.concurrent.Executors; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadUtil.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadUtil.java index 37f372bf4..ca9589be3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; -import cn.hutool.core.util.RuntimeUtil; +import org.dromara.hutool.core.util.RuntimeUtil; import java.lang.Thread.UncaughtExceptionHandler; import java.util.concurrent.Callable; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/lock/LockUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/LockUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/thread/lock/LockUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/LockUtil.java index 82bd50564..5c5d2d0bb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/lock/LockUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/LockUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread.lock; +package org.dromara.hutool.core.thread.lock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.StampedLock; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/lock/NoLock.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/NoLock.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/thread/lock/NoLock.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/NoLock.java index 8c4d798c3..6f2521f35 --- a/hutool-core/src/main/java/cn/hutool/core/thread/lock/NoLock.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/NoLock.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread.lock; +package org.dromara.hutool.core.thread.lock; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/lock/NoReadWriteLock.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/NoReadWriteLock.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/thread/lock/NoReadWriteLock.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/NoReadWriteLock.java index 7f4c9d1ba..bd566e141 --- a/hutool-core/src/main/java/cn/hutool/core/thread/lock/NoReadWriteLock.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/NoReadWriteLock.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread.lock; +package org.dromara.hutool.core.thread.lock; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/commons/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/package-info.java similarity index 93% rename from hutool-log/src/main/java/cn/hutool/log/dialect/commons/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/package-info.java index 6984aaa6c..46c968fea 100644 --- a/hutool-log/src/main/java/cn/hutool/log/dialect/commons/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/package-info.java @@ -11,9 +11,9 @@ */ /** - * Apache-Commons-Logging日志库的实现封装 + * 锁的实现 * * @author looly * */ -package cn.hutool.log.dialect.commons; +package org.dromara.hutool.core.thread.lock; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/package-info.java similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/thread/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/package-info.java index 8a86823ac..18ff907a8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/threadlocal/NamedInheritableThreadLocal.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/NamedInheritableThreadLocal.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/thread/threadlocal/NamedInheritableThreadLocal.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/NamedInheritableThreadLocal.java index 0f734a54f..e6693faf0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/threadlocal/NamedInheritableThreadLocal.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/NamedInheritableThreadLocal.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread.threadlocal; +package org.dromara.hutool.core.thread.threadlocal; /** * 带有Name标识的 {@link InheritableThreadLocal}，调用toString返回name diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/threadlocal/NamedThreadLocal.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/NamedThreadLocal.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/thread/threadlocal/NamedThreadLocal.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/NamedThreadLocal.java index be9c22d46..9173257fb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/threadlocal/NamedThreadLocal.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/NamedThreadLocal.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.thread.threadlocal; +package org.dromara.hutool.core.thread.threadlocal; /** * 带有Name标识的 {@link ThreadLocal}，调用toString返回name diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/threadlocal/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/package-info.java similarity index 91% rename from hutool-core/src/main/java/cn/hutool/core/thread/threadlocal/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/package-info.java index fc125d706..052abcdc3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/threadlocal/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.thread.threadlocal; +package org.dromara.hutool.core.thread.threadlocal; diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/BeanTree.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java rename to hutool-core/src/main/java/org/dromara/hutool/core/tree/BeanTree.java index e8b68889c..fd837fcc5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/BeanTree.java @@ -10,13 +10,17 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.lang.func.*; -import cn.hutool.core.stream.EasyStream; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.lang.func.*; +import org.dromara.hutool.core.lang.func.SerBiConsumer; +import org.dromara.hutool.core.lang.func.SerConsumer; +import org.dromara.hutool.core.lang.func.SerFunction; +import org.dromara.hutool.core.lang.func.SerPredicate; +import org.dromara.hutool.core.stream.EasyStream; import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/MapTree.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/tree/MapTree.java rename to hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java index eb087e14e..ebf38c392 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/MapTree.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/Node.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/Node.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/tree/Node.java rename to hutool-core/src/main/java/org/dromara/hutool/core/tree/Node.java index d7f8de470..771c37dac 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/Node.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/Node.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; -import cn.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.comparator.CompareUtil; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/TreeBuilder.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeBuilder.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/tree/TreeBuilder.java rename to hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeBuilder.java index ebc965b1e..e86b00a90 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/TreeBuilder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeBuilder.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.builder.Builder; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.tree.parser.NodeParser; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.builder.Builder; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.tree.parser.NodeParser; +import org.dromara.hutool.core.util.ObjUtil; import java.util.LinkedHashMap; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/TreeNode.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNode.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/tree/TreeNode.java rename to hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNode.java index e84733562..03ce5819d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/TreeNode.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNode.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/TreeNodeConfig.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNodeConfig.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/tree/TreeNodeConfig.java rename to hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNodeConfig.java index 17cc420ac..aa100ed78 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/TreeNodeConfig.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNodeConfig.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; import java.io.Serializable; diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeUtil.java index 5ad20147e..d6501fcee 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/TreeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.tree.parser.DefaultNodeParser; -import cn.hutool.core.tree.parser.NodeParser; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.tree.parser.DefaultNodeParser; +import org.dromara.hutool.core.tree.parser.NodeParser; +import org.dromara.hutool.core.util.ObjUtil; import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/package-info.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/tree/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/tree/package-info.java index 7a254a08b..2250b079d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/package-info.java @@ -23,4 +23,4 @@ * @author liangbaikai（https://gitee.com/liangbaikai00/） * @since 5.2.1 */ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/parser/DefaultNodeParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/DefaultNodeParser.java similarity index 85% rename from hutool-core/src/main/java/cn/hutool/core/tree/parser/DefaultNodeParser.java rename to hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/DefaultNodeParser.java index d87ce0a12..dc27c4df1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/parser/DefaultNodeParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/DefaultNodeParser.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.tree.parser; +package org.dromara.hutool.core.tree.parser; -import cn.hutool.core.tree.TreeNode; -import cn.hutool.core.tree.MapTree; -import cn.hutool.core.map.MapUtil; +import org.dromara.hutool.core.tree.TreeNode; +import org.dromara.hutool.core.tree.MapTree; +import org.dromara.hutool.core.map.MapUtil; import java.util.Map; diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/parser/NodeParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/NodeParser.java similarity index 90% rename from hutool-core/src/main/java/cn/hutool/core/tree/parser/NodeParser.java rename to hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/NodeParser.java index fbbd23f85..43f7f86f3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/parser/NodeParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/NodeParser.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.tree.parser; +package org.dromara.hutool.core.tree.parser; -import cn.hutool.core.tree.MapTree; +import org.dromara.hutool.core.tree.MapTree; /** * 树节点解析器 可以参考{@link DefaultNodeParser} diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/parser/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/package-info.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/main/java/cn/hutool/core/tree/parser/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/package-info.java index bac918b86..56651cc1c --- a/hutool-core/src/main/java/cn/hutool/core/tree/parser/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/package-info.java @@ -13,4 +13,4 @@ /** * 节点解析器封装 */ -package cn.hutool.core.tree.parser; +package org.dromara.hutool.core.tree.parser; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java index 8504f2422..c126a2872 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.text.StrUtil; import java.util.Set; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ByteUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/ByteUtil.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/util/ByteUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/ByteUtil.java index d7aef0271..43bb71e54 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ByteUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/ByteUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.math.NumberUtil; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/CharUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/CharUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/util/CharUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/CharUtil.java index 5bdfb98de..4f77f1897 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/CharUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/CharUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.text.ASCIIStrCache; -import cn.hutool.core.text.CharPool; +import org.dromara.hutool.core.text.ASCIIStrCache; +import org.dromara.hutool.core.text.CharPool; /** * 字符工具类
      diff --git a/hutool-core/src/main/java/cn/hutool/core/util/CharsetUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/CharsetUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/util/CharsetUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/CharsetUtil.java index 136a56c2a..8201c4721 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/CharsetUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/CharsetUtil.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.io.CharsetDetector; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.CharsetDetector; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/CoordinateUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/CoordinateUtil.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/util/CoordinateUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/CoordinateUtil.java index 5872dbfcf..0edaa9e21 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/CoordinateUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/CoordinateUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/CreditCodeUtil.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/CreditCodeUtil.java index 54f4978d5..9b04182fa --- a/hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/CreditCodeUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.map.SafeConcurrentHashMap; -import cn.hutool.core.regex.PatternPool; -import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.map.SafeConcurrentHashMap; +import org.dromara.hutool.core.regex.PatternPool; +import org.dromara.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.text.StrUtil; import java.util.Map; import java.util.regex.Pattern; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/EnumUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/EnumUtil.java index e7be91b8d..7b777824f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/EnumUtil.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.func.LambdaUtil; -import cn.hutool.core.lang.func.SerFunction; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.reflect.FieldUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.func.LambdaUtil; +import org.dromara.hutool.core.lang.func.SerFunction; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.reflect.FieldUtil; +import org.dromara.hutool.core.text.StrUtil; import java.lang.reflect.Field; import java.util.*; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/IdcardUtil.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/IdcardUtil.java index 5618ac319..57d2f7ec6 --- a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/IdcardUtil.java @@ -10,16 +10,16 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.regex.PatternPool; -import cn.hutool.core.lang.Validator; -import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.date.DatePattern; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.regex.PatternPool; +import org.dromara.hutool.core.lang.Validator; +import org.dromara.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.Serializable; import java.util.Date; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/JNDIUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/JNDIUtil.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/main/java/cn/hutool/core/util/JNDIUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/JNDIUtil.java index 156e5a4ac..498f99def --- a/hutool-core/src/main/java/cn/hutool/core/util/JNDIUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/JNDIUtil.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.map.MapUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.map.MapUtil; import javax.naming.InitialContext; import javax.naming.NamingException; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/JdkUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/JdkUtil.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/util/JdkUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/JdkUtil.java index ff58b0197..652b87e9c --- a/hutool-core/src/main/java/cn/hutool/core/util/JdkUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/JdkUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * JDK相关工具类，包括判断JDK版本等
      diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ManifestUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/ManifestUtil.java similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/util/ManifestUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/ManifestUtil.java index c90d5501c..a793bfbd9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ManifestUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/ManifestUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.resource.ResourceUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.resource.ResourceUtil; import java.io.File; import java.io.FileInputStream; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java index 9916cede0..12e38792d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java @@ -10,20 +10,20 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.SerializeUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.reflect.ClassUtil; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.SerializeUtil; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.reflect.ClassUtil; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.text.StrUtil; import java.io.Serializable; import java.lang.reflect.Array; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/PhoneUtil.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/PhoneUtil.java index e833c02cb..9602bbea7 --- a/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/PhoneUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.regex.PatternPool; -import cn.hutool.core.lang.Validator; -import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.regex.PatternPool; +import org.dromara.hutool.core.lang.Validator; +import org.dromara.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.text.StrUtil; /** diff --git a/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java index 3c201d038..23f661994 --- a/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java @@ -10,20 +10,20 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.date.DateField; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.WeightRandom; -import cn.hutool.core.lang.WeightRandom.WeightObj; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.date.DateField; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.lang.WeightRandom; +import org.dromara.hutool.core.lang.WeightRandom.WeightObj; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.text.StrUtil; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ReferenceUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/ReferenceUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/util/ReferenceUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/ReferenceUtil.java index e554f5466..35ba7a7e4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ReferenceUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/ReferenceUtil.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; import java.lang.ref.PhantomReference; import java.lang.ref.Reference; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java index 5b04aec59..bb4a75d93 --- a/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java @@ -10,14 +10,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.id.Pid; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.lang.id.Pid; +import org.dromara.hutool.core.text.StrUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/ServiceLoaderUtil.java similarity index 95% rename from hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/ServiceLoaderUtil.java index 1b6a28ed6..bdc44c20e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/ServiceLoaderUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.classloader.ClassLoaderUtil; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.collection.ListUtil; import java.util.Iterator; import java.util.List; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/SystemUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/util/SystemUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java index eb9fe08b7..36bbe89e8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/SystemUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.lang.Console; import java.util.Properties; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/XmlUtil.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/XmlUtil.java index e7c2d40c7..739b004c4 --- a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/XmlUtil.java @@ -10,20 +10,20 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.IORuntimeException; -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.StrUtil; -import cn.hutool.core.text.escape.EscapeUtil; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.map.BiMap; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.escape.EscapeUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/package-info.java similarity index 94% rename from hutool-core/src/main/java/cn/hutool/core/util/package-info.java rename to hutool-core/src/main/java/org/dromara/hutool/core/util/package-info.java index 842f6f44b..7679842a3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotatedElementUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/AnnotatedElementUtilTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/annotation/AnnotatedElementUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/annotation/AnnotatedElementUtilTest.java index 7fac3d661..9beac5bff 100644 --- a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotatedElementUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/AnnotatedElementUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/AnnotationUtilTest.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/annotation/AnnotationUtilTest.java index ddac22646..c0db59601 --- a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/AnnotationUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.util.ObjUtil; import lombok.SneakyThrows; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/CombinationAnnotationElementTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/CombinationAnnotationElementTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/annotation/CombinationAnnotationElementTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/annotation/CombinationAnnotationElementTest.java index 328ee6414..69a260889 100644 --- a/hutool-core/src/test/java/cn/hutool/core/annotation/CombinationAnnotationElementTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/CombinationAnnotationElementTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/GenericAnnotationMappingTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/GenericAnnotationMappingTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/annotation/GenericAnnotationMappingTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/annotation/GenericAnnotationMappingTest.java index 4fdd8d794..43ee3cccc 100644 --- a/hutool-core/src/test/java/cn/hutool/core/annotation/GenericAnnotationMappingTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/GenericAnnotationMappingTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; import lombok.SneakyThrows; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/HierarchicalAnnotatedElementTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElementTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/annotation/HierarchicalAnnotatedElementTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElementTest.java index 6a27ea0f7..1fa83400b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/annotation/HierarchicalAnnotatedElementTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElementTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; import lombok.SneakyThrows; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/MetaAnnotatedElementTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/MetaAnnotatedElementTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/annotation/MetaAnnotatedElementTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/annotation/MetaAnnotatedElementTest.java index 6a50714f8..e58ebb012 100644 --- a/hutool-core/src/test/java/cn/hutool/core/annotation/MetaAnnotatedElementTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/MetaAnnotatedElementTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/RepeatableAnnotationCollectorTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollectorTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/annotation/RepeatableAnnotationCollectorTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollectorTest.java index 1b5bc3041..263e8b7e5 100644 --- a/hutool-core/src/test/java/cn/hutool/core/annotation/RepeatableAnnotationCollectorTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollectorTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.text.CharSequenceUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/RepeatableMetaAnnotatedElementTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/RepeatableMetaAnnotatedElementTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/annotation/RepeatableMetaAnnotatedElementTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/annotation/RepeatableMetaAnnotatedElementTest.java index 1d93cba3d..c7d09192f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/annotation/RepeatableMetaAnnotatedElementTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/RepeatableMetaAnnotatedElementTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; -import cn.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.collection.iter.IterUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/ResolvedAnnotationMappingTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMappingTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/annotation/ResolvedAnnotationMappingTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMappingTest.java index 57b6954ef..7cab84557 100644 --- a/hutool-core/src/test/java/cn/hutool/core/annotation/ResolvedAnnotationMappingTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMappingTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.annotation; +package org.dromara.hutool.core.annotation; import lombok.SneakyThrows; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanCopyMappingTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanCopyMappingTest.java similarity index 87% rename from hutool-core/src/test/java/cn/hutool/core/bean/BeanCopyMappingTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanCopyMappingTest.java index e91873a5e..c72cb71ea 100644 --- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanCopyMappingTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanCopyMappingTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.map.MapUtil; +import org.dromara.hutool.core.bean.copier.CopyOptions; +import org.dromara.hutool.core.map.MapUtil; import lombok.Builder; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanDescTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/bean/BeanDescTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescTest.java index 7fab1265d..4ba7ee09b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanDescTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanPathTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanPathTest.java similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/bean/BeanPathTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanPathTest.java index 555ec9687..40fde0ce2 100644 --- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanPathTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanPathTest.java @@ -1,9 +1,9 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.lang.test.bean.ExamInfoDict; -import cn.hutool.core.lang.test.bean.UserInfoDict; -import cn.hutool.core.map.Dict; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.lang.test.bean.ExamInfoDict; +import org.dromara.hutool.core.lang.test.bean.UserInfoDict; +import org.dromara.hutool.core.map.Dict; import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java index 8459ca4c9..5092fc045 --- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java @@ -1,16 +1,16 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.annotation.Alias; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.bean.copier.ValueProvider; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.map.MapBuilder; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.annotation.Alias; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.bean.copier.CopyOptions; +import org.dromara.hutool.core.bean.copier.ValueProvider; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.map.MapBuilder; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.util.ObjUtil; import lombok.Data; import lombok.Getter; import lombok.Setter; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanWithReturnThisTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanWithReturnThisTest.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/bean/BeanWithReturnThisTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanWithReturnThisTest.java index b5ed14be8..3b9af9654 100644 --- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanWithReturnThisTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanWithReturnThisTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/DynaBeanTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/DynaBeanTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/bean/DynaBeanTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/DynaBeanTest.java index d61d04cf5..b666b0cc6 100644 --- a/hutool-core/src/test/java/cn/hutool/core/bean/DynaBeanTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/DynaBeanTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue1687Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue1687Test.java old mode 100755 new mode 100644 similarity index 88% rename from hutool-core/src/test/java/cn/hutool/core/bean/Issue1687Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue1687Test.java index 9aeb435a5..e7d16ac4b --- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue1687Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue1687Test.java @@ -1,8 +1,8 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.annotation.Alias; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.map.MapUtil; +import org.dromara.hutool.core.annotation.Alias; +import org.dromara.hutool.core.bean.copier.CopyOptions; +import org.dromara.hutool.core.map.MapUtil; import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2009Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2009Test.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/bean/Issue2009Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2009Test.java index f2d56fafe..4595f6efe 100644 --- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2009Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2009Test.java @@ -1,4 +1,4 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2082Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2082Test.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/bean/Issue2082Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2082Test.java index 9671ce34e..94996e37c --- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2082Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2082Test.java @@ -1,4 +1,4 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2202Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2202Test.java old mode 100755 new mode 100644 similarity index 90% rename from hutool-core/src/test/java/cn/hutool/core/bean/Issue2202Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2202Test.java index 7b0fdbe7b..2b724be1e --- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2202Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2202Test.java @@ -1,7 +1,7 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.text.NamingCase; +import org.dromara.hutool.core.bean.copier.CopyOptions; +import org.dromara.hutool.core.text.NamingCase; import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2649Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2649Test.java old mode 100755 new mode 100644 similarity index 89% rename from hutool-core/src/test/java/cn/hutool/core/bean/Issue2649Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2649Test.java index ead645afe..898c13a3d --- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2649Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2649Test.java @@ -1,7 +1,7 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.date.StopWatch; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.date.StopWatch; +import org.dromara.hutool.core.lang.Console; import lombok.Data; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2683Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2683Test.java old mode 100755 new mode 100644 similarity index 90% rename from hutool-core/src/test/java/cn/hutool/core/bean/Issue2683Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2683Test.java index 9161ace1e..a5fd2dd99 --- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2683Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2683Test.java @@ -1,6 +1,6 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; -import cn.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.CollUtil; import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/IssueI5DDZXTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI5DDZXTest.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/bean/IssueI5DDZXTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI5DDZXTest.java index b608f2d92..b3bccb593 100644 --- a/hutool-core/src/test/java/cn/hutool/core/bean/IssueI5DDZXTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI5DDZXTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.bean; +package org.dromara.hutool.core.bean; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/copier/BeanCopierTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/copier/BeanCopierTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/bean/copier/BeanCopierTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/bean/copier/BeanCopierTest.java index 20029bdc9..271fd1e4b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/bean/copier/BeanCopierTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/copier/BeanCopierTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.bean.copier; +package org.dromara.hutool.core.bean.copier; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/cache/CacheConcurrentTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/cache/CacheConcurrentTest.java old mode 100755 new mode 100644 similarity index 88% rename from hutool-core/src/test/java/cn/hutool/core/cache/CacheConcurrentTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/cache/CacheConcurrentTest.java index eb74e3925..a0ab87303 --- a/hutool-core/src/test/java/cn/hutool/core/cache/CacheConcurrentTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/cache/CacheConcurrentTest.java @@ -1,11 +1,11 @@ -package cn.hutool.core.cache; +package org.dromara.hutool.core.cache; -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; +import org.dromara.hutool.core.cache.impl.FIFOCache; +import org.dromara.hutool.core.cache.impl.LRUCache; +import org.dromara.hutool.core.cache.impl.WeakCache; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.thread.ConcurrencyTester; +import org.dromara.hutool.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/cache/CacheTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/cache/CacheTest.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/cache/CacheTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/cache/CacheTest.java index a9c3abcba..e2a843876 --- a/hutool-core/src/test/java/cn/hutool/core/cache/CacheTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/cache/CacheTest.java @@ -1,9 +1,9 @@ -package cn.hutool.core.cache; +package org.dromara.hutool.core.cache; -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; +import org.dromara.hutool.core.cache.impl.TimedCache; +import org.dromara.hutool.core.date.DateUnit; +import org.dromara.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/cache/FileCacheTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/cache/FileCacheTest.java old mode 100755 new mode 100644 similarity index 76% rename from hutool-core/src/test/java/cn/hutool/core/cache/FileCacheTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/cache/FileCacheTest.java index f4860184a..2b08519ae --- a/hutool-core/src/test/java/cn/hutool/core/cache/FileCacheTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/cache/FileCacheTest.java @@ -1,10 +1,9 @@ -package cn.hutool.core.cache; +package org.dromara.hutool.core.cache; +import org.dromara.hutool.core.cache.file.LFUFileCache; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import cn.hutool.core.cache.file.LFUFileCache; - /** * 文件缓存单元测试 * @author looly diff --git a/hutool-core/src/test/java/cn/hutool/core/cache/LRUCacheTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/cache/LRUCacheTest.java old mode 100755 new mode 100644 similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/cache/LRUCacheTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/cache/LRUCacheTest.java index 0055a2d70..b8048fafe --- a/hutool-core/src/test/java/cn/hutool/core/cache/LRUCacheTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/cache/LRUCacheTest.java @@ -1,9 +1,9 @@ -package cn.hutool.core.cache; +package org.dromara.hutool.core.cache; -import cn.hutool.core.cache.impl.LRUCache; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.cache.impl.LRUCache; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/cache/WeakCacheTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/cache/WeakCacheTest.java old mode 100755 new mode 100644 similarity index 88% rename from hutool-core/src/test/java/cn/hutool/core/cache/WeakCacheTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/cache/WeakCacheTest.java index 3a5ff4560..7d4282230 --- a/hutool-core/src/test/java/cn/hutool/core/cache/WeakCacheTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/cache/WeakCacheTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.cache; +package org.dromara.hutool.core.cache; -import cn.hutool.core.cache.impl.WeakCache; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.cache.impl.WeakCache; +import org.dromara.hutool.core.lang.Console; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/classloader/ClassLoaderUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/classloader/ClassLoaderUtilTest.java similarity index 58% rename from hutool-core/src/test/java/cn/hutool/core/classloader/ClassLoaderUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/classloader/ClassLoaderUtilTest.java index 97e17ad41..ca3fa5c06 100644 --- a/hutool-core/src/test/java/cn/hutool/core/classloader/ClassLoaderUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/classloader/ClassLoaderUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.classloader; +package org.dromara.hutool.core.classloader; -import cn.hutool.core.map.Dict; +import org.dromara.hutool.core.map.Dict; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -8,7 +8,7 @@ public class ClassLoaderUtilTest { @Test public void isPresentTest() { - final boolean present = ClassLoaderUtil.isPresent("cn.hutool.core.classloader.ClassLoaderUtil"); + final boolean present = ClassLoaderUtil.isPresent("classloader.org.dromara.hutool.core.ClassLoaderUtil"); Assertions.assertTrue(present); } @@ -31,10 +31,10 @@ public class ClassLoaderUtilTest { @Test public void loadInnerClassTest() { - String name = ClassLoaderUtil.loadClass("cn.hutool.core.classloader.ClassLoaderUtilTest.A").getName(); - Assertions.assertEquals("cn.hutool.core.classloader.ClassLoaderUtilTest$A", name); - name = ClassLoaderUtil.loadClass("cn.hutool.core.classloader.ClassLoaderUtilTest.A.B").getName(); - Assertions.assertEquals("cn.hutool.core.classloader.ClassLoaderUtilTest$A$B", name); + String name = ClassLoaderUtil.loadClass("org.dromara.hutool.core.classloader.ClassLoaderUtilTest.A").getName(); + Assertions.assertEquals("org.dromara.hutool.core.classloader.ClassLoaderUtilTest$A", name); + name = ClassLoaderUtil.loadClass("org.dromara.hutool.core.classloader.ClassLoaderUtilTest.A.B").getName(); + Assertions.assertEquals("org.dromara.hutool.core.classloader.ClassLoaderUtilTest$A$B", name); } @SuppressWarnings("unused") diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base32Test.java similarity index 89% rename from hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/Base32Test.java index ddd81e60c..a0f55902e 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base32Test.java @@ -1,8 +1,8 @@ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; -import cn.hutool.core.codec.binary.Base32; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.codec.binary.Base32; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/Base58Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base58Test.java similarity index 93% rename from hutool-core/src/test/java/cn/hutool/core/codec/Base58Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/Base58Test.java index 341b79abe..26bee0b87 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/Base58Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base58Test.java @@ -1,6 +1,6 @@ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; -import cn.hutool.core.codec.binary.Base58; +import org.dromara.hutool.core.codec.binary.Base58; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/Base62Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base62Test.java similarity index 90% rename from hutool-core/src/test/java/cn/hutool/core/codec/Base62Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/Base62Test.java index 6da0e00cf..e92b2cc11 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/Base62Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base62Test.java @@ -1,7 +1,7 @@ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; -import cn.hutool.core.codec.binary.Base62; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.codec.binary.Base62; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/Base64Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base64Test.java similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/codec/Base64Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/Base64Test.java index 21dfe0807..3f77059ed 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/Base64Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base64Test.java @@ -1,9 +1,9 @@ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; -import cn.hutool.core.codec.binary.Base64; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.codec.binary.Base64; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/CaesarTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/CaesarTest.java similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/codec/CaesarTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/CaesarTest.java index 210c12c01..0647e789b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/CaesarTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/CaesarTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/HashidsTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/HashidsTest.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/codec/HashidsTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/HashidsTest.java index 85bb777a3..fa8da47c0 --- a/hutool-core/src/test/java/cn/hutool/core/codec/HashidsTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/HashidsTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/MorseTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/MorseTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/codec/MorseTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/MorseTest.java index 0554824b5..58aeef9a7 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/MorseTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/MorseTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/PercentCodecTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/PercentCodecTest.java similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/codec/PercentCodecTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/PercentCodecTest.java index 22476ecfd..715a5366a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/PercentCodecTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/PercentCodecTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/PunyCodeTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/PunyCodeTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/codec/PunyCodeTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/PunyCodeTest.java index e51126b10..c83713c2c 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/PunyCodeTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/PunyCodeTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/RotTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/RotTest.java similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/codec/RotTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/RotTest.java index 94a1acd3b..6be4157d2 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/RotTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/RotTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.codec; +package org.dromara.hutool.core.codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/hash/CityHashTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/CityHashTest.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/test/java/cn/hutool/core/codec/hash/CityHashTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/CityHashTest.java index 8d4a5fe05..781e8d005 --- a/hutool-core/src/test/java/cn/hutool/core/codec/hash/CityHashTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/CityHashTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; -import cn.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.ByteUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/hash/MurmurHashTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/MurmurHashTest.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/test/java/cn/hutool/core/codec/hash/MurmurHashTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/MurmurHashTest.java index 6796b23da..21c3f4fc5 --- a/hutool-core/src/test/java/cn/hutool/core/codec/hash/MurmurHashTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/MurmurHashTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; -import cn.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.ByteUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/hash/SimhashTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/SimhashTest.java similarity index 79% rename from hutool-core/src/test/java/cn/hutool/core/codec/hash/SimhashTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/SimhashTest.java index 93c4c1db8..af0c8395b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/hash/SimhashTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/SimhashTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.codec.hash; +package org.dromara.hutool.core.codec.hash; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHash128Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHash128Test.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHash128Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHash128Test.java index f01ab1fab..6bcca1b68 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHash128Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHash128Test.java @@ -1,8 +1,8 @@ -package cn.hutool.core.codec.hash.metro; +package org.dromara.hutool.core.codec.hash.metro; -import cn.hutool.core.codec.HexUtil; -import cn.hutool.core.codec.Number128; -import cn.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.codec.HexUtil; +import org.dromara.hutool.core.codec.Number128; +import org.dromara.hutool.core.util.ByteUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHash64Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHash64Test.java similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHash64Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHash64Test.java index eb64f6cf5..6ff83d849 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHash64Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHash64Test.java @@ -1,7 +1,7 @@ -package cn.hutool.core.codec.hash.metro; +package org.dromara.hutool.core.codec.hash.metro; -import cn.hutool.core.codec.HexUtil; -import cn.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.codec.HexUtil; +import org.dromara.hutool.core.util.ByteUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHashTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHashTest.java similarity index 90% rename from hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHashTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHashTest.java index 7bf449bc1..ef5bd756f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/codec/hash/metro/MetroHashTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHashTest.java @@ -1,11 +1,11 @@ -package cn.hutool.core.codec.hash.metro; +package org.dromara.hutool.core.codec.hash.metro; -import cn.hutool.core.codec.HexUtil; -import cn.hutool.core.codec.hash.CityHash; -import cn.hutool.core.util.ByteUtil; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.codec.HexUtil; +import org.dromara.hutool.core.codec.hash.CityHash; +import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollStreamUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/CollStreamUtilTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/collection/CollStreamUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/CollStreamUtilTest.java index 8364ca5a4..7f5b3f325 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/CollStreamUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/CollStreamUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.map.MapUtil; +import org.dromara.hutool.core.map.MapUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.ToString; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/CollUtilTest.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/CollUtilTest.java index 443d4c5fd..66dfd9f2f --- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/CollUtilTest.java @@ -1,12 +1,12 @@ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.collection.iter.IterUtil; -import cn.hutool.core.comparator.CompareUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.Console; -import cn.hutool.core.map.Dict; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.comparator.CompareUtil; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.map.Dict; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.text.StrUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/IterUtilTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/IterUtilTest.java index dbeeaa224..2594712b6 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/IterUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.collection.iter.FilterIter; -import cn.hutool.core.collection.iter.IterUtil; +import org.dromara.hutool.core.collection.iter.FilterIter; +import org.dromara.hutool.core.collection.iter.IterUtil; import lombok.AllArgsConstructor; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/ListUtilTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/ListUtilTest.java index 01a9477ce..52f015fd7 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/ListUtilTest.java @@ -1,9 +1,9 @@ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.date.StopWatch; -import cn.hutool.core.lang.Console; -import cn.hutool.core.lang.page.PageInfo; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.date.StopWatch; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.lang.page.PageInfo; +import org.dromara.hutool.core.util.RandomUtil; import lombok.AllArgsConstructor; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/MapProxyTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/MapProxyTest.java similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/collection/MapProxyTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/MapProxyTest.java index 3568f1313..86d7a1d9f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/MapProxyTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/MapProxyTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.map.MapProxy; +import org.dromara.hutool.core.map.MapProxy; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java similarity index 87% rename from hutool-core/src/test/java/cn/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java index cbef27ba8..ff3961788 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/PartitionIterTest.java similarity index 75% rename from hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/PartitionIterTest.java index fea83cbfb..fb1e89d0c 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/PartitionIterTest.java @@ -1,9 +1,9 @@ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.collection.iter.LineIter; -import cn.hutool.core.collection.iter.PartitionIter; -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.iter.LineIter; +import org.dromara.hutool.core.collection.iter.PartitionIter; +import org.dromara.hutool.core.io.resource.ResourceUtil; +import org.dromara.hutool.core.array.ArrayUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/RingIndexUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/RingIndexUtilTest.java similarity index 89% rename from hutool-core/src/test/java/cn/hutool/core/collection/RingIndexUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/RingIndexUtilTest.java index 06193dbdf..6a52d4601 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/RingIndexUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/RingIndexUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; -import cn.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/UniqueKeySetTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/UniqueKeySetTest.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/collection/UniqueKeySetTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/UniqueKeySetTest.java index 7f9089945..d0b70d915 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/UniqueKeySetTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/UniqueKeySetTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection; +package org.dromara.hutool.core.collection; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/ArrayIterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/ArrayIterTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/collection/iter/ArrayIterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/ArrayIterTest.java index c33a8fa01..a06feccbb 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/iter/ArrayIterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/ArrayIterTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/CopiedIterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/CopiedIterTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/collection/iter/CopiedIterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/CopiedIterTest.java index a40a6009c..f7aaaf532 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/iter/CopiedIterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/CopiedIterTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/EnumerationIterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/EnumerationIterTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/collection/iter/EnumerationIterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/EnumerationIterTest.java index de41487ad..0e314c304 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/iter/EnumerationIterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/EnumerationIterTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/FilterIterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/FilterIterTest.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/collection/iter/FilterIterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/FilterIterTest.java index a9362a6d0..efcc0e868 --- a/hutool-core/src/test/java/cn/hutool/core/collection/iter/FilterIterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/FilterIterTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/IterChainTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IterChainTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/collection/iter/IterChainTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IterChainTest.java index c533f97c1..553492453 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/iter/IterChainTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IterChainTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/IterUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IterUtilTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/collection/iter/IterUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IterUtilTest.java index de9631656..e39a99de8 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/iter/IterUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IterUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/IteratorEnumerationTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IteratorEnumerationTest.java similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/collection/iter/IteratorEnumerationTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IteratorEnumerationTest.java index 6abcfdc71..4c5a599f6 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/iter/IteratorEnumerationTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IteratorEnumerationTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/LineIterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/LineIterTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/collection/iter/LineIterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/LineIterTest.java index 5cc171f86..113815b93 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/iter/LineIterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/LineIterTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/PartitionIterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/PartitionIterTest.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/collection/iter/PartitionIterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/PartitionIterTest.java index 928a379d6..2fdb9c21a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/iter/PartitionIterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/PartitionIterTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/iter/TransIterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/TransIterTest.java similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/collection/iter/TransIterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/TransIterTest.java index c00de7e17..aba44e235 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/iter/TransIterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/TransIterTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.collection.iter; +package org.dromara.hutool.core.collection.iter; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/partition/PartitionTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/partition/PartitionTest.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/collection/partition/PartitionTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/collection/partition/PartitionTest.java index a8d4b3a21..e0d0c802f --- a/hutool-core/src/test/java/cn/hutool/core/collection/partition/PartitionTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/partition/PartitionTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.collection.partition; +package org.dromara.hutool.core.collection.partition; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/comparator/CompareUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/comparator/CompareUtilTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/comparator/CompareUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/comparator/CompareUtilTest.java index 99b9023ca..42dc5f933 100644 --- a/hutool-core/src/test/java/cn/hutool/core/comparator/CompareUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/comparator/CompareUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/comparator/PropertyComparatorTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/comparator/PropertyComparatorTest.java similarity index 93% rename from hutool-core/src/test/java/cn/hutool/core/comparator/PropertyComparatorTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/comparator/PropertyComparatorTest.java index 2de08d9bf..e19efc686 100644 --- a/hutool-core/src/test/java/cn/hutool/core/comparator/PropertyComparatorTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/comparator/PropertyComparatorTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.ListUtil; import lombok.AllArgsConstructor; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/comparator/VersionComparatorTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/comparator/VersionComparatorTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/comparator/VersionComparatorTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/comparator/VersionComparatorTest.java index 5a287a75b..91cbb4dde 100644 --- a/hutool-core/src/test/java/cn/hutool/core/comparator/VersionComparatorTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/comparator/VersionComparatorTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.comparator; +package org.dromara.hutool.core.comparator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/compress/Issue3018Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/compress/Issue3018Test.java similarity index 85% rename from hutool-core/src/test/java/cn/hutool/core/compress/Issue3018Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/compress/Issue3018Test.java index 53f386243..08b704182 100644 --- a/hutool-core/src/test/java/cn/hutool/core/compress/Issue3018Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/compress/Issue3018Test.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Test; public class Issue3018Test { diff --git a/hutool-core/src/test/java/cn/hutool/core/compress/IssueI5DRU0Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueI5DRU0Test.java similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/compress/IssueI5DRU0Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueI5DRU0Test.java index b75b26893..31f29c5c9 100644 --- a/hutool-core/src/test/java/cn/hutool/core/compress/IssueI5DRU0Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueI5DRU0Test.java @@ -1,4 +1,4 @@ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/compress/ZipReaderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipReaderTest.java old mode 100755 new mode 100644 similarity index 75% rename from hutool-core/src/test/java/cn/hutool/core/compress/ZipReaderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipReaderTest.java index f33708a99..b7f89f779 --- a/hutool-core/src/test/java/cn/hutool/core/compress/ZipReaderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipReaderTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.lang.Console; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/compress/ZipWriterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipWriterTest.java old mode 100755 new mode 100644 similarity index 68% rename from hutool-core/src/test/java/cn/hutool/core/compress/ZipWriterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipWriterTest.java index 198aff383..18df2143b --- a/hutool-core/src/test/java/cn/hutool/core/compress/ZipWriterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipWriterTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.compress; +package org.dromara.hutool.core.compress; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.resource.FileResource; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.resource.FileResource; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/BasicTypeTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/BasicTypeTest.java similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/convert/BasicTypeTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/BasicTypeTest.java index 9c6d77efd..0a83e0d11 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/BasicTypeTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/BasicTypeTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/CastUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/CastUtilTest.java similarity index 90% rename from hutool-core/src/test/java/cn/hutool/core/convert/CastUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/CastUtilTest.java index 415f8c205..46076c14a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/CastUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/CastUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/CompositeConverterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/CompositeConverterTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/convert/CompositeConverterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/CompositeConverterTest.java index b2b73939e..80579da23 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/CompositeConverterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/CompositeConverterTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertOtherTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertOtherTest.java similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/convert/ConvertOtherTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertOtherTest.java index 8baee843f..babcc93af 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertOtherTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertOtherTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertTest.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertTest.java index 8f2c13cc1..150a92257 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertTest.java @@ -1,12 +1,12 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.codec.HexUtil; -import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.date.DateException; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.reflect.TypeReference; -import cn.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.codec.HexUtil; +import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.date.DateException; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.reflect.TypeReference; +import org.dromara.hutool.core.util.ByteUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; @@ -311,7 +311,7 @@ public class ConvertTest { @Test public void toClassTest(){ - final Class convert = Convert.convert(Class.class, "cn.hutool.core.convert.ConvertTest.Product"); + final Class convert = Convert.convert(Class.class, "convert.org.dromara.hutool.core.ConvertTest.Product"); Assertions.assertSame(Product.class, convert); } diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToArrayTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToArrayTest.java similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/convert/ConvertToArrayTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToArrayTest.java index 45ba8ac77..6d56c4096 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToArrayTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToArrayTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.convert.impl.ArrayConverter; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.convert.impl.ArrayConverter; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.lang.Console; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToBeanTest.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToBeanTest.java index 97eb621c0..4adbd9b8d --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToBeanTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.bean.BeanUtilTest.SubPerson; -import cn.hutool.core.map.CaseInsensitiveMap; -import cn.hutool.core.reflect.TypeReference; +import org.dromara.hutool.core.bean.BeanUtilTest.SubPerson; +import org.dromara.hutool.core.map.CaseInsensitiveMap; +import org.dromara.hutool.core.reflect.TypeReference; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBooleanTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToBooleanTest.java similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBooleanTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToBooleanTest.java index 389e8b468..99454a07f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBooleanTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToBooleanTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToCollectionTest.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToCollectionTest.java index b135d1471..76621c787 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToCollectionTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.reflect.TypeReference; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.reflect.TypeReference; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToNumberTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToNumberTest.java similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/convert/ConvertToNumberTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToNumberTest.java index 90b5765e1..144c514c6 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToNumberTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToNumberTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToSBCAndDBCTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToSBCAndDBCTest.java similarity index 93% rename from hutool-core/src/test/java/cn/hutool/core/convert/ConvertToSBCAndDBCTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToSBCAndDBCTest.java index 619acce04..3ee934c28 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToSBCAndDBCTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToSBCAndDBCTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/DateConvertTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/DateConvertTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/convert/DateConvertTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/DateConvertTest.java index 914384144..87aff3d22 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/DateConvertTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/DateConvertTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.date.DateUtil; +import org.dromara.hutool.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/EnumConvertTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/EnumConvertTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/convert/EnumConvertTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/EnumConvertTest.java index a6b20631b..4d6b8aea9 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/EnumConvertTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/EnumConvertTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/MapConvertTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/MapConvertTest.java similarity index 93% rename from hutool-core/src/test/java/cn/hutool/core/convert/MapConvertTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/MapConvertTest.java index c62501c84..7395282c0 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/MapConvertTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/MapConvertTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.map.MapBuilder; +import org.dromara.hutool.core.map.MapBuilder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/NumberChineseFormatterTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/NumberChineseFormatterTest.java index f98c1f384..01e0130d5 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/NumberChineseFormatterTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/NumberConverterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/NumberConverterTest.java similarity index 85% rename from hutool-core/src/test/java/cn/hutool/core/convert/NumberConverterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/NumberConverterTest.java index 685a7145d..860764173 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/NumberConverterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/NumberConverterTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.convert.impl.NumberConverter; +import org.dromara.hutool.core.convert.impl.NumberConverter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/NumberWordFormatTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/NumberWordFormatTest.java index dadbd5f1a..98b7721d6 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/NumberWordFormatTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/PrimitiveConvertTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/PrimitiveConvertTest.java similarity index 83% rename from hutool-core/src/test/java/cn/hutool/core/convert/PrimitiveConvertTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/PrimitiveConvertTest.java index 6d7123081..b193ae008 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/PrimitiveConvertTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/PrimitiveConvertTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.convert.impl.PrimitiveConverter; +import org.dromara.hutool.core.convert.impl.PrimitiveConverter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/StringConvertTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/StringConvertTest.java similarity index 88% rename from hutool-core/src/test/java/cn/hutool/core/convert/StringConvertTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/StringConvertTest.java index 2aeaefcd4..84f07ccf7 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/StringConvertTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/StringConvertTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/TemporalAccessorConverterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/TemporalAccessorConverterTest.java similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/convert/TemporalAccessorConverterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/TemporalAccessorConverterTest.java index 07dcc8066..b67b71ed4 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/TemporalAccessorConverterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/TemporalAccessorConverterTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.date.DateUtil; +import org.dromara.hutool.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/XMLGregorianCalendarConverterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/convert/XMLGregorianCalendarConverterTest.java old mode 100755 new mode 100644 similarity index 81% rename from hutool-core/src/test/java/cn/hutool/core/convert/XMLGregorianCalendarConverterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/convert/XMLGregorianCalendarConverterTest.java index ed92ab356..4c551529c --- a/hutool-core/src/test/java/cn/hutool/core/convert/XMLGregorianCalendarConverterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/convert/XMLGregorianCalendarConverterTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.convert; +package org.dromara.hutool.core.convert; -import cn.hutool.core.date.DateUtil; +import org.dromara.hutool.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/BetweenFormatterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/BetweenFormatterTest.java similarity index 80% rename from hutool-core/src/test/java/cn/hutool/core/date/BetweenFormatterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/BetweenFormatterTest.java index 89526d6aa..cacdb2ce5 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/BetweenFormatterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/BetweenFormatterTest.java @@ -1,6 +1,5 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.date.BetweenFormatter.Level; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -9,27 +8,27 @@ public class BetweenFormatterTest { @Test public void formatTest(){ final long betweenMs = DateUtil.betweenMs(DateUtil.parse("2017-01-01 22:59:59"), DateUtil.parse("2017-01-02 23:59:58")); - final BetweenFormatter formater = new BetweenFormatter(betweenMs, Level.MILLISECOND, 1); + final BetweenFormatter formater = new BetweenFormatter(betweenMs, BetweenFormatter.Level.MILLISECOND, 1); Assertions.assertEquals(formater.toString(), "1天"); } @Test public void formatBetweenTest(){ final long betweenMs = DateUtil.betweenMs(DateUtil.parse("2018-07-16 11:23:19"), DateUtil.parse("2018-07-16 11:23:20")); - final BetweenFormatter formater = new BetweenFormatter(betweenMs, Level.SECOND, 1); + final BetweenFormatter formater = new BetweenFormatter(betweenMs, BetweenFormatter.Level.SECOND, 1); Assertions.assertEquals(formater.toString(), "1秒"); } @Test public void formatBetweenTest2(){ final long betweenMs = DateUtil.betweenMs(DateUtil.parse("2018-07-16 12:25:23"), DateUtil.parse("2018-07-16 11:23:20")); - final BetweenFormatter formater = new BetweenFormatter(betweenMs, Level.SECOND, 5); + final BetweenFormatter formater = new BetweenFormatter(betweenMs, BetweenFormatter.Level.SECOND, 5); Assertions.assertEquals(formater.toString(), "1小时2分3秒"); } @Test public void formatTest2(){ - final BetweenFormatter formater = new BetweenFormatter(584, Level.SECOND, 1); + final BetweenFormatter formater = new BetweenFormatter(584, BetweenFormatter.Level.SECOND, 1); Assertions.assertEquals(formater.toString(), "0秒"); } } diff --git a/hutool-core/src/test/java/cn/hutool/core/date/CalendarUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/CalendarUtilTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/date/CalendarUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/CalendarUtilTest.java index fd11e3b8f..05344eb97 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/CalendarUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/CalendarUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/ChineseDateTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/ChineseDateTest.java index adb9f2ee3..68e2f211f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/ChineseDateTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.date.chinese.ChineseDate; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.date.chinese.ChineseDate; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateBetweenTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/DateBetweenTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/date/DateBetweenTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/DateBetweenTest.java index 6224c5a18..f1d80a422 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/DateBetweenTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/DateBetweenTest.java @@ -1,6 +1,5 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.date.BetweenFormatter.Level; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -59,7 +58,7 @@ public class DateBetweenTest { public void betweenMinuteTest() { final Date date1 = DateUtil.parse("2017-03-01 20:33:23"); final Date date2 = DateUtil.parse("2017-03-01 23:33:23"); - final String formatBetween = DateUtil.formatBetween(date1, date2, Level.SECOND); + final String formatBetween = DateUtil.formatBetween(date1, date2, BetweenFormatter.Level.SECOND); Assertions.assertEquals("3小时", formatBetween); } diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateFieldTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/DateFieldTest.java similarity index 89% rename from hutool-core/src/test/java/cn/hutool/core/date/DateFieldTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/DateFieldTest.java index 9b4aaf8c6..0ad78b107 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/DateFieldTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/DateFieldTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateModifierTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/DateModifierTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/date/DateModifierTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/DateModifierTest.java index 1b5f0105b..746226555 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/DateModifierTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/DateModifierTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateTimeTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/DateTimeTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/date/DateTimeTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/DateTimeTest.java index dfb390911..663437656 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/DateTimeTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/DateTimeTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/DateUtilTest.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/DateUtilTest.java index b0566609a..64c97cefa --- a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/DateUtilTest.java @@ -1,9 +1,8 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.date.BetweenFormatter.Level; -import cn.hutool.core.date.format.FastDateFormat; -import cn.hutool.core.lang.Console; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.date.format.FastDateFormat; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -306,7 +305,7 @@ public class DateUtilTest { final Date date2 = DateUtil.parse(dateStr2); final long between = DateUtil.between(date1, date2, DateUnit.MS); - final String formatBetween = DateUtil.formatBetween(between, Level.MINUTE); + final String formatBetween = DateUtil.formatBetween(between, BetweenFormatter.Level.MINUTE); Assertions.assertEquals("31天1小时21分", formatBetween); } diff --git a/hutool-core/src/test/java/cn/hutool/core/date/GanzhiTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/GanzhiTest.java similarity index 89% rename from hutool-core/src/test/java/cn/hutool/core/date/GanzhiTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/GanzhiTest.java index b13324318..e70ce7fad 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/GanzhiTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/GanzhiTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.date.chinese.ChineseDate; -import cn.hutool.core.date.chinese.GanZhi; +import org.dromara.hutool.core.date.chinese.ChineseDate; +import org.dromara.hutool.core.date.chinese.GanZhi; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/Issue2612Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue2612Test.java similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/date/Issue2612Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/Issue2612Test.java index b0a9d0351..d0575126d 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/Issue2612Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue2612Test.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/Issue2981Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue2981Test.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/date/Issue2981Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/Issue2981Test.java index e2cf549aa..fcb20c136 --- a/hutool-core/src/test/java/cn/hutool/core/date/Issue2981Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue2981Test.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/Issue3011Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3011Test.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/date/Issue3011Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3011Test.java index 92007abba..57963c9de 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/Issue3011Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3011Test.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/MonthTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/MonthTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/date/MonthTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/MonthTest.java index 27bb9e561..7cb8504a4 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/MonthTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/MonthTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/StopWatchTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/StopWatchTest.java similarity index 77% rename from hutool-core/src/test/java/cn/hutool/core/date/StopWatchTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/StopWatchTest.java index 87d96ef28..fc87dd596 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/StopWatchTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/StopWatchTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.lang.Console; -import cn.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.thread.ThreadUtil; import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/TemporalAccessorUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/TemporalAccessorUtilTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/date/TemporalAccessorUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/TemporalAccessorUtilTest.java index f52a1b145..80ace6b0c 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/TemporalAccessorUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/TemporalAccessorUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/TimeUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/TimeUtilTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/date/TimeUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/TimeUtilTest.java index 3608671d9..3954e7584 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/TimeUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/TimeUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.lang.Console; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/TimeZoneTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/TimeZoneTest.java similarity index 86% rename from hutool-core/src/test/java/cn/hutool/core/date/TimeZoneTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/TimeZoneTest.java index e084c063e..1a880f3d1 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/TimeZoneTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/TimeZoneTest.java @@ -1,12 +1,11 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import java.util.TimeZone; +import org.dromara.hutool.core.date.format.FastDateFormat; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import cn.hutool.core.date.format.FastDateFormat; - public class TimeZoneTest { @Test diff --git a/hutool-core/src/test/java/cn/hutool/core/date/WeekTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/WeekTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/date/WeekTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/WeekTest.java index cf1b2661e..665a6f0a3 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/WeekTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/WeekTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/ZodiacTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/ZodiacTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/date/ZodiacTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/ZodiacTest.java index 797857a8e..c38330f54 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/ZodiacTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/ZodiacTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/ZoneUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/ZoneUtilTest.java similarity index 90% rename from hutool-core/src/test/java/cn/hutool/core/date/ZoneUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/ZoneUtilTest.java index 50432cf7f..3b72d0abd 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/ZoneUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/ZoneUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date; +package org.dromara.hutool.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/chinese/IssueI5YB1ATest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/IssueI5YB1ATest.java old mode 100755 new mode 100644 similarity index 88% rename from hutool-core/src/test/java/cn/hutool/core/date/chinese/IssueI5YB1ATest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/IssueI5YB1ATest.java index 72b8fc17e..22696147e --- a/hutool-core/src/test/java/cn/hutool/core/date/chinese/IssueI5YB1ATest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/IssueI5YB1ATest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.date.chinese; +package org.dromara.hutool.core.date.chinese; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/SolarTermsTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/SolarTermsTest.java index 263a316ca..3959e3a85 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/SolarTermsTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.date.chinese; +package org.dromara.hutool.core.date.chinese; -import cn.hutool.core.date.DateUtil; +import org.dromara.hutool.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/exceptions/ExceptionUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/exceptions/ExceptionUtilTest.java similarity index 89% rename from hutool-core/src/test/java/cn/hutool/core/exceptions/ExceptionUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/exceptions/ExceptionUtilTest.java index 736b3db8f..05e3cc977 100644 --- a/hutool-core/src/test/java/cn/hutool/core/exceptions/ExceptionUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/exceptions/ExceptionUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.exceptions; +package org.dromara.hutool.core.exceptions; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.io.IORuntimeException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/BomReaderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/BomReaderTest.java old mode 100755 new mode 100644 similarity index 81% rename from hutool-core/src/test/java/cn/hutool/core/io/BomReaderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/BomReaderTest.java index 7b33922a5..a0a53ad4e --- a/hutool-core/src/test/java/cn/hutool/core/io/BomReaderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/BomReaderTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.file.FileUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/BufferUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/BufferUtilTest.java similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/io/BufferUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/BufferUtilTest.java index 0663e8c89..5b03004eb 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/BufferUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/BufferUtilTest.java @@ -1,13 +1,12 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; import java.nio.ByteBuffer; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.text.StrUtil; - /** * BufferUtil单元测试 * diff --git a/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/CharsetDetectorTest.java similarity index 75% rename from hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/CharsetDetectorTest.java index be4075f23..128ac79cf 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/CharsetDetectorTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.io.resource.ResourceUtil; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/ClassPathResourceTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/ClassPathResourceTest.java similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/io/ClassPathResourceTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/ClassPathResourceTest.java index 1e12ce858..af3d7d7b1 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/ClassPathResourceTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/ClassPathResourceTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.io.resource.ClassPathResource; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.resource.ClassPathResource; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FastStringWriterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/FastStringWriterTest.java old mode 100755 new mode 100644 similarity index 83% rename from hutool-core/src/test/java/cn/hutool/core/io/FastStringWriterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/FastStringWriterTest.java index e77673c80..466ca68cb --- a/hutool-core/src/test/java/cn/hutool/core/io/FastStringWriterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/FastStringWriterTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FileReaderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/FileReaderTest.java similarity index 83% rename from hutool-core/src/test/java/cn/hutool/core/io/FileReaderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/FileReaderTest.java index 827af2770..d87c5cca7 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/FileReaderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/FileReaderTest.java @@ -1,12 +1,11 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.file.FileReader; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import cn.hutool.core.io.file.FileReader; - import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FileTypeUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/FileTypeUtilTest.java old mode 100755 new mode 100644 similarity index 90% rename from hutool-core/src/test/java/cn/hutool/core/io/FileTypeUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/FileTypeUtilTest.java index a90417e73..98d905dc2 --- a/hutool-core/src/test/java/cn/hutool/core/io/FileTypeUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/FileTypeUtilTest.java @@ -1,9 +1,9 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.io.file.FileTypeUtil; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.io.file.FileTypeUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.resource.ResourceUtil; +import org.dromara.hutool.core.lang.Console; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/FileUtilTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/FileUtilTest.java index 9cdde2503..781fcf9e6 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/FileUtilTest.java @@ -1,12 +1,12 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.io.file.FileNameUtil; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.file.LineSeparator; -import cn.hutool.core.lang.Console; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.SystemUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.io.file.FileNameUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.file.LineSeparator; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.SystemUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/IoUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/IoUtilTest.java similarity index 88% rename from hutool-core/src/test/java/cn/hutool/core/io/IoUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/IoUtilTest.java index 4365ef94a..4ec399b52 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/IoUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/IoUtilTest.java @@ -1,13 +1,13 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.collection.iter.LineIter; -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.io.stream.EmptyOutputStream; -import cn.hutool.core.io.stream.StrInputStream; -import cn.hutool.core.lang.func.SerConsumer; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.iter.LineIter; +import org.dromara.hutool.core.io.resource.ResourceUtil; +import org.dromara.hutool.core.io.stream.EmptyOutputStream; +import org.dromara.hutool.core.io.stream.StrInputStream; +import org.dromara.hutool.core.lang.func.SerConsumer; +import org.dromara.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/LineReaderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/LineReaderTest.java old mode 100755 new mode 100644 similarity index 86% rename from hutool-core/src/test/java/cn/hutool/core/io/LineReaderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/LineReaderTest.java index c188c6b4a..b7ae9a5f5 --- a/hutool-core/src/test/java/cn/hutool/core/io/LineReaderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/LineReaderTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.io.resource.ResourceUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.io.resource.ResourceUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/ManifestUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/ManifestUtilTest.java similarity index 77% rename from hutool-core/src/test/java/cn/hutool/core/io/ManifestUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/ManifestUtilTest.java index 788857fb5..a41dbc451 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/ManifestUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/ManifestUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.util.ManifestUtil; +import org.dromara.hutool.core.util.ManifestUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/NioUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/NioUtilTest.java old mode 100755 new mode 100644 similarity index 84% rename from hutool-core/src/test/java/cn/hutool/core/io/NioUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/NioUtilTest.java index 94576d827..5ebd9cf0c --- a/hutool-core/src/test/java/cn/hutool/core/io/NioUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/NioUtilTest.java @@ -1,10 +1,10 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.io.stream.EmptyOutputStream; -import cn.hutool.core.lang.Console; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.resource.ResourceUtil; +import org.dromara.hutool.core.io.stream.EmptyOutputStream; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/WatchMonitorTest.java old mode 100755 new mode 100644 similarity index 79% rename from hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/WatchMonitorTest.java index 55cd35954..776059c41 --- a/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/WatchMonitorTest.java @@ -1,13 +1,13 @@ -package cn.hutool.core.io; +package org.dromara.hutool.core.io; import java.nio.file.Path; import java.nio.file.WatchEvent; -import cn.hutool.core.io.watch.SimpleWatcher; -import cn.hutool.core.io.watch.WatchMonitor; -import cn.hutool.core.io.watch.Watcher; -import cn.hutool.core.io.watch.watchers.DelayWatcher; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.io.watch.SimpleWatcher; +import org.dromara.hutool.core.io.watch.WatchMonitor; +import org.dromara.hutool.core.io.watch.Watcher; +import org.dromara.hutool.core.io.watch.watchers.DelayWatcher; +import org.dromara.hutool.core.lang.Console; /** * 文件监听单元测试 diff --git a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CRC16Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/checksum/CRC16Test.java similarity index 77% rename from hutool-core/src/test/java/cn/hutool/core/io/checksum/CRC16Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/checksum/CRC16Test.java index 349f717a0..1aa8b69b8 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CRC16Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/checksum/CRC16Test.java @@ -1,15 +1,15 @@ -package cn.hutool.core.io.checksum; +package org.dromara.hutool.core.io.checksum; -import cn.hutool.core.io.checksum.crc16.CRC16Ansi; -import cn.hutool.core.io.checksum.crc16.CRC16CCITT; -import cn.hutool.core.io.checksum.crc16.CRC16CCITTFalse; -import cn.hutool.core.io.checksum.crc16.CRC16DNP; -import cn.hutool.core.io.checksum.crc16.CRC16IBM; -import cn.hutool.core.io.checksum.crc16.CRC16Maxim; -import cn.hutool.core.io.checksum.crc16.CRC16Modbus; -import cn.hutool.core.io.checksum.crc16.CRC16USB; -import cn.hutool.core.io.checksum.crc16.CRC16X25; -import cn.hutool.core.io.checksum.crc16.CRC16XModem; +import org.dromara.hutool.core.io.checksum.crc16.CRC16Ansi; +import org.dromara.hutool.core.io.checksum.crc16.CRC16CCITT; +import org.dromara.hutool.core.io.checksum.crc16.CRC16CCITTFalse; +import org.dromara.hutool.core.io.checksum.crc16.CRC16DNP; +import org.dromara.hutool.core.io.checksum.crc16.CRC16IBM; +import org.dromara.hutool.core.io.checksum.crc16.CRC16Maxim; +import org.dromara.hutool.core.io.checksum.crc16.CRC16Modbus; +import org.dromara.hutool.core.io.checksum.crc16.CRC16USB; +import org.dromara.hutool.core.io.checksum.crc16.CRC16X25; +import org.dromara.hutool.core.io.checksum.crc16.CRC16XModem; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/checksum/CrcTest.java old mode 100755 new mode 100644 similarity index 88% rename from hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/checksum/CrcTest.java index 7b9350fc2..146a60cc3 --- a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/checksum/CrcTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.io.checksum; +package org.dromara.hutool.core.io.checksum; -import cn.hutool.core.codec.HexUtil; -import cn.hutool.core.io.checksum.crc16.CRC16XModem; -import cn.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.codec.HexUtil; +import org.dromara.hutool.core.io.checksum.crc16.CRC16XModem; +import org.dromara.hutool.core.util.ByteUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/FileNameUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileNameUtilTest.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/io/file/FileNameUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileNameUtilTest.java index 2ec58257b..398adf640 --- a/hutool-core/src/test/java/cn/hutool/core/io/file/FileNameUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileNameUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/FileSystemUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileSystemUtilTest.java similarity index 84% rename from hutool-core/src/test/java/cn/hutool/core/io/file/FileSystemUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileSystemUtilTest.java index 8ff8ac9ad..1ff250eb8 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/file/FileSystemUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileSystemUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.lang.Console; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/IssueI666HBTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/IssueI666HBTest.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/io/file/IssueI666HBTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/file/IssueI666HBTest.java index 3a882c5dd..b746dbc0d --- a/hutool-core/src/test/java/cn/hutool/core/io/file/IssueI666HBTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/IssueI666HBTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/PathCopyTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathCopyTest.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/io/file/PathCopyTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathCopyTest.java index bf2e38c6c..7725d466f --- a/hutool-core/src/test/java/cn/hutool/core/io/file/PathCopyTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathCopyTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/PathDeleterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathDeleterTest.java old mode 100755 new mode 100644 similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/io/file/PathDeleterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathDeleterTest.java index e4be2dee3..2856426a9 --- a/hutool-core/src/test/java/cn/hutool/core/io/file/PathDeleterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathDeleterTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/PathUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathUtilTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/io/file/PathUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathUtilTest.java index 5ade407a2..3e33f7c89 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/file/PathUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/TailerTest.java similarity index 81% rename from hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/file/TailerTest.java index 107086c2d..187aefba2 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/TailerTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.io.file; +package org.dromara.hutool.core.io.file; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/resource/ResourceUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/resource/ResourceUtilTest.java similarity index 84% rename from hutool-core/src/test/java/cn/hutool/core/io/resource/ResourceUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/resource/ResourceUtilTest.java index c0da16e76..3381a1abc 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/resource/ResourceUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/resource/ResourceUtilTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.io.resource; +package org.dromara.hutool.core.io.resource; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.io.IoUtil; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/io/unit/DataSizeUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/unit/DataSizeUtilTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/io/unit/DataSizeUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/io/unit/DataSizeUtilTest.java index ed8602f7d..402327c4f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/unit/DataSizeUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/unit/DataSizeUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.io.unit; +package org.dromara.hutool.core.io.unit; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/AssertTest.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/AssertTest.java index 21b401a0d..20074392b --- a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/AssertTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTableTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ConsoleTableTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTableTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/ConsoleTableTest.java index 81d1e9e7b..928284d0e 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTableTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ConsoleTableTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ConsoleTest.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/ConsoleTest.java index aea871106..aa40f361a --- a/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ConsoleTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.thread.ThreadUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/DictTest.java old mode 100755 new mode 100644 similarity index 90% rename from hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/DictTest.java index b209b391b..dbdc73a75 --- a/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/DictTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.lang.builder.GenericBuilder; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.map.Dict; +import org.dromara.hutool.core.lang.builder.GenericBuilder; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.map.Dict; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/NanoIdTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/NanoIdTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/lang/NanoIdTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/NanoIdTest.java index 023c1ab86..7d6daea90 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/NanoIdTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/NanoIdTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.lang.id.NanoId; +import org.dromara.hutool.core.lang.id.NanoId; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ObjectIdTest.java old mode 100755 new mode 100644 similarity index 86% rename from hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/ObjectIdTest.java index d4755dfdc..c0d61f0be --- a/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ObjectIdTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.lang.id.ObjectId; +import org.dromara.hutool.core.lang.id.ObjectId; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/OptTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/OptTest.java index df823d0a2..de5a46303 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/OptTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.collection.CollUtil; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SimpleCacheTest.java old mode 100755 new mode 100644 similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/SimpleCacheTest.java index 71d5e99ab..a79715d61 --- a/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SimpleCacheTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.cache.SimpleCache; -import cn.hutool.core.thread.ConcurrencyTester; -import cn.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.cache.SimpleCache; +import org.dromara.hutool.core.thread.ConcurrencyTester; +import org.dromara.hutool.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SingletonTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SingletonTest.java similarity index 89% rename from hutool-core/src/test/java/cn/hutool/core/lang/SingletonTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/SingletonTest.java index 86b4f15be..4a1fd8774 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/SingletonTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SingletonTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.thread.ThreadUtil; import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java old mode 100755 new mode 100644 similarity index 88% rename from hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java index 42667b8d7..fb241559f --- a/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java @@ -1,11 +1,11 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.collection.ConcurrentHashSet; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.id.IdUtil; -import cn.hutool.core.lang.id.Snowflake; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.collection.ConcurrentHashSet; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.lang.id.Snowflake; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/StrFormatterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/StrFormatterTest.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/lang/StrFormatterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/StrFormatterTest.java index 978600bb4..f110fa573 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/StrFormatterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/StrFormatterTest.java @@ -1,10 +1,9 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; +import org.dromara.hutool.core.text.StrFormatter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import cn.hutool.core.text.StrFormatter; - public class StrFormatterTest { @Test diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/TupleTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/TupleTest.java similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/lang/TupleTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/TupleTest.java index 284f446d4..218f0db60 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/TupleTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/TupleTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/UUIDTest.java old mode 100755 new mode 100644 similarity index 67% rename from hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/UUIDTest.java index 7a0ba3f89..cedb8191f --- a/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/UUIDTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.collection.ConcurrentHashSet; -import cn.hutool.core.lang.id.UUID; -import cn.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.collection.ConcurrentHashSet; +import org.dromara.hutool.core.lang.id.UUID; +import org.dromara.hutool.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java index 16a7efd71..870449734 --- a/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java @@ -1,11 +1,11 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.exceptions.ValidateException; -import cn.hutool.core.lang.id.IdUtil; -import cn.hutool.core.regex.PatternPool; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.exceptions.ValidateException; +import org.dromara.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.regex.PatternPool; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/WeightRandomTest.java similarity index 81% rename from hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/WeightRandomTest.java index 3b31d89c1..9ce168f1f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/WeightRandomTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.lang; +package org.dromara.hutool.core.lang; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ansi/AnsiEncoderTest.java old mode 100755 new mode 100644 similarity index 87% rename from hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/ansi/AnsiEncoderTest.java index 7eef56bb3..789ca7562 --- a/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ansi/AnsiEncoderTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.ansi; +package org.dromara.hutool.core.lang.ansi; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/builder/GenericBuilderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/builder/GenericBuilderTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/lang/builder/GenericBuilderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/builder/GenericBuilderTest.java index 303e460b6..74a77d0c4 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/builder/GenericBuilderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/builder/GenericBuilderTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.lang.builder; +package org.dromara.hutool.core.lang.builder; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/caller/CallerTest.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/caller/CallerTest.java index d2fd3ecc7..d768f4eda --- a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/caller/CallerTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.caller; +package org.dromara.hutool.core.lang.caller; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/caller/CallerUtilTest.java old mode 100755 new mode 100644 similarity index 69% rename from hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/caller/CallerUtilTest.java index 54a6d33ca..bf56ad75e --- a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/caller/CallerUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.caller; +package org.dromara.hutool.core.lang.caller; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -11,6 +11,6 @@ public class CallerUtilTest { Assertions.assertEquals("getCallerMethodNameTest", callerMethodName); final String fullCallerMethodName = CallerUtil.getCallerMethodName(true); - Assertions.assertEquals("cn.hutool.core.lang.caller.CallerUtilTest.getCallerMethodNameTest", fullCallerMethodName); + Assertions.assertEquals("caller.lang.org.dromara.hutool.core.CallerUtilTest.getCallerMethodNameTest", fullCallerMethodName); } } diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/func/FunctionPoolTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/func/FunctionPoolTest.java similarity index 75% rename from hutool-core/src/test/java/cn/hutool/core/lang/func/FunctionPoolTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/func/FunctionPoolTest.java index 1138dae7b..78b71eeef 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/func/FunctionPoolTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/func/FunctionPoolTest.java @@ -1,9 +1,9 @@ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.date.StopWatch; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.date.StopWatch; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaFactoryTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/func/LambdaFactoryTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaFactoryTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/func/LambdaFactoryTest.java index fe13492f4..85534f003 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaFactoryTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/func/LambdaFactoryTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.reflect.ConstructorUtil; -import cn.hutool.core.reflect.MethodHandleUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.reflect.ConstructorUtil; +import org.dromara.hutool.core.reflect.MethodHandleUtil; import lombok.Data; import lombok.Getter; import lombok.Setter; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/func/LambdaUtilTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/func/LambdaUtilTest.java index e6445d9e0..8e7dca83a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/func/LambdaUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.lang.Tuple; -import cn.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.lang.Tuple; +import org.dromara.hutool.core.reflect.MethodUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/func/PredicateUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/func/PredicateUtilTest.java similarity index 84% rename from hutool-core/src/test/java/cn/hutool/core/lang/func/PredicateUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/func/PredicateUtilTest.java index eb65dea9f..d27c70999 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/func/PredicateUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/func/PredicateUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.lang.func; +package org.dromara.hutool.core.lang.func; -import cn.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -10,15 +10,13 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import static cn.hutool.core.lang.func.PredicateUtil.*; - public class PredicateUtilTest { @Test public void notContainsTest() { final Set sets = SetUtil.of("1", "2", "3"); final List collect = Stream.of("3", "4", "5") - .filter(negate(sets::contains)) + .filter(PredicateUtil.negate(sets::contains)) .collect(Collectors.toList()); Assertions.assertEquals(2, collect.size()); @@ -30,7 +28,7 @@ public class PredicateUtilTest { public void andTest() { boolean condition = Stream.of(1, 3, 5) .allMatch( - and( + PredicateUtil.and( Objects::nonNull, i -> i < 10, i -> i % 2 == 1 @@ -43,7 +41,7 @@ public class PredicateUtilTest { public void orTest() { boolean condition = Stream.of(1, 3, 5) .anyMatch( - or( + PredicateUtil.or( Objects::isNull, i -> i > 10, i -> i % 2 == 0 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/intern/InternUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/intern/InternUtilTest.java similarity index 84% rename from hutool-core/src/test/java/cn/hutool/core/lang/intern/InternUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/intern/InternUtilTest.java index f5fb9193d..a42d52c55 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/intern/InternUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/intern/InternUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.lang.intern; +package org.dromara.hutool.core.lang.intern; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/loader/LazyFunLoaderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/loader/LazyFunLoaderTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/lang/loader/LazyFunLoaderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/loader/LazyFunLoaderTest.java index 2722c7a51..5c33cd616 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/loader/LazyFunLoaderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/loader/LazyFunLoaderTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.loader; +package org.dromara.hutool.core.lang.loader; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/page/NavigatePageInfoTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/page/NavigatePageInfoTest.java similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/lang/page/NavigatePageInfoTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/page/NavigatePageInfoTest.java index 0fe10b18e..f89083c3c 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/page/NavigatePageInfoTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/page/NavigatePageInfoTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.page; +package org.dromara.hutool.core.lang.page; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/page/PageInfoTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/page/PageInfoTest.java similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/lang/page/PageInfoTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/page/PageInfoTest.java index 8fddaa2fd..999d88aa5 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/page/PageInfoTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/page/PageInfoTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.page; +package org.dromara.hutool.core.lang.page; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/range/BoundTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/lang/range/BoundTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundTest.java index f33ecf44a..f734057cd 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/range/BoundTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/range/BoundTypeTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundTypeTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/lang/range/BoundTypeTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundTypeTest.java index 484a5144a..5d57897da 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/range/BoundTypeTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundTypeTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/range/BoundedRangeTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundedRangeTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/lang/range/BoundedRangeTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundedRangeTest.java index 1e9834386..ea7caad56 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/range/BoundedRangeTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundedRangeTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/range/RangeTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/RangeTest.java similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/lang/range/RangeTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/range/RangeTest.java index 4b7276215..7c4c12068 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/range/RangeTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/RangeTest.java @@ -1,10 +1,10 @@ -package cn.hutool.core.lang.range; +package org.dromara.hutool.core.lang.range; -import cn.hutool.core.date.DateField; -import cn.hutool.core.date.DateRange; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.date.DateField; +import org.dromara.hutool.core.date.DateRange; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/test/bean/ExamInfoDict.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/ExamInfoDict.java similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/lang/test/bean/ExamInfoDict.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/ExamInfoDict.java index f198b0c5c..d0d380787 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/test/bean/ExamInfoDict.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/ExamInfoDict.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.test.bean; +package org.dromara.hutool.core.lang.test.bean; import lombok.Data; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/test/bean/UserInfoDict.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/UserInfoDict.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/lang/test/bean/UserInfoDict.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/UserInfoDict.java index 238a3b52c..ae65c24ed 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/test/bean/UserInfoDict.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/UserInfoDict.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.test.bean; +package org.dromara.hutool.core.lang.test.bean; import java.io.Serializable; import java.util.List; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/test/bean/UserInfoRedundCount.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/UserInfoRedundCount.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/lang/test/bean/UserInfoRedundCount.java rename to hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/UserInfoRedundCount.java index d53eaf9d7..04b0bf9c1 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/test/bean/UserInfoRedundCount.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/UserInfoRedundCount.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang.test.bean; +package org.dromara.hutool.core.lang.test.bean; import java.io.Serializable; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/BiMapTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/BiMapTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/map/BiMapTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/BiMapTest.java index 971be19db..65f19ed65 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/BiMapTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/BiMapTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/CamelCaseMapTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/CamelCaseMapTest.java similarity index 93% rename from hutool-core/src/test/java/cn/hutool/core/map/CamelCaseMapTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/CamelCaseMapTest.java index 78ad32070..1dfb662e8 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/CamelCaseMapTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/CamelCaseMapTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.io.SerializeUtil; +import org.dromara.hutool.core.io.SerializeUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/CaseInsensitiveMapTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/CaseInsensitiveMapTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/map/CaseInsensitiveMapTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/CaseInsensitiveMapTest.java index 2256c84f4..6cfad7377 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/CaseInsensitiveMapTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/CaseInsensitiveMapTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/CollectionValueMapTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/CollectionValueMapTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/map/CollectionValueMapTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/CollectionValueMapTest.java index 906f83c7c..a279f7608 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/CollectionValueMapTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/CollectionValueMapTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.map.multi.CollectionValueMap; -import cn.hutool.core.map.multi.MultiValueMap; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.map.multi.CollectionValueMap; +import org.dromara.hutool.core.map.multi.MultiValueMap; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/GraphTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/GraphTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/map/GraphTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/GraphTest.java index 12a43c077..27ba8f89c 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/GraphTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/GraphTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.map.multi.Graph; +import org.dromara.hutool.core.map.multi.Graph; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/Issue2349Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/Issue2349Test.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/map/Issue2349Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/Issue2349Test.java index dcdc2ade0..8c348be07 --- a/hutool-core/src/test/java/cn/hutool/core/map/Issue2349Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/Issue2349Test.java @@ -1,4 +1,4 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/ListValueMapTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/ListValueMapTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/map/ListValueMapTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/ListValueMapTest.java index 656fe354f..3f0225131 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/ListValueMapTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/ListValueMapTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.map.multi.ListValueMap; -import cn.hutool.core.map.multi.MultiValueMap; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.map.multi.ListValueMap; +import org.dromara.hutool.core.map.multi.MultiValueMap; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/MapBuilderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/MapBuilderTest.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/map/MapBuilderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/MapBuilderTest.java index 8b725c2be..bd51bf8de 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/MapBuilderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/MapBuilderTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/MapJoinerTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/MapJoinerTest.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/map/MapJoinerTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/MapJoinerTest.java index 66213a553..8913ee435 --- a/hutool-core/src/test/java/cn/hutool/core/map/MapJoinerTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/MapJoinerTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/MapUtilTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/MapUtilTest.java index 20bf08c8c..01062b977 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/MapUtilTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.text.StrUtil; import lombok.Builder; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/RowKeyTableTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/RowKeyTableTest.java similarity index 87% rename from hutool-core/src/test/java/cn/hutool/core/map/RowKeyTableTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/RowKeyTableTest.java index 1a6044b74..8b039f791 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/RowKeyTableTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/RowKeyTableTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.map.multi.RowKeyTable; -import cn.hutool.core.map.multi.Table; +import org.dromara.hutool.core.map.multi.RowKeyTable; +import org.dromara.hutool.core.map.multi.Table; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/SerFunctionMapTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/SerFunctionMapTest.java similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/map/SerFunctionMapTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/SerFunctionMapTest.java index 621587083..4a7f71c20 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/SerFunctionMapTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/SerFunctionMapTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/SetValueMapTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/SetValueMapTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/map/SetValueMapTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/SetValueMapTest.java index be63d6d27..cc9f3a12a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/SetValueMapTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/SetValueMapTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.map.multi.MultiValueMap; -import cn.hutool.core.map.multi.SetValueMap; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.map.multi.MultiValueMap; +import org.dromara.hutool.core.map.multi.SetValueMap; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/TableMapTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/TableMapTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/map/TableMapTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/TableMapTest.java index 254c9621d..d38411585 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/TableMapTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/TableMapTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/TolerantMapTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/TolerantMapTest.java similarity index 86% rename from hutool-core/src/test/java/cn/hutool/core/map/TolerantMapTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/TolerantMapTest.java index a07f299e3..923a16c4f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/TolerantMapTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/TolerantMapTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.io.SerializeUtil; -import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.io.SerializeUtil; +import org.dromara.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/map/WeakConcurrentMapTest.java old mode 100755 new mode 100644 similarity index 86% rename from hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/map/WeakConcurrentMapTest.java index 7b79a90a0..4eb289fb1 --- a/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/map/WeakConcurrentMapTest.java @@ -1,9 +1,9 @@ -package cn.hutool.core.map; +package org.dromara.hutool.core.map; -import cn.hutool.core.thread.ConcurrencyTester; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.thread.ConcurrencyTester; +import org.dromara.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.util.ObjUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/math/ArrangementTest.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/math/ArrangementTest.java index 07c158ed4..34c3b6c19 --- a/hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/math/ArrangementTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.lang.Console; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/math/CalculatorTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/math/CalculatorTest.java index ab451171c..f32657774 100644 --- a/hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/math/CalculatorTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/math/CombinationTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/math/CombinationTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/math/CombinationTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/math/CombinationTest.java index 0eb34da72..f9517c43a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/math/CombinationTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/math/CombinationTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/math/MathUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/math/MathUtilTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/math/MathUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/math/MathUtilTest.java index b28cabb64..71430f76e 100644 --- a/hutool-core/src/test/java/cn/hutool/core/math/MathUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/math/MathUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/math/MoneyTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/math/MoneyTest.java similarity index 93% rename from hutool-core/src/test/java/cn/hutool/core/math/MoneyTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/math/MoneyTest.java index f9c01ad58..1e8ece34d 100644 --- a/hutool-core/src/test/java/cn/hutool/core/math/MoneyTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/math/MoneyTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.math; +package org.dromara.hutool.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/net/FormUrlencodedTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/net/FormUrlencodedTest.java similarity index 72% rename from hutool-core/src/test/java/cn/hutool/core/net/FormUrlencodedTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/net/FormUrlencodedTest.java index 6d26269a0..7158b5dba 100644 --- a/hutool-core/src/test/java/cn/hutool/core/net/FormUrlencodedTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/net/FormUrlencodedTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; -import cn.hutool.core.net.url.FormUrlencoded; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.net.url.FormUrlencoded; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/net/Ipv4UtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/net/Ipv4UtilTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/net/Ipv4UtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/net/Ipv4UtilTest.java index f7c02606b..2d6244f89 100644 --- a/hutool-core/src/test/java/cn/hutool/core/net/Ipv4UtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/net/Ipv4UtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/net/NetUtilTest.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/net/NetUtilTest.java index 52c41abca..16c59679a --- a/hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/net/NetUtilTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; -import cn.hutool.core.lang.Console; -import cn.hutool.core.regex.PatternPool; -import cn.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.regex.PatternPool; +import org.dromara.hutool.core.regex.ReUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/net/RFC3986Test.java similarity index 87% rename from hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/net/RFC3986Test.java index 89f510ec6..a64eca920 100644 --- a/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/net/RFC3986Test.java @@ -1,7 +1,7 @@ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; -import cn.hutool.core.net.url.RFC3986; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.net.url.RFC3986; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/net/URLEncoderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/net/URLEncoderTest.java similarity index 87% rename from hutool-core/src/test/java/cn/hutool/core/net/URLEncoderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/net/URLEncoderTest.java index 29ce7c5ce..acd2b8ac4 100644 --- a/hutool-core/src/test/java/cn/hutool/core/net/URLEncoderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/net/URLEncoderTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; -import cn.hutool.core.net.url.URLDecoder; -import cn.hutool.core.net.url.URLEncoder; +import org.dromara.hutool.core.net.url.URLDecoder; +import org.dromara.hutool.core.net.url.URLEncoder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/net/URLUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/net/URLUtilTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/net/URLUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/net/URLUtilTest.java index 14bb0b726..b00f14035 100644 --- a/hutool-core/src/test/java/cn/hutool/core/net/URLUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/net/URLUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; -import cn.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.net.url.URLUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/net/UrlBuilderTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/net/UrlBuilderTest.java index 29baab4d2..b1192b53f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/net/UrlBuilderTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.net.url.UrlBuilder; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.net.url.UrlBuilder; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/net/UrlDecoderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/net/UrlDecoderTest.java similarity index 63% rename from hutool-core/src/test/java/cn/hutool/core/net/UrlDecoderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/net/UrlDecoderTest.java index f2122d1fe..efd18e1fd 100644 --- a/hutool-core/src/test/java/cn/hutool/core/net/UrlDecoderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/net/UrlDecoderTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; -import cn.hutool.core.net.url.URLDecoder; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.net.url.URLDecoder; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/net/UrlQueryTest.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/net/UrlQueryTest.java index 175f4dfbf..e29661194 100644 --- a/hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/net/UrlQueryTest.java @@ -1,10 +1,10 @@ -package cn.hutool.core.net; +package org.dromara.hutool.core.net; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.net.url.URLUtil; -import cn.hutool.core.net.url.UrlBuilder; -import cn.hutool.core.net.url.UrlQuery; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.net.url.URLUtil; +import org.dromara.hutool.core.net.url.UrlBuilder; +import org.dromara.hutool.core.net.url.UrlQuery; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/net/url/UrlQueryUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/net/url/UrlQueryUtilTest.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/net/url/UrlQueryUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/net/url/UrlQueryUtilTest.java index ad8526663..7a27ac9f1 --- a/hutool-core/src/test/java/cn/hutool/core/net/url/UrlQueryUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/net/url/UrlQueryUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.net.url; +package org.dromara.hutool.core.net.url; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/reflect/ActualTypeMapperPoolTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ActualTypeMapperPoolTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/reflect/ActualTypeMapperPoolTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/reflect/ActualTypeMapperPoolTest.java index c34cd9bc0..78b85706c 100644 --- a/hutool-core/src/test/java/cn/hutool/core/reflect/ActualTypeMapperPoolTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ActualTypeMapperPoolTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/reflect/ClassScannerTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ClassScannerTest.java similarity index 86% rename from hutool-core/src/test/java/cn/hutool/core/reflect/ClassScannerTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/reflect/ClassScannerTest.java index 87a27ae27..440b1e83d 100644 --- a/hutool-core/src/test/java/cn/hutool/core/reflect/ClassScannerTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ClassScannerTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.lang.Console; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -11,7 +11,7 @@ public class ClassScannerTest { @Test @Disabled public void scanTest() { - final ClassScanner scaner = new ClassScanner("cn.hutool.core.util", null); + final ClassScanner scaner = new ClassScanner("org.dromara.hutool.core.util", null); final Set> set = scaner.scan(); for (final Class clazz : set) { Console.log(clazz.getName()); diff --git a/hutool-core/src/test/java/cn/hutool/core/reflect/ConstructorUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ConstructorUtilTest.java similarity index 93% rename from hutool-core/src/test/java/cn/hutool/core/reflect/ConstructorUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/reflect/ConstructorUtilTest.java index 499a4689d..c6016c1c2 100644 --- a/hutool-core/src/test/java/cn/hutool/core/reflect/ConstructorUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ConstructorUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.date.Week; +import org.dromara.hutool.core.date.Week; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/reflect/FieldUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/FieldUtilTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/reflect/FieldUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/reflect/FieldUtilTest.java index bb7cb3da1..b6bee273f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/reflect/FieldUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/FieldUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/reflect/MethodHandleUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/MethodHandleUtilTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/reflect/MethodHandleUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/reflect/MethodHandleUtilTest.java index 4b95accf9..d9b9ff019 100644 --- a/hutool-core/src/test/java/cn/hutool/core/reflect/MethodHandleUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/MethodHandleUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.classloader.ClassLoaderUtil; +import org.dromara.hutool.core.classloader.ClassLoaderUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/reflect/MethodUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/MethodUtilTest.java similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/reflect/MethodUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/reflect/MethodUtilTest.java index cc94beb1c..dc063b9ba 100644 --- a/hutool-core/src/test/java/cn/hutool/core/reflect/MethodUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/MethodUtilTest.java @@ -1,11 +1,11 @@ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.date.StopWatch; -import cn.hutool.core.lang.Console; -import cn.hutool.core.lang.test.bean.ExamInfoDict; -import cn.hutool.core.text.StrUtil; -import cn.hutool.core.util.SystemUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.date.StopWatch; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.lang.test.bean.ExamInfoDict; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.util.SystemUtil; import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; @@ -149,11 +149,11 @@ public class MethodUtilTest { Assertions.assertEquals(3, methods.length); // getA属于本类 - Assertions.assertEquals("public void cn.hutool.core.reflect.ReflectUtilTest$C2.getA()", methods[0].toString()); + Assertions.assertEquals("public void reflect.org.dromara.hutool.core.ReflectUtilTest$C2.getA()", methods[0].toString()); // getB属于父类 - Assertions.assertEquals("public void cn.hutool.core.reflect.ReflectUtilTest$C1.getB()", methods[1].toString()); + Assertions.assertEquals("public void reflect.org.dromara.hutool.core.ReflectUtilTest$C1.getB()", methods[1].toString()); // getC属于接口中的默认方法 - Assertions.assertEquals("public default void cn.hutool.core.reflect.ReflectUtilTest$TestInterface1.getC()", methods[2].toString()); + Assertions.assertEquals("public default void reflect.org.dromara.hutool.core.ReflectUtilTest$TestInterface1.getC()", methods[2].toString()); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/core/reflect/ReflectUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ReflectUtilTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/reflect/ReflectUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/reflect/ReflectUtilTest.java index 51fb89dad..6872afc0a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/reflect/ReflectUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ReflectUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.reflect; +package org.dromara.hutool.core.reflect; import lombok.Data; import lombok.SneakyThrows; diff --git a/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java index efb24d019..60aa7b1fb 100644 --- a/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.ListUtil; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/hutool-core/src/test/java/cn/hutool/core/stream/CollectorUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/stream/CollectorUtilTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/stream/CollectorUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/stream/CollectorUtilTest.java index d6baee33f..38e0c9159 100644 --- a/hutool-core/src/test/java/cn/hutool/core/stream/CollectorUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/stream/CollectorUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; -import cn.hutool.core.map.MapUtil; +import org.dromara.hutool.core.map.MapUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/stream/EasyStreamTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/stream/EasyStreamTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/stream/EasyStreamTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/stream/EasyStreamTest.java index 21cf35467..0f697fd6b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/stream/EasyStreamTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/stream/EasyStreamTest.java @@ -1,9 +1,9 @@ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.lang.Opt; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.lang.Opt; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.math.NumberUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/stream/EntryStreamTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/stream/EntryStreamTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/stream/EntryStreamTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/stream/EntryStreamTest.java index 227a9c455..ad8253983 100644 --- a/hutool-core/src/test/java/cn/hutool/core/stream/EntryStreamTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/stream/EntryStreamTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; -import cn.hutool.core.map.multi.Table; +import org.dromara.hutool.core.map.multi.Table; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/stream/StreamUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/stream/StreamUtilTest.java similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/stream/StreamUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/stream/StreamUtilTest.java index ffac6cf8d..c3cb57b58 100644 --- a/hutool-core/src/test/java/cn/hutool/core/stream/StreamUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/stream/StreamUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.stream; +package org.dromara.hutool.core.stream; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/AntPathMatcherTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/AntPathMatcherTest.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/text/AntPathMatcherTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/AntPathMatcherTest.java index 14623848b..68b50c721 --- a/hutool-core/src/test/java/cn/hutool/core/text/AntPathMatcherTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/AntPathMatcherTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/CharSequenceUtilTest.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/CharSequenceUtilTest.java index ffbe6dc96..eaef633df --- a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/CharSequenceUtilTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.CharsetUtil; +import org.dromara.hutool.core.date.DatePattern; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/NamingCaseTest.java old mode 100755 new mode 100644 similarity index 93% rename from hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/NamingCaseTest.java index f317ab629..215c9b33f --- a/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/NamingCaseTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.map.Dict; -import cn.hutool.core.util.CharUtil; +import org.dromara.hutool.core.map.Dict; +import org.dromara.hutool.core.util.CharUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/PasswdStrengthTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/PasswdStrengthTest.java old mode 100755 new mode 100644 similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/text/PasswdStrengthTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/PasswdStrengthTest.java index 618672a53..f66987a71 --- a/hutool-core/src/test/java/cn/hutool/core/text/PasswdStrengthTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/PasswdStrengthTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/PlaceholderParserTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/PlaceholderParserTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/text/PlaceholderParserTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/PlaceholderParserTest.java index cd054cc92..6a592b9ae 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/PlaceholderParserTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/PlaceholderParserTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/SplitUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/SplitUtilTest.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/text/SplitUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/SplitUtilTest.java index 5293a1bf1..cee3a6c24 --- a/hutool-core/src/test/java/cn/hutool/core/text/SplitUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/SplitUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.text.split.SplitUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrCheckerTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrCheckerTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/text/StrCheckerTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/StrCheckerTest.java index d43ef603c..31d0079c6 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/StrCheckerTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrCheckerTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrJoinerTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrJoinerTest.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/text/StrJoinerTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/StrJoinerTest.java index 619dd3484..246166737 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/StrJoinerTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrJoinerTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrMatcherTest.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/StrMatcherTest.java index 277cad814..ccf2aee62 --- a/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrMatcherTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrRegionMatcherTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrRegionMatcherTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/text/StrRegionMatcherTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/StrRegionMatcherTest.java index 250e03eaf..6895a2d15 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/StrRegionMatcherTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrRegionMatcherTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrRepeaterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrRepeaterTest.java similarity index 93% rename from hutool-core/src/test/java/cn/hutool/core/text/StrRepeaterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/StrRepeaterTest.java index 9fd7d471a..95334687b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/StrRepeaterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrRepeaterTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/text/StrUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java index f795f283d..6df156e88 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/StrUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java @@ -1,9 +1,9 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; -import cn.hutool.core.map.Dict; -import cn.hutool.core.text.split.SplitUtil; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.map.Dict; +import org.dromara.hutool.core.text.split.SplitUtil; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/TextSimilarityTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/TextSimilarityTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/text/TextSimilarityTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/TextSimilarityTest.java index 16c9a6c9a..7d8b26a96 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/TextSimilarityTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/TextSimilarityTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/UnicodeUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/UnicodeUtilTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/text/UnicodeUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/UnicodeUtilTest.java index b8832f9f0..5bb65eb0b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/UnicodeUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/UnicodeUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.text; +package org.dromara.hutool.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/bloom/BitMapBloomFilterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/bloom/BitMapBloomFilterTest.java similarity index 84% rename from hutool-core/src/test/java/cn/hutool/core/text/bloom/BitMapBloomFilterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/bloom/BitMapBloomFilterTest.java index 6609e02d9..ba6b17256 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/bloom/BitMapBloomFilterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/bloom/BitMapBloomFilterTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.text.bloom; +package org.dromara.hutool.core.text.bloom; -import cn.hutool.core.codec.hash.HashUtil; +import org.dromara.hutool.core.codec.hash.HashUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/dfa/DfaTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/DfaTest.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/text/dfa/DfaTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/DfaTest.java index 8662567dd..34b51d277 --- a/hutool-core/src/test/java/cn/hutool/core/text/dfa/DfaTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/DfaTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.text.dfa; +package org.dromara.hutool.core.text.dfa; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/dfa/IssueI5Q4HDTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/IssueI5Q4HDTest.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/text/dfa/IssueI5Q4HDTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/IssueI5Q4HDTest.java index 1cef5a1ca..dd5586037 --- a/hutool-core/src/test/java/cn/hutool/core/text/dfa/IssueI5Q4HDTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/IssueI5Q4HDTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.text.dfa; +package org.dromara.hutool.core.text.dfa; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/dfa/NFATest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/NFATest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/text/dfa/NFATest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/NFATest.java index d67f2a22f..36cdf4726 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/dfa/NFATest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/NFATest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.text.dfa; +package org.dromara.hutool.core.text.dfa; -import cn.hutool.core.date.StopWatch; +import org.dromara.hutool.core.date.StopWatch; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/dfa/SensitiveUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/SensitiveUtilTest.java old mode 100755 new mode 100644 similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/text/dfa/SensitiveUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/SensitiveUtilTest.java index d9acbde81..1bf4ba1cd --- a/hutool-core/src/test/java/cn/hutool/core/text/dfa/SensitiveUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/SensitiveUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.text.dfa; +package org.dromara.hutool.core.text.dfa; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.ListUtil; import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/escape/EscapeUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/escape/EscapeUtilTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/text/escape/EscapeUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/escape/EscapeUtilTest.java index 20019574e..d09256435 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/escape/EscapeUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/escape/EscapeUtilTest.java @@ -1,6 +1,5 @@ -package cn.hutool.core.text.escape; +package org.dromara.hutool.core.text.escape; -import cn.hutool.core.text.escape.EscapeUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/finder/CharFinderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/finder/CharFinderTest.java similarity index 94% rename from hutool-core/src/test/java/cn/hutool/core/text/finder/CharFinderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/finder/CharFinderTest.java index a708ce2ad..51faa1f9d 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/finder/CharFinderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/finder/CharFinderTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.text.finder; +package org.dromara.hutool.core.text.finder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/replacer/SearchReplacerTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/replacer/SearchReplacerTest.java similarity index 88% rename from hutool-core/src/test/java/cn/hutool/core/text/replacer/SearchReplacerTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/replacer/SearchReplacerTest.java index 93666db67..eb500609c 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/replacer/SearchReplacerTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/replacer/SearchReplacerTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.text.replacer; +package org.dromara.hutool.core.text.replacer; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.CharSequenceUtil; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/split/SplitIterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/split/SplitIterTest.java similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/text/split/SplitIterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/split/SplitIterTest.java index 08b2595d2..3593dadf1 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/split/SplitIterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/split/SplitIterTest.java @@ -1,9 +1,9 @@ -package cn.hutool.core.text.split; +package org.dromara.hutool.core.text.split; -import cn.hutool.core.text.finder.CharFinder; -import cn.hutool.core.text.finder.LengthFinder; -import cn.hutool.core.text.finder.PatternFinder; -import cn.hutool.core.text.finder.StrFinder; +import org.dromara.hutool.core.text.finder.CharFinder; +import org.dromara.hutool.core.text.finder.LengthFinder; +import org.dromara.hutool.core.text.finder.PatternFinder; +import org.dromara.hutool.core.text.finder.StrFinder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/text/split/StrSplitterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/split/StrSplitterTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/text/split/StrSplitterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/text/split/StrSplitterTest.java index fbdd6ba3b..3c81b4ba5 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/split/StrSplitterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/split/StrSplitterTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.text.split; +package org.dromara.hutool.core.text.split; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/thread/AsyncUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/thread/AsyncUtilTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/thread/AsyncUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/thread/AsyncUtilTest.java index 3e6af8fa1..a6600fce0 100644 --- a/hutool-core/src/test/java/cn/hutool/core/thread/AsyncUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/thread/AsyncUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; diff --git a/hutool-core/src/test/java/cn/hutool/core/thread/ConcurrencyTesterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/thread/ConcurrencyTesterTest.java old mode 100755 new mode 100644 similarity index 84% rename from hutool-core/src/test/java/cn/hutool/core/thread/ConcurrencyTesterTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/thread/ConcurrencyTesterTest.java index 94e473ebb..c57c5f8ea --- a/hutool-core/src/test/java/cn/hutool/core/thread/ConcurrencyTesterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/thread/ConcurrencyTesterTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.Console; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/thread/SimpleSchedulerTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/thread/SimpleSchedulerTest.java similarity index 80% rename from hutool-core/src/test/java/cn/hutool/core/thread/SimpleSchedulerTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/thread/SimpleSchedulerTest.java index a382c5e9d..72e9bc31e 100644 --- a/hutool-core/src/test/java/cn/hutool/core/thread/SimpleSchedulerTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/thread/SimpleSchedulerTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.lang.Console; -import cn.hutool.core.util.RuntimeUtil; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.util.RuntimeUtil; /** * 简单定时任务测试 diff --git a/hutool-core/src/test/java/cn/hutool/core/thread/ThreadUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/thread/ThreadUtilTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/thread/ThreadUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/thread/ThreadUtilTest.java index 55674355c..c5d43ca3e 100644 --- a/hutool-core/src/test/java/cn/hutool/core/thread/ThreadUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/thread/ThreadUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.thread; +package org.dromara.hutool.core.thread; -import cn.hutool.core.date.TimeUtil; -import cn.hutool.core.util.RandomUtil; +import org.dromara.hutool.core.date.TimeUtil; +import org.dromara.hutool.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/tree/BeanTreeTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/tree/BeanTreeTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/tree/BeanTreeTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/tree/BeanTreeTest.java index 560419f88..a320724d2 100644 --- a/hutool-core/src/test/java/cn/hutool/core/tree/BeanTreeTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/tree/BeanTreeTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; -import cn.hutool.core.stream.EasyStream; +import org.dromara.hutool.core.stream.EasyStream; import lombok.Builder; import lombok.Data; import lombok.experimental.Tolerate; diff --git a/hutool-core/src/test/java/cn/hutool/core/tree/Issue2279Test.java b/hutool-core/src/test/java/org/dromara/hutool/core/tree/Issue2279Test.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/tree/Issue2279Test.java rename to hutool-core/src/test/java/org/dromara/hutool/core/tree/Issue2279Test.java index 4a834645f..4f4463a89 --- a/hutool-core/src/test/java/cn/hutool/core/tree/Issue2279Test.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/tree/Issue2279Test.java @@ -1,6 +1,6 @@ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.ListUtil; import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/tree/IssueI6NR2ZTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueI6NR2ZTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/tree/IssueI6NR2ZTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueI6NR2ZTest.java index bbf048577..e1110dc70 100644 --- a/hutool-core/src/test/java/cn/hutool/core/tree/IssueI6NR2ZTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueI6NR2ZTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/tree/TreeBuilderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeBuilderTest.java old mode 100755 new mode 100644 similarity index 90% rename from hutool-core/src/test/java/cn/hutool/core/tree/TreeBuilderTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeBuilderTest.java index 1bd350f97..c6fb1bb93 --- a/hutool-core/src/test/java/cn/hutool/core/tree/TreeBuilderTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeBuilderTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/tree/TreeSearchTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeSearchTest.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/tree/TreeSearchTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeSearchTest.java index 3e3fe069a..2fd2599f5 --- a/hutool-core/src/test/java/cn/hutool/core/tree/TreeSearchTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeSearchTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/tree/TreeTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeTest.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/tree/TreeTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeTest.java index 43077c00a..574cc5c18 --- a/hutool-core/src/test/java/cn/hutool/core/tree/TreeTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.tree; +package org.dromara.hutool.core.tree; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.lang.Console; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ArrayUtilTest.java old mode 100755 new mode 100644 similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/ArrayUtilTest.java index 212589ea2..aa6901c0b --- a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ArrayUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/BooleanUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/BooleanUtilTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/util/BooleanUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/BooleanUtilTest.java index d51a0325b..a1d8b6c11 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/BooleanUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/BooleanUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ByteUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ByteUtilTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/util/ByteUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/ByteUtilTest.java index 17dafd297..3a7f186f2 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/ByteUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ByteUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/CharUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/CharUtilTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/util/CharUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/CharUtilTest.java index 65aca8d60..234d8fe5a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/CharUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/CharUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ClassUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ClassUtilTest.java similarity index 84% rename from hutool-core/src/test/java/cn/hutool/core/util/ClassUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/ClassUtilTest.java index 65b6dcf86..ffcb67efd 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/ClassUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ClassUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.reflect.ClassUtil; +import org.dromara.hutool.core.reflect.ClassUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ public class ClassUtilTest { @Test public void getClassNameTest() { final String className = ClassUtil.getClassName(ClassUtil.class, false); - Assertions.assertEquals("cn.hutool.core.reflect.ClassUtil", className); + Assertions.assertEquals("reflect.org.dromara.hutool.core.ClassUtil", className); final String simpleClassName = ClassUtil.getClassName(ClassUtil.class, true); Assertions.assertEquals("ClassUtil", simpleClassName); @@ -31,7 +31,7 @@ public class ClassUtilTest { @Test public void getShortClassNameTest() { - final String className = "cn.hutool.core.text.StrUtil"; + final String className = "text.org.dromara.hutool.core.StrUtil"; final String result = ClassUtil.getShortClassName(className); Assertions.assertEquals("c.h.c.t.StrUtil", result); } diff --git a/hutool-core/src/test/java/cn/hutool/core/util/CloneTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java similarity index 93% rename from hutool-core/src/test/java/cn/hutool/core/util/CloneTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java index 6f96e344a..fc1ef5b97 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/CloneTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.exceptions.CloneRuntimeException; +import org.dromara.hutool.core.exceptions.CloneRuntimeException; import lombok.Data; import lombok.EqualsAndHashCode; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/CoordinateUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/CoordinateUtilTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/util/CoordinateUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/CoordinateUtilTest.java index c8816c151..7df504613 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/CoordinateUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/CoordinateUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/CreditCodeUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/CreditCodeUtilTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/util/CreditCodeUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/CreditCodeUtilTest.java index 978dda3a5..0a81875ce 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/CreditCodeUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/CreditCodeUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/DefaultCloneTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/util/DefaultCloneTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java index 677f555b3..3a240a53b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/DefaultCloneTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.exceptions.CloneRuntimeException; +import org.dromara.hutool.core.exceptions.CloneRuntimeException; import lombok.AllArgsConstructor; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/EnumUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/EnumUtilTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/util/EnumUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/EnumUtilTest.java index 3a96eaf2d..8572dd38b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/EnumUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/EnumUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/HashUtilTest.java old mode 100755 new mode 100644 similarity index 90% rename from hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/HashUtilTest.java index 88093755c..a56c1af0d --- a/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/HashUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.codec.hash.HashUtil; +import org.dromara.hutool.core.codec.hash.HashUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/HexUtilTest.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/HexUtilTest.java index f776bfc87..cb6cb16e7 --- a/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/HexUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.codec.HexUtil; +import org.dromara.hutool.core.codec.HexUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java old mode 100755 new mode 100644 similarity index 88% rename from hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java index 4521573c1..1315c1b25 --- a/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java @@ -1,13 +1,13 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.collection.ConcurrentHashSet; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.date.StopWatch; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.lang.Console; -import cn.hutool.core.lang.id.IdUtil; -import cn.hutool.core.lang.id.Snowflake; -import cn.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.core.collection.ConcurrentHashSet; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.date.StopWatch; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.lang.id.Snowflake; +import org.dromara.hutool.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/IdcardUtilTest.java similarity index 97% rename from hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/IdcardUtilTest.java index abc575700..595d082a1 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/IdcardUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; +import org.dromara.hutool.core.date.DateTime; +import org.dromara.hutool.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/JNDIUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/JNDIUtilTest.java old mode 100755 new mode 100644 similarity index 77% rename from hutool-core/src/test/java/cn/hutool/core/util/JNDIUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/JNDIUtilTest.java index 28c421898..112378838 --- a/hutool-core/src/test/java/cn/hutool/core/util/JNDIUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/JNDIUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.collection.iter.EnumerationIter; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.collection.iter.EnumerationIter; +import org.dromara.hutool.core.lang.Console; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/JdkUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/JdkUtilTest.java old mode 100755 new mode 100644 similarity index 81% rename from hutool-core/src/test/java/cn/hutool/core/util/JdkUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/JdkUtilTest.java index ae39e17aa..e5a30edc9 --- a/hutool-core/src/test/java/cn/hutool/core/util/JdkUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/JdkUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.lang.Console; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/MaskingUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/MaskingUtilTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/util/MaskingUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/MaskingUtilTest.java index 215d36372..968932f5c 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/MaskingUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/MaskingUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.text.MaskingUtil; +import org.dromara.hutool.core.text.MaskingUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ModifierUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ModifierUtilTest.java similarity index 89% rename from hutool-core/src/test/java/cn/hutool/core/util/ModifierUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/ModifierUtilTest.java index c46c6b853..d51dfd8ab 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/ModifierUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ModifierUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.reflect.FieldUtil; -import cn.hutool.core.reflect.ModifierUtil; +import org.dromara.hutool.core.reflect.FieldUtil; +import org.dromara.hutool.core.reflect.ModifierUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/NumberUtilTest.java similarity index 99% rename from hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/NumberUtilTest.java index 170c881e3..4e255dbda 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/NumberUtilTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.lang.Console; -import cn.hutool.core.math.NumberUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ObjUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ObjUtilTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/util/ObjUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/ObjUtilTest.java index 628fa91f8..4840b0fe7 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/ObjUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ObjUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.ListUtil; import lombok.EqualsAndHashCode; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/PhoneUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/PhoneUtilTest.java similarity index 98% rename from hutool-core/src/test/java/cn/hutool/core/util/PhoneUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/PhoneUtilTest.java index 312aa94b4..8bcdc5228 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/PhoneUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/PhoneUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java similarity index 90% rename from hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java index f096e70d7..81fe78435 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java @@ -1,9 +1,9 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.Console; -import cn.hutool.core.math.NumberUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.convert.Convert; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.math.NumberUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ReUtilTest.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/ReUtilTest.java index 4d010ffc4..c111275cf --- a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ReUtilTest.java @@ -1,10 +1,10 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.lang.Console; -import cn.hutool.core.regex.PatternPool; -import cn.hutool.core.regex.ReUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.regex.PatternPool; +import org.dromara.hutool.core.regex.ReUtil; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReferenceUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ReferenceUtilTest.java old mode 100755 new mode 100644 similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/util/ReferenceUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/ReferenceUtilTest.java index 05f2bfbef..9cdfc8a21 --- a/hutool-core/src/test/java/cn/hutool/core/util/ReferenceUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ReferenceUtilTest.java @@ -1,7 +1,7 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.lang.Console; -import cn.hutool.core.lang.mutable.MutableObj; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.lang.mutable.MutableObj; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/RuntimeUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/RuntimeUtilTest.java similarity index 92% rename from hutool-core/src/test/java/cn/hutool/core/util/RuntimeUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/RuntimeUtilTest.java index d07001265..b3b483636 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/RuntimeUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/RuntimeUtilTest.java @@ -1,6 +1,6 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.lang.Console; +import org.dromara.hutool.core.lang.Console; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/TypeUtilTest.java similarity index 91% rename from hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/TypeUtilTest.java index 262958e3a..657951a88 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/TypeUtilTest.java @@ -1,8 +1,8 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.reflect.FieldUtil; -import cn.hutool.core.reflect.MethodUtil; -import cn.hutool.core.reflect.TypeUtil; +import org.dromara.hutool.core.reflect.FieldUtil; +import org.dromara.hutool.core.reflect.MethodUtil; +import org.dromara.hutool.core.reflect.TypeUtil; import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/XmlUtilTest.java similarity index 96% rename from hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/XmlUtilTest.java index ea0bc97e9..ae25462f1 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/XmlUtilTest.java @@ -1,12 +1,12 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.collection.SetUtil; -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.lang.Console; -import cn.hutool.core.map.MapBuilder; -import cn.hutool.core.map.MapUtil; +import org.dromara.hutool.core.bean.BeanUtil; +import org.dromara.hutool.core.collection.ListUtil; +import org.dromara.hutool.core.collection.SetUtil; +import org.dromara.hutool.core.io.resource.ResourceUtil; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.map.MapBuilder; +import org.dromara.hutool.core.map.MapUtil; import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ZipUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/ZipUtilTest.java similarity index 95% rename from hutool-core/src/test/java/cn/hutool/core/util/ZipUtilTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/util/ZipUtilTest.java index a6ad34777..073c0a17b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/ZipUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/ZipUtilTest.java @@ -1,11 +1,11 @@ -package cn.hutool.core.util; +package org.dromara.hutool.core.util; -import cn.hutool.core.compress.ZipReader; -import cn.hutool.core.compress.ZipUtil; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.file.FileUtil; -import cn.hutool.core.lang.Console; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.compress.ZipReader; +import org.dromara.hutool.core.compress.ZipUtil; +import org.dromara.hutool.core.io.IORuntimeException; +import org.dromara.hutool.core.io.file.FileUtil; +import org.dromara.hutool.core.lang.Console; +import org.dromara.hutool.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index bcb9af9d4..a704a9372 100755 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -19,7 +19,7 @@ jar - cn.hutool + org.dromara.hutool hutool-parent 6.0.0.M3 @@ -29,17 +29,17 @@ Hutool 定时任务 - cn.hutool.cron + org.dromara.hutool.cron - cn.hutool + org.dromara.hutool hutool-core ${project.parent.version} - cn.hutool + org.dromara.hutool hutool-setting ${project.parent.version} diff --git a/hutool-cron/src/main/java/cn/hutool/cron/CronConfig.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronConfig.java similarity index 97% rename from hutool-cron/src/main/java/cn/hutool/cron/CronConfig.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/CronConfig.java index 24313695e..6eae11e00 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/CronConfig.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronConfig.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron; +package org.dromara.hutool.cron; import java.util.TimeZone; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/CronException.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronException.java similarity index 94% rename from hutool-cron/src/main/java/cn/hutool/cron/CronException.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/CronException.java index 2ab5ca570..718aece2b 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/CronException.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronException.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron; +package org.dromara.hutool.cron; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 定时任务异常 diff --git a/hutool-cron/src/main/java/cn/hutool/cron/CronTimer.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronTimer.java similarity index 94% rename from hutool-cron/src/main/java/cn/hutool/cron/CronTimer.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/CronTimer.java index d0c5f6b4c..cfbe9ca07 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/CronTimer.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronTimer.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron; +package org.dromara.hutool.cron; -import cn.hutool.core.date.DateUnit; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.log.Log; -import cn.hutool.log.LogFactory; +import org.dromara.hutool.core.date.DateUnit; +import org.dromara.hutool.core.thread.ThreadUtil; +import org.dromara.hutool.log.Log; +import org.dromara.hutool.log.LogFactory; import java.io.Serializable; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/CronUtil.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronUtil.java similarity index 94% rename from hutool-cron/src/main/java/cn/hutool/cron/CronUtil.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/CronUtil.java index 754d59e71..89f07a236 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/CronUtil.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronUtil.java @@ -11,14 +11,14 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron; +package org.dromara.hutool.cron; -import cn.hutool.core.exceptions.UtilException; -import cn.hutool.core.io.resource.NoResourceException; -import cn.hutool.cron.pattern.CronPattern; -import cn.hutool.cron.task.Task; -import cn.hutool.setting.Setting; -import cn.hutool.setting.SettingException; +import org.dromara.hutool.core.exceptions.UtilException; +import org.dromara.hutool.core.io.resource.NoResourceException; +import org.dromara.hutool.cron.pattern.CronPattern; +import org.dromara.hutool.cron.task.Task; +import org.dromara.hutool.setting.Setting; +import org.dromara.hutool.setting.SettingException; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java index 2959c9899..a18a42dd2 --- a/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java @@ -10,22 +10,22 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron; +package org.dromara.hutool.cron; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.thread.ExecutorBuilder; -import cn.hutool.core.thread.ThreadFactoryBuilder; -import cn.hutool.core.util.CharUtil; -import cn.hutool.core.lang.id.IdUtil; -import cn.hutool.core.text.StrUtil; -import cn.hutool.cron.listener.TaskListener; -import cn.hutool.cron.listener.TaskListenerManager; -import cn.hutool.cron.pattern.CronPattern; -import cn.hutool.cron.task.InvokeTask; -import cn.hutool.cron.task.RunnableTask; -import cn.hutool.cron.task.Task; -import cn.hutool.log.StaticLog; -import cn.hutool.setting.Setting; +import org.dromara.hutool.core.map.MapUtil; +import org.dromara.hutool.core.thread.ExecutorBuilder; +import org.dromara.hutool.core.thread.ThreadFactoryBuilder; +import org.dromara.hutool.core.util.CharUtil; +import org.dromara.hutool.core.lang.id.IdUtil; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.cron.listener.TaskListener; +import org.dromara.hutool.cron.listener.TaskListenerManager; +import org.dromara.hutool.cron.pattern.CronPattern; +import org.dromara.hutool.cron.task.InvokeTask; +import org.dromara.hutool.cron.task.RunnableTask; +import org.dromara.hutool.cron.task.Task; +import org.dromara.hutool.log.StaticLog; +import org.dromara.hutool.setting.Setting; import java.io.Serializable; import java.util.LinkedHashMap; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/TaskExecutor.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutor.java similarity index 93% rename from hutool-cron/src/main/java/cn/hutool/cron/TaskExecutor.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutor.java index cbf47aa74..faa6f3ce4 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/TaskExecutor.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutor.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron; +package org.dromara.hutool.cron; -import cn.hutool.cron.task.CronTask; -import cn.hutool.cron.task.Task; +import org.dromara.hutool.cron.task.CronTask; +import org.dromara.hutool.cron.task.Task; /** * 作业执行器
      diff --git a/hutool-cron/src/main/java/cn/hutool/cron/TaskExecutorManager.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutorManager.java similarity index 94% rename from hutool-cron/src/main/java/cn/hutool/cron/TaskExecutorManager.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutorManager.java index 6e119de2e..586a82a72 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/TaskExecutorManager.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutorManager.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron; +package org.dromara.hutool.cron; -import cn.hutool.cron.task.CronTask; -import cn.hutool.cron.task.Task; +import org.dromara.hutool.cron.task.CronTask; +import org.dromara.hutool.cron.task.Task; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/TaskLauncher.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskLauncher.java similarity index 97% rename from hutool-cron/src/main/java/cn/hutool/cron/TaskLauncher.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/TaskLauncher.java index a11a241e1..35dffe80c 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/TaskLauncher.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskLauncher.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron; +package org.dromara.hutool.cron; /** * 作业启动器
      diff --git a/hutool-cron/src/main/java/cn/hutool/cron/TaskLauncherManager.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskLauncherManager.java similarity index 98% rename from hutool-cron/src/main/java/cn/hutool/cron/TaskLauncherManager.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/TaskLauncherManager.java index 9a4b0f9c3..11bf10b86 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/TaskLauncherManager.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskLauncherManager.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron; +package org.dromara.hutool.cron; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/TaskTable.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskTable.java similarity index 96% rename from hutool-cron/src/main/java/cn/hutool/cron/TaskTable.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/TaskTable.java index d3fe841a6..eeb8dfc67 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/TaskTable.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskTable.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron; +package org.dromara.hutool.cron; -import cn.hutool.core.text.StrUtil; -import cn.hutool.cron.pattern.CronPattern; -import cn.hutool.cron.task.CronTask; -import cn.hutool.cron.task.Task; +import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.cron.pattern.CronPattern; +import org.dromara.hutool.cron.task.CronTask; +import org.dromara.hutool.cron.task.Task; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/listener/SimpleTaskListener.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/SimpleTaskListener.java similarity index 91% rename from hutool-cron/src/main/java/cn/hutool/cron/listener/SimpleTaskListener.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/listener/SimpleTaskListener.java index 76c3114c1..12194cfc1 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/listener/SimpleTaskListener.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/SimpleTaskListener.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.listener; +package org.dromara.hutool.cron.listener; -import cn.hutool.cron.TaskExecutor; +import org.dromara.hutool.cron.TaskExecutor; /** * 简单监听实现，不做任何操作
      diff --git a/hutool-cron/src/main/java/cn/hutool/cron/listener/TaskListener.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/TaskListener.java similarity index 92% rename from hutool-cron/src/main/java/cn/hutool/cron/listener/TaskListener.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/listener/TaskListener.java index e2884dab9..0edec95a4 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/listener/TaskListener.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/TaskListener.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.listener; +package org.dromara.hutool.cron.listener; -import cn.hutool.cron.TaskExecutor; +import org.dromara.hutool.cron.TaskExecutor; /** * 定时任务监听接口
      diff --git a/hutool-cron/src/main/java/cn/hutool/cron/listener/TaskListenerManager.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/TaskListenerManager.java similarity index 95% rename from hutool-cron/src/main/java/cn/hutool/cron/listener/TaskListenerManager.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/listener/TaskListenerManager.java index dafac43be..210bcab23 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/listener/TaskListenerManager.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/TaskListenerManager.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.listener; +package org.dromara.hutool.cron.listener; -import cn.hutool.cron.TaskExecutor; -import cn.hutool.log.StaticLog; +import org.dromara.hutool.cron.TaskExecutor; +import org.dromara.hutool.log.StaticLog; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/listener/package-info.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/package-info.java similarity index 93% rename from hutool-cron/src/main/java/cn/hutool/cron/listener/package-info.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/listener/package-info.java index d2d268f78..1b489f345 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/listener/package-info.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package cn.hutool.cron.listener; +package org.dromara.hutool.cron.listener; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/package-info.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/package-info.java similarity index 60% rename from hutool-cron/src/main/java/cn/hutool/cron/package-info.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/package-info.java index cb7228800..df7cd0068 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/package-info.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/package-info.java @@ -14,13 +14,13 @@ * 定时任务模块，提供类Crontab表达式的定时任务，实现参考了Cron4j，同时可以支持秒级别的定时任务定义和年的定义（同时兼容Crontab、Cron4j、Quartz表达式）
      * 定时任务模块由三部分组成： *

        - *
      • {@link cn.hutool.cron.Scheduler} 定时任务调度器，用于整体管理任务的增删、启停和触发运行。
        • - *
      • {@link cn.hutool.cron.task.Task} 定时任务实现，用于定义具体的任务
        • - *
      • {@link cn.hutool.cron.pattern.CronPattern} 定时任务表达式，用于定义任务触发时间
        • + *
      • {@link org.dromara.hutool.cron.Scheduler} 定时任务调度器，用于整体管理任务的增删、启停和触发运行。
        • + *
      • {@link org.dromara.hutool.cron.task.Task} 定时任务实现，用于定义具体的任务
        • + *
      • {@link org.dromara.hutool.cron.pattern.CronPattern} 定时任务表达式，用于定义任务触发时间
        • *
      * - * 同时，提供了{@link cn.hutool.cron.CronUtil}工具类，维护一个全局的{@link cn.hutool.cron.Scheduler}。 + * 同时，提供了{@link org.dromara.hutool.cron.CronUtil}工具类，维护一个全局的{@link org.dromara.hutool.cron.Scheduler}。 * * @author looly */ -package cn.hutool.cron; +package org.dromara.hutool.cron; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPattern.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPattern.java index e24045d63..63d17f526 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPattern.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.pattern; +package org.dromara.hutool.cron.pattern; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.CalendarUtil; -import cn.hutool.cron.pattern.matcher.PatternMatcher; -import cn.hutool.cron.pattern.parser.PatternParser; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.date.CalendarUtil; +import org.dromara.hutool.cron.pattern.matcher.PatternMatcher; +import org.dromara.hutool.cron.pattern.parser.PatternParser; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternBuilder.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPatternBuilder.java similarity index 89% rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternBuilder.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPatternBuilder.java index 04f2fda11..3281e2ff0 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternBuilder.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPatternBuilder.java @@ -10,13 +10,13 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.pattern; +package org.dromara.hutool.cron.pattern; -import cn.hutool.core.lang.builder.Builder; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrJoiner; -import cn.hutool.core.array.ArrayUtil; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.lang.builder.Builder; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrJoiner; +import org.dromara.hutool.core.array.ArrayUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 定时任务表达式构建器 diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternUtil.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPatternUtil.java old mode 100755 new mode 100644 similarity index 94% rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternUtil.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPatternUtil.java index e72065b9c..57ff9c798 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternUtil.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPatternUtil.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.pattern; +package org.dromara.hutool.cron.pattern; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUnit; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.Assert; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.date.DateUnit; +import org.dromara.hutool.core.date.DateUtil; +import org.dromara.hutool.core.lang.Assert; import java.util.ArrayList; import java.util.Date; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/Part.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/Part.java similarity index 92% rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/Part.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/Part.java index 292c2cfc5..604b43de2 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/Part.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/Part.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.pattern; +package org.dromara.hutool.cron.pattern; -import cn.hutool.core.date.Month; -import cn.hutool.core.date.Week; -import cn.hutool.core.lang.Assert; -import cn.hutool.cron.CronException; +import org.dromara.hutool.core.date.Month; +import org.dromara.hutool.core.date.Week; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.cron.CronException; import java.util.Calendar; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/PatternUtil.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/PatternUtil.java old mode 100755 new mode 100644 similarity index 96% rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/PatternUtil.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/PatternUtil.java index 145e20832..5f4520fbf --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/PatternUtil.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/PatternUtil.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.pattern; +package org.dromara.hutool.cron.pattern; -import cn.hutool.core.date.Week; +import org.dromara.hutool.core.date.Week; import java.time.LocalDateTime; import java.util.Calendar; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java similarity index 91% rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java index 9a4327085..03d17c09d 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.pattern.matcher; +package org.dromara.hutool.cron.pattern.matcher; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.StrUtil; /** * 所有值匹配，始终返回{@code true} diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/BoolArrayMatcher.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/BoolArrayMatcher.java similarity index 91% rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/BoolArrayMatcher.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/BoolArrayMatcher.java index 4cb69589a..166f838ef 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/BoolArrayMatcher.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/BoolArrayMatcher.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.pattern.matcher; +package org.dromara.hutool.cron.pattern.matcher; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.text.StrUtil; +import org.dromara.hutool.core.collection.CollUtil; +import org.dromara.hutool.core.lang.Assert; +import org.dromara.hutool.core.text.StrUtil; import java.util.Collections; import java.util.List; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/DayOfMonthMatcher.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/DayOfMonthMatcher.java similarity index 95% rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/DayOfMonthMatcher.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/DayOfMonthMatcher.java index 30e6f56c6..c611d3e2e 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/DayOfMonthMatcher.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/DayOfMonthMatcher.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.pattern.matcher; +package org.dromara.hutool.cron.pattern.matcher; -import cn.hutool.core.date.Month; +import org.dromara.hutool.core.date.Month; import java.util.List; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PartMatcher.java old mode 100755 new mode 100644 similarity index 95% rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PartMatcher.java index f531cc8f2..5f6c1491f --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PartMatcher.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.pattern.matcher; +package org.dromara.hutool.cron.pattern.matcher; import java.util.function.Predicate; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PatternMatcher.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PatternMatcher.java index 86963ebb6..e8287f3e2 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PatternMatcher.java @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.pattern.matcher; +package org.dromara.hutool.cron.pattern.matcher; -import cn.hutool.cron.pattern.Part; +import org.dromara.hutool.cron.pattern.Part; import java.time.Year; import java.util.Calendar; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/YearValueMatcher.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/YearValueMatcher.java similarity index 96% rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/YearValueMatcher.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/YearValueMatcher.java index 35ee4e6e7..825efbcc5 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/YearValueMatcher.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/YearValueMatcher.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package cn.hutool.cron.pattern.matcher; +package org.dromara.hutool.cron.pattern.matcher; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/package-info.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/package-info.java similarity index 73% rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/package-info.java rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/package-info.java index ad5563f22..956b6d24c 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/package-info.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/package-info.java @@ -12,8 +12,8 @@ /** * 定时任务表达式匹配器，内部使用
      - * 单一表达式使用{@link cn.hutool.cron.pattern.matcher.PatternMatcher}表示
      - * {@link cn.hutool.cron.pattern.matcher.PatternMatcher}由7个{@link cn.hutool.cron.pattern.matcher.PartMatcher}组成， + * 单一表达式使用{@link org.dromara.hutool.cron.pattern.matcher.PatternMatcher}表示
      + * {@link org.dromara.hutool.cron.pattern.matcher.PatternMatcher}由7个{@link org.dromara.hutool.cron.pattern.matcher.PartMatcher}组成， * 分别表示定时任务表达式中的7个位置: * 
        *         0      1     2        3         4       5        6
@@ -23,4 +23,4 @@
  * @author looly
  *
  */
-package cn.hutool.cron.pattern.matcher;
+package org.dromara.hutool.cron.pattern.matcher;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/package-info.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/package-info.java
similarity index 93%
rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/package-info.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/package-info.java
index b233e6249..72ce565e2 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/package-info.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.cron.pattern;
+package org.dromara.hutool.cron.pattern;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PartParser.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PartParser.java
similarity index 93%
rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PartParser.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PartParser.java
index 4038da6b7..5cc8c827d 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PartParser.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PartParser.java
@@ -10,17 +10,18 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.cron.pattern.parser;
+package org.dromara.hutool.cron.pattern.parser;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.date.Month;
-import cn.hutool.core.date.Week;
-import cn.hutool.core.math.NumberUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.cron.CronException;
-import cn.hutool.cron.pattern.Part;
-import cn.hutool.cron.pattern.matcher.*;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.date.Month;
+import org.dromara.hutool.core.date.Week;
+import org.dromara.hutool.core.math.NumberUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.cron.CronException;
+import org.dromara.hutool.cron.pattern.Part;
+import org.dromara.hutool.cron.pattern.matcher.*;
+import org.dromara.hutool.cron.pattern.matcher.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PatternParser.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PatternParser.java
similarity index 89%
rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PatternParser.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PatternParser.java
index 8ca86d5ae..6601617fe 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/PatternParser.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PatternParser.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.cron.pattern.parser;
+package org.dromara.hutool.cron.pattern.parser;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.cron.CronException;
-import cn.hutool.cron.pattern.Part;
-import cn.hutool.cron.pattern.matcher.AlwaysTrueMatcher;
-import cn.hutool.cron.pattern.matcher.PartMatcher;
-import cn.hutool.cron.pattern.matcher.PatternMatcher;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.cron.CronException;
+import org.dromara.hutool.cron.pattern.Part;
+import org.dromara.hutool.cron.pattern.matcher.AlwaysTrueMatcher;
+import org.dromara.hutool.cron.pattern.matcher.PartMatcher;
+import org.dromara.hutool.cron.pattern.matcher.PatternMatcher;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/package-info.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/package-info.java
similarity index 92%
rename from hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/package-info.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/package-info.java
index 6133fccb4..079150512 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/parser/package-info.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.cron.pattern.parser;
+package org.dromara.hutool.cron.pattern.parser;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/task/CronTask.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/task/CronTask.java
similarity index 94%
rename from hutool-cron/src/main/java/cn/hutool/cron/task/CronTask.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/task/CronTask.java
index 07ae83768..e0d842616 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/task/CronTask.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/task/CronTask.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.cron.task;
+package org.dromara.hutool.cron.task;
 
-import cn.hutool.cron.pattern.CronPattern;
+import org.dromara.hutool.cron.pattern.CronPattern;
 
 /**
  * 定时作业，此类除了定义了作业，也定义了作业的执行周期以及ID。
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/task/InvokeTask.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/task/InvokeTask.java
similarity index 86%
rename from hutool-cron/src/main/java/cn/hutool/cron/task/InvokeTask.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/task/InvokeTask.java
index 3b023ca66..c9772e96f 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/task/InvokeTask.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/task/InvokeTask.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.cron.task;
+package org.dromara.hutool.cron.task;
 
-import cn.hutool.core.classloader.ClassLoaderUtil;
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.reflect.ConstructorUtil;
-import cn.hutool.core.reflect.MethodUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.cron.CronException;
+import org.dromara.hutool.core.classloader.ClassLoaderUtil;
+import org.dromara.hutool.core.exceptions.UtilException;
+import org.dromara.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.reflect.MethodUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.cron.CronException;
 
 import java.lang.reflect.Method;
 
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/task/RunnableTask.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/task/RunnableTask.java
similarity index 95%
rename from hutool-cron/src/main/java/cn/hutool/cron/task/RunnableTask.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/task/RunnableTask.java
index 5ecddd565..154fabeaa 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/task/RunnableTask.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/task/RunnableTask.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.cron.task;
+package org.dromara.hutool.cron.task;
 
 /**
  * {@link Runnable} 的 {@link Task}包装
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/task/Task.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/task/Task.java
similarity index 96%
rename from hutool-cron/src/main/java/cn/hutool/cron/task/Task.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/task/Task.java
index 910624fc7..373fb66e9 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/task/Task.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/task/Task.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.cron.task;
+package org.dromara.hutool.cron.task;
 
 /**
  * 定时作业接口，通过实现execute方法执行具体的任务
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/task/package-info.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/task/package-info.java
similarity index 75%
rename from hutool-cron/src/main/java/cn/hutool/cron/task/package-info.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/task/package-info.java
index ad5804a97..156f97d32 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/task/package-info.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/task/package-info.java
@@ -12,9 +12,9 @@
 
 /**
  * 定时任务中作业的抽象封装和实现，包括Runnable实现和反射实现
      
- * {@link cn.hutool.cron.task.Task}表示一个具体的任务，当满足时间匹配要求时，会执行{@link cn.hutool.cron.task.Task#execute()}方法。
+ * {@link org.dromara.hutool.cron.task.Task}表示一个具体的任务，当满足时间匹配要求时，会执行{@link org.dromara.hutool.cron.task.Task#execute()}方法。
  *
  * @author looly
  *
  */
-package cn.hutool.cron.task;
+package org.dromara.hutool.cron.task;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/SystemTimer.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/SystemTimer.java
similarity index 96%
rename from hutool-cron/src/main/java/cn/hutool/cron/timingwheel/SystemTimer.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/SystemTimer.java
index 0c30d7844..86a72fb0c 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/SystemTimer.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/SystemTimer.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.cron.timingwheel;
+package org.dromara.hutool.cron.timingwheel;
 
-import cn.hutool.core.thread.ThreadUtil;
+import org.dromara.hutool.core.thread.ThreadUtil;
 
 import java.util.concurrent.DelayQueue;
 import java.util.concurrent.ExecutorService;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimerTask.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTask.java
similarity index 97%
rename from hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimerTask.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTask.java
index 8f74fcaac..1876db321 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimerTask.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTask.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.cron.timingwheel;
+package org.dromara.hutool.cron.timingwheel;
 
 /**
  * 延迟任务
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimerTaskList.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTaskList.java
similarity index 98%
rename from hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimerTaskList.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTaskList.java
index 92d2abf9c..c5d6c9a6a 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimerTaskList.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTaskList.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.cron.timingwheel;
+package org.dromara.hutool.cron.timingwheel;
 
 import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimingWheel.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimingWheel.java
similarity index 97%
rename from hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimingWheel.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimingWheel.java
index a85a37794..8dc6e7d0a 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/TimingWheel.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimingWheel.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.cron.timingwheel;
+package org.dromara.hutool.cron.timingwheel;
 
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.log.StaticLog;
 
 import java.util.function.Consumer;
 
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/package-info.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/package-info.java
similarity index 95%
rename from hutool-cron/src/main/java/cn/hutool/cron/timingwheel/package-info.java
rename to hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/package-info.java
index 8d9e8f8b5..3731e0259 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/timingwheel/package-info.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/package-info.java
@@ -20,4 +20,4 @@
  *
  * @author looly
  */
-package cn.hutool.cron.timingwheel;
+package org.dromara.hutool.cron.timingwheel;
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/TaskTableTest.java
old mode 100755
new mode 100644
similarity index 74%
rename from hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java
rename to hutool-cron/src/test/java/org/dromara/hutool/cron/TaskTableTest.java
index 226afc07c..a5700eb64
--- a/hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java
+++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/TaskTableTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.cron;
+package org.dromara.hutool.cron;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.lang.id.IdUtil;
-import cn.hutool.cron.pattern.CronPattern;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.lang.id.IdUtil;
+import org.dromara.hutool.cron.pattern.CronPattern;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/AddAndRemoveMainTest.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/AddAndRemoveMainTest.java
old mode 100755
new mode 100644
similarity index 74%
rename from hutool-cron/src/test/java/cn/hutool/cron/demo/AddAndRemoveMainTest.java
rename to hutool-cron/src/test/java/org/dromara/hutool/cron/demo/AddAndRemoveMainTest.java
index 4a639b5cc..7d0320da7
--- a/hutool-cron/src/test/java/cn/hutool/cron/demo/AddAndRemoveMainTest.java
+++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/AddAndRemoveMainTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.cron.demo;
+package org.dromara.hutool.cron.demo;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.cron.CronUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.thread.ThreadUtil;
+import org.dromara.hutool.cron.CronUtil;
 
 public class AddAndRemoveMainTest {
 
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/CronTest.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/CronTest.java
similarity index 84%
rename from hutool-cron/src/test/java/cn/hutool/cron/demo/CronTest.java
rename to hutool-cron/src/test/java/org/dromara/hutool/cron/demo/CronTest.java
index e66c770b3..07a600e33 100644
--- a/hutool-cron/src/test/java/cn/hutool/cron/demo/CronTest.java
+++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/CronTest.java
@@ -1,11 +1,11 @@
-package cn.hutool.cron.demo;
+package org.dromara.hutool.cron.demo;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.cron.CronUtil;
-import cn.hutool.cron.TaskExecutor;
-import cn.hutool.cron.listener.TaskListener;
-import cn.hutool.cron.task.Task;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.thread.ThreadUtil;
+import org.dromara.hutool.cron.CronUtil;
+import org.dromara.hutool.cron.TaskExecutor;
+import org.dromara.hutool.cron.listener.TaskListener;
+import org.dromara.hutool.cron.task.Task;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/DeamonMainTest.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/DeamonMainTest.java
similarity index 62%
rename from hutool-cron/src/test/java/cn/hutool/cron/demo/DeamonMainTest.java
rename to hutool-cron/src/test/java/org/dromara/hutool/cron/demo/DeamonMainTest.java
index 622d3077c..56a62b20e 100644
--- a/hutool-cron/src/test/java/cn/hutool/cron/demo/DeamonMainTest.java
+++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/DeamonMainTest.java
@@ -1,13 +1,13 @@
-package cn.hutool.cron.demo;
+package org.dromara.hutool.cron.demo;
 
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.cron.CronUtil;
-import cn.hutool.cron.task.InvokeTask;
+import org.dromara.hutool.core.thread.ThreadUtil;
+import org.dromara.hutool.cron.CronUtil;
+import org.dromara.hutool.cron.task.InvokeTask;
 
 public class DeamonMainTest {
 	public static void main(final String[] args) {
 		// 测试守护线程是否对作业线程有效
-		CronUtil.schedule("*/2 * * * * *", new InvokeTask("cn.hutool.cron.demo.TestJob.doWhileTest"));
+		CronUtil.schedule("*/2 * * * * *", new InvokeTask("demo.org.dromara.hutool.cron.TestJob.doWhileTest"));
 		// 当为守护线程时，stop方法调用后doWhileTest里的循环输出将终止，表示作业线程正常结束
 		// 当非守护线程时，stop方法调用后，不再产生新的作业，原作业正常执行。
 		CronUtil.setMatchSecond(true);
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/JobMainTest.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/JobMainTest.java
similarity index 68%
rename from hutool-cron/src/test/java/cn/hutool/cron/demo/JobMainTest.java
rename to hutool-cron/src/test/java/org/dromara/hutool/cron/demo/JobMainTest.java
index 6dae4af3d..4b263d400 100644
--- a/hutool-cron/src/test/java/cn/hutool/cron/demo/JobMainTest.java
+++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/JobMainTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.cron.demo;
+package org.dromara.hutool.cron.demo;
 
-import cn.hutool.cron.CronUtil;
+import org.dromara.hutool.cron.CronUtil;
 
 /**
  * 定时任务样例
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob.java
old mode 100755
new mode 100644
similarity index 76%
rename from hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob.java
rename to hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob.java
index 7f56b9f73..4cad46790
--- a/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob.java
+++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob.java
@@ -1,9 +1,9 @@
-package cn.hutool.cron.demo;
+package org.dromara.hutool.cron.demo;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.lang.id.IdUtil;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.thread.ThreadUtil;
+import org.dromara.hutool.core.lang.id.IdUtil;
 
 /**
  * 测试定时任务，当触发到定时的时间点时，执行doTest方法
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob2.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob2.java
old mode 100755
new mode 100644
similarity index 74%
rename from hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob2.java
rename to hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob2.java
index 1d3030c7e..5189c7cdb
--- a/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob2.java
+++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob2.java
@@ -1,9 +1,9 @@
-package cn.hutool.cron.demo;
+package org.dromara.hutool.cron.demo;
 
 import java.util.concurrent.TimeUnit;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.thread.ThreadUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.thread.ThreadUtil;
 
 /**
  * 测试定时任务，当触发到定时的时间点时，执行doTest方法
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternBuilderTest.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternBuilderTest.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternBuilderTest.java
rename to hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternBuilderTest.java
index 330937128..09d9e93b0
--- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternBuilderTest.java
+++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternBuilderTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.cron.pattern;
+package org.dromara.hutool.cron.pattern;
 
-import cn.hutool.cron.CronException;
+import org.dromara.hutool.cron.CronException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternNextMatchTest.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternNextMatchTest.java
similarity index 95%
rename from hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternNextMatchTest.java
rename to hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternNextMatchTest.java
index f928e8891..e9bcc8d01 100644
--- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternNextMatchTest.java
+++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternNextMatchTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.cron.pattern;
+package org.dromara.hutool.cron.pattern;
 
-import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.date.DateField;
+import org.dromara.hutool.core.date.DateTime;
+import org.dromara.hutool.core.date.DateUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternTest.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternTest.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternTest.java
rename to hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternTest.java
index 9c3c8f810..939966d7b
--- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternTest.java
+++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.cron.pattern;
+package org.dromara.hutool.cron.pattern;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.cron.CronException;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.cron.CronException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternUtilTest.java b/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternUtilTest.java
similarity index 96%
rename from hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternUtilTest.java
rename to hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternUtilTest.java
index 45e65c9b6..23545ee0a 100644
--- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternUtilTest.java
+++ b/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternUtilTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.cron.pattern;
+package org.dromara.hutool.cron.pattern;
 
-import cn.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.date.DateUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/resources/config/cron.setting b/hutool-cron/src/test/resources/config/cron.setting
index 749c8ae97..4e2860de9 100644
--- a/hutool-cron/src/test/resources/config/cron.setting
+++ b/hutool-cron/src/test/resources/config/cron.setting
@@ -6,9 +6,9 @@
 # 3. 表达式为7位，此时兼容Quartz模式，第一位匹配秒，最后一位匹配年
 #------------------------------------------------------------------
 
-# cn.hutool.cron.demo.TestJob.doTest = */1 * * * * *
+# demo.org.dromara.hutool.cron.TestJob.doTest = */1 * * * * *
 
-[cn.hutool.cron.demo]=
+[org.dromara.hutool.cron.demo]=
 # 6位表达式在秒匹配模式下可用，此处表示每秒执行一次
 # TestJob.doTest = */1 * * * * *
 # 5位表达式在分匹配模式下可用，此处表示每分钟执行一次
diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml
index 9c17c8340..6e2e261f6 100755
--- a/hutool-crypto/pom.xml
+++ b/hutool-crypto/pom.xml
@@ -19,7 +19,7 @@
 	jar
 
 	
-		cn.hutool
+		org.dromara.hutool
 		hutool-parent
 		6.0.0.M3
 	
@@ -29,14 +29,14 @@
 	Hutool 加密解密
 
 	
-		cn.hutool.crypto
+		org.dromara.hutool.crypto
 		
 		1.72
 	
 
 	
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-core
 			${project.parent.version}
 		
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/ASN1Util.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/ASN1Util.java
similarity index 95%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/ASN1Util.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/ASN1Util.java
index 5caa60efa..ea9d7085f 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/ASN1Util.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/ASN1Util.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.io.stream.FastByteArrayOutputStream;
-import cn.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
+import org.dromara.hutool.core.io.IORuntimeException;
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1Encoding;
 import org.bouncycastle.asn1.ASN1InputStream;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/BCUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/BCUtil.java
similarity index 99%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/BCUtil.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/BCUtil.java
index 203b08218..a6993257c 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/BCUtil.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/BCUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IORuntimeException;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.asn1.x9.X9ECParameters;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/CipherMode.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CipherMode.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/CipherMode.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/CipherMode.java
index ba744c688..45e26c4c8 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/CipherMode.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CipherMode.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
 import javax.crypto.Cipher;
 
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/CipherWrapper.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CipherWrapper.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/CipherWrapper.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/CipherWrapper.java
index 6357bbaa5..4715bc731 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/CipherWrapper.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CipherWrapper.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.lang.func.Wrapper;
+import org.dromara.hutool.core.lang.func.Wrapper;
 
 import javax.crypto.Cipher;
 import java.security.InvalidAlgorithmParameterException;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/CryptoException.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CryptoException.java
similarity index 91%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/CryptoException.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/CryptoException.java
index 213207bcc..6737b0630 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/CryptoException.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CryptoException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 加密异常
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/ECKeyUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/ECKeyUtil.java
similarity index 99%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/ECKeyUtil.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/ECKeyUtil.java
index 36e574d85..70f22d165 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/ECKeyUtil.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/ECKeyUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IORuntimeException;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.asn1.sec.ECPrivateKey;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/GlobalBouncyCastleProvider.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/GlobalBouncyCastleProvider.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/GlobalBouncyCastleProvider.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/GlobalBouncyCastleProvider.java
index fd49d494b..331000912 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/GlobalBouncyCastleProvider.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/GlobalBouncyCastleProvider.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
 import java.security.Provider;
 
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java
similarity index 98%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java
index 33e15d9b9..c44171fdb 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java
@@ -10,18 +10,18 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.crypto.asymmetric.AsymmetricAlgorithm;
-import cn.hutool.crypto.symmetric.SymmetricAlgorithm;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.crypto.asymmetric.AsymmetricAlgorithm;
+import org.dromara.hutool.crypto.symmetric.SymmetricAlgorithm;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/Mode.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/Mode.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/Mode.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/Mode.java
index ecf765505..aa127540d 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/Mode.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/Mode.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
 /**
  * 模式
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/OpensslKeyUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/OpensslKeyUtil.java
similarity index 99%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/OpensslKeyUtil.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/OpensslKeyUtil.java
index 2d084a259..fcbe674f4 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/OpensslKeyUtil.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/OpensslKeyUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IORuntimeException;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.cert.X509CertificateHolder;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/Padding.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/Padding.java
index 05c958fda..642bc4e9a 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/Padding.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
 /**
  * 补码方式
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/PemUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/PemUtil.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/PemUtil.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/PemUtil.java
index dfdfada46..e9ea67e30 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/PemUtil.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/PemUtil.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
 import org.bouncycastle.util.io.pem.PemObject;
 import org.bouncycastle.util.io.pem.PemObjectGenerator;
 import org.bouncycastle.util.io.pem.PemReader;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/ProviderFactory.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/ProviderFactory.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/ProviderFactory.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/ProviderFactory.java
index 7e95647d9..4dff0d9fb 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/ProviderFactory.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/ProviderFactory.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
 import java.security.Provider;
 
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SecureUtil.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/SecureUtil.java
index a75806bca..930c38e18
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SecureUtil.java
@@ -10,28 +10,28 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.lang.Validator;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.crypto.asymmetric.AsymmetricAlgorithm;
-import cn.hutool.crypto.asymmetric.RSA;
-import cn.hutool.crypto.digest.DigestAlgorithm;
-import cn.hutool.crypto.digest.Digester;
-import cn.hutool.crypto.digest.HMac;
-import cn.hutool.crypto.digest.HmacAlgorithm;
-import cn.hutool.crypto.digest.MD5;
-import cn.hutool.crypto.symmetric.AES;
-import cn.hutool.crypto.symmetric.DES;
-import cn.hutool.crypto.symmetric.DESede;
-import cn.hutool.crypto.symmetric.PBKDF2;
-import cn.hutool.crypto.symmetric.RC4;
-import cn.hutool.crypto.symmetric.SymmetricCrypto;
-import cn.hutool.crypto.symmetric.ZUC;
-import cn.hutool.crypto.symmetric.FPE;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.core.lang.Validator;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.crypto.asymmetric.AsymmetricAlgorithm;
+import org.dromara.hutool.crypto.asymmetric.RSA;
+import org.dromara.hutool.crypto.digest.DigestAlgorithm;
+import org.dromara.hutool.crypto.digest.Digester;
+import org.dromara.hutool.crypto.digest.HMac;
+import org.dromara.hutool.crypto.digest.HmacAlgorithm;
+import org.dromara.hutool.crypto.digest.MD5;
+import org.dromara.hutool.crypto.symmetric.AES;
+import org.dromara.hutool.crypto.symmetric.DES;
+import org.dromara.hutool.crypto.symmetric.DESede;
+import org.dromara.hutool.crypto.symmetric.PBKDF2;
+import org.dromara.hutool.crypto.symmetric.RC4;
+import org.dromara.hutool.crypto.symmetric.SymmetricCrypto;
+import org.dromara.hutool.crypto.symmetric.ZUC;
+import org.dromara.hutool.crypto.symmetric.FPE;
 import org.bouncycastle.crypto.AlphabetMapper;
 
 import javax.crypto.Cipher;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/SignUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SignUtil.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/SignUtil.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/SignUtil.java
index 3d1cbb459..0b0279ba1
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/SignUtil.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SignUtil.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.crypto.asymmetric.AsymmetricAlgorithm;
-import cn.hutool.crypto.asymmetric.Sign;
-import cn.hutool.crypto.asymmetric.SignAlgorithm;
-import cn.hutool.crypto.digest.DigestAlgorithm;
-import cn.hutool.crypto.digest.Digester;
-import cn.hutool.crypto.symmetric.SymmetricCrypto;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.crypto.asymmetric.AsymmetricAlgorithm;
+import org.dromara.hutool.crypto.asymmetric.Sign;
+import org.dromara.hutool.crypto.asymmetric.SignAlgorithm;
+import org.dromara.hutool.crypto.digest.DigestAlgorithm;
+import org.dromara.hutool.crypto.digest.Digester;
+import org.dromara.hutool.crypto.symmetric.SymmetricCrypto;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.Provider;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/SmUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SmUtil.java
similarity index 94%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/SmUtil.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/SmUtil.java
index 965c32b4b..b29dac21d 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/SmUtil.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SmUtil.java
@@ -10,18 +10,18 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.crypto.asymmetric.SM2;
-import cn.hutool.crypto.digest.HMac;
-import cn.hutool.crypto.digest.HmacAlgorithm;
-import cn.hutool.crypto.digest.SM3;
-import cn.hutool.crypto.digest.mac.BCHMacEngine;
-import cn.hutool.crypto.digest.mac.MacEngine;
-import cn.hutool.crypto.symmetric.SM4;
-import cn.hutool.crypto.symmetric.SymmetricCrypto;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.crypto.asymmetric.SM2;
+import org.dromara.hutool.crypto.digest.HMac;
+import org.dromara.hutool.crypto.digest.HmacAlgorithm;
+import org.dromara.hutool.crypto.digest.SM3;
+import org.dromara.hutool.crypto.digest.mac.BCHMacEngine;
+import org.dromara.hutool.crypto.digest.mac.MacEngine;
+import org.dromara.hutool.crypto.symmetric.SM4;
+import org.dromara.hutool.crypto.symmetric.SymmetricCrypto;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.gm.GMNamedCurves;
 import org.bouncycastle.crypto.digests.SM3Digest;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AbstractAsymmetricCrypto.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AbstractAsymmetricCrypto.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AbstractAsymmetricCrypto.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AbstractAsymmetricCrypto.java
index 4d1726f0a..813f86647 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AbstractAsymmetricCrypto.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AbstractAsymmetricCrypto.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
 import java.security.PrivateKey;
 import java.security.PublicKey;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricAlgorithm.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricAlgorithm.java
similarity index 96%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricAlgorithm.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricAlgorithm.java
index 077ce8ab7..4d65699b5 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricAlgorithm.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricAlgorithm.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
 /**
  * 非对称算法类型
      
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricCrypto.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricCrypto.java
similarity index 96%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricCrypto.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricCrypto.java
index 3b2db17d9..46799206d 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricCrypto.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricCrypto.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.io.stream.FastByteArrayOutputStream;
-import cn.hutool.crypto.CipherWrapper;
-import cn.hutool.crypto.CryptoException;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.SecureUtil;
-import cn.hutool.crypto.symmetric.SymmetricAlgorithm;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
+import org.dromara.hutool.crypto.CipherWrapper;
+import org.dromara.hutool.crypto.CryptoException;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.SecureUtil;
+import org.dromara.hutool.crypto.symmetric.SymmetricAlgorithm;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricDecryptor.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricDecryptor.java
similarity index 89%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricDecryptor.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricDecryptor.java
index 40c79a941..5bea5fa9b 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricDecryptor.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricDecryptor.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.crypto.SecureUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.crypto.SecureUtil;
 
 import java.io.InputStream;
 import java.nio.charset.Charset;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricEncryptor.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricEncryptor.java
index 3a0997e85..b6acccb0f
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricEncryptor.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.ByteUtil;
 
 import java.io.InputStream;
 import java.nio.charset.Charset;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/BaseAsymmetric.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/BaseAsymmetric.java
similarity index 95%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/BaseAsymmetric.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/BaseAsymmetric.java
index f3d517dbf..f93b581ee 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/BaseAsymmetric.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/BaseAsymmetric.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.crypto.CryptoException;
-import cn.hutool.crypto.KeyUtil;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.crypto.CryptoException;
+import org.dromara.hutool.crypto.KeyUtil;
 
 import java.io.Serializable;
 import java.security.Key;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/ECIES.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/ECIES.java
similarity index 98%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/ECIES.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/ECIES.java
index bb6af2a18..d309eb59a 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/ECIES.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/ECIES.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
 import java.security.PrivateKey;
 import java.security.PublicKey;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/KeyType.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/KeyType.java
similarity index 95%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/KeyType.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/KeyType.java
index 69e9025ee..bd06df566 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/KeyType.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/KeyType.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
 import javax.crypto.Cipher;
 
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/RSA.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/RSA.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/RSA.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/RSA.java
index 28616efda..60169881c 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/RSA.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/RSA.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
-import cn.hutool.crypto.CryptoException;
-import cn.hutool.crypto.GlobalBouncyCastleProvider;
-import cn.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.CryptoException;
+import org.dromara.hutool.crypto.GlobalBouncyCastleProvider;
+import org.dromara.hutool.crypto.KeyUtil;
 
 import java.math.BigInteger;
 import java.security.NoSuchAlgorithmException;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SM2.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SM2.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SM2.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SM2.java
index 99163d22f..3f64ecb23
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SM2.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SM2.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.crypto.BCUtil;
-import cn.hutool.crypto.CryptoException;
-import cn.hutool.crypto.ECKeyUtil;
-import cn.hutool.crypto.SecureUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.crypto.BCUtil;
+import org.dromara.hutool.crypto.CryptoException;
+import org.dromara.hutool.crypto.ECKeyUtil;
+import org.dromara.hutool.crypto.SecureUtil;
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.InvalidCipherTextException;
@@ -33,6 +33,7 @@ import org.bouncycastle.crypto.signers.SM2Signer;
 import org.bouncycastle.crypto.signers.StandardDSAEncoding;
 import org.bouncycastle.util.BigIntegers;
 import org.bouncycastle.util.encoders.Hex;
+import org.dromara.hutool.crypto.SmUtil;
 
 import java.math.BigInteger;
 import java.security.PrivateKey;
@@ -329,7 +330,7 @@ public class SM2 extends AbstractAsymmetricCrypto {
 
 	/**
 	 * 用私钥对信息生成数字签名，签名格式为ASN1
      
-	 * * 在硬件签名中，返回结果为R+S，可以通过调用{@link cn.hutool.crypto.SmUtil#rsAsn1ToPlain(byte[])}方法转换之。
+	 * * 在硬件签名中，返回结果为R+S，可以通过调用{@link SmUtil#rsAsn1ToPlain(byte[])}方法转换之。
 	 *
 	 * @param data 加密数据
 	 * @return 签名
@@ -351,7 +352,7 @@ public class SM2 extends AbstractAsymmetricCrypto {
 
 	/**
 	 * 用私钥对信息生成数字签名，签名格式为ASN1
      
-	 * 在硬件签名中，返回结果为R+S，可以通过调用{@link cn.hutool.crypto.SmUtil#rsAsn1ToPlain(byte[])}方法转换之。
+	 * 在硬件签名中，返回结果为R+S，可以通过调用{@link SmUtil#rsAsn1ToPlain(byte[])}方法转换之。
 	 *
 	 * @param data 被签名的数据数据
 	 * @param id   可以为null，若为null，则默认withId为字节数组:"1234567812345678".getBytes()
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/Sign.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/Sign.java
index 2620d5473..33410d662
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/Sign.java
@@ -10,18 +10,18 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.crypto.CryptoException;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.SecureUtil;
-import cn.hutool.crypto.SignUtil;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.crypto.CryptoException;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.SecureUtil;
+import org.dromara.hutool.crypto.SignUtil;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SignAlgorithm.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SignAlgorithm.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SignAlgorithm.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SignAlgorithm.java
index 2b8510587..1970b2e1c 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SignAlgorithm.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SignAlgorithm.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
 /**
  * 签名算法类型
      
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/package-info.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/package-info.java
similarity index 92%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/package-info.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/package-info.java
index bffcfb1f6..fef60b76c 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/package-info.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/BCrypt.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/BCrypt.java
similarity index 99%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/BCrypt.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/BCrypt.java
index 0eee0e006..0d6058025 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/BCrypt.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/BCrypt.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 
 import java.security.SecureRandom;
 
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestAlgorithm.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigestAlgorithm.java
similarity index 96%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestAlgorithm.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigestAlgorithm.java
index de39585aa..616fea8c0 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestAlgorithm.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigestAlgorithm.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
 /**
  * 摘要算法类型
      
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigestUtil.java
similarity index 99%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigestUtil.java
index c689c4fd9..d2d57e155 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigestUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 
 import javax.crypto.SecretKey;
 import java.io.File;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/Digester.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/Digester.java
index a9c751df6..b0997a921
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/Digester.java
@@ -10,17 +10,17 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.crypto.CryptoException;
-import cn.hutool.crypto.SecureUtil;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.crypto.CryptoException;
+import org.dromara.hutool.crypto.SecureUtil;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/HMac.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/HMac.java
similarity index 93%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/HMac.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/HMac.java
index 39af48cfb..cc61aa0e3 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/HMac.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/HMac.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
-import cn.hutool.crypto.digest.mac.Mac;
-import cn.hutool.crypto.digest.mac.MacEngine;
-import cn.hutool.crypto.digest.mac.MacEngineFactory;
+import org.dromara.hutool.crypto.digest.mac.Mac;
+import org.dromara.hutool.crypto.digest.mac.MacEngine;
+import org.dromara.hutool.crypto.digest.mac.MacEngineFactory;
 
 import javax.crypto.spec.SecretKeySpec;
 import java.security.Key;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/HmacAlgorithm.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/HmacAlgorithm.java
similarity index 96%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/HmacAlgorithm.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/HmacAlgorithm.java
index 27f31c9ee..bbac12435 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/HmacAlgorithm.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/HmacAlgorithm.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
 /**
  * HMAC算法类型
      
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/MD5.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/MD5.java
similarity index 98%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/MD5.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/MD5.java
index 470a9bd77..0ecf3b2b6 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/MD5.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/MD5.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/SM3.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/SM3.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/SM3.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/SM3.java
index 1e8ffaee3..f27e7a166 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/SM3.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/SM3.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
 /**
  * 国密SM3杂凑（摘要）算法
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/BCHMacEngine.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/BCHMacEngine.java
similarity index 98%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/BCHMacEngine.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/BCHMacEngine.java
index a7441e3a2..0b6345238 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/BCHMacEngine.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/BCHMacEngine.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest.mac;
+package org.dromara.hutool.crypto.digest.mac;
 
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Digest;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/BCMacEngine.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/BCMacEngine.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/BCMacEngine.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/BCMacEngine.java
index 73d2b65e5..f5f84a8d5 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/BCMacEngine.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/BCMacEngine.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest.mac;
+package org.dromara.hutool.crypto.digest.mac;
 
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Mac;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/CBCBlockCipherMacEngine.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/CBCBlockCipherMacEngine.java
similarity index 98%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/CBCBlockCipherMacEngine.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/CBCBlockCipherMacEngine.java
index 17f8fb17e..3e5cd9997 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/CBCBlockCipherMacEngine.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/CBCBlockCipherMacEngine.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest.mac;
+package org.dromara.hutool.crypto.digest.mac;
 
 import org.bouncycastle.crypto.BlockCipher;
 import org.bouncycastle.crypto.CipherParameters;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/DefaultHMacEngine.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/DefaultHMacEngine.java
similarity index 95%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/DefaultHMacEngine.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/DefaultHMacEngine.java
index de8209e3a..7a892d014 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/DefaultHMacEngine.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/DefaultHMacEngine.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest.mac;
+package org.dromara.hutool.crypto.digest.mac;
 
-import cn.hutool.crypto.CryptoException;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.SecureUtil;
+import org.dromara.hutool.crypto.CryptoException;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.SecureUtil;
 
 import javax.crypto.Mac;
 import javax.crypto.SecretKey;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/Mac.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/Mac.java
index 69d56a937..28ea4c60b
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/Mac.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest.mac;
+package org.dromara.hutool.crypto.digest.mac;
 
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.crypto.CryptoException;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.crypto.CryptoException;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/MacEngine.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/MacEngine.java
similarity index 93%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/MacEngine.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/MacEngine.java
index 591dc8744..e63e10eae 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/MacEngine.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/MacEngine.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest.mac;
+package org.dromara.hutool.crypto.digest.mac;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.crypto.CryptoException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.crypto.CryptoException;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/MacEngineFactory.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/MacEngineFactory.java
similarity index 92%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/MacEngineFactory.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/MacEngineFactory.java
index a43003f31..c1d513146 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/MacEngineFactory.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/MacEngineFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest.mac;
+package org.dromara.hutool.crypto.digest.mac;
 
-import cn.hutool.crypto.SmUtil;
-import cn.hutool.crypto.digest.HmacAlgorithm;
+import org.dromara.hutool.crypto.SmUtil;
+import org.dromara.hutool.crypto.digest.HmacAlgorithm;
 
 import java.security.Key;
 import java.security.spec.AlgorithmParameterSpec;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/SM4MacEngine.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/SM4MacEngine.java
similarity index 95%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/SM4MacEngine.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/SM4MacEngine.java
index d0d83931d..966b18c4d 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/SM4MacEngine.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/SM4MacEngine.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest.mac;
+package org.dromara.hutool.crypto.digest.mac;
 
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.engines.SM4Engine;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/package-info.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/package-info.java
similarity index 95%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/package-info.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/package-info.java
index 31ebd539a..70d68d218 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/package-info.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/package-info.java
@@ -19,4 +19,4 @@
  * @author Looly
  * @since 4.5.13
  */
-package cn.hutool.crypto.digest.mac;
+package org.dromara.hutool.crypto.digest.mac;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/HOTP.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/HOTP.java
similarity index 94%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/HOTP.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/HOTP.java
index 71bb031af..4a71fd3c2 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/HOTP.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/HOTP.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest.otp;
+package org.dromara.hutool.crypto.digest.otp;
 
-import cn.hutool.core.codec.binary.Base32;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.crypto.digest.HMac;
-import cn.hutool.crypto.digest.HmacAlgorithm;
+import org.dromara.hutool.core.codec.binary.Base32;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.crypto.digest.HMac;
+import org.dromara.hutool.crypto.digest.HmacAlgorithm;
 
 /**
  * 
      HMAC-based one-time passwords (HOTP) 基于HMAC算法一次性密码生成器，
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/TOTP.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/TOTP.java
similarity index 96%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/TOTP.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/TOTP.java
index 86762decd..90870afea 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/TOTP.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/TOTP.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.digest.otp;
+package org.dromara.hutool.crypto.digest.otp;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.crypto.digest.HmacAlgorithm;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.crypto.digest.HmacAlgorithm;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/package-info.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/package-info.java
similarity index 95%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/package-info.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/package-info.java
index a001a568b..d2272f1c8 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/otp/package-info.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/package-info.java
@@ -23,4 +23,4 @@
  *
  * @author looly
  */
-package cn.hutool.crypto.digest.otp;
+package org.dromara.hutool.crypto.digest.otp;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/package-info.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/package-info.java
similarity index 93%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/digest/package-info.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/package-info.java
index 6570725ff..6fd4bc43a 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/package-info.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/package-info.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/package-info.java
similarity index 96%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/package-info.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/package-info.java
index a5136c773..cccbf3b59 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/package-info.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/package-info.java
@@ -22,4 +22,4 @@
  * @author looly
  *
  */
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/AES.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/AES.java
similarity index 95%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/AES.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/AES.java
index 6d6ab3f67..2c9c54a0d 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/AES.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/AES.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.Mode;
-import cn.hutool.crypto.Padding;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.Mode;
+import org.dromara.hutool.crypto.Padding;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/ChaCha20.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/ChaCha20.java
similarity index 91%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/ChaCha20.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/ChaCha20.java
index 0adadc919..8966f3c5b 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/ChaCha20.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/ChaCha20.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.crypto.KeyUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.crypto.KeyUtil;
 
 import javax.crypto.spec.IvParameterSpec;
 
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DES.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/DES.java
similarity index 95%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DES.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/DES.java
index 4de66814e..1eaa7957d 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DES.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/DES.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.Mode;
-import cn.hutool.crypto.Padding;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.Mode;
+import org.dromara.hutool.crypto.Padding;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DESede.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/DESede.java
similarity index 95%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DESede.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/DESede.java
index 0b2527aa3..ef6dbbba7 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/DESede.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/DESede.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.Mode;
-import cn.hutool.crypto.Padding;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.Mode;
+import org.dromara.hutool.crypto.Padding;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/FPE.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/FPE.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/FPE.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/FPE.java
index 875e8e117..2897e46ae 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/FPE.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/FPE.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.Padding;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.Padding;
 import org.bouncycastle.crypto.AlphabetMapper;
 import org.bouncycastle.jcajce.spec.FPEParameterSpec;
 
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/PBKDF2.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/PBKDF2.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/PBKDF2.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/PBKDF2.java
index ca1355ba2..2cd02b155
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/PBKDF2.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/PBKDF2.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.crypto.KeyUtil;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.crypto.KeyUtil;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.PBEKeySpec;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/RC4.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/RC4.java
index 91ec339d0..cfee25186
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/RC4.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.crypto.CryptoException;
-import cn.hutool.crypto.SecureUtil;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.crypto.CryptoException;
+import org.dromara.hutool.crypto.SecureUtil;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SM4.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SM4.java
similarity index 94%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SM4.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SM4.java
index 491a696d3..80ff96640 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SM4.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SM4.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.Mode;
-import cn.hutool.crypto.Padding;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.Mode;
+import org.dromara.hutool.crypto.Padding;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricAlgorithm.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricAlgorithm.java
similarity index 96%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricAlgorithm.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricAlgorithm.java
index 1c2c06b07..676667a3a 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricAlgorithm.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricAlgorithm.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
 /**
  * 对称算法类型
      
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricCrypto.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricCrypto.java
index 40c802dd0..ccb6c081b
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricCrypto.java
@@ -10,21 +10,21 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.lang.Opt;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.crypto.CipherMode;
-import cn.hutool.crypto.CipherWrapper;
-import cn.hutool.crypto.CryptoException;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.Padding;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.lang.Opt;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.crypto.CipherMode;
+import org.dromara.hutool.crypto.CipherWrapper;
+import org.dromara.hutool.crypto.CryptoException;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.Padding;
 
 import javax.crypto.Cipher;
 import javax.crypto.CipherInputStream;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricDecryptor.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricDecryptor.java
similarity index 92%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricDecryptor.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricDecryptor.java
index 7ff6a54c8..0df732b0a 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricDecryptor.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricDecryptor.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.crypto.SecureUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.crypto.SecureUtil;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricEncryptor.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricEncryptor.java
index 026053b9b..688748b64
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricEncryptor.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/Vigenere.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/Vigenere.java
similarity index 98%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/Vigenere.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/Vigenere.java
index 526f5ddbb..be4b32a25 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/Vigenere.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/Vigenere.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
 /**
  * 维吉尼亚密码实现。
      
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/XXTEA.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/XXTEA.java
similarity index 97%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/XXTEA.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/XXTEA.java
index cfbc4035c..465c74904 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/XXTEA.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/XXTEA.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.IoUtil;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/ZUC.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/ZUC.java
similarity index 94%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/ZUC.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/ZUC.java
index 86ac17232..715648310 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/ZUC.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/ZUC.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.crypto.KeyUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.crypto.KeyUtil;
 
 import javax.crypto.spec.IvParameterSpec;
 
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/package-info.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/package-info.java
similarity index 93%
rename from hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/package-info.java
rename to hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/package-info.java
index 3bd7d8be4..398fa216e 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/package-info.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/BCUtilTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/BCUtilTest.java
similarity index 96%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/BCUtilTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/BCUtilTest.java
index bf499c12f..7b3f33dd3 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/BCUtilTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/BCUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
 import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
 import org.bouncycastle.crypto.params.ECPublicKeyParameters;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/KeyUtilTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/KeyUtilTest.java
similarity index 98%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/KeyUtilTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/KeyUtilTest.java
index 50e12ae79..380b9411c 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/KeyUtilTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/KeyUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/OpensslKeyUtilTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/OpensslKeyUtilTest.java
similarity index 91%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/OpensslKeyUtilTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/OpensslKeyUtilTest.java
index 26d7ae828..f00f2ca77 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/OpensslKeyUtilTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/OpensslKeyUtilTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.crypto.asymmetric.SM2;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.crypto.asymmetric.SM2;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/PemUtilTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/PemUtilTest.java
similarity index 89%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/PemUtilTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/PemUtilTest.java
index 3ba62f0ee..6a8f75249 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/PemUtilTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/PemUtilTest.java
@@ -1,11 +1,11 @@
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.crypto.asymmetric.KeyType;
-import cn.hutool.crypto.asymmetric.RSA;
-import cn.hutool.crypto.asymmetric.SM2;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.crypto.asymmetric.KeyType;
+import org.dromara.hutool.crypto.asymmetric.RSA;
+import org.dromara.hutool.crypto.asymmetric.SM2;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/SmTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/SmTest.java
similarity index 93%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/SmTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/SmTest.java
index ed883e5a1..bbef9c9c8 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/SmTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/SmTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.crypto;
+package org.dromara.hutool.crypto;
 
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.crypto.digest.HMac;
-import cn.hutool.crypto.symmetric.SM4;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.crypto.digest.HMac;
+import org.dromara.hutool.crypto.symmetric.SM4;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/ECIESTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/ECIESTest.java
similarity index 92%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/ECIESTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/ECIESTest.java
index 8bc0445d7..af3b9ff67 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/ECIESTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/ECIESTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/RSATest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/RSATest.java
similarity index 95%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/RSATest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/RSATest.java
index 8217be7ca..0c731a48b 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/RSATest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/RSATest.java
@@ -1,14 +1,14 @@
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.SecureUtil;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.SecureUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SM2Test.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SM2Test.java
similarity index 96%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SM2Test.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SM2Test.java
index e930956d0..7577da755 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SM2Test.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SM2Test.java
@@ -1,14 +1,14 @@
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.crypto.ECKeyUtil;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.SecureUtil;
-import cn.hutool.crypto.SmUtil;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.crypto.ECKeyUtil;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.SecureUtil;
+import org.dromara.hutool.crypto.SmUtil;
 import org.bouncycastle.crypto.engines.SM2Engine;
 import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
 import org.bouncycastle.jcajce.spec.OpenSSHPrivateKeySpec;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SignTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SignTest.java
similarity index 96%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SignTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SignTest.java
index b24fb7812..90d8a2cc2 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SignTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SignTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.crypto.asymmetric;
+package org.dromara.hutool.crypto.asymmetric;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.crypto.SignUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.crypto.SignUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/BCryptTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/BCryptTest.java
similarity index 86%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/digest/BCryptTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/BCryptTest.java
index 9d9f34a96..69a7b08a6 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/BCryptTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/BCryptTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java
similarity index 86%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java
index e1d6c5696..cbd28f698 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.digest.mac.Mac;
-import cn.hutool.crypto.digest.mac.SM4MacEngine;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.digest.mac.Mac;
+import org.dromara.hutool.crypto.digest.mac.SM4MacEngine;
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/DigestTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/DigestTest.java
similarity index 94%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/digest/DigestTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/DigestTest.java
index e3f1a0a9e..9977fff83 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/DigestTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/DigestTest.java
@@ -1,10 +1,10 @@
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 
 /**
  * 摘要算法单元测试
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/HmacTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/HmacTest.java
similarity index 90%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/digest/HmacTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/HmacTest.java
index 991f70d8c..3e26fcb53 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/HmacTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/HmacTest.java
@@ -1,10 +1,10 @@
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.SecureUtil;
-import cn.hutool.crypto.symmetric.ZUC;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.SecureUtil;
+import org.dromara.hutool.crypto.symmetric.ZUC;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/Md5Test.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/Md5Test.java
similarity index 89%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/digest/Md5Test.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/Md5Test.java
index 067c343e7..752d251be 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/Md5Test.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/Md5Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/OTPTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/OTPTest.java
similarity index 96%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/digest/OTPTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/OTPTest.java
index 2c1ab4676..f56daf1b0 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/OTPTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/OTPTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.crypto.digest;
+package org.dromara.hutool.crypto.digest;
 
-import cn.hutool.core.codec.binary.Base32;
-import cn.hutool.crypto.digest.otp.HOTP;
-import cn.hutool.crypto.digest.otp.TOTP;
+import org.dromara.hutool.core.codec.binary.Base32;
+import org.dromara.hutool.crypto.digest.otp.HOTP;
+import org.dromara.hutool.crypto.digest.otp.TOTP;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/AESTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/AESTest.java
similarity index 93%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/AESTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/AESTest.java
index e17e99636..d84b736e0 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/AESTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/AESTest.java
@@ -1,11 +1,11 @@
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.Mode;
-import cn.hutool.crypto.Padding;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.Mode;
+import org.dromara.hutool.crypto.Padding;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ChaCha20Test.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ChaCha20Test.java
similarity index 84%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ChaCha20Test.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ChaCha20Test.java
index 38dbcabd4..f901b8e57 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ChaCha20Test.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ChaCha20Test.java
@@ -1,7 +1,7 @@
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.RandomUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.RandomUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/DesTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/DesTest.java
similarity index 89%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/DesTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/DesTest.java
index 2ba75c5ee..7c4d620d7 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/DesTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/DesTest.java
@@ -1,11 +1,11 @@
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.Mode;
-import cn.hutool.crypto.Padding;
-import cn.hutool.crypto.SecureUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.Mode;
+import org.dromara.hutool.crypto.Padding;
+import org.dromara.hutool.crypto.SecureUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Issue2613Test.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Issue2613Test.java
similarity index 82%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Issue2613Test.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Issue2613Test.java
index 02fb5b959..71e21122b 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Issue2613Test.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Issue2613Test.java
@@ -1,6 +1,6 @@
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.crypto.Padding;
+import org.dromara.hutool.crypto.Padding;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/PBKDF2Test.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/PBKDF2Test.java
similarity index 66%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/PBKDF2Test.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/PBKDF2Test.java
index 5e98c9a3b..4c537e895 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/PBKDF2Test.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/PBKDF2Test.java
@@ -1,7 +1,7 @@
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.crypto.SecureUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.crypto.SecureUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/RC4Test.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/RC4Test.java
similarity index 96%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/RC4Test.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/RC4Test.java
index 474ad6e14..59ebcdfc9 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/RC4Test.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/RC4Test.java
@@ -1,6 +1,6 @@
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Sm4StreamTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Sm4StreamTest.java
similarity index 96%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Sm4StreamTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Sm4StreamTest.java
index aeb599131..f0e836577 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Sm4StreamTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Sm4StreamTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/SymmetricTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/SymmetricTest.java
similarity index 93%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/SymmetricTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/SymmetricTest.java
index e0eeba95a..a46361019 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/SymmetricTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/SymmetricTest.java
@@ -1,14 +1,14 @@
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.crypto.CipherMode;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.crypto.Mode;
-import cn.hutool.crypto.Padding;
-import cn.hutool.crypto.SecureUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.crypto.CipherMode;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.crypto.Mode;
+import org.dromara.hutool.crypto.Padding;
+import org.dromara.hutool.crypto.SecureUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/TEATest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/TEATest.java
similarity index 96%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/TEATest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/TEATest.java
index 9c2d2eeac..ff9b64668 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/TEATest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/TEATest.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ZucTest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ZucTest.java
similarity index 86%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ZucTest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ZucTest.java
index e758bf659..15dc19145 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ZucTest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ZucTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.crypto.symmetric;
+package org.dromara.hutool.crypto.symmetric;
 
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.RandomUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.RandomUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/fpe/FPETest.java
similarity index 91%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java
rename to hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/fpe/FPETest.java
index 291caa2c5..a3c0c891d 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java
+++ b/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/fpe/FPETest.java
@@ -1,7 +1,7 @@
-package cn.hutool.crypto.symmetric.fpe;
+package org.dromara.hutool.crypto.symmetric.fpe;
 
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.crypto.symmetric.FPE;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.crypto.symmetric.FPE;
 import org.bouncycastle.crypto.util.BasicAlphabetMapper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
index ac1a83c27..a00d52d9e 100755
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -19,7 +19,7 @@
 	jar
 
 	
-		cn.hutool
+		org.dromara.hutool
 		hutool-parent
 		6.0.0.M3
 	
@@ -29,7 +29,7 @@
 	Hutool 数据库JDBC的ORM封装
 
 	
-		cn.hutool.db
+		org.dromara.hutool.db
 		
 		0.9.5.5
 		2.9.0
@@ -45,17 +45,17 @@
 
 	
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-core
 			${project.parent.version}
 		
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-setting
 			${project.parent.version}
 		
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-log
 			${project.parent.version}
 		
diff --git a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java b/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-db/src/main/java/cn/hutool/db/AbstractDb.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java
index 0c2c0d841..4f49ecdf7
--- a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java
@@ -10,13 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.lang.func.SerFunction;
-import cn.hutool.db.dialect.Dialect;
-import cn.hutool.db.handler.*;
-import cn.hutool.db.sql.*;
-import cn.hutool.db.sql.Condition.LikeType;
+import org.dromara.hutool.core.lang.func.SerFunction;
+import org.dromara.hutool.db.dialect.Dialect;
+import org.dromara.hutool.db.handler.*;
+import org.dromara.hutool.db.sql.*;
+import org.dromara.hutool.db.handler.*;
+import org.dromara.hutool.db.sql.*;
+import org.dromara.hutool.db.sql.Condition.LikeType;
 
 import javax.sql.DataSource;
 import java.io.Serializable;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java b/hutool-db/src/main/java/org/dromara/hutool/db/ActiveEntity.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ActiveEntity.java
index fac7f5d87..9513c142f
--- a/hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ActiveEntity.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.lang.func.SerSupplier;
-import cn.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.lang.func.SerSupplier;
+import org.dromara.hutool.core.map.MapUtil;
 
 import java.util.Collection;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/ConnectionHolder.java b/hutool-db/src/main/java/org/dromara/hutool/db/ConnectionHolder.java
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/ConnectionHolder.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ConnectionHolder.java
index 789497776..97fd9d5fb 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ConnectionHolder.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ConnectionHolder.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
 import java.sql.Connection;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/DaoTemplate.java b/hutool-db/src/main/java/org/dromara/hutool/db/DaoTemplate.java
similarity index 98%
rename from hutool-db/src/main/java/cn/hutool/db/DaoTemplate.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/DaoTemplate.java
index 83c4fb774..023dda8c6 100644
--- a/hutool-db/src/main/java/cn/hutool/db/DaoTemplate.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/DaoTemplate.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.ds.DSUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.ds.DSUtil;
 
 import javax.sql.DataSource;
 import java.util.Arrays;
diff --git a/hutool-db/src/main/java/cn/hutool/db/Db.java b/hutool-db/src/main/java/org/dromara/hutool/db/Db.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/Db.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/Db.java
index bba21c84b..d3d474c90 100644
--- a/hutool-db/src/main/java/cn/hutool/db/Db.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/Db.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.lang.func.SerConsumer;
-import cn.hutool.db.dialect.Dialect;
-import cn.hutool.db.dialect.DialectFactory;
-import cn.hutool.db.ds.DSUtil;
-import cn.hutool.db.transaction.TransactionLevel;
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.core.lang.func.SerConsumer;
+import org.dromara.hutool.db.dialect.Dialect;
+import org.dromara.hutool.db.dialect.DialectFactory;
+import org.dromara.hutool.db.ds.DSUtil;
+import org.dromara.hutool.db.transaction.TransactionLevel;
+import org.dromara.hutool.log.StaticLog;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
diff --git a/hutool-db/src/main/java/cn/hutool/db/DbRuntimeException.java b/hutool-db/src/main/java/org/dromara/hutool/db/DbRuntimeException.java
similarity index 91%
rename from hutool-db/src/main/java/cn/hutool/db/DbRuntimeException.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/DbRuntimeException.java
index 6620a40e8..a52123b82 100644
--- a/hutool-db/src/main/java/cn/hutool/db/DbRuntimeException.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/DbRuntimeException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 数据库异常
diff --git a/hutool-db/src/main/java/cn/hutool/db/DbUtil.java b/hutool-db/src/main/java/org/dromara/hutool/db/DbUtil.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/DbUtil.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/DbUtil.java
index 84e6f9af2..90ab9ace6 100644
--- a/hutool-db/src/main/java/cn/hutool/db/DbUtil.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/DbUtil.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.db.ds.DSKeys;
-import cn.hutool.log.Log;
-import cn.hutool.log.level.Level;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.db.ds.DSKeys;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.level.Level;
+import org.dromara.hutool.setting.Setting;
 
 /**
  * 数据库操作工具类
diff --git a/hutool-db/src/main/java/cn/hutool/db/DefaultConnectionHolder.java b/hutool-db/src/main/java/org/dromara/hutool/db/DefaultConnectionHolder.java
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/DefaultConnectionHolder.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/DefaultConnectionHolder.java
index 726fb9aad..9fb015a9c 100644
--- a/hutool-db/src/main/java/cn/hutool/db/DefaultConnectionHolder.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/DefaultConnectionHolder.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
diff --git a/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java b/hutool-db/src/main/java/org/dromara/hutool/db/DialectRunner.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/DialectRunner.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/DialectRunner.java
index dea0e4d88..7c390e45b 100644
--- a/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/DialectRunner.java
@@ -10,23 +10,23 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.db.dialect.Dialect;
-import cn.hutool.db.dialect.DialectFactory;
-import cn.hutool.db.handler.NumberHandler;
-import cn.hutool.db.handler.PageResultHandler;
-import cn.hutool.db.handler.RsHandler;
-import cn.hutool.db.sql.Query;
-import cn.hutool.db.sql.SqlBuilder;
-import cn.hutool.db.sql.SqlExecutor;
-import cn.hutool.db.sql.SqlUtil;
-import cn.hutool.db.sql.QuoteWrapper;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.db.dialect.Dialect;
+import org.dromara.hutool.db.dialect.DialectFactory;
+import org.dromara.hutool.db.handler.NumberHandler;
+import org.dromara.hutool.db.handler.PageResultHandler;
+import org.dromara.hutool.db.handler.RsHandler;
+import org.dromara.hutool.db.sql.Query;
+import org.dromara.hutool.db.sql.SqlBuilder;
+import org.dromara.hutool.db.sql.SqlExecutor;
+import org.dromara.hutool.db.sql.SqlUtil;
+import org.dromara.hutool.db.sql.QuoteWrapper;
 
 import java.io.Serializable;
 import java.sql.Connection;
diff --git a/hutool-db/src/main/java/cn/hutool/db/Entity.java b/hutool-db/src/main/java/org/dromara/hutool/db/Entity.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-db/src/main/java/cn/hutool/db/Entity.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/Entity.java
index 9b46b12ce..8e029b8a5
--- a/hutool-db/src/main/java/cn/hutool/db/Entity.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/Entity.java
@@ -10,18 +10,18 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.SetUtil;
-import cn.hutool.core.lang.func.SerSupplier;
-import cn.hutool.core.map.Dict;
-import cn.hutool.core.reflect.MethodUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.db.sql.SqlUtil;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.collection.SetUtil;
+import org.dromara.hutool.core.lang.func.SerSupplier;
+import org.dromara.hutool.core.map.Dict;
+import org.dromara.hutool.core.reflect.MethodUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.db.sql.SqlUtil;
 
 import java.nio.charset.Charset;
 import java.sql.Blob;
diff --git a/hutool-db/src/main/java/cn/hutool/db/GlobalDbConfig.java b/hutool-db/src/main/java/org/dromara/hutool/db/GlobalDbConfig.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/GlobalDbConfig.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/GlobalDbConfig.java
index 9efbdc571..f676f8019 100644
--- a/hutool-db/src/main/java/cn/hutool/db/GlobalDbConfig.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/GlobalDbConfig.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.io.resource.NoResourceException;
-import cn.hutool.db.sql.SqlLog;
-import cn.hutool.log.level.Level;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.core.io.resource.NoResourceException;
+import org.dromara.hutool.db.sql.SqlLog;
+import org.dromara.hutool.log.level.Level;
+import org.dromara.hutool.setting.Setting;
 
 /**
  * DB全局配置配置项
diff --git a/hutool-db/src/main/java/cn/hutool/db/Page.java b/hutool-db/src/main/java/org/dromara/hutool/db/Page.java
similarity index 95%
rename from hutool-db/src/main/java/cn/hutool/db/Page.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/Page.java
index 5d258e187..e5f0454e0 100644
--- a/hutool-db/src/main/java/cn/hutool/db/Page.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/Page.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.lang.Segment;
-import cn.hutool.core.lang.page.PageInfo;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.db.sql.Order;
+import org.dromara.hutool.core.lang.Segment;
+import org.dromara.hutool.core.lang.page.PageInfo;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.db.sql.Order;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/hutool-db/src/main/java/cn/hutool/db/PageResult.java b/hutool-db/src/main/java/org/dromara/hutool/db/PageResult.java
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/PageResult.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/PageResult.java
index 7ba7db73b..29b13d345 100644
--- a/hutool-db/src/main/java/cn/hutool/db/PageResult.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/PageResult.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.lang.page.PageInfo;
+import org.dromara.hutool.core.lang.page.PageInfo;
 
 import java.util.ArrayList;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/Session.java b/hutool-db/src/main/java/org/dromara/hutool/db/Session.java
similarity index 95%
rename from hutool-db/src/main/java/cn/hutool/db/Session.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/Session.java
index b5e59fdf9..a636a1985 100644
--- a/hutool-db/src/main/java/cn/hutool/db/Session.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/Session.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.lang.func.SerConsumer;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.dialect.Dialect;
-import cn.hutool.db.dialect.DialectFactory;
-import cn.hutool.db.ds.DSUtil;
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
+import org.dromara.hutool.core.lang.func.SerConsumer;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.dialect.Dialect;
+import org.dromara.hutool.db.dialect.DialectFactory;
+import org.dromara.hutool.db.ds.DSUtil;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
 
 import javax.sql.DataSource;
 import java.io.Closeable;
diff --git a/hutool-db/src/main/java/cn/hutool/db/StatementUtil.java b/hutool-db/src/main/java/org/dromara/hutool/db/StatementUtil.java
similarity index 95%
rename from hutool-db/src/main/java/cn/hutool/db/StatementUtil.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/StatementUtil.java
index a5b4c8886..b656bf8eb 100644
--- a/hutool-db/src/main/java/cn/hutool/db/StatementUtil.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/StatementUtil.java
@@ -10,20 +10,20 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.collection.iter.ArrayIter;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.db.handler.ResultSetUtil;
-import cn.hutool.db.handler.RsHandler;
-import cn.hutool.db.sql.NamedSql;
-import cn.hutool.db.sql.SqlBuilder;
-import cn.hutool.db.sql.SqlLog;
-import cn.hutool.db.sql.SqlUtil;
+import org.dromara.hutool.core.collection.iter.ArrayIter;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.db.handler.ResultSetUtil;
+import org.dromara.hutool.db.handler.RsHandler;
+import org.dromara.hutool.db.sql.NamedSql;
+import org.dromara.hutool.db.sql.SqlBuilder;
+import org.dromara.hutool.db.sql.SqlLog;
+import org.dromara.hutool.db.sql.SqlUtil;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ThreadLocalConnection.java b/hutool-db/src/main/java/org/dromara/hutool/db/ThreadLocalConnection.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/ThreadLocalConnection.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ThreadLocalConnection.java
index ee28fca28..08b55622a
--- a/hutool-db/src/main/java/cn/hutool/db/ThreadLocalConnection.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ThreadLocalConnection.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.IoUtil;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/Dialect.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/Dialect.java
similarity index 96%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/Dialect.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/Dialect.java
index 3feef73e1..4e44f2e90 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/Dialect.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/Dialect.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect;
+package org.dromara.hutool.db.dialect;
 
-import cn.hutool.db.Entity;
-import cn.hutool.db.Page;
-import cn.hutool.db.sql.Order;
-import cn.hutool.db.sql.Query;
-import cn.hutool.db.sql.SqlBuilder;
-import cn.hutool.db.sql.QuoteWrapper;
+import org.dromara.hutool.db.Entity;
+import org.dromara.hutool.db.Page;
+import org.dromara.hutool.db.sql.Order;
+import org.dromara.hutool.db.sql.Query;
+import org.dromara.hutool.db.sql.SqlBuilder;
+import org.dromara.hutool.db.sql.QuoteWrapper;
 
 import java.io.Serializable;
 import java.sql.Connection;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/DialectFactory.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/DialectFactory.java
index d5dc5fa90..6590c4430
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/DialectFactory.java
@@ -10,21 +10,21 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect;
+package org.dromara.hutool.db.dialect;
 
-import cn.hutool.core.classloader.ClassLoaderUtil;
-import cn.hutool.core.map.SafeConcurrentHashMap;
-import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.dialect.impl.AnsiSqlDialect;
-import cn.hutool.db.dialect.impl.H2Dialect;
-import cn.hutool.db.dialect.impl.MysqlDialect;
-import cn.hutool.db.dialect.impl.OracleDialect;
-import cn.hutool.db.dialect.impl.PhoenixDialect;
-import cn.hutool.db.dialect.impl.PostgresqlDialect;
-import cn.hutool.db.dialect.impl.SqlServer2012Dialect;
-import cn.hutool.db.dialect.impl.Sqlite3Dialect;
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.core.classloader.ClassLoaderUtil;
+import org.dromara.hutool.core.map.SafeConcurrentHashMap;
+import org.dromara.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.dialect.impl.AnsiSqlDialect;
+import org.dromara.hutool.db.dialect.impl.H2Dialect;
+import org.dromara.hutool.db.dialect.impl.MysqlDialect;
+import org.dromara.hutool.db.dialect.impl.OracleDialect;
+import org.dromara.hutool.db.dialect.impl.PhoenixDialect;
+import org.dromara.hutool.db.dialect.impl.PostgresqlDialect;
+import org.dromara.hutool.db.dialect.impl.SqlServer2012Dialect;
+import org.dromara.hutool.db.dialect.impl.Sqlite3Dialect;
+import org.dromara.hutool.log.StaticLog;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectName.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/DialectName.java
similarity index 92%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/DialectName.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/DialectName.java
index 8d3e17ffe..b2d21d42b 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectName.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/DialectName.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect;
+package org.dromara.hutool.db.dialect;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 方言名
      
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DriverNamePool.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/DriverNamePool.java
similarity index 98%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/DriverNamePool.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/DriverNamePool.java
index 63187d2b6..b66e981af 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/DriverNamePool.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/DriverNamePool.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect;
+package org.dromara.hutool.db.dialect;
 
 /**
  * 常用数据库驱动池
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DriverUtil.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/DriverUtil.java
similarity index 91%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/DriverUtil.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/DriverUtil.java
index 4bdd61e96..7cf8fda17 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/DriverUtil.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/DriverUtil.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect;
+package org.dromara.hutool.db.dialect;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.ds.DSWrapper;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.ds.DSWrapper;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/AnsiSqlDialect.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/AnsiSqlDialect.java
similarity index 87%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/impl/AnsiSqlDialect.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/AnsiSqlDialect.java
index 64670724a..2cd5f1948 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/AnsiSqlDialect.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/AnsiSqlDialect.java
@@ -10,22 +10,22 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect.impl;
+package org.dromara.hutool.db.dialect.impl;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.Entity;
-import cn.hutool.db.Page;
-import cn.hutool.db.StatementUtil;
-import cn.hutool.db.dialect.Dialect;
-import cn.hutool.db.dialect.DialectName;
-import cn.hutool.db.sql.Condition;
-import cn.hutool.db.sql.Query;
-import cn.hutool.db.sql.SqlBuilder;
-import cn.hutool.db.sql.QuoteWrapper;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.Entity;
+import org.dromara.hutool.db.Page;
+import org.dromara.hutool.db.StatementUtil;
+import org.dromara.hutool.db.dialect.Dialect;
+import org.dromara.hutool.db.dialect.DialectName;
+import org.dromara.hutool.db.sql.Condition;
+import org.dromara.hutool.db.sql.Query;
+import org.dromara.hutool.db.sql.SqlBuilder;
+import org.dromara.hutool.db.sql.QuoteWrapper;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/H2Dialect.java
similarity index 86%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/H2Dialect.java
index 4b0521056..c2d638262 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/H2Dialect.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect.impl;
+package org.dromara.hutool.db.dialect.impl;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.Entity;
-import cn.hutool.db.Page;
-import cn.hutool.db.StatementUtil;
-import cn.hutool.db.dialect.DialectName;
-import cn.hutool.db.sql.SqlBuilder;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.Entity;
+import org.dromara.hutool.db.Page;
+import org.dromara.hutool.db.StatementUtil;
+import org.dromara.hutool.db.dialect.DialectName;
+import org.dromara.hutool.db.sql.SqlBuilder;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/MysqlDialect.java
similarity index 89%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/MysqlDialect.java
index 5ac271db1..843a57a38 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/MysqlDialect.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect.impl;
+package org.dromara.hutool.db.dialect.impl;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.Entity;
-import cn.hutool.db.Page;
-import cn.hutool.db.StatementUtil;
-import cn.hutool.db.dialect.DialectName;
-import cn.hutool.db.sql.SqlBuilder;
-import cn.hutool.db.sql.QuoteWrapper;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.Entity;
+import org.dromara.hutool.db.Page;
+import org.dromara.hutool.db.StatementUtil;
+import org.dromara.hutool.db.dialect.DialectName;
+import org.dromara.hutool.db.sql.SqlBuilder;
+import org.dromara.hutool.db.sql.QuoteWrapper;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/OracleDialect.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/OracleDialect.java
similarity index 88%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/impl/OracleDialect.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/OracleDialect.java
index 761b5c6cb..b0c5c8a0c 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/OracleDialect.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/OracleDialect.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect.impl;
+package org.dromara.hutool.db.dialect.impl;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.Page;
-import cn.hutool.db.dialect.DialectName;
-import cn.hutool.db.sql.SqlBuilder;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.Page;
+import org.dromara.hutool.db.dialect.DialectName;
+import org.dromara.hutool.db.sql.SqlBuilder;
 
 /**
  * Oracle 方言
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PhoenixDialect.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/PhoenixDialect.java
similarity index 90%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/impl/PhoenixDialect.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/PhoenixDialect.java
index 4ad989448..53b110574 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PhoenixDialect.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/PhoenixDialect.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect.impl;
+package org.dromara.hutool.db.dialect.impl;
 
-import cn.hutool.db.Entity;
-import cn.hutool.db.dialect.DialectName;
-import cn.hutool.db.sql.Query;
+import org.dromara.hutool.db.Entity;
+import org.dromara.hutool.db.dialect.DialectName;
+import org.dromara.hutool.db.sql.Query;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/PostgresqlDialect.java
similarity index 86%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/PostgresqlDialect.java
index 6d7c73177..cbbfad0aa 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/PostgresqlDialect.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect.impl;
+package org.dromara.hutool.db.dialect.impl;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.Entity;
-import cn.hutool.db.StatementUtil;
-import cn.hutool.db.dialect.DialectName;
-import cn.hutool.db.sql.SqlBuilder;
-import cn.hutool.db.sql.QuoteWrapper;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.Entity;
+import org.dromara.hutool.db.StatementUtil;
+import org.dromara.hutool.db.dialect.DialectName;
+import org.dromara.hutool.db.sql.SqlBuilder;
+import org.dromara.hutool.db.sql.QuoteWrapper;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/SqlServer2012Dialect.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2012Dialect.java
similarity index 84%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/impl/SqlServer2012Dialect.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2012Dialect.java
index 7fc6272fa..f0576d58b 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/SqlServer2012Dialect.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2012Dialect.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect.impl;
+package org.dromara.hutool.db.dialect.impl;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.Page;
-import cn.hutool.db.dialect.DialectName;
-import cn.hutool.db.sql.SqlBuilder;
-import cn.hutool.db.sql.QuoteWrapper;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.Page;
+import org.dromara.hutool.db.dialect.DialectName;
+import org.dromara.hutool.db.sql.SqlBuilder;
+import org.dromara.hutool.db.sql.QuoteWrapper;
 
 /**
  * SQLServer2012 方言
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/Sqlite3Dialect.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/Sqlite3Dialect.java
similarity index 85%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/impl/Sqlite3Dialect.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/Sqlite3Dialect.java
index b4d0bc4bb..afd2e15be 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/Sqlite3Dialect.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/Sqlite3Dialect.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.dialect.impl;
+package org.dromara.hutool.db.dialect.impl;
 
-import cn.hutool.db.dialect.DialectName;
-import cn.hutool.db.sql.QuoteWrapper;
+import org.dromara.hutool.db.dialect.DialectName;
+import org.dromara.hutool.db.sql.QuoteWrapper;
 
 /**
  * SqlLite3方言
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/package-info.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/impl/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/package-info.java
index b0510def9..819de0939 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.dialect.impl;
+package org.dromara.hutool.db.dialect.impl;
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/dialect/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/dialect/package-info.java
index e4a4ab600..aa26385bb 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.dialect;
+package org.dromara.hutool.db.dialect;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/AbstractDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/AbstractDSFactory.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/ds/AbstractDSFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/AbstractDSFactory.java
index 56e1562c9..4054dcefb 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/AbstractDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/AbstractDSFactory.java
@@ -10,17 +10,17 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds;
+package org.dromara.hutool.db.ds;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.map.SafeConcurrentHashMap;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.DbUtil;
-import cn.hutool.db.GlobalDbConfig;
-import cn.hutool.db.dialect.DriverUtil;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.map.SafeConcurrentHashMap;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.DbUtil;
+import org.dromara.hutool.db.GlobalDbConfig;
+import org.dromara.hutool.db.dialect.DriverUtil;
+import org.dromara.hutool.setting.Setting;
 
 import javax.sql.DataSource;
 import java.util.Collection;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSFactory.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/DSFactory.java
index 3a166be1c..21229e736 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds;
+package org.dromara.hutool.db.ds;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.setting.Setting;
 
 import javax.sql.DataSource;
 import java.io.Closeable;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/DSKeys.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSKeys.java
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/ds/DSKeys.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/DSKeys.java
index f24a66f20..544c13336 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/DSKeys.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSKeys.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds;
+package org.dromara.hutool.db.ds;
 
 /**
  * 数据源配置的字段名
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/DSUtil.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSUtil.java
similarity index 89%
rename from hutool-db/src/main/java/cn/hutool/db/ds/DSUtil.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/DSUtil.java
index 5190003cf..8e1987b05 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/DSUtil.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSUtil.java
@@ -10,18 +10,18 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds;
+package org.dromara.hutool.db.ds;
 
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.ds.bee.BeeDSFactory;
-import cn.hutool.db.ds.c3p0.C3p0DSFactory;
-import cn.hutool.db.ds.dbcp.DbcpDSFactory;
-import cn.hutool.db.ds.druid.DruidDSFactory;
-import cn.hutool.db.ds.hikari.HikariDSFactory;
-import cn.hutool.db.ds.pooled.PooledDSFactory;
-import cn.hutool.db.ds.tomcat.TomcatDSFactory;
-import cn.hutool.log.StaticLog;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.ds.bee.BeeDSFactory;
+import org.dromara.hutool.db.ds.c3p0.C3p0DSFactory;
+import org.dromara.hutool.db.ds.dbcp.DbcpDSFactory;
+import org.dromara.hutool.db.ds.druid.DruidDSFactory;
+import org.dromara.hutool.db.ds.hikari.HikariDSFactory;
+import org.dromara.hutool.db.ds.pooled.PooledDSFactory;
+import org.dromara.hutool.db.ds.tomcat.TomcatDSFactory;
+import org.dromara.hutool.log.StaticLog;
+import org.dromara.hutool.setting.Setting;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/DSWrapper.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSWrapper.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/ds/DSWrapper.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/DSWrapper.java
index 2cd56f57b..ed61ad3fd 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/DSWrapper.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSWrapper.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds;
+package org.dromara.hutool.db.ds;
 
-import cn.hutool.core.exceptions.CloneRuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.func.Wrapper;
+import org.dromara.hutool.core.exceptions.CloneRuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.func.Wrapper;
 
 import javax.sql.DataSource;
 import java.io.Closeable;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/GlobalDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/GlobalDSFactory.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/ds/GlobalDSFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/GlobalDSFactory.java
index d9262ead2..24457316b 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/GlobalDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/GlobalDSFactory.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds;
+package org.dromara.hutool.db.ds;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.RuntimeUtil;
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.RuntimeUtil;
+import org.dromara.hutool.log.StaticLog;
 
 /**
  * 全局单例数据源工厂
      
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/bee/BeeDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/bee/BeeDSFactory.java
similarity index 88%
rename from hutool-db/src/main/java/cn/hutool/db/ds/bee/BeeDSFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/bee/BeeDSFactory.java
index 14f3f9d20..aa3e62eb0 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/bee/BeeDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/bee/BeeDSFactory.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.bee;
+package org.dromara.hutool.db.ds.bee;
 
 import cn.beecp.BeeDataSource;
 import cn.beecp.BeeDataSourceConfig;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.ds.AbstractDSFactory;
-import cn.hutool.db.ds.DSKeys;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.ds.AbstractDSFactory;
+import org.dromara.hutool.db.ds.DSKeys;
+import org.dromara.hutool.setting.Setting;
 
 import javax.sql.DataSource;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/bee/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/bee/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/ds/bee/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/bee/package-info.java
index 7065211d4..00dad0588 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/bee/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/bee/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.ds.bee;
+package org.dromara.hutool.db.ds.bee;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/c3p0/C3p0DSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java
similarity index 84%
rename from hutool-db/src/main/java/cn/hutool/db/ds/c3p0/C3p0DSFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java
index 957dd8f69..a0f3e68b5 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/c3p0/C3p0DSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.c3p0;
+package org.dromara.hutool.db.ds.c3p0;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.ds.AbstractDSFactory;
-import cn.hutool.db.ds.DSKeys;
-import cn.hutool.setting.Setting;
-import cn.hutool.setting.dialect.Props;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.ds.AbstractDSFactory;
+import org.dromara.hutool.db.ds.DSKeys;
+import org.dromara.hutool.setting.Setting;
+import org.dromara.hutool.setting.dialect.Props;
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 
 import javax.sql.DataSource;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/c3p0/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/package-info.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/ds/c3p0/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/package-info.java
index eb79ca9b3..5232d15fe 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/c3p0/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.ds.c3p0;
+package org.dromara.hutool.db.ds.c3p0;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/dbcp/DbcpDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/dbcp/DbcpDSFactory.java
similarity index 89%
rename from hutool-db/src/main/java/cn/hutool/db/ds/dbcp/DbcpDSFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/dbcp/DbcpDSFactory.java
index 9d25637d1..be786a067 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/dbcp/DbcpDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/dbcp/DbcpDSFactory.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.dbcp;
+package org.dromara.hutool.db.ds.dbcp;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.ds.AbstractDSFactory;
-import cn.hutool.db.ds.DSKeys;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.ds.AbstractDSFactory;
+import org.dromara.hutool.db.ds.DSKeys;
+import org.dromara.hutool.setting.Setting;
 import org.apache.commons.dbcp2.BasicDataSource;
 
 import javax.sql.DataSource;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/dbcp/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/dbcp/package-info.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/ds/dbcp/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/dbcp/package-info.java
index d2a046190..9140ffc1e 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/dbcp/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/dbcp/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.ds.dbcp;
+package org.dromara.hutool.db.ds.dbcp;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/druid/DruidDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
similarity index 92%
rename from hutool-db/src/main/java/cn/hutool/db/ds/druid/DruidDSFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
index f45fba6cc..3620433e7 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/druid/DruidDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.druid;
+package org.dromara.hutool.db.ds.druid;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.ds.AbstractDSFactory;
-import cn.hutool.db.ds.DSKeys;
-import cn.hutool.setting.Setting;
-import cn.hutool.setting.dialect.Props;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.ds.AbstractDSFactory;
+import org.dromara.hutool.db.ds.DSKeys;
+import org.dromara.hutool.setting.Setting;
+import org.dromara.hutool.setting.dialect.Props;
 import com.alibaba.druid.pool.DruidDataSource;
 
 import javax.sql.DataSource;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/druid/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/package-info.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/ds/druid/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/package-info.java
index ab04089db..e2cb0fc31 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/druid/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.ds.druid;
+package org.dromara.hutool.db.ds.druid;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/hikari/HikariDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java
similarity index 88%
rename from hutool-db/src/main/java/cn/hutool/db/ds/hikari/HikariDSFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java
index 38399c16d..4d17c8122 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/hikari/HikariDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.hikari;
+package org.dromara.hutool.db.ds.hikari;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.ds.AbstractDSFactory;
-import cn.hutool.db.ds.DSKeys;
-import cn.hutool.setting.Setting;
-import cn.hutool.setting.dialect.Props;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.ds.AbstractDSFactory;
+import org.dromara.hutool.db.ds.DSKeys;
+import org.dromara.hutool.setting.Setting;
+import org.dromara.hutool.setting.dialect.Props;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/hikari/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/package-info.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/ds/hikari/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/package-info.java
index bb67ee8e0..1d4d593bf 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/hikari/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.ds.hikari;
+package org.dromara.hutool.db.ds.hikari;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/jndi/JndiDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/jndi/JndiDSFactory.java
similarity index 85%
rename from hutool-db/src/main/java/cn/hutool/db/ds/jndi/JndiDSFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/jndi/JndiDSFactory.java
index 372fc1e9c..83382cbbd 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/jndi/JndiDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/jndi/JndiDSFactory.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.jndi;
+package org.dromara.hutool.db.ds.jndi;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.ds.AbstractDSFactory;
-import cn.hutool.db.ds.DSUtil;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.ds.AbstractDSFactory;
+import org.dromara.hutool.db.ds.DSUtil;
+import org.dromara.hutool.setting.Setting;
 
 import javax.sql.DataSource;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/jndi/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/jndi/package-info.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/ds/jndi/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/jndi/package-info.java
index 8721dbdc5..19d65d5ef 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/jndi/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/jndi/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.ds.jndi;
+package org.dromara.hutool.db.ds.jndi;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/package-info.java
similarity index 87%
rename from hutool-db/src/main/java/cn/hutool/db/ds/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/package-info.java
index d820167c5..ef1a6c50e 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/package-info.java
@@ -12,9 +12,9 @@
 
 /**
  * 数据源封装，对各类数据库连接池的封装
      
- * 数据库连接池使用工厂方法模式，当有新增连接池时，实现{@link cn.hutool.db.ds.DSFactory}即可。
+ * 数据库连接池使用工厂方法模式，当有新增连接池时，实现{@link org.dromara.hutool.db.ds.DSFactory}即可。
  *
  * @author looly
  *
  */
-package cn.hutool.db.ds;
+package org.dromara.hutool.db.ds;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/ConnectionWraper.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/ConnectionWraper.java
similarity index 99%
rename from hutool-db/src/main/java/cn/hutool/db/ds/pooled/ConnectionWraper.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/ConnectionWraper.java
index 5ad36bedf..363807250 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/ConnectionWraper.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/ConnectionWraper.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.pooled;
+package org.dromara.hutool.db.ds.pooled;
 
 import java.sql.Array;
 import java.sql.Blob;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/DbConfig.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/DbConfig.java
similarity index 96%
rename from hutool-db/src/main/java/cn/hutool/db/ds/pooled/DbConfig.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/DbConfig.java
index b5906478c..4722e570f 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/DbConfig.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/DbConfig.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.pooled;
+package org.dromara.hutool.db.ds.pooled;
 
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.dialect.DriverUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.dialect.DriverUtil;
 
 import java.util.Properties;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/DbSetting.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/DbSetting.java
similarity index 89%
rename from hutool-db/src/main/java/cn/hutool/db/ds/pooled/DbSetting.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/DbSetting.java
index 34400ffa3..500ffe12f 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/DbSetting.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/DbSetting.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.pooled;
+package org.dromara.hutool.db.ds.pooled;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.dialect.DriverUtil;
-import cn.hutool.db.ds.DSKeys;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.dialect.DriverUtil;
+import org.dromara.hutool.db.ds.DSKeys;
+import org.dromara.hutool.setting.Setting;
 
 /**
  * 数据库配置文件类，此类对应一个数据库配置文件
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledConnection.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledConnection.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java
index 438fc7a0c..3706d68bf 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledConnection.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.pooled;
+package org.dromara.hutool.db.ds.pooled;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.setting.dialect.Props;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.setting.dialect.Props;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledDSFactory.java
similarity index 90%
rename from hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDSFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledDSFactory.java
index c0347f23b..a3d0e55dc 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledDSFactory.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.pooled;
+package org.dromara.hutool.db.ds.pooled;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.ds.AbstractDSFactory;
-import cn.hutool.db.ds.DSKeys;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.ds.AbstractDSFactory;
+import org.dromara.hutool.db.ds.DSKeys;
+import org.dromara.hutool.setting.Setting;
 
 import javax.sql.DataSource;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledDataSource.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledDataSource.java
index 3dade9e85..0caf61c29 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledDataSource.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.pooled;
+package org.dromara.hutool.db.ds.pooled;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.ds.simple.AbstractDataSource;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.thread.ThreadUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.ds.simple.AbstractDataSource;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/package-info.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/ds/pooled/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/package-info.java
index d99eb9e64..d51fff10a 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/pooled/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.ds.pooled;
+package org.dromara.hutool.db.ds.pooled;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/simple/AbstractDataSource.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/AbstractDataSource.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/ds/simple/AbstractDataSource.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/AbstractDataSource.java
index c745db973..ad8e31d36 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/simple/AbstractDataSource.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/AbstractDataSource.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.simple;
+package org.dromara.hutool.db.ds.simple;
 
-import cn.hutool.core.exceptions.CloneRuntimeException;
+import org.dromara.hutool.core.exceptions.CloneRuntimeException;
 
 import javax.sql.DataSource;
 import java.io.Closeable;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/simple/SimpleDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDSFactory.java
similarity index 91%
rename from hutool-db/src/main/java/cn/hutool/db/ds/simple/SimpleDSFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDSFactory.java
index c339e0be4..3d201385c 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/simple/SimpleDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDSFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.simple;
+package org.dromara.hutool.db.ds.simple;
 
-import cn.hutool.db.ds.AbstractDSFactory;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.db.ds.AbstractDSFactory;
+import org.dromara.hutool.setting.Setting;
 
 import javax.sql.DataSource;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/simple/SimpleDataSource.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/ds/simple/SimpleDataSource.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java
index f202d9661..5a4bff82a 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/simple/SimpleDataSource.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.simple;
+package org.dromara.hutool.db.ds.simple;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.dialect.DriverUtil;
-import cn.hutool.db.ds.DSKeys;
-import cn.hutool.setting.Setting;
-import cn.hutool.setting.dialect.Props;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.dialect.DriverUtil;
+import org.dromara.hutool.db.ds.DSKeys;
+import org.dromara.hutool.setting.Setting;
+import org.dromara.hutool.setting.dialect.Props;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/simple/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/package-info.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/ds/simple/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/package-info.java
index de6e6d23e..c93c0e9a4 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/simple/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.ds.simple;
+package org.dromara.hutool.db.ds.simple;
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/tomcat/TomcatDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java
similarity index 88%
rename from hutool-db/src/main/java/cn/hutool/db/ds/tomcat/TomcatDSFactory.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java
index 7ced216e3..f1a5f9574 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/tomcat/TomcatDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.ds.tomcat;
+package org.dromara.hutool.db.ds.tomcat;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.ds.AbstractDSFactory;
-import cn.hutool.db.ds.DSKeys;
-import cn.hutool.setting.Setting;
-import cn.hutool.setting.dialect.Props;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.ds.AbstractDSFactory;
+import org.dromara.hutool.db.ds.DSKeys;
+import org.dromara.hutool.setting.Setting;
+import org.dromara.hutool.setting.dialect.Props;
 import org.apache.tomcat.jdbc.pool.DataSource;
 import org.apache.tomcat.jdbc.pool.PoolProperties;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/tomcat/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/package-info.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/ds/tomcat/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/package-info.java
index d71c9a283..513a7b4ba 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/tomcat/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.ds.tomcat;
+package org.dromara.hutool.db.ds.tomcat;
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/BeanHandler.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/BeanHandler.java
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/handler/BeanHandler.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/handler/BeanHandler.java
index 8b5dd666d..471739172 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/BeanHandler.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/BeanHandler.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.handler;
+package org.dromara.hutool.db.handler;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/BeanListHandler.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/BeanListHandler.java
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/handler/BeanListHandler.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/handler/BeanListHandler.java
index 51b18a750..161356ff1 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/BeanListHandler.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/BeanListHandler.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.handler;
+package org.dromara.hutool.db.handler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/EntityHandler.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityHandler.java
similarity index 95%
rename from hutool-db/src/main/java/cn/hutool/db/handler/EntityHandler.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityHandler.java
index 00e355f9d..bd244a935 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/EntityHandler.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityHandler.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.handler;
+package org.dromara.hutool.db.handler;
 
-import cn.hutool.db.Entity;
+import org.dromara.hutool.db.Entity;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/EntityListHandler.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityListHandler.java
similarity index 95%
rename from hutool-db/src/main/java/cn/hutool/db/handler/EntityListHandler.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityListHandler.java
index 2ba6fe1d4..5d09a9450 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/EntityListHandler.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityListHandler.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.handler;
+package org.dromara.hutool.db.handler;
 
-import cn.hutool.db.Entity;
+import org.dromara.hutool.db.Entity;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/EntitySetHandler.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntitySetHandler.java
similarity index 95%
rename from hutool-db/src/main/java/cn/hutool/db/handler/EntitySetHandler.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/handler/EntitySetHandler.java
index ded597d41..1ce2258c9 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/EntitySetHandler.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntitySetHandler.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.handler;
+package org.dromara.hutool.db.handler;
 
-import cn.hutool.db.Entity;
+import org.dromara.hutool.db.Entity;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/NumberHandler.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/NumberHandler.java
similarity index 96%
rename from hutool-db/src/main/java/cn/hutool/db/handler/NumberHandler.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/handler/NumberHandler.java
index 867bfc77d..c326c04b1 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/NumberHandler.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/NumberHandler.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.handler;
+package org.dromara.hutool.db.handler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/PageResultHandler.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/PageResultHandler.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/handler/PageResultHandler.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/handler/PageResultHandler.java
index 6506b499e..7ff94f051 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/PageResultHandler.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/PageResultHandler.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.handler;
+package org.dromara.hutool.db.handler;
 
-import cn.hutool.db.Entity;
-import cn.hutool.db.PageResult;
+import org.dromara.hutool.db.Entity;
+import org.dromara.hutool.db.PageResult;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/ResultSetUtil.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/ResultSetUtil.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/handler/ResultSetUtil.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/handler/ResultSetUtil.java
index c712ba638..791d46d63 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/ResultSetUtil.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/ResultSetUtil.java
@@ -10,19 +10,19 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.handler;
+package org.dromara.hutool.db.handler;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.PropDesc;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.reflect.ConstructorUtil;
-import cn.hutool.core.reflect.MethodUtil;
-import cn.hutool.core.reflect.TypeUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.Entity;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.bean.PropDesc;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.reflect.MethodUtil;
+import org.dromara.hutool.core.reflect.TypeUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.Entity;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/RsHandler.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/RsHandler.java
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/handler/RsHandler.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/handler/RsHandler.java
index 84d7e87a8..cb6604e46 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/RsHandler.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/RsHandler.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.handler;
+package org.dromara.hutool.db.handler;
 
 import java.io.Serializable;
 import java.sql.ResultSet;
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/StringHandler.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/StringHandler.java
similarity index 96%
rename from hutool-db/src/main/java/cn/hutool/db/handler/StringHandler.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/handler/StringHandler.java
index 876cbf8db..356dcadcf 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/StringHandler.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/StringHandler.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.handler;
+package org.dromara.hutool.db.handler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/ValueListHandler.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/ValueListHandler.java
similarity index 96%
rename from hutool-db/src/main/java/cn/hutool/db/handler/ValueListHandler.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/handler/ValueListHandler.java
index 6afc8af76..5e280d2e8 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/ValueListHandler.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/ValueListHandler.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.handler;
+package org.dromara.hutool.db.handler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/handler/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/handler/package-info.java
index 5c9e8dbb3..56c29bdb7 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.handler;
+package org.dromara.hutool.db.handler;
diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/Column.java b/hutool-db/src/main/java/org/dromara/hutool/db/meta/Column.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/meta/Column.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/meta/Column.java
index 7aa3f9872..57fed4a7f
--- a/hutool-db/src/main/java/cn/hutool/db/meta/Column.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/meta/Column.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.meta;
+package org.dromara.hutool.db.meta;
 
-import cn.hutool.core.util.BooleanUtil;
-import cn.hutool.core.regex.ReUtil;
-import cn.hutool.db.DbRuntimeException;
+import org.dromara.hutool.core.util.BooleanUtil;
+import org.dromara.hutool.core.regex.ReUtil;
+import org.dromara.hutool.db.DbRuntimeException;
 
 import java.io.Serializable;
 import java.sql.ResultSet;
diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/ColumnIndexInfo.java b/hutool-db/src/main/java/org/dromara/hutool/db/meta/ColumnIndexInfo.java
similarity index 96%
rename from hutool-db/src/main/java/cn/hutool/db/meta/ColumnIndexInfo.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/meta/ColumnIndexInfo.java
index 74cbfbd3e..b861b9296 100644
--- a/hutool-db/src/main/java/cn/hutool/db/meta/ColumnIndexInfo.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/meta/ColumnIndexInfo.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.meta;
+package org.dromara.hutool.db.meta;
 
-import cn.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.DbRuntimeException;
 
 import java.io.Serializable;
 import java.sql.ResultSet;
diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/IndexInfo.java b/hutool-db/src/main/java/org/dromara/hutool/db/meta/IndexInfo.java
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/meta/IndexInfo.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/meta/IndexInfo.java
index 7eb31c02e..14f385fef 100644
--- a/hutool-db/src/main/java/cn/hutool/db/meta/IndexInfo.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/meta/IndexInfo.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.meta;
+package org.dromara.hutool.db.meta;
 
 
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/JdbcType.java b/hutool-db/src/main/java/org/dromara/hutool/db/meta/JdbcType.java
similarity index 99%
rename from hutool-db/src/main/java/cn/hutool/db/meta/JdbcType.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/meta/JdbcType.java
index 6ec9038ba..e7214bf17 100644
--- a/hutool-db/src/main/java/cn/hutool/db/meta/JdbcType.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/meta/JdbcType.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.meta;
+package org.dromara.hutool.db.meta;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java b/hutool-db/src/main/java/org/dromara/hutool/db/meta/MetaUtil.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/meta/MetaUtil.java
index f637a329b..85a24657c
--- a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/meta/MetaUtil.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.meta;
+package org.dromara.hutool.db.meta;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.Entity;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.Entity;
 
 import javax.sql.DataSource;
 import java.sql.*;
diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/ResultColumn.java b/hutool-db/src/main/java/org/dromara/hutool/db/meta/ResultColumn.java
similarity index 98%
rename from hutool-db/src/main/java/cn/hutool/db/meta/ResultColumn.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/meta/ResultColumn.java
index b7ecf9288..e4c2d4e57 100644
--- a/hutool-db/src/main/java/cn/hutool/db/meta/ResultColumn.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/meta/ResultColumn.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.meta;
+package org.dromara.hutool.db.meta;
 
-import cn.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.DbRuntimeException;
 
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/Table.java b/hutool-db/src/main/java/org/dromara/hutool/db/meta/Table.java
similarity index 99%
rename from hutool-db/src/main/java/cn/hutool/db/meta/Table.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/meta/Table.java
index 67b2d1b1c..051cb2f08 100644
--- a/hutool-db/src/main/java/cn/hutool/db/meta/Table.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/meta/Table.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.meta;
+package org.dromara.hutool.db.meta;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/TableType.java b/hutool-db/src/main/java/org/dromara/hutool/db/meta/TableType.java
similarity index 96%
rename from hutool-db/src/main/java/cn/hutool/db/meta/TableType.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/meta/TableType.java
index 1ac31f558..746badb93 100644
--- a/hutool-db/src/main/java/cn/hutool/db/meta/TableType.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/meta/TableType.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.meta;
+package org.dromara.hutool.db.meta;
 
 /**
  * 元信息中表的类型
diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/meta/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/meta/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/meta/package-info.java
index 007aefbf9..20c019389 100644
--- a/hutool-db/src/main/java/cn/hutool/db/meta/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/meta/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.meta;
+package org.dromara.hutool.db.meta;
diff --git a/hutool-db/src/main/java/cn/hutool/db/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/package-info.java
similarity index 96%
rename from hutool-db/src/main/java/cn/hutool/db/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/package-info.java
index dd1302c8d..8cf5fa3b5 100644
--- a/hutool-db/src/main/java/cn/hutool/db/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.db;
+package org.dromara.hutool.db;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/Condition.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/sql/Condition.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java
index 5d37eb7f3..e2d369d2c 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/Condition.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.exceptions.CloneRuntimeException;
-import cn.hutool.core.math.NumberUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.exceptions.CloneRuntimeException;
+import org.dromara.hutool.core.math.NumberUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.CharUtil;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/ConditionBuilder.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionBuilder.java
similarity index 91%
rename from hutool-db/src/main/java/cn/hutool/db/sql/ConditionBuilder.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionBuilder.java
index ffafb1ffe..30fc17a35 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/ConditionBuilder.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionBuilder.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.lang.builder.Builder;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.lang.builder.Builder;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/ConditionGroup.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionGroup.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/sql/ConditionGroup.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionGroup.java
index f87ac0a4a..de6e55616 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/ConditionGroup.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionGroup.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.util.List;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/Direction.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Direction.java
similarity index 95%
rename from hutool-db/src/main/java/cn/hutool/db/sql/Direction.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/Direction.java
index 83f36117f..d4bcd8b69 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/Direction.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Direction.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 排序方式（升序或者降序）
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/LogicalOperator.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/LogicalOperator.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/sql/LogicalOperator.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/LogicalOperator.java
index 4826a5a8e..91e15cc08 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/LogicalOperator.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/LogicalOperator.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 逻辑运算符
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/NamedSql.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/NamedSql.java
similarity index 96%
rename from hutool-db/src/main/java/cn/hutool/db/sql/NamedSql.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/NamedSql.java
index 48efefbaa..bdd48e617 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/NamedSql.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/NamedSql.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/Order.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Order.java
similarity index 96%
rename from hutool-db/src/main/java/cn/hutool/db/sql/Order.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/Order.java
index 99e8f2447..7cc9ba056 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/Order.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Order.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
 import java.io.Serializable;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * SQL排序对象
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/Query.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Query.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/sql/Query.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/Query.java
index 81a91f57c..8b7325f35 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/Query.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Query.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.Entity;
-import cn.hutool.db.Page;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.Entity;
+import org.dromara.hutool.db.Page;
 
 import java.util.Collection;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/QuoteWrapper.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/QuoteWrapper.java
similarity index 95%
rename from hutool-db/src/main/java/cn/hutool/db/sql/QuoteWrapper.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/QuoteWrapper.java
index 57a9481fc..c5bca679f 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/QuoteWrapper.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/QuoteWrapper.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.db.Entity;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.db.Entity;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlBuilder.java
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlBuilder.java
index cdfd512ec..c7f11a471 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlBuilder.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.lang.builder.Builder;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.Entity;
-import cn.hutool.db.dialect.DialectName;
-import cn.hutool.db.dialect.impl.OracleDialect;
+import org.dromara.hutool.core.lang.builder.Builder;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.Entity;
+import org.dromara.hutool.db.dialect.DialectName;
+import org.dromara.hutool.db.dialect.impl.OracleDialect;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlExecutor.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlExecutor.java
index 979ac0226..4f7a8719e
--- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlExecutor.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.collection.iter.ArrayIter;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.func.SerFunction;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.StatementUtil;
-import cn.hutool.db.handler.RsHandler;
+import org.dromara.hutool.core.collection.iter.ArrayIter;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.func.SerFunction;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.StatementUtil;
+import org.dromara.hutool.db.handler.RsHandler;
 
 import java.sql.*;
 import java.util.Map;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlFormatter.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlFormatter.java
similarity index 99%
rename from hutool-db/src/main/java/cn/hutool/db/sql/SqlFormatter.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlFormatter.java
index 29fb00576..169b0f298 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlFormatter.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlFormatter.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.util.HashSet;
 import java.util.LinkedList;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlLog.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlLog.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/sql/SqlLog.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlLog.java
index 4b45abbc7..640e25faa 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlLog.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlLog.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
-import cn.hutool.log.level.Level;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
+import org.dromara.hutool.log.level.Level;
 
 /**
  * SQL在日志中打印配置
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlUtil.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlUtil.java
similarity index 95%
rename from hutool-db/src/main/java/cn/hutool/db/sql/SqlUtil.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlUtil.java
index 79c1e7a45..2ba308fad 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlUtil.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlUtil.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.db.DbRuntimeException;
-import cn.hutool.db.Entity;
-import cn.hutool.db.sql.Condition.LikeType;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.db.DbRuntimeException;
+import org.dromara.hutool.db.Entity;
+import org.dromara.hutool.db.sql.Condition.LikeType;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/StatementWrapper.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementWrapper.java
similarity index 99%
rename from hutool-db/src/main/java/cn/hutool/db/sql/StatementWrapper.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementWrapper.java
index 45e028709..1d4cfaba6 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/StatementWrapper.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementWrapper.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.lang.func.Wrapper;
+import org.dromara.hutool.core.lang.func.Wrapper;
 
 import java.io.InputStream;
 import java.io.Reader;
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/cn/hutool/db/sql/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/sql/package-info.java
index e5b4dfcae..d820e1587 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
diff --git a/hutool-db/src/main/java/cn/hutool/db/transaction/TransactionLevel.java b/hutool-db/src/main/java/org/dromara/hutool/db/transaction/TransactionLevel.java
similarity index 98%
rename from hutool-db/src/main/java/cn/hutool/db/transaction/TransactionLevel.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/transaction/TransactionLevel.java
index 34dc01922..0d985ed1e 100644
--- a/hutool-db/src/main/java/cn/hutool/db/transaction/TransactionLevel.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/transaction/TransactionLevel.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.db.transaction;
+package org.dromara.hutool.db.transaction;
 
 import java.sql.Connection;
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/transaction/package-info.java b/hutool-db/src/main/java/org/dromara/hutool/db/transaction/package-info.java
similarity index 93%
rename from hutool-db/src/main/java/cn/hutool/db/transaction/package-info.java
rename to hutool-db/src/main/java/org/dromara/hutool/db/transaction/package-info.java
index ee86ae6e9..373317ace 100644
--- a/hutool-db/src/main/java/cn/hutool/db/transaction/package-info.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/transaction/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.db.transaction;
+package org.dromara.hutool.db.transaction;
diff --git a/hutool-db/src/test/java/cn/hutool/db/CRUDTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/CRUDTest.java
similarity index 93%
rename from hutool-db/src/test/java/cn/hutool/db/CRUDTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/CRUDTest.java
index 002c61ba0..fcccadf21 100644
--- a/hutool-db/src/test/java/cn/hutool/db/CRUDTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/CRUDTest.java
@@ -1,12 +1,12 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.db.handler.EntityListHandler;
-import cn.hutool.db.pojo.User;
-import cn.hutool.db.sql.Condition;
-import cn.hutool.db.sql.Condition.LikeType;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.db.handler.EntityListHandler;
+import org.dromara.hutool.db.pojo.User;
+import org.dromara.hutool.db.sql.Condition;
+import org.dromara.hutool.db.sql.Condition.LikeType;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/ConcurentTest.java
old mode 100755
new mode 100644
similarity index 74%
rename from hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/ConcurentTest.java
index 6514efd80..7f01ddb9e
--- a/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/ConcurentTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.db.handler.EntityListHandler;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.thread.ThreadUtil;
+import org.dromara.hutool.db.handler.EntityListHandler;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/DbTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/DbTest.java
similarity index 96%
rename from hutool-db/src/test/java/cn/hutool/db/DbTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/DbTest.java
index 0469116f5..2341aa545 100644
--- a/hutool-db/src/test/java/cn/hutool/db/DbTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/DbTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.db.handler.EntityListHandler;
-import cn.hutool.db.sql.Condition;
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.db.handler.EntityListHandler;
+import org.dromara.hutool.db.sql.Condition;
+import org.dromara.hutool.log.StaticLog;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/DerbyTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/DerbyTest.java
similarity index 96%
rename from hutool-db/src/test/java/cn/hutool/db/DerbyTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/DerbyTest.java
index 4dcad1bdd..4609cbf80 100644
--- a/hutool-db/src/test/java/cn/hutool/db/DerbyTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/DerbyTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
diff --git a/hutool-db/src/test/java/cn/hutool/db/DsTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/DsTest.java
similarity index 83%
rename from hutool-db/src/test/java/cn/hutool/db/DsTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/DsTest.java
index 14f264d96..e5c1278e1 100644
--- a/hutool-db/src/test/java/cn/hutool/db/DsTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/DsTest.java
@@ -1,15 +1,15 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.db.ds.DSUtil;
-import cn.hutool.db.ds.DSWrapper;
-import cn.hutool.db.ds.bee.BeeDSFactory;
-import cn.hutool.db.ds.c3p0.C3p0DSFactory;
-import cn.hutool.db.ds.dbcp.DbcpDSFactory;
-import cn.hutool.db.ds.druid.DruidDSFactory;
-import cn.hutool.db.ds.hikari.HikariDSFactory;
-import cn.hutool.db.ds.pooled.PooledDSFactory;
-import cn.hutool.db.ds.tomcat.TomcatDSFactory;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.db.ds.DSUtil;
+import org.dromara.hutool.db.ds.DSWrapper;
+import org.dromara.hutool.db.ds.bee.BeeDSFactory;
+import org.dromara.hutool.db.ds.c3p0.C3p0DSFactory;
+import org.dromara.hutool.db.ds.dbcp.DbcpDSFactory;
+import org.dromara.hutool.db.ds.druid.DruidDSFactory;
+import org.dromara.hutool.db.ds.hikari.HikariDSFactory;
+import org.dromara.hutool.db.ds.pooled.PooledDSFactory;
+import org.dromara.hutool.db.ds.tomcat.TomcatDSFactory;
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/EntityTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/EntityTest.java
similarity index 95%
rename from hutool-db/src/test/java/cn/hutool/db/EntityTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/EntityTest.java
index 76a432ab9..e25103b51 100644
--- a/hutool-db/src/test/java/cn/hutool/db/EntityTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/EntityTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.db.pojo.User;
+import org.dromara.hutool.db.pojo.User;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/cn/hutool/db/FindBeanTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/FindBeanTest.java
similarity index 95%
rename from hutool-db/src/test/java/cn/hutool/db/FindBeanTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/FindBeanTest.java
index 11b186717..3bfba214d 100644
--- a/hutool-db/src/test/java/cn/hutool/db/FindBeanTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/FindBeanTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.db.pojo.User;
+import org.dromara.hutool.db.pojo.User;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/H2Test.java b/hutool-db/src/test/java/org/dromara/hutool/db/H2Test.java
similarity index 92%
rename from hutool-db/src/test/java/cn/hutool/db/H2Test.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/H2Test.java
index 43a56341e..8f878fa8f 100644
--- a/hutool-db/src/test/java/cn/hutool/db/H2Test.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/H2Test.java
@@ -1,7 +1,7 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.map.CaseInsensitiveMap;
-import cn.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.map.CaseInsensitiveMap;
+import org.dromara.hutool.core.map.MapUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/HsqldbTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/HsqldbTest.java
similarity index 96%
rename from hutool-db/src/test/java/cn/hutool/db/HsqldbTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/HsqldbTest.java
index a856de181..f079583eb 100644
--- a/hutool-db/src/test/java/cn/hutool/db/HsqldbTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/HsqldbTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/MySQLTest.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-db/src/test/java/cn/hutool/db/MySQLTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/MySQLTest.java
index ab16a51ef..f60b07641
--- a/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/MySQLTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.lang.Console;
+import org.dromara.hutool.core.lang.Console;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/NamedSqlTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/NamedSqlTest.java
similarity index 96%
rename from hutool-db/src/test/java/cn/hutool/db/NamedSqlTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/NamedSqlTest.java
index dd018f444..7262550a8 100644
--- a/hutool-db/src/test/java/cn/hutool/db/NamedSqlTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/NamedSqlTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.db.sql.NamedSql;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.db.sql.NamedSql;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/cn/hutool/db/OracleTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/OracleTest.java
old mode 100755
new mode 100644
similarity index 89%
rename from hutool-db/src/test/java/cn/hutool/db/OracleTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/OracleTest.java
index ee0337b5d..d2a52f660
--- a/hutool-db/src/test/java/cn/hutool/db/OracleTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/OracleTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.db.sql.Query;
-import cn.hutool.db.sql.SqlBuilder;
-import cn.hutool.db.sql.SqlUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.db.sql.Query;
+import org.dromara.hutool.db.sql.SqlBuilder;
+import org.dromara.hutool.db.sql.SqlUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/PageResultTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/PageResultTest.java
similarity index 91%
rename from hutool-db/src/test/java/cn/hutool/db/PageResultTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/PageResultTest.java
index db3379ca1..ad6bd9d5e 100644
--- a/hutool-db/src/test/java/cn/hutool/db/PageResultTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/PageResultTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/PageTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/PageTest.java
similarity index 83%
rename from hutool-db/src/test/java/cn/hutool/db/PageTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/PageTest.java
index ab77da262..86245cac9 100644
--- a/hutool-db/src/test/java/cn/hutool/db/PageTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/PageTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.db.sql.Order;
+import org.dromara.hutool.db.sql.Order;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/PicTransferTest.java
similarity index 79%
rename from hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/PicTransferTest.java
index 0239b1419..4dd07a2c1 100644
--- a/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/PicTransferTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.text.StrUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/cn/hutool/db/PostgreTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/PostgreTest.java
similarity index 94%
rename from hutool-db/src/test/java/cn/hutool/db/PostgreTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/PostgreTest.java
index a90000830..d9d12b16e 100644
--- a/hutool-db/src/test/java/cn/hutool/db/PostgreTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/PostgreTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.lang.Console;
+import org.dromara.hutool.core.lang.Console;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/SessionTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/SessionTest.java
similarity index 94%
rename from hutool-db/src/test/java/cn/hutool/db/SessionTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/SessionTest.java
index 66aca432c..9f91cdbbf 100644
--- a/hutool-db/src/test/java/cn/hutool/db/SessionTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/SessionTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/SqlServerTest.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/SqlServerTest.java
index d93ff8017..d1d25ce0c
--- a/hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/SqlServerTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
-import cn.hutool.core.lang.Console;
+import org.dromara.hutool.core.lang.Console;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/cn/hutool/db/UpdateTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/UpdateTest.java
similarity index 95%
rename from hutool-db/src/test/java/cn/hutool/db/UpdateTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/UpdateTest.java
index b53452bf4..10c7d7de9 100644
--- a/hutool-db/src/test/java/cn/hutool/db/UpdateTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/UpdateTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.db;
+package org.dromara.hutool.db;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/hutool-db/src/test/java/cn/hutool/db/dialect/DialectFactoryTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/dialect/DialectFactoryTest.java
old mode 100755
new mode 100644
similarity index 89%
rename from hutool-db/src/test/java/cn/hutool/db/dialect/DialectFactoryTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/dialect/DialectFactoryTest.java
index f01dcd20a..2df53bdb2
--- a/hutool-db/src/test/java/cn/hutool/db/dialect/DialectFactoryTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/dialect/DialectFactoryTest.java
@@ -1,13 +1,13 @@
-package cn.hutool.db.dialect;
+package org.dromara.hutool.db.dialect;
 
-import cn.hutool.core.util.RandomUtil;
+import org.dromara.hutool.core.util.RandomUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static cn.hutool.db.dialect.DriverNamePool.*;
+import static org.dromara.hutool.db.dialect.DriverNamePool.*;
 
 public class DialectFactoryTest {
 
diff --git a/hutool-db/src/test/java/cn/hutool/db/dialect/DriverUtilTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/dialect/DriverUtilTest.java
similarity index 91%
rename from hutool-db/src/test/java/cn/hutool/db/dialect/DriverUtilTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/dialect/DriverUtilTest.java
index 46cfd08e2..195acb005 100644
--- a/hutool-db/src/test/java/cn/hutool/db/dialect/DriverUtilTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/dialect/DriverUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.db.dialect;
+package org.dromara.hutool.db.dialect;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/ds/DataSourceWrapperTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/ds/DataSourceWrapperTest.java
similarity index 84%
rename from hutool-db/src/test/java/cn/hutool/db/ds/DataSourceWrapperTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/ds/DataSourceWrapperTest.java
index f9478f984..9ee68e790 100644
--- a/hutool-db/src/test/java/cn/hutool/db/ds/DataSourceWrapperTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/ds/DataSourceWrapperTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.db.ds;
+package org.dromara.hutool.db.ds;
 
-import cn.hutool.db.ds.simple.SimpleDataSource;
+import org.dromara.hutool.db.ds.simple.SimpleDataSource;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/meta/MetaUtilTest.java
similarity index 81%
rename from hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/meta/MetaUtilTest.java
index 973bf662d..1b30ec753 100644
--- a/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/meta/MetaUtilTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.db.meta;
+package org.dromara.hutool.db.meta;
 
-import cn.hutool.core.collection.SetUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.db.ds.DSUtil;
+import org.dromara.hutool.core.collection.SetUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.db.ds.DSUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/cn/hutool/db/pojo/User.java b/hutool-db/src/test/java/org/dromara/hutool/db/pojo/User.java
similarity index 87%
rename from hutool-db/src/test/java/cn/hutool/db/pojo/User.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/pojo/User.java
index d3a3d8daa..f2839af0e 100644
--- a/hutool-db/src/test/java/cn/hutool/db/pojo/User.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/pojo/User.java
@@ -1,4 +1,4 @@
-package cn.hutool.db.pojo;
+package org.dromara.hutool.db.pojo;
 
 import lombok.Data;
 
diff --git a/hutool-db/src/test/java/cn/hutool/db/pojo/package-info.java b/hutool-db/src/test/java/org/dromara/hutool/db/pojo/package-info.java
similarity index 93%
rename from hutool-db/src/test/java/cn/hutool/db/pojo/package-info.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/pojo/package-info.java
index cb14388b8..25103f81b 100644
--- a/hutool-db/src/test/java/cn/hutool/db/pojo/package-info.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/pojo/package-info.java
@@ -13,4 +13,4 @@
 /**
  * 测试pojo
  */
-package cn.hutool.db.pojo;
+package org.dromara.hutool.db.pojo;
diff --git a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionBuilderTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionBuilderTest.java
similarity index 95%
rename from hutool-db/src/test/java/cn/hutool/db/sql/ConditionBuilderTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionBuilderTest.java
index 4cef47d0f..365c59cc1 100644
--- a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionBuilderTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionBuilderTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionGroupTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionGroupTest.java
similarity index 91%
rename from hutool-db/src/test/java/cn/hutool/db/sql/ConditionGroupTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionGroupTest.java
index bc5e89f0c..ffd3fa2fa 100644
--- a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionGroupTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionGroupTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
-import cn.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.collection.ListUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionTest.java
similarity index 98%
rename from hutool-db/src/test/java/cn/hutool/db/sql/ConditionTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionTest.java
index a723abf3d..9b0f0e936 100644
--- a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/sql/SqlBuilderTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/sql/SqlBuilderTest.java
similarity index 98%
rename from hutool-db/src/test/java/cn/hutool/db/sql/SqlBuilderTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/sql/SqlBuilderTest.java
index abf0388d3..ab4b31053 100644
--- a/hutool-db/src/test/java/cn/hutool/db/sql/SqlBuilderTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/sql/SqlBuilderTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/cn/hutool/db/sql/SqlFormatterTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/sql/SqlFormatterTest.java
old mode 100755
new mode 100644
similarity index 88%
rename from hutool-db/src/test/java/cn/hutool/db/sql/SqlFormatterTest.java
rename to hutool-db/src/test/java/org/dromara/hutool/db/sql/SqlFormatterTest.java
index 676cebf09..a81115dcc
--- a/hutool-db/src/test/java/cn/hutool/db/sql/SqlFormatterTest.java
+++ b/hutool-db/src/test/java/org/dromara/hutool/db/sql/SqlFormatterTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.db.sql;
+package org.dromara.hutool.db.sql;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index 5f1fd8bfd..3e3db7e6a 100755
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -19,7 +19,7 @@
 	jar
 
 	
-		cn.hutool
+		org.dromara.hutool
 		hutool-parent
 		6.0.0.M3
 	
@@ -29,7 +29,7 @@
 	Hutool 扩展工具类（提供其它类库的封装）
 
 	
-		cn.hutool.extra
+		org.dromara.hutool.extra
 		
 		2.3
 		3.14.1.RELEASE
@@ -49,17 +49,17 @@
 
 	
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-core
 			${project.parent.version}
 		
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-swing
 			${project.parent.version}
 		
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-setting
 			${project.parent.version}
 		
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/ProxyUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyUtil.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/ProxyUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyUtil.java
index 0b4b6dcf0..a04d022bc
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/ProxyUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyUtil.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.aop;
+package org.dromara.hutool.extra.aop;
 
-import cn.hutool.core.classloader.ClassLoaderUtil;
-import cn.hutool.extra.aop.aspects.Aspect;
-import cn.hutool.extra.aop.proxy.ProxyFactory;
+import org.dromara.hutool.core.classloader.ClassLoaderUtil;
+import org.dromara.hutool.extra.aop.aspects.Aspect;
+import org.dromara.hutool.extra.aop.proxy.ProxyFactory;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/Aspect.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/Aspect.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/Aspect.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/Aspect.java
index 92212655d..e318b5604
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/Aspect.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/Aspect.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.aop.aspects;
+package org.dromara.hutool.extra.aop.aspects;
 
 import java.lang.reflect.Method;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/SimpleAspect.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/SimpleAspect.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/SimpleAspect.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/SimpleAspect.java
index 5c682a164..3180de73f
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/SimpleAspect.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/SimpleAspect.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.aop.aspects;
+package org.dromara.hutool.extra.aop.aspects;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/TimeIntervalAspect.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/TimeIntervalAspect.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/TimeIntervalAspect.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/TimeIntervalAspect.java
index e3e24def5..00e5d0299
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/TimeIntervalAspect.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/TimeIntervalAspect.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.aop.aspects;
+package org.dromara.hutool.extra.aop.aspects;
 
-import cn.hutool.core.date.StopWatch;
-import cn.hutool.core.lang.Console;
+import org.dromara.hutool.core.date.StopWatch;
+import org.dromara.hutool.core.lang.Console;
 
 import java.lang.reflect.Method;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/package-info.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/package-info.java
index 4b6550a46..e52cd480d
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/aspects/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.aop.aspects;
+package org.dromara.hutool.extra.aop.aspects;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/CglibInterceptor.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/CglibInterceptor.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/CglibInterceptor.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/CglibInterceptor.java
index ddec3fd93..4667c5b91
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/CglibInterceptor.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/CglibInterceptor.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.aop.interceptor;
+package org.dromara.hutool.extra.aop.interceptor;
 
-import cn.hutool.extra.aop.aspects.Aspect;
+import org.dromara.hutool.extra.aop.aspects.Aspect;
 import net.sf.cglib.proxy.MethodInterceptor;
 import net.sf.cglib.proxy.MethodProxy;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/JdkInterceptor.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/JdkInterceptor.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/JdkInterceptor.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/JdkInterceptor.java
index 885ee1c91..93e59afa2
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/JdkInterceptor.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/JdkInterceptor.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.aop.interceptor;
+package org.dromara.hutool.extra.aop.interceptor;
 
-import cn.hutool.core.reflect.ModifierUtil;
-import cn.hutool.core.reflect.ReflectUtil;
-import cn.hutool.extra.aop.aspects.Aspect;
+import org.dromara.hutool.core.reflect.ModifierUtil;
+import org.dromara.hutool.core.reflect.ReflectUtil;
+import org.dromara.hutool.extra.aop.aspects.Aspect;
 
 import java.io.Serializable;
 import java.lang.reflect.InvocationHandler;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/SpringCglibInterceptor.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/SpringCglibInterceptor.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/SpringCglibInterceptor.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/SpringCglibInterceptor.java
index 35cceff60..c111c42f9
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/SpringCglibInterceptor.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/SpringCglibInterceptor.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.aop.interceptor;
+package org.dromara.hutool.extra.aop.interceptor;
 
-import cn.hutool.extra.aop.aspects.Aspect;
+import org.dromara.hutool.extra.aop.aspects.Aspect;
 import org.springframework.cglib.proxy.MethodInterceptor;
 import org.springframework.cglib.proxy.MethodProxy;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/package-info.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/package-info.java
index 6f89460f3..85b3f0ec0
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/interceptor/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.aop.interceptor;
+package org.dromara.hutool.extra.aop.interceptor;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/package-info.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/package-info.java
index 1276a0b88..ee66f4d60
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.aop;
+package org.dromara.hutool.extra.aop;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/CglibProxyFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/CglibProxyFactory.java
old mode 100755
new mode 100644
similarity index 86%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/CglibProxyFactory.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/CglibProxyFactory.java
index 291b321d6..b2636edfa
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/CglibProxyFactory.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/CglibProxyFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.aop.proxy;
+package org.dromara.hutool.extra.aop.proxy;
 
-import cn.hutool.extra.aop.aspects.Aspect;
-import cn.hutool.extra.aop.interceptor.CglibInterceptor;
+import org.dromara.hutool.extra.aop.aspects.Aspect;
+import org.dromara.hutool.extra.aop.interceptor.CglibInterceptor;
 import net.sf.cglib.proxy.Enhancer;
 
 /**
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/JdkProxyFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/JdkProxyFactory.java
old mode 100755
new mode 100644
similarity index 81%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/JdkProxyFactory.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/JdkProxyFactory.java
index 78ad1146a..5b8d370cb
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/JdkProxyFactory.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/JdkProxyFactory.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.aop.proxy;
+package org.dromara.hutool.extra.aop.proxy;
 
-import cn.hutool.extra.aop.ProxyUtil;
-import cn.hutool.extra.aop.aspects.Aspect;
-import cn.hutool.extra.aop.interceptor.JdkInterceptor;
+import org.dromara.hutool.extra.aop.ProxyUtil;
+import org.dromara.hutool.extra.aop.aspects.Aspect;
+import org.dromara.hutool.extra.aop.interceptor.JdkInterceptor;
 
 /**
  * JDK实现的切面代理
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/ProxyFactory.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/ProxyFactory.java
index 48ed40a8f..54cb7bd76
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/ProxyFactory.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.aop.proxy;
+package org.dromara.hutool.extra.aop.proxy;
 
-import cn.hutool.core.reflect.ConstructorUtil;
-import cn.hutool.core.util.ServiceLoaderUtil;
-import cn.hutool.extra.aop.aspects.Aspect;
+import org.dromara.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.util.ServiceLoaderUtil;
+import org.dromara.hutool.extra.aop.aspects.Aspect;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/SpringCglibProxyFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/SpringCglibProxyFactory.java
old mode 100755
new mode 100644
similarity index 86%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/SpringCglibProxyFactory.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/SpringCglibProxyFactory.java
index b2fadd36d..05b5d880d
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/SpringCglibProxyFactory.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/SpringCglibProxyFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.aop.proxy;
+package org.dromara.hutool.extra.aop.proxy;
 
-import cn.hutool.extra.aop.aspects.Aspect;
-import cn.hutool.extra.aop.interceptor.SpringCglibInterceptor;
+import org.dromara.hutool.extra.aop.aspects.Aspect;
+import org.dromara.hutool.extra.aop.interceptor.SpringCglibInterceptor;
 import org.springframework.cglib.proxy.Enhancer;
 
 /**
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/package-info.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/package-info.java
index 9db25099a..87e2969b6
--- a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.aop.proxy;
+package org.dromara.hutool.extra.aop.proxy;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/cglib/BeanCopierCache.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/BeanCopierCache.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/cglib/BeanCopierCache.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/BeanCopierCache.java
index 38421291d..9155de2dc
--- a/hutool-extra/src/main/java/cn/hutool/extra/cglib/BeanCopierCache.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/BeanCopierCache.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.cglib;
+package org.dromara.hutool.extra.cglib;
 
-import cn.hutool.core.map.WeakConcurrentMap;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.map.WeakConcurrentMap;
+import org.dromara.hutool.core.text.StrUtil;
 import net.sf.cglib.beans.BeanCopier;
 import net.sf.cglib.core.Converter;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/cglib/CglibUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/CglibUtil.java
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/cglib/CglibUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/CglibUtil.java
index c57e55429..543df6c0c 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/cglib/CglibUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/CglibUtil.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.cglib;
+package org.dromara.hutool.extra.cglib;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.reflect.ConstructorUtil;
 import net.sf.cglib.beans.BeanCopier;
 import net.sf.cglib.beans.BeanMap;
 import net.sf.cglib.core.Converter;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/cglib/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/cglib/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/package-info.java
index 99622536e..a2e611278 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/cglib/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.cglib;
+package org.dromara.hutool.extra.cglib;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/compress/CompressException.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java
index 6dfa724ad..7506c9520 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.compress;
+package org.dromara.hutool.extra.compress;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 压缩解压异常语言异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressUtil.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressUtil.java
index f247a4aed..cc29ab076 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressUtil.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.compress;
+package org.dromara.hutool.extra.compress;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.compress.archiver.Archiver;
-import cn.hutool.extra.compress.archiver.SevenZArchiver;
-import cn.hutool.extra.compress.archiver.StreamArchiver;
-import cn.hutool.extra.compress.extractor.Extractor;
-import cn.hutool.extra.compress.extractor.SevenZExtractor;
-import cn.hutool.extra.compress.extractor.StreamExtractor;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.compress.archiver.Archiver;
+import org.dromara.hutool.extra.compress.archiver.SevenZArchiver;
+import org.dromara.hutool.extra.compress.archiver.StreamArchiver;
+import org.dromara.hutool.extra.compress.extractor.Extractor;
+import org.dromara.hutool.extra.compress.extractor.SevenZExtractor;
+import org.dromara.hutool.extra.compress.extractor.StreamExtractor;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
 import org.apache.commons.compress.archivers.StreamingNotSupportedException;
 import org.apache.commons.compress.compressors.CompressorException;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/Archiver.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/Archiver.java
index bacfd2a97..6a1879da4
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/Archiver.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.compress.archiver;
+package org.dromara.hutool.extra.compress.archiver;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/SevenZArchiver.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/SevenZArchiver.java
index 320939ebf..c24be5a11
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/SevenZArchiver.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.compress.archiver;
+package org.dromara.hutool.extra.compress.archiver;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
 import org.apache.commons.compress.archivers.sevenz.SevenZOutputFile;
 import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/StreamArchiver.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/StreamArchiver.java
index ba5f16f61..d62539882
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/StreamArchiver.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.compress.archiver;
+package org.dromara.hutool.extra.compress.archiver;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.extra.compress.CompressException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.extra.compress.CompressException;
 import org.apache.commons.compress.archivers.ArchiveException;
 import org.apache.commons.compress.archivers.ArchiveOutputStream;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/package-info.java
index 59b239481..c0ea256fa 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/package-info.java
@@ -20,4 +20,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.compress.archiver;
+package org.dromara.hutool.extra.compress.archiver;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Extractor.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/Extractor.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Extractor.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/Extractor.java
index 6dd98c944..74ae32f05
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Extractor.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/Extractor.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.compress.extractor;
+package org.dromara.hutool.extra.compress.extractor;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 import org.apache.commons.compress.archivers.ArchiveEntry;
 
 import java.io.Closeable;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Seven7EntryInputStream.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/Seven7EntryInputStream.java
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Seven7EntryInputStream.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/Seven7EntryInputStream.java
index 8a9713fd3..7c91f2774 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Seven7EntryInputStream.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/Seven7EntryInputStream.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.compress.extractor;
+package org.dromara.hutool.extra.compress.extractor;
 
 import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry;
 import org.apache.commons.compress.archivers.sevenz.SevenZFile;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/SevenZExtractor.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/SevenZExtractor.java
index 0d6eb88d9..4d8a148c4
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/SevenZExtractor.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.compress.extractor;
+package org.dromara.hutool.extra.compress.extractor;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Assert;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Assert;
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry;
 import org.apache.commons.compress.archivers.sevenz.SevenZFile;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/StreamExtractor.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/StreamExtractor.java
index c9360ac75..75641f698
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/StreamExtractor.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.compress.extractor;
+package org.dromara.hutool.extra.compress.extractor;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.compress.CompressException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.compress.CompressException;
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveException;
 import org.apache.commons.compress.archivers.ArchiveInputStream;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/package-info.java
index a797e40d7..af5f9e2c6 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/package-info.java
@@ -20,4 +20,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.compress.extractor;
+package org.dromara.hutool.extra.compress.extractor;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/package-info.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/compress/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/compress/package-info.java
index 12afada02..c163a3ebb 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/compress/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/package-info.java
@@ -22,4 +22,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.compress;
+package org.dromara.hutool.extra.compress;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/emoji/EmojiUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/emoji/EmojiUtil.java
similarity index 99%
rename from hutool-extra/src/main/java/cn/hutool/extra/emoji/EmojiUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/emoji/EmojiUtil.java
index 802bff7a0..9a0fa6371 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/emoji/EmojiUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/emoji/EmojiUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.emoji;
+package org.dromara.hutool.extra.emoji;
 
 import com.vdurmont.emoji.Emoji;
 import com.vdurmont.emoji.EmojiManager;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/emoji/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/emoji/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/emoji/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/emoji/package-info.java
index 746669467..d662a6af5 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/emoji/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/emoji/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.emoji;
+package org.dromara.hutool.extra.emoji;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/ExpressionEngine.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/ExpressionEngine.java
index b0159e6ee..f7eeefeae 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/ExpressionEngine.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.expression;
+package org.dromara.hutool.extra.expression;
 
 import java.util.Map;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/ExpressionException.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionException.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/ExpressionException.java
index e22655e38..dd9f9e08a 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/ExpressionException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.expression;
+package org.dromara.hutool.extra.expression;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 表达式语言异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/ExpressionUtil.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/ExpressionUtil.java
index 2f88808f1..e151e7b71 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/ExpressionUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/ExpressionUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.expression;
+package org.dromara.hutool.extra.expression;
 
-import cn.hutool.extra.expression.engine.ExpressionFactory;
+import org.dromara.hutool.extra.expression.engine.ExpressionFactory;
 
 import java.util.Map;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/ExpressionFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/ExpressionFactory.java
similarity index 83%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/ExpressionFactory.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/ExpressionFactory.java
index 73961cdf3..9c03e6ac8 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/ExpressionFactory.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/ExpressionFactory.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.expression.engine;
+package org.dromara.hutool.extra.expression.engine;
 
-import cn.hutool.core.lang.Singleton;
-import cn.hutool.core.util.ServiceLoaderUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.core.lang.Singleton;
+import org.dromara.hutool.core.util.ServiceLoaderUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.StaticLog;
 
-import cn.hutool.extra.expression.ExpressionEngine;
-import cn.hutool.extra.expression.ExpressionException;
+import org.dromara.hutool.extra.expression.ExpressionEngine;
+import org.dromara.hutool.extra.expression.ExpressionException;
 
 /**
  * 表达式语言引擎工厂类，用于根据用户引入的表达式jar，自动创建对应的引擎对象
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/aviator/AviatorEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/aviator/AviatorEngine.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/aviator/AviatorEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/aviator/AviatorEngine.java
index 35d6ba300..f58a39e58 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/aviator/AviatorEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/aviator/AviatorEngine.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.expression.engine.aviator;
+package org.dromara.hutool.extra.expression.engine.aviator;
 
-import cn.hutool.extra.expression.ExpressionEngine;
+import org.dromara.hutool.extra.expression.ExpressionEngine;
 import com.googlecode.aviator.AviatorEvaluator;
 import com.googlecode.aviator.AviatorEvaluatorInstance;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/aviator/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/aviator/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/aviator/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/aviator/package-info.java
index 4f7c281a7..eec2fa611 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/aviator/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/aviator/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.expression.engine.aviator;
+package org.dromara.hutool.extra.expression.engine.aviator;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/jexl/JexlEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/jexl/JexlEngine.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/jexl/JexlEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/jexl/JexlEngine.java
index d9551bbca..725c1c8eb 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/jexl/JexlEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/jexl/JexlEngine.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.expression.engine.jexl;
+package org.dromara.hutool.extra.expression.engine.jexl;
 
-import cn.hutool.extra.expression.ExpressionEngine;
+import org.dromara.hutool.extra.expression.ExpressionEngine;
 import org.apache.commons.jexl3.JexlBuilder;
 import org.apache.commons.jexl3.MapContext;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/jexl/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/jexl/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/jexl/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/jexl/package-info.java
index 0d057ba8e..f812fffc3 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/jexl/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/jexl/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.expression.engine.jexl;
+package org.dromara.hutool.extra.expression.engine.jexl;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/jfireel/JfireELEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/jfireel/JfireELEngine.java
similarity index 89%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/jfireel/JfireELEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/jfireel/JfireELEngine.java
index cbbd8e062..261ce8059 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/jfireel/JfireELEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/jfireel/JfireELEngine.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.expression.engine.jfireel;
+package org.dromara.hutool.extra.expression.engine.jfireel;
 
-import cn.hutool.extra.expression.ExpressionEngine;
+import org.dromara.hutool.extra.expression.ExpressionEngine;
 import com.jfirer.jfireel.expression.Expression;
 
 import java.util.Map;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/jfireel/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/jfireel/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/jfireel/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/jfireel/package-info.java
index 3baf21e66..f72fd98f7 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/jfireel/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/jfireel/package-info.java
@@ -16,4 +16,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.expression.engine.jfireel;
+package org.dromara.hutool.extra.expression.engine.jfireel;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/mvel/MvelEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/mvel/MvelEngine.java
similarity index 89%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/mvel/MvelEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/mvel/MvelEngine.java
index 474d97cc2..bd41ca913 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/mvel/MvelEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/mvel/MvelEngine.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.expression.engine.mvel;
+package org.dromara.hutool.extra.expression.engine.mvel;
 
-import cn.hutool.extra.expression.ExpressionEngine;
+import org.dromara.hutool.extra.expression.ExpressionEngine;
 import org.mvel2.MVEL;
 
 import java.util.Map;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/mvel/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/mvel/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/mvel/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/mvel/package-info.java
index 788cd7112..102f77979 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/mvel/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/mvel/package-info.java
@@ -16,4 +16,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.expression.engine.mvel;
+package org.dromara.hutool.extra.expression.engine.mvel;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/package-info.java
index f4f258f53..8f620bbc7 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.expression;
+package org.dromara.hutool.extra.expression.engine;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/qlexpress/QLExpressEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/qlexpress/QLExpressEngine.java
old mode 100755
new mode 100644
similarity index 87%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/qlexpress/QLExpressEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/qlexpress/QLExpressEngine.java
index 49f1a4c1f..6b9c34b7f
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/qlexpress/QLExpressEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/qlexpress/QLExpressEngine.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.expression.engine.qlexpress;
+package org.dromara.hutool.extra.expression.engine.qlexpress;
 
-import cn.hutool.extra.expression.ExpressionEngine;
-import cn.hutool.extra.expression.ExpressionException;
+import org.dromara.hutool.extra.expression.ExpressionEngine;
+import org.dromara.hutool.extra.expression.ExpressionException;
 import com.ql.util.express.DefaultContext;
 import com.ql.util.express.ExpressRunner;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/qlexpress/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/qlexpress/package-info.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/qlexpress/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/qlexpress/package-info.java
index ce227241a..8fb23292f
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/qlexpress/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/qlexpress/package-info.java
@@ -16,4 +16,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.expression.engine.qlexpress;
+package org.dromara.hutool.extra.expression.engine.qlexpress;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/rhino/RhinoEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/rhino/RhinoEngine.java
similarity index 89%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/rhino/RhinoEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/rhino/RhinoEngine.java
index 5218d3429..a26b2dea9 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/rhino/RhinoEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/rhino/RhinoEngine.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.expression.engine.rhino;
+package org.dromara.hutool.extra.expression.engine.rhino;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.extra.expression.ExpressionEngine;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.extra.expression.ExpressionEngine;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/rhino/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/rhino/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/rhino/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/rhino/package-info.java
index f5ae9caeb..d5604c8c4 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/rhino/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/rhino/package-info.java
@@ -16,4 +16,4 @@
  *
  * @author lzpeng
  */
-package cn.hutool.extra.expression.engine.rhino;
+package org.dromara.hutool.extra.expression.engine.rhino;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/spel/SpELEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/spel/SpELEngine.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/spel/SpELEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/spel/SpELEngine.java
index 368dff664..365ada4f7 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/spel/SpELEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/spel/SpELEngine.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.expression.engine.spel;
+package org.dromara.hutool.extra.expression.engine.spel;
 
-import cn.hutool.extra.expression.ExpressionEngine;
+import org.dromara.hutool.extra.expression.ExpressionEngine;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/spel/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/spel/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/spel/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/spel/package-info.java
index 352a66ae7..699abee7e 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/spel/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/spel/package-info.java
@@ -16,4 +16,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.expression.engine.spel;
+package org.dromara.hutool.extra.expression.engine.spel;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/expression/engine/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/expression/package-info.java
index 3b0a94fb2..6e68a59b3 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.expression.engine;
+package org.dromara.hutool.extra.expression;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/AbstractFtp.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/ftp/AbstractFtp.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java
index 096f50140..f36225049 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/AbstractFtp.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ftp;
+package org.dromara.hutool.extra.ftp;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.file.FileNameUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.file.FileNameUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/Ftp.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/Ftp.java
index 8c0d31bc1..77bcbd90e
--- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/Ftp.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ftp;
+package org.dromara.hutool.extra.ftp;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.file.FileNameUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.file.FileNameUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPClientConfig;
 import org.apache.commons.net.ftp.FTPFile;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpConfig.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpConfig.java
similarity index 99%
rename from hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpConfig.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpConfig.java
index 5623d6778..7d24ded12 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpConfig.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpConfig.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ftp;
+package org.dromara.hutool.extra.ftp;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpException.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpException.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpException.java
index e824cb6b3..e0e81a80a 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ftp;
+package org.dromara.hutool.extra.ftp;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * Ftp异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpMode.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpMode.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpMode.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpMode.java
index 7e33f5de4..5dd025e8b 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpMode.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpMode.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ftp;
+package org.dromara.hutool.extra.ftp;
 
 /**
  * FTP连接模式
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/SimpleFtpServer.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/SimpleFtpServer.java
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/ftp/SimpleFtpServer.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/SimpleFtpServer.java
index 79fa83902..9e6c90b91 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/SimpleFtpServer.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/SimpleFtpServer.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ftp;
+package org.dromara.hutool.extra.ftp;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.net.NetUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.net.NetUtil;
 import org.apache.ftpserver.ConnectionConfig;
 import org.apache.ftpserver.FtpServerFactory;
 import org.apache.ftpserver.ftplet.Authority;
@@ -227,7 +227,7 @@ public class SimpleFtpServer {
 		try {
 			serverFactory.createServer().start();
 		} catch (final org.apache.ftpserver.ftplet.FtpException e) {
-			throw new cn.hutool.extra.ftp.FtpException(e);
+			throw new FtpException(e);
 		}
 	}
 }
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/ftp/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/package-info.java
index 8f0b28eb4..e8689405c 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.ftp;
+package org.dromara.hutool.extra.ftp;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/GlobalMailAccount.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/GlobalMailAccount.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/mail/GlobalMailAccount.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/mail/GlobalMailAccount.java
index de3c74a1c..8e277a233 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/GlobalMailAccount.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/GlobalMailAccount.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.mail;
+package org.dromara.hutool.extra.mail;
 
-import cn.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IORuntimeException;
 
 /**
  * 全局邮件帐户，依赖于邮件配置文件{@link MailAccount#MAIL_SETTING_PATHS}
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/InternalMailUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/InternalMailUtil.java
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/mail/InternalMailUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/mail/InternalMailUtil.java
index 2570874eb..2c16d9ce8 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/InternalMailUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/InternalMailUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.mail;
+package org.dromara.hutool.extra.mail;
 
-import cn.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
 
 import jakarta.mail.internet.AddressException;
 import jakarta.mail.internet.InternetAddress;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/Mail.java
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/mail/Mail.java
index 2f10383ed..9ed2d2a8d 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/Mail.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.mail;
+package org.dromara.hutool.extra.mail;
 
-import cn.hutool.core.lang.builder.Builder;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.lang.builder.Builder;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import jakarta.activation.DataHandler;
 import jakarta.activation.DataSource;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java
index 26d1be76d..67ff85011
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.mail;
+package org.dromara.hutool.extra.mail;
 
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.setting.Setting;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailException.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/mail/MailException.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailException.java
index 33da6e821..05dd3e538 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.mail;
+package org.dromara.hutool.extra.mail;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 邮件异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailUtil.java
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailUtil.java
index b78413069..899d32738 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailUtil.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.mail;
+package org.dromara.hutool.extra.mail;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 import jakarta.mail.Authenticator;
 import jakarta.mail.Session;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/UserPassAuthenticator.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/UserPassAuthenticator.java
similarity index 96%
rename from hutool-extra/src/main/java/cn/hutool/extra/mail/UserPassAuthenticator.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/mail/UserPassAuthenticator.java
index 2f21eb901..0362f924b 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/UserPassAuthenticator.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/UserPassAuthenticator.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.mail;
+package org.dromara.hutool.extra.mail;
 
 import jakarta.mail.Authenticator;
 import jakarta.mail.PasswordAuthentication;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/mail/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/mail/package-info.java
index 2d50e0dd9..f6c157bbf 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.mail;
+package org.dromara.hutool.extra.mail;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/HostInfo.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/HostInfo.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/HostInfo.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/HostInfo.java
index 4dc5f7fbc..ace376f83 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/HostInfo.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/HostInfo.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.net.NetUtil;
+import org.dromara.hutool.core.net.NetUtil;
 
 import java.io.Serializable;
 import java.net.InetAddress;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/JavaInfo.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaInfo.java
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/JavaInfo.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaInfo.java
index 3872ef313..8637f4be0 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/JavaInfo.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaInfo.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.SystemUtil;
+import org.dromara.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.SystemUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/JavaRuntimeInfo.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaRuntimeInfo.java
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/JavaRuntimeInfo.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaRuntimeInfo.java
index 63e0715de..244f9f8e7 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/JavaRuntimeInfo.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaRuntimeInfo.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.core.util.SystemUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.core.util.SystemUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/JavaSpecInfo.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaSpecInfo.java
similarity index 96%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/JavaSpecInfo.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaSpecInfo.java
index 842e752ec..3780c6121 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/JavaSpecInfo.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaSpecInfo.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.util.SystemUtil;
+import org.dromara.hutool.core.util.SystemUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/JvmInfo.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JvmInfo.java
similarity index 96%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/JvmInfo.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/JvmInfo.java
index b26e1214d..4c5f4b899 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/JvmInfo.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JvmInfo.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.util.SystemUtil;
+import org.dromara.hutool.core.util.SystemUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/JvmSpecInfo.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JvmSpecInfo.java
similarity index 96%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/JvmSpecInfo.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/JvmSpecInfo.java
index ab79c1630..45d9b020f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/JvmSpecInfo.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JvmSpecInfo.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.util.SystemUtil;
+import org.dromara.hutool.core.util.SystemUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/ManagementException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementException.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/ManagementException.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementException.java
index 2f60f27e3..f4f2d1154 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/ManagementException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * FtpException异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/ManagementUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementUtil.java
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/ManagementUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementUtil.java
index d69ced847..685e51ff9 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/ManagementUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementUtil.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.Singleton;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.lang.Singleton;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/OsInfo.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/OsInfo.java
similarity index 99%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/OsInfo.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/OsInfo.java
index e2e56e48d..f1a747587 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/OsInfo.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/OsInfo.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.util.SystemUtil;
+import org.dromara.hutool.core.util.SystemUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/RuntimeInfo.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/RuntimeInfo.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/RuntimeInfo.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/RuntimeInfo.java
index 403fb502d..061b0cc11 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/RuntimeInfo.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/RuntimeInfo.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/SystemPropsKeys.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/SystemPropsKeys.java
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/SystemPropsKeys.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/SystemPropsKeys.java
index 0988984b5..4a67a18c6 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/SystemPropsKeys.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/SystemPropsKeys.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
 /**
  * 系统属性名称常量池
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/UserInfo.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/UserInfo.java
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/UserInfo.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/UserInfo.java
index c487e8329..5e290f0ca 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/UserInfo.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/UserInfo.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.SystemUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.SystemUtil;
 
 import java.io.File;
 import java.io.Serializable;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/oshi/CpuInfo.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/CpuInfo.java
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/oshi/CpuInfo.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/CpuInfo.java
index 6dc060629..cc8b885ac 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/oshi/CpuInfo.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/CpuInfo.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management.oshi;
+package org.dromara.hutool.extra.management.oshi;
 
-import cn.hutool.core.math.NumberUtil;
+import org.dromara.hutool.core.math.NumberUtil;
 import oshi.hardware.CentralProcessor;
 
 import java.text.DecimalFormat;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/oshi/CpuTicks.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/CpuTicks.java
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/oshi/CpuTicks.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/CpuTicks.java
index d76cb5eb8..b15616dd1 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/oshi/CpuTicks.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/CpuTicks.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management.oshi;
+package org.dromara.hutool.extra.management.oshi;
 
 import oshi.hardware.CentralProcessor;
 import oshi.util.Util;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/oshi/OshiUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/OshiUtil.java
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/oshi/OshiUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/OshiUtil.java
index c5770cf0b..ab904d679 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/oshi/OshiUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/OshiUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.management.oshi;
+package org.dromara.hutool.extra.management.oshi;
 
 import oshi.SystemInfo;
 import oshi.hardware.CentralProcessor;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/oshi/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/oshi/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/package-info.java
index 7171af910..9293d8696 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/oshi/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/package-info.java
@@ -17,4 +17,4 @@
  * @author Looly
  * @since 4.6.4
  */
-package cn.hutool.extra.management.oshi;
+package org.dromara.hutool.extra.management.oshi;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/management/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/management/package-info.java
index 099754956..1762ac13c 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/package-info.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/package-info.java
index fc4e9fb9d..2ec6e65d8 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra;
+package org.dromara.hutool.extra;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinEngine.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinEngine.java
index 678dcfe1b..186085cf0 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinEngine.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.pinyin;
+package org.dromara.hutool.extra.pinyin;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
 
 import java.util.List;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinException.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinException.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinException.java
index 3151aaaf6..0bc98135b 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.pinyin;
+package org.dromara.hutool.extra.pinyin;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 模板异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinUtil.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinUtil.java
index 43f52c67f..d7df1ae22 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinUtil.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.pinyin;
+package org.dromara.hutool.extra.pinyin;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.pinyin.engine.PinyinFactory;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.pinyin.engine.PinyinFactory;
 
 /**
  * 拼音工具类，封装了TinyPinyin、JPinyin、Pinyin4j，通过SPI自动识别。
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/PinyinFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinFactory.java
similarity index 84%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/PinyinFactory.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinFactory.java
index 724c8f900..6be06052c 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/PinyinFactory.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinFactory.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.pinyin.engine;
+package org.dromara.hutool.extra.pinyin.engine;
 
-import cn.hutool.core.lang.Singleton;
-import cn.hutool.core.util.ServiceLoaderUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.core.lang.Singleton;
+import org.dromara.hutool.core.util.ServiceLoaderUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.StaticLog;
 
-import cn.hutool.extra.pinyin.PinyinEngine;
-import cn.hutool.extra.pinyin.PinyinException;
+import org.dromara.hutool.extra.pinyin.PinyinEngine;
+import org.dromara.hutool.extra.pinyin.PinyinException;
 
 /**
  * 简单拼音引擎工厂，用于根据用户引入的拼音库jar，自动创建对应的拼音引擎对象
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
similarity index 90%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
index eea8c05cf..15505f14f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.pinyin.engine.bopomofo4j;
+package org.dromara.hutool.extra.pinyin.engine.bopomofo4j;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.pinyin.PinyinEngine;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.pinyin.PinyinEngine;
 import com.rnkrsoft.bopomofo4j.Bopomofo4j;
 import com.rnkrsoft.bopomofo4j.ToneType;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/bopomofo4j/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/bopomofo4j/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/bopomofo4j/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/bopomofo4j/package-info.java
index bea505eeb..0fd1884ee 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/bopomofo4j/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/bopomofo4j/package-info.java
@@ -29,4 +29,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.pinyin.engine.bopomofo4j;
+package org.dromara.hutool.extra.pinyin.engine.bopomofo4j;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/houbbpinyin/HoubbPinyinEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/houbbpinyin/HoubbPinyinEngine.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/houbbpinyin/HoubbPinyinEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/houbbpinyin/HoubbPinyinEngine.java
index 222d11c2c..41e2e47fc 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/houbbpinyin/HoubbPinyinEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/houbbpinyin/HoubbPinyinEngine.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.pinyin.engine.houbbpinyin;
+package org.dromara.hutool.extra.pinyin.engine.houbbpinyin;
 
-import cn.hutool.extra.pinyin.PinyinEngine;
+import org.dromara.hutool.extra.pinyin.PinyinEngine;
 import com.github.houbb.pinyin.constant.enums.PinyinStyleEnum;
 import com.github.houbb.pinyin.util.PinyinHelper;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/houbbpinyin/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/houbbpinyin/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/houbbpinyin/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/houbbpinyin/package-info.java
index 52d0326af..852c84ee0 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/houbbpinyin/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/houbbpinyin/package-info.java
@@ -29,4 +29,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.pinyin.engine.houbbpinyin;
+package org.dromara.hutool.extra.pinyin.engine.houbbpinyin;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/jpinyin/JPinyinEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/jpinyin/JPinyinEngine.java
similarity index 89%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/jpinyin/JPinyinEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/jpinyin/JPinyinEngine.java
index 5f0c67c9c..d3d17e00c 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/jpinyin/JPinyinEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/jpinyin/JPinyinEngine.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.pinyin.engine.jpinyin;
+package org.dromara.hutool.extra.pinyin.engine.jpinyin;
 
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.extra.pinyin.PinyinEngine;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.extra.pinyin.PinyinEngine;
 import com.github.stuxuhai.jpinyin.PinyinException;
 import com.github.stuxuhai.jpinyin.PinyinFormat;
 import com.github.stuxuhai.jpinyin.PinyinHelper;
@@ -70,7 +70,7 @@ public class JPinyinEngine implements PinyinEngine {
 		try {
 			return PinyinHelper.convertToPinyinString(str, separator, format);
 		} catch (final PinyinException e) {
-			throw new cn.hutool.extra.pinyin.PinyinException(e);
+			throw new org.dromara.hutool.extra.pinyin.PinyinException(e);
 		}
 	}
 }
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/jpinyin/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/jpinyin/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/jpinyin/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/jpinyin/package-info.java
index fa4f3151a..70559a7ee 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/jpinyin/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/jpinyin/package-info.java
@@ -29,4 +29,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.pinyin.engine.jpinyin;
+package org.dromara.hutool.extra.pinyin.engine.jpinyin;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/package-info.java
index 9003df02a..b06799121 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.pinyin.engine;
+package org.dromara.hutool.extra.pinyin.engine;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
index 74ea611ca..7ed714223 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.pinyin.engine.pinyin4j;
+package org.dromara.hutool.extra.pinyin.engine.pinyin4j;
 
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.extra.pinyin.PinyinEngine;
-import cn.hutool.extra.pinyin.PinyinException;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.extra.pinyin.PinyinEngine;
+import org.dromara.hutool.extra.pinyin.PinyinException;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
 import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/pinyin4j/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/pinyin4j/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/pinyin4j/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/pinyin4j/package-info.java
index 641ebf0d0..3ae039fb5 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/pinyin4j/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/pinyin4j/package-info.java
@@ -29,4 +29,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.pinyin.engine.pinyin4j;
+package org.dromara.hutool.extra.pinyin.engine.pinyin4j;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java
index c26e701ca..edf9331fb 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.pinyin.engine.tinypinyin;
+package org.dromara.hutool.extra.pinyin.engine.tinypinyin;
 
-import cn.hutool.extra.pinyin.PinyinEngine;
+import org.dromara.hutool.extra.pinyin.PinyinEngine;
 import com.github.promeg.pinyinhelper.Pinyin;
 
 /**
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/tinypinyin/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/tinypinyin/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/package-info.java
index ebd8d3d5c..b77f4b16d 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/tinypinyin/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/package-info.java
@@ -31,4 +31,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.pinyin.engine.tinypinyin;
+package org.dromara.hutool.extra.pinyin.engine.tinypinyin;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/pinyin/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/package-info.java
index 30f54756a..74caac57b 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.pinyin;
+package org.dromara.hutool.extra.pinyin;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/BufferedImageLuminanceSource.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/BufferedImageLuminanceSource.java
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/qrcode/BufferedImageLuminanceSource.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/BufferedImageLuminanceSource.java
index 5ef8f841b..d41e59a52 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/BufferedImageLuminanceSource.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/BufferedImageLuminanceSource.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.qrcode;
+package org.dromara.hutool.extra.qrcode;
 
 import com.google.zxing.LuminanceSource;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrAsciiArt.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrAsciiArt.java
similarity index 90%
rename from hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrAsciiArt.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrAsciiArt.java
index f44c02da0..bf5a4a100 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrAsciiArt.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrAsciiArt.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.qrcode;
+package org.dromara.hutool.extra.qrcode;
 
-import cn.hutool.core.lang.ansi.AnsiElement;
-import cn.hutool.core.lang.ansi.AnsiEncoder;
-import cn.hutool.swing.img.color.ColorUtil;
+import org.dromara.hutool.core.lang.ansi.AnsiElement;
+import org.dromara.hutool.core.lang.ansi.AnsiEncoder;
+import org.dromara.hutool.swing.img.color.ColorUtil;
 import com.google.zxing.common.BitMatrix;
 
 /**
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeException.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeException.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeException.java
index 23c8a5654..a07bf1831 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.qrcode;
+package org.dromara.hutool.extra.qrcode;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * Qrcode异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeUtil.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeUtil.java
index 44d9c0b83..5711827b8
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeUtil.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.qrcode;
+package org.dromara.hutool.extra.qrcode;
 
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.swing.img.ImgUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.swing.img.ImgUtil;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.DecodeHintType;
 import com.google.zxing.common.BitMatrix;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrConfig.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrConfig.java
index 7da65ab5a..5ebea9d17
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrConfig.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.qrcode;
+package org.dromara.hutool.extra.qrcode;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.swing.img.ImgUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.swing.img.ImgUtil;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
 import com.google.zxing.datamatrix.encoder.SymbolShapeHint;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrDecoder.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrDecoder.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrDecoder.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrDecoder.java
index 01712e9bb..c66894e12 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrDecoder.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrDecoder.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.qrcode;
+package org.dromara.hutool.extra.qrcode;
 
-import cn.hutool.core.codec.Decoder;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.swing.img.ImgUtil;
+import org.dromara.hutool.core.codec.Decoder;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.swing.img.ImgUtil;
 import com.google.zxing.Binarizer;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.DecodeHintType;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrEncoder.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrEncoder.java
similarity index 90%
rename from hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrEncoder.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrEncoder.java
index 0d7c4d930..7b4a555b8 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrEncoder.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrEncoder.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.qrcode;
+package org.dromara.hutool.extra.qrcode;
 
-import cn.hutool.core.codec.Encoder;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.codec.Encoder;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrImage.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrImage.java
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrImage.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrImage.java
index 4a7e7eb64..3bfa3570f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrImage.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrImage.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.qrcode;
+package org.dromara.hutool.extra.qrcode;
 
-import cn.hutool.swing.img.Img;
+import org.dromara.hutool.swing.img.Img;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.common.BitMatrix;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrSVG.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrSVG.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrSVG.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrSVG.java
index 866926446..f4c3e898b 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrSVG.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrSVG.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.qrcode;
+package org.dromara.hutool.extra.qrcode;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.swing.img.ImgUtil;
-import cn.hutool.swing.img.color.ColorUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.swing.img.ImgUtil;
+import org.dromara.hutool.swing.img.color.ColorUtil;
 import com.google.zxing.common.BitMatrix;
 
 import java.awt.Color;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/qrcode/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/package-info.java
index 9ce9e745a..e35903d59 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.qrcode;
+package org.dromara.hutool.extra.qrcode;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/script/ScriptUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/script/ScriptUtil.java
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/script/ScriptUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/script/ScriptUtil.java
index d3dfddf5d..b2f9f1fe2 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/script/ScriptUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/script/ScriptUtil.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.script;
+package org.dromara.hutool.extra.script;
 
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.map.WeakConcurrentMap;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.UtilException;
+import org.dromara.hutool.core.map.WeakConcurrentMap;
+import org.dromara.hutool.core.text.StrUtil;
 
 import javax.script.Bindings;
 import javax.script.Compilable;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/script/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/script/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/script/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/script/package-info.java
index b46f9d070..8ad618f14 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/script/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/script/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.script;
+package org.dromara.hutool.extra.script;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/servlet/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/servlet/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/servlet/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/servlet/package-info.java
index c38483a57..b93640888 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/servlet/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/servlet/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.servlet;
+package org.dromara.hutool.extra.servlet;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/spring/EnableSpringUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/EnableSpringUtil.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/spring/EnableSpringUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/spring/EnableSpringUtil.java
index ac5037b49..9b35819d0 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/spring/EnableSpringUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/EnableSpringUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.spring;
+package org.dromara.hutool.extra.spring;
 
 import org.springframework.context.annotation.Import;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/SpringUtil.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/spring/SpringUtil.java
index 7a5034e9a..929d55db9
--- a/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/SpringUtil.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.spring;
+package org.dromara.hutool.extra.spring;
 
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.reflect.TypeReference;
-import cn.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.exceptions.UtilException;
+import org.dromara.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.array.ArrayUtil;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/spring/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/spring/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/spring/package-info.java
index 4eec2c3aa..1f03e4a2f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/spring/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.spring;
+package org.dromara.hutool.extra.spring;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/ChannelType.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/ChannelType.java
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/ssh/ChannelType.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/ChannelType.java
index 96269eb11..0600d2835 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/ChannelType.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/ChannelType.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ssh;
+package org.dromara.hutool.extra.ssh;
 
 /**
  * Jsch支持的Channel类型
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/Connector.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Connector.java
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/ssh/Connector.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Connector.java
index b3c28da6b..3c78c2332 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/Connector.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Connector.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ssh;
+package org.dromara.hutool.extra.ssh;
 
 /**
  * 连接者对象，提供一些连接的基本信息
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/GanymedUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/GanymedUtil.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/ssh/GanymedUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/GanymedUtil.java
index 2b0e885db..a0a39e599 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/GanymedUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/GanymedUtil.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ssh;
+package org.dromara.hutool.extra.ssh;
 
 import ch.ethz.ssh2.Connection;
 import ch.ethz.ssh2.Session;
 import ch.ethz.ssh2.StreamGobbler;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschRuntimeException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschRuntimeException.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/ssh/JschRuntimeException.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschRuntimeException.java
index 7fa3fd8c8..09b9fac24 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschRuntimeException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschRuntimeException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ssh;
+package org.dromara.hutool.extra.ssh;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * Jsch异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschSessionPool.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschSessionPool.java
index 7cb17f5cb..3dfb1049c
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschSessionPool.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ssh;
+package org.dromara.hutool.extra.ssh;
 
-import cn.hutool.core.cache.SimpleCache;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.cache.SimpleCache;
+import org.dromara.hutool.core.text.StrUtil;
 import com.jcraft.jsch.Session;
 
 import java.util.HashMap;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschUtil.java
similarity index 97%
rename from hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschUtil.java
index 4dd58a1a8..3b94959ce 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschUtil.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ssh;
+package org.dromara.hutool.extra.ssh;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.net.LocalPortGenerator;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.net.LocalPortGenerator;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 import com.jcraft.jsch.*;
 
 import java.io.IOException;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Sftp.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Sftp.java
index e8614b000..8944c1a96
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Sftp.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ssh;
+package org.dromara.hutool.extra.ssh;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.ftp.AbstractFtp;
-import cn.hutool.extra.ftp.FtpConfig;
-import cn.hutool.extra.ftp.FtpException;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.ftp.AbstractFtp;
+import org.dromara.hutool.extra.ftp.FtpConfig;
+import org.dromara.hutool.extra.ftp.FtpException;
 import com.jcraft.jsch.ChannelSftp;
 import com.jcraft.jsch.ChannelSftp.LsEntry;
 import com.jcraft.jsch.ChannelSftp.LsEntrySelector;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/SshjSftp.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/SshjSftp.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/ssh/SshjSftp.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/SshjSftp.java
index 73e54d04d..1db5a2159 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/SshjSftp.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/SshjSftp.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.ssh;
+package org.dromara.hutool.extra.ssh;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.ftp.AbstractFtp;
-import cn.hutool.extra.ftp.FtpConfig;
-import cn.hutool.extra.ftp.FtpException;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.ftp.AbstractFtp;
+import org.dromara.hutool.extra.ftp.FtpConfig;
+import org.dromara.hutool.extra.ftp.FtpException;
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.connection.channel.direct.Session;
 import net.schmizz.sshj.sftp.RemoteResourceInfo;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/ssh/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/package-info.java
index a2ac25aec..8ab9bf937 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.ssh;
+package org.dromara.hutool.extra.ssh;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/Template.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/Template.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/Template.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/Template.java
index a4c6dc187..937ae9800 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/Template.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/Template.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template;
+package org.dromara.hutool.extra.template;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IoUtil;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateConfig.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateConfig.java
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/TemplateConfig.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateConfig.java
index 1ba6ffef8..0568a7157 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateConfig.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateConfig.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template;
+package org.dromara.hutool.extra.template;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
 import java.util.Objects;
 
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 
 /**
  * 模板配置
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateEngine.java
similarity index 96%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/TemplateEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateEngine.java
index c9bdb70ff..f206a35d3 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateEngine.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template;
+package org.dromara.hutool.extra.template;
 
 /**
  * 引擎接口，通过实现此接口从而使用对应的模板引擎
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateException.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/TemplateException.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateException.java
index af19f6950..7d18ba799 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template;
+package org.dromara.hutool.extra.template;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 模板异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateUtil.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/TemplateUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateUtil.java
index e9b2331d4..6b575603f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template;
+package org.dromara.hutool.extra.template;
 
-import cn.hutool.extra.template.engine.TemplateFactory;
+import org.dromara.hutool.extra.template.engine.TemplateFactory;
 
 /**
  * 模板工具类
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/TemplateFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateFactory.java
similarity index 85%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/TemplateFactory.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateFactory.java
index 199d1b6b4..56d28b53f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/TemplateFactory.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateFactory.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine;
+package org.dromara.hutool.extra.template.engine;
 
-import cn.hutool.core.lang.Singleton;
-import cn.hutool.core.reflect.ConstructorUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ServiceLoaderUtil;
-import cn.hutool.extra.template.TemplateConfig;
-import cn.hutool.extra.template.TemplateEngine;
-import cn.hutool.extra.template.TemplateException;
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.core.lang.Singleton;
+import org.dromara.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ServiceLoaderUtil;
+import org.dromara.hutool.extra.template.TemplateConfig;
+import org.dromara.hutool.extra.template.TemplateEngine;
+import org.dromara.hutool.extra.template.TemplateException;
+import org.dromara.hutool.log.StaticLog;
 
 /**
  * 简单模板工厂，用于根据用户引入的模板引擎jar，自动创建对应的模板引擎对象
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/BeetlEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlEngine.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/BeetlEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlEngine.java
index 2159e6c28..d6c7702ec 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/BeetlEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlEngine.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.beetl;
+package org.dromara.hutool.extra.template.engine.beetl;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.extra.template.Template;
-import cn.hutool.extra.template.TemplateConfig;
-import cn.hutool.extra.template.TemplateEngine;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.TemplateConfig;
+import org.dromara.hutool.extra.template.TemplateEngine;
 import org.beetl.core.Configuration;
 import org.beetl.core.GroupTemplate;
 import org.beetl.core.ResourceLoader;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/BeetlTemplate.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlTemplate.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/BeetlTemplate.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlTemplate.java
index 5a02b2763..c6225103c 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/BeetlTemplate.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlTemplate.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.beetl;
+package org.dromara.hutool.extra.template.engine.beetl;
 
-import cn.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.Template;
 
 import java.io.OutputStream;
 import java.io.Serializable;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/package-info.java
index 6f42db85e..d17606a2c 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.template.engine.beetl;
+package org.dromara.hutool.extra.template.engine.beetl;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java
old mode 100755
new mode 100644
similarity index 88%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java
index b2306738b..e713c7eaf
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.enjoy;
+package org.dromara.hutool.extra.template.engine.enjoy;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.id.IdUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.extra.template.Template;
-import cn.hutool.extra.template.TemplateConfig;
-import cn.hutool.extra.template.TemplateConfig.ResourceMode;
-import cn.hutool.extra.template.TemplateEngine;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.id.IdUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.TemplateConfig;
+import org.dromara.hutool.extra.template.TemplateConfig.ResourceMode;
+import org.dromara.hutool.extra.template.TemplateEngine;
 import com.jfinal.template.source.FileSourceFactory;
 
 import java.io.File;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyTemplate.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyTemplate.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyTemplate.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyTemplate.java
index ab7a55904..59a635767 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyTemplate.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyTemplate.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.enjoy;
+package org.dromara.hutool.extra.template.engine.enjoy;
 
-import cn.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.Template;
 
 import java.io.OutputStream;
 import java.io.Serializable;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/package-info.java
index 3ba06b87f..3f0748c86 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.template.engine.enjoy;
+package org.dromara.hutool.extra.template.engine.enjoy;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/FreemarkerEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerEngine.java
similarity index 88%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/FreemarkerEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerEngine.java
index a41c0be71..255f4f6d0 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/FreemarkerEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerEngine.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.freemarker;
+package org.dromara.hutool.extra.template.engine.freemarker;
 
-import cn.hutool.core.classloader.ClassLoaderUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.extra.template.Template;
-import cn.hutool.extra.template.TemplateConfig;
-import cn.hutool.extra.template.TemplateEngine;
-import cn.hutool.extra.template.TemplateException;
+import org.dromara.hutool.core.classloader.ClassLoaderUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.TemplateConfig;
+import org.dromara.hutool.extra.template.TemplateEngine;
+import org.dromara.hutool.extra.template.TemplateException;
 import freemarker.cache.ClassTemplateLoader;
 import freemarker.cache.FileTemplateLoader;
 import freemarker.template.Configuration;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java
similarity index 88%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java
index 97a86d193..30effe508 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.freemarker;
+package org.dromara.hutool.extra.template.engine.freemarker;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.extra.template.Template;
-import cn.hutool.extra.template.TemplateException;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.TemplateException;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/SimpleStringTemplateLoader.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/SimpleStringTemplateLoader.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/SimpleStringTemplateLoader.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/SimpleStringTemplateLoader.java
index 36ab369d7..afd55367f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/SimpleStringTemplateLoader.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/SimpleStringTemplateLoader.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.freemarker;
+package org.dromara.hutool.extra.template.engine.freemarker;
 
 import freemarker.cache.TemplateLoader;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/package-info.java
index 90721689f..893af7b57 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/package-info.java
@@ -16,4 +16,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.template.engine.freemarker;
+package org.dromara.hutool.extra.template.engine.freemarker;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickEngine.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickEngine.java
index 6a3a93407..50a65c75e
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickEngine.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.jetbrick;
+package org.dromara.hutool.extra.template.engine.jetbrick;
 
-import cn.hutool.extra.template.Template;
-import cn.hutool.extra.template.TemplateConfig;
-import cn.hutool.extra.template.TemplateEngine;
+import org.dromara.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.TemplateConfig;
+import org.dromara.hutool.extra.template.TemplateEngine;
 import jetbrick.template.JetEngine;
 
 import java.util.Properties;
@@ -119,7 +119,7 @@ public class JetbrickEngine implements TemplateEngine {
 				props.setProperty("$loader.root", config.getPath());
 				break;
 			case STRING:
-				props.setProperty("$loader", "cn.hutool.extra.template.engine.jetbrick.loader.StringResourceLoader");
+				props.setProperty("$loader", "loader.jetbrick.engine.template.org.dromara.hutool.extra.StringResourceLoader");
 				props.setProperty("$loader.charset", config.getCharsetStr());
 				break;
 			default:
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java
old mode 100755
new mode 100644
similarity index 89%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java
index c3239621f..b13bf5ef5
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.jetbrick;
+package org.dromara.hutool.extra.template.engine.jetbrick;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.reflect.TypeReference;
-import cn.hutool.extra.template.Template;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.extra.template.Template;
 import jetbrick.template.JetTemplate;
 
 import java.io.OutputStream;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java
index 884c08e10..7fb507f18
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.jetbrick.loader;
+package org.dromara.hutool.extra.template.engine.jetbrick.loader;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
 import jetbrick.io.resource.AbstractResource;
 import jetbrick.io.resource.Resource;
 import jetbrick.io.resource.ResourceNotFoundException;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/loader/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/loader/package-info.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/loader/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/loader/package-info.java
index 9ef543a53..59775adc2
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/loader/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/loader/package-info.java
@@ -16,4 +16,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.template.engine.jetbrick.loader;
+package org.dromara.hutool.extra.template.engine.jetbrick.loader;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/package-info.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/package-info.java
index b77b6d457..983215151
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.template.engine.jetbrick;
+package org.dromara.hutool.extra.template.engine.jetbrick;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/package-info.java
index e75051562..8165f6daf 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.template.engine;
+package org.dromara.hutool.extra.template.engine;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/pebble/PebbleTemplate.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplate.java
similarity index 90%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/pebble/PebbleTemplate.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplate.java
index 469fb0ca9..db9e37125 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/pebble/PebbleTemplate.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplate.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.pebble;
+package org.dromara.hutool.extra.template.engine.pebble;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.reflect.TypeReference;
-import cn.hutool.extra.template.Template;
-import cn.hutool.extra.template.TemplateException;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.TemplateException;
 
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java
similarity index 87%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java
index 29b620625..fe18f4134 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java
@@ -10,17 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.pebble;
+package org.dromara.hutool.extra.template.engine.pebble;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.template.Template;
-import cn.hutool.extra.template.TemplateConfig;
-import cn.hutool.extra.template.TemplateEngine;
-import cn.hutool.extra.template.TemplateException;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.TemplateConfig;
+import org.dromara.hutool.extra.template.TemplateEngine;
 import io.pebbletemplates.pebble.PebbleEngine;
-import io.pebbletemplates.pebble.error.PebbleException;
 import io.pebbletemplates.pebble.loader.*;
 import org.beetl.core.GroupTemplate;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/pebble/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/pebble/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/package-info.java
index 3c8f73643..f7946c9e1 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/pebble/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author zooooooooy
  */
-package cn.hutool.extra.template.engine.pebble;
+package org.dromara.hutool.extra.template.engine.pebble;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmEngine.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmEngine.java
index cb1ce1563..0e473962e 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmEngine.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.rythm;
+package org.dromara.hutool.extra.template.engine.rythm;
 
-import cn.hutool.extra.template.Template;
-import cn.hutool.extra.template.TemplateConfig;
-import cn.hutool.extra.template.TemplateEngine;
+import org.dromara.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.TemplateConfig;
+import org.dromara.hutool.extra.template.TemplateEngine;
 
 import java.util.Properties;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmTemplate.java
old mode 100755
new mode 100644
similarity index 89%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmTemplate.java
index 06a2d08de..865b09fae
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmTemplate.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.rythm;
+package org.dromara.hutool.extra.template.engine.rythm;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.reflect.TypeReference;
-import cn.hutool.extra.template.Template;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.extra.template.Template;
 
 import java.io.OutputStream;
 import java.io.Serializable;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/package-info.java
index 78a6c3607..0822c77ec 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.template.engine.rythm;
+package org.dromara.hutool.extra.template.engine.rythm;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java
index 2d2bee20c..810067377 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.thymeleaf;
+package org.dromara.hutool.extra.template.engine.thymeleaf;
 
 import org.thymeleaf.templatemode.TemplateMode;
 import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver;
@@ -19,11 +19,11 @@ import org.thymeleaf.templateresolver.FileTemplateResolver;
 import org.thymeleaf.templateresolver.ITemplateResolver;
 import org.thymeleaf.templateresolver.StringTemplateResolver;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.template.Template;
-import cn.hutool.extra.template.TemplateConfig;
-import cn.hutool.extra.template.TemplateEngine;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.TemplateConfig;
+import org.dromara.hutool.extra.template.TemplateEngine;
 
 /**
  * Thymeleaf模板引擎实现
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java
old mode 100755
new mode 100644
similarity index 87%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java
index 8f1462d05..6b0984f08
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.thymeleaf;
+package org.dromara.hutool.extra.template.engine.thymeleaf;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.reflect.TypeReference;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.extra.template.Template;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.extra.template.Template;
 import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.context.Context;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/package-info.java
index 824302616..ef9a1938e 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.template.engine.thymeleaf;
+package org.dromara.hutool.extra.template.engine.thymeleaf;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java
index f358ff257..172732094 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.velocity;
+package org.dromara.hutool.extra.template.engine.velocity;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -21,8 +21,8 @@ import org.apache.velocity.runtime.resource.Resource;
 import org.apache.velocity.runtime.resource.loader.ResourceLoader;
 import org.apache.velocity.util.ExtProperties;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 
 /**
  * {@link ResourceLoader} 的字符串实现形式
      
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityEngine.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityEngine.java
index 9503463cf..e666793ca 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityEngine.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.velocity;
+package org.dromara.hutool.extra.template.engine.velocity;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.extra.template.Template;
-import cn.hutool.extra.template.TemplateConfig;
-import cn.hutool.extra.template.TemplateEngine;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.TemplateConfig;
+import org.dromara.hutool.extra.template.TemplateEngine;
 import org.apache.velocity.app.Velocity;
 
 /**
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityTemplate.java
old mode 100755
new mode 100644
similarity index 87%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityTemplate.java
index 6ca1ee3a4..b7addd363
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityTemplate.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.velocity;
+package org.dromara.hutool.extra.template.engine.velocity;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.reflect.TypeReference;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.extra.template.Template;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.extra.template.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/package-info.java
index 27cab92ad..03c25cae6 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/package-info.java
@@ -16,4 +16,4 @@
  *
  * @author looly
  */
-package cn.hutool.extra.template.engine.velocity;
+package org.dromara.hutool.extra.template.engine.velocity;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitEngine.java
old mode 100755
new mode 100644
similarity index 89%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitEngine.java
index 431d8c831..153f4846f
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitEngine.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.wit;
+package org.dromara.hutool.extra.template.engine.wit;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.map.Dict;
-import cn.hutool.extra.template.Template;
-import cn.hutool.extra.template.TemplateConfig;
-import cn.hutool.extra.template.TemplateEngine;
-import cn.hutool.extra.template.TemplateException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.map.Dict;
+import org.dromara.hutool.extra.template.Template;
+import org.dromara.hutool.extra.template.TemplateConfig;
+import org.dromara.hutool.extra.template.TemplateEngine;
+import org.dromara.hutool.extra.template.TemplateException;
 import org.febit.wit.Engine;
 import org.febit.wit.exceptions.ResourceNotFoundException;
 import org.febit.wit.util.Props;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitTemplate.java
old mode 100755
new mode 100644
similarity index 87%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitTemplate.java
index a0d82d729..b16365fec
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitTemplate.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.template.engine.wit;
+package org.dromara.hutool.extra.template.engine.wit;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.reflect.TypeReference;
 import org.febit.wit.Template;
 
 import java.io.OutputStream;
@@ -26,7 +26,7 @@ import java.util.Map;
  *
  * @author looly
  */
-public class WitTemplate implements cn.hutool.extra.template.Template, Serializable{
+public class WitTemplate implements org.dromara.hutool.extra.template.Template, Serializable{
 	private static final long serialVersionUID = 1L;
 
 	private final Template rawTemplate;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/package-info.java
index 3f68564b8..2acc7526d 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.template.engine.wit;
+package org.dromara.hutool.extra.template.engine.wit;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/template/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/template/package-info.java
index 95293dd7c..479dd8d0e 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.template;
+package org.dromara.hutool.extra.template;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/AbstractResult.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/AbstractResult.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/AbstractResult.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/AbstractResult.java
index 714ae01bc..51f771edc 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/AbstractResult.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/AbstractResult.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer;
+package org.dromara.hutool.extra.tokenizer;
 
-import cn.hutool.core.collection.iter.ComputeIter;
+import org.dromara.hutool.core.collection.iter.ComputeIter;
 
 import java.util.Iterator;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/Result.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/Result.java
similarity index 87%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/Result.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/Result.java
index c1307b681..3b909b716 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/Result.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/Result.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer;
+package org.dromara.hutool.extra.tokenizer;
 
-import cn.hutool.core.collection.iter.IterableIter;
+import org.dromara.hutool.core.collection.iter.IterableIter;
 
 /**
  * 分词结果接口定义
      
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerEngine.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerEngine.java
index 6bf846edb..f7f5a0c0a 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerEngine.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer;
+package org.dromara.hutool.extra.tokenizer;
 
 /**
  * 分词引擎接口定义，用户通过实现此接口完成特定分词引擎的适配
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerException.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerException.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerException.java
index 171e3ab53..558851f6f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer;
+package org.dromara.hutool.extra.tokenizer;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 分词异常
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerUtil.java
similarity index 88%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerUtil.java
index 8b6835e8f..80e95969f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer;
+package org.dromara.hutool.extra.tokenizer;
 
-import cn.hutool.extra.tokenizer.engine.TokenizerFactory;
+import org.dromara.hutool.extra.tokenizer.engine.TokenizerFactory;
 
 /**
  * 分词工具类
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/Word.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/Word.java
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/Word.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/Word.java
index 09d63c3ce..d1468cf51 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/Word.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/Word.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer;
+package org.dromara.hutool.extra.tokenizer;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerFactory.java
old mode 100755
new mode 100644
similarity index 83%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerFactory.java
index d3371c437..3cb2381d9
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerFactory.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine;
+package org.dromara.hutool.extra.tokenizer.engine;
 
-import cn.hutool.core.lang.Singleton;
-import cn.hutool.core.util.ServiceLoaderUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.tokenizer.TokenizerEngine;
-import cn.hutool.extra.tokenizer.TokenizerException;
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.core.lang.Singleton;
+import org.dromara.hutool.core.util.ServiceLoaderUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.tokenizer.TokenizerEngine;
+import org.dromara.hutool.extra.tokenizer.TokenizerException;
+import org.dromara.hutool.log.StaticLog;
 
 /**
  * 简单分词引擎工厂，用于根据用户引入的分词引擎jar，自动创建对应的引擎
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java
similarity index 83%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java
index 2fc77b898..144c1d727 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java
@@ -10,17 +10,17 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.analysis;
+package org.dromara.hutool.extra.tokenizer.engine.analysis;
 
 import java.io.IOException;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.tokenizer.Result;
-import cn.hutool.extra.tokenizer.TokenizerEngine;
-import cn.hutool.extra.tokenizer.TokenizerException;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.extra.tokenizer.TokenizerEngine;
+import org.dromara.hutool.extra.tokenizer.TokenizerException;
 
 /**
  * Lucene-analysis分词抽象封装
      
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisResult.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisResult.java
similarity index 85%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisResult.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisResult.java
index c7f60632b..be370c5ba 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisResult.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisResult.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.analysis;
+package org.dromara.hutool.extra.tokenizer.engine.analysis;
 
 import java.io.IOException;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 
-import cn.hutool.extra.tokenizer.AbstractResult;
-import cn.hutool.extra.tokenizer.TokenizerException;
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.AbstractResult;
+import org.dromara.hutool.extra.tokenizer.TokenizerException;
+import org.dromara.hutool.extra.tokenizer.Word;
 
 /**
  * Lucene-analysis分词抽象结果封装
      
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisWord.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisWord.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisWord.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisWord.java
index eab63c62d..5932f7847 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/AnalysisWord.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisWord.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.analysis;
+package org.dromara.hutool.extra.tokenizer.engine.analysis;
 
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
 import org.apache.lucene.util.Attribute;
 
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Word;
 
 /**
  * Lucene-analysis分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/SmartcnEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/SmartcnEngine.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/SmartcnEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/SmartcnEngine.java
index 30c449f86..b11ee148f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/SmartcnEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/SmartcnEngine.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.analysis;
+package org.dromara.hutool.extra.tokenizer.engine.analysis;
 
 import org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/package-info.java
index 6fb9d054a..3a4229694 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/analysis/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.tokenizer.engine.analysis;
+package org.dromara.hutool.extra.tokenizer.engine.analysis;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java
similarity index 84%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java
index 5897d84ca..dfb0325f0 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.ansj;
+package org.dromara.hutool.extra.tokenizer.engine.ansj;
 
 import org.ansj.splitWord.Analysis;
 import org.ansj.splitWord.analysis.ToAnalysis;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.tokenizer.Result;
-import cn.hutool.extra.tokenizer.TokenizerEngine;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.extra.tokenizer.TokenizerEngine;
 
 /**
  * Ansj分词引擎实现
      
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjResult.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjResult.java
similarity index 88%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjResult.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjResult.java
index cee0d76a6..5bc4da90f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjResult.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjResult.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.ansj;
+package org.dromara.hutool.extra.tokenizer.engine.ansj;
 
-import cn.hutool.extra.tokenizer.Result;
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.extra.tokenizer.Word;
 import org.ansj.domain.Term;
 
 import java.util.Iterator;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjWord.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjWord.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjWord.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjWord.java
index 67098d696..e8aa9c4c7 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/AnsjWord.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjWord.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.ansj;
+package org.dromara.hutool.extra.tokenizer.engine.ansj;
 
 import org.ansj.domain.Term;
 
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Word;
 
 /**
  * Ansj分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/package-info.java
index 01a64e50f..998ad7009 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ansj/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.tokenizer.engine.ansj;
+package org.dromara.hutool.extra.tokenizer.engine.ansj;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java
similarity index 84%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java
index a3b3fba6e..f9931f6ab 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.hanlp;
+package org.dromara.hutool.extra.tokenizer.engine.hanlp;
 
 import com.hankcs.hanlp.HanLP;
 import com.hankcs.hanlp.seg.Segment;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.tokenizer.TokenizerEngine;
-import cn.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.tokenizer.TokenizerEngine;
+import org.dromara.hutool.extra.tokenizer.Result;
 
 /**
  * HanLP分词引擎实现
      
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPResult.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPResult.java
similarity index 87%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPResult.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPResult.java
index 2225eb5d9..86a543f6b 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPResult.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPResult.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.hanlp;
+package org.dromara.hutool.extra.tokenizer.engine.hanlp;
 
-import cn.hutool.extra.tokenizer.Result;
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.extra.tokenizer.Word;
 import com.hankcs.hanlp.seg.common.Term;
 
 import java.util.Iterator;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPWord.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPWord.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPWord.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPWord.java
index c33a891a2..4d02f0b97 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/HanLPWord.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPWord.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.hanlp;
+package org.dromara.hutool.extra.tokenizer.engine.hanlp;
 
 import com.hankcs.hanlp.seg.common.Term;
 
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Word;
 
 /**
  * HanLP分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/package-info.java
index 4c06fecc2..c658a8f12 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/hanlp/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.tokenizer.engine.hanlp;
+package org.dromara.hutool.extra.tokenizer.engine.hanlp;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
similarity index 84%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
index a7dab4a61..a9b41ae8b 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.ikanalyzer;
+package org.dromara.hutool.extra.tokenizer.engine.ikanalyzer;
 
 import org.wltea.analyzer.core.IKSegmenter;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.tokenizer.TokenizerEngine;
-import cn.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.tokenizer.TokenizerEngine;
+import org.dromara.hutool.extra.tokenizer.Result;
 
 /**
  * IKAnalyzer分词引擎实现
      
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerResult.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerResult.java
similarity index 84%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerResult.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerResult.java
index 70fea4e0a..4739273f1 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerResult.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerResult.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.ikanalyzer;
+package org.dromara.hutool.extra.tokenizer.engine.ikanalyzer;
 
-import cn.hutool.extra.tokenizer.AbstractResult;
-import cn.hutool.extra.tokenizer.TokenizerException;
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.AbstractResult;
+import org.dromara.hutool.extra.tokenizer.TokenizerException;
+import org.dromara.hutool.extra.tokenizer.Word;
 import org.wltea.analyzer.core.IKSegmenter;
 import org.wltea.analyzer.core.Lexeme;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java
index 512064da8..10ec699a1 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.ikanalyzer;
+package org.dromara.hutool.extra.tokenizer.engine.ikanalyzer;
 
 import org.wltea.analyzer.core.Lexeme;
 
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Word;
 
 /**
  * IKAnalyzer分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/package-info.java
index 5773666a8..2a94c15d2 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/ikanalyzer/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.tokenizer.engine.ikanalyzer;
+package org.dromara.hutool.extra.tokenizer.engine.ikanalyzer;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java
similarity index 87%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java
index 0bab0582e..f87dfb586 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.jcseg;
+package org.dromara.hutool.extra.tokenizer.engine.jcseg;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.tokenizer.Result;
-import cn.hutool.extra.tokenizer.TokenizerEngine;
-import cn.hutool.extra.tokenizer.TokenizerException;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.extra.tokenizer.TokenizerEngine;
+import org.dromara.hutool.extra.tokenizer.TokenizerException;
 import org.lionsoul.jcseg.ISegment;
 import org.lionsoul.jcseg.dic.ADictionary;
 import org.lionsoul.jcseg.dic.DictionaryFactory;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegResult.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegResult.java
similarity index 84%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegResult.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegResult.java
index 7044eb8c0..5ee2ce821 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegResult.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegResult.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.jcseg;
+package org.dromara.hutool.extra.tokenizer.engine.jcseg;
 
-import cn.hutool.extra.tokenizer.AbstractResult;
-import cn.hutool.extra.tokenizer.TokenizerException;
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.AbstractResult;
+import org.dromara.hutool.extra.tokenizer.TokenizerException;
+import org.dromara.hutool.extra.tokenizer.Word;
 import org.lionsoul.jcseg.ISegment;
 import org.lionsoul.jcseg.IWord;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegWord.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegWord.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegWord.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegWord.java
index 1aae1403f..fa0a0511f 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/JcsegWord.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegWord.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.jcseg;
+package org.dromara.hutool.extra.tokenizer.engine.jcseg;
 
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Word;
 import org.lionsoul.jcseg.IWord;
 
 /**
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/package-info.java
index 99a5b716c..fcde9b8ff 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jcseg/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.tokenizer.engine.jcseg;
+package org.dromara.hutool.extra.tokenizer.engine.jcseg;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java
similarity index 85%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java
index 5873334fc..08a413139 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.jieba;
+package org.dromara.hutool.extra.tokenizer.engine.jieba;
 
 import com.huaban.analysis.jieba.JiebaSegmenter;
 import com.huaban.analysis.jieba.JiebaSegmenter.SegMode;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.tokenizer.TokenizerEngine;
-import cn.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.tokenizer.TokenizerEngine;
+import org.dromara.hutool.extra.tokenizer.Result;
 
 /**
  * Jieba分词引擎实现
      
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaResult.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaResult.java
similarity index 88%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaResult.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaResult.java
index 6eb80ab9b..cf5dfaef5 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaResult.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaResult.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.jieba;
+package org.dromara.hutool.extra.tokenizer.engine.jieba;
 
-import cn.hutool.extra.tokenizer.Result;
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.extra.tokenizer.Word;
 import com.huaban.analysis.jieba.SegToken;
 
 import java.util.Iterator;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaWord.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaWord.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaWord.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaWord.java
index 6bc2ca95c..896674cfc 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/JiebaWord.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaWord.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.jieba;
+package org.dromara.hutool.extra.tokenizer.engine.jieba;
 
 import com.huaban.analysis.jieba.SegToken;
 
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Word;
 
 /**
  * Jieba分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/package-info.java
index 344f2d99d..4c29c5700 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/jieba/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.tokenizer.engine.jieba;
+package org.dromara.hutool.extra.tokenizer.engine.jieba;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java
similarity index 86%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java
index 6dab3d9d7..ab3d88bf2 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.mmseg;
+package org.dromara.hutool.extra.tokenizer.engine.mmseg;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.tokenizer.Result;
-import cn.hutool.extra.tokenizer.TokenizerEngine;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.extra.tokenizer.TokenizerEngine;
 import com.chenlb.mmseg4j.ComplexSeg;
 import com.chenlb.mmseg4j.Dictionary;
 import com.chenlb.mmseg4j.MMSeg;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegResult.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegResult.java
similarity index 84%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegResult.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegResult.java
index ea3e2874d..c7428269e 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegResult.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegResult.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.mmseg;
+package org.dromara.hutool.extra.tokenizer.engine.mmseg;
 
-import cn.hutool.extra.tokenizer.AbstractResult;
-import cn.hutool.extra.tokenizer.TokenizerException;
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.AbstractResult;
+import org.dromara.hutool.extra.tokenizer.TokenizerException;
+import org.dromara.hutool.extra.tokenizer.Word;
 import com.chenlb.mmseg4j.MMSeg;
 
 import java.io.IOException;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegWord.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegWord.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegWord.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegWord.java
index 0bb141acc..a2bd5a6a5 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/MmsegWord.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegWord.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.mmseg;
+package org.dromara.hutool.extra.tokenizer.engine.mmseg;
 
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Word;
 
 /**
  * mmseg分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/package-info.java
index 1f1f23db9..51bfae531 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mmseg/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.tokenizer.engine.mmseg;
+package org.dromara.hutool.extra.tokenizer.engine.mmseg;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java
similarity index 85%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java
index ee1c2fa62..debd592ee 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.mynlp;
+package org.dromara.hutool.extra.tokenizer.engine.mynlp;
 
 import com.mayabot.nlp.segment.Lexer;
 import com.mayabot.nlp.segment.Lexers;
 import com.mayabot.nlp.segment.Sentence;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.tokenizer.Result;
-import cn.hutool.extra.tokenizer.TokenizerEngine;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.extra.tokenizer.TokenizerEngine;
 
 /**
  * MYNLP 中文NLP工具包分词实现
      
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpResult.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpResult.java
similarity index 88%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpResult.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpResult.java
index 24cfe5ea4..d12ccbb3d 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpResult.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpResult.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.mynlp;
+package org.dromara.hutool.extra.tokenizer.engine.mynlp;
 
-import cn.hutool.extra.tokenizer.Result;
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.extra.tokenizer.Word;
 import com.mayabot.nlp.segment.Sentence;
 import com.mayabot.nlp.segment.WordTerm;
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpWord.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpWord.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpWord.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpWord.java
index 974761b74..36e8eb952 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/MynlpWord.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpWord.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.mynlp;
+package org.dromara.hutool.extra.tokenizer.engine.mynlp;
 
 import com.mayabot.nlp.segment.WordTerm;
 
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Word;
 
 /**
  * mmseg分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/package-info.java
index f285335ac..43a7c5c3b 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/mynlp/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/package-info.java
@@ -17,4 +17,4 @@
  * @author Looly
  * @since 4.6.5
  */
-package cn.hutool.extra.tokenizer.engine.mynlp;
+package org.dromara.hutool.extra.tokenizer.engine.mynlp;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/package-info.java
index 54e7347b0..d58163dbb 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.tokenizer.engine;
+package org.dromara.hutool.extra.tokenizer.engine;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordEngine.java
similarity index 87%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordEngine.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordEngine.java
index 9a07e8b9f..4231da93c 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordEngine.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordEngine.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.word;
+package org.dromara.hutool.extra.tokenizer.engine.word;
 
 import org.apdplat.word.segmentation.Segmentation;
 import org.apdplat.word.segmentation.SegmentationAlgorithm;
 import org.apdplat.word.segmentation.SegmentationFactory;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.tokenizer.Result;
-import cn.hutool.extra.tokenizer.TokenizerEngine;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.extra.tokenizer.TokenizerEngine;
 
 /**
  * Word分词引擎实现
      
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordResult.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordResult.java
similarity index 88%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordResult.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordResult.java
index f91880fc3..a135d88ba 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordResult.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordResult.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.word;
+package org.dromara.hutool.extra.tokenizer.engine.word;
 
-import cn.hutool.extra.tokenizer.Result;
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Result;
+import org.dromara.hutool.extra.tokenizer.Word;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordWord.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordWord.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordWord.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordWord.java
index c414f3a5b..14b5d1a48 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/WordWord.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordWord.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.tokenizer.engine.word;
+package org.dromara.hutool.extra.tokenizer.engine.word;
 
-import cn.hutool.extra.tokenizer.Word;
+import org.dromara.hutool.extra.tokenizer.Word;
 
 /**
  * Word分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/package-info.java
similarity index 91%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/package-info.java
index bbc7e0caf..d615e5e75 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/word/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.tokenizer.engine.word;
+package org.dromara.hutool.extra.tokenizer.engine.word;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/tokenizer/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/package-info.java
index 10961ad2d..2a47f07ce 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.tokenizer;
+package org.dromara.hutool.extra.tokenizer;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/validation/BeanValidationResult.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/validation/BeanValidationResult.java
similarity index 98%
rename from hutool-extra/src/main/java/cn/hutool/extra/validation/BeanValidationResult.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/validation/BeanValidationResult.java
index ceccb4d8c..582340695 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/validation/BeanValidationResult.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/validation/BeanValidationResult.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.validation;
+package org.dromara.hutool.extra.validation;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/validation/ValidationUtil.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/validation/ValidationUtil.java
index 47d00e17c..7a901e3ab
--- a/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/validation/ValidationUtil.java
@@ -10,10 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.validation;
+package org.dromara.hutool.extra.validation;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.extra.validation.BeanValidationResult.ErrorMessage;
+import org.dromara.hutool.core.collection.CollUtil;
 
 import jakarta.validation.*;
 
@@ -126,7 +125,7 @@ public class ValidationUtil {
 	private static  BeanValidationResult warpBeanValidationResult(final Set> constraintViolations) {
 		final BeanValidationResult result = new BeanValidationResult(constraintViolations.isEmpty());
 		for (final ConstraintViolation constraintViolation : constraintViolations) {
-			final ErrorMessage errorMessage = new ErrorMessage();
+			final BeanValidationResult.ErrorMessage errorMessage = new BeanValidationResult.ErrorMessage();
 			errorMessage.setPropertyName(constraintViolation.getPropertyPath().toString());
 			errorMessage.setMessage(constraintViolation.getMessage());
 			errorMessage.setValue(constraintViolation.getInvalidValue());
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/validation/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/validation/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/cn/hutool/extra/validation/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/validation/package-info.java
index 6ec070f13..b9da3405b 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/validation/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/validation/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author chengqiang
  */
-package cn.hutool.extra.validation;
+package org.dromara.hutool.extra.validation;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/xml/JAXBUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java
similarity index 92%
rename from hutool-extra/src/main/java/cn/hutool/extra/xml/JAXBUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java
index 12999b799..c839e0421 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/xml/JAXBUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.xml;
+package org.dromara.hutool.extra.xml;
 
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.XmlUtil;
+import org.dromara.hutool.core.exceptions.UtilException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.XmlUtil;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/xml/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/cn/hutool/extra/xml/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/xml/package-info.java
index 77c8693b3..8cfcb24f9 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/xml/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.extra.xml;
+package org.dromara.hutool.extra.xml;
diff --git a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.template.TemplateEngine b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.template.TemplateEngine
deleted file mode 100644
index ab395b1a3..000000000
--- a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.template.TemplateEngine
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (c) 2023 looly(loolly@aliyun.com)
-# Hutool is licensed under Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-#          http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-# See the Mulan PSL v2 for more details.
-#
-
-cn.hutool.extra.template.engine.beetl.BeetlEngine
-cn.hutool.extra.template.engine.freemarker.FreemarkerEngine
-cn.hutool.extra.template.engine.velocity.VelocityEngine
-cn.hutool.extra.template.engine.rythm.RythmEngine
-cn.hutool.extra.template.engine.enjoy.EnjoyEngine
-cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine
-cn.hutool.extra.template.engine.wit.WitEngine
-cn.hutool.extra.template.engine.jetbrick.JetbrickEngine
-cn.hutool.extra.template.engine.pebble.PebbleTemplateEngine
diff --git a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.tokenizer.TokenizerEngine b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.tokenizer.TokenizerEngine
deleted file mode 100644
index da69bb16f..000000000
--- a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.tokenizer.TokenizerEngine
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (c) 2023 looly(loolly@aliyun.com)
-# Hutool is licensed under Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-#          http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-# See the Mulan PSL v2 for more details.
-#
-
-cn.hutool.extra.tokenizer.engine.ansj.AnsjEngine
-cn.hutool.extra.tokenizer.engine.hanlp.HanLPEngine
-cn.hutool.extra.tokenizer.engine.ikanalyzer.IKAnalyzerEngine
-cn.hutool.extra.tokenizer.engine.jcseg.JcsegEngine
-cn.hutool.extra.tokenizer.engine.jieba.JiebaEngine
-cn.hutool.extra.tokenizer.engine.mmseg.MmsegEngine
-cn.hutool.extra.tokenizer.engine.word.WordEngine
-cn.hutool.extra.tokenizer.engine.analysis.SmartcnEngine
-cn.hutool.extra.tokenizer.engine.mynlp.MynlpEngine
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/org.dromara.hutool.extra.aop.proxy.ProxyFactory
old mode 100755
new mode 100644
similarity index 76%
rename from hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.aop.proxy.ProxyFactory
rename to hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.aop.proxy.ProxyFactory
index 930f691be..935bab58f
--- a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.aop.proxy.ProxyFactory
+++ b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.aop.proxy.ProxyFactory
@@ -10,6 +10,6 @@
 # See the Mulan PSL v2 for more details.
 #
 
-cn.hutool.extra.aop.proxy.CglibProxyFactory
-cn.hutool.extra.aop.proxy.SpringCglibProxyFactory
-cn.hutool.extra.aop.proxy.JdkProxyFactory
+org.dromara.hutool.extra.aop.proxy.CglibProxyFactory
+org.dromara.hutool.extra.aop.proxy.SpringCglibProxyFactory
+org.dromara.hutool.extra.aop.proxy.JdkProxyFactory
diff --git a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.expression.ExpressionEngine b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.expression.ExpressionEngine
similarity index 54%
rename from hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.expression.ExpressionEngine
rename to hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.expression.ExpressionEngine
index e3fda6236..1cfd8e1c0 100644
--- a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.expression.ExpressionEngine
+++ b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.expression.ExpressionEngine
@@ -10,10 +10,10 @@
 # See the Mulan PSL v2 for more details.
 #
 
-cn.hutool.extra.expression.engine.aviator.AviatorEngine
-cn.hutool.extra.expression.engine.jexl.JexlEngine
-cn.hutool.extra.expression.engine.mvel.MvelEngine
-cn.hutool.extra.expression.engine.jfireel.JfireELEngine
-cn.hutool.extra.expression.engine.spel.SpELEngine
-cn.hutool.extra.expression.engine.rhino.RhinoEngine
-cn.hutool.extra.expression.engine.qlexpress.QLExpressEngine
+org.dromara.hutool.extra.expression.engine.aviator.AviatorEngine
+org.dromara.hutool.extra.expression.engine.jexl.JexlEngine
+org.dromara.hutool.extra.expression.engine.mvel.MvelEngine
+org.dromara.hutool.extra.expression.engine.jfireel.JfireELEngine
+org.dromara.hutool.extra.expression.engine.spel.SpELEngine
+org.dromara.hutool.extra.expression.engine.rhino.RhinoEngine
+org.dromara.hutool.extra.expression.engine.qlexpress.QLExpressEngine
diff --git a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.pinyin.PinyinEngine b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.pinyin.PinyinEngine
similarity index 61%
rename from hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.pinyin.PinyinEngine
rename to hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.pinyin.PinyinEngine
index 5fb19a369..1d21a1354 100644
--- a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.extra.pinyin.PinyinEngine
+++ b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.pinyin.PinyinEngine
@@ -10,8 +10,8 @@
 # See the Mulan PSL v2 for more details.
 #
 
-cn.hutool.extra.pinyin.engine.tinypinyin.TinyPinyinEngine
-cn.hutool.extra.pinyin.engine.jpinyin.JPinyinEngine
-cn.hutool.extra.pinyin.engine.pinyin4j.Pinyin4jEngine
-cn.hutool.extra.pinyin.engine.bopomofo4j.Bopomofo4jEngine
-cn.hutool.extra.pinyin.engine.houbbpinyin.HoubbPinyinEngine
+org.dromara.hutool.extra.pinyin.engine.tinypinyin.TinyPinyinEngine
+org.dromara.hutool.extra.pinyin.engine.jpinyin.JPinyinEngine
+org.dromara.hutool.extra.pinyin.engine.pinyin4j.Pinyin4jEngine
+org.dromara.hutool.extra.pinyin.engine.bopomofo4j.Bopomofo4jEngine
+org.dromara.hutool.extra.pinyin.engine.houbbpinyin.HoubbPinyinEngine
diff --git a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.template.TemplateEngine b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.template.TemplateEngine
new file mode 100644
index 000000000..ef2646f4a
--- /dev/null
+++ b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.template.TemplateEngine
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2023 looly(loolly@aliyun.com)
+# Hutool is licensed under Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#          http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+# See the Mulan PSL v2 for more details.
+#
+
+org.dromara.hutool.extra.template.engine.beetl.BeetlEngine
+org.dromara.hutool.extra.template.engine.freemarker.FreemarkerEngine
+org.dromara.hutool.extra.template.engine.velocity.VelocityEngine
+org.dromara.hutool.extra.template.engine.rythm.RythmEngine
+org.dromara.hutool.extra.template.engine.enjoy.EnjoyEngine
+org.dromara.hutool.extra.template.engine.thymeleaf.ThymeleafEngine
+org.dromara.hutool.extra.template.engine.wit.WitEngine
+org.dromara.hutool.extra.template.engine.jetbrick.JetbrickEngine
+org.dromara.hutool.extra.template.engine.pebble.PebbleTemplateEngine
diff --git a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.tokenizer.TokenizerEngine b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.tokenizer.TokenizerEngine
new file mode 100644
index 000000000..704697833
--- /dev/null
+++ b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.tokenizer.TokenizerEngine
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2023 looly(loolly@aliyun.com)
+# Hutool is licensed under Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#          http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+# See the Mulan PSL v2 for more details.
+#
+
+org.dromara.hutool.extra.tokenizer.engine.ansj.AnsjEngine
+org.dromara.hutool.extra.tokenizer.engine.hanlp.HanLPEngine
+org.dromara.hutool.extra.tokenizer.engine.ikanalyzer.IKAnalyzerEngine
+org.dromara.hutool.extra.tokenizer.engine.jcseg.JcsegEngine
+org.dromara.hutool.extra.tokenizer.engine.jieba.JiebaEngine
+org.dromara.hutool.extra.tokenizer.engine.mmseg.MmsegEngine
+org.dromara.hutool.extra.tokenizer.engine.word.WordEngine
+org.dromara.hutool.extra.tokenizer.engine.analysis.SmartcnEngine
+org.dromara.hutool.extra.tokenizer.engine.mynlp.MynlpEngine
diff --git a/hutool-extra/src/main/resources/META-INF/spring.factories b/hutool-extra/src/main/resources/META-INF/spring.factories
index 09fa11dde..44ca5e8cd 100644
--- a/hutool-extra/src/main/resources/META-INF/spring.factories
+++ b/hutool-extra/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,3 @@
 # Auto Configure
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-cn.hutool.extra.spring.SpringUtil
+org.dromara.hutool.extra.spring.SpringUtil
diff --git a/hutool-extra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hutool-extra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index d16c1928b..cceb64fe2 100644
--- a/hutool-extra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/hutool-extra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-cn.hutool.extra.spring.SpringUtil
+org.dromara.hutool.extra.spring.SpringUtil
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/aop/AopTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/aop/AopTest.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-extra/src/test/java/cn/hutool/extra/aop/AopTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/aop/AopTest.java
index 209f4ae8e..d97fed948
--- a/hutool-extra/src/test/java/cn/hutool/extra/aop/AopTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/aop/AopTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.extra.aop;
+package org.dromara.hutool.extra.aop;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.extra.aop.aspects.TimeIntervalAspect;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.extra.aop.aspects.TimeIntervalAspect;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/cglib/CglibUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/cglib/CglibUtilTest.java
similarity index 93%
rename from hutool-extra/src/test/java/cn/hutool/extra/cglib/CglibUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/cglib/CglibUtilTest.java
index 54088d7e7..3762983c2 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/cglib/CglibUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/cglib/CglibUtilTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.extra.cglib;
+package org.dromara.hutool.extra.cglib;
 
-import cn.hutool.core.convert.Convert;
+import org.dromara.hutool.core.convert.Convert;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/compress/ArchiverTest.java
similarity index 88%
rename from hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/compress/ArchiverTest.java
index 68613b0ee..257a84eae 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/compress/ArchiverTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.extra.compress;
+package org.dromara.hutool.extra.compress;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.extra.compress.archiver.StreamArchiver;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.extra.compress.archiver.StreamArchiver;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/compress/ExtractorTest.java
similarity index 81%
rename from hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/compress/ExtractorTest.java
index c264acb19..aad21f11d 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/compress/ExtractorTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.extra.compress;
+package org.dromara.hutool.extra.compress;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.extra.compress.extractor.Extractor;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.extra.compress.extractor.Extractor;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/emoji/EmojiUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/emoji/EmojiUtilTest.java
similarity index 94%
rename from hutool-extra/src/test/java/cn/hutool/extra/emoji/EmojiUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/emoji/EmojiUtilTest.java
index 6182089c1..483b8ca4e 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/emoji/EmojiUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/emoji/EmojiUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.extra.emoji;
+package org.dromara.hutool.extra.emoji;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/expression/AviatorTest.java
old mode 100755
new mode 100644
similarity index 86%
rename from hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/expression/AviatorTest.java
index 705987480..9c396e8c3
--- a/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/expression/AviatorTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.extra.expression;
+package org.dromara.hutool.extra.expression;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.map.Dict;
-import cn.hutool.extra.expression.engine.aviator.AviatorEngine;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.map.Dict;
+import org.dromara.hutool.extra.expression.engine.aviator.AviatorEngine;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/expression/ExpressionUtilTest.java
old mode 100755
new mode 100644
similarity index 82%
rename from hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/expression/ExpressionUtilTest.java
index e7ce4557c..b4d045448
--- a/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/expression/ExpressionUtilTest.java
@@ -1,12 +1,12 @@
-package cn.hutool.extra.expression;
+package org.dromara.hutool.extra.expression;
 
-import cn.hutool.core.map.Dict;
-import cn.hutool.extra.expression.engine.jexl.JexlEngine;
-import cn.hutool.extra.expression.engine.jfireel.JfireELEngine;
-import cn.hutool.extra.expression.engine.mvel.MvelEngine;
-import cn.hutool.extra.expression.engine.qlexpress.QLExpressEngine;
-import cn.hutool.extra.expression.engine.rhino.RhinoEngine;
-import cn.hutool.extra.expression.engine.spel.SpELEngine;
+import org.dromara.hutool.core.map.Dict;
+import org.dromara.hutool.extra.expression.engine.jexl.JexlEngine;
+import org.dromara.hutool.extra.expression.engine.jfireel.JfireELEngine;
+import org.dromara.hutool.extra.expression.engine.mvel.MvelEngine;
+import org.dromara.hutool.extra.expression.engine.qlexpress.QLExpressEngine;
+import org.dromara.hutool.extra.expression.engine.rhino.RhinoEngine;
+import org.dromara.hutool.extra.expression.engine.spel.SpELEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/ftp/FtpTest.java
similarity index 94%
rename from hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/ftp/FtpTest.java
index d5e75cdc3..91c7918b8 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/ftp/FtpTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.extra.ftp;
+package org.dromara.hutool.extra.ftp;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.extra.ssh.Sftp;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.extra.ssh.Sftp;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ftp/SimpleFtpServerTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/ftp/SimpleFtpServerTest.java
similarity index 81%
rename from hutool-extra/src/test/java/cn/hutool/extra/ftp/SimpleFtpServerTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/ftp/SimpleFtpServerTest.java
index fa77e1fdf..e642f0703 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/ftp/SimpleFtpServerTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/ftp/SimpleFtpServerTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.extra.ftp;
+package org.dromara.hutool.extra.ftp;
 
 public class SimpleFtpServerTest {
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/mail/MailAccountTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/mail/MailAccountTest.java
similarity index 97%
rename from hutool-extra/src/test/java/cn/hutool/extra/mail/MailAccountTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/mail/MailAccountTest.java
index 7465965ff..08578e55f 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/mail/MailAccountTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/mail/MailAccountTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.extra.mail;
+package org.dromara.hutool.extra.mail;
 
 import com.sun.mail.util.MailSSLSocketFactory;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/mail/MailTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/mail/MailTest.java
similarity index 96%
rename from hutool-extra/src/test/java/cn/hutool/extra/mail/MailTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/mail/MailTest.java
index 306c2d2cb..0755c9d2d 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/mail/MailTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/mail/MailTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.extra.mail;
+package org.dromara.hutool.extra.mail;
 
-import cn.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/management/JavaInfoTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/management/JavaInfoTest.java
similarity index 90%
rename from hutool-extra/src/test/java/cn/hutool/extra/management/JavaInfoTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/management/JavaInfoTest.java
index b6c3f4bd3..93bc9cd2e 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/management/JavaInfoTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/management/JavaInfoTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/management/OshiPrintTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/management/OshiPrintTest.java
similarity index 58%
rename from hutool-extra/src/test/java/cn/hutool/extra/management/OshiPrintTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/management/OshiPrintTest.java
index 775c570e4..ab94e7a38 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/management/OshiPrintTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/management/OshiPrintTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.extra.management.oshi.OshiUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.extra.management.oshi.OshiUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/management/OshiTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/management/OshiTest.java
similarity index 82%
rename from hutool-extra/src/test/java/cn/hutool/extra/management/OshiTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/management/OshiTest.java
index bcd9f4565..75d97d486 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/management/OshiTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/management/OshiTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.extra.management.oshi.CpuInfo;
-import cn.hutool.extra.management.oshi.OshiUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.extra.management.oshi.CpuInfo;
+import org.dromara.hutool.extra.management.oshi.OshiUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/management/SystemUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/management/SystemUtilTest.java
similarity index 93%
rename from hutool-extra/src/test/java/cn/hutool/extra/management/SystemUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/management/SystemUtilTest.java
index 1be7321fb..112366fe1 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/management/SystemUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/management/SystemUtilTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.extra.management;
+package org.dromara.hutool.extra.management;
 
-import cn.hutool.core.util.SystemUtil;
+import org.dromara.hutool.core.util.SystemUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/Bopomofo4jTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/Bopomofo4jTest.java
similarity index 80%
rename from hutool-extra/src/test/java/cn/hutool/extra/pinyin/Bopomofo4jTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/Bopomofo4jTest.java
index 60d0ed112..1bfbfe233 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/Bopomofo4jTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/Bopomofo4jTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.extra.pinyin;
+package org.dromara.hutool.extra.pinyin;
 
-import cn.hutool.extra.pinyin.engine.bopomofo4j.Bopomofo4jEngine;
+import org.dromara.hutool.extra.pinyin.engine.bopomofo4j.Bopomofo4jEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/HoubbPinyinTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/HoubbPinyinTest.java
similarity index 79%
rename from hutool-extra/src/test/java/cn/hutool/extra/pinyin/HoubbPinyinTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/HoubbPinyinTest.java
index 06dc79131..558ee182b 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/HoubbPinyinTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/HoubbPinyinTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.extra.pinyin;
+package org.dromara.hutool.extra.pinyin;
 
-import cn.hutool.extra.pinyin.engine.houbbpinyin.HoubbPinyinEngine;
+import org.dromara.hutool.extra.pinyin.engine.houbbpinyin.HoubbPinyinEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/JpinyinTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/JpinyinTest.java
similarity index 81%
rename from hutool-extra/src/test/java/cn/hutool/extra/pinyin/JpinyinTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/JpinyinTest.java
index 32891d9da..1bebf8a9d 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/JpinyinTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/JpinyinTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.extra.pinyin;
+package org.dromara.hutool.extra.pinyin;
 
-import cn.hutool.extra.pinyin.engine.jpinyin.JPinyinEngine;
+import org.dromara.hutool.extra.pinyin.engine.jpinyin.JPinyinEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/Pinyin4jTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/Pinyin4jTest.java
similarity index 80%
rename from hutool-extra/src/test/java/cn/hutool/extra/pinyin/Pinyin4jTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/Pinyin4jTest.java
index f69ea714a..8b1d019a4 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/Pinyin4jTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/Pinyin4jTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.extra.pinyin;
+package org.dromara.hutool.extra.pinyin;
 
-import cn.hutool.extra.pinyin.engine.pinyin4j.Pinyin4jEngine;
+import org.dromara.hutool.extra.pinyin.engine.pinyin4j.Pinyin4jEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/PinyinUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/PinyinUtilTest.java
similarity index 93%
rename from hutool-extra/src/test/java/cn/hutool/extra/pinyin/PinyinUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/PinyinUtilTest.java
index e56791393..a98fe54b2 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/PinyinUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/PinyinUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.extra.pinyin;
+package org.dromara.hutool.extra.pinyin;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/TinyPinyinTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/TinyPinyinTest.java
similarity index 80%
rename from hutool-extra/src/test/java/cn/hutool/extra/pinyin/TinyPinyinTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/TinyPinyinTest.java
index 280ad2c7f..0807d7f8b 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/TinyPinyinTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/TinyPinyinTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.extra.pinyin;
+package org.dromara.hutool.extra.pinyin;
 
-import cn.hutool.extra.pinyin.engine.tinypinyin.TinyPinyinEngine;
+import org.dromara.hutool.extra.pinyin.engine.tinypinyin.TinyPinyinEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/Discussions3030Test.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/Discussions3030Test.java
similarity index 90%
rename from hutool-extra/src/test/java/cn/hutool/extra/qrcode/Discussions3030Test.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/Discussions3030Test.java
index 3224589a0..6fd51d2db 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/Discussions3030Test.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/Discussions3030Test.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.extra.qrcode;
+package org.dromara.hutool.extra.qrcode;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static cn.hutool.core.io.file.FileUtil.file;
+import static org.dromara.hutool.core.io.file.FileUtil.file;
 
 public class Discussions3030Test {
 	@Test
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/QrCodeUtilTest.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/QrCodeUtilTest.java
index 9b776e43d..8ec1a71c6
--- a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/QrCodeUtilTest.java
@@ -1,11 +1,11 @@
-package cn.hutool.extra.qrcode;
+package org.dromara.hutool.extra.qrcode;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.swing.img.ImgUtil;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.swing.img.ImgUtil;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.datamatrix.encoder.SymbolShapeHint;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/script/ScriptUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/script/ScriptUtilTest.java
similarity index 82%
rename from hutool-extra/src/test/java/cn/hutool/extra/script/ScriptUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/script/ScriptUtilTest.java
index 3a632c0f9..8be19960f 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/script/ScriptUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/script/ScriptUtilTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.extra.script;
+package org.dromara.hutool.extra.script;
 
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.exceptions.UtilException;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/EnableSpringUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/EnableSpringUtilTest.java
similarity index 94%
rename from hutool-extra/src/test/java/cn/hutool/extra/spring/EnableSpringUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/spring/EnableSpringUtilTest.java
index 926cb0da8..44dd3082a 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/spring/EnableSpringUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/EnableSpringUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.extra.spring;
+package org.dromara.hutool.extra.spring;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java
index 5b6ac582b..eabefa372
--- a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.extra.spring;
+package org.dromara.hutool.extra.spring;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.reflect.TypeReference;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -18,7 +18,7 @@ import java.util.Map;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = {SpringUtil.class, SpringUtilTest.Demo2.class})
-//@Import(cn.hutool.extra.spring.SpringUtil.class)
+//@Import(spring.org.dromara.hutool.extra.SpringUtil.class)
 public class SpringUtilTest {
 
 	/**
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
index 3c21320fe..432052ce8
--- a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.extra.spring;
+package org.dromara.hutool.extra.spring;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.reflect.TypeReference;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -16,7 +16,7 @@ import java.util.Map;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = {SpringUtilWithAutoConfigTest.Demo2.class})
-//@Import(cn.hutool.extra.spring.SpringUtil.class)
+//@Import(spring.org.dromara.hutool.extra.SpringUtil.class)
 @EnableAutoConfiguration
 public class SpringUtilWithAutoConfigTest {
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/ssh/JschUtilTest.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/ssh/JschUtilTest.java
index 218456363..6975d55e3
--- a/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/ssh/JschUtilTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.extra.ssh;
+package org.dromara.hutool.extra.ssh;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Console;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Console;
 import com.jcraft.jsch.Session;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ssh/SftpTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/ssh/SftpTest.java
similarity index 93%
rename from hutool-extra/src/test/java/cn/hutool/extra/ssh/SftpTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/ssh/SftpTest.java
index 681d3ca66..4d949429b 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/ssh/SftpTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/ssh/SftpTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.extra.ssh;
+package org.dromara.hutool.extra.ssh;
 
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 import org.junit.Before;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/template/JetbrickTest.java
old mode 100755
new mode 100644
similarity index 84%
rename from hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/template/JetbrickTest.java
index 5951fa121..c48b71c64
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/template/JetbrickTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.extra.template;
+package org.dromara.hutool.extra.template;
 
-import cn.hutool.core.map.Dict;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.template.engine.jetbrick.JetbrickEngine;
+import org.dromara.hutool.core.map.Dict;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.template.engine.jetbrick.JetbrickEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/template/TemplateUtilTest.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/template/TemplateUtilTest.java
index 651c96f56..1a7bc22cd
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/template/TemplateUtilTest.java
@@ -1,16 +1,16 @@
-package cn.hutool.extra.template;
+package org.dromara.hutool.extra.template;
 
-import cn.hutool.core.map.Dict;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.extra.template.TemplateConfig.ResourceMode;
-import cn.hutool.extra.template.engine.beetl.BeetlEngine;
-import cn.hutool.extra.template.engine.enjoy.EnjoyEngine;
-import cn.hutool.extra.template.engine.freemarker.FreemarkerEngine;
-import cn.hutool.extra.template.engine.pebble.PebbleTemplateEngine;
-import cn.hutool.extra.template.engine.rythm.RythmEngine;
-import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
-import cn.hutool.extra.template.engine.velocity.VelocityEngine;
-import cn.hutool.extra.template.engine.wit.WitEngine;
+import org.dromara.hutool.core.map.Dict;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.extra.template.TemplateConfig.ResourceMode;
+import org.dromara.hutool.extra.template.engine.beetl.BeetlEngine;
+import org.dromara.hutool.extra.template.engine.enjoy.EnjoyEngine;
+import org.dromara.hutool.extra.template.engine.freemarker.FreemarkerEngine;
+import org.dromara.hutool.extra.template.engine.pebble.PebbleTemplateEngine;
+import org.dromara.hutool.extra.template.engine.rythm.RythmEngine;
+import org.dromara.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
+import org.dromara.hutool.extra.template.engine.velocity.VelocityEngine;
+import org.dromara.hutool.extra.template.engine.wit.WitEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/template/ThymeleafTest.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/template/ThymeleafTest.java
index 92ca42a40..3738eaf13
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/template/ThymeleafTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.extra.template;
+package org.dromara.hutool.extra.template;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.Dict;
-import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.map.Dict;
+import org.dromara.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/template/VelocityTest.java
old mode 100755
new mode 100644
similarity index 74%
rename from hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/template/VelocityTest.java
index 072c22ff0..44839d808
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/template/VelocityTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.extra.template;
+package org.dromara.hutool.extra.template;
 
-import cn.hutool.core.map.Dict;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.extra.template.engine.velocity.VelocityEngine;
+import org.dromara.hutool.core.map.Dict;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.extra.template.engine.velocity.VelocityEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/tokenizer/TokenizerUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/tokenizer/TokenizerUtilTest.java
similarity index 79%
rename from hutool-extra/src/test/java/cn/hutool/extra/tokenizer/TokenizerUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/tokenizer/TokenizerUtilTest.java
index a98f5daf1..144a8d05f 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/tokenizer/TokenizerUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/tokenizer/TokenizerUtilTest.java
@@ -1,14 +1,14 @@
-package cn.hutool.extra.tokenizer;
+package org.dromara.hutool.extra.tokenizer;
 
-import cn.hutool.core.collection.iter.IterUtil;
-import cn.hutool.extra.tokenizer.engine.analysis.SmartcnEngine;
-import cn.hutool.extra.tokenizer.engine.hanlp.HanLPEngine;
-import cn.hutool.extra.tokenizer.engine.ikanalyzer.IKAnalyzerEngine;
-import cn.hutool.extra.tokenizer.engine.jcseg.JcsegEngine;
-import cn.hutool.extra.tokenizer.engine.jieba.JiebaEngine;
-import cn.hutool.extra.tokenizer.engine.mmseg.MmsegEngine;
-import cn.hutool.extra.tokenizer.engine.mynlp.MynlpEngine;
-import cn.hutool.extra.tokenizer.engine.word.WordEngine;
+import org.dromara.hutool.core.collection.iter.IterUtil;
+import org.dromara.hutool.extra.tokenizer.engine.analysis.SmartcnEngine;
+import org.dromara.hutool.extra.tokenizer.engine.hanlp.HanLPEngine;
+import org.dromara.hutool.extra.tokenizer.engine.ikanalyzer.IKAnalyzerEngine;
+import org.dromara.hutool.extra.tokenizer.engine.jcseg.JcsegEngine;
+import org.dromara.hutool.extra.tokenizer.engine.jieba.JiebaEngine;
+import org.dromara.hutool.extra.tokenizer.engine.mmseg.MmsegEngine;
+import org.dromara.hutool.extra.tokenizer.engine.mynlp.MynlpEngine;
+import org.dromara.hutool.extra.tokenizer.engine.word.WordEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/validation/BeanValidatorUtilTest.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/validation/BeanValidatorUtilTest.java
index ac848fe16..3bea65d96
--- a/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/validation/BeanValidatorUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.extra.validation;
+package org.dromara.hutool.extra.validation;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/xml/JAXBUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/xml/JAXBUtilTest.java
similarity index 98%
rename from hutool-extra/src/test/java/cn/hutool/extra/xml/JAXBUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/xml/JAXBUtilTest.java
index 9b74b6036..2c851f7da 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/xml/JAXBUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/xml/JAXBUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.extra.xml;
+package org.dromara.hutool.extra.xml;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml
index 39d26abc5..3aff588b5 100755
--- a/hutool-http/pom.xml
+++ b/hutool-http/pom.xml
@@ -19,7 +19,7 @@
 	jar
 
 	
-		cn.hutool
+		org.dromara.hutool
 		hutool-parent
 		6.0.0.M3
 	
@@ -29,17 +29,17 @@
 	Hutool Http客户端
 
 	
-		cn.hutool.http
+		org.dromara.hutool.http
 	
 
 	
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-core
 			${project.parent.version}
 		
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-log
 			${project.parent.version}
 		
@@ -86,7 +86,7 @@
 		
 
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-json
 			${project.parent.version}
 			test
diff --git a/hutool-http/src/main/java/cn/hutool/http/GlobalCompressStreamRegister.java b/hutool-http/src/main/java/org/dromara/hutool/http/GlobalCompressStreamRegister.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/GlobalCompressStreamRegister.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/GlobalCompressStreamRegister.java
index 8ae13bbb5..99aabe129
--- a/hutool-http/src/main/java/cn/hutool/http/GlobalCompressStreamRegister.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/GlobalCompressStreamRegister.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.compress.InflaterInputStream;
-import cn.hutool.core.map.CaseInsensitiveMap;
+import org.dromara.hutool.core.compress.InflaterInputStream;
+import org.dromara.hutool.core.map.CaseInsensitiveMap;
 
 import java.io.InputStream;
 import java.util.Map;
diff --git a/hutool-http/src/main/java/cn/hutool/http/GlobalHeaders.java b/hutool-http/src/main/java/org/dromara/hutool/http/GlobalHeaders.java
similarity index 96%
rename from hutool-http/src/main/java/cn/hutool/http/GlobalHeaders.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/GlobalHeaders.java
index e1a04a37b..bd61cf114 100644
--- a/hutool-http/src/main/java/cn/hutool/http/GlobalHeaders.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/GlobalHeaders.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.http.meta.Header;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.http.meta.Header;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpException.java b/hutool-http/src/main/java/org/dromara/hutool/http/HttpException.java
similarity index 94%
rename from hutool-http/src/main/java/cn/hutool/http/HttpException.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/HttpException.java
index cf13e3d32..6131a4d8c 100644
--- a/hutool-http/src/main/java/cn/hutool/http/HttpException.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/HttpException.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * HTTP异常
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpGlobalConfig.java b/hutool-http/src/main/java/org/dromara/hutool/http/HttpGlobalConfig.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-http/src/main/java/cn/hutool/http/HttpGlobalConfig.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/HttpGlobalConfig.java
index d82e6852b..6972930bf
--- a/hutool-http/src/main/java/cn/hutool/http/HttpGlobalConfig.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/HttpGlobalConfig.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.http.client.cookie.GlobalCookieManager;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.http.client.cookie.GlobalCookieManager;
 
 import java.io.Serializable;
 import java.net.CookieManager;
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/HttpUtil.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/HttpUtil.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/HttpUtil.java
index b1094a875..d68ab4d07
--- a/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/HttpUtil.java
@@ -10,17 +10,17 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.net.url.UrlQueryUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.http.client.ClientConfig;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.Response;
-import cn.hutool.http.client.engine.ClientEngineFactory;
-import cn.hutool.http.meta.Method;
-import cn.hutool.http.server.SimpleServer;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.net.url.UrlQueryUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.http.client.ClientConfig;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.Response;
+import org.dromara.hutool.http.client.engine.ClientEngineFactory;
+import org.dromara.hutool.http.meta.Method;
+import org.dromara.hutool.http.server.SimpleServer;
 
 import java.nio.charset.Charset;
 import java.util.Map;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/ClientConfig.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/ClientConfig.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-http/src/main/java/cn/hutool/http/client/ClientConfig.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/ClientConfig.java
index 9806b46db..7b8932d83
--- a/hutool-http/src/main/java/cn/hutool/http/client/ClientConfig.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/ClientConfig.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
 
-import cn.hutool.http.HttpGlobalConfig;
-import cn.hutool.http.ssl.SSLInfo;
+import org.dromara.hutool.http.HttpGlobalConfig;
+import org.dromara.hutool.http.ssl.SSLInfo;
 
 import java.net.InetSocketAddress;
 import java.net.Proxy;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/ClientEngine.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/ClientEngine.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-http/src/main/java/cn/hutool/http/client/ClientEngine.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/ClientEngine.java
index ac6633cc6..f9fd115f0
--- a/hutool-http/src/main/java/cn/hutool/http/client/ClientEngine.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/ClientEngine.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
 
 import java.io.Closeable;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/HeaderOperation.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/HeaderOperation.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-http/src/main/java/cn/hutool/http/client/HeaderOperation.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/HeaderOperation.java
index ae3c5cb97..5768ea435
--- a/hutool-http/src/main/java/cn/hutool/http/client/HeaderOperation.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/HeaderOperation.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.http.meta.Header;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.http.meta.Header;
 
 import java.net.HttpCookie;
 import java.util.Collection;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/HttpDownloader.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/HttpDownloader.java
similarity index 94%
rename from hutool-http/src/main/java/cn/hutool/http/client/HttpDownloader.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/HttpDownloader.java
index 87025a4b3..707c4da2b 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/HttpDownloader.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/HttpDownloader.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
 
-import cn.hutool.core.io.StreamProgress;
-import cn.hutool.core.io.stream.FastByteArrayOutputStream;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.http.HttpException;
-import cn.hutool.http.client.engine.ClientEngineFactory;
+import org.dromara.hutool.core.io.StreamProgress;
+import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.http.HttpException;
+import org.dromara.hutool.http.client.engine.ClientEngineFactory;
 
 import java.io.File;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/Request.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/Request.java
old mode 100755
new mode 100644
similarity index 89%
rename from hutool-http/src/main/java/cn/hutool/http/client/Request.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/Request.java
index 0563051c2..4906d2eea
--- a/hutool-http/src/main/java/cn/hutool/http/client/Request.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/Request.java
@@ -10,24 +10,24 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.net.url.UrlBuilder;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.http.GlobalHeaders;
-import cn.hutool.http.HttpGlobalConfig;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.http.client.body.HttpBody;
-import cn.hutool.http.client.body.StringBody;
-import cn.hutool.http.client.body.UrlEncodedFormBody;
-import cn.hutool.http.meta.Header;
-import cn.hutool.http.meta.Method;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.net.url.UrlBuilder;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.http.GlobalHeaders;
+import org.dromara.hutool.http.HttpGlobalConfig;
+import org.dromara.hutool.http.HttpUtil;
+import org.dromara.hutool.http.client.body.HttpBody;
+import org.dromara.hutool.http.client.body.StringBody;
+import org.dromara.hutool.http.client.body.UrlEncodedFormBody;
+import org.dromara.hutool.http.meta.Header;
+import org.dromara.hutool.http.meta.Method;
 
 import java.nio.charset.Charset;
 import java.util.HashMap;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/Response.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/Response.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/client/Response.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/Response.java
index a60805646..faa5fb7f3
--- a/hutool-http/src/main/java/cn/hutool/http/client/Response.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/Response.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.http.HttpException;
-import cn.hutool.http.client.body.ResponseBody;
-import cn.hutool.http.meta.ContentTypeUtil;
-import cn.hutool.http.meta.Header;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.http.HttpException;
+import org.dromara.hutool.http.client.body.ResponseBody;
+import org.dromara.hutool.http.meta.ContentTypeUtil;
+import org.dromara.hutool.http.meta.Header;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/BytesBody.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/BytesBody.java
similarity index 87%
rename from hutool-http/src/main/java/cn/hutool/http/client/body/BytesBody.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/body/BytesBody.java
index b37124951..2f4bbb130 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/body/BytesBody.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/BytesBody.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.body;
+package org.dromara.hutool.http.client.body;
 
-import cn.hutool.core.io.resource.BytesResource;
-import cn.hutool.core.io.resource.HttpResource;
+import org.dromara.hutool.core.io.resource.BytesResource;
+import org.dromara.hutool.core.io.resource.HttpResource;
 
 /**
  * bytes类型的Http request body，主要发送编码后的表单数据或rest body（如JSON或XML）
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/FormBody.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/FormBody.java
old mode 100755
new mode 100644
similarity index 86%
rename from hutool-http/src/main/java/cn/hutool/http/client/body/FormBody.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/body/FormBody.java
index 04a6dca68..16ac0e04e
--- a/hutool-http/src/main/java/cn/hutool/http/client/body/FormBody.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/FormBody.java
@@ -10,17 +10,17 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.body;
+package org.dromara.hutool.http.client.body;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.resource.FileResource;
-import cn.hutool.core.io.resource.MultiFileResource;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.map.TableMap;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.io.resource.FileResource;
+import org.dromara.hutool.core.io.resource.MultiFileResource;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.map.TableMap;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import java.io.File;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/HttpBody.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/HttpBody.java
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/client/body/HttpBody.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/body/HttpBody.java
index 2a74b78c8..7ebe929fb 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/body/HttpBody.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/HttpBody.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.body;
+package org.dromara.hutool.http.client.body;
 
-import cn.hutool.core.io.stream.FastByteArrayOutputStream;
-import cn.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
+import org.dromara.hutool.core.io.IoUtil;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/MultipartBody.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartBody.java
similarity index 92%
rename from hutool-http/src/main/java/cn/hutool/http/client/body/MultipartBody.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartBody.java
index 72ea90596..fa0e8c7ac 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/body/MultipartBody.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartBody.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.body;
+package org.dromara.hutool.http.client.body;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.http.meta.ContentType;
-import cn.hutool.http.HttpGlobalConfig;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.http.meta.ContentType;
+import org.dromara.hutool.http.HttpGlobalConfig;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/MultipartOutputStream.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartOutputStream.java
similarity index 89%
rename from hutool-http/src/main/java/cn/hutool/http/client/body/MultipartOutputStream.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartOutputStream.java
index 42b8762fc..dae06309c 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/body/MultipartOutputStream.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartOutputStream.java
@@ -10,19 +10,19 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.body;
+package org.dromara.hutool.http.client.body;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.resource.HttpResource;
-import cn.hutool.core.io.resource.MultiResource;
-import cn.hutool.core.io.resource.Resource;
-import cn.hutool.core.io.resource.StringResource;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.http.HttpGlobalConfig;
-import cn.hutool.http.meta.ContentType;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.resource.HttpResource;
+import org.dromara.hutool.core.io.resource.MultiResource;
+import org.dromara.hutool.core.io.resource.Resource;
+import org.dromara.hutool.core.io.resource.StringResource;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.http.HttpGlobalConfig;
+import org.dromara.hutool.http.meta.ContentType;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/ResourceBody.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResourceBody.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-http/src/main/java/cn/hutool/http/client/body/ResourceBody.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResourceBody.java
index fee511a2e..1de516a78
--- a/hutool-http/src/main/java/cn/hutool/http/client/body/ResourceBody.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResourceBody.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.body;
+package org.dromara.hutool.http.client.body;
 
-import cn.hutool.core.io.resource.HttpResource;
-import cn.hutool.core.io.resource.Resource;
+import org.dromara.hutool.core.io.resource.HttpResource;
+import org.dromara.hutool.core.io.resource.Resource;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/ResponseBody.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResponseBody.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-http/src/main/java/cn/hutool/http/client/body/ResponseBody.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResponseBody.java
index de5d1f689..559296ff9
--- a/hutool-http/src/main/java/cn/hutool/http/client/body/ResponseBody.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResponseBody.java
@@ -10,21 +10,21 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.body;
+package org.dromara.hutool.http.client.body;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.StreamProgress;
-import cn.hutool.core.io.file.FileNameUtil;
-import cn.hutool.core.io.stream.SyncInputStream;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.http.HttpException;
-import cn.hutool.http.client.Response;
-import cn.hutool.http.html.HtmlUtil;
-import cn.hutool.http.meta.Header;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.StreamProgress;
+import org.dromara.hutool.core.io.file.FileNameUtil;
+import org.dromara.hutool.core.io.stream.SyncInputStream;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.http.HttpException;
+import org.dromara.hutool.http.client.Response;
+import org.dromara.hutool.http.html.HtmlUtil;
+import org.dromara.hutool.http.meta.Header;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/StringBody.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/StringBody.java
old mode 100755
new mode 100644
similarity index 86%
rename from hutool-http/src/main/java/cn/hutool/http/client/body/StringBody.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/body/StringBody.java
index 56d31a14a..90f96b156
--- a/hutool-http/src/main/java/cn/hutool/http/client/body/StringBody.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/StringBody.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.body;
+package org.dromara.hutool.http.client.body;
 
-import cn.hutool.core.io.resource.HttpResource;
-import cn.hutool.core.io.resource.StringResource;
-import cn.hutool.http.meta.ContentTypeUtil;
+import org.dromara.hutool.core.io.resource.HttpResource;
+import org.dromara.hutool.core.io.resource.StringResource;
+import org.dromara.hutool.http.meta.ContentTypeUtil;
 
 import java.nio.charset.Charset;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/UrlEncodedFormBody.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/UrlEncodedFormBody.java
similarity index 87%
rename from hutool-http/src/main/java/cn/hutool/http/client/body/UrlEncodedFormBody.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/body/UrlEncodedFormBody.java
index dbd029f14..1846af1f2 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/body/UrlEncodedFormBody.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/UrlEncodedFormBody.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.body;
+package org.dromara.hutool.http.client.body;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.net.url.UrlQuery;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.http.meta.ContentType;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.net.url.UrlQuery;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.http.meta.ContentType;
 
 import java.io.OutputStream;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/body/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/package-info.java
similarity index 92%
rename from hutool-http/src/main/java/cn/hutool/http/client/body/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/body/package-info.java
index 3b8b15969..05c076796 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/body/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.http.client.body;
+package org.dromara.hutool.http.client.body;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/cookie/GlobalCookieManager.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/GlobalCookieManager.java
similarity index 92%
rename from hutool-http/src/main/java/cn/hutool/http/client/cookie/GlobalCookieManager.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/GlobalCookieManager.java
index a5a723778..9532acbaf 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/cookie/GlobalCookieManager.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/GlobalCookieManager.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.cookie;
+package org.dromara.hutool.http.client.cookie;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.net.url.URLUtil;
-import cn.hutool.http.client.engine.jdk.JdkHttpConnection;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.net.url.URLUtil;
+import org.dromara.hutool.http.client.engine.jdk.JdkHttpConnection;
 
 import java.io.IOException;
 import java.net.CookieManager;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/cookie/ThreadLocalCookieStore.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/ThreadLocalCookieStore.java
similarity index 97%
rename from hutool-http/src/main/java/cn/hutool/http/client/cookie/ThreadLocalCookieStore.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/ThreadLocalCookieStore.java
index 40d51fcca..87334a589 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/cookie/ThreadLocalCookieStore.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/ThreadLocalCookieStore.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.cookie;
+package org.dromara.hutool.http.client.cookie;
 
 import java.net.CookieManager;
 import java.net.CookieStore;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/cookie/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/package-info.java
similarity index 92%
rename from hutool-http/src/main/java/cn/hutool/http/client/cookie/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/package-info.java
index c42b8e990..8fd96c808 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/cookie/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.http.client.cookie;
+package org.dromara.hutool.http.client.cookie;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/ClientEngineFactory.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngineFactory.java
old mode 100755
new mode 100644
similarity index 84%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/ClientEngineFactory.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngineFactory.java
index 49aad2994..e6093fb2e
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/ClientEngineFactory.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngineFactory.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine;
+package org.dromara.hutool.http.client.engine;
 
-import cn.hutool.core.lang.Singleton;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ServiceLoaderUtil;
-import cn.hutool.http.HttpException;
-import cn.hutool.http.client.ClientConfig;
-import cn.hutool.http.client.ClientEngine;
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.core.lang.Singleton;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ServiceLoaderUtil;
+import org.dromara.hutool.http.HttpException;
+import org.dromara.hutool.http.client.ClientConfig;
+import org.dromara.hutool.http.client.ClientEngine;
+import org.dromara.hutool.log.StaticLog;
 
 /**
  * Http客户端引擎工厂类
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4BodyEntity.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4BodyEntity.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4BodyEntity.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4BodyEntity.java
index 4f9b617c4..142613954
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4BodyEntity.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4BodyEntity.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.httpclient4;
+package org.dromara.hutool.http.client.engine.httpclient4;
 
-import cn.hutool.http.client.body.BytesBody;
-import cn.hutool.http.client.body.HttpBody;
+import org.dromara.hutool.http.client.body.BytesBody;
+import org.dromara.hutool.http.client.body.HttpBody;
 import org.apache.http.entity.AbstractHttpEntity;
 
 import java.io.InputStream;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4Engine.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java
old mode 100755
new mode 100644
similarity index 88%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4Engine.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java
index d46b1b5bb..6aeb5ab08
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4Engine.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java
@@ -10,19 +10,19 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.httpclient4;
+package org.dromara.hutool.http.client.engine.httpclient4;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.net.url.UrlBuilder;
-import cn.hutool.http.GlobalHeaders;
-import cn.hutool.http.HttpException;
-import cn.hutool.http.client.ClientConfig;
-import cn.hutool.http.client.ClientEngine;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.Response;
-import cn.hutool.http.client.body.HttpBody;
-import cn.hutool.http.ssl.SSLInfo;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.net.url.UrlBuilder;
+import org.dromara.hutool.http.GlobalHeaders;
+import org.dromara.hutool.http.HttpException;
+import org.dromara.hutool.http.client.ClientConfig;
+import org.dromara.hutool.http.client.ClientEngine;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.Response;
+import org.dromara.hutool.http.client.body.HttpBody;
+import org.dromara.hutool.http.ssl.SSLInfo;
 import org.apache.http.Header;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -142,7 +142,7 @@ public class HttpClient4Engine implements ClientEngine {
 		final HttpBody body = message.body();
 		request.setEntity(new HttpClient4BodyEntity(
 				// 用户自定义的内容类型
-				message.header(cn.hutool.http.meta.Header.CONTENT_TYPE),
+				message.header(org.dromara.hutool.http.meta.Header.CONTENT_TYPE),
 				// 用户自定义编码
 				message.charset(),
 				message.isChunked(),
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4Response.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Response.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4Response.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Response.java
index e61bbdbd7..d1d11d5d8
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/HttpClient4Response.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Response.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.httpclient4;
+package org.dromara.hutool.http.client.engine.httpclient4;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.http.HttpException;
-import cn.hutool.http.client.Response;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.http.HttpException;
+import org.dromara.hutool.http.client.Response;
 import org.apache.http.Header;
 import org.apache.http.ParseException;
 import org.apache.http.client.methods.CloseableHttpResponse;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/package-info.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/package-info.java
index a609c34af..6debbf00f
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/package-info.java
@@ -16,4 +16,4 @@
  *
  * @author looly
  */
-package cn.hutool.http.client.engine.httpclient4;
+package org.dromara.hutool.http.client.engine.httpclient4;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/pom.xml b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/pom.xml
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/pom.xml
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/pom.xml
index f4148c4cb..c11cf402e
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient4/pom.xml
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/pom.xml
@@ -19,7 +19,7 @@
 	jar
 
 	
-		cn.hutool
+		org.dromara.hutool
 		hutool-parent
 		6.0.0.M1
 	
@@ -30,7 +30,7 @@
 
 	
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-core
 			${project.parent.version}
 		
@@ -56,7 +56,7 @@
 		
 
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-json
 			${project.parent.version}
 			test
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5BodyEntity.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5BodyEntity.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5BodyEntity.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5BodyEntity.java
index 136870759..5d9317f8a
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5BodyEntity.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5BodyEntity.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.httpclient5;
+package org.dromara.hutool.http.client.engine.httpclient5;
 
-import cn.hutool.http.client.body.BytesBody;
-import cn.hutool.http.client.body.HttpBody;
+import org.dromara.hutool.http.client.body.BytesBody;
+import org.dromara.hutool.http.client.body.HttpBody;
 import org.apache.hc.core5.http.io.entity.AbstractHttpEntity;
 
 import java.io.InputStream;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5Engine.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5Engine.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java
index 3aaf6fe3b..7449930e3
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5Engine.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java
@@ -10,19 +10,19 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.httpclient5;
+package org.dromara.hutool.http.client.engine.httpclient5;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.net.url.UrlBuilder;
-import cn.hutool.http.GlobalHeaders;
-import cn.hutool.http.HttpException;
-import cn.hutool.http.client.ClientConfig;
-import cn.hutool.http.client.ClientEngine;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.Response;
-import cn.hutool.http.client.body.HttpBody;
-import cn.hutool.http.ssl.SSLInfo;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.net.url.UrlBuilder;
+import org.dromara.hutool.http.GlobalHeaders;
+import org.dromara.hutool.http.HttpException;
+import org.dromara.hutool.http.client.ClientConfig;
+import org.dromara.hutool.http.client.ClientEngine;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.Response;
+import org.dromara.hutool.http.client.body.HttpBody;
+import org.dromara.hutool.http.ssl.SSLInfo;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.config.RequestConfig;
@@ -140,7 +140,7 @@ public class HttpClient5Engine implements ClientEngine {
 		final HttpBody body = message.body();
 		request.setEntity(new HttpClient5BodyEntity(
 				// 用户自定义的内容类型
-				message.header(cn.hutool.http.meta.Header.CONTENT_TYPE),
+				message.header(org.dromara.hutool.http.meta.Header.CONTENT_TYPE),
 				// 用户自定义编码
 				message.charset(),
 				message.isChunked(),
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5Response.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Response.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5Response.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Response.java
index 83e94b9ef..851b37e0d
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/HttpClient5Response.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Response.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.httpclient5;
+package org.dromara.hutool.http.client.engine.httpclient5;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.http.HttpException;
-import cn.hutool.http.client.Response;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.http.HttpException;
+import org.dromara.hutool.http.client.Response;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.Header;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/package-info.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/package-info.java
index 24f21500a..385082fbb
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/httpclient5/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/package-info.java
@@ -16,4 +16,4 @@
  *
  * @author looly
  */
-package cn.hutool.http.client.engine.httpclient5;
+package org.dromara.hutool.http.client.engine.httpclient5;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java
index 3e8444dd6..6fc023645
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.jdk;
+package org.dromara.hutool.http.client.engine.jdk;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.reflect.FieldUtil;
-import cn.hutool.core.reflect.ModifierUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.SystemUtil;
-import cn.hutool.http.HttpException;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.reflect.FieldUtil;
+import org.dromara.hutool.core.reflect.ModifierUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.SystemUtil;
+import org.dromara.hutool.http.HttpException;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkClientEngine.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkClientEngine.java
old mode 100755
new mode 100644
similarity index 88%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkClientEngine.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkClientEngine.java
index c158ea1db..e4140c417
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkClientEngine.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkClientEngine.java
@@ -10,23 +10,23 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.jdk;
+package org.dromara.hutool.http.client.engine.jdk;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.net.url.UrlBuilder;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.http.HttpException;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.http.client.ClientConfig;
-import cn.hutool.http.client.ClientEngine;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.Response;
-import cn.hutool.http.client.body.HttpBody;
-import cn.hutool.http.client.cookie.GlobalCookieManager;
-import cn.hutool.http.meta.Header;
-import cn.hutool.http.meta.HttpStatus;
-import cn.hutool.http.meta.Method;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.net.url.UrlBuilder;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.http.HttpException;
+import org.dromara.hutool.http.HttpUtil;
+import org.dromara.hutool.http.client.ClientConfig;
+import org.dromara.hutool.http.client.ClientEngine;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.Response;
+import org.dromara.hutool.http.client.body.HttpBody;
+import org.dromara.hutool.http.client.cookie.GlobalCookieManager;
+import org.dromara.hutool.http.meta.Header;
+import org.dromara.hutool.http.meta.HttpStatus;
+import org.dromara.hutool.http.meta.Method;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpConnection.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpConnection.java
similarity index 95%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpConnection.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpConnection.java
index 323f637c1..1b4bffb2b 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpConnection.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpConnection.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.jdk;
+package org.dromara.hutool.http.client.engine.jdk;
 
-import cn.hutool.core.net.url.URLUtil;
-import cn.hutool.core.reflect.FieldUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.http.HttpException;
-import cn.hutool.http.client.HeaderOperation;
-import cn.hutool.http.meta.Method;
-import cn.hutool.http.ssl.SSLInfo;
+import org.dromara.hutool.core.net.url.URLUtil;
+import org.dromara.hutool.core.reflect.FieldUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.http.HttpException;
+import org.dromara.hutool.http.client.HeaderOperation;
+import org.dromara.hutool.http.meta.Method;
+import org.dromara.hutool.http.ssl.SSLInfo;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpInputStream.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpInputStream.java
similarity index 90%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpInputStream.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpInputStream.java
index 3d3662544..c746ec6a9 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpInputStream.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpInputStream.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.jdk;
+package org.dromara.hutool.http.client.engine.jdk;
 
-import cn.hutool.core.reflect.ConstructorUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.http.GlobalCompressStreamRegister;
-import cn.hutool.http.HttpException;
-import cn.hutool.http.meta.HttpStatus;
+import org.dromara.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.http.GlobalCompressStreamRegister;
+import org.dromara.hutool.http.HttpException;
+import org.dromara.hutool.http.meta.HttpStatus;
 
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpResponse.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpResponse.java
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpResponse.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpResponse.java
index 17a7142ee..699bed82a 100644
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/JdkHttpResponse.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpResponse.java
@@ -10,17 +10,17 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.jdk;
+package org.dromara.hutool.http.client.engine.jdk;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.stream.EmptyInputStream;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.http.HttpException;
-import cn.hutool.http.client.Response;
-import cn.hutool.http.client.body.ResponseBody;
-import cn.hutool.http.client.cookie.GlobalCookieManager;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.stream.EmptyInputStream;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.http.HttpException;
+import org.dromara.hutool.http.client.Response;
+import org.dromara.hutool.http.client.body.ResponseBody;
+import org.dromara.hutool.http.client.cookie.GlobalCookieManager;
 
 import java.io.Closeable;
 import java.io.FileNotFoundException;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/package-info.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/package-info.java
index fac835828..1906c15df
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/jdk/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  * @since 6.0.0
  */
-package cn.hutool.http.client.engine.jdk;
+package org.dromara.hutool.http.client.engine.jdk;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpEngine.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpEngine.java
old mode 100755
new mode 100644
similarity index 89%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpEngine.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpEngine.java
index 51110afc6..0a86174ef
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpEngine.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpEngine.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.okhttp;
+package org.dromara.hutool.http.client.engine.okhttp;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.http.client.ClientConfig;
-import cn.hutool.http.client.ClientEngine;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.Response;
-import cn.hutool.http.ssl.SSLInfo;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.http.client.ClientConfig;
+import org.dromara.hutool.http.client.ClientEngine;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.Response;
+import org.dromara.hutool.http.ssl.SSLInfo;
 import okhttp3.OkHttpClient;
 import okhttp3.internal.http.HttpMethod;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpRequestBody.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpRequestBody.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpRequestBody.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpRequestBody.java
index 8fcb49303..7e24e94bf
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpRequestBody.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpRequestBody.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.okhttp;
+package org.dromara.hutool.http.client.engine.okhttp;
 
-import cn.hutool.http.client.body.HttpBody;
+import org.dromara.hutool.http.client.body.HttpBody;
 import okhttp3.MediaType;
 import okio.BufferedSink;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpResponse.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpResponse.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpResponse.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpResponse.java
index c3cb5d08c..cf4524036
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/OkHttpResponse.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpResponse.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.client.engine.okhttp;
+package org.dromara.hutool.http.client.engine.okhttp;
 
-import cn.hutool.core.io.stream.EmptyInputStream;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.http.client.Response;
+import org.dromara.hutool.core.io.stream.EmptyInputStream;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.http.client.Response;
 import kotlin.Pair;
 import okhttp3.Headers;
 import okhttp3.ResponseBody;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/package-info.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/package-info.java
index cf1a87e9a..9e58ee5d2
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/okhttp/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/package-info.java
@@ -14,4 +14,4 @@
  * OKHttp3封装
      
  * 文档见：https://square.github.io/okhttp/
  */
-package cn.hutool.http.client.engine.okhttp;
+package org.dromara.hutool.http.client.engine.okhttp;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/engine/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/package-info.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-http/src/main/java/cn/hutool/http/client/engine/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/engine/package-info.java
index 147d532c7..0f0497155
--- a/hutool-http/src/main/java/cn/hutool/http/client/engine/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author looly
  */
-package cn.hutool.http.client.engine;
+package org.dromara.hutool.http.client.engine;
diff --git a/hutool-http/src/main/java/cn/hutool/http/client/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/package-info.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/client/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/client/package-info.java
index 71269ddec..8bb53b27d
--- a/hutool-http/src/main/java/cn/hutool/http/client/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/package-info.java
@@ -14,4 +14,4 @@
  * HTTP请求客户端封装
  * @author looly
  */
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
diff --git a/hutool-http/src/main/java/cn/hutool/http/html/HTMLFilter.java b/hutool-http/src/main/java/org/dromara/hutool/http/html/HTMLFilter.java
similarity index 98%
rename from hutool-http/src/main/java/cn/hutool/http/html/HTMLFilter.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/html/HTMLFilter.java
index 4ccb6f23a..7ed396bbc 100644
--- a/hutool-http/src/main/java/cn/hutool/http/html/HTMLFilter.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/html/HTMLFilter.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.html;
+package org.dromara.hutool.http.html;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.map.SafeConcurrentHashMap;
-import cn.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.map.SafeConcurrentHashMap;
+import org.dromara.hutool.core.util.CharUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/hutool-http/src/main/java/cn/hutool/http/html/HtmlUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-http/src/main/java/cn/hutool/http/html/HtmlUtil.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java
index 0b107d707..65b6db528
--- a/hutool-http/src/main/java/cn/hutool/http/html/HtmlUtil.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.html;
+package org.dromara.hutool.http.html;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.text.escape.EscapeUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.XmlUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.escape.EscapeUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.XmlUtil;
 
 import java.io.InputStream;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/cn/hutool/http/html/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/html/package-info.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/html/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/html/package-info.java
index 67eaa995b..9fb05abb1
--- a/hutool-http/src/main/java/cn/hutool/http/html/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/html/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author looly
  */
-package cn.hutool.http.html;
+package org.dromara.hutool.http.html;
diff --git a/hutool-http/src/main/java/cn/hutool/http/meta/ContentType.java b/hutool-http/src/main/java/org/dromara/hutool/http/meta/ContentType.java
similarity index 97%
rename from hutool-http/src/main/java/cn/hutool/http/meta/ContentType.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/meta/ContentType.java
index a79a09b63..3a84bf8bc 100644
--- a/hutool-http/src/main/java/cn/hutool/http/meta/ContentType.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/meta/ContentType.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.meta;
+package org.dromara.hutool.http.meta;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.nio.charset.Charset;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/meta/ContentTypeUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/meta/ContentTypeUtil.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-http/src/main/java/cn/hutool/http/meta/ContentTypeUtil.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/meta/ContentTypeUtil.java
index 33be40059..d28c9ac6c
--- a/hutool-http/src/main/java/cn/hutool/http/meta/ContentTypeUtil.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/meta/ContentTypeUtil.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.meta;
+package org.dromara.hutool.http.meta;
 
-import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 
 import java.nio.charset.Charset;
 import java.util.regex.Pattern;
diff --git a/hutool-http/src/main/java/cn/hutool/http/meta/Header.java b/hutool-http/src/main/java/org/dromara/hutool/http/meta/Header.java
similarity index 99%
rename from hutool-http/src/main/java/cn/hutool/http/meta/Header.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/meta/Header.java
index 1c79d6cd1..dcbb9ed80 100644
--- a/hutool-http/src/main/java/cn/hutool/http/meta/Header.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/meta/Header.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.meta;
+package org.dromara.hutool.http.meta;
 
 /**
  * Http 头域
diff --git a/hutool-http/src/main/java/cn/hutool/http/meta/HttpStatus.java b/hutool-http/src/main/java/org/dromara/hutool/http/meta/HttpStatus.java
similarity index 99%
rename from hutool-http/src/main/java/cn/hutool/http/meta/HttpStatus.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/meta/HttpStatus.java
index 608ef3f43..574c8902d 100644
--- a/hutool-http/src/main/java/cn/hutool/http/meta/HttpStatus.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/meta/HttpStatus.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.meta;
+package org.dromara.hutool.http.meta;
 
 /**
  * HTTP状态码
diff --git a/hutool-http/src/main/java/cn/hutool/http/meta/Method.java b/hutool-http/src/main/java/org/dromara/hutool/http/meta/Method.java
similarity index 94%
rename from hutool-http/src/main/java/cn/hutool/http/meta/Method.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/meta/Method.java
index dd4bbaf91..936a43d16 100644
--- a/hutool-http/src/main/java/cn/hutool/http/meta/Method.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/meta/Method.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.meta;
+package org.dromara.hutool.http.meta;
 
 /**
  * Http方法枚举
diff --git a/hutool-http/src/main/java/cn/hutool/http/meta/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/meta/package-info.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-http/src/main/java/cn/hutool/http/meta/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/meta/package-info.java
index f4a0145ad..8936668e4
--- a/hutool-http/src/main/java/cn/hutool/http/meta/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/meta/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author looly
  */
-package cn.hutool.http.meta;
+package org.dromara.hutool.http.meta;
diff --git a/hutool-http/src/main/java/cn/hutool/http/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/package-info.java
similarity index 95%
rename from hutool-http/src/main/java/cn/hutool/http/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/package-info.java
index 7fb065429..04158fe00 100644
--- a/hutool-http/src/main/java/cn/hutool/http/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.http;
+package org.dromara.hutool.http;
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerBase.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerBase.java
similarity index 94%
rename from hutool-http/src/main/java/cn/hutool/http/server/HttpServerBase.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerBase.java
index 135aaa228..782a054b4 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerBase.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerBase.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.server;
+package org.dromara.hutool.http.server;
 
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 import com.sun.net.httpserver.HttpContext;
 import com.sun.net.httpserver.HttpExchange;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerRequest.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerRequest.java
similarity index 91%
rename from hutool-http/src/main/java/cn/hutool/http/server/HttpServerRequest.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerRequest.java
index e22dab988..25bbc3ecc 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerRequest.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerRequest.java
@@ -10,26 +10,26 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.server;
+package org.dromara.hutool.http.server;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.map.CaseInsensitiveMap;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.map.multi.ListValueMap;
-import cn.hutool.core.net.NetUtil;
-import cn.hutool.core.net.multipart.MultipartFormData;
-import cn.hutool.core.net.multipart.UploadSetting;
-import cn.hutool.core.net.url.UrlQueryUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.http.meta.ContentTypeUtil;
-import cn.hutool.http.meta.Header;
-import cn.hutool.http.meta.Method;
-import cn.hutool.http.useragent.UserAgent;
-import cn.hutool.http.useragent.UserAgentUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.map.CaseInsensitiveMap;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.map.multi.ListValueMap;
+import org.dromara.hutool.core.net.NetUtil;
+import org.dromara.hutool.core.net.multipart.MultipartFormData;
+import org.dromara.hutool.core.net.multipart.UploadSetting;
+import org.dromara.hutool.core.net.url.UrlQueryUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.http.meta.ContentTypeUtil;
+import org.dromara.hutool.http.meta.Header;
+import org.dromara.hutool.http.meta.Method;
+import org.dromara.hutool.http.useragent.UserAgent;
+import org.dromara.hutool.http.useragent.UserAgentUtil;
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerResponse.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerResponse.java
similarity index 95%
rename from hutool-http/src/main/java/cn/hutool/http/server/HttpServerResponse.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerResponse.java
index b2c21d91a..c908bf38e 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/HttpServerResponse.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerResponse.java
@@ -10,18 +10,18 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.server;
+package org.dromara.hutool.http.server;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.net.url.URLEncoder;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.http.meta.ContentType;
-import cn.hutool.http.meta.Header;
-import cn.hutool.http.meta.HttpStatus;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.net.url.URLEncoder;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.http.meta.ContentType;
+import org.dromara.hutool.http.meta.Header;
+import org.dromara.hutool.http.meta.HttpStatus;
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/SimpleServer.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/SimpleServer.java
similarity index 92%
rename from hutool-http/src/main/java/cn/hutool/http/server/SimpleServer.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/SimpleServer.java
index afa052584..86a9440ee 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/SimpleServer.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/SimpleServer.java
@@ -10,17 +10,17 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.server;
+package org.dromara.hutool.http.server;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.thread.GlobalThreadPool;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.http.server.action.Action;
-import cn.hutool.http.server.action.RootAction;
-import cn.hutool.http.server.filter.HttpFilter;
-import cn.hutool.http.server.filter.SimpleFilter;
-import cn.hutool.http.server.handler.ActionHandler;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.thread.GlobalThreadPool;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.http.server.action.Action;
+import org.dromara.hutool.http.server.action.RootAction;
+import org.dromara.hutool.http.server.filter.HttpFilter;
+import org.dromara.hutool.http.server.filter.SimpleFilter;
+import org.dromara.hutool.http.server.handler.ActionHandler;
 
 import com.sun.net.httpserver.Filter;
 import com.sun.net.httpserver.HttpContext;
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/action/Action.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/action/Action.java
similarity index 85%
rename from hutool-http/src/main/java/cn/hutool/http/server/action/Action.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/action/Action.java
index cc997aced..0e84ea9a2 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/action/Action.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/action/Action.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.server.action;
+package org.dromara.hutool.http.server.action;
 
-import cn.hutool.http.server.HttpServerRequest;
-import cn.hutool.http.server.HttpServerResponse;
+import org.dromara.hutool.http.server.HttpServerRequest;
+import org.dromara.hutool.http.server.HttpServerResponse;
 
 import java.io.IOException;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/action/RootAction.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/action/RootAction.java
similarity index 89%
rename from hutool-http/src/main/java/cn/hutool/http/server/action/RootAction.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/action/RootAction.java
index 6fd14475d..c72aa7d65 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/action/RootAction.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/action/RootAction.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.server.action;
+package org.dromara.hutool.http.server.action;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.http.server.HttpServerRequest;
-import cn.hutool.http.server.HttpServerResponse;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.http.server.HttpServerRequest;
+import org.dromara.hutool.http.server.HttpServerResponse;
 
 import java.io.File;
 import java.util.List;
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/action/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/action/package-info.java
similarity index 92%
rename from hutool-http/src/main/java/cn/hutool/http/server/action/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/action/package-info.java
index c0f56810a..fa089eb80 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/action/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/action/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author looly
  */
-package cn.hutool.http.server.action;
+package org.dromara.hutool.http.server.action;
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/filter/HttpFilter.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/filter/HttpFilter.java
similarity index 87%
rename from hutool-http/src/main/java/cn/hutool/http/server/filter/HttpFilter.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/filter/HttpFilter.java
index 796accf6b..8b3f1dd49 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/filter/HttpFilter.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/filter/HttpFilter.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.server.filter;
+package org.dromara.hutool.http.server.filter;
 
-import cn.hutool.http.server.HttpServerRequest;
-import cn.hutool.http.server.HttpServerResponse;
+import org.dromara.hutool.http.server.HttpServerRequest;
+import org.dromara.hutool.http.server.HttpServerResponse;
 import com.sun.net.httpserver.Filter;
 
 import java.io.IOException;
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/filter/SimpleFilter.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/filter/SimpleFilter.java
similarity index 94%
rename from hutool-http/src/main/java/cn/hutool/http/server/filter/SimpleFilter.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/filter/SimpleFilter.java
index 3910e909f..9859bfb3e 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/filter/SimpleFilter.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/filter/SimpleFilter.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.server.filter;
+package org.dromara.hutool.http.server.filter;
 
 import com.sun.net.httpserver.Filter;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/filter/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/filter/package-info.java
similarity index 92%
rename from hutool-http/src/main/java/cn/hutool/http/server/filter/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/filter/package-info.java
index 9658bbbc9..9f80b6d20 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/filter/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/filter/package-info.java
@@ -13,4 +13,4 @@
 /**
  * {@link com.sun.net.httpserver.Filter} 实现包装
  */
-package cn.hutool.http.server.filter;
+package org.dromara.hutool.http.server.filter;
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/handler/ActionHandler.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/ActionHandler.java
similarity index 84%
rename from hutool-http/src/main/java/cn/hutool/http/server/handler/ActionHandler.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/handler/ActionHandler.java
index 6c5a7a520..9ec9d53cd 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/handler/ActionHandler.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/ActionHandler.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.server.handler;
+package org.dromara.hutool.http.server.handler;
 
-import cn.hutool.http.server.HttpServerRequest;
-import cn.hutool.http.server.HttpServerResponse;
-import cn.hutool.http.server.action.Action;
+import org.dromara.hutool.http.server.HttpServerRequest;
+import org.dromara.hutool.http.server.HttpServerResponse;
+import org.dromara.hutool.http.server.action.Action;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/handler/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/package-info.java
similarity index 92%
rename from hutool-http/src/main/java/cn/hutool/http/server/handler/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/handler/package-info.java
index 77ecaa0eb..473276362 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/handler/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/package-info.java
@@ -13,4 +13,4 @@
 /**
  * {@link com.sun.net.httpserver.HttpHandler} 实现包装
  */
-package cn.hutool.http.server.handler;
+package org.dromara.hutool.http.server.handler;
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/server/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/package-info.java
index da982984e..e110c4375 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.http.server;
+package org.dromara.hutool.http.server;
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/servlet/JakartaServletUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java
similarity index 95%
rename from hutool-http/src/main/java/cn/hutool/http/server/servlet/JakartaServletUtil.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java
index 2d614e9a4..d9d21ef95 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/servlet/JakartaServletUtil.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java
@@ -10,30 +10,30 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.server.servlet;
+package org.dromara.hutool.http.server.servlet;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
-import cn.hutool.core.bean.copier.ValueProvider;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.collection.iter.ArrayIter;
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.map.CaseInsensitiveMap;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.net.NetUtil;
-import cn.hutool.core.net.url.URLEncoder;
-import cn.hutool.core.net.multipart.MultipartFormData;
-import cn.hutool.core.net.multipart.UploadSetting;
-import cn.hutool.core.reflect.ConstructorUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.bean.copier.CopyOptions;
+import org.dromara.hutool.core.bean.copier.ValueProvider;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.collection.iter.ArrayIter;
+import org.dromara.hutool.core.exceptions.UtilException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.map.CaseInsensitiveMap;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.net.NetUtil;
+import org.dromara.hutool.core.net.url.URLEncoder;
+import org.dromara.hutool.core.net.multipart.MultipartFormData;
+import org.dromara.hutool.core.net.multipart.UploadSetting;
+import org.dromara.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 
-import cn.hutool.http.meta.Method;
+import org.dromara.hutool.http.meta.Method;
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.http.Cookie;
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/servlet/ServletUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java
similarity index 95%
rename from hutool-http/src/main/java/cn/hutool/http/server/servlet/ServletUtil.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java
index e7ca499cc..e2cc30393 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/servlet/ServletUtil.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java
@@ -10,29 +10,29 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.server.servlet;
+package org.dromara.hutool.http.server.servlet;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
-import cn.hutool.core.bean.copier.ValueProvider;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.collection.iter.ArrayIter;
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.map.CaseInsensitiveMap;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.net.NetUtil;
-import cn.hutool.core.net.multipart.MultipartFormData;
-import cn.hutool.core.net.multipart.UploadSetting;
-import cn.hutool.core.net.url.URLEncoder;
-import cn.hutool.core.reflect.ConstructorUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.http.meta.Method;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.bean.copier.CopyOptions;
+import org.dromara.hutool.core.bean.copier.ValueProvider;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.collection.iter.ArrayIter;
+import org.dromara.hutool.core.exceptions.UtilException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.map.CaseInsensitiveMap;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.net.NetUtil;
+import org.dromara.hutool.core.net.multipart.MultipartFormData;
+import org.dromara.hutool.core.net.multipart.UploadSetting;
+import org.dromara.hutool.core.net.url.URLEncoder;
+import org.dromara.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.http.meta.Method;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.ServletRequest;
diff --git a/hutool-http/src/main/java/cn/hutool/http/server/servlet/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/server/servlet/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/package-info.java
index d8edece20..61b63689b 100644
--- a/hutool-http/src/main/java/cn/hutool/http/server/servlet/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.http.server.servlet;
+package org.dromara.hutool.http.server.servlet;
diff --git a/hutool-http/src/main/java/cn/hutool/http/ssl/CustomProtocolsSSLFactory.java b/hutool-http/src/main/java/org/dromara/hutool/http/ssl/CustomProtocolsSSLFactory.java
similarity index 97%
rename from hutool-http/src/main/java/cn/hutool/http/ssl/CustomProtocolsSSLFactory.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/ssl/CustomProtocolsSSLFactory.java
index aec649c29..7635d2ffc 100644
--- a/hutool-http/src/main/java/cn/hutool/http/ssl/CustomProtocolsSSLFactory.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/ssl/CustomProtocolsSSLFactory.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.ssl;
+package org.dromara.hutool.http.ssl;
 
-import cn.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
 
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
diff --git a/hutool-http/src/main/java/cn/hutool/http/ssl/SSLInfo.java b/hutool-http/src/main/java/org/dromara/hutool/http/ssl/SSLInfo.java
old mode 100755
new mode 100644
similarity index 88%
rename from hutool-http/src/main/java/cn/hutool/http/ssl/SSLInfo.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/ssl/SSLInfo.java
index 16ecc4e95..aa9f60101
--- a/hutool-http/src/main/java/cn/hutool/http/ssl/SSLInfo.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/ssl/SSLInfo.java
@@ -10,13 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.ssl;
+package org.dromara.hutool.http.ssl;
 
-import cn.hutool.core.net.ssl.SSLProtocols;
-import cn.hutool.core.net.ssl.SSLUtil;
-import cn.hutool.core.net.ssl.TrustAnyHostnameVerifier;
-import cn.hutool.core.net.ssl.TrustAnyTrustManager;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.net.ssl.SSLProtocols;
+import org.dromara.hutool.core.net.ssl.SSLUtil;
+import org.dromara.hutool.core.net.ssl.SSLContextBuilder;
+import org.dromara.hutool.core.net.ssl.TrustAnyHostnameVerifier;
+import org.dromara.hutool.core.net.ssl.TrustAnyTrustManager;
+import org.dromara.hutool.core.text.StrUtil;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
@@ -119,7 +120,7 @@ public class SSLInfo {
 	}
 
 	/**
-	 * 设置{@link HostnameVerifier}，信任所有则使用{@link cn.hutool.core.net.ssl.TrustAnyHostnameVerifier}
+	 * 设置{@link HostnameVerifier}，信任所有则使用{@link TrustAnyHostnameVerifier}
 	 *
 	 * @param hostnameVerifier {@link HostnameVerifier}
 	 * @return this
@@ -139,7 +140,7 @@ public class SSLInfo {
 	}
 
 	/**
-	 * 设置{@link SSLContext}，可以使用{@link cn.hutool.core.net.ssl.SSLContextBuilder}构建
+	 * 设置{@link SSLContext}，可以使用{@link SSLContextBuilder}构建
 	 *
 	 * @param sslContext {@link SSLContext}
 	 * @return this
@@ -159,7 +160,7 @@ public class SSLInfo {
 	}
 
 	/**
-	 * 设置{@link X509TrustManager}，新人所有则使用{@link cn.hutool.core.net.ssl.TrustAnyTrustManager}
+	 * 设置{@link X509TrustManager}，新人所有则使用{@link TrustAnyTrustManager}
 	 *
 	 * @param trustManager {@link X509TrustManager}
 	 * @return this
diff --git a/hutool-http/src/main/java/cn/hutool/http/ssl/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/ssl/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/ssl/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/ssl/package-info.java
index 19d33ed6e..a2d8f5fc8 100644
--- a/hutool-http/src/main/java/cn/hutool/http/ssl/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/ssl/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.http.ssl;
+package org.dromara.hutool.http.ssl;
diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/Browser.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/useragent/Browser.java
index 501eeef21..ccc9010cc
--- a/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/Browser.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.useragent;
+package org.dromara.hutool.http.useragent;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.regex.ReUtil;
 
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/BrowserEngine.java b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/BrowserEngine.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/useragent/BrowserEngine.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/useragent/BrowserEngine.java
index a3ee786b0..95e9fedd4
--- a/hutool-http/src/main/java/cn/hutool/http/useragent/BrowserEngine.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/BrowserEngine.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.useragent;
+package org.dromara.hutool.http.useragent;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.regex.ReUtil;
 
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/OS.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-http/src/main/java/cn/hutool/http/useragent/OS.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/useragent/OS.java
index 27a69e1af..da85be867
--- a/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/OS.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.useragent;
+package org.dromara.hutool.http.useragent;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.regex.ReUtil;
 
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/Platform.java b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/Platform.java
similarity index 97%
rename from hutool-http/src/main/java/cn/hutool/http/useragent/Platform.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/useragent/Platform.java
index c838003ce..c3276f6f6 100644
--- a/hutool-http/src/main/java/cn/hutool/http/useragent/Platform.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/Platform.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.useragent;
+package org.dromara.hutool.http.useragent;
 
-import cn.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.collection.ListUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgent.java b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgent.java
similarity index 98%
rename from hutool-http/src/main/java/cn/hutool/http/useragent/UserAgent.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgent.java
index e0d429888..7272a6bf8 100644
--- a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgent.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgent.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.useragent;
+package org.dromara.hutool.http.useragent;
 
 import java.io.Serializable;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentInfo.java b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentInfo.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentInfo.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentInfo.java
index 30fc75dd6..f746f44ca
--- a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentInfo.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentInfo.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.useragent;
+package org.dromara.hutool.http.useragent;
 
-import cn.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.regex.ReUtil;
 
 import java.io.Serializable;
 import java.util.regex.Pattern;
diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentParser.java b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentParser.java
similarity index 97%
rename from hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentParser.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentParser.java
index 876491f58..23ef3aeee 100644
--- a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentParser.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentParser.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.useragent;
+package org.dromara.hutool.http.useragent;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * User-Agent解析器
diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentUtil.java
similarity index 95%
rename from hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentUtil.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentUtil.java
index 7b16ff2f9..b22502675 100644
--- a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentUtil.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.useragent;
+package org.dromara.hutool.http.useragent;
 
 /**
  * User-Agent工具类
diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/useragent/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/useragent/package-info.java
index a65913711..76362d73a 100644
--- a/hutool-http/src/main/java/cn/hutool/http/useragent/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/useragent/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.http.useragent;
+package org.dromara.hutool.http.useragent;
diff --git a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapClient.java
similarity index 96%
rename from hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapClient.java
index b527c7851..0adf9f27f 100644
--- a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapClient.java
@@ -10,19 +10,19 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.webservice;
+package org.dromara.hutool.http.webservice;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.core.util.XmlUtil;
-import cn.hutool.http.client.HeaderOperation;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.Response;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.util.XmlUtil;
+import org.dromara.hutool.http.client.HeaderOperation;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.Response;
 
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
diff --git a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapProtocol.java b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapProtocol.java
similarity index 96%
rename from hutool-http/src/main/java/cn/hutool/http/webservice/SoapProtocol.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapProtocol.java
index 63240b7de..478f083de 100644
--- a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapProtocol.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapProtocol.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.webservice;
+package org.dromara.hutool.http.webservice;
 
 import javax.xml.soap.SOAPConstants;
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapRuntimeException.java b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapRuntimeException.java
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/webservice/SoapRuntimeException.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapRuntimeException.java
index e7ebb3e52..d55834698 100644
--- a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapRuntimeException.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapRuntimeException.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.webservice;
+package org.dromara.hutool.http.webservice;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * SOAP异常
diff --git a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/webservice/SoapUtil.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java
index bfb536d66..d74139ad6 100644
--- a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapUtil.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.webservice;
+package org.dromara.hutool.http.webservice;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -20,9 +20,9 @@ import java.nio.charset.Charset;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
 
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.XmlUtil;
+import org.dromara.hutool.core.exceptions.UtilException;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.XmlUtil;
 
 /**
  * SOAP相关工具类
diff --git a/hutool-http/src/main/java/cn/hutool/http/webservice/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/cn/hutool/http/webservice/package-info.java
rename to hutool-http/src/main/java/org/dromara/hutool/http/webservice/package-info.java
index d2d656aa0..f68f0e95d 100644
--- a/hutool-http/src/main/java/cn/hutool/http/webservice/package-info.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.http.webservice;
+package org.dromara.hutool.http.webservice;
diff --git a/hutool-http/src/main/resources/META-INF/services/cn.hutool.http.client.ClientEngine b/hutool-http/src/main/resources/META-INF/services/org.dromara.hutool.http.client.ClientEngine
old mode 100755
new mode 100644
similarity index 67%
rename from hutool-http/src/main/resources/META-INF/services/cn.hutool.http.client.ClientEngine
rename to hutool-http/src/main/resources/META-INF/services/org.dromara.hutool.http.client.ClientEngine
index 72ec1f9ef..b8ed43b82
--- a/hutool-http/src/main/resources/META-INF/services/cn.hutool.http.client.ClientEngine
+++ b/hutool-http/src/main/resources/META-INF/services/org.dromara.hutool.http.client.ClientEngine
@@ -10,7 +10,7 @@
 # See the Mulan PSL v2 for more details.
 #
 
-cn.hutool.http.client.engine.httpclient5.HttpClient5Engine
-cn.hutool.http.client.engine.httpclient4.HttpClient4Engine
-cn.hutool.http.client.engine.okhttp.OkHttpEngine
-cn.hutool.http.client.engine.jdk.JdkClientEngine
+org.dromara.hutool.http.client.engine.httpclient5.HttpClient5Engine
+org.dromara.hutool.http.client.engine.httpclient4.HttpClient4Engine
+org.dromara.hutool.http.client.engine.okhttp.OkHttpEngine
+org.dromara.hutool.http.client.engine.jdk.JdkClientEngine
diff --git a/hutool-http/src/test/java/cn/hutool/http/ContentTypeTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/ContentTypeTest.java
similarity index 72%
rename from hutool-http/src/test/java/cn/hutool/http/ContentTypeTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/ContentTypeTest.java
index 5bb77f7d0..b637ec53c 100644
--- a/hutool-http/src/test/java/cn/hutool/http/ContentTypeTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/ContentTypeTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.http.meta.ContentType;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.http.meta.ContentType;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/DownloadTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/DownloadTest.java
similarity index 93%
rename from hutool-http/src/test/java/cn/hutool/http/DownloadTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/DownloadTest.java
index 5d034a130..72728b9a3 100644
--- a/hutool-http/src/test/java/cn/hutool/http/DownloadTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/DownloadTest.java
@@ -1,14 +1,14 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.StreamProgress;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.http.client.HttpDownloader;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.engine.ClientEngineFactory;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.StreamProgress;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.http.client.HttpDownloader;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.engine.ClientEngineFactory;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/cn/hutool/http/HtmlUtilTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/HtmlUtilTest.java
similarity index 97%
rename from hutool-http/src/test/java/cn/hutool/http/HtmlUtilTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/HtmlUtilTest.java
index 694243aba..8d07952bf 100644
--- a/hutool-http/src/test/java/cn/hutool/http/HtmlUtilTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/HtmlUtilTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.regex.ReUtil;
-import cn.hutool.http.html.HtmlUtil;
-import cn.hutool.http.meta.ContentTypeUtil;
+import org.dromara.hutool.core.regex.ReUtil;
+import org.dromara.hutool.http.html.HtmlUtil;
+import org.dromara.hutool.http.meta.ContentTypeUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/HttpRequestTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/HttpRequestTest.java
similarity index 92%
rename from hutool-http/src/test/java/cn/hutool/http/HttpRequestTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/HttpRequestTest.java
index e1393a728..8cf7f2daf 100644
--- a/hutool-http/src/test/java/cn/hutool/http/HttpRequestTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/HttpRequestTest.java
@@ -1,15 +1,15 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.StopWatch;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.net.url.UrlBuilder;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.Response;
-import cn.hutool.http.meta.Header;
-import cn.hutool.http.meta.Method;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.date.StopWatch;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.net.url.UrlBuilder;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.Response;
+import org.dromara.hutool.http.meta.Header;
+import org.dromara.hutool.http.meta.Method;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/HttpUtilTest.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/HttpUtilTest.java
index f17f00d3f..14ecb5747
--- a/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/HttpUtilTest.java
@@ -1,12 +1,12 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.meta.Header;
-import cn.hutool.http.meta.Method;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.meta.Header;
+import org.dromara.hutool.http.meta.Method;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/cn/hutool/http/HttpsTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/HttpsTest.java
similarity index 80%
rename from hutool-http/src/test/java/cn/hutool/http/HttpsTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/HttpsTest.java
index f0465c78d..34a1d0d51 100644
--- a/hutool-http/src/test/java/cn/hutool/http/HttpsTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/HttpsTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.thread.ThreadUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.thread.ThreadUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/Issue2531Test.java b/hutool-http/src/test/java/org/dromara/hutool/http/Issue2531Test.java
old mode 100755
new mode 100644
similarity index 84%
rename from hutool-http/src/test/java/cn/hutool/http/Issue2531Test.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/Issue2531Test.java
index 378fa3ea5..b6f102315
--- a/hutool-http/src/test/java/cn/hutool/http/Issue2531Test.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/Issue2531Test.java
@@ -1,10 +1,10 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.net.url.UrlBuilder;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.Response;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.net.url.UrlBuilder;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.Response;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/cn/hutool/http/Issue2901Test.java b/hutool-http/src/test/java/org/dromara/hutool/http/Issue2901Test.java
similarity index 53%
rename from hutool-http/src/test/java/cn/hutool/http/Issue2901Test.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/Issue2901Test.java
index 9d20a0d55..29cdd088a 100644
--- a/hutool-http/src/test/java/cn/hutool/http/Issue2901Test.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/Issue2901Test.java
@@ -1,14 +1,14 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.resource.FileResource;
-import cn.hutool.core.io.resource.HttpResource;
-import cn.hutool.core.lang.Console;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.Response;
-import cn.hutool.http.client.body.ResourceBody;
-import cn.hutool.http.meta.ContentType;
-import cn.hutool.http.meta.Method;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.resource.FileResource;
+import org.dromara.hutool.core.io.resource.HttpResource;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.Response;
+import org.dromara.hutool.http.client.body.ResourceBody;
+import org.dromara.hutool.http.meta.ContentType;
+import org.dromara.hutool.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/IssueI5TFPUTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5TFPUTest.java
similarity index 79%
rename from hutool-http/src/test/java/cn/hutool/http/IssueI5TFPUTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/IssueI5TFPUTest.java
index 96fdbe284..295e8970b 100644
--- a/hutool-http/src/test/java/cn/hutool/http/IssueI5TFPUTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5TFPUTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.net.url.UrlBuilder;
+import org.dromara.hutool.core.net.url.UrlBuilder;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/IssueI5TPSYTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5TPSYTest.java
old mode 100755
new mode 100644
similarity index 70%
rename from hutool-http/src/test/java/cn/hutool/http/IssueI5TPSYTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/IssueI5TPSYTest.java
index df79b397f..a309d2e39
--- a/hutool-http/src/test/java/cn/hutool/http/IssueI5TPSYTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5TPSYTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.Response;
-import cn.hutool.http.meta.Header;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.Response;
+import org.dromara.hutool.http.meta.Header;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/IssueI5WAV4Test.java b/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5WAV4Test.java
old mode 100755
new mode 100644
similarity index 82%
rename from hutool-http/src/test/java/cn/hutool/http/IssueI5WAV4Test.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/IssueI5WAV4Test.java
index 30d75c579..0f24c9350
--- a/hutool-http/src/test/java/cn/hutool/http/IssueI5WAV4Test.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5WAV4Test.java
@@ -1,7 +1,7 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.http.client.Request;
-import cn.hutool.json.JSONUtil;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.json.JSONUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/IssueI5XBCFTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5XBCFTest.java
old mode 100755
new mode 100644
similarity index 69%
rename from hutool-http/src/test/java/cn/hutool/http/IssueI5XBCFTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/IssueI5XBCFTest.java
index 4e64d1a7d..7f434b700
--- a/hutool-http/src/test/java/cn/hutool/http/IssueI5XBCFTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5XBCFTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.Response;
-import cn.hutool.http.meta.Header;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.Response;
+import org.dromara.hutool.http.meta.Header;
 import org.brotli.dec.BrotliInputStream;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/cn/hutool/http/MockServerTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/MockServerTest.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-http/src/test/java/cn/hutool/http/MockServerTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/MockServerTest.java
index a419b6567..bdbc71564
--- a/hutool-http/src/test/java/cn/hutool/http/MockServerTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/MockServerTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
diff --git a/hutool-http/src/test/java/cn/hutool/http/RestTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/RestTest.java
similarity index 85%
rename from hutool-http/src/test/java/cn/hutool/http/RestTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/RestTest.java
index f1b9001b6..886d8fae0 100644
--- a/hutool-http/src/test/java/cn/hutool/http/RestTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/RestTest.java
@@ -1,10 +1,10 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.meta.Header;
-import cn.hutool.http.meta.Method;
-import cn.hutool.json.JSONUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.meta.Header;
+import org.dromara.hutool.http.meta.Method;
+import org.dromara.hutool.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/cn/hutool/http/UploadTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/UploadTest.java
similarity index 81%
rename from hutool-http/src/test/java/cn/hutool/http/UploadTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/UploadTest.java
index aff8d1e1b..464032e1c 100644
--- a/hutool-http/src/test/java/cn/hutool/http/UploadTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/UploadTest.java
@@ -1,13 +1,13 @@
-package cn.hutool.http;
+package org.dromara.hutool.http;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.resource.MultiFileResource;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.http.client.Request;
-import cn.hutool.http.client.Response;
-import cn.hutool.http.meta.Header;
-import cn.hutool.http.meta.Method;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.resource.MultiFileResource;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.http.client.Request;
+import org.dromara.hutool.http.client.Response;
+import org.dromara.hutool.http.meta.Header;
+import org.dromara.hutool.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/client/ClientEngineFactoryTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/client/ClientEngineFactoryTest.java
old mode 100755
new mode 100644
similarity index 72%
rename from hutool-http/src/test/java/cn/hutool/http/client/ClientEngineFactoryTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/client/ClientEngineFactoryTest.java
index 9ac6bea4a..dc8582ecd
--- a/hutool-http/src/test/java/cn/hutool/http/client/ClientEngineFactoryTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/client/ClientEngineFactoryTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
 
-import cn.hutool.http.client.engine.ClientEngineFactory;
+import org.dromara.hutool.http.client.engine.ClientEngineFactory;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/client/HttpClient4EngineTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpClient4EngineTest.java
old mode 100755
new mode 100644
similarity index 67%
rename from hutool-http/src/test/java/cn/hutool/http/client/HttpClient4EngineTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/client/HttpClient4EngineTest.java
index 9066e739e..d46517fe0
--- a/hutool-http/src/test/java/cn/hutool/http/client/HttpClient4EngineTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpClient4EngineTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.http.client.engine.httpclient4.HttpClient4Engine;
-import cn.hutool.http.meta.Method;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.http.client.engine.httpclient4.HttpClient4Engine;
+import org.dromara.hutool.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/client/HttpClient5EngineTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpClient5EngineTest.java
old mode 100755
new mode 100644
similarity index 67%
rename from hutool-http/src/test/java/cn/hutool/http/client/HttpClient5EngineTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/client/HttpClient5EngineTest.java
index 0cd39c6e1..cae911475
--- a/hutool-http/src/test/java/cn/hutool/http/client/HttpClient5EngineTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpClient5EngineTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.http.client.engine.httpclient5.HttpClient5Engine;
-import cn.hutool.http.meta.Method;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.http.client.engine.httpclient5.HttpClient5Engine;
+import org.dromara.hutool.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/client/HttpUrlConnectionUtilTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpUrlConnectionUtilTest.java
old mode 100755
new mode 100644
similarity index 58%
rename from hutool-http/src/test/java/cn/hutool/http/client/HttpUrlConnectionUtilTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/client/HttpUrlConnectionUtilTest.java
index 712d66648..fa6fc1792
--- a/hutool-http/src/test/java/cn/hutool/http/client/HttpUrlConnectionUtilTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpUrlConnectionUtilTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
 
-import cn.hutool.http.client.engine.jdk.HttpUrlConnectionUtil;
+import org.dromara.hutool.http.client.engine.jdk.HttpUrlConnectionUtil;
 import org.junit.jupiter.api.Test;
 
 public class HttpUrlConnectionUtilTest {
diff --git a/hutool-http/src/test/java/cn/hutool/http/client/JdkEngineTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/client/JdkEngineTest.java
old mode 100755
new mode 100644
similarity index 66%
rename from hutool-http/src/test/java/cn/hutool/http/client/JdkEngineTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/client/JdkEngineTest.java
index 5022fd171..e7b134002
--- a/hutool-http/src/test/java/cn/hutool/http/client/JdkEngineTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/client/JdkEngineTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.http.client.engine.jdk.JdkClientEngine;
-import cn.hutool.http.meta.Method;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.http.client.engine.jdk.JdkClientEngine;
+import org.dromara.hutool.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/client/OkHttpEngineTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/client/OkHttpEngineTest.java
old mode 100755
new mode 100644
similarity index 68%
rename from hutool-http/src/test/java/cn/hutool/http/client/OkHttpEngineTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/client/OkHttpEngineTest.java
index 5af6352f4..b7641abe3
--- a/hutool-http/src/test/java/cn/hutool/http/client/OkHttpEngineTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/client/OkHttpEngineTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.http.client;
+package org.dromara.hutool.http.client;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.http.client.engine.okhttp.OkHttpEngine;
-import cn.hutool.http.meta.Method;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.http.client.engine.okhttp.OkHttpEngine;
+import org.dromara.hutool.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/client/body/MultipartBodyTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/client/body/MultipartBodyTest.java
similarity index 74%
rename from hutool-http/src/test/java/cn/hutool/http/client/body/MultipartBodyTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/client/body/MultipartBodyTest.java
index 2f3581753..5f0061375 100644
--- a/hutool-http/src/test/java/cn/hutool/http/client/body/MultipartBodyTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/client/body/MultipartBodyTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.http.client.body;
+package org.dromara.hutool.http.client.body;
 
-import cn.hutool.core.io.resource.HttpResource;
-import cn.hutool.core.io.resource.StringResource;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.io.resource.HttpResource;
+import org.dromara.hutool.core.io.resource.StringResource;
+import org.dromara.hutool.core.util.CharsetUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/server/BlankServerTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/server/BlankServerTest.java
old mode 100755
new mode 100644
similarity index 63%
rename from hutool-http/src/test/java/cn/hutool/http/server/BlankServerTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/server/BlankServerTest.java
index 37670d0a6..be28a8d4a
--- a/hutool-http/src/test/java/cn/hutool/http/server/BlankServerTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/server/BlankServerTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.http.server;
+package org.dromara.hutool.http.server;
 
-import cn.hutool.http.meta.ContentType;
-import cn.hutool.http.HttpUtil;
+import org.dromara.hutool.http.meta.ContentType;
+import org.dromara.hutool.http.HttpUtil;
 
 public class BlankServerTest {
 	public static void main(final String[] args) {
diff --git a/hutool-http/src/test/java/cn/hutool/http/server/DocServerTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/server/DocServerTest.java
old mode 100755
new mode 100644
similarity index 71%
rename from hutool-http/src/test/java/cn/hutool/http/server/DocServerTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/server/DocServerTest.java
index 65cc19561..bd89fe093
--- a/hutool-http/src/test/java/cn/hutool/http/server/DocServerTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/server/DocServerTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.http.server;
+package org.dromara.hutool.http.server;
 
-import cn.hutool.http.HttpUtil;
+import org.dromara.hutool.http.HttpUtil;
 
 public class DocServerTest {
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/server/RedirectServerTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/server/RedirectServerTest.java
similarity index 85%
rename from hutool-http/src/test/java/cn/hutool/http/server/RedirectServerTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/server/RedirectServerTest.java
index 2e1896ede..2480a738e 100644
--- a/hutool-http/src/test/java/cn/hutool/http/server/RedirectServerTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/server/RedirectServerTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.http.server;
+package org.dromara.hutool.http.server;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.http.meta.Header;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.http.HttpUtil;
+import org.dromara.hutool.http.meta.Header;
 
 public class RedirectServerTest {
 	public static void main(final String[] args) {
diff --git a/hutool-http/src/test/java/cn/hutool/http/server/SimpleServerTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/server/SimpleServerTest.java
similarity index 83%
rename from hutool-http/src/test/java/cn/hutool/http/server/SimpleServerTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/server/SimpleServerTest.java
index dffe0e455..3d79081cb 100644
--- a/hutool-http/src/test/java/cn/hutool/http/server/SimpleServerTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/server/SimpleServerTest.java
@@ -1,13 +1,13 @@
-package cn.hutool.http.server;
+package org.dromara.hutool.http.server;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.net.multipart.UploadFile;
-import cn.hutool.http.meta.ContentType;
-import cn.hutool.http.meta.Header;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.net.multipart.UploadFile;
+import org.dromara.hutool.http.meta.ContentType;
+import org.dromara.hutool.http.meta.Header;
+import org.dromara.hutool.http.HttpUtil;
+import org.dromara.hutool.json.JSONUtil;
 
 import java.net.HttpCookie;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/server/servlet/ServletUtilTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/server/servlet/ServletUtilTest.java
similarity index 96%
rename from hutool-http/src/test/java/cn/hutool/http/server/servlet/ServletUtilTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/server/servlet/ServletUtilTest.java
index 8aa813bf1..c79b83d21 100644
--- a/hutool-http/src/test/java/cn/hutool/http/server/servlet/ServletUtilTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/server/servlet/ServletUtilTest.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.http.server.servlet;
+package org.dromara.hutool.http.server.servlet;
 
-import cn.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.util.ByteUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/useragent/UserAgentUtilTest.java
similarity index 99%
rename from hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/useragent/UserAgentUtilTest.java
index fb22d8750..a306181f4 100644
--- a/hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/useragent/UserAgentUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.http.useragent;
+package org.dromara.hutool.http.useragent;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/webservice/SoapClientTest.java
similarity index 88%
rename from hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java
rename to hutool-http/src/test/java/org/dromara/hutool/http/webservice/SoapClientTest.java
index b27a1c51e..5566aff12 100644
--- a/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/webservice/SoapClientTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.http.webservice;
+package org.dromara.hutool.http.webservice;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.util.CharsetUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml
index a036830a8..fbf062490 100755
--- a/hutool-json/pom.xml
+++ b/hutool-json/pom.xml
@@ -19,7 +19,7 @@
 	jar
 
 	
-		cn.hutool
+		org.dromara.hutool
 		hutool-parent
 		6.0.0.M3
 	
@@ -29,19 +29,19 @@
 	Hutool JSON封装
 
 	
-		cn.hutool.json
+		org.dromara.hutool.json
 		
 		1.72
 	
 
 	
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-core
 			${project.parent.version}
 		
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-crypto
 			${project.parent.version}
 			true
diff --git a/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java
index a7f9cbaff..518021b72
--- a/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java
@@ -10,29 +10,29 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.bean.copier.CopyOptions;
-import cn.hutool.core.codec.HexUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.lang.mutable.MutableEntry;
-import cn.hutool.core.map.CaseInsensitiveLinkedMap;
-import cn.hutool.core.map.CaseInsensitiveTreeMap;
-import cn.hutool.core.math.NumberUtil;
-import cn.hutool.core.reflect.ClassUtil;
-import cn.hutool.core.reflect.ConstructorUtil;
-import cn.hutool.core.reflect.TypeUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.json.serialize.GlobalSerializeMapping;
-import cn.hutool.json.serialize.JSONDeserializer;
-import cn.hutool.json.serialize.JSONStringer;
-import cn.hutool.json.writer.GlobalValueWriterMapping;
-import cn.hutool.json.writer.JSONValueWriter;
+import org.dromara.hutool.core.bean.copier.CopyOptions;
+import org.dromara.hutool.core.codec.HexUtil;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.lang.mutable.MutableEntry;
+import org.dromara.hutool.core.map.CaseInsensitiveLinkedMap;
+import org.dromara.hutool.core.map.CaseInsensitiveTreeMap;
+import org.dromara.hutool.core.math.NumberUtil;
+import org.dromara.hutool.core.reflect.ClassUtil;
+import org.dromara.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.reflect.TypeUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.json.serialize.GlobalSerializeMapping;
+import org.dromara.hutool.json.serialize.JSONDeserializer;
+import org.dromara.hutool.json.serialize.JSONStringer;
+import org.dromara.hutool.json.writer.GlobalValueWriterMapping;
+import org.dromara.hutool.json.writer.JSONValueWriter;
 
 import java.io.*;
 import java.lang.reflect.Type;
@@ -214,7 +214,7 @@ public final class InternalJSONUtil {
 
 	/**
 	 * 将Property的键转化为JSON形式
      
-	 * 用于识别类似于：cn.hutool.json这类用点隔开的键
      
+	 * 用于识别类似于：org.dromara.hutool.json这类用点隔开的键
      
 	 * 注意：不允许重复键
 	 *
 	 * @param jsonObject JSONObject
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSON.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSON.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-json/src/main/java/cn/hutool/json/JSON.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/JSON.java
index 0fc444663..3ab77fd91
--- a/hutool-json/src/main/java/cn/hutool/json/JSON.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSON.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.bean.BeanPath;
-import cn.hutool.core.convert.ConvertException;
-import cn.hutool.core.convert.Converter;
-import cn.hutool.core.lang.mutable.MutableEntry;
-import cn.hutool.json.convert.JSONConverter;
+import org.dromara.hutool.core.bean.BeanPath;
+import org.dromara.hutool.core.convert.ConvertException;
+import org.dromara.hutool.core.convert.Converter;
+import org.dromara.hutool.core.lang.mutable.MutableEntry;
+import org.dromara.hutool.json.convert.JSONConverter;
 
 import java.io.Serializable;
 import java.io.StringWriter;
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-json/src/main/java/cn/hutool/json/JSONArray.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java
index d687550df..d55c79b80
--- a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java
@@ -10,18 +10,18 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.convert.impl.ArrayConverter;
-import cn.hutool.core.lang.mutable.Mutable;
-import cn.hutool.core.lang.mutable.MutableEntry;
-import cn.hutool.core.lang.mutable.MutableObj;
-import cn.hutool.core.text.StrJoiner;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.json.mapper.JSONArrayMapper;
-import cn.hutool.json.writer.JSONWriter;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.convert.impl.ArrayConverter;
+import org.dromara.hutool.core.lang.mutable.Mutable;
+import org.dromara.hutool.core.lang.mutable.MutableEntry;
+import org.dromara.hutool.core.lang.mutable.MutableObj;
+import org.dromara.hutool.core.text.StrJoiner;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.json.mapper.JSONArrayMapper;
+import org.dromara.hutool.json.writer.JSONWriter;
 
 import java.io.StringWriter;
 import java.io.Writer;
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONConfig.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONConfig.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-json/src/main/java/cn/hutool/json/JSONConfig.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/JSONConfig.java
index 5d2cb261a..36cdd1baa
--- a/hutool-json/src/main/java/cn/hutool/json/JSONConfig.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONConfig.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.comparator.CompareUtil;
-import cn.hutool.core.convert.Converter;
-import cn.hutool.json.convert.JSONConverter;
+import org.dromara.hutool.core.comparator.CompareUtil;
+import org.dromara.hutool.core.convert.Converter;
+import org.dromara.hutool.json.convert.JSONConverter;
 
 import java.io.Serializable;
 import java.util.Comparator;
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONException.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java
similarity index 91%
rename from hutool-json/src/main/java/cn/hutool/json/JSONException.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java
index f1bc4da03..e619df773 100644
--- a/hutool-json/src/main/java/cn/hutool/json/JSONException.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * JSON异常
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONGetter.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java
similarity index 96%
rename from hutool-json/src/main/java/cn/hutool/json/JSONGetter.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java
index 4380cf76c..bdd8cc1db 100644
--- a/hutool-json/src/main/java/cn/hutool/json/JSONGetter.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.lang.getter.TypeGetter;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.lang.getter.TypeGetter;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import java.lang.reflect.Type;
 import java.util.List;
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-json/src/main/java/cn/hutool/json/JSONObject.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java
index 46fe11e38..373022621
--- a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java
@@ -10,19 +10,19 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.func.LambdaInfo;
-import cn.hutool.core.lang.func.LambdaUtil;
-import cn.hutool.core.lang.func.SerFunction;
-import cn.hutool.core.lang.func.SerSupplier;
-import cn.hutool.core.lang.mutable.MutableEntry;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.map.MapWrapper;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.json.mapper.JSONObjectMapper;
-import cn.hutool.json.writer.JSONWriter;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.lang.func.LambdaInfo;
+import org.dromara.hutool.core.lang.func.LambdaUtil;
+import org.dromara.hutool.core.lang.func.SerFunction;
+import org.dromara.hutool.core.lang.func.SerSupplier;
+import org.dromara.hutool.core.lang.mutable.MutableEntry;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.map.MapWrapper;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.json.mapper.JSONObjectMapper;
+import org.dromara.hutool.json.writer.JSONWriter;
 
 import java.io.StringWriter;
 import java.io.Writer;
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONObjectIter.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONObjectIter.java
similarity index 97%
rename from hutool-json/src/main/java/cn/hutool/json/JSONObjectIter.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/JSONObjectIter.java
index d5c11071f..30ee6b265 100644
--- a/hutool-json/src/main/java/cn/hutool/json/JSONObjectIter.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONObjectIter.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import java.util.Iterator;
 
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONParser.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONParser.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-json/src/main/java/cn/hutool/json/JSONParser.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/JSONParser.java
index f0fd7d6f7..d5a4ab1bf
--- a/hutool-json/src/main/java/cn/hutool/json/JSONParser.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONParser.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.lang.mutable.Mutable;
-import cn.hutool.core.lang.mutable.MutableEntry;
-import cn.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.lang.mutable.Mutable;
+import org.dromara.hutool.core.lang.mutable.MutableEntry;
+import org.dromara.hutool.core.util.CharUtil;
 
 import java.util.function.Predicate;
 
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONStrFormatter.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONStrFormatter.java
similarity index 97%
rename from hutool-json/src/main/java/cn/hutool/json/JSONStrFormatter.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/JSONStrFormatter.java
index 9f528147f..a430ab78d 100644
--- a/hutool-json/src/main/java/cn/hutool/json/JSONStrFormatter.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONStrFormatter.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * JSON字符串格式化工具，用于简单格式化JSON字符串
      
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONSupport.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONSupport.java
similarity index 88%
rename from hutool-json/src/main/java/cn/hutool/json/JSONSupport.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/JSONSupport.java
index f28dd6265..898096a90 100644
--- a/hutool-json/src/main/java/cn/hutool/json/JSONSupport.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONSupport.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.bean.copier.BeanCopier;
-import cn.hutool.json.serialize.JSONDeserializer;
-import cn.hutool.json.serialize.JSONStringer;
+import org.dromara.hutool.core.bean.copier.BeanCopier;
+import org.dromara.hutool.json.serialize.JSONDeserializer;
+import org.dromara.hutool.json.serialize.JSONStringer;
 
 /**
  * JSON支持
      
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONTokener.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONTokener.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-json/src/main/java/cn/hutool/json/JSONTokener.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/JSONTokener.java
index 292c6c757..de8398386
--- a/hutool-json/src/main/java/cn/hutool/json/JSONTokener.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONTokener.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.ReaderWrapper;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.ReaderWrapper;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-json/src/main/java/cn/hutool/json/JSONUtil.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java
index e24ce9a2a..1c6f20df6
--- a/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java
@@ -10,22 +10,22 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.reflect.TypeReference;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.json.convert.JSONConverter;
-import cn.hutool.json.serialize.GlobalSerializeMapping;
-import cn.hutool.json.serialize.JSONArraySerializer;
-import cn.hutool.json.serialize.JSONDeserializer;
-import cn.hutool.json.serialize.JSONObjectSerializer;
-import cn.hutool.json.writer.JSONValueWriter;
-import cn.hutool.json.writer.JSONWriter;
-import cn.hutool.json.xml.JSONXMLUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.json.convert.JSONConverter;
+import org.dromara.hutool.json.serialize.GlobalSerializeMapping;
+import org.dromara.hutool.json.serialize.JSONArraySerializer;
+import org.dromara.hutool.json.serialize.JSONDeserializer;
+import org.dromara.hutool.json.serialize.JSONObjectSerializer;
+import org.dromara.hutool.json.writer.JSONValueWriter;
+import org.dromara.hutool.json.writer.JSONWriter;
+import org.dromara.hutool.json.xml.JSONXMLUtil;
 
 import java.io.*;
 import java.lang.reflect.Type;
diff --git a/hutool-json/src/main/java/cn/hutool/json/convert/JSONConverter.java b/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java
similarity index 89%
rename from hutool-json/src/main/java/cn/hutool/json/convert/JSONConverter.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java
index 7e78ae756..c2f8cdf85 100644
--- a/hutool-json/src/main/java/cn/hutool/json/convert/JSONConverter.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java
@@ -10,25 +10,26 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.convert;
+package org.dromara.hutool.json.convert;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.BeanCopier;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.convert.ConvertException;
-import cn.hutool.core.convert.Converter;
-import cn.hutool.core.convert.RegisterConverter;
-import cn.hutool.core.convert.impl.*;
-import cn.hutool.core.map.MapWrapper;
-import cn.hutool.core.reflect.ConstructorUtil;
-import cn.hutool.core.reflect.TypeReference;
-import cn.hutool.core.reflect.TypeUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.json.*;
-import cn.hutool.json.serialize.JSONDeserializer;
-import cn.hutool.json.serialize.JSONStringer;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.bean.copier.BeanCopier;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.convert.ConvertException;
+import org.dromara.hutool.core.convert.Converter;
+import org.dromara.hutool.core.convert.RegisterConverter;
+import org.dromara.hutool.core.convert.impl.*;
+import org.dromara.hutool.core.map.MapWrapper;
+import org.dromara.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.reflect.TypeUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.json.*;
+import org.dromara.hutool.json.*;
+import org.dromara.hutool.json.serialize.JSONDeserializer;
+import org.dromara.hutool.json.serialize.JSONStringer;
 
 import java.lang.reflect.Type;
 import java.time.temporal.TemporalAccessor;
diff --git a/hutool-json/src/main/java/cn/hutool/json/convert/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/convert/package-info.java
similarity index 93%
rename from hutool-json/src/main/java/cn/hutool/json/convert/package-info.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/convert/package-info.java
index 56fc27e4c..c6f071af9 100644
--- a/hutool-json/src/main/java/cn/hutool/json/convert/package-info.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/convert/package-info.java
@@ -16,4 +16,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package cn.hutool.json.convert;
+package org.dromara.hutool.json.convert;
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/Claims.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/Claims.java
old mode 100755
new mode 100644
similarity index 86%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/Claims.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/Claims.java
index 20bd31fe7..53b7de162
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/Claims.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/Claims.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.date.format.GlobalCustomFormat;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.json.JSONConfig;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.date.format.GlobalCustomFormat;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.json.JSONConfig;
+import org.dromara.hutool.json.JSONObject;
+import org.dromara.hutool.json.JSONUtil;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java
index 44ff04687..24046e395
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java
@@ -10,21 +10,21 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.exceptions.ValidateException;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.json.JSONObject;
-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 org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.exceptions.ValidateException;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.json.JSONObject;
+import org.dromara.hutool.json.jwt.signers.AlgorithmUtil;
+import org.dromara.hutool.json.jwt.signers.JWTSigner;
+import org.dromara.hutool.json.jwt.signers.JWTSignerUtil;
+import org.dromara.hutool.json.jwt.signers.NoneJWTSigner;
 
 import java.nio.charset.Charset;
 import java.security.Key;
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTException.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/JWTException.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java
index e51128ca7..6fb5cb279
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTException.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * JWT异常
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTHeader.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTHeader.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/JWTHeader.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTHeader.java
index d4430575c..fa6d98e55
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTHeader.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTHeader.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
 import java.util.Map;
 
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTPayload.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTPayload.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/JWTPayload.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTPayload.java
index 6a7fff8e3..0bc73bad2
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTPayload.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTPayload.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
 import java.util.Map;
 
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTUtil.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/JWTUtil.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTUtil.java
index 2dec90796..7062be03f
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTUtil.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
-import cn.hutool.json.jwt.signers.JWTSigner;
+import org.dromara.hutool.json.jwt.signers.JWTSigner;
 
 import java.util.Map;
 
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTValidator.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/JWTValidator.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java
index fb9b636e7..66e52b7bf
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTValidator.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.exceptions.ValidateException;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.json.jwt.signers.JWTSigner;
-import cn.hutool.json.jwt.signers.NoneJWTSigner;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.exceptions.ValidateException;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.json.jwt.signers.JWTSigner;
+import org.dromara.hutool.json.jwt.signers.NoneJWTSigner;
 
 import java.util.Date;
 
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/RegisteredPayload.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/RegisteredPayload.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/RegisteredPayload.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/RegisteredPayload.java
index 2ccfd78b0..8fb05e66d
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/RegisteredPayload.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/RegisteredPayload.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
 import java.util.Date;
 
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/package-info.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/package-info.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/package-info.java
index 8ea2aedf5..7ae22d03c
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/package-info.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/package-info.java
@@ -13,4 +13,4 @@
 /**
  * JSON Web Token (JWT)封装
  */
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AlgorithmUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AlgorithmUtil.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/signers/AlgorithmUtil.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AlgorithmUtil.java
index 7dd2464fd..0b6666bcd
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AlgorithmUtil.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AlgorithmUtil.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt.signers;
+package org.dromara.hutool.json.jwt.signers;
 
-import cn.hutool.core.map.BiMap;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.crypto.asymmetric.SignAlgorithm;
-import cn.hutool.crypto.digest.HmacAlgorithm;
+import org.dromara.hutool.core.map.BiMap;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.crypto.asymmetric.SignAlgorithm;
+import org.dromara.hutool.crypto.digest.HmacAlgorithm;
 
 import java.util.HashMap;
 
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AsymmetricJWTSigner.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AsymmetricJWTSigner.java
old mode 100755
new mode 100644
similarity index 89%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/signers/AsymmetricJWTSigner.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AsymmetricJWTSigner.java
index ae48c4f4d..371758a8a
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/AsymmetricJWTSigner.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AsymmetricJWTSigner.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt.signers;
+package org.dromara.hutool.json.jwt.signers;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.crypto.asymmetric.Sign;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.crypto.asymmetric.Sign;
 
 import java.nio.charset.Charset;
 import java.security.Key;
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/HMacJWTSigner.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/HMacJWTSigner.java
old mode 100755
new mode 100644
similarity index 89%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/signers/HMacJWTSigner.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/HMacJWTSigner.java
index 7dcb81c16..05ba75c9f
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/HMacJWTSigner.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/HMacJWTSigner.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt.signers;
+package org.dromara.hutool.json.jwt.signers;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.crypto.digest.HMac;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.crypto.digest.HMac;
 
 import java.nio.charset.Charset;
 import java.security.Key;
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSigner.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSigner.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSigner.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSigner.java
index 7daa84564..d81d0bb3c
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSigner.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSigner.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt.signers;
+package org.dromara.hutool.json.jwt.signers;
 
 /**
  * JWT签名接口封装，通过实现此接口，完成不同算法的签名功能
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSignerUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSignerUtil.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSignerUtil.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSignerUtil.java
index 8a95edc06..4022a625b
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSignerUtil.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSignerUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt.signers;
+package org.dromara.hutool.json.jwt.signers;
 
-import cn.hutool.core.lang.Assert;
+import org.dromara.hutool.core.lang.Assert;
 
 import java.security.Key;
 import java.security.KeyPair;
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/NoneJWTSigner.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/NoneJWTSigner.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/signers/NoneJWTSigner.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/NoneJWTSigner.java
index 9cf5ed1e3..ffc15c28c
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/NoneJWTSigner.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/NoneJWTSigner.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.jwt.signers;
+package org.dromara.hutool.json.jwt.signers;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 无需签名的JWT签名器
diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/package-info.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-json/src/main/java/cn/hutool/json/jwt/signers/package-info.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/package-info.java
index 89d5dba69..317e79a08
--- a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/package-info.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/package-info.java
@@ -13,4 +13,4 @@
 /**
  * JWT签名封装
  */
-package cn.hutool.json.jwt.signers;
+package org.dromara.hutool.json.jwt.signers;
diff --git a/hutool-json/src/main/java/cn/hutool/json/mapper/JSONArrayMapper.java b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java
similarity index 89%
rename from hutool-json/src/main/java/cn/hutool/json/mapper/JSONArrayMapper.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java
index 419fb0353..81d87d2e4 100644
--- a/hutool-json/src/main/java/cn/hutool/json/mapper/JSONArrayMapper.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java
@@ -10,19 +10,19 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.mapper;
+package org.dromara.hutool.json.mapper;
 
-import cn.hutool.core.collection.iter.ArrayIter;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.mutable.Mutable;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONException;
-import cn.hutool.json.JSONParser;
-import cn.hutool.json.JSONTokener;
-import cn.hutool.json.serialize.GlobalSerializeMapping;
-import cn.hutool.json.serialize.JSONSerializer;
+import org.dromara.hutool.core.collection.iter.ArrayIter;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.mutable.Mutable;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.json.JSONArray;
+import org.dromara.hutool.json.JSONException;
+import org.dromara.hutool.json.JSONParser;
+import org.dromara.hutool.json.JSONTokener;
+import org.dromara.hutool.json.serialize.GlobalSerializeMapping;
+import org.dromara.hutool.json.serialize.JSONSerializer;
 
 import java.io.InputStream;
 import java.io.Reader;
diff --git a/hutool-json/src/main/java/cn/hutool/json/mapper/JSONObjectMapper.java b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java
similarity index 89%
rename from hutool-json/src/main/java/cn/hutool/json/mapper/JSONObjectMapper.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java
index 04cdc4bbc..dd67db840 100644
--- a/hutool-json/src/main/java/cn/hutool/json/mapper/JSONObjectMapper.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java
@@ -10,23 +10,23 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.mapper;
+package org.dromara.hutool.json.mapper;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.mutable.MutableEntry;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.json.InternalJSONUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONException;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONParser;
-import cn.hutool.json.JSONTokener;
-import cn.hutool.json.xml.JSONXMLUtil;
-import cn.hutool.json.serialize.GlobalSerializeMapping;
-import cn.hutool.json.serialize.JSONSerializer;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.bean.copier.CopyOptions;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.mutable.MutableEntry;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.json.InternalJSONUtil;
+import org.dromara.hutool.json.JSONArray;
+import org.dromara.hutool.json.JSONException;
+import org.dromara.hutool.json.JSONObject;
+import org.dromara.hutool.json.JSONParser;
+import org.dromara.hutool.json.JSONTokener;
+import org.dromara.hutool.json.xml.JSONXMLUtil;
+import org.dromara.hutool.json.serialize.GlobalSerializeMapping;
+import org.dromara.hutool.json.serialize.JSONSerializer;
 
 import java.io.InputStream;
 import java.io.Reader;
diff --git a/hutool-json/src/main/java/cn/hutool/json/mapper/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/package-info.java
similarity index 93%
rename from hutool-json/src/main/java/cn/hutool/json/mapper/package-info.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/mapper/package-info.java
index 766486cad..16d0e3214 100644
--- a/hutool-json/src/main/java/cn/hutool/json/mapper/package-info.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/package-info.java
@@ -13,4 +13,4 @@
 /**
  * Bean和JSON之间的映射封装。
  */
-package cn.hutool.json.mapper;
+package org.dromara.hutool.json.mapper;
diff --git a/hutool-json/src/main/java/cn/hutool/json/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/package-info.java
similarity index 97%
rename from hutool-json/src/main/java/cn/hutool/json/package-info.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/package-info.java
index 203dace7e..2111d8baa 100644
--- a/hutool-json/src/main/java/cn/hutool/json/package-info.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/package-info.java
@@ -28,4 +28,4 @@
  * @author looly
  *
  */
-package cn.hutool.json;
+package org.dromara.hutool.json;
diff --git a/hutool-json/src/main/java/cn/hutool/json/serialize/DateJSONString.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/DateJSONString.java
similarity index 88%
rename from hutool-json/src/main/java/cn/hutool/json/serialize/DateJSONString.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/serialize/DateJSONString.java
index c2f5db394..0c417889c 100644
--- a/hutool-json/src/main/java/cn/hutool/json/serialize/DateJSONString.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/DateJSONString.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.serialize;
+package org.dromara.hutool.json.serialize;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.TemporalAccessorUtil;
-import cn.hutool.core.date.format.GlobalCustomFormat;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.json.InternalJSONUtil;
-import cn.hutool.json.JSONConfig;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.date.TemporalAccessorUtil;
+import org.dromara.hutool.core.date.format.GlobalCustomFormat;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.json.InternalJSONUtil;
+import org.dromara.hutool.json.JSONConfig;
 
 import java.time.MonthDay;
 import java.time.temporal.TemporalAccessor;
diff --git a/hutool-json/src/main/java/cn/hutool/json/serialize/GlobalSerializeMapping.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/GlobalSerializeMapping.java
similarity index 94%
rename from hutool-json/src/main/java/cn/hutool/json/serialize/GlobalSerializeMapping.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/serialize/GlobalSerializeMapping.java
index 2e3ec9b1f..6d270eee9 100644
--- a/hutool-json/src/main/java/cn/hutool/json/serialize/GlobalSerializeMapping.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/GlobalSerializeMapping.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.serialize;
+package org.dromara.hutool.json.serialize;
 
-import cn.hutool.core.map.SafeConcurrentHashMap;
-import cn.hutool.core.reflect.NullType;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.json.JSON;
+import org.dromara.hutool.core.map.SafeConcurrentHashMap;
+import org.dromara.hutool.core.reflect.NullType;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.json.JSON;
 
 import java.lang.reflect.Type;
 import java.time.LocalDate;
diff --git a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONArraySerializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONArraySerializer.java
similarity index 90%
rename from hutool-json/src/main/java/cn/hutool/json/serialize/JSONArraySerializer.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONArraySerializer.java
index 26f976d7b..d4fe70dcd 100644
--- a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONArraySerializer.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONArraySerializer.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.serialize;
+package org.dromara.hutool.json.serialize;
 
-import cn.hutool.json.JSONArray;
+import org.dromara.hutool.json.JSONArray;
 
 /**
  * JSON列表的序列化接口，用于将特定对象序列化为{@link JSONArray}
diff --git a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONDeserializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONDeserializer.java
similarity index 94%
rename from hutool-json/src/main/java/cn/hutool/json/serialize/JSONDeserializer.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONDeserializer.java
index 504b913bc..2970b282c 100644
--- a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONDeserializer.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONDeserializer.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.serialize;
+package org.dromara.hutool.json.serialize;
 
-import cn.hutool.json.JSON;
+import org.dromara.hutool.json.JSON;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONObjectSerializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONObjectSerializer.java
similarity index 90%
rename from hutool-json/src/main/java/cn/hutool/json/serialize/JSONObjectSerializer.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONObjectSerializer.java
index 5de14dfcb..6f4fb6a6a 100644
--- a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONObjectSerializer.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONObjectSerializer.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.serialize;
+package org.dromara.hutool.json.serialize;
 
-import cn.hutool.json.JSONObject;
+import org.dromara.hutool.json.JSONObject;
 
 /**
  * 对象的序列化接口，用于将特定对象序列化为{@link JSONObject}
diff --git a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONSerializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONSerializer.java
similarity index 93%
rename from hutool-json/src/main/java/cn/hutool/json/serialize/JSONSerializer.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONSerializer.java
index ed6baffd9..72a810797 100644
--- a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONSerializer.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONSerializer.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.serialize;
+package org.dromara.hutool.json.serialize;
 
-import cn.hutool.json.JSON;
+import org.dromara.hutool.json.JSON;
 
 /**
  * 序列化接口，通过实现此接口，实现自定义的对象转换为JSON的操作
diff --git a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONStringer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONStringer.java
similarity index 91%
rename from hutool-json/src/main/java/cn/hutool/json/serialize/JSONStringer.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONStringer.java
index d850b2d8c..2f9444fa2 100644
--- a/hutool-json/src/main/java/cn/hutool/json/serialize/JSONStringer.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/JSONStringer.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.serialize;
+package org.dromara.hutool.json.serialize;
 
-import cn.hutool.core.lang.func.Wrapper;
+import org.dromara.hutool.core.lang.func.Wrapper;
 
 /**
  * {@code JSONString}接口定义了一个{@code toJSONString()}
      
diff --git a/hutool-json/src/main/java/cn/hutool/json/serialize/TemporalAccessorSerializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/TemporalAccessorSerializer.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-json/src/main/java/cn/hutool/json/serialize/TemporalAccessorSerializer.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/serialize/TemporalAccessorSerializer.java
index b433b70aa..9b84e750a
--- a/hutool-json/src/main/java/cn/hutool/json/serialize/TemporalAccessorSerializer.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/TemporalAccessorSerializer.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.serialize;
+package org.dromara.hutool.json.serialize;
 
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONException;
-import cn.hutool.json.JSONObject;
+import org.dromara.hutool.json.JSON;
+import org.dromara.hutool.json.JSONException;
+import org.dromara.hutool.json.JSONObject;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
diff --git a/hutool-json/src/main/java/cn/hutool/json/serialize/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/package-info.java
similarity index 93%
rename from hutool-json/src/main/java/cn/hutool/json/serialize/package-info.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/serialize/package-info.java
index 3f3f27956..9c4e74a3f 100644
--- a/hutool-json/src/main/java/cn/hutool/json/serialize/package-info.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/package-info.java
@@ -13,4 +13,4 @@
 /**
  * JSON序列化和反序列化，提供对象和JSON之间的转换
  */
-package cn.hutool.json.serialize;
+package org.dromara.hutool.json.serialize;
diff --git a/hutool-json/src/main/java/cn/hutool/json/writer/BooleanValueWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/BooleanValueWriter.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-json/src/main/java/cn/hutool/json/writer/BooleanValueWriter.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/writer/BooleanValueWriter.java
index c7c01857b..87282fdcb
--- a/hutool-json/src/main/java/cn/hutool/json/writer/BooleanValueWriter.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/BooleanValueWriter.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.writer;
+package org.dromara.hutool.json.writer;
 
 /**
  * Boolean类型的值写出器
diff --git a/hutool-json/src/main/java/cn/hutool/json/writer/DateValueWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/DateValueWriter.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-json/src/main/java/cn/hutool/json/writer/DateValueWriter.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/writer/DateValueWriter.java
index a282a976d..65a7c7581
--- a/hutool-json/src/main/java/cn/hutool/json/writer/DateValueWriter.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/DateValueWriter.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.writer;
+package org.dromara.hutool.json.writer;
 
-import cn.hutool.json.serialize.DateJSONString;
+import org.dromara.hutool.json.serialize.DateJSONString;
 
 import java.time.temporal.TemporalAccessor;
 import java.util.Calendar;
diff --git a/hutool-json/src/main/java/cn/hutool/json/writer/GlobalValueWriterMapping.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/GlobalValueWriterMapping.java
similarity index 88%
rename from hutool-json/src/main/java/cn/hutool/json/writer/GlobalValueWriterMapping.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/writer/GlobalValueWriterMapping.java
index 7f1ddf08f..e2cf154db 100644
--- a/hutool-json/src/main/java/cn/hutool/json/writer/GlobalValueWriterMapping.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/GlobalValueWriterMapping.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.writer;
+package org.dromara.hutool.json.writer;
 
-import cn.hutool.core.map.SafeConcurrentHashMap;
-import cn.hutool.core.reflect.NullType;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.map.SafeConcurrentHashMap;
+import org.dromara.hutool.core.reflect.NullType;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import java.lang.reflect.Type;
 import java.util.Map;
diff --git a/hutool-json/src/main/java/cn/hutool/json/writer/JSONStringValueWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONStringValueWriter.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-json/src/main/java/cn/hutool/json/writer/JSONStringValueWriter.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONStringValueWriter.java
index 48bca1c12..2b2d7804b
--- a/hutool-json/src/main/java/cn/hutool/json/writer/JSONStringValueWriter.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONStringValueWriter.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.writer;
+package org.dromara.hutool.json.writer;
 
-import cn.hutool.json.JSONException;
-import cn.hutool.json.serialize.JSONStringer;
+import org.dromara.hutool.json.JSONException;
+import org.dromara.hutool.json.serialize.JSONStringer;
 
 import java.time.temporal.TemporalAccessor;
 import java.util.Calendar;
diff --git a/hutool-json/src/main/java/cn/hutool/json/writer/JSONValueWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONValueWriter.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-json/src/main/java/cn/hutool/json/writer/JSONValueWriter.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONValueWriter.java
index 7bd9eb4b6..db90901b8
--- a/hutool-json/src/main/java/cn/hutool/json/writer/JSONValueWriter.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONValueWriter.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.writer;
+package org.dromara.hutool.json.writer;
 
 /**
  * JSON的值自定义写出
diff --git a/hutool-json/src/main/java/cn/hutool/json/writer/JSONWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-json/src/main/java/cn/hutool/json/writer/JSONWriter.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java
index 4d7cd3520..488b91e64
--- a/hutool-json/src/main/java/cn/hutool/json/writer/JSONWriter.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java
@@ -10,17 +10,17 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.writer;
+package org.dromara.hutool.json.writer;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.lang.mutable.MutableEntry;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.json.InternalJSONUtil;
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONConfig;
-import cn.hutool.json.serialize.JSONStringer;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.lang.mutable.MutableEntry;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.json.InternalJSONUtil;
+import org.dromara.hutool.json.JSON;
+import org.dromara.hutool.json.JSONConfig;
+import org.dromara.hutool.json.serialize.JSONStringer;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/hutool-json/src/main/java/cn/hutool/json/writer/NumberValueWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/NumberValueWriter.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-json/src/main/java/cn/hutool/json/writer/NumberValueWriter.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/writer/NumberValueWriter.java
index 12e29e5a6..da2fb02f6
--- a/hutool-json/src/main/java/cn/hutool/json/writer/NumberValueWriter.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/NumberValueWriter.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.writer;
+package org.dromara.hutool.json.writer;
 
-import cn.hutool.core.math.NumberUtil;
-import cn.hutool.json.JSONConfig;
+import org.dromara.hutool.core.math.NumberUtil;
+import org.dromara.hutool.json.JSONConfig;
 
 /**
  * 数字类型的值写出器
diff --git a/hutool-json/src/main/java/cn/hutool/json/writer/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/package-info.java
similarity index 93%
rename from hutool-json/src/main/java/cn/hutool/json/writer/package-info.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/writer/package-info.java
index fb2111e76..4f7dea3cb 100644
--- a/hutool-json/src/main/java/cn/hutool/json/writer/package-info.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/package-info.java
@@ -16,4 +16,4 @@
  * @author Looly
  *
  */
-package cn.hutool.json.writer;
+package org.dromara.hutool.json.writer;
diff --git a/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLParser.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java
similarity index 95%
rename from hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLParser.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java
index b25816813..adb1c81ec 100644
--- a/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLParser.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.xml;
+package org.dromara.hutool.json.xml;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.json.InternalJSONUtil;
-import cn.hutool.json.JSONException;
-import cn.hutool.json.JSONObject;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.json.InternalJSONUtil;
+import org.dromara.hutool.json.JSONException;
+import org.dromara.hutool.json.JSONObject;
 
 /**
  * XML解析器，将XML解析为JSON对象
diff --git a/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java
index 4c1d61aff..0371fd058
--- a/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.xml;
+package org.dromara.hutool.json.xml;
 
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.text.escape.EscapeUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONException;
-import cn.hutool.json.JSONObject;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.text.escape.EscapeUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.json.JSONArray;
+import org.dromara.hutool.json.JSONException;
+import org.dromara.hutool.json.JSONObject;
 
 /**
  * JSON转XML字符串工具
diff --git a/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java
similarity index 96%
rename from hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLUtil.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java
index 315575f15..44f77eb52 100644
--- a/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLUtil.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.xml;
+package org.dromara.hutool.json.xml;
 
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.json.JSONException;
-import cn.hutool.json.JSONObject;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.json.JSONException;
+import org.dromara.hutool.json.JSONObject;
 
 /**
  * 提供静态方法在XML和JSONObject之间转换
diff --git a/hutool-json/src/main/java/cn/hutool/json/xml/XMLTokener.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java
similarity index 98%
rename from hutool-json/src/main/java/cn/hutool/json/xml/XMLTokener.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java
index 56d89c76c..f0318ff24 100644
--- a/hutool-json/src/main/java/cn/hutool/json/xml/XMLTokener.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.json.xml;
+package org.dromara.hutool.json.xml;
 
-import cn.hutool.json.JSONConfig;
-import cn.hutool.json.JSONException;
-import cn.hutool.json.JSONTokener;
+import org.dromara.hutool.json.JSONConfig;
+import org.dromara.hutool.json.JSONException;
+import org.dromara.hutool.json.JSONTokener;
 
 /**
  * XML分析器，继承自JSONTokener，提供XML的语法分析
diff --git a/hutool-json/src/main/java/cn/hutool/json/xml/package-info.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/package-info.java
similarity index 94%
rename from hutool-json/src/main/java/cn/hutool/json/xml/package-info.java
rename to hutool-json/src/main/java/org/dromara/hutool/json/xml/package-info.java
index 3550fc4b6..52993b568 100644
--- a/hutool-json/src/main/java/cn/hutool/json/xml/package-info.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author looly
  */
-package cn.hutool.json.xml;
+package org.dromara.hutool.json.xml;
diff --git a/hutool-json/src/test/java/cn/hutool/json/CustomSerializeTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/CustomSerializeTest.java
similarity index 93%
rename from hutool-json/src/test/java/cn/hutool/json/CustomSerializeTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/CustomSerializeTest.java
index f511c3a36..3a378d322 100644
--- a/hutool-json/src/test/java/cn/hutool/json/CustomSerializeTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/CustomSerializeTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.json.serialize.JSONObjectSerializer;
+import org.dromara.hutool.json.serialize.JSONObjectSerializer;
 import lombok.ToString;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue1075Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue1075Test.java
similarity index 96%
rename from hutool-json/src/test/java/cn/hutool/json/Issue1075Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue1075Test.java
index f7a8ee737..c8f834c9b 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue1075Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue1075Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue1101Test.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue1101Test.java
index 183182196..065bfeaf1
--- a/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue1101Test.java
@@ -1,8 +1,8 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.reflect.TypeReference;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue1200Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue1200Test.java
similarity index 80%
rename from hutool-json/src/test/java/cn/hutool/json/Issue1200Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue1200Test.java
index 117cfec97..42920674d 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue1200Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue1200Test.java
@@ -1,8 +1,8 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.json.test.bean.ResultBean;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.json.test.bean.ResultBean;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2090Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2090Test.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2090Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2090Test.java
index 906bc6612..da6c6079b
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2090Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2090Test.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.lang.Console;
+import org.dromara.hutool.core.lang.Console;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2131Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2131Test.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2131Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2131Test.java
index 26f2715db..233225f17
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2131Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2131Test.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.collection.ListUtil;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2223Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2223Test.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2223Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2223Test.java
index dbc8eae63..e166d4623
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2223Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2223Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2377Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2377Test.java
similarity index 95%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2377Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2377Test.java
index 7bd32357a..9d9d99679 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2377Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2377Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2447Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2447Test.java
similarity index 94%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2447Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2447Test.java
index 2818ee68c..7b4aff056 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2447Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2447Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2507Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2507Test.java
old mode 100755
new mode 100644
similarity index 87%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2507Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2507Test.java
index 5012f00bb..1f9aabc0f
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2507Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2507Test.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.lang.Console;
+import org.dromara.hutool.core.lang.Console;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2555Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2555Test.java
similarity index 89%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2555Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2555Test.java
index 3cba6285e..18c877341 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2555Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2555Test.java
@@ -1,7 +1,7 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.json.serialize.JSONDeserializer;
-import cn.hutool.json.serialize.JSONObjectSerializer;
+import org.dromara.hutool.json.serialize.JSONDeserializer;
+import org.dromara.hutool.json.serialize.JSONObjectSerializer;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2564Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2564Test.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2564Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2564Test.java
index 1c8a9ae7d..6170f3369
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2564Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2564Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2572Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2572Test.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2572Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2572Test.java
index d90776a66..7505ef0d2
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2572Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2572Test.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.reflect.TypeReference;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2746Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2746Test.java
old mode 100755
new mode 100644
similarity index 88%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2746Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2746Test.java
index 20b3f8958..e6cb0df7f
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2746Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2746Test.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2749Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2749Test.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2749Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2749Test.java
index 0e616d7cd..7f16f71f0
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2749Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2749Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2801Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2801Test.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2801Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2801Test.java
index d0708c865..e2e1121f9
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2801Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2801Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2924Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2924Test.java
similarity index 92%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2924Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2924Test.java
index 557d8b033..5dc8d36bc 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2924Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2924Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2953Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2953Test.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-json/src/test/java/cn/hutool/json/Issue2953Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue2953Test.java
index 9fa8476ca..cb6177dbf
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2953Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue2953Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue488Test.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-json/src/test/java/cn/hutool/json/Issue488Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue488Test.java
index dfd6b18bf..755a7669c
--- a/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue488Test.java
@@ -1,7 +1,7 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.reflect.TypeReference;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue644Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue644Test.java
similarity index 92%
rename from hutool-json/src/test/java/cn/hutool/json/Issue644Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue644Test.java
index 6f6c7450f..02f34b880 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue644Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue644Test.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.date.TimeUtil;
+import org.dromara.hutool.core.date.TimeUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue677Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue677Test.java
similarity index 90%
rename from hutool-json/src/test/java/cn/hutool/json/Issue677Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue677Test.java
index 6970dfd2a..61a57bf64 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue677Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue677Test.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.date.DateUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue867Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issue867Test.java
similarity index 88%
rename from hutool-json/src/test/java/cn/hutool/json/Issue867Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issue867Test.java
index eb2be6d54..8436a6811 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue867Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issue867Test.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.annotation.Alias;
+import org.dromara.hutool.core.annotation.Alias;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1AU86Test.java
similarity index 94%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI1AU86Test.java
index 6d6035350..6a95fac16 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1AU86Test.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.collection.ListUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1F8M2Test.java
similarity index 96%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI1F8M2Test.java
index cf41f1cf1..278504a5a 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1F8M2Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI1H2VNTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1H2VNTest.java
similarity index 97%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI1H2VNTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI1H2VNTest.java
index 27f18d7e1..2eb8eb13c 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI1H2VNTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI1H2VNTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI3BS4STest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI3BS4STest.java
similarity index 87%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI3BS4STest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI3BS4STest.java
index af50230ec..0ec7683c7 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI3BS4STest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI3BS4STest.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.bean.BeanUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI3EGJPTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI3EGJPTest.java
similarity index 88%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI3EGJPTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI3EGJPTest.java
index 536765f66..319802c2a 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI3EGJPTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI3EGJPTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.bean.BeanUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI49VZBTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI49VZBTest.java
similarity index 94%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI49VZBTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI49VZBTest.java
index 5e29492c9..f9d58d571 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI49VZBTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI49VZBTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.convert.Convert;
+import org.dromara.hutool.core.convert.Convert;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI4RBZ4Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI4RBZ4Test.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI4RBZ4Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI4RBZ4Test.java
index 3287c5223..df3759fd3
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI4RBZ4Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI4RBZ4Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI4XFMWTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI4XFMWTest.java
similarity index 92%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI4XFMWTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI4XFMWTest.java
index d3078b472..db6a5f21c 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI4XFMWTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI4XFMWTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.annotation.Alias;
+import org.dromara.hutool.core.annotation.Alias;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI50EGGTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI50EGGTest.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI50EGGTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI50EGGTest.java
index 9e2a73a09..33986ab05
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI50EGGTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI50EGGTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI59LW4Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI59LW4Test.java
similarity index 95%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI59LW4Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI59LW4Test.java
index 9c7214240..22c5a1af1 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI59LW4Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI59LW4Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI5DHK2Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI5DHK2Test.java
similarity index 97%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI5DHK2Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI5DHK2Test.java
index a11c47616..0e1a61a38 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI5DHK2Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI5DHK2Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI5OMSCTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI5OMSCTest.java
old mode 100755
new mode 100644
similarity index 82%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI5OMSCTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI5OMSCTest.java
index 02fa28fb0..4ae99be2e
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI5OMSCTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI5OMSCTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI676ITTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI676ITTest.java
old mode 100755
new mode 100644
similarity index 74%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI676ITTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI676ITTest.java
index fa9355797..b7c04a086
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI676ITTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI676ITTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.util.XmlUtil;
-import cn.hutool.json.xml.JSONXMLSerializer;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.util.XmlUtil;
+import org.dromara.hutool.json.xml.JSONXMLSerializer;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI6H0XFTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6H0XFTest.java
similarity index 92%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI6H0XFTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI6H0XFTest.java
index ec840c1a1..f22a3f80b 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI6H0XFTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6H0XFTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI6LBZATest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6LBZATest.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-json/src/test/java/cn/hutool/json/IssueI6LBZATest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssueI6LBZATest.java
index cc8bd4b37..03c3136b5
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI6LBZATest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI6LBZATest.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issues1881Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Issues1881Test.java
similarity index 96%
rename from hutool-json/src/test/java/cn/hutool/json/Issues1881Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Issues1881Test.java
index 4b180b384..d68386d61 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issues1881Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Issues1881Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssuesI44E4HTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssuesI44E4HTest.java
old mode 100755
new mode 100644
similarity index 88%
rename from hutool-json/src/test/java/cn/hutool/json/IssuesI44E4HTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssuesI44E4HTest.java
index 52fa42028..9c3e2bdc6
--- a/hutool-json/src/test/java/cn/hutool/json/IssuesI44E4HTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssuesI44E4HTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.json.serialize.GlobalSerializeMapping;
-import cn.hutool.json.serialize.JSONDeserializer;
+import org.dromara.hutool.json.serialize.GlobalSerializeMapping;
+import org.dromara.hutool.json.serialize.JSONDeserializer;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssuesI4V14NTest.java
old mode 100755
new mode 100644
similarity index 84%
rename from hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/IssuesI4V14NTest.java
index aed4fd34b..8f82132ad
--- a/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssuesI4V14NTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.reflect.TypeReference;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java
index f360c82d0..6b7b3f206
--- a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java
@@ -1,14 +1,14 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.convert.ConvertException;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.map.Dict;
-import cn.hutool.core.reflect.TypeReference;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.json.test.bean.Exam;
-import cn.hutool.json.test.bean.JsonNode;
-import cn.hutool.json.test.bean.KeyBean;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.convert.ConvertException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.map.Dict;
+import org.dromara.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.json.test.bean.Exam;
+import org.dromara.hutool.json.test.bean.JsonNode;
+import org.dromara.hutool.json.test.bean.KeyBean;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONConvertTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONConvertTest.java
similarity index 92%
rename from hutool-json/src/test/java/cn/hutool/json/JSONConvertTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/JSONConvertTest.java
index f101d3306..7412eacfd 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONConvertTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONConvertTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.json.test.bean.ExamInfoDict;
-import cn.hutool.json.test.bean.PerfectEvaluationProductResVo;
-import cn.hutool.json.test.bean.UserInfoDict;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.json.test.bean.ExamInfoDict;
+import org.dromara.hutool.json.test.bean.PerfectEvaluationProductResVo;
+import org.dromara.hutool.json.test.bean.UserInfoDict;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONDeserializerTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONDeserializerTest.java
similarity index 90%
rename from hutool-json/src/test/java/cn/hutool/json/JSONDeserializerTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/JSONDeserializerTest.java
index d20b1514b..e468a02b3 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONDeserializerTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONDeserializerTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.json.serialize.JSONDeserializer;
+import org.dromara.hutool.json.serialize.JSONDeserializer;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONNullTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java
similarity index 98%
rename from hutool-json/src/test/java/cn/hutool/json/JSONNullTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java
index bac188b20..ac698763f 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONNullTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java
index bcbf3bf4e..794d4783c
--- a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java
@@ -1,25 +1,25 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.annotation.Alias;
-import cn.hutool.core.annotation.PropIgnore;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.json.test.bean.JSONBean;
-import cn.hutool.json.test.bean.ResultDto;
-import cn.hutool.json.test.bean.Seq;
-import cn.hutool.json.test.bean.TokenAuthResponse;
-import cn.hutool.json.test.bean.TokenAuthWarp2;
-import cn.hutool.json.test.bean.UserA;
-import cn.hutool.json.test.bean.UserB;
-import cn.hutool.json.test.bean.UserWithMap;
-import cn.hutool.json.test.bean.report.CaseReport;
-import cn.hutool.json.test.bean.report.StepReport;
-import cn.hutool.json.test.bean.report.SuiteReport;
+import org.dromara.hutool.core.annotation.Alias;
+import org.dromara.hutool.core.annotation.PropIgnore;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.date.DatePattern;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.json.test.bean.JSONBean;
+import org.dromara.hutool.json.test.bean.ResultDto;
+import org.dromara.hutool.json.test.bean.Seq;
+import org.dromara.hutool.json.test.bean.TokenAuthResponse;
+import org.dromara.hutool.json.test.bean.TokenAuthWarp2;
+import org.dromara.hutool.json.test.bean.UserA;
+import org.dromara.hutool.json.test.bean.UserB;
+import org.dromara.hutool.json.test.bean.UserWithMap;
+import org.dromara.hutool.json.test.bean.report.CaseReport;
+import org.dromara.hutool.json.test.bean.report.StepReport;
+import org.dromara.hutool.json.test.bean.report.SuiteReport;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONPathTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONPathTest.java
similarity index 95%
rename from hutool-json/src/test/java/cn/hutool/json/JSONPathTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/JSONPathTest.java
index 196b09420..f5f424a13 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONPathTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONPathTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONStrFormatterTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONStrFormatterTest.java
similarity index 94%
rename from hutool-json/src/test/java/cn/hutool/json/JSONStrFormatterTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/JSONStrFormatterTest.java
index 71fa2cbb3..c90e34267 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONStrFormatterTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONStrFormatterTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.lang.Console;
+import org.dromara.hutool.core.lang.Console;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONSupportTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONSupportTest.java
similarity index 97%
rename from hutool-json/src/test/java/cn/hutool/json/JSONSupportTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/JSONSupportTest.java
index fc9064d1a..bdbba3586 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONSupportTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONSupportTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONTokenerTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONTokenerTest.java
similarity index 76%
rename from hutool-json/src/test/java/cn/hutool/json/JSONTokenerTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/JSONTokenerTest.java
index b541c9b9a..670595ab8 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONTokenerTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONTokenerTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java
similarity index 95%
rename from hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java
index b30b70390..5b3749709 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java
@@ -1,13 +1,13 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.math.NumberUtil;
-import cn.hutool.json.serialize.JSONStringer;
-import cn.hutool.json.test.bean.Price;
-import cn.hutool.json.test.bean.UserA;
-import cn.hutool.json.test.bean.UserC;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.math.NumberUtil;
+import org.dromara.hutool.json.serialize.JSONStringer;
+import org.dromara.hutool.json.test.bean.Price;
+import org.dromara.hutool.json.test.bean.UserA;
+import org.dromara.hutool.json.test.bean.UserC;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONWriterTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONWriterTest.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-json/src/test/java/cn/hutool/json/JSONWriterTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/JSONWriterTest.java
index 5f1af3689..4546f7fe1
--- a/hutool-json/src/test/java/cn/hutool/json/JSONWriterTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONWriterTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.date.DateUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/ParseBeanTest.java
similarity index 93%
rename from hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/ParseBeanTest.java
index f97504229..bfbdcd040 100644
--- a/hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/ParseBeanTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
-import cn.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.collection.ListUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/Pr192Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/Pr192Test.java
similarity index 97%
rename from hutool-json/src/test/java/cn/hutool/json/Pr192Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/Pr192Test.java
index fcfada612..51b22ff28 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Pr192Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/Pr192Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/TransientTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/TransientTest.java
similarity index 98%
rename from hutool-json/src/test/java/cn/hutool/json/TransientTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/TransientTest.java
index d2910096d..c01e3b300 100644
--- a/hutool-json/src/test/java/cn/hutool/json/TransientTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/TransientTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.json;
+package org.dromara.hutool.json;
 
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/BaseResult.java b/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/BaseResult.java
similarity index 83%
rename from hutool-json/src/test/java/cn/hutool/json/issueIVMD5/BaseResult.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/BaseResult.java
index 9b3161b26..0edf0d787 100644
--- a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/BaseResult.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/BaseResult.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.issueIVMD5;
+package org.dromara.hutool.json.issueIVMD5;
 
 import java.util.List;
 
@@ -6,15 +6,15 @@ import lombok.Data;
 
 @Data
 public class BaseResult {
-	
+
 	public BaseResult() {
 	}
-	
+
 	private int result;
 	private List data;
 	private E data2;
 	private String nextDataUri;
 	private String message;
 	private int dataCount;
-	
-}
\ No newline at end of file
+
+}
diff --git a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/IssueIVMD5Test.java
old mode 100755
new mode 100644
similarity index 84%
rename from hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/IssueIVMD5Test.java
index 35491c63c..1c4278b3c
--- a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/IssueIVMD5Test.java
@@ -1,9 +1,9 @@
-package cn.hutool.json.issueIVMD5;
+package org.dromara.hutool.json.issueIVMD5;
 
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.reflect.TypeReference;
-import cn.hutool.json.JSONConfig;
-import cn.hutool.json.JSONUtil;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.reflect.TypeReference;
+import org.dromara.hutool.json.JSONConfig;
+import org.dromara.hutool.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/StudentInfo.java b/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/StudentInfo.java
similarity index 93%
rename from hutool-json/src/test/java/cn/hutool/json/issueIVMD5/StudentInfo.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/StudentInfo.java
index b7e66c95a..4d79ab752 100644
--- a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/StudentInfo.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/issueIVMD5/StudentInfo.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.issueIVMD5;
+package org.dromara.hutool.json.issueIVMD5;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/jwt/IssueI5QRUOTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI5QRUOTest.java
similarity index 96%
rename from hutool-json/src/test/java/cn/hutool/json/jwt/IssueI5QRUOTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI5QRUOTest.java
index 99a90d34c..edca70273 100644
--- a/hutool-json/src/test/java/cn/hutool/json/jwt/IssueI5QRUOTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI5QRUOTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/jwt/IssueI6IS5BTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI6IS5BTest.java
similarity index 89%
rename from hutool-json/src/test/java/cn/hutool/json/jwt/IssueI6IS5BTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI6IS5BTest.java
index 030717b48..1492626cc 100644
--- a/hutool-json/src/test/java/cn/hutool/json/jwt/IssueI6IS5BTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI6IS5BTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.TimeUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.date.TimeUtil;
+import org.dromara.hutool.json.JSONObject;
+import org.dromara.hutool.json.JSONUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTSignerTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTSignerTest.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-json/src/test/java/cn/hutool/json/jwt/JWTSignerTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTSignerTest.java
index 0261ba0a3..a11958577
--- a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTSignerTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTSignerTest.java
@@ -1,10 +1,10 @@
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.crypto.KeyUtil;
-import cn.hutool.json.jwt.signers.AlgorithmUtil;
-import cn.hutool.json.jwt.signers.JWTSigner;
-import cn.hutool.json.jwt.signers.JWTSignerUtil;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.crypto.KeyUtil;
+import org.dromara.hutool.json.jwt.signers.AlgorithmUtil;
+import org.dromara.hutool.json.jwt.signers.JWTSigner;
+import org.dromara.hutool.json.jwt.signers.JWTSignerUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTTest.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTTest.java
index ac2d11850..dc2e83cfb
--- a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTTest.java
@@ -1,11 +1,11 @@
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ByteUtil;
-import cn.hutool.json.jwt.signers.AlgorithmUtil;
-import cn.hutool.json.jwt.signers.JWTSigner;
-import cn.hutool.json.jwt.signers.JWTSignerUtil;
+import org.dromara.hutool.core.date.DatePattern;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.util.ByteUtil;
+import org.dromara.hutool.json.jwt.signers.AlgorithmUtil;
+import org.dromara.hutool.json.jwt.signers.JWTSigner;
+import org.dromara.hutool.json.jwt.signers.JWTSignerUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTUtilTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTUtilTest.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-json/src/test/java/cn/hutool/json/jwt/JWTUtilTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTUtilTest.java
index bb2265945..c3224aaf8
--- a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTUtilTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTValidatorTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-json/src/test/java/cn/hutool/json/jwt/JWTValidatorTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java
index 86bf3974f..1376760ba
--- a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTValidatorTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.json.jwt;
+package org.dromara.hutool.json.jwt;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.exceptions.ValidateException;
-import cn.hutool.json.jwt.signers.JWTSignerUtil;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.exceptions.ValidateException;
+import org.dromara.hutool.json.jwt.signers.JWTSignerUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/ADT.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ADT.java
similarity index 71%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/ADT.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ADT.java
index b02d4e250..3bd834559 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/ADT.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ADT.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/Data.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Data.java
similarity index 57%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/Data.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Data.java
index 2b16af9b3..55ca91c6e 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/Data.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Data.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 @lombok.Data
 public class Data {
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/Exam.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Exam.java
similarity index 82%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/Exam.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Exam.java
index 150fd7105..fc9c23b97 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/Exam.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Exam.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/ExamInfoDict.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ExamInfoDict.java
similarity index 90%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/ExamInfoDict.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ExamInfoDict.java
index 50dc860e6..883568edb 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/ExamInfoDict.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ExamInfoDict.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/JSONBean.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JSONBean.java
similarity index 53%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/JSONBean.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JSONBean.java
index cef52eb4c..fc5b77bee 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/JSONBean.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JSONBean.java
@@ -1,6 +1,6 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
-import cn.hutool.json.JSONObject;
+import org.dromara.hutool.json.JSONObject;
 import lombok.Data;
 
 @Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/JsonNode.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JsonNode.java
similarity index 90%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/JsonNode.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JsonNode.java
index 2e7721203..48650af28 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/JsonNode.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JsonNode.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/KeyBean.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/KeyBean.java
similarity index 69%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/KeyBean.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/KeyBean.java
index cf297f77c..b1e8da0ee 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/KeyBean.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/KeyBean.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/PerfectEvaluationProductResVo.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/PerfectEvaluationProductResVo.java
similarity index 99%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/PerfectEvaluationProductResVo.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/PerfectEvaluationProductResVo.java
index e83abbe2e..16a3776e8 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/PerfectEvaluationProductResVo.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/PerfectEvaluationProductResVo.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/Price.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Price.java
similarity index 70%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/Price.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Price.java
index 3a92e3238..769c94825 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/Price.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Price.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/ProductResBase.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ProductResBase.java
similarity index 94%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/ProductResBase.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ProductResBase.java
index 50e177d34..b70a9289f 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/ProductResBase.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ProductResBase.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/ResultBean.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultBean.java
similarity index 86%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/ResultBean.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultBean.java
index 1acadbcdc..9d3cf1381 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/ResultBean.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultBean.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/ResultDto.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultDto.java
similarity index 98%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/ResultDto.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultDto.java
index 770014c05..f7354bcfd 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/ResultDto.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultDto.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/Seq.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Seq.java
similarity index 77%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/Seq.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Seq.java
index ffb1f4b31..9793f6ba9 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/Seq.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Seq.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/TokenAuthResponse.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthResponse.java
similarity index 71%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/TokenAuthResponse.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthResponse.java
index 8086a2d8a..9a4364d37 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/TokenAuthResponse.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthResponse.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/TokenAuthWarp.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp.java
similarity index 84%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/TokenAuthWarp.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp.java
index 335d0a089..d876cf97a 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/TokenAuthWarp.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/TokenAuthWarp2.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp2.java
similarity index 70%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/TokenAuthWarp2.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp2.java
index 0e8765c6c..678633594 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/TokenAuthWarp2.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp2.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 public class TokenAuthWarp2 extends TokenAuthWarp {
 	private static final long serialVersionUID = 1L;
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/UUMap.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UUMap.java
similarity index 85%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/UUMap.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UUMap.java
index 8cb44406a..f21961ac3 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/UUMap.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UUMap.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/UserA.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserA.java
similarity index 80%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/UserA.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserA.java
index 05a8bd674..ce87f6706 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/UserA.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserA.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/UserB.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserB.java
similarity index 75%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/UserB.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserB.java
index 69a62a333..f4d1b84dd 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/UserB.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserB.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/UserC.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserC.java
similarity index 72%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/UserC.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserC.java
index 088d14a67..f7ec65428 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/UserC.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserC.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/UserInfoDict.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoDict.java
similarity index 91%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/UserInfoDict.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoDict.java
index 899b25968..30344de5b 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/UserInfoDict.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoDict.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/UserInfoRedundCount.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoRedundCount.java
similarity index 89%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/UserInfoRedundCount.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoRedundCount.java
index 9582342fd..205e85acc 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/UserInfoRedundCount.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoRedundCount.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/UserWithMap.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserWithMap.java
similarity index 72%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/UserWithMap.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserWithMap.java
index 2087913f0..e5a69ded1 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/UserWithMap.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserWithMap.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean;
+package org.dromara.hutool.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/report/CaseReport.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/CaseReport.java
similarity index 91%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/report/CaseReport.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/CaseReport.java
index 001447432..97f8c9456 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/report/CaseReport.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/CaseReport.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean.report;
+package org.dromara.hutool.json.test.bean.report;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/report/EnvSettingInfo.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/EnvSettingInfo.java
similarity index 99%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/report/EnvSettingInfo.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/EnvSettingInfo.java
index 5065ace9f..c08025b34 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/report/EnvSettingInfo.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/EnvSettingInfo.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean.report;
+package org.dromara.hutool.json.test.bean.report;
 
 import java.util.Collection;
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/report/StepReport.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/StepReport.java
similarity index 96%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/report/StepReport.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/StepReport.java
index 73e717e6e..f37882919 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/report/StepReport.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/StepReport.java
@@ -1,6 +1,6 @@
-package cn.hutool.json.test.bean.report;
+package org.dromara.hutool.json.test.bean.report;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 测试步骤报告
diff --git a/hutool-json/src/test/java/cn/hutool/json/test/bean/report/SuiteReport.java b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/SuiteReport.java
similarity index 91%
rename from hutool-json/src/test/java/cn/hutool/json/test/bean/report/SuiteReport.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/SuiteReport.java
index 42a058643..5384918b6 100644
--- a/hutool-json/src/test/java/cn/hutool/json/test/bean/report/SuiteReport.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/SuiteReport.java
@@ -1,4 +1,4 @@
-package cn.hutool.json.test.bean.report;
+package org.dromara.hutool.json.test.bean.report;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-json/src/test/java/cn/hutool/json/writer/GlobalValueWriterMappingTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/writer/GlobalValueWriterMappingTest.java
similarity index 90%
rename from hutool-json/src/test/java/cn/hutool/json/writer/GlobalValueWriterMappingTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/writer/GlobalValueWriterMappingTest.java
index 2a3e1c06c..6457eaf15 100644
--- a/hutool-json/src/test/java/cn/hutool/json/writer/GlobalValueWriterMappingTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/writer/GlobalValueWriterMappingTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.json.writer;
+package org.dromara.hutool.json.writer;
 
-import cn.hutool.core.convert.Converter;
-import cn.hutool.json.JSONConfig;
-import cn.hutool.json.JSONUtil;
+import org.dromara.hutool.core.convert.Converter;
+import org.dromara.hutool.json.JSONConfig;
+import org.dromara.hutool.json.JSONUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/hutool-json/src/test/java/cn/hutool/json/xml/XMLTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/xml/XMLTest.java
similarity index 89%
rename from hutool-json/src/test/java/cn/hutool/json/xml/XMLTest.java
rename to hutool-json/src/test/java/org/dromara/hutool/json/xml/XMLTest.java
index 01a447fb8..04a7c7e92 100644
--- a/hutool-json/src/test/java/cn/hutool/json/xml/XMLTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/xml/XMLTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.json.xml;
+package org.dromara.hutool.json.xml;
 
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
+import org.dromara.hutool.json.JSONObject;
+import org.dromara.hutool.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml
index 1fcecf5b1..631851e35 100755
--- a/hutool-log/pom.xml
+++ b/hutool-log/pom.xml
@@ -19,7 +19,7 @@
 	jar
 
 	
-		cn.hutool
+		org.dromara.hutool
 		hutool-parent
 		6.0.0.M3
 	
@@ -29,7 +29,7 @@
 	Hutool 日志封装
 
 	
-		cn.hutool.log
+		org.dromara.hutool.log
 		
 		2.0.5
 		
@@ -46,7 +46,7 @@
 
 	
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-core
 			${project.parent.version}
 		
diff --git a/hutool-log/src/main/java/cn/hutool/log/AbstractLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/AbstractLog.java
similarity index 96%
rename from hutool-log/src/main/java/cn/hutool/log/AbstractLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/AbstractLog.java
index 1622ec789..1dcde7b09 100644
--- a/hutool-log/src/main/java/cn/hutool/log/AbstractLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/AbstractLog.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log;
+package org.dromara.hutool.log;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.level.Level;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.level.Level;
 
 import java.io.Serializable;
 
diff --git a/hutool-log/src/main/java/cn/hutool/log/GlobalLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/GlobalLogFactory.java
similarity index 71%
rename from hutool-log/src/main/java/cn/hutool/log/GlobalLogFactory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/GlobalLogFactory.java
index d352abc0e..c6881ea57 100644
--- a/hutool-log/src/main/java/cn/hutool/log/GlobalLogFactory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/GlobalLogFactory.java
@@ -10,7 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log;
+package org.dromara.hutool.log;
+
+import org.dromara.hutool.log.dialect.commons.ApacheCommonsLogFactory;
+import org.dromara.hutool.log.dialect.console.ConsoleLogFactory;
+import org.dromara.hutool.log.dialect.jdk.JdkLogFactory;
+import org.dromara.hutool.log.dialect.log4j.Log4jLogFactory;
+import org.dromara.hutool.log.dialect.log4j2.Log4j2LogFactory;
+import org.dromara.hutool.log.dialect.slf4j.Slf4jLogFactory;
 
 /**
  * 全局日志工厂类
      
@@ -42,12 +49,12 @@ public class GlobalLogFactory {
 	/**
 	 * 自定义日志实现
 	 *
-	 * @see cn.hutool.log.dialect.slf4j.Slf4jLogFactory
-	 * @see cn.hutool.log.dialect.log4j.Log4jLogFactory
-	 * @see cn.hutool.log.dialect.log4j2.Log4j2LogFactory
-	 * @see cn.hutool.log.dialect.commons.ApacheCommonsLogFactory
-	 * @see cn.hutool.log.dialect.jdk.JdkLogFactory
-	 * @see cn.hutool.log.dialect.console.ConsoleLogFactory
+	 * @see Slf4jLogFactory
+	 * @see Log4jLogFactory
+	 * @see Log4j2LogFactory
+	 * @see ApacheCommonsLogFactory
+	 * @see JdkLogFactory
+	 * @see ConsoleLogFactory
 	 *
 	 * @param logFactoryClass 日志工厂类
 	 * @return 自定义的日志工厂类
@@ -63,12 +70,12 @@ public class GlobalLogFactory {
 	/**
 	 * 自定义日志实现
 	 *
-	 * @see cn.hutool.log.dialect.slf4j.Slf4jLogFactory
-	 * @see cn.hutool.log.dialect.log4j.Log4jLogFactory
-	 * @see cn.hutool.log.dialect.log4j2.Log4j2LogFactory
-	 * @see cn.hutool.log.dialect.commons.ApacheCommonsLogFactory
-	 * @see cn.hutool.log.dialect.jdk.JdkLogFactory
-	 * @see cn.hutool.log.dialect.console.ConsoleLogFactory
+	 * @see Slf4jLogFactory
+	 * @see Log4jLogFactory
+	 * @see Log4j2LogFactory
+	 * @see ApacheCommonsLogFactory
+	 * @see JdkLogFactory
+	 * @see ConsoleLogFactory
 	 *
 	 * @param logFactory 日志工厂类对象
 	 * @return 自定义的日志工厂类
diff --git a/hutool-log/src/main/java/cn/hutool/log/Log.java b/hutool-log/src/main/java/org/dromara/hutool/log/Log.java
old mode 100755
new mode 100644
similarity index 86%
rename from hutool-log/src/main/java/cn/hutool/log/Log.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/Log.java
index 59364fa30..058f17e16
--- a/hutool-log/src/main/java/cn/hutool/log/Log.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/Log.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log;
+package org.dromara.hutool.log;
 
-import cn.hutool.core.lang.caller.CallerUtil;
-import cn.hutool.log.level.DebugLog;
-import cn.hutool.log.level.ErrorLog;
-import cn.hutool.log.level.InfoLog;
-import cn.hutool.log.level.Level;
-import cn.hutool.log.level.TraceLog;
-import cn.hutool.log.level.WarnLog;
+import org.dromara.hutool.core.lang.caller.CallerUtil;
+import org.dromara.hutool.log.level.DebugLog;
+import org.dromara.hutool.log.level.ErrorLog;
+import org.dromara.hutool.log.level.InfoLog;
+import org.dromara.hutool.log.level.Level;
+import org.dromara.hutool.log.level.TraceLog;
+import org.dromara.hutool.log.level.WarnLog;
 
 /**
  * 日志统一接口
diff --git a/hutool-log/src/main/java/cn/hutool/log/LogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/LogFactory.java
similarity index 92%
rename from hutool-log/src/main/java/cn/hutool/log/LogFactory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/LogFactory.java
index 41c1577bb..31beaa643 100644
--- a/hutool-log/src/main/java/cn/hutool/log/LogFactory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/LogFactory.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log;
+package org.dromara.hutool.log;
 
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.lang.caller.CallerUtil;
-import cn.hutool.core.map.SafeConcurrentHashMap;
-import cn.hutool.core.util.ServiceLoaderUtil;
-import cn.hutool.log.dialect.console.ConsoleLogFactory;
-import cn.hutool.log.dialect.jdk.JdkLogFactory;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.lang.caller.CallerUtil;
+import org.dromara.hutool.core.map.SafeConcurrentHashMap;
+import org.dromara.hutool.core.util.ServiceLoaderUtil;
+import org.dromara.hutool.log.dialect.console.ConsoleLogFactory;
+import org.dromara.hutool.log.dialect.jdk.JdkLogFactory;
 
 import java.net.URL;
 import java.util.Map;
diff --git a/hutool-log/src/main/java/cn/hutool/log/StaticLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/StaticLog.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-log/src/main/java/cn/hutool/log/StaticLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/StaticLog.java
index c60fd8866..5bde72e38
--- a/hutool-log/src/main/java/cn/hutool/log/StaticLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/StaticLog.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log;
+package org.dromara.hutool.log;
 
-import cn.hutool.core.lang.caller.CallerUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.level.Level;
+import org.dromara.hutool.core.lang.caller.CallerUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.level.Level;
 
 /**
  * 静态日志类，用于在不引入日志对象的情况下打印日志
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog.java
similarity index 96%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog.java
index 4defc6e8a..4c384e446 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.commons;
+package org.dromara.hutool.log.dialect.commons;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.AbstractLog;
-import cn.hutool.log.level.Level;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.AbstractLog;
+import org.dromara.hutool.log.level.Level;
 
 /**
  * Apache Commons Logging
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLog4JLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog4JLog.java
similarity index 92%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLog4JLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog4JLog.java
index 424ddca77..9f0b064ab 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLog4JLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog4JLog.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.commons;
+package org.dromara.hutool.log.dialect.commons;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.impl.Log4JLogger;
 
-import cn.hutool.log.dialect.log4j.Log4jLog;
+import org.dromara.hutool.log.dialect.log4j.Log4jLog;
 
 /**
  * Apache Commons Logging for Log4j
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLogFactory.java
similarity index 92%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLogFactory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLogFactory.java
index 0159f12b6..fd436d1bb 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/commons/ApacheCommonsLogFactory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLogFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.commons;
+package org.dromara.hutool.log.dialect.commons;
 
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
 
 /**
  *  Apache Commons Logging
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/package-info.java
new file mode 100644
index 000000000..38d169e75
--- /dev/null
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2023 looly(loolly@aliyun.com)
+ * Hutool is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *          http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
+/**
+ * Apache-Commons-Logging日志库的实现封装
+ *
+ * @author looly
+ *
+ */
+package org.dromara.hutool.log.dialect.commons;
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleColorLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLog.java
old mode 100755
new mode 100644
similarity index 87%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleColorLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLog.java
index 14a2e1b53..38862a1f1
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleColorLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLog.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.console;
+package org.dromara.hutool.log.dialect.console;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.ansi.Ansi4BitColor;
-import cn.hutool.core.lang.ansi.AnsiEncoder;
-import cn.hutool.core.reflect.ClassUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.level.Level;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.lang.ansi.Ansi4BitColor;
+import org.dromara.hutool.core.lang.ansi.AnsiEncoder;
+import org.dromara.hutool.core.reflect.ClassUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.level.Level;
 
 import java.util.function.Function;
 
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleColorLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLogFactory.java
old mode 100755
new mode 100644
similarity index 88%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleColorLogFactory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLogFactory.java
index 74c71903c..665653312
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleColorLogFactory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLogFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.console;
+package org.dromara.hutool.log.dialect.console;
 
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
 
 /**
  * 利用System.out.println()打印彩色日志
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLog.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLog.java
index 5bad70ce7..5b5cc3e73
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLog.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.console;
+package org.dromara.hutool.log.dialect.console;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.map.Dict;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.AbstractLog;
-import cn.hutool.log.level.Level;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.map.Dict;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.AbstractLog;
+import org.dromara.hutool.log.level.Level;
 
 /**
  * 利用System.out.println()打印日志
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLogFactory.java
similarity index 87%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLogFactory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLogFactory.java
index ebd93bebd..0117b81e3 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLogFactory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLogFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.console;
+package org.dromara.hutool.log.dialect.console;
 
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
 
 /**
  * 利用System.out.println()打印日志
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/console/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/package-info.java
similarity index 92%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/console/package-info.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/package-info.java
index 1436c3b82..d5d89bf82 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/console/package-info.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.log.dialect.console;
+package org.dromara.hutool.log.dialect.console;
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/jboss/JbossLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLog.java
similarity index 95%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/jboss/JbossLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLog.java
index f4d4f3991..019241b6a 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/jboss/JbossLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLog.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.jboss;
+package org.dromara.hutool.log.dialect.jboss;
 
 import org.jboss.logging.Logger;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.AbstractLog;
-import cn.hutool.log.level.Level;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.AbstractLog;
+import org.dromara.hutool.log.level.Level;
 
 /**
  * Jboss-Logging log.
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/jboss/JbossLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLogFactory.java
similarity index 89%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/jboss/JbossLogFactory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLogFactory.java
index 4fca9f569..946fe015d 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/jboss/JbossLogFactory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLogFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.jboss;
+package org.dromara.hutool.log.dialect.jboss;
 
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
 
 /**
  * Jboss-Logging log.
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/jboss/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/package-info.java
similarity index 92%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/jboss/package-info.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/package-info.java
index b63df8d7b..66c7fdee6 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/jboss/package-info.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.log.dialect.jboss;
+package org.dromara.hutool.log.dialect.jboss;
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLog.java
similarity index 94%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLog.java
index 6ad700d4e..3e31a6745 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLog.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.jdk;
+package org.dromara.hutool.log.dialect.jdk;
 
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.AbstractLog;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.AbstractLog;
 
 /**
  * java.util.logging log.
@@ -105,7 +105,7 @@ public class JdkLog extends AbstractLog {
 
 	// ------------------------------------------------------------------------- Log
 	@Override
-	public void log(final String fqcn, final cn.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
+	public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
 		final Level jdkLevel;
 		switch (level) {
 			case TRACE:
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLogFactory.java
old mode 100755
new mode 100644
similarity index 87%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLogFactory.java
index e5b268283..79daa413a
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLogFactory.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.jdk;
+package org.dromara.hutool.log.dialect.jdk;
 
 import java.io.InputStream;
 import java.util.logging.LogManager;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
 
 /**
  * JDK日志工厂类
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/package-info.java
similarity index 93%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/jdk/package-info.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/package-info.java
index 49a934b4f..fd93a37c9 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/package-info.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.log.dialect.jdk;
+package org.dromara.hutool.log.dialect.jdk;
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j/Log4jLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLog.java
similarity index 83%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/log4j/Log4jLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLog.java
index e33a3cd51..b6be3660f 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j/Log4jLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLog.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.log4j;
+package org.dromara.hutool.log.dialect.log4j;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.AbstractLog;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.AbstractLog;
 
 /**
  * Apache Log4J log.
      
@@ -55,7 +55,7 @@ public class Log4jLog extends AbstractLog {
 
 	@Override
 	public void trace(final String fqcn, final Throwable t, final String format, final Object... arguments) {
-		log(fqcn, cn.hutool.log.level.Level.TRACE, t, format, arguments);
+		log(fqcn, org.dromara.hutool.log.level.Level.TRACE, t, format, arguments);
 	}
 
 	// ------------------------------------------------------------------------- Debug
@@ -66,7 +66,7 @@ public class Log4jLog extends AbstractLog {
 
 	@Override
 	public void debug(final String fqcn, final Throwable t, final String format, final Object... arguments) {
-		log(fqcn, cn.hutool.log.level.Level.DEBUG, t, format, arguments);
+		log(fqcn, org.dromara.hutool.log.level.Level.DEBUG, t, format, arguments);
 	}
 	// ------------------------------------------------------------------------- Info
 	@Override
@@ -76,7 +76,7 @@ public class Log4jLog extends AbstractLog {
 
 	@Override
 	public void info(final String fqcn, final Throwable t, final String format, final Object... arguments) {
-		log(fqcn, cn.hutool.log.level.Level.INFO, t, format, arguments);
+		log(fqcn, org.dromara.hutool.log.level.Level.INFO, t, format, arguments);
 	}
 
 	// ------------------------------------------------------------------------- Warn
@@ -87,7 +87,7 @@ public class Log4jLog extends AbstractLog {
 
 	@Override
 	public void warn(final String fqcn, final Throwable t, final String format, final Object... arguments) {
-		log(fqcn, cn.hutool.log.level.Level.WARN, t, format, arguments);
+		log(fqcn, org.dromara.hutool.log.level.Level.WARN, t, format, arguments);
 	}
 
 	// ------------------------------------------------------------------------- Error
@@ -98,12 +98,12 @@ public class Log4jLog extends AbstractLog {
 
 	@Override
 	public void error(final String fqcn, final Throwable t, final String format, final Object... arguments) {
-		log(fqcn, cn.hutool.log.level.Level.ERROR, t, format, arguments);
+		log(fqcn, org.dromara.hutool.log.level.Level.ERROR, t, format, arguments);
 	}
 
 	// ------------------------------------------------------------------------- Log
 	@Override
-	public void log(final String fqcn, final cn.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
+	public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
 		final Level log4jLevel;
 		switch (level) {
 			case TRACE:
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j/Log4jLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLogFactory.java
similarity index 88%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/log4j/Log4jLogFactory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLogFactory.java
index 676f42919..d07805709 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j/Log4jLogFactory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLogFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.log4j;
+package org.dromara.hutool.log.dialect.log4j;
 
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
 
 /**
  * Apache Log4J log.
      
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/package-info.java
similarity index 92%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/log4j/package-info.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/package-info.java
index 930bdb5e3..3ba5ea1c7 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j/package-info.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.log.dialect.log4j;
+package org.dromara.hutool.log.dialect.log4j;
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/Log4j2Log.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2Log.java
similarity index 94%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/Log4j2Log.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2Log.java
index b6d43a329..d6ae59cfb 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/Log4j2Log.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2Log.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.log4j2;
+package org.dromara.hutool.log.dialect.log4j2;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.spi.AbstractLogger;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.AbstractLog;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.AbstractLog;
 
 /**
  * Apache Log4J 2 log.
      
@@ -106,7 +106,7 @@ public class Log4j2Log extends AbstractLog {
 
 	// ------------------------------------------------------------------------- Log
 	@Override
-	public void log(final String fqcn, final cn.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
+	public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
 		final Level log4j2Level;
 		switch (level) {
 			case TRACE:
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/Log4j2LogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2LogFactory.java
similarity index 88%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/Log4j2LogFactory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2LogFactory.java
index a00a55a33..d3ec19622 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/Log4j2LogFactory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2LogFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.log4j2;
+package org.dromara.hutool.log.dialect.log4j2;
 
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
 
 /**
  * Apache Log4J 2 log.
      
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/package-info.java
similarity index 92%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/package-info.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/package-info.java
index 62673ba2a..46266f8df 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/log4j2/package-info.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.log.dialect.log4j2;
+package org.dromara.hutool.log.dialect.log4j2;
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/logtube/LogTubeLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLog.java
similarity index 93%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/logtube/LogTubeLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLog.java
index 8f2a1a64b..dd4e0ed80 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/logtube/LogTubeLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLog.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.logtube;
+package org.dromara.hutool.log.dialect.logtube;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.AbstractLog;
-import cn.hutool.log.level.Level;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.AbstractLog;
+import org.dromara.hutool.log.level.Level;
 import io.github.logtube.Logtube;
 import io.github.logtube.core.IEventLogger;
 
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/logtube/LogTubeLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLogFactory.java
similarity index 88%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/logtube/LogTubeLogFactory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLogFactory.java
index 5adc7fc31..1d4cd785e 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/logtube/LogTubeLogFactory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLogFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.logtube;
+package org.dromara.hutool.log.dialect.logtube;
 
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
 
 /**
  * LogTube log. 封装
      
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/logtube/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/package-info.java
similarity index 92%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/logtube/package-info.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/package-info.java
index 1ab31e88d..91ea5afe6 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/logtube/package-info.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.log.dialect.logtube;
+package org.dromara.hutool.log.dialect.logtube;
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/package-info.java
similarity index 93%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/package-info.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/package-info.java
index eb9756783..5c2955d31 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/package-info.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.log.dialect;
+package org.dromara.hutool.log.dialect;
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/Slf4jLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLog.java
similarity index 97%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/Slf4jLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLog.java
index 4332a6975..4c8d7612e 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/Slf4jLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLog.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.slf4j;
+package org.dromara.hutool.log.dialect.slf4j;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.spi.LocationAwareLogger;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.AbstractLog;
-import cn.hutool.log.level.Level;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.AbstractLog;
+import org.dromara.hutool.log.level.Level;
 
 /**
  * SLF4J log.
      
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/Slf4jLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLogFactory.java
similarity index 94%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/Slf4jLogFactory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLogFactory.java
index 79e969148..b8ea31b2b 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/Slf4jLogFactory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLogFactory.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.slf4j;
+package org.dromara.hutool.log.dialect.slf4j;
 
 import java.io.OutputStream;
 import java.io.PrintStream;
@@ -19,8 +19,8 @@ import java.io.UnsupportedEncodingException;
 import org.slf4j.LoggerFactory;
 import org.slf4j.helpers.NOPLoggerFactory;
 
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
 
 /**
  * SLF4J log.
      
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/package-info.java
similarity index 92%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/package-info.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/package-info.java
index c585477fc..a19dd7d75 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/slf4j/package-info.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.log.dialect.slf4j;
+package org.dromara.hutool.log.dialect.slf4j;
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog.java
similarity index 91%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog.java
index 9bee47879..2ee8650da 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.tinylog;
+package org.dromara.hutool.log.dialect.tinylog;
 
+import org.dromara.hutool.log.AbstractLog;
 import org.pmw.tinylog.Level;
 import org.pmw.tinylog.LogEntryForwarder;
 import org.pmw.tinylog.Logger;
 
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.AbstractLog;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * tinylog log.
      
@@ -118,12 +118,12 @@ public class TinyLog extends AbstractLog {
 
 	// ------------------------------------------------------------------------- Log
 	@Override
-	public void log(final String fqcn, final cn.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
+	public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
 		logIfEnabled(fqcn, toTinyLevel(level), t, format, arguments);
 	}
 
 	@Override
-	public boolean isEnabled(final cn.hutool.log.level.Level level) {
+	public boolean isEnabled(final org.dromara.hutool.log.level.Level level) {
 		return this.level <= toTinyLevel(level).ordinal();
 	}
 
@@ -151,7 +151,7 @@ public class TinyLog extends AbstractLog {
 	 * @return Tinylog的Level
 	 * @since 4.0.3
 	 */
-	private Level toTinyLevel(final cn.hutool.log.level.Level level) {
+	private Level toTinyLevel(final org.dromara.hutool.log.level.Level level) {
 		final Level tinyLevel;
 		switch (level) {
 			case TRACE:
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog2.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog2.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2.java
index b40daa9f1..c3475b425
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog2.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.tinylog;
+package org.dromara.hutool.log.dialect.tinylog;
 
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.AbstractLog;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.AbstractLog;
 import org.tinylog.Level;
 import org.tinylog.configuration.Configuration;
 import org.tinylog.format.AdvancedMessageFormatter;
@@ -126,12 +126,12 @@ public class TinyLog2 extends AbstractLog {
 
 	// ------------------------------------------------------------------------- Log
 	@Override
-	public void log(final String fqcn, final cn.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
+	public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
 		logIfEnabled(fqcn, toTinyLevel(level), t, format, arguments);
 	}
 
 	@Override
-	public boolean isEnabled(final cn.hutool.log.level.Level level) {
+	public boolean isEnabled(final org.dromara.hutool.log.level.Level level) {
 		return this.level <= toTinyLevel(level).ordinal();
 	}
 
@@ -160,7 +160,7 @@ public class TinyLog2 extends AbstractLog {
 	 * @return Tinylog的Level
 	 * @since 4.0.3
 	 */
-	private Level toTinyLevel(final cn.hutool.log.level.Level level) {
+	private Level toTinyLevel(final org.dromara.hutool.log.level.Level level) {
 		final Level tinyLevel;
 		switch (level) {
 			case TRACE:
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog2Factory.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2Factory.java
similarity index 88%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog2Factory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2Factory.java
index ad3e6f943..45214bdc6 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog2Factory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2Factory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.tinylog;
+package org.dromara.hutool.log.dialect.tinylog;
 
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
 
 /**
  * TinyLog2 log.
      
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLogFactory.java
similarity index 88%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLogFactory.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLogFactory.java
index aace12242..c68897f61 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLogFactory.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLogFactory.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.dialect.tinylog;
+package org.dromara.hutool.log.dialect.tinylog;
 
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
 
 /**
  * TinyLog log.
      
diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/package-info.java
similarity index 93%
rename from hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/package-info.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/package-info.java
index 9b2b87566..2a0fb26e1 100644
--- a/hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/package-info.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/package-info.java
@@ -16,4 +16,4 @@
  *
  * @author looly
  */
-package cn.hutool.log.dialect.tinylog;
+package org.dromara.hutool.log.dialect.tinylog;
diff --git a/hutool-log/src/main/java/cn/hutool/log/level/DebugLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/level/DebugLog.java
similarity index 97%
rename from hutool-log/src/main/java/cn/hutool/log/level/DebugLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/level/DebugLog.java
index 4ddea4a00..b72d67788 100644
--- a/hutool-log/src/main/java/cn/hutool/log/level/DebugLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/level/DebugLog.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.level;
+package org.dromara.hutool.log.level;
 
 /**
  * DEBUG级别日志接口
diff --git a/hutool-log/src/main/java/cn/hutool/log/level/ErrorLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/level/ErrorLog.java
similarity index 97%
rename from hutool-log/src/main/java/cn/hutool/log/level/ErrorLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/level/ErrorLog.java
index fddfded69..5dc65b8bc 100644
--- a/hutool-log/src/main/java/cn/hutool/log/level/ErrorLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/level/ErrorLog.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.level;
+package org.dromara.hutool.log.level;
 
 /**
  * ERROR级别日志接口
diff --git a/hutool-log/src/main/java/cn/hutool/log/level/InfoLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/level/InfoLog.java
similarity index 97%
rename from hutool-log/src/main/java/cn/hutool/log/level/InfoLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/level/InfoLog.java
index d92a449f5..54cbd673b 100644
--- a/hutool-log/src/main/java/cn/hutool/log/level/InfoLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/level/InfoLog.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.level;
+package org.dromara.hutool.log.level;
 
 /**
  * INFO级别日志接口
diff --git a/hutool-log/src/main/java/cn/hutool/log/level/Level.java b/hutool-log/src/main/java/org/dromara/hutool/log/level/Level.java
similarity index 95%
rename from hutool-log/src/main/java/cn/hutool/log/level/Level.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/level/Level.java
index 27a9e724c..b6256f486 100644
--- a/hutool-log/src/main/java/cn/hutool/log/level/Level.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/level/Level.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.level;
+package org.dromara.hutool.log.level;
 
 /**
  * 日志等级
diff --git a/hutool-log/src/main/java/cn/hutool/log/level/TraceLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/level/TraceLog.java
similarity index 97%
rename from hutool-log/src/main/java/cn/hutool/log/level/TraceLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/level/TraceLog.java
index 6292ae3f6..07fd98358 100644
--- a/hutool-log/src/main/java/cn/hutool/log/level/TraceLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/level/TraceLog.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.level;
+package org.dromara.hutool.log.level;
 
 /**
  * TRACE级别日志接口
diff --git a/hutool-log/src/main/java/cn/hutool/log/level/WarnLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/level/WarnLog.java
similarity index 97%
rename from hutool-log/src/main/java/cn/hutool/log/level/WarnLog.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/level/WarnLog.java
index 338a74f35..e4b6d7953 100644
--- a/hutool-log/src/main/java/cn/hutool/log/level/WarnLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/level/WarnLog.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.log.level;
+package org.dromara.hutool.log.level;
 
 /**
  * WARN级别日志接口
diff --git a/hutool-log/src/main/java/cn/hutool/log/level/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/level/package-info.java
similarity index 94%
rename from hutool-log/src/main/java/cn/hutool/log/level/package-info.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/level/package-info.java
index 7bb0405c6..55eb2a744 100644
--- a/hutool-log/src/main/java/cn/hutool/log/level/package-info.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/level/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.log.level;
+package org.dromara.hutool.log.level;
diff --git a/hutool-log/src/main/java/cn/hutool/log/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/package-info.java
similarity index 95%
rename from hutool-log/src/main/java/cn/hutool/log/package-info.java
rename to hutool-log/src/main/java/org/dromara/hutool/log/package-info.java
index effa25591..aaa94169c 100644
--- a/hutool-log/src/main/java/cn/hutool/log/package-info.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.log;
+package org.dromara.hutool.log;
diff --git a/hutool-log/src/main/resources/META-INF/services/cn.hutool.log.LogFactory b/hutool-log/src/main/resources/META-INF/services/cn.hutool.log.LogFactory
deleted file mode 100644
index 30bab5b3c..000000000
--- a/hutool-log/src/main/resources/META-INF/services/cn.hutool.log.LogFactory
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (c) 2023 looly(loolly@aliyun.com)
-# Hutool is licensed under Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-#          http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-# See the Mulan PSL v2 for more details.
-#
-
-cn.hutool.log.dialect.logtube.LogTubeLogFactory
-cn.hutool.log.dialect.slf4j.Slf4jLogFactory
-cn.hutool.log.dialect.log4j2.Log4j2LogFactory
-cn.hutool.log.dialect.log4j.Log4jLogFactory
-cn.hutool.log.dialect.commons.ApacheCommonsLogFactory
-cn.hutool.log.dialect.tinylog.TinyLog2Factory
-cn.hutool.log.dialect.tinylog.TinyLogFactory
-cn.hutool.log.dialect.jboss.JbossLogFactory
diff --git a/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.LogFactory b/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.LogFactory
new file mode 100644
index 000000000..42ab283cc
--- /dev/null
+++ b/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.LogFactory
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2023 looly(loolly@aliyun.com)
+# Hutool is licensed under Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#          http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+# EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+# See the Mulan PSL v2 for more details.
+#
+
+org.dromara.hutool.log.dialect.logtube.LogTubeLogFactory
+org.dromara.hutool.log.dialect.slf4j.Slf4jLogFactory
+org.dromara.hutool.log.dialect.log4j2.Log4j2LogFactory
+org.dromara.hutool.log.dialect.log4j.Log4jLogFactory
+org.dromara.hutool.log.dialect.commons.ApacheCommonsLogFactory
+org.dromara.hutool.log.dialect.tinylog.TinyLog2Factory
+org.dromara.hutool.log.dialect.tinylog.TinyLogFactory
+org.dromara.hutool.log.dialect.jboss.JbossLogFactory
diff --git a/hutool-log/src/test/java/cn/hutool/log/CustomLogTest.java b/hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java
similarity index 83%
rename from hutool-log/src/test/java/cn/hutool/log/CustomLogTest.java
rename to hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java
index f3b5b8770..978688e12 100644
--- a/hutool-log/src/test/java/cn/hutool/log/CustomLogTest.java
+++ b/hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java
@@ -1,14 +1,14 @@
-package cn.hutool.log;
+package org.dromara.hutool.log;
 
-import cn.hutool.log.dialect.commons.ApacheCommonsLogFactory;
-import cn.hutool.log.dialect.console.ConsoleLogFactory;
-import cn.hutool.log.dialect.jboss.JbossLogFactory;
-import cn.hutool.log.dialect.jdk.JdkLogFactory;
-import cn.hutool.log.dialect.log4j.Log4jLogFactory;
-import cn.hutool.log.dialect.log4j2.Log4j2LogFactory;
-import cn.hutool.log.dialect.slf4j.Slf4jLogFactory;
-import cn.hutool.log.dialect.tinylog.TinyLog2Factory;
-import cn.hutool.log.dialect.tinylog.TinyLogFactory;
+import org.dromara.hutool.log.dialect.commons.ApacheCommonsLogFactory;
+import org.dromara.hutool.log.dialect.console.ConsoleLogFactory;
+import org.dromara.hutool.log.dialect.jboss.JbossLogFactory;
+import org.dromara.hutool.log.dialect.jdk.JdkLogFactory;
+import org.dromara.hutool.log.dialect.log4j.Log4jLogFactory;
+import org.dromara.hutool.log.dialect.log4j2.Log4j2LogFactory;
+import org.dromara.hutool.log.dialect.slf4j.Slf4jLogFactory;
+import org.dromara.hutool.log.dialect.tinylog.TinyLog2Factory;
+import org.dromara.hutool.log.dialect.tinylog.TinyLogFactory;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/hutool-log/src/test/java/cn/hutool/log/LogTest.java b/hutool-log/src/test/java/org/dromara/hutool/log/LogTest.java
similarity index 91%
rename from hutool-log/src/test/java/cn/hutool/log/LogTest.java
rename to hutool-log/src/test/java/org/dromara/hutool/log/LogTest.java
index 05551ff83..65673ebdd 100644
--- a/hutool-log/src/test/java/cn/hutool/log/LogTest.java
+++ b/hutool-log/src/test/java/org/dromara/hutool/log/LogTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.log;
+package org.dromara.hutool.log;
 
-import cn.hutool.log.level.Level;
+import org.dromara.hutool.log.level.Level;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-log/src/test/java/cn/hutool/log/LogTubeTest.java b/hutool-log/src/test/java/org/dromara/hutool/log/LogTubeTest.java
similarity index 73%
rename from hutool-log/src/test/java/cn/hutool/log/LogTubeTest.java
rename to hutool-log/src/test/java/org/dromara/hutool/log/LogTubeTest.java
index 3af1335c6..e4fc1d42c 100644
--- a/hutool-log/src/test/java/cn/hutool/log/LogTubeTest.java
+++ b/hutool-log/src/test/java/org/dromara/hutool/log/LogTubeTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.log;
+package org.dromara.hutool.log;
 
-import cn.hutool.log.dialect.logtube.LogTubeLogFactory;
+import org.dromara.hutool.log.dialect.logtube.LogTubeLogFactory;
 import org.junit.jupiter.api.Test;
 
 public class LogTubeTest {
diff --git a/hutool-log/src/test/java/cn/hutool/log/StaticLogTest.java b/hutool-log/src/test/java/org/dromara/hutool/log/StaticLogTest.java
old mode 100755
new mode 100644
similarity index 78%
rename from hutool-log/src/test/java/cn/hutool/log/StaticLogTest.java
rename to hutool-log/src/test/java/org/dromara/hutool/log/StaticLogTest.java
index 290c422f6..6cc08f380
--- a/hutool-log/src/test/java/cn/hutool/log/StaticLogTest.java
+++ b/hutool-log/src/test/java/org/dromara/hutool/log/StaticLogTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.log;
+package org.dromara.hutool.log;
 
-import cn.hutool.log.dialect.console.ConsoleColorLogFactory;
-import cn.hutool.log.dialect.console.ConsoleLogFactory;
+import org.dromara.hutool.log.dialect.console.ConsoleColorLogFactory;
+import org.dromara.hutool.log.dialect.console.ConsoleLogFactory;
 import org.junit.jupiter.api.Test;
 
 public class StaticLogTest {
diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml
index 358c9585b..4e1a1803d 100755
--- a/hutool-poi/pom.xml
+++ b/hutool-poi/pom.xml
@@ -19,7 +19,7 @@
 	jar
 
 	
-		cn.hutool
+		org.dromara.hutool
 		hutool-parent
 		6.0.0.M3
 	
@@ -29,19 +29,19 @@
 	Hutool POI工具类（对Office文档、OFD等操作）
 
 	
-		cn.hutool.poi
+		org.dromara.hutool.poi
 		
 		5.2.3
 	
 
 	
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-core
 			${project.parent.version}
 		
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-log
 			${project.parent.version}
 		
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/PoiChecker.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/PoiChecker.java
similarity index 88%
rename from hutool-poi/src/main/java/cn/hutool/poi/PoiChecker.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/PoiChecker.java
index 7f39ae907..0313ce25c 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/PoiChecker.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/PoiChecker.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi;
+package org.dromara.hutool.poi;
 
-import cn.hutool.core.exceptions.DependencyException;
-import cn.hutool.core.classloader.ClassLoaderUtil;
+import org.dromara.hutool.core.exceptions.DependencyException;
+import org.dromara.hutool.core.classloader.ClassLoaderUtil;
 
 /**
  * POI引入检查器
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvBaseReader.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvBaseReader.java
index 3ef0ab710..fca166876
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvBaseReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvBaseReader.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.lang.func.SerConsumer;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.lang.func.SerConsumer;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import java.io.File;
 import java.io.Reader;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvConfig.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvConfig.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/csv/CsvConfig.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvConfig.java
index d5bb178d7..927756e10
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvConfig.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvConfig.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.util.CharUtil;
 
 import java.io.Serializable;
 import java.util.LinkedHashMap;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvData.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvData.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-poi/src/main/java/cn/hutool/poi/csv/CsvData.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvData.java
index f50a906a7..6df15d190
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvData.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvData.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.collection.ListUtil;
 
 import java.io.Serializable;
 import java.util.Iterator;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java
index 592c37fb8..6aed85cb0
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvParser.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.collection.iter.ComputeIter;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrTrimer;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.collection.iter.ComputeIter;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrTrimer;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReadConfig.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReadConfig.java
old mode 100755
new mode 100644
similarity index 99%
rename from hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReadConfig.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReadConfig.java
index 88d19ea06..7c7775ae4
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReadConfig.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReadConfig.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
 import java.io.Serializable;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReader.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReader.java
index fd521c8f3..e3779a434
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReader.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.func.SerConsumer;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.func.SerConsumer;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvRow.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvRow.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/csv/CsvRow.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvRow.java
index f31862a0a..3a9e75b3f
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvRow.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvRow.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
-import cn.hutool.core.lang.Assert;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.bean.copier.CopyOptions;
+import org.dromara.hutool.core.lang.Assert;
 
 import java.util.*;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvUtil.java
old mode 100755
new mode 100644
similarity index 99%
rename from hutool-poi/src/main/java/cn/hutool/poi/csv/CsvUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvUtil.java
index eb8f0136a..2db41df81
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
 import java.io.File;
 import java.io.Reader;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriteConfig.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriteConfig.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriteConfig.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriteConfig.java
index 05c31ce31..10295240f
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriteConfig.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriteConfig.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.util.CharUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java
index 4f14ff99e..81dd2c7c6
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/CsvWriter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java
@@ -10,21 +10,21 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.iter.ArrayIter;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.collection.iter.ArrayIter;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import java.io.*;
 import java.nio.charset.Charset;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/csv/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/package-info.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/csv/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/csv/package-info.java
index 7edbdd3b6..809d4f4e4
--- a/hutool-poi/src/main/java/cn/hutool/poi/csv/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/package-info.java
@@ -17,4 +17,4 @@
  * @author looly
  *
  */
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/BigExcelWriter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/BigExcelWriter.java
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/BigExcelWriter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/BigExcelWriter.java
index c78ba7801..9a0efe5bf 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/BigExcelWriter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/BigExcelWriter.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelBase.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelBase.java
similarity index 98%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelBase.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelBase.java
index d2d51f7fe..7fe759564 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelBase.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelBase.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.poi.excel.cell.CellLocation;
-import cn.hutool.poi.excel.cell.CellUtil;
-import cn.hutool.poi.excel.style.StyleUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.poi.excel.cell.CellLocation;
+import org.dromara.hutool.poi.excel.cell.CellUtil;
+import org.dromara.hutool.poi.excel.style.StyleUtil;
 import org.apache.poi.common.usermodel.HyperlinkType;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelDateUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelDateUtil.java
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelDateUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelDateUtil.java
index 1c73e2c0c..ee35d8ce4 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelDateUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelDateUtil.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.text.StrUtil;
 import org.apache.poi.ss.formula.ConditionalFormattingEvaluator;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.ExcelNumberFormat;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelExtractorUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelExtractorUtil.java
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelExtractorUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelExtractorUtil.java
index 74f0d2595..478582127 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelExtractorUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelExtractorUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.extractor.ExcelExtractor;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelFileUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelFileUtil.java
similarity index 96%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelFileUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelFileUtil.java
index 92ff93afc..f80beee46 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelFileUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelFileUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IORuntimeException;
 import org.apache.poi.poifs.filesystem.FileMagic;
 
 import java.io.File;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelPicUtil.java
similarity index 95%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelPicUtil.java
index 3d430b94b..b938bf0b8 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelPicUtil.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.multi.ListValueMap;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.map.multi.ListValueMap;
+import org.dromara.hutool.core.text.StrUtil;
 import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
 import org.apache.poi.hssf.usermodel.HSSFPicture;
 import org.apache.poi.hssf.usermodel.HSSFPictureData;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelReader.java
similarity index 96%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelReader.java
index 163b8b57d..3764fe0fe 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelReader.java
@@ -10,18 +10,18 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.lang.func.SerBiConsumer;
-import cn.hutool.poi.excel.cell.CellEditor;
-import cn.hutool.poi.excel.cell.CellUtil;
-import cn.hutool.poi.excel.reader.BeanSheetReader;
-import cn.hutool.poi.excel.reader.ColumnSheetReader;
-import cn.hutool.poi.excel.reader.ListSheetReader;
-import cn.hutool.poi.excel.reader.MapSheetReader;
-import cn.hutool.poi.excel.reader.SheetReader;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.lang.func.SerBiConsumer;
+import org.dromara.hutool.poi.excel.cell.CellEditor;
+import org.dromara.hutool.poi.excel.cell.CellUtil;
+import org.dromara.hutool.poi.excel.reader.BeanSheetReader;
+import org.dromara.hutool.poi.excel.reader.ColumnSheetReader;
+import org.dromara.hutool.poi.excel.reader.ListSheetReader;
+import org.dromara.hutool.poi.excel.reader.MapSheetReader;
+import org.dromara.hutool.poi.excel.reader.SheetReader;
 import org.apache.poi.ss.extractor.ExcelExtractor;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java
index 3fc888c8e..d3552cb62
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java
@@ -10,19 +10,19 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.exceptions.DependencyException;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.poi.PoiChecker;
-import cn.hutool.poi.excel.cell.CellLocation;
-import cn.hutool.poi.excel.sax.ExcelSaxReader;
-import cn.hutool.poi.excel.sax.ExcelSaxUtil;
-import cn.hutool.poi.excel.sax.handler.RowHandler;
+import org.dromara.hutool.core.exceptions.DependencyException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.poi.PoiChecker;
+import org.dromara.hutool.poi.excel.cell.CellLocation;
+import org.dromara.hutool.poi.excel.sax.ExcelSaxReader;
+import org.dromara.hutool.poi.excel.sax.ExcelSaxUtil;
+import org.dromara.hutool.poi.excel.sax.handler.RowHandler;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java
index d3df43cfd..ff9d456c1
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java
@@ -10,28 +10,28 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.comparator.IndexedComparator;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.lang.id.IdUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.map.SafeConcurrentHashMap;
-import cn.hutool.core.map.TableMap;
-import cn.hutool.core.map.multi.RowKeyTable;
-import cn.hutool.core.map.multi.Table;
-import cn.hutool.core.net.url.URLEncoder;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.poi.excel.cell.CellEditor;
-import cn.hutool.poi.excel.cell.CellLocation;
-import cn.hutool.poi.excel.cell.CellUtil;
-import cn.hutool.poi.excel.style.Align;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.comparator.IndexedComparator;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.lang.id.IdUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.map.SafeConcurrentHashMap;
+import org.dromara.hutool.core.map.TableMap;
+import org.dromara.hutool.core.map.multi.RowKeyTable;
+import org.dromara.hutool.core.map.multi.Table;
+import org.dromara.hutool.core.net.url.URLEncoder;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.poi.excel.cell.CellEditor;
+import org.dromara.hutool.poi.excel.cell.CellLocation;
+import org.dromara.hutool.poi.excel.cell.CellUtil;
+import org.dromara.hutool.poi.excel.style.Align;
 import org.apache.poi.common.usermodel.Hyperlink;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -1209,7 +1209,7 @@ public class ExcelWriter extends ExcelBase {
 	/**
 	 * 对数据行整行加自定义样式 仅对数据单元格设置 write后调用
 	 * 
      
-	 * {@link cn.hutool.poi.excel.ExcelWriter#setRowStyle(int, org.apache.poi.ss.usermodel.CellStyle)}
+	 * {@link ExcelWriter#setRowStyle(int, org.apache.poi.ss.usermodel.CellStyle)}
 	 * 这个方法加的样式会使整行没有数据的单元格也有样式
 	 * 特别是加背景色时很不美观 且有数据的单元格样式会被StyleSet中的样式覆盖掉
 	 *
@@ -1245,7 +1245,7 @@ public class ExcelWriter extends ExcelBase {
 	/**
 	 * 设置整个列的样式 仅对数据单元格设置 write后调用
 	 * 
      
-	 * {@link cn.hutool.poi.excel.ExcelWriter#setColumnStyle(int, org.apache.poi.ss.usermodel.CellStyle)}
+	 * {@link ExcelWriter#setColumnStyle(int, org.apache.poi.ss.usermodel.CellStyle)}
 	 * 这个方法加的样式会使整列没有数据的单元格也有样式
 	 * 特别是加背景色时很不美观 且有数据的单元格样式会被StyleSet中的样式覆盖掉
 	 *
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/RowUtil.java
similarity index 96%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/RowUtil.java
index 73b939c42..a1f06c0f8 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/RowUtil.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.poi.excel.cell.CellEditor;
-import cn.hutool.poi.excel.cell.CellUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.poi.excel.cell.CellEditor;
+import org.dromara.hutool.poi.excel.cell.CellUtil;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/StyleSet.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/StyleSet.java
similarity index 98%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/StyleSet.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/StyleSet.java
index 7d352a84a..36c9fee08 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/StyleSet.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/StyleSet.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.poi.excel.style.StyleUtil;
+import org.dromara.hutool.poi.excel.style.StyleUtil;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.CellStyle;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/WorkbookUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/WorkbookUtil.java
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/WorkbookUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/WorkbookUtil.java
index 11bdde896..31b073de9 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/WorkbookUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/WorkbookUtil.java
@@ -11,13 +11,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.poi.exceptions.POIException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.poi.exceptions.POIException;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellEditor.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellEditor.java
similarity index 96%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellEditor.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellEditor.java
index 573f324f6..57927ab3c 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellEditor.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellEditor.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell;
+package org.dromara.hutool.poi.excel.cell;
 
 import org.apache.poi.ss.usermodel.Cell;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellLocation.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellLocation.java
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellLocation.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellLocation.java
index 59ad240ed..16f2effbe 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellLocation.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellLocation.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell;
+package org.dromara.hutool.poi.excel.cell;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellSetter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellSetter.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellSetter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellSetter.java
index 7aa4929c8..c6c567a98
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellSetter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellSetter.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell;
+package org.dromara.hutool.poi.excel.cell;
 
 import org.apache.poi.ss.usermodel.Cell;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellUtil.java
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellUtil.java
index c00cdaf6c..05678071d 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellUtil.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell;
+package org.dromara.hutool.poi.excel.cell;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.poi.excel.ExcelUtil;
-import cn.hutool.poi.excel.StyleSet;
-import cn.hutool.poi.excel.cell.editors.TrimEditor;
-import cn.hutool.poi.excel.cell.setters.CellSetterFactory;
-import cn.hutool.poi.excel.cell.values.ErrorCellValue;
-import cn.hutool.poi.excel.cell.values.NumericCellValue;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.poi.excel.ExcelUtil;
+import org.dromara.hutool.poi.excel.StyleSet;
+import org.dromara.hutool.poi.excel.cell.editors.TrimEditor;
+import org.dromara.hutool.poi.excel.cell.setters.CellSetterFactory;
+import org.dromara.hutool.poi.excel.cell.values.ErrorCellValue;
+import org.dromara.hutool.poi.excel.cell.values.NumericCellValue;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.RegionUtil;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellValue.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellValue.java
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellValue.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellValue.java
index 481d1a63b..8fb89d760 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellValue.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellValue.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell;
+package org.dromara.hutool.poi.excel.cell;
 
 /**
  * 抽象的单元格值接口，用于判断不同类型的单元格值
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/NullCell.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/NullCell.java
similarity index 99%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/NullCell.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/NullCell.java
index d5c3bf74d..6692000d1 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/NullCell.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/NullCell.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell;
+package org.dromara.hutool.poi.excel.cell;
 
 import org.apache.poi.ss.formula.FormulaParseException;
 import org.apache.poi.ss.usermodel.Cell;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/NumericToIntEditor.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/NumericToIntEditor.java
similarity index 89%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/NumericToIntEditor.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/NumericToIntEditor.java
index 0d94a6d3c..2a77f71cb 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/NumericToIntEditor.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/NumericToIntEditor.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.editors;
+package org.dromara.hutool.poi.excel.cell.editors;
 
 import org.apache.poi.ss.usermodel.Cell;
 
-import cn.hutool.poi.excel.cell.CellEditor;
+import org.dromara.hutool.poi.excel.cell.CellEditor;
 
 /**
  * POI中NUMRIC类型的值默认返回的是Double类型，此编辑器用于转换其为int型
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/TrimEditor.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/TrimEditor.java
similarity index 85%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/TrimEditor.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/TrimEditor.java
index dca7c42d8..a7960e85b 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/TrimEditor.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/TrimEditor.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.editors;
+package org.dromara.hutool.poi.excel.cell.editors;
 
 import org.apache.poi.ss.usermodel.Cell;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.poi.excel.cell.CellEditor;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.poi.excel.cell.CellEditor;
 
 /**
  * 去除String类型的单元格值两边的空格
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/package-info.java
similarity index 92%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/package-info.java
index a81d0e22d..d41bd42b1 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/editors/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author looly
  */
-package cn.hutool.poi.excel.cell.editors;
+package org.dromara.hutool.poi.excel.cell.editors;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/package-info.java
similarity index 93%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/package-info.java
index ee2c183bb..34dce69bf 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/package-info.java
@@ -15,4 +15,4 @@
  * @author looly
  *
  */
-package cn.hutool.poi.excel.cell;
+package org.dromara.hutool.poi.excel.cell;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/BooleanCellSetter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/BooleanCellSetter.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/BooleanCellSetter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/BooleanCellSetter.java
index b87718e40..c7ac18b66
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/BooleanCellSetter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/BooleanCellSetter.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.setters;
+package org.dromara.hutool.poi.excel.cell.setters;
 
-import cn.hutool.poi.excel.cell.CellSetter;
+import org.dromara.hutool.poi.excel.cell.CellSetter;
 import org.apache.poi.ss.usermodel.Cell;
 
 /**
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/CalendarCellSetter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CalendarCellSetter.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/CalendarCellSetter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CalendarCellSetter.java
index ced4a7c5f..0d0e8c0bd
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/CalendarCellSetter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CalendarCellSetter.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.setters;
+package org.dromara.hutool.poi.excel.cell.setters;
 
-import cn.hutool.poi.excel.cell.CellSetter;
+import org.dromara.hutool.poi.excel.cell.CellSetter;
 import org.apache.poi.ss.usermodel.Cell;
 
 import java.util.Calendar;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/CellSetterFactory.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CellSetterFactory.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/CellSetterFactory.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CellSetterFactory.java
index d65ad8b4c..6b7b618b0
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/CellSetterFactory.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CellSetterFactory.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.setters;
+package org.dromara.hutool.poi.excel.cell.setters;
 
-import cn.hutool.poi.excel.cell.CellSetter;
+import org.dromara.hutool.poi.excel.cell.CellSetter;
 import org.apache.poi.ss.usermodel.Hyperlink;
 import org.apache.poi.ss.usermodel.RichTextString;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/CharSequenceCellSetter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CharSequenceCellSetter.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/CharSequenceCellSetter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CharSequenceCellSetter.java
index d0085d8fc..46916fb4e
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/CharSequenceCellSetter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CharSequenceCellSetter.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.setters;
+package org.dromara.hutool.poi.excel.cell.setters;
 
-import cn.hutool.poi.excel.cell.CellSetter;
+import org.dromara.hutool.poi.excel.cell.CellSetter;
 import org.apache.poi.ss.usermodel.Cell;
 
 /**
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/DateCellSetter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/DateCellSetter.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/DateCellSetter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/DateCellSetter.java
index 121f68bde..553f8c00c
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/DateCellSetter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/DateCellSetter.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.setters;
+package org.dromara.hutool.poi.excel.cell.setters;
 
-import cn.hutool.poi.excel.cell.CellSetter;
+import org.dromara.hutool.poi.excel.cell.CellSetter;
 import org.apache.poi.ss.usermodel.Cell;
 
 import java.util.Date;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java
index ef77d39f4..f495aa388
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.setters;
+package org.dromara.hutool.poi.excel.cell.setters;
 
-import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.util.regex.Pattern;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/HyperlinkCellSetter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/HyperlinkCellSetter.java
similarity index 91%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/HyperlinkCellSetter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/HyperlinkCellSetter.java
index 35e15e7b2..97823a57d 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/HyperlinkCellSetter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/HyperlinkCellSetter.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.setters;
+package org.dromara.hutool.poi.excel.cell.setters;
 
-import cn.hutool.poi.excel.cell.CellSetter;
+import org.dromara.hutool.poi.excel.cell.CellSetter;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Hyperlink;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/NullCellSetter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/NullCellSetter.java
old mode 100755
new mode 100644
similarity index 85%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/NullCellSetter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/NullCellSetter.java
index bda3d1ed8..a4f174bca
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/NullCellSetter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/NullCellSetter.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.setters;
+package org.dromara.hutool.poi.excel.cell.setters;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.poi.excel.cell.CellSetter;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.poi.excel.cell.CellSetter;
 import org.apache.poi.ss.usermodel.Cell;
 
 /**
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/NumberCellSetter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/NumberCellSetter.java
old mode 100755
new mode 100644
similarity index 87%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/NumberCellSetter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/NumberCellSetter.java
index ca72a41ae..37b8f33aa
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/NumberCellSetter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/NumberCellSetter.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.setters;
+package org.dromara.hutool.poi.excel.cell.setters;
 
-import cn.hutool.core.math.NumberUtil;
-import cn.hutool.poi.excel.cell.CellSetter;
+import org.dromara.hutool.core.math.NumberUtil;
+import org.dromara.hutool.poi.excel.cell.CellSetter;
 import org.apache.poi.ss.usermodel.Cell;
 
 /**
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/RichTextCellSetter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/RichTextCellSetter.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/RichTextCellSetter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/RichTextCellSetter.java
index a67a1bc4d..074337b1a
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/RichTextCellSetter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/RichTextCellSetter.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.setters;
+package org.dromara.hutool.poi.excel.cell.setters;
 
-import cn.hutool.poi.excel.cell.CellSetter;
+import org.dromara.hutool.poi.excel.cell.CellSetter;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.RichTextString;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/TemporalAccessorCellSetter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/TemporalAccessorCellSetter.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/TemporalAccessorCellSetter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/TemporalAccessorCellSetter.java
index 0244bedf3..efc2da6e0
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/TemporalAccessorCellSetter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/TemporalAccessorCellSetter.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.setters;
+package org.dromara.hutool.poi.excel.cell.setters;
 
-import cn.hutool.poi.excel.cell.CellSetter;
+import org.dromara.hutool.poi.excel.cell.CellSetter;
 import org.apache.poi.ss.usermodel.Cell;
 
 import java.time.Instant;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/package-info.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/package-info.java
index 477c618e6..274832e97
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author looly
  */
-package cn.hutool.poi.excel.cell.setters;
+package org.dromara.hutool.poi.excel.cell.setters;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/ErrorCellValue.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/ErrorCellValue.java
old mode 100755
new mode 100644
similarity index 88%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/ErrorCellValue.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/ErrorCellValue.java
index ad32687ab..a60a55319
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/ErrorCellValue.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/ErrorCellValue.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.values;
+package org.dromara.hutool.poi.excel.cell.values;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.poi.excel.cell.CellValue;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.poi.excel.cell.CellValue;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.FormulaError;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/FormulaCellValue.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/FormulaCellValue.java
similarity index 91%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/FormulaCellValue.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/FormulaCellValue.java
index a7fbdcea6..53119e25e 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/FormulaCellValue.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/FormulaCellValue.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.values;
+package org.dromara.hutool.poi.excel.cell.values;
 
-import cn.hutool.poi.excel.cell.CellSetter;
-import cn.hutool.poi.excel.cell.CellValue;
+import org.dromara.hutool.poi.excel.cell.CellSetter;
+import org.dromara.hutool.poi.excel.cell.CellValue;
 import org.apache.poi.ss.usermodel.Cell;
 
 /**
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/NumericCellValue.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/NumericCellValue.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/NumericCellValue.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/NumericCellValue.java
index 7e284aa1e..ad824f60c
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/NumericCellValue.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/NumericCellValue.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.cell.values;
+package org.dromara.hutool.poi.excel.cell.values;
 
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.poi.excel.ExcelDateUtil;
-import cn.hutool.poi.excel.cell.CellValue;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.poi.excel.ExcelDateUtil;
+import org.dromara.hutool.poi.excel.cell.CellValue;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.util.NumberToTextConverter;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/package-info.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/package-info.java
index 5038a5b12..76629d723
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author looly
  */
-package cn.hutool.poi.excel.cell.values;
+package org.dromara.hutool.poi.excel.cell.values;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/package-info.java
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/package-info.java
index b3f305258..5def5e44f 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/AbstractSheetReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/AbstractSheetReader.java
similarity index 93%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/reader/AbstractSheetReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/AbstractSheetReader.java
index 6697f7dce..d8d01fcb0 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/AbstractSheetReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/AbstractSheetReader.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.reader;
+package org.dromara.hutool.poi.excel.reader;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.poi.excel.ExcelUtil;
-import cn.hutool.poi.excel.RowUtil;
-import cn.hutool.poi.excel.cell.CellEditor;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.poi.excel.ExcelUtil;
+import org.dromara.hutool.poi.excel.RowUtil;
+import org.dromara.hutool.poi.excel.cell.CellEditor;
 import org.apache.poi.ss.usermodel.Sheet;
 
 import java.util.ArrayList;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/BeanSheetReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/BeanSheetReader.java
similarity index 93%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/reader/BeanSheetReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/BeanSheetReader.java
index cc972b1e0..f4f4d8b66 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/BeanSheetReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/BeanSheetReader.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.reader;
+package org.dromara.hutool.poi.excel.reader;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
-import cn.hutool.poi.excel.cell.CellEditor;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.bean.copier.CopyOptions;
+import org.dromara.hutool.poi.excel.cell.CellEditor;
 import org.apache.poi.ss.usermodel.Sheet;
 
 import java.util.ArrayList;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/ColumnSheetReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ColumnSheetReader.java
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/reader/ColumnSheetReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ColumnSheetReader.java
index b64362096..777dc0105 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/ColumnSheetReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ColumnSheetReader.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.reader;
+package org.dromara.hutool.poi.excel.reader;
 
-import cn.hutool.poi.excel.cell.CellUtil;
+import org.dromara.hutool.poi.excel.cell.CellUtil;
 import org.apache.poi.ss.usermodel.Sheet;
 
 import java.util.ArrayList;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/ListSheetReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ListSheetReader.java
similarity index 93%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/reader/ListSheetReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ListSheetReader.java
index 26820e7e9..ac7502042 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/ListSheetReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ListSheetReader.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.reader;
+package org.dromara.hutool.poi.excel.reader;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.convert.Convert;
 import org.apache.poi.ss.usermodel.Sheet;
 
 import java.util.ArrayList;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/MapSheetReader.java
similarity index 91%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/MapSheetReader.java
index 6250c8153..1b0d7028a 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/MapSheetReader.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.reader;
+package org.dromara.hutool.poi.excel.reader;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.iter.IterUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.collection.iter.IterUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.text.StrUtil;
 import org.apache.poi.ss.usermodel.Sheet;
 
 import java.util.ArrayList;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/SheetReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/SheetReader.java
similarity index 95%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/reader/SheetReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/SheetReader.java
index f77714cf2..03871a92e 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/SheetReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/SheetReader.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.reader;
+package org.dromara.hutool.poi.excel.reader;
 
 import org.apache.poi.ss.usermodel.Sheet;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/package-info.java
similarity index 93%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/reader/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/package-info.java
index 8646aacac..1c2c0116e 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.poi.excel.reader;
+package org.dromara.hutool.poi.excel.reader;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/AttributeName.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/AttributeName.java
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/AttributeName.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/AttributeName.java
index 3c3b22533..0ba3242b7 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/AttributeName.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/AttributeName.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax;
+package org.dromara.hutool.poi.excel.sax;
 
 import org.xml.sax.Attributes;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/CellDataType.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/CellDataType.java
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/CellDataType.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/CellDataType.java
index 1e8e5c02e..9413283c9 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/CellDataType.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/CellDataType.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax;
+package org.dromara.hutool.poi.excel.sax;
 
 /**
  * 单元格数据类型枚举
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ElementName.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ElementName.java
similarity index 96%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ElementName.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ElementName.java
index 01b8c7ac2..b4045398d 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ElementName.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ElementName.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax;
+package org.dromara.hutool.poi.excel.sax;
 
 /**
  * 标签名枚举
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/Excel03SaxReader.java
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/Excel03SaxReader.java
index f006fddae..34e52569a 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/Excel03SaxReader.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax;
+package org.dromara.hutool.poi.excel.sax;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.poi.excel.sax.handler.RowHandler;
-import cn.hutool.poi.exceptions.POIException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.poi.excel.sax.handler.RowHandler;
+import org.dromara.hutool.poi.exceptions.POIException;
 import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener;
 import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener;
 import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel07SaxReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/Excel07SaxReader.java
similarity index 95%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel07SaxReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/Excel07SaxReader.java
index f1717c8a5..61a532855 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel07SaxReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/Excel07SaxReader.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax;
+package org.dromara.hutool.poi.excel.sax;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.reflect.MethodUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.poi.excel.sax.handler.RowHandler;
-import cn.hutool.poi.exceptions.POIException;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.reflect.MethodUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.poi.excel.sax.handler.RowHandler;
+import org.dromara.hutool.poi.exceptions.POIException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
 import org.apache.poi.openxml4j.opc.OPCPackage;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ExcelSaxReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxReader.java
similarity index 96%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ExcelSaxReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxReader.java
index 3411c16b2..8bb92cb12 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ExcelSaxReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxReader.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax;
+package org.dromara.hutool.poi.excel.sax;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.poi.exceptions.POIException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.poi.exceptions.POIException;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ExcelSaxUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ExcelSaxUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java
index 7df9b1143..d6b2359a1 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/ExcelSaxUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java
@@ -10,18 +10,18 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax;
+package org.dromara.hutool.poi.excel.sax;
 
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.exceptions.DependencyException;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.poi.excel.ExcelDateUtil;
-import cn.hutool.poi.excel.sax.handler.RowHandler;
-import cn.hutool.poi.exceptions.POIException;
+import org.dromara.hutool.core.date.DateTime;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.exceptions.DependencyException;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.poi.excel.ExcelDateUtil;
+import org.dromara.hutool.poi.excel.sax.handler.RowHandler;
+import org.dromara.hutool.poi.exceptions.POIException;
 import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener;
 import org.apache.poi.hssf.record.CellValueRecordInterface;
 import org.apache.poi.ss.usermodel.DataFormatter;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetDataSaxHandler.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetDataSaxHandler.java
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetDataSaxHandler.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetDataSaxHandler.java
index 76fbf958a..9e783a0d4 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetDataSaxHandler.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetDataSaxHandler.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax;
+package org.dromara.hutool.poi.excel.sax;
 
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.poi.excel.cell.values.FormulaCellValue;
-import cn.hutool.poi.excel.sax.handler.RowHandler;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.poi.excel.cell.values.FormulaCellValue;
+import org.dromara.hutool.poi.excel.sax.handler.RowHandler;
 import org.apache.poi.ss.usermodel.BuiltinFormats;
 import org.apache.poi.xssf.model.SharedStrings;
 import org.apache.poi.xssf.model.StylesTable;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetRidReader.java
similarity index 93%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetRidReader.java
index 692c4ba79..4c13480a9 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetRidReader.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax;
+package org.dromara.hutool.poi.excel.sax;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.poi.exceptions.POIException;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.poi.exceptions.POIException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.xssf.eventusermodel.XSSFReader;
 import org.xml.sax.Attributes;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/AbstractRowHandler.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/AbstractRowHandler.java
similarity index 95%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/AbstractRowHandler.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/AbstractRowHandler.java
index 956d1b58c..dab9e72d1 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/AbstractRowHandler.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/AbstractRowHandler.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax.handler;
+package org.dromara.hutool.poi.excel.sax.handler;
 
-import cn.hutool.core.lang.Assert;
+import org.dromara.hutool.core.lang.Assert;
 
 import java.util.List;
 import java.util.function.Function;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/BeanRowHandler.java
similarity index 86%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/BeanRowHandler.java
index 8e00137ce..86c4f42eb 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/BeanRowHandler.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax.handler;
+package org.dromara.hutool.poi.excel.sax.handler;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.iter.IterUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.Assert;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.collection.iter.IterUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.lang.Assert;
 
 import java.util.List;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/MapRowHandler.java
similarity index 89%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/MapRowHandler.java
index d8540e0c2..240d07ca3 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/MapRowHandler.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax.handler;
+package org.dromara.hutool.poi.excel.sax.handler;
 
-import cn.hutool.core.collection.iter.IterUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.convert.Convert;
+import org.dromara.hutool.core.collection.iter.IterUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.convert.Convert;
 
 import java.util.List;
 import java.util.Map;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/RowHandler.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/RowHandler.java
similarity index 96%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/RowHandler.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/RowHandler.java
index a6b9092da..d2f4d8060 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/RowHandler.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/RowHandler.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.sax.handler;
+package org.dromara.hutool.poi.excel.sax.handler;
 
 import org.apache.poi.ss.usermodel.CellStyle;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/package-info.java
similarity index 92%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/package-info.java
index 2eedcea95..301e90121 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.poi.excel.sax.handler;
+package org.dromara.hutool.poi.excel.sax.handler;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/package-info.java
similarity index 93%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/sax/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/package-info.java
index 70f6e765b..6f8edc2be 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.poi.excel.sax;
+package org.dromara.hutool.poi.excel.sax;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/style/Align.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/Align.java
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/style/Align.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/Align.java
index a977373f3..0a67b354a 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/style/Align.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/Align.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.style;
+package org.dromara.hutool.poi.excel.style;
 
 /**
  * 对齐方式枚举
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/style/StyleUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/StyleUtil.java
similarity index 98%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/style/StyleUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/StyleUtil.java
index 1800c680b..d1580833f 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/style/StyleUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/StyleUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.excel.style;
+package org.dromara.hutool.poi.excel.style;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/style/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/package-info.java
similarity index 93%
rename from hutool-poi/src/main/java/cn/hutool/poi/excel/style/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/package-info.java
index 648f08800..8dc68a3ca 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/style/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.poi.excel.style;
+package org.dromara.hutool.poi.excel.style;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/exceptions/POIException.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/exceptions/POIException.java
similarity index 91%
rename from hutool-poi/src/main/java/cn/hutool/poi/exceptions/POIException.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/exceptions/POIException.java
index a1cc5e948..d8ef40e06 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/exceptions/POIException.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/exceptions/POIException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.exceptions;
+package org.dromara.hutool.poi.exceptions;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * POI异常
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/exceptions/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/exceptions/package-info.java
similarity index 93%
rename from hutool-poi/src/main/java/cn/hutool/poi/exceptions/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/exceptions/package-info.java
index 8411c9b3a..7b21cb9f7 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/exceptions/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/exceptions/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.poi.exceptions;
+package org.dromara.hutool.poi.exceptions;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/ofd/OfdWriter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/OfdWriter.java
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/ofd/OfdWriter.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/OfdWriter.java
index 517a93cbb..cd84aa88b 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/ofd/OfdWriter.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/OfdWriter.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.ofd;
+package org.dromara.hutool.poi.ofd;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.PathUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.PathUtil;
 import org.ofdrw.font.Font;
 import org.ofdrw.layout.OFDDoc;
 import org.ofdrw.layout.edit.Annotation;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/ofd/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/package-info.java
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/ofd/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/package-info.java
index 427e2a5d6..829ae93a9 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/ofd/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/package-info.java
@@ -15,4 +15,4 @@
  *
  * @author looly
  */
-package cn.hutool.poi.ofd;
+package org.dromara.hutool.poi.ofd;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/package-info.java
similarity index 96%
rename from hutool-poi/src/main/java/cn/hutool/poi/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/package-info.java
index b2a18f900..f44c13313 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/package-info.java
@@ -18,4 +18,4 @@
  * @author looly
  *
  */
-package cn.hutool.poi;
+package org.dromara.hutool.poi;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/word/DocUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/word/DocUtil.java
similarity index 87%
rename from hutool-poi/src/main/java/cn/hutool/poi/word/DocUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/word/DocUtil.java
index 8732769ca..ced80b4c6 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/word/DocUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/word/DocUtil.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.word;
+package org.dromara.hutool.poi.word;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.poi.exceptions.POIException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.poi.exceptions.POIException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/word/PicType.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/word/PicType.java
similarity index 97%
rename from hutool-poi/src/main/java/cn/hutool/poi/word/PicType.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/word/PicType.java
index 799a86227..cb38dce6c 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/word/PicType.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/word/PicType.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.word;
+package org.dromara.hutool.poi.word;
 
 import org.apache.poi.xwpf.usermodel.Document;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/word/TableUtil.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/word/TableUtil.java
index acc9d3e78..602939075
--- a/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/word/TableUtil.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.word;
+package org.dromara.hutool.poi.word;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.collection.iter.IterUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.collection.iter.IterUtil;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.map.MapUtil;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFTable;
 import org.apache.poi.xwpf.usermodel.XWPFTableCell;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/word/Word07Writer.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/word/Word07Writer.java
similarity index 95%
rename from hutool-poi/src/main/java/cn/hutool/poi/word/Word07Writer.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/word/Word07Writer.java
index 22e082fff..a4e7cc4c0 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/word/Word07Writer.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/word/Word07Writer.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.word;
+package org.dromara.hutool.poi.word;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileNameUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.poi.exceptions.POIException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileNameUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.poi.exceptions.POIException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.util.Units;
 import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/word/WordUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/word/WordUtil.java
similarity index 96%
rename from hutool-poi/src/main/java/cn/hutool/poi/word/WordUtil.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/word/WordUtil.java
index 6e67072be..23a8818d6 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/word/WordUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/word/WordUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.poi.word;
+package org.dromara.hutool.poi.word;
 
 import java.io.File;
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/word/package-info.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/word/package-info.java
similarity index 94%
rename from hutool-poi/src/main/java/cn/hutool/poi/word/package-info.java
rename to hutool-poi/src/main/java/org/dromara/hutool/poi/word/package-info.java
index 6c18174f4..b762e10d0 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/word/package-info.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/word/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.poi.word;
+package org.dromara.hutool.poi.word;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvParserTest.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvParserTest.java
index fb00a5f60..3f05f149d
--- a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvParserTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.text.StrUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvReaderTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvReaderTest.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-poi/src/test/java/cn/hutool/poi/csv/CsvReaderTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvReaderTest.java
index 3b3ab0d10..557c78c83
--- a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvReaderTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvReaderTest.java
@@ -1,11 +1,11 @@
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.annotation.Alias;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.annotation.Alias;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.util.CharsetUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvUtilTest.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvUtilTest.java
index 36146332b..21665ea0a
--- a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvUtilTest.java
@@ -1,10 +1,10 @@
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.util.CharsetUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvWriterTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvWriterTest.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-poi/src/test/java/cn/hutool/poi/csv/CsvWriterTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvWriterTest.java
index 273c63253..5fa489f9b
--- a/hutool-poi/src/test/java/cn/hutool/poi/csv/CsvWriterTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvWriterTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.util.CharsetUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/csv/Issue2783Test.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Issue2783Test.java
old mode 100755
new mode 100644
similarity index 74%
rename from hutool-poi/src/test/java/cn/hutool/poi/csv/Issue2783Test.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Issue2783Test.java
index 5884a26e2..802137f11
--- a/hutool-poi/src/test/java/cn/hutool/poi/csv/Issue2783Test.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Issue2783Test.java
@@ -1,8 +1,8 @@
-package cn.hutool.poi.csv;
+package org.dromara.hutool.poi.csv;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.func.SerConsumer;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.func.SerConsumer;
+import org.dromara.hutool.core.util.CharsetUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/BigExcelWriteTest.java
similarity index 93%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/BigExcelWriteTest.java
index fba44c135..8929a8335 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/BigExcelWriteTest.java
@@ -1,11 +1,11 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.poi.excel.style.StyleUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.poi.excel.style.StyleUtil;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.Font;
@@ -155,21 +155,21 @@ public class BigExcelWriteTest {
 	@Test
 	@Disabled
 	public void writeBeanTest() {
-		final cn.hutool.poi.excel.TestBean bean1 = new cn.hutool.poi.excel.TestBean();
+		final TestBean bean1 = new TestBean();
 		bean1.setName("张三");
 		bean1.setAge(22);
 		bean1.setPass(true);
 		bean1.setScore(66.30);
 		bean1.setExamDate(DateUtil.now());
 
-		final cn.hutool.poi.excel.TestBean bean2 = new cn.hutool.poi.excel.TestBean();
+		final TestBean bean2 = new TestBean();
 		bean2.setName("李四");
 		bean2.setAge(28);
 		bean2.setPass(false);
 		bean2.setScore(38.50);
 		bean2.setExamDate(DateUtil.now());
 
-		final List rows = ListUtil.of(bean1, bean2);
+		final List rows = ListUtil.of(bean1, bean2);
 		// 通过工具类创建writer
 		final String file = "e:/bigWriteBeanTest.xlsx";
 		FileUtil.del(FileUtil.file(file));
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/CellEditorTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/CellEditorTest.java
similarity index 93%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/CellEditorTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/CellEditorTest.java
index 34aeb0579..14ab25434 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/CellEditorTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/CellEditorTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.poi.excel.cell.CellEditor;
+import org.dromara.hutool.poi.excel.cell.CellEditor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.poi.ss.usermodel.Cell;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/CellUtilTest.java
old mode 100755
new mode 100644
similarity index 80%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/CellUtilTest.java
index 725595826..698f38486
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/CellUtilTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.lang.Console;
+import org.dromara.hutool.core.lang.Console;
 import org.apache.poi.ss.usermodel.BuiltinFormats;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelFileUtilTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelFileUtilTest.java
old mode 100755
new mode 100644
similarity index 83%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelFileUtilTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelFileUtilTest.java
index ca82d0483..580625463
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelFileUtilTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelFileUtilTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IoUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelReadTest.java
similarity index 96%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelReadTest.java
index 1ed59afca..eb98dd6bd 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelReadTest.java
@@ -1,10 +1,10 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.lang.func.SerBiConsumer;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.lang.func.SerBiConsumer;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 import lombok.Data;
 import org.apache.poi.ss.usermodel.Cell;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelSaxReadTest.java
similarity index 92%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelSaxReadTest.java
index fccd769cb..14d83d116 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelSaxReadTest.java
@@ -1,15 +1,15 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.poi.excel.cell.values.FormulaCellValue;
-import cn.hutool.poi.excel.sax.Excel03SaxReader;
-import cn.hutool.poi.excel.sax.handler.RowHandler;
-import cn.hutool.poi.exceptions.POIException;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.poi.excel.cell.values.FormulaCellValue;
+import org.dromara.hutool.poi.excel.sax.Excel03SaxReader;
+import org.dromara.hutool.poi.excel.sax.handler.RowHandler;
+import org.dromara.hutool.poi.exceptions.POIException;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelUtilTest.java
similarity index 95%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelUtilTest.java
index 555b3508c..dffdc4091 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelUtilTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.poi.excel.cell.CellLocation;
+import org.dromara.hutool.poi.excel.cell.CellLocation;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelWriteTest.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelWriteTest.java
index f2add1ad3..e7c856fc4
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelWriteTest.java
@@ -1,15 +1,15 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.lang.id.IdUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.poi.excel.cell.setters.EscapeStrCellSetter;
-import cn.hutool.poi.excel.style.StyleUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.lang.id.IdUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.poi.excel.cell.setters.EscapeStrCellSetter;
+import org.dromara.hutool.poi.excel.style.StyleUtil;
 import org.apache.poi.common.usermodel.HyperlinkType;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddressList;
@@ -428,21 +428,21 @@ public class ExcelWriteTest {
 	@Test
 	@Disabled
 	public void writeBeanTest() {
-		final cn.hutool.poi.excel.TestBean bean1 = new cn.hutool.poi.excel.TestBean();
+		final TestBean bean1 = new TestBean();
 		bean1.setName("张三");
 		bean1.setAge(22);
 		bean1.setPass(true);
 		bean1.setScore(66.30);
 		bean1.setExamDate(DateUtil.now());
 
-		final cn.hutool.poi.excel.TestBean bean2 = new cn.hutool.poi.excel.TestBean();
+		final TestBean bean2 = new TestBean();
 		bean2.setName("李四");
 		bean2.setAge(28);
 		bean2.setPass(false);
 		bean2.setScore(38.50);
 		bean2.setExamDate(DateUtil.now());
 
-		final List rows = ListUtil.of(bean1, bean2);
+		final List rows = ListUtil.of(bean1, bean2);
 		// 通过工具类创建writer
 		final String file = "e:/writeBeanTest.xlsx";
 		FileUtil.del(FileUtil.file(file));
@@ -464,17 +464,17 @@ public class ExcelWriteTest {
 	@Test
 	@Disabled
 	public void writeBeanTest2() {
-		final cn.hutool.poi.excel.OrderExcel order1 = new cn.hutool.poi.excel.OrderExcel();
+		final OrderExcel order1 = new OrderExcel();
 		order1.setId("1");
 		order1.setNum("123");
 		order1.setBody("body1");
 
-		final cn.hutool.poi.excel.OrderExcel order2 = new cn.hutool.poi.excel.OrderExcel();
+		final OrderExcel order2 = new OrderExcel();
 		order1.setId("2");
 		order1.setNum("456");
 		order1.setBody("body2");
 
-		final List rows = ListUtil.of(order1, order2);
+		final List rows = ListUtil.of(order1, order2);
 		// 通过工具类创建writer
 		final String file = "f:/test/writeBeanTest2.xlsx";
 		FileUtil.del(FileUtil.file(file));
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue1729Test.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue1729Test.java
similarity index 95%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/Issue1729Test.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue1729Test.java
index 88b26ac98..e35c741f9 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue1729Test.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue1729Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue2221Test.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue2221Test.java
index 985725bb5..5ce46ce2e
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue2221Test.java
@@ -1,8 +1,8 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.poi.excel.style.StyleUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.poi.excel.style.StyleUtil;
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.IndexedColors;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2307Test.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue2307Test.java
similarity index 93%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2307Test.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue2307Test.java
index a52cd733a..53b0fa856 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2307Test.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue2307Test.java
@@ -1,7 +1,7 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI53OSTTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI53OSTTest.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI53OSTTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI53OSTTest.java
index 9d8987241..5239ad557
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI53OSTTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI53OSTTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.lang.Console;
+import org.dromara.hutool.core.lang.Console;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI5Q1TWTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI5Q1TWTest.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI5Q1TWTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI5Q1TWTest.java
index 09e4dd91e..d6e194dd9
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI5Q1TWTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI5Q1TWTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI5U1JATest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI5U1JATest.java
old mode 100755
new mode 100644
similarity index 87%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI5U1JATest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI5U1JATest.java
index 6606aad11..1c6e7fa00
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI5U1JATest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI5U1JATest.java
@@ -1,4 +1,4 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI66Z6BTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI66Z6BTest.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI66Z6BTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI66Z6BTest.java
index c9cbdd382..6ab50a578
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI66Z6BTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI66Z6BTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6MBS5Test.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI6MBS5Test.java
similarity index 94%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6MBS5Test.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI6MBS5Test.java
index 3327b1187..3ba626d68 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6MBS5Test.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI6MBS5Test.java
@@ -1,6 +1,6 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.poi.excel.cell.CellUtil;
+import org.dromara.hutool.poi.excel.cell.CellUtil;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/NumericCellValueTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/NumericCellValueTest.java
similarity index 88%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/NumericCellValueTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/NumericCellValueTest.java
index 691f1ade0..dee7f8037 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/NumericCellValueTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/NumericCellValueTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
-import cn.hutool.poi.excel.cell.values.NumericCellValue;
+import org.dromara.hutool.poi.excel.cell.values.NumericCellValue;
 import java.util.Date;
 import org.apache.poi.ss.usermodel.Cell;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/OrderExcel.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/OrderExcel.java
similarity index 75%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/OrderExcel.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/OrderExcel.java
index 5bd068ee1..afbaa0463 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/OrderExcel.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/OrderExcel.java
@@ -1,4 +1,4 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
 import lombok.Data;
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/TestBean.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/TestBean.java
similarity index 83%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/TestBean.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/TestBean.java
index ab72ff340..892ea4997 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/TestBean.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/TestBean.java
@@ -1,4 +1,4 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
 import lombok.Data;
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/WorkbookUtilTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/WorkbookUtilTest.java
similarity index 90%
rename from hutool-poi/src/test/java/cn/hutool/poi/excel/WorkbookUtilTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/excel/WorkbookUtilTest.java
index 3be3c5873..059e8df7d 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/WorkbookUtilTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/WorkbookUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.poi.excel;
+package org.dromara.hutool.poi.excel;
 
 import org.apache.poi.ss.usermodel.Workbook;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/ofd/OfdWriterTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/ofd/OfdWriterTest.java
similarity index 77%
rename from hutool-poi/src/test/java/cn/hutool/poi/ofd/OfdWriterTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/ofd/OfdWriterTest.java
index 7bd686857..287bfb2f8 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/ofd/OfdWriterTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/ofd/OfdWriterTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.poi.ofd;
+package org.dromara.hutool.poi.ofd;
 
-import cn.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java b/hutool-poi/src/test/java/org/dromara/hutool/poi/word/WordWriterTest.java
similarity index 93%
rename from hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java
rename to hutool-poi/src/test/java/org/dromara/hutool/poi/word/WordWriterTest.java
index 25f4b2281..54c5cf973 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java
+++ b/hutool-poi/src/test/java/org/dromara/hutool/poi/word/WordWriterTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.poi.word;
+package org.dromara.hutool.poi.word;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Console;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Console;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.junit.jupiter.api.Disabled;
diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml
index 1ef129316..d8c831404 100755
--- a/hutool-setting/pom.xml
+++ b/hutool-setting/pom.xml
@@ -19,7 +19,7 @@
 	jar
 
 	
-		cn.hutool
+		org.dromara.hutool
 		hutool-parent
 		6.0.0.M3
 	
@@ -29,17 +29,17 @@
 	Hutool 配置文件增强
 
 	
-		cn.hutool.setting
+		org.dromara.hutool.setting
 	
 
 	
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-core
 			${project.parent.version}
 		
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-log
 			${project.parent.version}
 		
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/AbsSetting.java
similarity index 88%
rename from hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/AbsSetting.java
index 311f80bd5..7461d2edd 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/AbsSetting.java
@@ -10,20 +10,20 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
-import cn.hutool.core.bean.copier.ValueProvider;
-import cn.hutool.core.lang.func.LambdaInfo;
-import cn.hutool.core.lang.func.LambdaUtil;
-import cn.hutool.core.lang.func.SerFunction;
-import cn.hutool.core.lang.getter.GroupedTypeGetter;
-import cn.hutool.core.lang.getter.TypeGetter;
-import cn.hutool.core.reflect.ConstructorUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.bean.copier.CopyOptions;
+import org.dromara.hutool.core.bean.copier.ValueProvider;
+import org.dromara.hutool.core.lang.func.LambdaInfo;
+import org.dromara.hutool.core.lang.func.LambdaUtil;
+import org.dromara.hutool.core.lang.func.SerFunction;
+import org.dromara.hutool.core.lang.getter.GroupedTypeGetter;
+import org.dromara.hutool.core.lang.getter.TypeGetter;
+import org.dromara.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import java.io.Serializable;
 import java.lang.reflect.Type;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/GroupedMap.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/GroupedMap.java
similarity index 98%
rename from hutool-setting/src/main/java/cn/hutool/setting/GroupedMap.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/GroupedMap.java
index 41de76ea6..1d2b8ab57 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/GroupedMap.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/GroupedMap.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/GroupedSet.java
similarity index 96%
rename from hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/GroupedSet.java
index d2a4551fe..e99edc93a 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/GroupedSet.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/GroupedSet.java
@@ -10,14 +10,14 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.net.url.URLUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.net.url.URLUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/Setting.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java
similarity index 95%
rename from hutool-setting/src/main/java/cn/hutool/setting/Setting.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java
index a726cc164..ce22178bf 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/Setting.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java
@@ -10,25 +10,25 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.resource.Resource;
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.io.watch.SimpleWatcher;
-import cn.hutool.core.io.watch.WatchMonitor;
-import cn.hutool.core.io.watch.WatchUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.lang.func.LambdaUtil;
-import cn.hutool.core.lang.func.SerSupplier;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.log.StaticLog;
-import cn.hutool.setting.dialect.Props;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.resource.Resource;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.io.watch.SimpleWatcher;
+import org.dromara.hutool.core.io.watch.WatchMonitor;
+import org.dromara.hutool.core.io.watch.WatchUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.lang.func.LambdaUtil;
+import org.dromara.hutool.core.lang.func.SerSupplier;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.log.StaticLog;
+import org.dromara.hutool.setting.dialect.Props;
 
 import java.io.File;
 import java.net.URL;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/SettingException.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java
similarity index 94%
rename from hutool-setting/src/main/java/cn/hutool/setting/SettingException.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java
index c5aeda431..f9ba20306 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/SettingException.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
 
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 设置异常
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java
index 9d39c53f7..18af9b2b3
--- a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java
@@ -10,20 +10,20 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.LineReader;
-import cn.hutool.core.io.resource.Resource;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.regex.ReUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.SystemUtil;
-import cn.hutool.log.Log;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.LineReader;
+import org.dromara.hutool.core.io.resource.Resource;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.regex.ReUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.SystemUtil;
+import org.dromara.hutool.log.Log;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/SettingUtil.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingUtil.java
similarity index 88%
rename from hutool-setting/src/main/java/cn/hutool/setting/SettingUtil.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/SettingUtil.java
index a0aaeeb33..d73b5d9ba 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/SettingUtil.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingUtil.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
 
-import cn.hutool.core.io.file.FileNameUtil;
-import cn.hutool.core.io.resource.NoResourceException;
-import cn.hutool.core.map.SafeConcurrentHashMap;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.io.file.FileNameUtil;
+import org.dromara.hutool.core.io.resource.NoResourceException;
+import org.dromara.hutool.core.map.SafeConcurrentHashMap;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.util.Map;
 
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java
similarity index 90%
rename from hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java
index eb3fd7a8e..d4953d450 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java
@@ -10,30 +10,30 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting.dialect;
+package org.dromara.hutool.setting.dialect;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.resource.Resource;
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.io.resource.UrlResource;
-import cn.hutool.core.io.watch.SimpleWatcher;
-import cn.hutool.core.io.watch.WatchMonitor;
-import cn.hutool.core.io.watch.WatchUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.lang.func.LambdaInfo;
-import cn.hutool.core.lang.func.LambdaUtil;
-import cn.hutool.core.lang.func.SerFunction;
-import cn.hutool.core.lang.func.SerSupplier;
-import cn.hutool.core.lang.getter.TypeGetter;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.reflect.ConstructorUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.core.bean.BeanUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.resource.Resource;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.io.resource.UrlResource;
+import org.dromara.hutool.core.io.watch.SimpleWatcher;
+import org.dromara.hutool.core.io.watch.WatchMonitor;
+import org.dromara.hutool.core.io.watch.WatchUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.lang.func.LambdaInfo;
+import org.dromara.hutool.core.lang.func.LambdaUtil;
+import org.dromara.hutool.core.lang.func.SerFunction;
+import org.dromara.hutool.core.lang.func.SerSupplier;
+import org.dromara.hutool.core.lang.getter.TypeGetter;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.reflect.ConstructorUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.log.StaticLog;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/dialect/PropsLoaderUtil.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/PropsLoaderUtil.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-setting/src/main/java/cn/hutool/setting/dialect/PropsLoaderUtil.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/PropsLoaderUtil.java
index ef7a05899..3d2cc7a7e
--- a/hutool-setting/src/main/java/cn/hutool/setting/dialect/PropsLoaderUtil.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/PropsLoaderUtil.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting.dialect;
+package org.dromara.hutool.setting.dialect;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.resource.Resource;
-import cn.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.resource.Resource;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/dialect/PropsUtil.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/PropsUtil.java
similarity index 88%
rename from hutool-setting/src/main/java/cn/hutool/setting/dialect/PropsUtil.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/PropsUtil.java
index a52eaf762..39def155a 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/dialect/PropsUtil.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/PropsUtil.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting.dialect;
+package org.dromara.hutool.setting.dialect;
 
-import cn.hutool.core.io.file.FileNameUtil;
-import cn.hutool.core.io.resource.NoResourceException;
-import cn.hutool.core.map.SafeConcurrentHashMap;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.io.file.FileNameUtil;
+import org.dromara.hutool.core.io.resource.NoResourceException;
+import org.dromara.hutool.core.map.SafeConcurrentHashMap;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.util.Map;
 
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/dialect/package-info.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/package-info.java
similarity index 93%
rename from hutool-setting/src/main/java/cn/hutool/setting/dialect/package-info.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/package-info.java
index 0c3d55f81..348356173 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/dialect/package-info.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.setting.dialect;
+package org.dromara.hutool.setting.dialect;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/package-info.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/package-info.java
similarity index 95%
rename from hutool-setting/src/main/java/cn/hutool/setting/package-info.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/package-info.java
index 2dc369ccf..ebe48a064 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/package-info.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/profile/GlobalProfile.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/GlobalProfile.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-setting/src/main/java/cn/hutool/setting/profile/GlobalProfile.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/profile/GlobalProfile.java
index 9d0cc3903..bbde91cc6
--- a/hutool-setting/src/main/java/cn/hutool/setting/profile/GlobalProfile.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/GlobalProfile.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting.profile;
+package org.dromara.hutool.setting.profile;
 
-import cn.hutool.core.lang.Singleton;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.core.lang.Singleton;
+import org.dromara.hutool.setting.Setting;
 
 /**
  * 全局的Profile配置中心
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/Profile.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/profile/Profile.java
index d3f954198..0438b7506
--- a/hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/Profile.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting.profile;
+package org.dromara.hutool.setting.profile;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.SafeConcurrentHashMap;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.setting.Setting;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.map.SafeConcurrentHashMap;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.setting.Setting;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/profile/package-info.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/package-info.java
similarity index 93%
rename from hutool-setting/src/main/java/cn/hutool/setting/profile/package-info.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/profile/package-info.java
index 282de5f3f..d72f3f34a 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/profile/package-info.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.setting.profile;
+package org.dromara.hutool.setting.profile;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/toml/Toml.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/Toml.java
similarity index 94%
rename from hutool-setting/src/main/java/cn/hutool/setting/toml/Toml.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/toml/Toml.java
index 1ff8e2794..4ad0f5610 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/toml/Toml.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/Toml.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting.toml;
+package org.dromara.hutool.setting.toml;
 
-import cn.hutool.core.io.resource.Resource;
+import org.dromara.hutool.core.io.resource.Resource;
 
 import java.io.Writer;
 import java.time.format.DateTimeFormatter;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/toml/TomlReader.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java
similarity index 99%
rename from hutool-setting/src/main/java/cn/hutool/setting/toml/TomlReader.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java
index 2cfe95d67..63fc79748 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/toml/TomlReader.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting.toml;
+package org.dromara.hutool.setting.toml;
 
-import cn.hutool.setting.SettingException;
+import org.dromara.hutool.setting.SettingException;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/toml/TomlWriter.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java
similarity index 97%
rename from hutool-setting/src/main/java/cn/hutool/setting/toml/TomlWriter.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java
index 430a6bc89..5be35f001 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/toml/TomlWriter.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting.toml;
+package org.dromara.hutool.setting.toml;
 
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.setting.SettingException;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.setting.SettingException;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/toml/package-info.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/package-info.java
similarity index 94%
rename from hutool-setting/src/main/java/cn/hutool/setting/toml/package-info.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/toml/package-info.java
index e131c4917..74e4efa89 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/toml/package-info.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/package-info.java
@@ -22,4 +22,4 @@
  *
  * @author looly
  */
-package cn.hutool.setting.toml;
+package org.dromara.hutool.setting.toml;
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/yaml/YamlUtil.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/yaml/YamlUtil.java
index 27dbc59c1..7c73d439d
--- a/hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/yaml/YamlUtil.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting.yaml;
+package org.dromara.hutool.setting.yaml;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.Dict;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.map.Dict;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/yaml/package-info.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/yaml/package-info.java
similarity index 93%
rename from hutool-setting/src/main/java/cn/hutool/setting/yaml/package-info.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/yaml/package-info.java
index 122438ab5..27f9adc85 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/yaml/package-info.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/yaml/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.setting.yaml;
+package org.dromara.hutool.setting.yaml;
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/Issue3008Test.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java
similarity index 74%
rename from hutool-setting/src/test/java/cn/hutool/setting/Issue3008Test.java
rename to hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java
index f3c50947e..eb9f27f08 100644
--- a/hutool-setting/src/test/java/cn/hutool/setting/Issue3008Test.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java
@@ -1,8 +1,8 @@
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
 
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.setting.dialect.Props;
-import cn.hutool.setting.dialect.PropsUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.setting.dialect.Props;
+import org.dromara.hutool.setting.dialect.PropsUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/PropsTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java
similarity index 96%
rename from hutool-setting/src/test/java/cn/hutool/setting/PropsTest.java
rename to hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java
index 4992dde20..64cc73597 100644
--- a/hutool-setting/src/test/java/cn/hutool/setting/PropsTest.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.setting.dialect.Props;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.setting.dialect.Props;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/PropsUtilTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java
similarity index 85%
rename from hutool-setting/src/test/java/cn/hutool/setting/PropsUtilTest.java
rename to hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java
index 87fca2ffb..088cc4c22 100644
--- a/hutool-setting/src/test/java/cn/hutool/setting/PropsUtilTest.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
 
-import cn.hutool.setting.dialect.PropsUtil;
+import org.dromara.hutool.setting.dialect.PropsUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/SettingTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/SettingTest.java
similarity index 95%
rename from hutool-setting/src/test/java/cn/hutool/setting/SettingTest.java
rename to hutool-setting/src/test/java/org/dromara/hutool/setting/SettingTest.java
index a3df16f57..9720a6fbb 100644
--- a/hutool-setting/src/test/java/cn/hutool/setting/SettingTest.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/SettingTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
 
-import cn.hutool.core.lang.Console;
+import org.dromara.hutool.core.lang.Console;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/SettingUtilTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/SettingUtilTest.java
similarity index 95%
rename from hutool-setting/src/test/java/cn/hutool/setting/SettingUtilTest.java
rename to hutool-setting/src/test/java/org/dromara/hutool/setting/SettingUtilTest.java
index 60b3f91b4..7464e909c 100644
--- a/hutool-setting/src/test/java/cn/hutool/setting/SettingUtilTest.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/SettingUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.setting;
+package org.dromara.hutool.setting;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/toml/TomlTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/toml/TomlTest.java
similarity index 89%
rename from hutool-setting/src/test/java/cn/hutool/setting/toml/TomlTest.java
rename to hutool-setting/src/test/java/org/dromara/hutool/setting/toml/TomlTest.java
index e7487972f..29ba12dff 100644
--- a/hutool-setting/src/test/java/cn/hutool/setting/toml/TomlTest.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/toml/TomlTest.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.setting.toml;
+package org.dromara.hutool.setting.toml;
 
-import cn.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/yaml/YamlUtilTest.java
old mode 100755
new mode 100644
similarity index 80%
rename from hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java
rename to hutool-setting/src/test/java/org/dromara/hutool/setting/yaml/YamlUtilTest.java
index 443265b5f..b1b9e8f04
--- a/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/yaml/YamlUtilTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.setting.yaml;
+package org.dromara.hutool.setting.yaml;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.map.Dict;
-import cn.hutool.core.util.CharsetUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.map.Dict;
+import org.dromara.hutool.core.util.CharsetUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml
index d21f7a63c..6406896b8 100755
--- a/hutool-socket/pom.xml
+++ b/hutool-socket/pom.xml
@@ -19,7 +19,7 @@
 	jar
 
 	
-		cn.hutool
+		org.dromara.hutool
 		hutool-parent
 		6.0.0.M3
 	
@@ -29,17 +29,17 @@
 	Hutool套接字，包括BIO、NIO、AIO封装
 
 	
-		cn.hutool.socket
+		org.dromara.hutool.socket
 	
 
 	
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-core
 			${project.parent.version}
 		
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-log
 			${project.parent.version}
 		
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/ChannelUtil.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/ChannelUtil.java
similarity index 91%
rename from hutool-socket/src/main/java/cn/hutool/socket/ChannelUtil.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/ChannelUtil.java
index e4b068fab..acdbc68c5 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/ChannelUtil.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/ChannelUtil.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket;
+package org.dromara.hutool.socket;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.thread.ThreadFactoryBuilder;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.thread.ThreadFactoryBuilder;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/SocketConfig.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketConfig.java
similarity index 96%
rename from hutool-socket/src/main/java/cn/hutool/socket/SocketConfig.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/SocketConfig.java
index 96158bc9e..570915e71 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/SocketConfig.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketConfig.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket;
+package org.dromara.hutool.socket;
 
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.RuntimeUtil;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.util.RuntimeUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/SocketRuntimeException.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketRuntimeException.java
similarity index 91%
rename from hutool-socket/src/main/java/cn/hutool/socket/SocketRuntimeException.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/SocketRuntimeException.java
index 6a10d0aef..ec71546dd 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/SocketRuntimeException.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketRuntimeException.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket;
+package org.dromara.hutool.socket;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * Socket异常
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/SocketUtil.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketUtil.java
similarity index 97%
rename from hutool-socket/src/main/java/cn/hutool/socket/SocketUtil.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/SocketUtil.java
index 788a6cf16..46f884b24 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/SocketUtil.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket;
+package org.dromara.hutool.socket;
 
-import cn.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IORuntimeException;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/AcceptHandler.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AcceptHandler.java
similarity index 94%
rename from hutool-socket/src/main/java/cn/hutool/socket/aio/AcceptHandler.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AcceptHandler.java
index dbdece31d..70ceeb635 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/aio/AcceptHandler.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AcceptHandler.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.aio;
+package org.dromara.hutool.socket.aio;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.AsynchronousSocketChannel;
 import java.nio.channels.CompletionHandler;
 
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.log.StaticLog;
 
 /**
  * 接入完成回调，单例使用
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioClient.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioClient.java
similarity index 96%
rename from hutool-socket/src/main/java/cn/hutool/socket/aio/AioClient.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioClient.java
index 5e5e74b27..f9bffb26a 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioClient.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioClient.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.aio;
+package org.dromara.hutool.socket.aio;
 
-import cn.hutool.socket.ChannelUtil;
-import cn.hutool.socket.SocketConfig;
+import org.dromara.hutool.socket.ChannelUtil;
+import org.dromara.hutool.socket.SocketConfig;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioServer.java
similarity index 92%
rename from hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioServer.java
index f37c6e141..6bd13ed27 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioServer.java
@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.aio;
+package org.dromara.hutool.socket.aio;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.thread.ThreadFactoryBuilder;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.log.Log;
-import cn.hutool.log.LogFactory;
-import cn.hutool.socket.SocketConfig;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.thread.ThreadFactoryBuilder;
+import org.dromara.hutool.core.thread.ThreadUtil;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.log.LogFactory;
+import org.dromara.hutool.socket.SocketConfig;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioSession.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioSession.java
similarity index 95%
rename from hutool-socket/src/main/java/cn/hutool/socket/aio/AioSession.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioSession.java
index 6c00bf9ac..3bd413ee3 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioSession.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioSession.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.aio;
+package org.dromara.hutool.socket.aio;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.socket.SocketConfig;
-import cn.hutool.socket.SocketUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.socket.SocketConfig;
+import org.dromara.hutool.socket.SocketUtil;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/IoAction.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/IoAction.java
similarity index 96%
rename from hutool-socket/src/main/java/cn/hutool/socket/aio/IoAction.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/aio/IoAction.java
index 1546f07b7..b87afab5c 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/aio/IoAction.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/IoAction.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.aio;
+package org.dromara.hutool.socket.aio;
 
 /**
  * Socket流处理接口
      
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/ReadHandler.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/ReadHandler.java
similarity index 91%
rename from hutool-socket/src/main/java/cn/hutool/socket/aio/ReadHandler.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/aio/ReadHandler.java
index cb0319330..60f149953 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/aio/ReadHandler.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/ReadHandler.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.aio;
+package org.dromara.hutool.socket.aio;
 
 import java.nio.channels.CompletionHandler;
 
-import cn.hutool.socket.SocketRuntimeException;
+import org.dromara.hutool.socket.SocketRuntimeException;
 
 /**
  * 数据读取完成回调，调用Session中相应方法处理消息，单例使用
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/SimpleIoAction.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/SimpleIoAction.java
similarity index 91%
rename from hutool-socket/src/main/java/cn/hutool/socket/aio/SimpleIoAction.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/aio/SimpleIoAction.java
index 96bd28b92..7293847f9 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/aio/SimpleIoAction.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/SimpleIoAction.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.aio;
+package org.dromara.hutool.socket.aio;
 
 import java.nio.ByteBuffer;
 
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.log.StaticLog;
 
 /**
  * 简易IO信息处理类
      
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/package-info.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/package-info.java
similarity index 93%
rename from hutool-socket/src/main/java/cn/hutool/socket/aio/package-info.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/aio/package-info.java
index 0d8eb8337..1acf033dd 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/aio/package-info.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.socket.aio;
+package org.dromara.hutool.socket.aio;
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/nio/AcceptHandler.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/AcceptHandler.java
similarity index 91%
rename from hutool-socket/src/main/java/cn/hutool/socket/nio/AcceptHandler.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/nio/AcceptHandler.java
index 714db4b14..74fc366fe 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/nio/AcceptHandler.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/AcceptHandler.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.nio;
+package org.dromara.hutool.socket.nio;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.log.StaticLog;
 
 import java.io.IOException;
 import java.nio.channels.CompletionHandler;
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/nio/ChannelHandler.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/ChannelHandler.java
similarity index 95%
rename from hutool-socket/src/main/java/cn/hutool/socket/nio/ChannelHandler.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/nio/ChannelHandler.java
index 76befa6e9..c1e00a3ca 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/nio/ChannelHandler.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/ChannelHandler.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.nio;
+package org.dromara.hutool.socket.nio;
 
 import java.nio.channels.SocketChannel;
 
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/nio/ChannelUtil.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/ChannelUtil.java
similarity index 93%
rename from hutool-socket/src/main/java/cn/hutool/socket/nio/ChannelUtil.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/nio/ChannelUtil.java
index cbaf652d5..3c69792a7 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/nio/ChannelUtil.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/ChannelUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.nio;
+package org.dromara.hutool.socket.nio;
 
-import cn.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IORuntimeException;
 
 import java.io.IOException;
 import java.nio.channels.SelectableChannel;
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/nio/NioClient.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioClient.java
similarity index 93%
rename from hutool-socket/src/main/java/cn/hutool/socket/nio/NioClient.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioClient.java
index dedd37f52..d2c1f7a13 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/nio/NioClient.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioClient.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.nio;
+package org.dromara.hutool.socket.nio;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.log.Log;
-import cn.hutool.socket.SocketRuntimeException;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.thread.ThreadUtil;
+import org.dromara.hutool.log.Log;
+import org.dromara.hutool.socket.SocketRuntimeException;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/nio/NioServer.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioServer.java
similarity index 95%
rename from hutool-socket/src/main/java/cn/hutool/socket/nio/NioServer.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioServer.java
index a495c4d3c..c120c34f0 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/nio/NioServer.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioServer.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.nio;
+package org.dromara.hutool.socket.nio;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.log.Log;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.log.Log;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/nio/Operation.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/Operation.java
similarity index 97%
rename from hutool-socket/src/main/java/cn/hutool/socket/nio/Operation.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/nio/Operation.java
index d20b9529f..82f2e6778 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/nio/Operation.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/Operation.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.nio;
+package org.dromara.hutool.socket.nio;
 
 import java.nio.channels.SelectionKey;
 
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/nio/package-info.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/package-info.java
similarity index 93%
rename from hutool-socket/src/main/java/cn/hutool/socket/nio/package-info.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/nio/package-info.java
index ee3b3fa42..39b6b7814 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/nio/package-info.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.socket.nio;
+package org.dromara.hutool.socket.nio;
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/package-info.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/package-info.java
similarity index 94%
rename from hutool-socket/src/main/java/cn/hutool/socket/package-info.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/package-info.java
index 771545969..c09122311 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/package-info.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.socket;
+package org.dromara.hutool.socket;
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/protocol/MsgDecoder.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/MsgDecoder.java
similarity index 91%
rename from hutool-socket/src/main/java/cn/hutool/socket/protocol/MsgDecoder.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/MsgDecoder.java
index 4c6cd59fa..17ce81e21 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/protocol/MsgDecoder.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/MsgDecoder.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.protocol;
+package org.dromara.hutool.socket.protocol;
 
 import java.nio.ByteBuffer;
 
-import cn.hutool.socket.aio.AioSession;
+import org.dromara.hutool.socket.aio.AioSession;
 
 /**
  * 消息解码器
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/protocol/MsgEncoder.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/MsgEncoder.java
similarity index 90%
rename from hutool-socket/src/main/java/cn/hutool/socket/protocol/MsgEncoder.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/MsgEncoder.java
index e4a371fcb..5b1dd0aa2 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/protocol/MsgEncoder.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/MsgEncoder.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.protocol;
+package org.dromara.hutool.socket.protocol;
 
 import java.nio.ByteBuffer;
 
-import cn.hutool.socket.aio.AioSession;
+import org.dromara.hutool.socket.aio.AioSession;
 
 /**
  * 消息编码器
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/protocol/Protocol.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/Protocol.java
similarity index 95%
rename from hutool-socket/src/main/java/cn/hutool/socket/protocol/Protocol.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/Protocol.java
index 0f32d0ada..d41e37846 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/protocol/Protocol.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/Protocol.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.socket.protocol;
+package org.dromara.hutool.socket.protocol;
 
 /**
  * 协议接口
      
diff --git a/hutool-socket/src/main/java/cn/hutool/socket/protocol/package-info.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/package-info.java
similarity index 93%
rename from hutool-socket/src/main/java/cn/hutool/socket/protocol/package-info.java
rename to hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/package-info.java
index 434df5e93..fc525b338 100644
--- a/hutool-socket/src/main/java/cn/hutool/socket/protocol/package-info.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.socket.protocol;
+package org.dromara.hutool.socket.protocol;
diff --git a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java b/hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioClientTest.java
old mode 100755
new mode 100644
similarity index 81%
rename from hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java
rename to hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioClientTest.java
index 46301206c..0d420726b
--- a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java
+++ b/hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioClientTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.socket.aio;
+package org.dromara.hutool.socket.aio;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
diff --git a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java b/hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioServerTest.java
old mode 100755
new mode 100644
similarity index 80%
rename from hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java
rename to hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioServerTest.java
index 80a95baa2..e27eebf31
--- a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java
+++ b/hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioServerTest.java
@@ -1,10 +1,10 @@
-package cn.hutool.socket.aio;
+package org.dromara.hutool.socket.aio;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.BufferUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.log.StaticLog;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.io.BufferUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.log.StaticLog;
 
 import java.nio.ByteBuffer;
 
diff --git a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java b/hutool-socket/src/test/java/org/dromara/hutool/socket/nio/NioClientTest.java
old mode 100755
new mode 100644
similarity index 89%
rename from hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java
rename to hutool-socket/src/test/java/org/dromara/hutool/socket/nio/NioClientTest.java
index 6a0f25a0d..2590622a9
--- a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java
+++ b/hutool-socket/src/test/java/org/dromara/hutool/socket/nio/NioClientTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.socket.nio;
+package org.dromara.hutool.socket.nio;
 
-import cn.hutool.core.io.BufferUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.io.BufferUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.text.StrUtil;
 import lombok.SneakyThrows;
 
 import java.nio.ByteBuffer;
diff --git a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java b/hutool-socket/src/test/java/org/dromara/hutool/socket/nio/NioServerTest.java
old mode 100755
new mode 100644
similarity index 84%
rename from hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java
rename to hutool-socket/src/test/java/org/dromara/hutool/socket/nio/NioServerTest.java
index 1ce6e3ee7..2103afa8a
--- a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java
+++ b/hutool-socket/src/test/java/org/dromara/hutool/socket/nio/NioServerTest.java
@@ -1,10 +1,10 @@
-package cn.hutool.socket.nio;
+package org.dromara.hutool.socket.nio;
 
-import cn.hutool.core.io.BufferUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.io.BufferUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.core.text.StrUtil;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/hutool-swing/pom.xml b/hutool-swing/pom.xml
index a6b71f71b..81189d43e 100755
--- a/hutool-swing/pom.xml
+++ b/hutool-swing/pom.xml
@@ -19,7 +19,7 @@
 	jar
 
 	
-		cn.hutool
+		org.dromara.hutool
 		hutool-parent
 		6.0.0.M3
 	
@@ -29,12 +29,12 @@
 	Hutool swing桌面和图片多媒体相关封装
 
 	
-		cn.hutool.swing
+		org.dromara.hutool.swing
 	
 
 	
 		
-			cn.hutool
+			org.dromara.hutool
 			hutool-core
 			${project.parent.version}
 		
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/DesktopUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/DesktopUtil.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-swing/src/main/java/cn/hutool/swing/DesktopUtil.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/DesktopUtil.java
index cdcd12d5d..564a45b01
--- a/hutool-swing/src/main/java/cn/hutool/swing/DesktopUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/DesktopUtil.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing;
+package org.dromara.hutool.swing;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.net.url.URLUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.net.url.URLUtil;
 
 import java.awt.Desktop;
 import java.io.File;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/RobotUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/RobotUtil.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-swing/src/main/java/cn/hutool/swing/RobotUtil.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/RobotUtil.java
index 6531a2303..949232a30
--- a/hutool-swing/src/main/java/cn/hutool/swing/RobotUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/RobotUtil.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing;
+package org.dromara.hutool.swing;
 
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.swing.clipboard.ClipboardUtil;
-import cn.hutool.swing.img.ImgUtil;
+import org.dromara.hutool.core.exceptions.UtilException;
+import org.dromara.hutool.swing.clipboard.ClipboardUtil;
+import org.dromara.hutool.swing.img.ImgUtil;
 
 import java.awt.AWTException;
 import java.awt.Rectangle;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/ScreenUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/ScreenUtil.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-swing/src/main/java/cn/hutool/swing/ScreenUtil.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/ScreenUtil.java
index 222076237..ff73c887b
--- a/hutool-swing/src/main/java/cn/hutool/swing/ScreenUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/ScreenUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing;
+package org.dromara.hutool.swing;
 
 import java.awt.Dimension;
 import java.awt.Rectangle;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/AbstractCaptcha.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/AbstractCaptcha.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/AbstractCaptcha.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/AbstractCaptcha.java
index c6f2f70ee..4581259ff
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/AbstractCaptcha.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/AbstractCaptcha.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.captcha;
+package org.dromara.hutool.swing.captcha;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.net.url.URLUtil;
-import cn.hutool.swing.captcha.generator.CodeGenerator;
-import cn.hutool.swing.captcha.generator.RandomGenerator;
-import cn.hutool.swing.img.ImgUtil;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.net.url.URLUtil;
+import org.dromara.hutool.swing.captcha.generator.CodeGenerator;
+import org.dromara.hutool.swing.captcha.generator.RandomGenerator;
+import org.dromara.hutool.swing.img.ImgUtil;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/CaptchaUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/CaptchaUtil.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/CaptchaUtil.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/CaptchaUtil.java
index ee57662b4..6de84ccf0
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/CaptchaUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/CaptchaUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.captcha;
+package org.dromara.hutool.swing.captcha;
 
 /**
  * 图形验证码工具
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/CircleCaptcha.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/CircleCaptcha.java
index 2a4b8e78d..39ad61f2a
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/CircleCaptcha.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.captcha;
+package org.dromara.hutool.swing.captcha;
 
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.swing.img.color.ColorUtil;
-import cn.hutool.swing.img.GraphicsUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.swing.img.color.ColorUtil;
+import org.dromara.hutool.swing.img.GraphicsUtil;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/GifCaptcha.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/GifCaptcha.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/GifCaptcha.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/GifCaptcha.java
index da50b6cab..391d6deff
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/GifCaptcha.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/GifCaptcha.java
@@ -10,11 +10,11 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.captcha;
+package org.dromara.hutool.swing.captcha;
 
 
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.core.util.RandomUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.util.RandomUtil;
 import com.madgag.gif.fmsware.AnimatedGifEncoder;
 
 import java.awt.AlphaComposite;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/ICaptcha.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/ICaptcha.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/ICaptcha.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/ICaptcha.java
index fba004a0b..19e63ca65
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/ICaptcha.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/ICaptcha.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.captcha;
+package org.dromara.hutool.swing.captcha;
 
 import java.io.OutputStream;
 import java.io.Serializable;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/LineCaptcha.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/LineCaptcha.java
index f6faa0025..c75605af5
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/LineCaptcha.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.captcha;
+package org.dromara.hutool.swing.captcha;
 
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.swing.img.color.ColorUtil;
-import cn.hutool.swing.img.GraphicsUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.swing.img.color.ColorUtil;
+import org.dromara.hutool.swing.img.GraphicsUtil;
 
 import java.awt.Color;
 import java.awt.Graphics;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/ShearCaptcha.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/ShearCaptcha.java
index b2e141e33..8e3d39b7d
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/ShearCaptcha.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.captcha;
+package org.dromara.hutool.swing.captcha;
 
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.swing.img.color.ColorUtil;
-import cn.hutool.swing.img.GraphicsUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.swing.img.color.ColorUtil;
+import org.dromara.hutool.swing.img.GraphicsUtil;
 
 import java.awt.Color;
 import java.awt.Graphics;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/AbstractGenerator.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/AbstractGenerator.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/AbstractGenerator.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/AbstractGenerator.java
index 6f6689b30..0e42c1fcc
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/AbstractGenerator.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/AbstractGenerator.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.captcha.generator;
+package org.dromara.hutool.swing.captcha.generator;
 
-import cn.hutool.core.util.RandomUtil;
+import org.dromara.hutool.core.util.RandomUtil;
 
 /**
  * 随机字符验证码生成器
      
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/CodeGenerator.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/CodeGenerator.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/CodeGenerator.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/CodeGenerator.java
index 2d7e612cf..7b4fff5cd
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/CodeGenerator.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/CodeGenerator.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.captcha.generator;
+package org.dromara.hutool.swing.captcha.generator;
 
 import java.io.Serializable;
 
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/MathGenerator.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/MathGenerator.java
old mode 100755
new mode 100644
similarity index 90%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/MathGenerator.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/MathGenerator.java
index f14757bc5..0053ae4e0
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/MathGenerator.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/MathGenerator.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.captcha.generator;
+package org.dromara.hutool.swing.captcha.generator;
 
-import cn.hutool.core.math.Calculator;
-import cn.hutool.core.util.CharUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.math.Calculator;
+import org.dromara.hutool.core.util.CharUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 数字计算验证码生成器
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/RandomGenerator.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/RandomGenerator.java
old mode 100755
new mode 100644
similarity index 91%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/RandomGenerator.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/RandomGenerator.java
index 7684dbe29..46590e7cf
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/RandomGenerator.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/RandomGenerator.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.captcha.generator;
+package org.dromara.hutool.swing.captcha.generator;
 
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.RandomUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 /**
  * 随机字符验证码生成器
      
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/package-info.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/package-info.java
old mode 100755
new mode 100644
similarity index 92%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/package-info.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/package-info.java
index 93cdf3227..9c7d3102e
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/generator/package-info.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  * @since 4.1.2
  */
-package cn.hutool.swing.captcha.generator;
+package org.dromara.hutool.swing.captcha.generator;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/package-info.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/package-info.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-swing/src/main/java/cn/hutool/swing/captcha/package-info.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/package-info.java
index 710a1bd59..72afc8e55
--- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/package-info.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.swing.captcha;
+package org.dromara.hutool.swing.captcha;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardListener.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardListener.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardListener.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardListener.java
index a1302ce0f..53c367d4d
--- a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardListener.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardListener.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.clipboard;
+package org.dromara.hutool.swing.clipboard;
 
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.Transferable;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardMonitor.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardMonitor.java
index 0c79278f5..5b424bfab
--- a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardMonitor.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardMonitor.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.clipboard;
+package org.dromara.hutool.swing.clipboard;
 
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.thread.ThreadUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.ClipboardOwner;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardUtil.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardUtil.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardUtil.java
index 4dd7acfc3..b0e67790a
--- a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ClipboardUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardUtil.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.clipboard;
+package org.dromara.hutool.swing.clipboard;
 
-import cn.hutool.core.exceptions.UtilException;
+import org.dromara.hutool.core.exceptions.UtilException;
 
 import java.awt.Image;
 import java.awt.Toolkit;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ImageSelection.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ImageSelection.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-swing/src/main/java/cn/hutool/swing/clipboard/ImageSelection.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ImageSelection.java
index de89cfe89..5f899aa62
--- a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/ImageSelection.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ImageSelection.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.clipboard;
+package org.dromara.hutool.swing.clipboard;
 
 import java.awt.Image;
 import java.awt.datatransfer.DataFlavor;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/StrClipboardListener.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/StrClipboardListener.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-swing/src/main/java/cn/hutool/swing/clipboard/StrClipboardListener.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/StrClipboardListener.java
index 41b1f0d5c..f5b13a917
--- a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/StrClipboardListener.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/StrClipboardListener.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.clipboard;
+package org.dromara.hutool.swing.clipboard;
 
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/package-info.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/package-info.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-swing/src/main/java/cn/hutool/swing/clipboard/package-info.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/package-info.java
index 3b89b8092..7c301bc1b
--- a/hutool-swing/src/main/java/cn/hutool/swing/clipboard/package-info.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.swing.clipboard;
+package org.dromara.hutool.swing.clipboard;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/BackgroundRemoval.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/BackgroundRemoval.java
index e992432d9..53fbd858d
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/BackgroundRemoval.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
-import cn.hutool.core.io.file.FileTypeUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.swing.img.color.ColorUtil;
+import org.dromara.hutool.core.io.file.FileTypeUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.swing.img.color.ColorUtil;
 
 import javax.imageio.ImageIO;
 import javax.swing.ImageIcon;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/FontUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/FontUtil.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/FontUtil.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/FontUtil.java
index 28644b86b..d296e8999
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/FontUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/FontUtil.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.exceptions.UtilException;
+import org.dromara.hutool.core.io.IORuntimeException;
 
 import java.awt.Dimension;
 import java.awt.Font;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/GraphicsUtil.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/GraphicsUtil.java
index 8e0a5b95b..862ccef36
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/GraphicsUtil.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.swing.img.color.ColorUtil;
+import org.dromara.hutool.core.util.ObjUtil;
+import org.dromara.hutool.swing.img.color.ColorUtil;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/Img.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/Img.java
old mode 100755
new mode 100644
similarity index 98%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/Img.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/Img.java
index cb262f9d4..72f4a911e
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/Img.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/Img.java
@@ -10,16 +10,16 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileNameUtil;
-import cn.hutool.core.io.resource.Resource;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.math.NumberUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.util.ObjUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileNameUtil;
+import org.dromara.hutool.core.io.resource.Resource;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.math.NumberUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import javax.imageio.ImageIO;
 import javax.imageio.stream.ImageInputStream;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/ImgMetaUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgMetaUtil.java
similarity index 94%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/ImgMetaUtil.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgMetaUtil.java
index 630ef1631..70facd761 100644
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/ImgMetaUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgMetaUtil.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
-import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.exceptions.UtilException;
+import org.dromara.hutool.core.io.IORuntimeException;
 import com.drew.imaging.ImageMetadataReader;
 import com.drew.imaging.ImageProcessingException;
 import com.drew.metadata.Directory;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgUtil.java
old mode 100755
new mode 100644
similarity index 99%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgUtil.java
index ef7702d95..e8365f1be
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/ImgUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgUtil.java
@@ -10,18 +10,18 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
-import cn.hutool.core.codec.binary.Base64;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileNameUtil;
-import cn.hutool.core.io.resource.Resource;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.math.NumberUtil;
-import cn.hutool.core.net.url.URLUtil;
-import cn.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.codec.binary.Base64;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.io.file.FileNameUtil;
+import org.dromara.hutool.core.io.resource.Resource;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.math.NumberUtil;
+import org.dromara.hutool.core.net.url.URLUtil;
+import org.dromara.hutool.core.text.StrUtil;
 
 import javax.imageio.*;
 import javax.imageio.stream.ImageInputStream;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/ImgWriter.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgWriter.java
similarity index 95%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/ImgWriter.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgWriter.java
index 2a75d1132..6992a029b 100644
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/ImgWriter.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgWriter.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Assert;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.IoUtil;
+import org.dromara.hutool.core.lang.Assert;
 
 import javax.imageio.IIOImage;
 import javax.imageio.ImageTypeSpecifier;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/RenderingHintsBuilder.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/RenderingHintsBuilder.java
similarity index 99%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/RenderingHintsBuilder.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/RenderingHintsBuilder.java
index 242646c04..ce749e2e0 100644
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/RenderingHintsBuilder.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/RenderingHintsBuilder.java
@@ -10,10 +10,10 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.lang.builder.Builder;
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.lang.builder.Builder;
 
 import java.awt.RenderingHints;
 import java.util.HashMap;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/ScaleType.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ScaleType.java
old mode 100755
new mode 100644
similarity index 97%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/ScaleType.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/ScaleType.java
index 615eb9721..960678f32
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/ScaleType.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ScaleType.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
 import java.awt.Image;
 
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi4bitMapping.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/Ansi4bitMapping.java
similarity index 95%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi4bitMapping.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/Ansi4bitMapping.java
index e12a7807f..eb5b9bd92 100644
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi4bitMapping.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/Ansi4bitMapping.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img.color;
+package org.dromara.hutool.swing.img.color;
 
-import cn.hutool.core.lang.ansi.Ansi4BitColor;
+import org.dromara.hutool.core.lang.ansi.Ansi4BitColor;
 
 import java.util.LinkedHashMap;
 
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi8bitMapping.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/Ansi8bitMapping.java
similarity index 97%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi8bitMapping.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/Ansi8bitMapping.java
index d450e029b..c902e8739 100644
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi8bitMapping.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/Ansi8bitMapping.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img.color;
+package org.dromara.hutool.swing.img.color;
 
-import cn.hutool.core.lang.ansi.Ansi8BitColor;
+import org.dromara.hutool.core.lang.ansi.Ansi8BitColor;
 
 import java.util.LinkedHashMap;
 
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/color/AnsiLabMapping.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/AnsiLabMapping.java
similarity index 94%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/color/AnsiLabMapping.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/AnsiLabMapping.java
index 98101ba1e..c40fd97be 100644
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/color/AnsiLabMapping.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/AnsiLabMapping.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img.color;
+package org.dromara.hutool.swing.img.color;
 
-import cn.hutool.core.lang.ansi.AnsiElement;
+import org.dromara.hutool.core.lang.ansi.AnsiElement;
 
 import java.awt.Color;
 import java.util.Map;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/color/ColorUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/ColorUtil.java
similarity index 95%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/color/ColorUtil.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/ColorUtil.java
index ed572868e..3c5c4d74e 100644
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/color/ColorUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/ColorUtil.java
@@ -10,17 +10,17 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img.color;
+package org.dromara.hutool.swing.img.color;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.ansi.Ansi4BitColor;
-import cn.hutool.core.lang.ansi.Ansi8BitColor;
-import cn.hutool.core.lang.ansi.AnsiElement;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.text.StrUtil;
-import cn.hutool.core.text.split.SplitUtil;
-import cn.hutool.core.array.ArrayUtil;
-import cn.hutool.core.util.RandomUtil;
+import org.dromara.hutool.core.convert.Convert;
+import org.dromara.hutool.core.lang.ansi.Ansi4BitColor;
+import org.dromara.hutool.core.lang.ansi.Ansi8BitColor;
+import org.dromara.hutool.core.lang.ansi.AnsiElement;
+import org.dromara.hutool.core.map.MapUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.text.split.SplitUtil;
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.util.RandomUtil;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/color/LabColor.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/LabColor.java
similarity index 97%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/color/LabColor.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/LabColor.java
index be6a980d0..16da9c8b7 100644
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/color/LabColor.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/LabColor.java
@@ -10,9 +10,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package cn.hutool.swing.img.color;
+package org.dromara.hutool.swing.img.color;
 
-import cn.hutool.core.lang.Assert;
+import org.dromara.hutool.core.lang.Assert;
 
 import java.awt.Color;
 import java.awt.color.ColorSpace;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/color/package-info.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/package-info.java
similarity index 93%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/color/package-info.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/package-info.java
index 6ba93ccb3..972db35e7 100644
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/color/package-info.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.swing.img.color;
+package org.dromara.hutool.swing.img.color;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/package-info.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/package-info.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-swing/src/main/java/cn/hutool/swing/img/package-info.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/img/package-info.java
index 70ffbaa1a..42a315093
--- a/hutool-swing/src/main/java/cn/hutool/swing/img/package-info.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
diff --git a/hutool-swing/src/main/java/cn/hutool/swing/package-info.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/package-info.java
old mode 100755
new mode 100644
similarity index 94%
rename from hutool-swing/src/main/java/cn/hutool/swing/package-info.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/package-info.java
index 53827fc5f..f43e95451
--- a/hutool-swing/src/main/java/cn/hutool/swing/package-info.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package cn.hutool.swing;
+package org.dromara.hutool.swing;
diff --git a/hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/ClipboardMonitorTest.java
old mode 100755
new mode 100644
similarity index 80%
rename from hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/ClipboardMonitorTest.java
index 3c7ffccbf..73a455446
--- a/hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/ClipboardMonitorTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.swing;
+package org.dromara.hutool.swing;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.swing.clipboard.ClipboardUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.swing.clipboard.ClipboardUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/cn/hutool/swing/ClipboardUtilTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/ClipboardUtilTest.java
old mode 100755
new mode 100644
similarity index 85%
rename from hutool-swing/src/test/java/cn/hutool/swing/ClipboardUtilTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/ClipboardUtilTest.java
index 9242babcc..1cee9e155
--- a/hutool-swing/src/test/java/cn/hutool/swing/ClipboardUtilTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/ClipboardUtilTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.swing;
+package org.dromara.hutool.swing;
 
-import cn.hutool.swing.clipboard.ClipboardUtil;
+import org.dromara.hutool.swing.clipboard.ClipboardUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/cn/hutool/swing/DesktopUtilTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/DesktopUtilTest.java
old mode 100755
new mode 100644
similarity index 85%
rename from hutool-swing/src/test/java/cn/hutool/swing/DesktopUtilTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/DesktopUtilTest.java
index 98bc873a7..b69398854
--- a/hutool-swing/src/test/java/cn/hutool/swing/DesktopUtilTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/DesktopUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.swing;
+package org.dromara.hutool.swing;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-swing/src/test/java/cn/hutool/swing/RobotUtilTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/RobotUtilTest.java
old mode 100755
new mode 100644
similarity index 72%
rename from hutool-swing/src/test/java/cn/hutool/swing/RobotUtilTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/RobotUtilTest.java
index b275a02f1..80ce3fb6a
--- a/hutool-swing/src/test/java/cn/hutool/swing/RobotUtilTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/RobotUtilTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.swing;
+package org.dromara.hutool.swing;
 
-import cn.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/cn/hutool/swing/captcha/CaptchaTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/CaptchaTest.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-swing/src/test/java/cn/hutool/swing/captcha/CaptchaTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/CaptchaTest.java
index f0137c4f0..ae36b8ec2
--- a/hutool-swing/src/test/java/cn/hutool/swing/captcha/CaptchaTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/CaptchaTest.java
@@ -1,7 +1,7 @@
-package cn.hutool.swing.captcha;
+package org.dromara.hutool.swing.captcha;
 
-import cn.hutool.core.lang.Console;
-import cn.hutool.swing.captcha.generator.MathGenerator;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.swing.captcha.generator.MathGenerator;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-swing/src/test/java/cn/hutool/swing/captcha/CaptchaUtilTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/CaptchaUtilTest.java
old mode 100755
new mode 100644
similarity index 85%
rename from hutool-swing/src/test/java/cn/hutool/swing/captcha/CaptchaUtilTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/CaptchaUtilTest.java
index 37cc7d2b1..8cc9405b9
--- a/hutool-swing/src/test/java/cn/hutool/swing/captcha/CaptchaUtilTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/CaptchaUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.swing.captcha;
+package org.dromara.hutool.swing.captcha;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-swing/src/test/java/cn/hutool/swing/captcha/GeneratorTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/GeneratorTest.java
old mode 100755
new mode 100644
similarity index 71%
rename from hutool-swing/src/test/java/cn/hutool/swing/captcha/GeneratorTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/GeneratorTest.java
index 011ca48bf..a4e20d808
--- a/hutool-swing/src/test/java/cn/hutool/swing/captcha/GeneratorTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/GeneratorTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.swing.captcha;
+package org.dromara.hutool.swing.captcha;
 
-import cn.hutool.swing.captcha.generator.MathGenerator;
+import org.dromara.hutool.swing.captcha.generator.MathGenerator;
 import org.junit.jupiter.api.Test;
 
 public class GeneratorTest {
diff --git a/hutool-swing/src/test/java/cn/hutool/swing/img/ColorUtilTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/img/ColorUtilTest.java
old mode 100755
new mode 100644
similarity index 85%
rename from hutool-swing/src/test/java/cn/hutool/swing/img/ColorUtilTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/img/ColorUtilTest.java
index 477e908ab..fa5462060
--- a/hutool-swing/src/test/java/cn/hutool/swing/img/ColorUtilTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/img/ColorUtilTest.java
@@ -1,6 +1,6 @@
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
-import cn.hutool.swing.img.color.ColorUtil;
+import org.dromara.hutool.swing.img.color.ColorUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/cn/hutool/swing/img/FontUtilTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/img/FontUtilTest.java
old mode 100755
new mode 100644
similarity index 86%
rename from hutool-swing/src/test/java/cn/hutool/swing/img/FontUtilTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/img/FontUtilTest.java
index dbb481e3b..697915d85
--- a/hutool-swing/src/test/java/cn/hutool/swing/img/FontUtilTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/img/FontUtilTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-swing/src/test/java/cn/hutool/swing/img/ImgTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/img/ImgTest.java
old mode 100755
new mode 100644
similarity index 93%
rename from hutool-swing/src/test/java/cn/hutool/swing/img/ImgTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/img/ImgTest.java
index d1113b0b2..ee0196463
--- a/hutool-swing/src/test/java/cn/hutool/swing/img/ImgTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/img/ImgTest.java
@@ -1,8 +1,8 @@
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
-import cn.hutool.core.io.file.FileTypeUtil;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.net.url.URLUtil;
+import org.dromara.hutool.core.io.file.FileTypeUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.net.url.URLUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/cn/hutool/swing/img/ImgUtilTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/img/ImgUtilTest.java
old mode 100755
new mode 100644
similarity index 95%
rename from hutool-swing/src/test/java/cn/hutool/swing/img/ImgUtilTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/img/ImgUtilTest.java
index b4b8bf199..4e2b94dc8
--- a/hutool-swing/src/test/java/cn/hutool/swing/img/ImgUtilTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/img/ImgUtilTest.java
@@ -1,9 +1,9 @@
-package cn.hutool.swing.img;
+package org.dromara.hutool.swing.img;
 
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.file.FileUtil;
-import cn.hutool.core.lang.Console;
-import cn.hutool.swing.img.color.ColorUtil;
+import org.dromara.hutool.core.io.IORuntimeException;
+import org.dromara.hutool.core.io.file.FileUtil;
+import org.dromara.hutool.core.lang.Console;
+import org.dromara.hutool.swing.img.color.ColorUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/pom.xml b/pom.xml
index 346c440d0..d3d9e40e4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 
 	pom
 
-	cn.hutool
+	org.dromara.hutool
 	hutool-parent
 	6.0.0.M3
 	hutool
@@ -45,7 +45,7 @@
 	
 		utf-8
 		utf-8
-		cn.hutool
+		org.dromara.hutool
 
 		
 		8