diff --git a/README-EN.md b/README-EN.md old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/SECURITY.md b/SECURITY.md index ec97fe9b2..e69de29bb 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,13 +0,0 @@ -# Security Policy - -## Supported Versions（支持的版本） - -| Version | Supported | -|---------|--------------------| -| 6.x.x | :white_check_mark: | - -## Reporting a Vulnerability（报告漏洞） - -如果你发现有安全问题或漏洞，请发送邮件到`loolly@aliyun.com`。 - -To report any found security issues or vulnerabilities, please send a mail to `loolly@aliyun.com`. \ No newline at end of file diff --git a/bin/push_dev.sh b/bin/push_dev.sh index 7b8fa71b8..b9fc0989b 100755 --- a/bin/push_dev.sh +++ b/bin/push_dev.sh @@ -16,12 +16,12 @@ # limitations under the License. # -echo -e "\033[32mCheckout to v6-dev\033[0m" -git checkout v6-dev +echo -e "\033[32mCheckout to v7-dev\033[0m" +git checkout v7-dev -echo -e "\033[32mPush to Github(origin) v6-dev\033[0m" -git push origin v6-dev -echo -e "\033[32mPush to Gitee v6-dev\033[0m" -git push osc v6-dev -echo -e "\033[32mPush to Gitcode v6-dev\033[0m" -git push gitcode v6-dev +echo -e "\033[32mPush to Github(origin) v7-dev\033[0m" +git push origin v7-dev +echo -e "\033[32mPush to Gitee v7-dev\033[0m" +git push osc v7-dev +echo -e "\033[32mPush to Gitcode v7-dev\033[0m" +git push gitcode v7-dev diff --git a/bin/push_master.sh b/bin/push_master.sh index a212acd2d..69bfa9676 100755 --- a/bin/push_master.sh +++ b/bin/push_master.sh @@ -19,15 +19,15 @@ # show Hutool logo "$(dirname ${BASH_SOURCE[0]})"/logo.sh -echo -e "\033[32mCheckout to v6-master\033[0m" -git checkout v6-master +echo -e "\033[32mCheckout to v7-master\033[0m" +git checkout v7-master -echo -e "\033[32mMerge v6-dev branch\033[0m" -git merge v6-dev -m 'Prepare release' +echo -e "\033[32mMerge v7-dev branch\033[0m" +git merge v7-dev -m 'Prepare release' -echo -e "\033[32mPush to Github(origin) v6-master\033[0m" -git push origin v6-master -echo -e "\033[32mPush to Gitee v6-master\033[0m" -git push osc v6-master -echo -e "\033[32mPush to Gitcode v6-master\033[0m" -git push gitcode v6-master +echo -e "\033[32mPush to Github(origin) v7-master\033[0m" +git push origin v7-master +echo -e "\033[32mPush to Gitee v7-master\033[0m" +git push osc v7-master +echo -e "\033[32mPush to Gitcode v7-master\033[0m" +git push gitcode v7-master diff --git a/bin/sync.sh b/bin/sync.sh index 05b998887..e138b6c6c 100644 --- a/bin/sync.sh +++ b/bin/sync.sh @@ -19,10 +19,10 @@ # show Hutool logo "$(dirname ${BASH_SOURCE[0]})"/logo.sh -# 保证当前在v6-dev分支 -git checkout v6-dev +# 保证当前在v7-dev分支 +git checkout v7-dev # 同时同步Gitee、Github和Gitcode的库 -git pull osc v6-dev -git pull origin v6-dev -git pull gitcode v6-dev +git pull osc v7-dev +git pull origin v7-dev +git pull gitcode v7-dev diff --git a/bin/version.txt b/bin/version.txt index b4bf4ad80..649ef9b6d 100644 --- a/bin/version.txt +++ b/bin/version.txt @@ -1 +1 @@ -6.0.0-M22 +7.0.0.M1 diff --git a/docs/js/version.js b/docs/js/version.js index 34e567afb..b47b01512 100755 --- a/docs/js/version.js +++ b/docs/js/version.js @@ -1 +1 @@ -var version = '6.0.0-M22' \ No newline at end of file +var version = '7.0.0.M1' diff --git a/hutool-ai/pom.xml b/hutool-ai/pom.xml index 4915a0820..a6a650026 100644 --- a/hutool-ai/pom.xml +++ b/hutool-ai/pom.xml @@ -7,9 +7,9 @@ jar - org.dromara.hutool + cn.hutool.v7 hutool-parent - 6.0.0-M22 + 7.0.0.M1 hutool-ai @@ -17,34 +17,34 @@ Hutool AI大模型封装 - org.dromara.hutool.ai + cn.hutool.v7.ai - org.dromara.hutool + cn.hutool.v7 hutool-core ${project.parent.version} - org.dromara.hutool + cn.hutool.v7 hutool-http ${project.parent.version} - org.dromara.hutool + cn.hutool.v7 hutool-log ${project.parent.version} compile - org.dromara.hutool + cn.hutool.v7 hutool-json ${project.parent.version} compile - org.dromara.hutool + cn.hutool.v7 hutool-swing ${project.parent.version} test diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/AIException.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/AIException.java similarity index 95% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/AIException.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/AIException.java index 7722443b6..44afe00eb 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/AIException.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/AIException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.ai; +package cn.hutool.v7.ai; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; /** * 异常处理类 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/AIServiceFactory.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/AIServiceFactory.java similarity index 89% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/AIServiceFactory.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/AIServiceFactory.java index 7d900871d..bb5a649ac 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/AIServiceFactory.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/AIServiceFactory.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.ai; +package cn.hutool.v7.ai; -import org.dromara.hutool.ai.core.AIConfig; -import org.dromara.hutool.ai.core.AIService; -import org.dromara.hutool.ai.core.AIServiceProvider; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.ai.core.AIConfig; +import cn.hutool.v7.ai.core.AIService; +import cn.hutool.v7.ai.core.AIServiceProvider; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import java.util.Map; import java.util.ServiceLoader; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/AIUtil.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/AIUtil.java similarity index 89% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/AIUtil.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/AIUtil.java index 45f22eeaf..6aa1bb942 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/AIUtil.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/AIUtil.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.ai; +package cn.hutool.v7.ai; -import org.dromara.hutool.ai.core.AIConfig; -import org.dromara.hutool.ai.core.AIService; -import org.dromara.hutool.ai.core.Message; -import org.dromara.hutool.ai.model.deepseek.DeepSeekService; -import org.dromara.hutool.ai.model.doubao.DoubaoService; -import org.dromara.hutool.ai.model.grok.GrokService; -import org.dromara.hutool.ai.model.openai.OpenaiService; +import cn.hutool.v7.ai.core.AIConfig; +import cn.hutool.v7.ai.core.AIService; +import cn.hutool.v7.ai.core.Message; +import cn.hutool.v7.ai.model.deepseek.DeepSeekService; +import cn.hutool.v7.ai.model.doubao.DoubaoService; +import cn.hutool.v7.ai.model.grok.GrokService; +import cn.hutool.v7.ai.model.openai.OpenaiService; import java.util.List; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/ModelName.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/ModelName.java similarity index 97% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/ModelName.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/ModelName.java index 3ae1718e5..8877df1d4 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/ModelName.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/ModelName.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.ai; +package cn.hutool.v7.ai; /** * 模型厂商的名称（不指具体的模型） diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/Models.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/Models.java similarity index 99% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/Models.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/Models.java index ed2ab92c4..27688a487 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/Models.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/Models.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.ai; +package cn.hutool.v7.ai; /** * 各模型厂商包含的model（指具体的模型） diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIConfig.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIConfig.java similarity index 98% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIConfig.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIConfig.java index 1980b76f6..1956f7128 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIConfig.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.ai.core; +package cn.hutool.v7.ai.core; import java.util.Map; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIConfigBuilder.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIConfigBuilder.java similarity index 98% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIConfigBuilder.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIConfigBuilder.java index 060fa8a3e..f44229083 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIConfigBuilder.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIConfigBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.ai.core; +package cn.hutool.v7.ai.core; import java.lang.reflect.Constructor; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIConfigRegistry.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIConfigRegistry.java similarity index 93% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIConfigRegistry.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIConfigRegistry.java index 7d03ed456..c08188e29 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIConfigRegistry.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIConfigRegistry.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.ai.core; +package cn.hutool.v7.ai.core; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import java.util.Map; import java.util.ServiceLoader; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIService.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIService.java similarity index 96% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIService.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIService.java index fd049ed5f..c236a0d25 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIService.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.ai.core; +package cn.hutool.v7.ai.core; import java.util.List; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIServiceProvider.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIServiceProvider.java similarity index 96% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIServiceProvider.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIServiceProvider.java index be435b73d..c586f9f22 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIServiceProvider.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIServiceProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.ai.core; +package cn.hutool.v7.ai.core; /** * 用于加载AI服务,每一个通过SPI创建的AI服务都要实现此接口 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/BaseAIService.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/BaseAIService.java similarity index 90% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/core/BaseAIService.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/core/BaseAIService.java index 5a0a18a9a..a45a43c5d 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/BaseAIService.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/BaseAIService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.ai.core; +package cn.hutool.v7.ai.core; -import org.dromara.hutool.ai.AIException; -import org.dromara.hutool.http.HttpGlobalConfig; -import org.dromara.hutool.http.HttpUtil; -import org.dromara.hutool.http.client.Response; -import org.dromara.hutool.http.meta.HeaderName; -import org.dromara.hutool.http.meta.Method; +import cn.hutool.v7.ai.AIException; +import cn.hutool.v7.http.HttpGlobalConfig; +import cn.hutool.v7.http.HttpUtil; +import cn.hutool.v7.http.client.Response; +import cn.hutool.v7.http.meta.HeaderName; +import cn.hutool.v7.http.meta.Method; import java.util.Map; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/BaseConfig.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/BaseConfig.java similarity index 94% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/core/BaseConfig.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/core/BaseConfig.java index 20f195b77..55a73c802 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/BaseConfig.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/BaseConfig.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.ai.core; +package cn.hutool.v7.ai.core; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import java.util.Map; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/Message.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/Message.java similarity index 97% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/core/Message.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/core/Message.java index 6bb85c2a4..2cb5d5832 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/Message.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/Message.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.ai.core; +package cn.hutool.v7.ai.core; /** * 公共Message类 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/package-info.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/package-info.java similarity index 94% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/core/package-info.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/core/package-info.java index 97575b34e..1f0af7232 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/core/package-info.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/core/package-info.java @@ -21,4 +21,4 @@ * @since 6.0.0 */ -package org.dromara.hutool.ai.core; +package cn.hutool.v7.ai.core; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekCommon.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekCommon.java similarity index 93% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekCommon.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekCommon.java index 440fe54b1..72519688e 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekCommon.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekCommon.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.deepseek; +package cn.hutool.v7.ai.model.deepseek; /** * deepSeek公共类 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekConfig.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekConfig.java similarity index 89% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekConfig.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekConfig.java index e7ac42db0..0adfa9892 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekConfig.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.deepseek; +package cn.hutool.v7.ai.model.deepseek; -import org.dromara.hutool.ai.Models; -import org.dromara.hutool.ai.core.BaseConfig; +import cn.hutool.v7.ai.Models; +import cn.hutool.v7.ai.core.BaseConfig; /** * DeepSeek配置类，初始化API接口地址，设置默认的模型 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekProvider.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekProvider.java similarity index 86% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekProvider.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekProvider.java index cb58671b6..615cf695f 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekProvider.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekProvider.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.deepseek; +package cn.hutool.v7.ai.model.deepseek; -import org.dromara.hutool.ai.core.AIConfig; -import org.dromara.hutool.ai.core.AIServiceProvider; +import cn.hutool.v7.ai.core.AIConfig; +import cn.hutool.v7.ai.core.AIServiceProvider; /** * 创建DeepSeek服务实现类 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekService.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekService.java similarity index 92% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekService.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekService.java index f82b58d1f..aae2f19c5 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekService.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekService.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.deepseek; +package cn.hutool.v7.ai.model.deepseek; -import org.dromara.hutool.ai.core.AIService; +import cn.hutool.v7.ai.core.AIService; /** * deepSeek支持的扩展接口 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekServiceImpl.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekServiceImpl.java similarity index 91% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekServiceImpl.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekServiceImpl.java index b9897d36d..c38a80e28 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekServiceImpl.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekServiceImpl.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.deepseek; +package cn.hutool.v7.ai.model.deepseek; -import org.dromara.hutool.ai.core.AIConfig; -import org.dromara.hutool.ai.core.BaseAIService; -import org.dromara.hutool.ai.core.Message; -import org.dromara.hutool.http.client.Response; -import org.dromara.hutool.json.JSONUtil; +import cn.hutool.v7.ai.core.AIConfig; +import cn.hutool.v7.ai.core.BaseAIService; +import cn.hutool.v7.ai.core.Message; +import cn.hutool.v7.http.client.Response; +import cn.hutool.v7.json.JSONUtil; import java.util.ArrayList; import java.util.HashMap; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/package-info.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/package-info.java similarity index 93% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/package-info.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/package-info.java index 553dfbf37..1d74cbda9 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/package-info.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/package-info.java @@ -21,4 +21,4 @@ * @since 6.0.0 */ -package org.dromara.hutool.ai.model.deepseek; +package cn.hutool.v7.ai.model.deepseek; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoCommon.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoCommon.java similarity index 98% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoCommon.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoCommon.java index c8e9ddd9c..eac1a8cb0 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoCommon.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoCommon.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.doubao; +package cn.hutool.v7.ai.model.doubao; /** * doubao公共类 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoConfig.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoConfig.java similarity index 90% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoConfig.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoConfig.java index fa8a588e7..af52c9970 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoConfig.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.doubao; +package cn.hutool.v7.ai.model.doubao; -import org.dromara.hutool.ai.Models; -import org.dromara.hutool.ai.core.BaseConfig; +import cn.hutool.v7.ai.Models; +import cn.hutool.v7.ai.core.BaseConfig; /** * Doubao配置类，初始化API接口地址，设置默认的模型 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoProvider.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoProvider.java similarity index 86% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoProvider.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoProvider.java index cf6dd5fcc..d7227175d 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoProvider.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoProvider.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.doubao; +package cn.hutool.v7.ai.model.doubao; -import org.dromara.hutool.ai.core.AIConfig; -import org.dromara.hutool.ai.core.AIServiceProvider; +import cn.hutool.v7.ai.core.AIConfig; +import cn.hutool.v7.ai.core.AIServiceProvider; /** * 创建Doubap服务实现类 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoService.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoService.java similarity index 98% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoService.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoService.java index 37d86b01e..b346bc2eb 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoService.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.doubao; +package cn.hutool.v7.ai.model.doubao; -import org.dromara.hutool.ai.core.AIService; -import org.dromara.hutool.ai.core.Message; +import cn.hutool.v7.ai.core.AIService; +import cn.hutool.v7.ai.core.Message; import java.util.List; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoServiceImpl.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceImpl.java similarity index 97% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoServiceImpl.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceImpl.java index 60daf124d..a7afc44ce 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoServiceImpl.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.doubao; +package cn.hutool.v7.ai.model.doubao; -import org.dromara.hutool.ai.core.AIConfig; -import org.dromara.hutool.ai.core.BaseAIService; -import org.dromara.hutool.ai.core.Message; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.http.client.Response; -import org.dromara.hutool.json.JSONUtil; +import cn.hutool.v7.ai.core.AIConfig; +import cn.hutool.v7.ai.core.BaseAIService; +import cn.hutool.v7.ai.core.Message; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.http.client.Response; +import cn.hutool.v7.json.JSONUtil; import java.util.ArrayList; import java.util.HashMap; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/package-info.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/package-info.java similarity index 93% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/package-info.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/package-info.java index cd40edd94..ad32fa371 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/package-info.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/package-info.java @@ -21,4 +21,4 @@ * @since 6.0.0 */ -package org.dromara.hutool.ai.model.doubao; +package cn.hutool.v7.ai.model.doubao; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokCommon.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokCommon.java similarity index 95% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokCommon.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokCommon.java index 98a156bf4..7692537c9 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokCommon.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokCommon.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.grok; +package cn.hutool.v7.ai.model.grok; /** * grok公共类 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokConfig.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokConfig.java similarity index 89% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokConfig.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokConfig.java index 461a21437..31b8b021a 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokConfig.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.grok; +package cn.hutool.v7.ai.model.grok; -import org.dromara.hutool.ai.Models; -import org.dromara.hutool.ai.core.BaseConfig; +import cn.hutool.v7.ai.Models; +import cn.hutool.v7.ai.core.BaseConfig; /** * Grok配置类，初始化API接口地址，设置默认的模型 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokProvider.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokProvider.java similarity index 86% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokProvider.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokProvider.java index 78cbc517e..39e8cf5bc 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokProvider.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokProvider.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.grok; +package cn.hutool.v7.ai.model.grok; -import org.dromara.hutool.ai.core.AIConfig; -import org.dromara.hutool.ai.core.AIServiceProvider; +import cn.hutool.v7.ai.core.AIConfig; +import cn.hutool.v7.ai.core.AIServiceProvider; /** * 创建Grok服务实现类 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokService.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokService.java similarity index 96% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokService.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokService.java index b4bcbc0e9..4234e6702 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokService.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokService.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.grok; +package cn.hutool.v7.ai.model.grok; -import org.dromara.hutool.ai.core.AIService; +import cn.hutool.v7.ai.core.AIService; import java.util.List; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokServiceImpl.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokServiceImpl.java similarity index 95% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokServiceImpl.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokServiceImpl.java index 9353628f6..5c3f17396 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokServiceImpl.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokServiceImpl.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.grok; +package cn.hutool.v7.ai.model.grok; -import org.dromara.hutool.ai.core.AIConfig; -import org.dromara.hutool.ai.core.BaseAIService; -import org.dromara.hutool.ai.core.Message; -import org.dromara.hutool.http.client.Response; -import org.dromara.hutool.json.JSONUtil; +import cn.hutool.v7.ai.core.AIConfig; +import cn.hutool.v7.ai.core.BaseAIService; +import cn.hutool.v7.ai.core.Message; +import cn.hutool.v7.http.client.Response; +import cn.hutool.v7.json.JSONUtil; import java.util.ArrayList; import java.util.HashMap; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/package-info.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/package-info.java similarity index 94% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/package-info.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/package-info.java index 9cca48bd9..fa43f8824 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/package-info.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/package-info.java @@ -21,4 +21,4 @@ * @since 6.0.0 */ -package org.dromara.hutool.ai.model.grok; +package cn.hutool.v7.ai.model.grok; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiCommon.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiCommon.java similarity index 97% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiCommon.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiCommon.java index c9bae04ac..a73361b79 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiCommon.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiCommon.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.openai; +package cn.hutool.v7.ai.model.openai; /** * openai公共类 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiConfig.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiConfig.java similarity index 89% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiConfig.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiConfig.java index 3de62ea06..7779c24cc 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiConfig.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.openai; +package cn.hutool.v7.ai.model.openai; -import org.dromara.hutool.ai.Models; -import org.dromara.hutool.ai.core.BaseConfig; +import cn.hutool.v7.ai.Models; +import cn.hutool.v7.ai.core.BaseConfig; /** * openai配置类，初始化API接口地址，设置默认的模型 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiProvider.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiProvider.java similarity index 86% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiProvider.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiProvider.java index 114f60449..f1e6571a2 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiProvider.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiProvider.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.openai; +package cn.hutool.v7.ai.model.openai; -import org.dromara.hutool.ai.core.AIConfig; -import org.dromara.hutool.ai.core.AIServiceProvider; +import cn.hutool.v7.ai.core.AIConfig; +import cn.hutool.v7.ai.core.AIServiceProvider; /** * 创建Openai服务实现类 diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiService.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiService.java similarity index 97% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiService.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiService.java index 1c8dbddd2..ce7900e79 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiService.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.openai; +package cn.hutool.v7.ai.model.openai; -import org.dromara.hutool.ai.core.AIService; -import org.dromara.hutool.ai.core.Message; +import cn.hutool.v7.ai.core.AIService; +import cn.hutool.v7.ai.core.Message; import java.io.File; import java.io.InputStream; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiServiceImpl.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiServiceImpl.java similarity index 96% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiServiceImpl.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiServiceImpl.java index e337a0017..89e06937b 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiServiceImpl.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiServiceImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.openai; +package cn.hutool.v7.ai.model.openai; -import org.dromara.hutool.ai.core.AIConfig; -import org.dromara.hutool.ai.core.BaseAIService; -import org.dromara.hutool.ai.core.Message; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.http.client.Response; -import org.dromara.hutool.json.JSONUtil; +import cn.hutool.v7.ai.core.AIConfig; +import cn.hutool.v7.ai.core.BaseAIService; +import cn.hutool.v7.ai.core.Message; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.http.client.Response; +import cn.hutool.v7.json.JSONUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/package-info.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/package-info.java similarity index 93% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/package-info.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/package-info.java index e16e22946..032790275 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/package-info.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/package-info.java @@ -21,4 +21,4 @@ * @since 6.0.0 */ -package org.dromara.hutool.ai.model.openai; +package cn.hutool.v7.ai.model.openai; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/package-info.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/package-info.java similarity index 94% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/model/package-info.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/model/package-info.java index 7a264876c..f4dab1592 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/model/package-info.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/package-info.java @@ -21,4 +21,4 @@ * @since 6.0.0 */ -package org.dromara.hutool.ai.model; +package cn.hutool.v7.ai.model; diff --git a/hutool-ai/src/main/java/org/dromara/hutool/ai/package-info.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/package-info.java similarity index 96% rename from hutool-ai/src/main/java/org/dromara/hutool/ai/package-info.java rename to hutool-ai/src/main/java/cn/hutool/v7/ai/package-info.java index 35cd681c4..365570fb4 100644 --- a/hutool-ai/src/main/java/org/dromara/hutool/ai/package-info.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/package-info.java @@ -21,4 +21,4 @@ * @since 6.0.0 */ -package org.dromara.hutool.ai; +package cn.hutool.v7.ai; diff --git a/hutool-ai/src/main/resources/META-INF/services/cn.hutool.v7.ai.core.AIConfig b/hutool-ai/src/main/resources/META-INF/services/cn.hutool.v7.ai.core.AIConfig new file mode 100644 index 000000000..70cdb09d1 --- /dev/null +++ b/hutool-ai/src/main/resources/META-INF/services/cn.hutool.v7.ai.core.AIConfig @@ -0,0 +1,4 @@ +cn.hutool.v7.ai.model.deepseek.DeepSeekConfig +cn.hutool.v7.ai.model.openai.OpenaiConfig +cn.hutool.v7.ai.model.doubao.DoubaoConfig +cn.hutool.v7.ai.model.grok.GrokConfig diff --git a/hutool-ai/src/main/resources/META-INF/services/cn.hutool.v7.ai.core.AIServiceProvider b/hutool-ai/src/main/resources/META-INF/services/cn.hutool.v7.ai.core.AIServiceProvider new file mode 100644 index 000000000..ca0df6d59 --- /dev/null +++ b/hutool-ai/src/main/resources/META-INF/services/cn.hutool.v7.ai.core.AIServiceProvider @@ -0,0 +1,4 @@ +cn.hutool.v7.ai.model.deepseek.DeepSeekProvider +cn.hutool.v7.ai.model.openai.OpenaiProvider +cn.hutool.v7.ai.model.doubao.DoubaoProvider +cn.hutool.v7.ai.model.grok.GrokProvider diff --git a/hutool-ai/src/main/resources/META-INF/services/org.dromara.hutool.ai.core.AIConfig b/hutool-ai/src/main/resources/META-INF/services/org.dromara.hutool.ai.core.AIConfig deleted file mode 100644 index 211e9ad56..000000000 --- a/hutool-ai/src/main/resources/META-INF/services/org.dromara.hutool.ai.core.AIConfig +++ /dev/null @@ -1,4 +0,0 @@ -org.dromara.hutool.ai.model.deepseek.DeepSeekConfig -org.dromara.hutool.ai.model.openai.OpenaiConfig -org.dromara.hutool.ai.model.doubao.DoubaoConfig -org.dromara.hutool.ai.model.grok.GrokConfig diff --git a/hutool-ai/src/main/resources/META-INF/services/org.dromara.hutool.ai.core.AIServiceProvider b/hutool-ai/src/main/resources/META-INF/services/org.dromara.hutool.ai.core.AIServiceProvider deleted file mode 100644 index 97a1bb272..000000000 --- a/hutool-ai/src/main/resources/META-INF/services/org.dromara.hutool.ai.core.AIServiceProvider +++ /dev/null @@ -1,4 +0,0 @@ -org.dromara.hutool.ai.model.deepseek.DeepSeekProvider -org.dromara.hutool.ai.model.openai.OpenaiProvider -org.dromara.hutool.ai.model.doubao.DoubaoProvider -org.dromara.hutool.ai.model.grok.GrokProvider diff --git a/hutool-ai/src/test/java/org/dromara/hutool/ai/AIServiceFactoryTest.java b/hutool-ai/src/test/java/cn/hutool/v7/ai/AIServiceFactoryTest.java similarity index 86% rename from hutool-ai/src/test/java/org/dromara/hutool/ai/AIServiceFactoryTest.java rename to hutool-ai/src/test/java/cn/hutool/v7/ai/AIServiceFactoryTest.java index b87622b52..7ebafea20 100644 --- a/hutool-ai/src/test/java/org/dromara/hutool/ai/AIServiceFactoryTest.java +++ b/hutool-ai/src/test/java/cn/hutool/v7/ai/AIServiceFactoryTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.ai; +package cn.hutool.v7.ai; -import org.dromara.hutool.ai.core.AIConfigBuilder; -import org.dromara.hutool.ai.core.AIService; -import org.dromara.hutool.ai.model.deepseek.DeepSeekService; +import cn.hutool.v7.ai.core.AIConfigBuilder; +import cn.hutool.v7.ai.core.AIService; +import cn.hutool.v7.ai.model.deepseek.DeepSeekService; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/hutool-ai/src/test/java/org/dromara/hutool/ai/AIUtilTest.java b/hutool-ai/src/test/java/cn/hutool/v7/ai/AIUtilTest.java similarity index 86% rename from hutool-ai/src/test/java/org/dromara/hutool/ai/AIUtilTest.java rename to hutool-ai/src/test/java/cn/hutool/v7/ai/AIUtilTest.java index ab7d46456..0f5087fa0 100644 --- a/hutool-ai/src/test/java/org/dromara/hutool/ai/AIUtilTest.java +++ b/hutool-ai/src/test/java/cn/hutool/v7/ai/AIUtilTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.ai; +package cn.hutool.v7.ai; -import org.dromara.hutool.ai.core.AIConfigBuilder; -import org.dromara.hutool.ai.core.AIService; -import org.dromara.hutool.ai.core.Message; -import org.dromara.hutool.ai.model.deepseek.DeepSeekService; -import org.dromara.hutool.ai.model.doubao.DoubaoService; -import org.dromara.hutool.ai.model.grok.GrokService; -import org.dromara.hutool.ai.model.openai.OpenaiService; +import cn.hutool.v7.ai.core.AIConfigBuilder; +import cn.hutool.v7.ai.core.AIService; +import cn.hutool.v7.ai.core.Message; +import cn.hutool.v7.ai.model.deepseek.DeepSeekService; +import cn.hutool.v7.ai.model.doubao.DoubaoService; +import cn.hutool.v7.ai.model.grok.GrokService; +import cn.hutool.v7.ai.model.openai.OpenaiService; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/hutool-ai/src/test/java/org/dromara/hutool/ai/model/deepseek/DeepSeekServiceTest.java b/hutool-ai/src/test/java/cn/hutool/v7/ai/model/deepseek/DeepSeekServiceTest.java similarity index 89% rename from hutool-ai/src/test/java/org/dromara/hutool/ai/model/deepseek/DeepSeekServiceTest.java rename to hutool-ai/src/test/java/cn/hutool/v7/ai/model/deepseek/DeepSeekServiceTest.java index 47249046c..259716b71 100644 --- a/hutool-ai/src/test/java/org/dromara/hutool/ai/model/deepseek/DeepSeekServiceTest.java +++ b/hutool-ai/src/test/java/cn/hutool/v7/ai/model/deepseek/DeepSeekServiceTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.deepseek; +package cn.hutool.v7.ai.model.deepseek; -import org.dromara.hutool.ai.AIServiceFactory; -import org.dromara.hutool.ai.ModelName; -import org.dromara.hutool.ai.core.AIConfigBuilder; -import org.dromara.hutool.ai.core.Message; +import cn.hutool.v7.ai.AIServiceFactory; +import cn.hutool.v7.ai.ModelName; +import cn.hutool.v7.ai.core.AIConfigBuilder; +import cn.hutool.v7.ai.core.Message; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-ai/src/test/java/org/dromara/hutool/ai/model/doubao/DoubaoServiceTest.java b/hutool-ai/src/test/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceTest.java similarity index 96% rename from hutool-ai/src/test/java/org/dromara/hutool/ai/model/doubao/DoubaoServiceTest.java rename to hutool-ai/src/test/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceTest.java index f3147f2b4..d9f458033 100644 --- a/hutool-ai/src/test/java/org/dromara/hutool/ai/model/doubao/DoubaoServiceTest.java +++ b/hutool-ai/src/test/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.doubao; +package cn.hutool.v7.ai.model.doubao; -import org.dromara.hutool.ai.AIServiceFactory; -import org.dromara.hutool.ai.ModelName; -import org.dromara.hutool.ai.Models; -import org.dromara.hutool.ai.core.AIConfigBuilder; -import org.dromara.hutool.ai.core.Message; -import org.dromara.hutool.swing.img.ImgUtil; +import cn.hutool.v7.ai.AIServiceFactory; +import cn.hutool.v7.ai.ModelName; +import cn.hutool.v7.ai.Models; +import cn.hutool.v7.ai.core.AIConfigBuilder; +import cn.hutool.v7.ai.core.Message; +import cn.hutool.v7.swing.img.ImgUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-ai/src/test/java/org/dromara/hutool/ai/model/grok/GrokServiceTest.java b/hutool-ai/src/test/java/cn/hutool/v7/ai/model/grok/GrokServiceTest.java similarity index 91% rename from hutool-ai/src/test/java/org/dromara/hutool/ai/model/grok/GrokServiceTest.java rename to hutool-ai/src/test/java/cn/hutool/v7/ai/model/grok/GrokServiceTest.java index 13584798b..790b71c0a 100644 --- a/hutool-ai/src/test/java/org/dromara/hutool/ai/model/grok/GrokServiceTest.java +++ b/hutool-ai/src/test/java/cn/hutool/v7/ai/model/grok/GrokServiceTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.grok; +package cn.hutool.v7.ai.model.grok; -import org.dromara.hutool.ai.AIServiceFactory; -import org.dromara.hutool.ai.ModelName; -import org.dromara.hutool.ai.Models; -import org.dromara.hutool.ai.core.AIConfigBuilder; -import org.dromara.hutool.ai.core.Message; -import org.dromara.hutool.swing.img.ImgUtil; +import cn.hutool.v7.ai.AIServiceFactory; +import cn.hutool.v7.ai.ModelName; +import cn.hutool.v7.ai.Models; +import cn.hutool.v7.ai.core.AIConfigBuilder; +import cn.hutool.v7.ai.core.Message; +import cn.hutool.v7.swing.img.ImgUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-ai/src/test/java/org/dromara/hutool/ai/model/openai/OpenaiServiceTest.java b/hutool-ai/src/test/java/cn/hutool/v7/ai/model/openai/OpenaiServiceTest.java similarity index 95% rename from hutool-ai/src/test/java/org/dromara/hutool/ai/model/openai/OpenaiServiceTest.java rename to hutool-ai/src/test/java/cn/hutool/v7/ai/model/openai/OpenaiServiceTest.java index 55a88885d..b06cecf0b 100644 --- a/hutool-ai/src/test/java/org/dromara/hutool/ai/model/openai/OpenaiServiceTest.java +++ b/hutool-ai/src/test/java/cn/hutool/v7/ai/model/openai/OpenaiServiceTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.ai.model.openai; +package cn.hutool.v7.ai.model.openai; -import org.dromara.hutool.ai.AIServiceFactory; -import org.dromara.hutool.ai.ModelName; -import org.dromara.hutool.ai.Models; -import org.dromara.hutool.ai.core.AIConfigBuilder; -import org.dromara.hutool.ai.core.Message; -import org.dromara.hutool.core.io.file.FileUtil; +import cn.hutool.v7.ai.AIServiceFactory; +import cn.hutool.v7.ai.ModelName; +import cn.hutool.v7.ai.Models; +import cn.hutool.v7.ai.core.AIConfigBuilder; +import cn.hutool.v7.ai.core.Message; +import cn.hutool.v7.core.io.file.FileUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index bb65fef68..d7fa4b166 100755 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -23,9 +23,9 @@ jar - org.dromara.hutool + cn.hutool.v7 hutool-parent - 6.0.0-M22 + 7.0.0.M1 hutool-all diff --git a/hutool-all/src/main/java/org/dromara/hutool/Hutool.java b/hutool-all/src/main/java/cn/hutool/v7/Hutool.java similarity index 90% rename from hutool-all/src/main/java/org/dromara/hutool/Hutool.java rename to hutool-all/src/main/java/cn/hutool/v7/Hutool.java index b193a2661..c9ba8d609 100644 --- a/hutool-all/src/main/java/org/dromara/hutool/Hutool.java +++ b/hutool-all/src/main/java/cn/hutool/v7/Hutool.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool; +package cn.hutool.v7; -import org.dromara.hutool.core.lang.ConsoleTable; -import org.dromara.hutool.core.reflect.ClassUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.lang.ConsoleTable; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.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("org.dromara.hutool", + return ClassUtil.scanPackage("cn.hutool.v7", (clazz) -> (!clazz.isInterface()) && StrUtil.endWith(clazz.getSimpleName(), "Util")); } diff --git a/hutool-all/src/main/java/org/dromara/hutool/package-info.java b/hutool-all/src/main/java/cn/hutool/v7/package-info.java similarity index 97% rename from hutool-all/src/main/java/org/dromara/hutool/package-info.java rename to hutool-all/src/main/java/cn/hutool/v7/package-info.java index 5191fe603..f57ae6bbc 100644 --- a/hutool-all/src/main/java/org/dromara/hutool/package-info.java +++ b/hutool-all/src/main/java/cn/hutool/v7/package-info.java @@ -23,4 +23,4 @@ * * @author Looly */ -package org.dromara.hutool; +package cn.hutool.v7; diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index 705591679..b2584c0b2 100755 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -23,9 +23,9 @@ pom - org.dromara.hutool + cn.hutool.v7 hutool-parent - 6.0.0-M22 + 7.0.0.M1 hutool-bom diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index 27843333f..b2425be01 100755 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -23,9 +23,9 @@ jar - org.dromara.hutool + cn.hutool.v7 hutool-parent - 6.0.0-M22 + 7.0.0.M1 hutool-core @@ -33,7 +33,7 @@ Hutool核心，包括集合、字符串、Bean等工具 - org.dromara.hutool.core + cn.hutool.v7.core diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/Alias.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/Alias.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/Alias.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/Alias.java index d592555bb..7fea8fb74 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/Alias.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/Alias.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; import java.lang.annotation.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotatedElementUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotatedElementUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotatedElementUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotatedElementUtil.java index a8716cb49..8a2affb00 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotatedElementUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotatedElementUtil.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; -import org.dromara.hutool.core.annotation.elements.HierarchicalAnnotatedElements; -import org.dromara.hutool.core.annotation.elements.MetaAnnotatedElement; -import org.dromara.hutool.core.annotation.elements.RepeatableMetaAnnotatedElement; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.annotation.elements.HierarchicalAnnotatedElements; +import cn.hutool.v7.core.annotation.elements.MetaAnnotatedElement; +import cn.hutool.v7.core.annotation.elements.RepeatableMetaAnnotatedElement; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.util.ObjUtil; import java.lang.annotation.Annotation; import java.lang.annotation.Inherited; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMapping.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationMapping.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMapping.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationMapping.java index 80bd1708b..74df70066 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMapping.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMappingProxy.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationMappingProxy.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMappingProxy.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationMappingProxy.java index 9317d47fb..e069f3daf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMappingProxy.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationMappingProxy.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; -import org.dromara.hutool.core.reflect.method.MethodUtil; -import org.dromara.hutool.core.text.CharSequenceUtil; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.text.CharSequenceUtil; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationHandler; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationProxy.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationProxy.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationProxy.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationProxy.java index 3323eae33..38c5b0a90 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationProxy.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationProxy.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; -import org.dromara.hutool.core.reflect.method.MethodUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.lang.annotation.Annotation; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationUtil.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationUtil.java index 2984485d2..2aea993c8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationUtil.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; -import org.dromara.hutool.core.annotation.elements.CombinationAnnotatedElement; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.func.LambdaInfo; -import org.dromara.hutool.core.func.LambdaUtil; -import org.dromara.hutool.core.func.SerFunction; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; -import org.dromara.hutool.core.reflect.FieldUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; -import org.dromara.hutool.core.text.CharSequenceUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.annotation.elements.CombinationAnnotatedElement; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.func.LambdaInfo; +import cn.hutool.v7.core.func.LambdaUtil; +import cn.hutool.v7.core.func.SerFunction; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.reflect.FieldUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.text.CharSequenceUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.lang.annotation.*; import java.lang.reflect.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/GenericAnnotationMapping.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/GenericAnnotationMapping.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/GenericAnnotationMapping.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/GenericAnnotationMapping.java index 141b50715..64290235c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/GenericAnnotationMapping.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/GenericAnnotationMapping.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; -import org.dromara.hutool.core.reflect.ClassUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; -import org.dromara.hutool.core.text.CharSequenceUtil; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.text.CharSequenceUtil; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/PropIgnore.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/PropIgnore.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/PropIgnore.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/PropIgnore.java index 7257245f0..6c9a2731e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/PropIgnore.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/PropIgnore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/ReadableBean.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/ReadableBean.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/ReadableBean.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/ReadableBean.java index 21e9bbe34..3ca31d9e6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/ReadableBean.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/ReadableBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; import java.lang.annotation.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollector.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/RepeatableAnnotationCollector.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollector.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/RepeatableAnnotationCollector.java index 37c68eed4..26f4bbce8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollector.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/RepeatableAnnotationCollector.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; -import org.dromara.hutool.core.reflect.method.MethodUtil; -import org.dromara.hutool.core.text.CharSequenceUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.text.CharSequenceUtil; import java.lang.annotation.Annotation; import java.lang.annotation.Repeatable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMapping.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/ResolvedAnnotationMapping.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMapping.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/ResolvedAnnotationMapping.java index d06ae53cc..a9c543821 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMapping.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/ResolvedAnnotationMapping.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; -import org.dromara.hutool.core.annotation.elements.MetaAnnotatedElement; -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.method.MethodUtil; -import org.dromara.hutool.core.text.CharSequenceUtil; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.annotation.elements.MetaAnnotatedElement; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.multi.Graph; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.text.CharSequenceUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/WritableBean.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/WritableBean.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/WritableBean.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/WritableBean.java index 75635ba45..56d913d33 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/WritableBean.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/WritableBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; import java.lang.annotation.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/CombinationAnnotatedElement.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/CombinationAnnotatedElement.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/CombinationAnnotatedElement.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/CombinationAnnotatedElement.java index 46a7c9201..f508f2ef6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/CombinationAnnotatedElement.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/CombinationAnnotatedElement.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation.elements; +package cn.hutool.v7.core.annotation.elements; -import org.dromara.hutool.core.annotation.AnnotationUtil; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.map.TableMap; +import cn.hutool.v7.core.annotation.AnnotationUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.map.TableMap; import java.io.Serializable; import java.lang.annotation.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/HierarchicalAnnotatedElements.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/HierarchicalAnnotatedElements.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/HierarchicalAnnotatedElements.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/HierarchicalAnnotatedElements.java index 99db7f121..29992ae95 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/HierarchicalAnnotatedElements.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/HierarchicalAnnotatedElements.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation.elements; +package cn.hutool.v7.core.annotation.elements; -import org.dromara.hutool.core.annotation.AnnotationUtil; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.reflect.ClassUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; -import org.dromara.hutool.core.text.CharSequenceUtil; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.annotation.AnnotationUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.text.CharSequenceUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/MetaAnnotatedElement.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/MetaAnnotatedElement.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/MetaAnnotatedElement.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/MetaAnnotatedElement.java index 8f10e552b..f054ff350 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/MetaAnnotatedElement.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/MetaAnnotatedElement.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation.elements; +package cn.hutool.v7.core.annotation.elements; -import org.dromara.hutool.core.annotation.AnnotationMapping; -import org.dromara.hutool.core.annotation.AnnotationUtil; -import org.dromara.hutool.core.annotation.ResolvedAnnotationMapping; -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 cn.hutool.v7.core.annotation.AnnotationMapping; +import cn.hutool.v7.core.annotation.AnnotationUtil; +import cn.hutool.v7.core.annotation.ResolvedAnnotationMapping; +import cn.hutool.v7.core.stream.EasyStream; +import cn.hutool.v7.core.text.CharSequenceUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.lang.annotation.Annotation; import java.lang.annotation.Inherited; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/RepeatableMetaAnnotatedElement.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/RepeatableMetaAnnotatedElement.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/RepeatableMetaAnnotatedElement.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/RepeatableMetaAnnotatedElement.java index 166744388..ed46c11f2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/RepeatableMetaAnnotatedElement.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/RepeatableMetaAnnotatedElement.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation.elements; +package cn.hutool.v7.core.annotation.elements; -import org.dromara.hutool.core.annotation.AnnotationMapping; -import org.dromara.hutool.core.annotation.AnnotationUtil; -import org.dromara.hutool.core.annotation.RepeatableAnnotationCollector; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.text.CharSequenceUtil; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.annotation.AnnotationMapping; +import cn.hutool.v7.core.annotation.AnnotationUtil; +import cn.hutool.v7.core.annotation.RepeatableAnnotationCollector; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.text.CharSequenceUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/package-info.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/package-info.java index 9bf8c08b0..da00f2c70 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/package-info.java @@ -19,4 +19,4 @@ * * @author Looly, huangchengxing */ -package org.dromara.hutool.core.annotation.elements; +package cn.hutool.v7.core.annotation.elements; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/package-info.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/annotation/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/annotation/package-info.java index 70feac36f..410a5be1c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/annotation/package-info.java @@ -26,4 +26,4 @@ * @author Looly * */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/array/ArrayUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/array/ArrayUtil.java index 9d032bbc4..44407416c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/array/ArrayUtil.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.dromara.hutool.core.array; +package cn.hutool.v7.core.array; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.collection.set.UniqueKeySet; -import org.dromara.hutool.core.comparator.CompareUtil; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.exception.ExceptionUtil; -import org.dromara.hutool.core.exception.HutoolException; -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 cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.collection.set.UniqueKeySet; +import cn.hutool.v7.core.comparator.CompareUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.text.StrJoiner; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; +import cn.hutool.v7.core.util.RandomUtil; import java.lang.reflect.Array; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java b/hutool-core/src/main/java/cn/hutool/v7/core/array/ArrayWrapper.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java rename to hutool-core/src/main/java/cn/hutool/v7/core/array/ArrayWrapper.java index 342f0a208..5cb61e36b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/array/ArrayWrapper.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.array; +package cn.hutool.v7.core.array; -import org.dromara.hutool.core.collection.iter.ArrayIter; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.lang.wrapper.Wrapper; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.Validator; -import org.dromara.hutool.core.reflect.ClassUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.collection.iter.ArrayIter; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.lang.wrapper.Wrapper; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.Validator; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/array/PrimitiveArrayUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/array/PrimitiveArrayUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/array/PrimitiveArrayUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/array/PrimitiveArrayUtil.java index 6e40c2764..0b6c525b5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/array/PrimitiveArrayUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/array/PrimitiveArrayUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.array; +package cn.hutool.v7.core.array; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.math.NumberUtil; -import org.dromara.hutool.core.util.ObjUtil; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.math.NumberUtil; +import cn.hutool.v7.core.util.ObjUtil; +import cn.hutool.v7.core.util.RandomUtil; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/array/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/array/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/array/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/array/package-info.java index af6091670..c2356bf69 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/array/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/array/package-info.java @@ -19,4 +19,4 @@ * * @author Looly */ -package org.dromara.hutool.core.array; +package cn.hutool.v7.core.array; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDesc.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanDesc.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDesc.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanDesc.java index 0e35cf9b6..7ab2cf51f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDesc.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanDesc.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.reflect.Invoker; +import cn.hutool.v7.core.reflect.Invoker; import java.io.Serializable; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDescFactory.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanDescFactory.java similarity index 88% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDescFactory.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanDescFactory.java index 83006f9a8..27dfb6cf3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDescFactory.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanDescFactory.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; -import org.dromara.hutool.core.reflect.FieldUtil; -import org.dromara.hutool.core.reflect.JdkProxyUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.reflect.FieldUtil; +import cn.hutool.v7.core.reflect.JdkProxyUtil; /** * Bean描述信息工厂类
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanException.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanException.java index 15797a4df..aee2a4ed6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; /** * Bean异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanInfoCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanInfoCache.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanInfoCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanInfoCache.java index aa8f996ff..866c67375 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanInfoCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanInfoCache.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.func.SerSupplier; -import org.dromara.hutool.core.map.reference.ReferenceConcurrentMap; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.func.SerSupplier; +import cn.hutool.v7.core.map.reference.ReferenceConcurrentMap; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; import java.beans.PropertyDescriptor; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanUtil.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanUtil.java index d7c8b7a0f..e0690eefe 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanUtil.java @@ -14,30 +14,30 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.annotation.AnnotationUtil; -import org.dromara.hutool.core.annotation.ReadableBean; -import org.dromara.hutool.core.annotation.WritableBean; -import org.dromara.hutool.core.array.ArrayUtil; -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.bean.path.BeanPath; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.convert.impl.RecordConverter; -import org.dromara.hutool.core.lang.mutable.MutableEntry; -import org.dromara.hutool.core.map.BeanMap; -import org.dromara.hutool.core.map.CaseInsensitiveMap; -import org.dromara.hutool.core.map.Dict; -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.util.ObjUtil; +import cn.hutool.v7.core.annotation.AnnotationUtil; +import cn.hutool.v7.core.annotation.ReadableBean; +import cn.hutool.v7.core.annotation.WritableBean; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.bean.copier.BeanCopier; +import cn.hutool.v7.core.bean.copier.CopyOptions; +import cn.hutool.v7.core.bean.copier.ValueProvider; +import cn.hutool.v7.core.bean.path.BeanPath; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.convert.impl.RecordConverter; +import cn.hutool.v7.core.lang.mutable.MutableEntry; +import cn.hutool.v7.core.map.BeanMap; +import cn.hutool.v7.core.map.CaseInsensitiveMap; +import cn.hutool.v7.core.map.Dict; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.FieldUtil; +import cn.hutool.v7.core.reflect.ModifierUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.beans.*; import java.lang.reflect.Field; @@ -563,8 +563,8 @@ public class BeanUtil { /** * 给定的Bean的类名是否匹配指定类名字符串
- * 如果isSimple为{@code true}，则只匹配类名而忽略包名，例如：org.dromara.hutool.TestEntity只匹配TestEntity
- * 如果isSimple为{@code false}，则匹配包括包名的全类名，例如：org.dromara.hutool.TestEntity匹配org.dromara.hutool.TestEntity + * 如果isSimple为{@code true}，则只匹配类名而忽略包名，例如：cn.hutool.v7.TestEntity只匹配TestEntity
+ * 如果isSimple为{@code false}，则匹配包括包名的全类名，例如：cn.hutool.v7.TestEntity匹配cn.hutool.v7.TestEntity * * @param bean Bean * @param beanClassName Bean的类名 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/DynaBean.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/DynaBean.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/DynaBean.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/DynaBean.java index fcb9ed44d..9ebe6d229 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/DynaBean.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/DynaBean.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -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.convert.ConvertUtil; -import org.dromara.hutool.core.exception.CloneException; -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.method.MethodUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.exception.CloneException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; import java.io.Serializable; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/NullWrapperBean.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/NullWrapperBean.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/NullWrapperBean.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/NullWrapperBean.java index e7cb5ea36..b9bd75044 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/NullWrapperBean.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/NullWrapperBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; /** * 为了解决反射过程中,需要传递null参数,但是会丢失参数类型而设立的包装类 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/PropDesc.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/PropDesc.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/PropDesc.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/PropDesc.java index cc3aa2c1e..bee62e1fb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/PropDesc.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/PropDesc.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.annotation.AnnotationUtil; -import org.dromara.hutool.core.annotation.PropIgnore; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.reflect.*; -import org.dromara.hutool.core.reflect.method.MethodInvoker; +import cn.hutool.v7.core.annotation.AnnotationUtil; +import cn.hutool.v7.core.annotation.PropIgnore; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.reflect.*; +import cn.hutool.v7.core.reflect.method.MethodInvoker; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/RecordBeanDesc.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/RecordBeanDesc.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/RecordBeanDesc.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/RecordBeanDesc.java index 22699fa1d..812407629 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/RecordBeanDesc.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/RecordBeanDesc.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.bean.path.AbstractBeanDesc; -import org.dromara.hutool.core.reflect.FieldUtil; -import org.dromara.hutool.core.reflect.ModifierUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.bean.path.AbstractBeanDesc; +import cn.hutool.v7.core.reflect.FieldUtil; +import cn.hutool.v7.core.reflect.ModifierUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/RecordUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/RecordUtil.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/RecordUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/RecordUtil.java index ff0bf8e1e..856ad5fb5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/RecordUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/RecordUtil.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.bean.copier.ValueProvider; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.reflect.ConstructorUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; -import org.dromara.hutool.core.util.JdkUtil; +import cn.hutool.v7.core.bean.copier.ValueProvider; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.util.JdkUtil; import java.lang.reflect.Method; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/SimpleBeanDesc.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/SimpleBeanDesc.java similarity index 90% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/SimpleBeanDesc.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/SimpleBeanDesc.java index 3f0ee6614..62de028f5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/SimpleBeanDesc.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/SimpleBeanDesc.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.bean.path.AbstractBeanDesc; -import org.dromara.hutool.core.reflect.method.MethodInvoker; -import org.dromara.hutool.core.reflect.method.MethodNameUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; -import org.dromara.hutool.core.util.BooleanUtil; +import cn.hutool.v7.core.bean.path.AbstractBeanDesc; +import cn.hutool.v7.core.reflect.method.MethodInvoker; +import cn.hutool.v7.core.reflect.method.MethodNameUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.util.BooleanUtil; import java.lang.reflect.Method; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/StrictBeanDesc.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/StrictBeanDesc.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/StrictBeanDesc.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/StrictBeanDesc.java index caa5d7055..64438f8da 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/StrictBeanDesc.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/StrictBeanDesc.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.bean.path.AbstractBeanDesc; -import org.dromara.hutool.core.reflect.ClassUtil; -import org.dromara.hutool.core.reflect.FieldUtil; -import org.dromara.hutool.core.reflect.ModifierUtil; -import org.dromara.hutool.core.reflect.method.MethodNameUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.BooleanUtil; +import cn.hutool.v7.core.bean.path.AbstractBeanDesc; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.FieldUtil; +import cn.hutool.v7.core.reflect.ModifierUtil; +import cn.hutool.v7.core.reflect.method.MethodNameUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.BooleanUtil; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/AbsCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/AbsCopier.java similarity index 86% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/AbsCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/AbsCopier.java index 85621a742..13811661f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/AbsCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/AbsCopier.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier; +package cn.hutool.v7.core.bean.copier; -import org.dromara.hutool.core.bean.BeanDesc; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.lang.copier.Copier; -import org.dromara.hutool.core.reflect.ConstructorUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.bean.BeanDesc; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.lang.copier.Copier; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.util.ObjUtil; /** * 抽象的对象拷贝封装，提供来源对象、目标对象持有 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanCopier.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanCopier.java index 3f475116e..710d7f53c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanCopier.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier; +package cn.hutool.v7.core.bean.copier; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.copier.Copier; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.copier.Copier; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToBeanCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanToBeanCopier.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToBeanCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanToBeanCopier.java index a3477c088..dd4f66738 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToBeanCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanToBeanCopier.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier; +package cn.hutool.v7.core.bean.copier; -import org.dromara.hutool.core.bean.BeanException; -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.MapUtil; -import org.dromara.hutool.core.reflect.TypeUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.bean.BeanException; +import cn.hutool.v7.core.bean.PropDesc; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.mutable.MutableEntry; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.text.StrUtil; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToMapCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanToMapCopier.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToMapCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanToMapCopier.java index 9f7ea3e43..49db5ddb0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToMapCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanToMapCopier.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier; +package cn.hutool.v7.core.bean.copier; -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 org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.bean.PropDesc; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.mutable.MutableEntry; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.text.StrUtil; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/CopyOptions.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/CopyOptions.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/CopyOptions.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/CopyOptions.java index f3b59cfe1..02badfa60 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/CopyOptions.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/CopyOptions.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier; +package cn.hutool.v7.core.bean.copier; -import org.dromara.hutool.core.bean.BeanDesc; -import org.dromara.hutool.core.bean.PropDesc; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.convert.Converter; -import org.dromara.hutool.core.func.LambdaUtil; -import org.dromara.hutool.core.func.SerFunction; -import org.dromara.hutool.core.lang.mutable.MutableEntry; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.bean.BeanDesc; +import cn.hutool.v7.core.bean.PropDesc; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.convert.Converter; +import cn.hutool.v7.core.func.LambdaUtil; +import cn.hutool.v7.core.func.SerFunction; +import cn.hutool.v7.core.lang.mutable.MutableEntry; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.lang.reflect.Field; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToBeanCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/MapToBeanCopier.java similarity index 90% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToBeanCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/MapToBeanCopier.java index b4dd48037..668414889 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToBeanCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/MapToBeanCopier.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier; +package cn.hutool.v7.core.bean.copier; -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 cn.hutool.v7.core.bean.PropDesc; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.mutable.MutableEntry; +import cn.hutool.v7.core.map.CaseInsensitiveMap; +import cn.hutool.v7.core.map.MapWrapper; +import cn.hutool.v7.core.reflect.TypeUtil; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToMapCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/MapToMapCopier.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToMapCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/MapToMapCopier.java index 01625193a..2c6d35db5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToMapCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/MapToMapCopier.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier; +package cn.hutool.v7.core.bean.copier; -import org.dromara.hutool.core.lang.mutable.MutableEntry; -import org.dromara.hutool.core.reflect.TypeUtil; +import cn.hutool.v7.core.lang.mutable.MutableEntry; +import cn.hutool.v7.core.reflect.TypeUtil; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProvider.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/ValueProvider.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProvider.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/ValueProvider.java index 42e973878..70e6e5656 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProvider.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/ValueProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier; +package cn.hutool.v7.core.bean.copier; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProviderToBeanCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/ValueProviderToBeanCopier.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProviderToBeanCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/ValueProviderToBeanCopier.java index b1d2adf97..85a0d811a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProviderToBeanCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/ValueProviderToBeanCopier.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier; +package cn.hutool.v7.core.bean.copier; -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 org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.bean.PropDesc; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.mutable.MutableEntry; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.text.StrUtil; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/package-info.java index 36af197b2..05f442fa5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.bean.copier; +package cn.hutool.v7.core.bean.copier; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/BeanValueProvider.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/provider/BeanValueProvider.java similarity index 86% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/BeanValueProvider.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/provider/BeanValueProvider.java index 1218fac2e..52762de2e 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/BeanValueProvider.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/provider/BeanValueProvider.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier.provider; +package cn.hutool.v7.core.bean.copier.provider; -import org.dromara.hutool.core.bean.BeanDesc; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.bean.PropDesc; -import org.dromara.hutool.core.bean.copier.ValueProvider; +import cn.hutool.v7.core.bean.BeanDesc; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.bean.PropDesc; +import cn.hutool.v7.core.bean.copier.ValueProvider; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/DynaBeanValueProvider.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/provider/DynaBeanValueProvider.java similarity index 87% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/DynaBeanValueProvider.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/provider/DynaBeanValueProvider.java index 0b2c4f2de..da1e8fc56 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/DynaBeanValueProvider.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/provider/DynaBeanValueProvider.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier.provider; +package cn.hutool.v7.core.bean.copier.provider; -import org.dromara.hutool.core.bean.DynaBean; -import org.dromara.hutool.core.bean.copier.ValueProvider; -import org.dromara.hutool.core.convert.ConvertUtil; +import cn.hutool.v7.core.bean.DynaBean; +import cn.hutool.v7.core.bean.copier.ValueProvider; +import cn.hutool.v7.core.convert.ConvertUtil; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/MapValueProvider.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/provider/MapValueProvider.java similarity index 87% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/MapValueProvider.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/provider/MapValueProvider.java index a809f20e2..ac9a9a4f9 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/MapValueProvider.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/provider/MapValueProvider.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier.provider; +package cn.hutool.v7.core.bean.copier.provider; -import org.dromara.hutool.core.bean.copier.ValueProvider; -import org.dromara.hutool.core.convert.ConvertUtil; +import cn.hutool.v7.core.bean.copier.ValueProvider; +import cn.hutool.v7.core.convert.ConvertUtil; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/provider/package-info.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/provider/package-info.java index 1c45f508f..dfa7fce78 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/provider/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/provider/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.bean.copier.provider; +package cn.hutool.v7.core.bean.copier.provider; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/package-info.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/package-info.java index 17f9d52f0..b3c250ab8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/AbstractBeanDesc.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/AbstractBeanDesc.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/path/AbstractBeanDesc.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/path/AbstractBeanDesc.java index 3c0a95c08..e2f491469 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/AbstractBeanDesc.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/AbstractBeanDesc.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.path; +package cn.hutool.v7.core.bean.path; -import org.dromara.hutool.core.bean.BeanDesc; -import org.dromara.hutool.core.bean.PropDesc; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.map.CaseInsensitiveMap; +import cn.hutool.v7.core.bean.BeanDesc; +import cn.hutool.v7.core.bean.PropDesc; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.CaseInsensitiveMap; import java.lang.reflect.Field; import java.util.LinkedHashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/BeanPath.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/BeanPath.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/path/BeanPath.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/path/BeanPath.java index 3919b95a5..2fcef9a9c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/BeanPath.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/BeanPath.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.path; +package cn.hutool.v7.core.bean.path; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.bean.path.node.Node; -import org.dromara.hutool.core.bean.path.node.NodeFactory; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.bean.path.node.Node; +import cn.hutool.v7.core.bean.path.node.NodeFactory; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/DefaultNodeBeanFactory.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/DefaultNodeBeanFactory.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/path/DefaultNodeBeanFactory.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/path/DefaultNodeBeanFactory.java index 2c98ce655..756715e90 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/DefaultNodeBeanFactory.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/DefaultNodeBeanFactory.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.path; +package cn.hutool.v7.core.bean.path; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.bean.DynaBean; -import org.dromara.hutool.core.bean.path.node.*; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.convert.ConvertUtil; -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.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.bean.DynaBean; +import cn.hutool.v7.core.bean.path.node.*; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.FieldUtil; +import cn.hutool.v7.core.text.StrUtil; import java.lang.reflect.Field; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/NodeBeanFactory.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/NodeBeanFactory.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/path/NodeBeanFactory.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/path/NodeBeanFactory.java index 406b9a131..7fe8afe36 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/NodeBeanFactory.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/NodeBeanFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.path; +package cn.hutool.v7.core.bean.path; /** * BeanPath节点对应的Bean工厂，提供Bean的创建、获取和设置接口
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/EmptyNode.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/EmptyNode.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/EmptyNode.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/EmptyNode.java index c01fdf914..160aedd88 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/EmptyNode.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/EmptyNode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.path.node; +package cn.hutool.v7.core.bean.path.node; /** * 空节点 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/ListNode.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/ListNode.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/ListNode.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/ListNode.java index d87108d20..1e6792151 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/ListNode.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/ListNode.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.path.node; +package cn.hutool.v7.core.bean.path.node; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.split.SplitUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/NameNode.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/NameNode.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/NameNode.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/NameNode.java index 399be5ba8..b4fbd578e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/NameNode.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/NameNode.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.path.node; +package cn.hutool.v7.core.bean.path.node; -import org.dromara.hutool.core.math.NumberUtil; +import cn.hutool.v7.core.math.NumberUtil; /** * 处理名称节点或序号节点，如： diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/Node.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/Node.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/Node.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/Node.java index 60314db2a..db76c4cb9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/Node.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/Node.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.path.node; +package cn.hutool.v7.core.bean.path.node; /** * Bean路径节点接口 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/NodeFactory.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/NodeFactory.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/NodeFactory.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/NodeFactory.java index c5deaf73b..1e525f06a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/NodeFactory.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/NodeFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.path.node; +package cn.hutool.v7.core.bean.path.node; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; /** * 节点简单工厂 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/RangeNode.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/RangeNode.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/RangeNode.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/RangeNode.java index aa59297ad..460193d44 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/RangeNode.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/RangeNode.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.path.node; +package cn.hutool.v7.core.bean.path.node; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.split.SplitUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/package-info.java index 24affe467..a6ffdc21a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/node/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/node/package-info.java @@ -19,4 +19,4 @@ * * @author Looly */ -package org.dromara.hutool.core.bean.path.node; +package cn.hutool.v7.core.bean.path.node; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/bean/path/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/bean/path/package-info.java index f375db36e..85e126dae 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/path/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/path/package-info.java @@ -20,4 +20,4 @@ * @author Looly * @since 6.0.0 */ -package org.dromara.hutool.core.bean.path; +package cn.hutool.v7.core.bean.path; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/Cache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/Cache.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/Cache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/Cache.java index 01cb4d4ea..3c8eb1eac 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/Cache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/Cache.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; -import org.dromara.hutool.core.cache.impl.CacheObj; -import org.dromara.hutool.core.func.SerSupplier; +import cn.hutool.v7.core.cache.impl.CacheObj; +import cn.hutool.v7.core.func.SerSupplier; import java.io.Serializable; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/CacheListener.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/CacheListener.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/CacheListener.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/CacheListener.java index c4edf3537..4b9580022 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/CacheListener.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/CacheListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; /** * 缓存监听，用于实现缓存操作时的回调监听，例如缓存对象的移除事件等 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/CacheUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/CacheUtil.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/CacheUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/CacheUtil.java index f6d225597..30c0d8f92 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/CacheUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/CacheUtil.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; -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; +import cn.hutool.v7.core.cache.impl.FIFOCache; +import cn.hutool.v7.core.cache.impl.LFUCache; +import cn.hutool.v7.core.cache.impl.LRUCache; +import cn.hutool.v7.core.cache.impl.NoCache; +import cn.hutool.v7.core.cache.impl.TimedCache; +import cn.hutool.v7.core.cache.impl.WeakCache; /** * 缓存工具类 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/GlobalPruneTimer.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/GlobalPruneTimer.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/GlobalPruneTimer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/GlobalPruneTimer.java index ed61cc7bc..b719a5e45 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/GlobalPruneTimer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/GlobalPruneTimer.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; -import org.dromara.hutool.core.thread.ThreadUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.thread.ThreadUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.List; import java.util.concurrent.ScheduledExecutorService; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/SimpleCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/SimpleCache.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/SimpleCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/SimpleCache.java index 6fad880e2..0e4422511 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/SimpleCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/SimpleCache.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; -import org.dromara.hutool.core.collection.iter.TransIter; -import org.dromara.hutool.core.func.SerSupplier; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.mutable.Mutable; -import org.dromara.hutool.core.lang.mutable.MutableObj; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.collection.iter.TransIter; +import cn.hutool.v7.core.func.SerSupplier; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.mutable.Mutable; +import cn.hutool.v7.core.lang.mutable.MutableObj; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; import java.io.Serializable; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/AbstractFileCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/AbstractFileCache.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/file/AbstractFileCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/file/AbstractFileCache.java index 15705e1b2..722345e32 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/AbstractFileCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/AbstractFileCache.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.file; +package cn.hutool.v7.core.cache.file; -import org.dromara.hutool.core.cache.Cache; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.io.IORuntimeException; +import cn.hutool.v7.core.cache.Cache; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.io.IORuntimeException; import java.io.File; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/LFUFileCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LFUFileCache.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/file/LFUFileCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LFUFileCache.java index 96bea4656..6ece59b2d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/LFUFileCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LFUFileCache.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.file; +package cn.hutool.v7.core.cache.file; -import org.dromara.hutool.core.cache.Cache; -import org.dromara.hutool.core.cache.impl.LFUCache; +import cn.hutool.v7.core.cache.Cache; +import cn.hutool.v7.core.cache.impl.LFUCache; import java.io.File; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/LRUFileCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LRUFileCache.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/file/LRUFileCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LRUFileCache.java index 74bebf7a4..95c76994f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/LRUFileCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LRUFileCache.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.file; +package cn.hutool.v7.core.cache.file; -import org.dromara.hutool.core.cache.Cache; -import org.dromara.hutool.core.cache.impl.LRUCache; +import cn.hutool.v7.core.cache.Cache; +import cn.hutool.v7.core.cache.impl.LRUCache; import java.io.File; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/file/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/file/package-info.java index 5972bd9f4..883890309 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/file/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.cache.file; +package cn.hutool.v7.core.cache.file; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/AbstractCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/AbstractCache.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/AbstractCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/AbstractCache.java index 6f6d79f6b..25580523f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/AbstractCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/AbstractCache.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; -import org.dromara.hutool.core.cache.Cache; -import org.dromara.hutool.core.cache.CacheListener; -import org.dromara.hutool.core.func.SerSupplier; -import org.dromara.hutool.core.lang.mutable.Mutable; -import org.dromara.hutool.core.lang.mutable.MutableObj; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.cache.Cache; +import cn.hutool.v7.core.cache.CacheListener; +import cn.hutool.v7.core.func.SerSupplier; +import cn.hutool.v7.core.lang.mutable.Mutable; +import cn.hutool.v7.core.lang.mutable.MutableObj; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import java.util.Iterator; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObj.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObj.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObj.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObj.java index 14620b8e1..6f2a3b266 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObj.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObj.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; -import org.dromara.hutool.core.date.DateUtil; +import cn.hutool.v7.core.date.DateUtil; import java.io.Serializable; import java.util.Date; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObjIterator.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObjIterator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObjIterator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObjIterator.java index e588fdff5..3b6eb7888 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObjIterator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObjIterator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; import java.io.Serializable; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheValuesIterator.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheValuesIterator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheValuesIterator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheValuesIterator.java index 15f9efabe..e4622986c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheValuesIterator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheValuesIterator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; import java.io.Serializable; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/FIFOCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/FIFOCache.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/FIFOCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/FIFOCache.java index 38affe041..410558ea5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/FIFOCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/FIFOCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LFUCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LFUCache.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LFUCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LFUCache.java index 015228f61..e38175ec3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LFUCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LFUCache.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; -import org.dromara.hutool.core.thread.lock.NoLock; +import cn.hutool.v7.core.thread.lock.NoLock; import java.util.Iterator; import java.util.concurrent.ConcurrentHashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LRUCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LRUCache.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LRUCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LRUCache.java index dc5236fe8..4680527ca 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LRUCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LRUCache.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; -import org.dromara.hutool.core.lang.mutable.Mutable; -import org.dromara.hutool.core.map.FixedLinkedHashMap; +import cn.hutool.v7.core.lang.mutable.Mutable; +import cn.hutool.v7.core.map.FixedLinkedHashMap; import java.util.Iterator; import java.util.concurrent.locks.ReentrantLock; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LockedCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LockedCache.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LockedCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LockedCache.java index 615a0815a..4c9542dbf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/LockedCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LockedCache.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; -import org.dromara.hutool.core.collection.iter.CopiedIter; +import cn.hutool.v7.core.collection.iter.CopiedIter; import java.util.Iterator; import java.util.concurrent.locks.Lock; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/NoCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/NoCache.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/NoCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/NoCache.java index d59d1847a..ad239815c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/NoCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/NoCache.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; -import org.dromara.hutool.core.cache.Cache; -import org.dromara.hutool.core.func.SerSupplier; +import cn.hutool.v7.core.cache.Cache; +import cn.hutool.v7.core.func.SerSupplier; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/TimedCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/TimedCache.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/TimedCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/TimedCache.java index d4b1ad5cd..5e69d7190 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/TimedCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/TimedCache.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; -import org.dromara.hutool.core.cache.GlobalPruneTimer; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.mutable.Mutable; -import org.dromara.hutool.core.thread.lock.NoLock; +import cn.hutool.v7.core.cache.GlobalPruneTimer; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.mutable.Mutable; +import cn.hutool.v7.core.thread.lock.NoLock; import java.util.HashMap; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/TimedReentrantCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/TimedReentrantCache.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/TimedReentrantCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/TimedReentrantCache.java index 262d2d207..6674c4ab9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/TimedReentrantCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/TimedReentrantCache.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; -import org.dromara.hutool.core.cache.GlobalPruneTimer; -import org.dromara.hutool.core.lang.mutable.Mutable; +import cn.hutool.v7.core.cache.GlobalPruneTimer; +import cn.hutool.v7.core.lang.mutable.Mutable; import java.util.HashMap; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/WeakCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/WeakCache.java similarity index 85% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/WeakCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/WeakCache.java index 5675ef084..6648ab3ad 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/WeakCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/WeakCache.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; -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.lang.ref.Ref; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.cache.CacheListener; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.lang.mutable.Mutable; +import cn.hutool.v7.core.lang.ref.Ref; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; /** * 弱引用缓存
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/package-info.java index 13aa465ef..a9f39b4f5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.cache.impl; +package cn.hutool.v7.core.cache.impl; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/cache/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/cache/package-info.java index 0fe7ea97f..622a50095 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/classloader/ClassLoaderUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/classloader/ClassLoaderUtil.java index 9cbb54cd6..4897a2507 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/classloader/ClassLoaderUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.classloader; +package cn.hutool.v7.core.classloader; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.caller.CallerUtil; -import org.dromara.hutool.core.reflect.ClassDescUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.caller.CallerUtil; +import cn.hutool.v7.core.reflect.ClassDescUtil; import java.io.File; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/classloader/JarClassLoader.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/classloader/JarClassLoader.java index 802ed5ab5..4564d92f7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/classloader/JarClassLoader.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.classloader; +package cn.hutool.v7.core.classloader; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.file.FileNameUtil; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.net.url.UrlUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.file.FileNameUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.net.url.UrlUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ResourceClassLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/classloader/ResourceClassLoader.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/classloader/ResourceClassLoader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/classloader/ResourceClassLoader.java index 347965e64..bd77f3bf9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ResourceClassLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/classloader/ResourceClassLoader.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.classloader; +package cn.hutool.v7.core.classloader; -import org.dromara.hutool.core.io.resource.Resource; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.io.resource.Resource; +import cn.hutool.v7.core.util.ObjUtil; import java.security.SecureClassLoader; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/classloader/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/classloader/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/classloader/package-info.java index aee2656ac..920eb3773 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/classloader/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.classloader; +package cn.hutool.v7.core.classloader; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Caesar.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Caesar.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/Caesar.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/Caesar.java index 7ff2901e6..54f3fe142 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Caesar.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Caesar.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; /** * 凯撒密码实现
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Decoder.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Decoder.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/Decoder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/Decoder.java index 365593a60..efcca0aa6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Decoder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Decoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; /** * 解码接口 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Encoder.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Encoder.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/Encoder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/Encoder.java index 29c9790ff..fde6fee2a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Encoder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Encoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; /** * 编码接口 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Hashids.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/Hashids.java index a85222598..3bb10bca9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Hashids.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; import java.math.BigInteger; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Luhn.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Luhn.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/Luhn.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/Luhn.java index 26cecbd4b..ec401381e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Luhn.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Luhn.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; -import org.dromara.hutool.core.regex.PatternPool; -import org.dromara.hutool.core.regex.ReUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.regex.PatternPool; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.text.StrUtil; /** * Luhn算法，也称为“模10”算法，是一种简单的校验和（Checksum）算法，在ISO/IEC 7812-1中定义，校验步骤如下： diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Morse.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/Morse.java index dbcab2eb6..97de42ccd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Morse.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; -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.text.CharUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.text.CharUtil; import java.util.HashMap; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Number128.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Number128.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/Number128.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/Number128.java index 3fba2da25..9ea82765e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Number128.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Number128.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; import java.nio.ByteOrder; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/PercentCodec.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/PercentCodec.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/PercentCodec.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/PercentCodec.java index fd9531824..bc06e466f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/PercentCodec.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/PercentCodec.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; -import org.dromara.hutool.core.codec.binary.Base16Codec; -import org.dromara.hutool.core.codec.binary.HexUtil; -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.text.CharUtil; +import cn.hutool.v7.core.codec.binary.Base16Codec; +import cn.hutool.v7.core.codec.binary.HexUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.CharPool; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.text.CharUtil; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -184,7 +184,7 @@ public class PercentCodec implements Encoder, Serializable { * @author Looly * @since 6.0.0 */ - public static class Builder implements org.dromara.hutool.core.lang.builder.Builder { + public static class Builder implements cn.hutool.v7.core.lang.builder.Builder { private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/PunyCode.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/PunyCode.java index 6b2c78ac2..3b01a134b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/PunyCode.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; -import org.dromara.hutool.core.exception.HutoolException; -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.text.CharUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.text.CharUtil; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/RadixUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/RadixUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/RadixUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/RadixUtil.java index 70586edfc..d2cb93a0f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/RadixUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/RadixUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; /** * 进制转换工具类，可以转换为任意进制 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Rot.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Rot.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/Rot.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/Rot.java index 076669fea..368867b65 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Rot.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Rot.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; /** * RotN（rotate by N places），回转N位密码，是一种简易的替换式密码，也是过去在古罗马开发的凯撒加密的一种变体。
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base16Codec.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base16Codec.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base16Codec.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base16Codec.java index 6a575ef5f..acc3e3afb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base16Codec.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base16Codec.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -import org.dromara.hutool.core.codec.Decoder; -import org.dromara.hutool.core.codec.Encoder; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.codec.Decoder; +import cn.hutool.v7.core.codec.Encoder; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base32.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base32.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base32.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base32.java index 0612777e7..8d7e600fa 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base32.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base32.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base32Codec.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base32Codec.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base32Codec.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base32Codec.java index a0c493cf3..455053ceb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base32Codec.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base32Codec.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -import org.dromara.hutool.core.codec.Decoder; -import org.dromara.hutool.core.codec.Encoder; +import cn.hutool.v7.core.codec.Decoder; +import cn.hutool.v7.core.codec.Encoder; import java.io.Serializable; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base58.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base58.java index f8496c114..3dc8eda9f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base58.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.exception.ValidateException; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.exception.ValidateException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58Codec.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base58Codec.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58Codec.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base58Codec.java index f5a0c9354..3439ec4d7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58Codec.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base58Codec.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -import org.dromara.hutool.core.codec.Decoder; -import org.dromara.hutool.core.codec.Encoder; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.codec.Decoder; +import cn.hutool.v7.core.codec.Encoder; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base62.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base62.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base62.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base62.java index 4d38ec1d6..a372f9a81 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base62.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base62.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -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 cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base62Codec.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base62Codec.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base62Codec.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base62Codec.java index 764c3ac34..dc7b1f84b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base62Codec.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base62Codec.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -import org.dromara.hutool.core.codec.Decoder; -import org.dromara.hutool.core.codec.Encoder; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.codec.Decoder; +import cn.hutool.v7.core.codec.Encoder; +import cn.hutool.v7.core.array.ArrayUtil; import java.io.ByteArrayOutputStream; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base64.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base64.java index 403003b20..730c1d1d9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base64.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -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 cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64Decoder.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base64Decoder.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64Decoder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base64Decoder.java index 754472175..bff92e0a7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64Decoder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base64Decoder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -import org.dromara.hutool.core.codec.Decoder; -import org.dromara.hutool.core.lang.mutable.MutableInt; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.codec.Decoder; +import cn.hutool.v7.core.lang.mutable.MutableInt; +import cn.hutool.v7.core.array.ArrayUtil; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/CrockfordBase32Codec.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/CrockfordBase32Codec.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/CrockfordBase32Codec.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/CrockfordBase32Codec.java index 90be15200..5fce4727d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/CrockfordBase32Codec.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/CrockfordBase32Codec.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.nio.charset.Charset; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Hex.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Hex.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Hex.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Hex.java index c545f4608..b462d8c52 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Hex.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Hex.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/HexUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/HexUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/HexUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/HexUtil.java index 810718945..009997a45 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/HexUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/HexUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.awt.Color; import java.math.BigInteger; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Z85Codec.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Z85Codec.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Z85Codec.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Z85Codec.java index 02eeb5bcc..be85276dc 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Z85Codec.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Z85Codec.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; -import org.dromara.hutool.core.codec.Decoder; -import org.dromara.hutool.core.codec.Encoder; +import cn.hutool.v7.core.codec.Decoder; +import cn.hutool.v7.core.codec.Encoder; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/package-info.java index 321ca0c58..027184990 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/package-info.java @@ -24,4 +24,4 @@ *
  • Base64
    • * */ -package org.dromara.hutool.core.codec.binary; +package cn.hutool.v7.core.codec.binary; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/CityHash.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/CityHash.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/CityHash.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/CityHash.java index 9b7bf0158..adb2f59b7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/CityHash.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/CityHash.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; -import org.dromara.hutool.core.codec.Number128; -import org.dromara.hutool.core.util.ByteUtil; +import cn.hutool.v7.core.codec.Number128; +import cn.hutool.v7.core.util.ByteUtil; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/ConsistentHash.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/ConsistentHash.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/ConsistentHash.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/ConsistentHash.java index d1f13a9b5..e6fba9b3a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/ConsistentHash.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/ConsistentHash.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; import java.io.Serializable; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash128.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/Hash128.java similarity index 87% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash128.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/Hash128.java index 1204e30fc..8b2892cda 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash128.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/Hash128.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; -import org.dromara.hutool.core.codec.Encoder; -import org.dromara.hutool.core.codec.Number128; +import cn.hutool.v7.core.codec.Encoder; +import cn.hutool.v7.core.codec.Number128; /** * Hash计算接口 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash32.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/Hash32.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash32.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/Hash32.java index 5763a5eb4..e0989e270 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash32.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/Hash32.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; -import org.dromara.hutool.core.codec.Encoder; +import cn.hutool.v7.core.codec.Encoder; /** * Hash计算接口 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash64.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/Hash64.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash64.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/Hash64.java index 7498669ad..1c329a696 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Hash64.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/Hash64.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; -import org.dromara.hutool.core.codec.Encoder; +import cn.hutool.v7.core.codec.Encoder; /** * Hash计算接口 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/HashUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/HashUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/HashUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/HashUtil.java index ca4d84db8..83b0d03a6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/HashUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/HashUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; -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; +import cn.hutool.v7.core.codec.Number128; +import cn.hutool.v7.core.codec.hash.metro.MetroHash128; +import cn.hutool.v7.core.codec.hash.metro.MetroHash64; /** * Hash算法大全
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/KetamaHash.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/KetamaHash.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/KetamaHash.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/KetamaHash.java index 2097a25b2..5fbbe366c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/KetamaHash.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/KetamaHash.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/MurmurHash.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/MurmurHash.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/MurmurHash.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/MurmurHash.java index 4f7956508..aa025b7c9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/MurmurHash.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/MurmurHash.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; -import org.dromara.hutool.core.codec.Number128; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.codec.Number128; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.nio.ByteOrder; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Simhash.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/Simhash.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Simhash.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/Simhash.java index 95cd8899f..b271488e6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/Simhash.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/Simhash.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; import java.math.BigInteger; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/AbstractMetroHash.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/AbstractMetroHash.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/AbstractMetroHash.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/AbstractMetroHash.java index 15c8bbed6..6acc2311a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/AbstractMetroHash.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/AbstractMetroHash.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash.metro; +package cn.hutool.v7.core.codec.hash.metro; import java.nio.ByteBuffer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/MetroHash.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/MetroHash.java index 1f013f8d5..c85be1de5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/MetroHash.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash.metro; +package cn.hutool.v7.core.codec.hash.metro; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash128.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/MetroHash128.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash128.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/MetroHash128.java index f20689e90..18cb3e650 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash128.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/MetroHash128.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash.metro; +package cn.hutool.v7.core.codec.hash.metro; -import org.dromara.hutool.core.codec.Number128; -import org.dromara.hutool.core.codec.hash.Hash128; +import cn.hutool.v7.core.codec.Number128; +import cn.hutool.v7.core.codec.hash.Hash128; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash64.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/MetroHash64.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash64.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/MetroHash64.java index 0ef4b0c97..69935f9f8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/MetroHash64.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/MetroHash64.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash.metro; +package cn.hutool.v7.core.codec.hash.metro; -import org.dromara.hutool.core.codec.hash.Hash64; +import cn.hutool.v7.core.codec.hash.Hash64; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/package-info.java index 4f4b2ca34..86f6714cb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/metro/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/metro/package-info.java @@ -21,4 +21,4 @@ * * @author postamar, Looly */ -package org.dromara.hutool.core.codec.hash.metro; +package cn.hutool.v7.core.codec.hash.metro; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/package-info.java index 04a7f5e0e..e690916e9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/codec/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/codec/package-info.java index 0b3752cb3..3c35553a1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/BoundedCollection.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/BoundedCollection.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/BoundedCollection.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/BoundedCollection.java index 2f3c7449a..fdf94c228 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/BoundedCollection.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/BoundedCollection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/BoundedList.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/BoundedList.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/BoundedList.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/BoundedList.java index b18dea7de..4cb18fca0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/BoundedList.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/BoundedList.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; import java.util.ArrayList; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollStreamUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/CollStreamUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/CollStreamUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/CollStreamUtil.java index 0a369d108..2f8b106c1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollStreamUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/CollStreamUtil.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.func.SerFunction; -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 cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.func.SerFunction; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.stream.CollectorUtil; +import cn.hutool.v7.core.stream.StreamUtil; import java.util.*; import java.util.function.BiFunction; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/CollUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/CollUtil.java index 1aed2d381..a9451f3f6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/CollUtil.java @@ -14,35 +14,35 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.codec.hash.Hash32; -import org.dromara.hutool.core.collection.iter.ArrayIter; -import org.dromara.hutool.core.collection.iter.IterUtil; -import org.dromara.hutool.core.collection.iter.IteratorEnumeration; -import org.dromara.hutool.core.collection.queue.BoundedPriorityQueue; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.collection.set.UniqueKeySet; -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.ConvertUtil; -import org.dromara.hutool.core.convert.Converter; -import org.dromara.hutool.core.exception.ExceptionUtil; -import org.dromara.hutool.core.func.SerBiConsumer; -import org.dromara.hutool.core.func.SerConsumer3; -import org.dromara.hutool.core.lang.Assert; -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.util.ObjUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.codec.hash.Hash32; +import cn.hutool.v7.core.collection.iter.ArrayIter; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.collection.iter.IteratorEnumeration; +import cn.hutool.v7.core.collection.queue.BoundedPriorityQueue; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.collection.set.UniqueKeySet; +import cn.hutool.v7.core.comparator.CompareUtil; +import cn.hutool.v7.core.comparator.PinyinComparator; +import cn.hutool.v7.core.comparator.PropertyComparator; +import cn.hutool.v7.core.convert.CompositeConverter; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.convert.Converter; +import cn.hutool.v7.core.exception.ExceptionUtil; +import cn.hutool.v7.core.func.SerBiConsumer; +import cn.hutool.v7.core.func.SerConsumer3; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.FieldUtil; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.stream.StreamUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.lang.reflect.Type; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollectionOperation.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/CollectionOperation.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/CollectionOperation.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/CollectionOperation.java index 95665db48..530e55ae4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollectionOperation.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/CollectionOperation.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.collection.set.SetUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.set.SetUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/ListUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/ListUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/ListUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/ListUtil.java index e7ac2ed13..965bb9bf3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/ListUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/ListUtil.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; -import org.dromara.hutool.core.array.ArrayUtil; -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.Validator; -import org.dromara.hutool.core.lang.page.PageInfo; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.iter.EnumerationIter; +import cn.hutool.v7.core.collection.partition.AvgPartition; +import cn.hutool.v7.core.collection.partition.Partition; +import cn.hutool.v7.core.collection.partition.RandomAccessAvgPartition; +import cn.hutool.v7.core.collection.partition.RandomAccessPartition; +import cn.hutool.v7.core.comparator.PinyinComparator; +import cn.hutool.v7.core.comparator.PropertyComparator; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.Validator; +import cn.hutool.v7.core.lang.page.PageInfo; +import cn.hutool.v7.core.util.ObjUtil; import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/ListWrapper.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/ListWrapper.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/ListWrapper.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/ListWrapper.java index 760f460bd..2ea95383d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/ListWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/ListWrapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; -import org.dromara.hutool.core.lang.wrapper.SimpleWrapper; +import cn.hutool.v7.core.lang.wrapper.SimpleWrapper; import java.util.*; import java.util.function.Consumer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/RingIndexUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/RingIndexUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/RingIndexUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/RingIndexUtil.java index 1fd2b9ae9..b758d858c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/RingIndexUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/RingIndexUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/SpliteratorUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/SpliteratorUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/SpliteratorUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/SpliteratorUtil.java index bf556fc5e..23a19de3e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/SpliteratorUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/SpliteratorUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; import java.util.Spliterator; import java.util.function.Function; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/TransCollection.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/TransCollection.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/TransCollection.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/TransCollection.java index 08f58d6f1..ee063fd7d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/TransCollection.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/TransCollection.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; -import org.dromara.hutool.core.collection.iter.IterUtil; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.lang.Assert; import java.util.AbstractCollection; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/TransSpliterator.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/TransSpliterator.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/TransSpliterator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/TransSpliterator.java index 5aafae4aa..859e69b10 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/TransSpliterator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/TransSpliterator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; import java.util.Spliterator; import java.util.function.Consumer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ArrayIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ArrayIter.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ArrayIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ArrayIter.java index f6be3ebd5..a4d209ad2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ArrayIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ArrayIter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import java.io.Serializable; import java.lang.reflect.Array; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ComputeIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ComputeIter.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ComputeIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ComputeIter.java index 18ca924bf..130e9d313 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ComputeIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ComputeIter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/CopiedIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/CopiedIter.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/CopiedIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/CopiedIter.java index 923ed79e0..790212527 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/CopiedIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/CopiedIter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.Serializable; import java.util.Collections; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/EnumerationIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/EnumerationIter.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/EnumerationIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/EnumerationIter.java index 3fc987e2e..2fda57ff0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/EnumerationIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/EnumerationIter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import java.io.Serializable; import java.util.Enumeration; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/FilterIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/FilterIter.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/FilterIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/FilterIter.java index bff2e7603..2091a7181 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/FilterIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/FilterIter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterChain.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/IterChain.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterChain.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/IterChain.java index f9331b343..d2466c65a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterChain.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/IterChain.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; -import org.dromara.hutool.core.lang.Chain; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.lang.Chain; +import cn.hutool.v7.core.array.ArrayUtil; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/IterUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/IterUtil.java index 3f87ae02b..a1f18ace3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/IterUtil.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; -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.convert.ConvertUtil; -import org.dromara.hutool.core.func.SerBiConsumer; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.math.NumberUtil; -import org.dromara.hutool.core.reflect.FieldUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; -import org.dromara.hutool.core.text.StrJoiner; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.func.SerBiConsumer; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.math.NumberUtil; +import cn.hutool.v7.core.reflect.FieldUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.text.StrJoiner; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterableIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/IterableIter.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterableIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/IterableIter.java index eee60604a..548110965 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterableIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/IterableIter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IteratorEnumeration.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/IteratorEnumeration.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IteratorEnumeration.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/IteratorEnumeration.java index 69797d3b6..53706b825 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IteratorEnumeration.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/IteratorEnumeration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import java.io.Serializable; import java.util.Enumeration; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/LineIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/LineIter.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/LineIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/LineIter.java index f7b23946d..9d6008b49 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/LineIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/LineIter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.lang.Assert; import java.io.BufferedReader; import java.io.Closeable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/NodeListIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/NodeListIter.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/NodeListIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/NodeListIter.java index 1391dc0f6..0e3b0804b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/NodeListIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/NodeListIter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/PartitionIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/PartitionIter.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/PartitionIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/PartitionIter.java index 5c80edcda..e51b7546d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/PartitionIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/PartitionIter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ResettableIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ResettableIter.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ResettableIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ResettableIter.java index 92ce80ed4..5b1c439de 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ResettableIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ResettableIter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/TransIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/TransIter.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/TransIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/TransIter.java index 3814a9769..61b88e5cf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/TransIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/TransIter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.util.Iterator; import java.util.function.Function; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/package-info.java index bc776f33c..bbda9abbf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/package-info.java index 3b3baef88..9388c7ae5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/AvgPartition.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/AvgPartition.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/AvgPartition.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/AvgPartition.java index 6c3ff9822..b60420cde 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/AvgPartition.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/AvgPartition.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.partition; +package cn.hutool.v7.core.collection.partition; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/Partition.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/Partition.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/Partition.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/Partition.java index 93d542436..1069faf98 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/Partition.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/Partition.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.partition; +package cn.hutool.v7.core.collection.partition; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.util.AbstractList; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/RandomAccessAvgPartition.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/RandomAccessAvgPartition.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/RandomAccessAvgPartition.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/RandomAccessAvgPartition.java index 0787c8cdf..8400188bb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/RandomAccessAvgPartition.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/RandomAccessAvgPartition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.partition; +package cn.hutool.v7.core.collection.partition; import java.util.List; import java.util.RandomAccess; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/RandomAccessPartition.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/RandomAccessPartition.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/RandomAccessPartition.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/RandomAccessPartition.java index 5b9f9970f..626fec517 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/RandomAccessPartition.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/RandomAccessPartition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.partition; +package cn.hutool.v7.core.collection.partition; import java.util.List; import java.util.RandomAccess; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/package-info.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/package-info.java index f4203ebbe..04e7db49e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/partition/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/partition/package-info.java @@ -19,4 +19,4 @@ * * @author Looly */ -package org.dromara.hutool.core.collection.partition; +package cn.hutool.v7.core.collection.partition; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/BoundedPriorityQueue.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/BoundedPriorityQueue.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/BoundedPriorityQueue.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/BoundedPriorityQueue.java index ad3f7a4d2..af70fea36 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/BoundedPriorityQueue.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/BoundedPriorityQueue.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.queue; +package cn.hutool.v7.core.collection.queue; -import org.dromara.hutool.core.collection.BoundedCollection; +import cn.hutool.v7.core.collection.BoundedCollection; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/CheckedLinkedBlockingQueue.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/CheckedLinkedBlockingQueue.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/CheckedLinkedBlockingQueue.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/CheckedLinkedBlockingQueue.java index 848b529b5..6b80b49f5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/CheckedLinkedBlockingQueue.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/CheckedLinkedBlockingQueue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.queue; +package cn.hutool.v7.core.collection.queue; import java.util.Collection; import java.util.concurrent.LinkedBlockingQueue; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/DiscardingQueue.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/DiscardingQueue.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/DiscardingQueue.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/DiscardingQueue.java index 298666f50..17ffeea5c 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/DiscardingQueue.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/DiscardingQueue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.queue; +package cn.hutool.v7.core.collection.queue; import java.util.AbstractQueue; import java.util.Collections; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/Linked.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/Linked.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/Linked.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/Linked.java index 9544293ae..33a1c5221 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/Linked.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/Linked.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.queue; +package cn.hutool.v7.core.collection.queue; import java.util.Deque; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/LinkedDeque.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/LinkedDeque.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/LinkedDeque.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/LinkedDeque.java index 522c3725a..a1b79d0fb 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/LinkedDeque.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/LinkedDeque.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.hutool.core.collection.queue; +package cn.hutool.v7.core.collection.queue; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/MemorySafeLinkedBlockingQueue.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/MemorySafeLinkedBlockingQueue.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/MemorySafeLinkedBlockingQueue.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/MemorySafeLinkedBlockingQueue.java index 4869613ff..910fd204f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/MemorySafeLinkedBlockingQueue.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/MemorySafeLinkedBlockingQueue.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.hutool.core.collection.queue; +package cn.hutool.v7.core.collection.queue; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.thread.SimpleScheduler; -import org.dromara.hutool.core.util.RuntimeUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.thread.SimpleScheduler; +import cn.hutool.v7.core.util.RuntimeUtil; import java.util.Collection; import java.util.concurrent.LinkedBlockingQueue; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/package-info.java index 7638e6a92..ea811615e 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/queue/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/package-info.java @@ -17,4 +17,4 @@ /** * 队列{@link java.util.Queue}相关封装 */ -package org.dromara.hutool.core.collection.queue; +package cn.hutool.v7.core.collection.queue; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/ConcurrentHashSet.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/ConcurrentHashSet.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/set/ConcurrentHashSet.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/set/ConcurrentHashSet.java index 39b0b8a12..54b89728b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/ConcurrentHashSet.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/ConcurrentHashSet.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.set; +package cn.hutool.v7.core.collection.set; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/ConcurrentLinkedHashSet.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/ConcurrentLinkedHashSet.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/set/ConcurrentLinkedHashSet.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/set/ConcurrentLinkedHashSet.java index b514d0bd4..ee75a0281 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/ConcurrentLinkedHashSet.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/ConcurrentLinkedHashSet.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.set; +package cn.hutool.v7.core.collection.set; -import org.dromara.hutool.core.map.concurrent.ConcurrentLinkedHashMap; +import cn.hutool.v7.core.map.concurrent.ConcurrentLinkedHashMap; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetFromMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetFromMap.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetFromMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetFromMap.java index 94d35b1d5..eb1ac3164 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetFromMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetFromMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.set; +package cn.hutool.v7.core.collection.set; import java.io.IOException; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetUtil.java index 171c363a5..804267a3c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.set; +package cn.hutool.v7.core.collection.set; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetWrapper.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetWrapper.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetWrapper.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetWrapper.java index d5ae77233..5c603fd55 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/SetWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetWrapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.set; +package cn.hutool.v7.core.collection.set; -import org.dromara.hutool.core.lang.wrapper.SimpleWrapper; +import cn.hutool.v7.core.lang.wrapper.SimpleWrapper; import java.util.Collection; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/UniqueKeySet.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/UniqueKeySet.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/set/UniqueKeySet.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/set/UniqueKeySet.java index bb1740129..00a557514 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/UniqueKeySet.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/UniqueKeySet.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.set; +package cn.hutool.v7.core.collection.set; -import org.dromara.hutool.core.map.MapBuilder; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.map.MapBuilder; +import cn.hutool.v7.core.util.ObjUtil; import java.io.Serializable; import java.util.AbstractSet; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/collection/set/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/collection/set/package-info.java index 806fde256..0d0e01de4 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/set/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/package-info.java @@ -17,4 +17,4 @@ /** * {@link java.util.Set}相关封装 */ -package org.dromara.hutool.core.collection.set; +package cn.hutool.v7.core.collection.set; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ArrayIndexedComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ArrayIndexedComparator.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/ArrayIndexedComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/ArrayIndexedComparator.java index af37da88b..c815065ce 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ArrayIndexedComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ArrayIndexedComparator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.array.ArrayUtil; import java.util.Comparator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorChain.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorChain.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorChain.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorChain.java index 73a4519fc..f19ff8264 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorChain.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorChain.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.lang.Chain; +import cn.hutool.v7.core.lang.Chain; import java.io.Serializable; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorException.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorException.java index f501b4ef7..1c1ec7821 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; /** * 比较异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/CompareUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/CompareUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/CompareUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/CompareUtil.java index e4eaa94c0..948e7ae24 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/CompareUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/CompareUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.util.Comparator; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/FieldComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldComparator.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/FieldComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldComparator.java index 89dd44683..622556104 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/FieldComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldComparator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.reflect.FieldUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.reflect.FieldUtil; +import cn.hutool.v7.core.text.StrUtil; import java.lang.reflect.Field; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/FieldsComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldsComparator.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/FieldsComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldsComparator.java index af0d62e7a..d6749686c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/FieldsComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldsComparator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.reflect.FieldUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.reflect.FieldUtil; import java.lang.reflect.Field; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/FuncComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FuncComparator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/FuncComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/FuncComparator.java index 0f52d84fc..94de5e268 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/FuncComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FuncComparator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; import java.util.function.Function; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/IndexedComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/IndexedComparator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/IndexedComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/IndexedComparator.java index 4431d4c66..1d5856a72 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/IndexedComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/IndexedComparator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.util.Comparator; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/InstanceComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/InstanceComparator.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/InstanceComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/InstanceComparator.java index a8ab3e3b7..e8bb434b9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/InstanceComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/InstanceComparator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.util.Comparator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/LocaleComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/LocaleComparator.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/LocaleComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/LocaleComparator.java index 32927f5fb..a1d4d4728 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/LocaleComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/LocaleComparator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; import java.text.Collator; import java.util.Locale; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/NullComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/NullComparator.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/NullComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/NullComparator.java index fbd08d9a3..1f7100d36 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/NullComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/NullComparator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; import java.io.Serializable; import java.util.Comparator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/PinyinComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/PinyinComparator.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/PinyinComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/PinyinComparator.java index 1acfc9959..ef48ca331 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/PinyinComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/PinyinComparator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; import java.util.Locale; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/PropertyComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/PropertyComparator.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/PropertyComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/PropertyComparator.java index 83a84a20f..81afeb1ca 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/PropertyComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/PropertyComparator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.bean.BeanUtil; +import cn.hutool.v7.core.bean.BeanUtil; /** * Bean属性排序器
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/StrLengthComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/StrLengthComparator.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/StrLengthComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/StrLengthComparator.java index 419524047..a44e8c522 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/StrLengthComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/StrLengthComparator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; import java.util.Comparator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/VersionComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/VersionComparator.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/VersionComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/VersionComparator.java index ede8ebf0a..e6f970104 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/VersionComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/VersionComparator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.lang.Version; +import cn.hutool.v7.core.lang.Version; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/WindowsExplorerStringComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/WindowsExplorerStringComparator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/WindowsExplorerStringComparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/WindowsExplorerStringComparator.java index 797af8a57..d0295077c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/WindowsExplorerStringComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/WindowsExplorerStringComparator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.ArrayList; import java.util.Comparator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/comparator/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/comparator/package-info.java index bcc9135b0..36e35e10f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/Deflate.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/Deflate.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/Deflate.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/Deflate.java index 8b34c19b6..fa6364b5f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/Deflate.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/Deflate.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; import java.io.Closeable; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/Gzip.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/Gzip.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/Gzip.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/Gzip.java index 07200b686..1a4d25567 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/Gzip.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/Gzip.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; import java.io.Closeable; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/InflaterInputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/InflaterInputStream.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/InflaterInputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/InflaterInputStream.java index 183aed4fb..5d8ac2f4f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/InflaterInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/InflaterInputStream.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IORuntimeException; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/OpcZipOutputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/OpcZipOutputStream.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/OpcZipOutputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/OpcZipOutputStream.java index 2b7973580..550c9bb64 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/OpcZipOutputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/OpcZipOutputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; import java.io.IOException; import java.io.OutputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/Zip64.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/Zip64.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/Zip64.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/Zip64.java index 130cc70da..fef373798 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/Zip64.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/Zip64.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; import java.io.IOException; import java.io.OutputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipCopyVisitor.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipCopyVisitor.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipCopyVisitor.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipCopyVisitor.java index abed3f555..848ccb006 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipCopyVisitor.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipCopyVisitor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.IOException; import java.nio.file.CopyOption; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipFileResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipFileResource.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipFileResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipFileResource.java index 0632f09b4..48800fae9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipFileResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipFileResource.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.io.IoUtil; +import cn.hutool.v7.core.io.IoUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipReader.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipReader.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipReader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipReader.java index 3b2b4806d..ca895e906 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipReader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipReader.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -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 cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Closeable; import java.io.File; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipReplacer.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipReplacer.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipReplacer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipReplacer.java index d8e3141ed..665ad3fe2 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipReplacer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipReplacer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.io.resource.Resource; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.io.resource.Resource; +import cn.hutool.v7.core.text.StrUtil; import java.io.Closeable; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipResource.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipResource.java index d3910292f..af8d420ce 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipResource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; import java.io.Closeable; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipSecurityUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipSecurityUtil.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipSecurityUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipSecurityUtil.java index 50be8fbc9..9f4b5da2b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipSecurityUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipSecurityUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.exception.ValidateException; +import cn.hutool.v7.core.exception.ValidateException; import java.util.zip.ZipEntry; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipStreamResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipStreamResource.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipStreamResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipStreamResource.java index c81189c24..6cd588227 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipStreamResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipStreamResource.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipUtil.java index 9a134df7c..1543721bc 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipUtil.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.collection.iter.EnumerationIter; -import org.dromara.hutool.core.exception.HutoolException; -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.lang.Assert; -import org.dromara.hutool.core.net.url.UrlUtil; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.collection.iter.EnumerationIter; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.file.FileNameUtil; +import cn.hutool.v7.core.io.file.FileSystemUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.io.file.PathUtil; +import cn.hutool.v7.core.io.resource.Resource; +import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream; +import cn.hutool.v7.core.io.stream.LimitedInputStream; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.net.url.UrlUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.*; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipWriter.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipWriter.java index 5b68be314..fe0af1e13 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipWriter.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -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 cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.resource.Resource; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Closeable; import java.io.File; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/compress/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/compress/package-info.java index 826d93f5b..e21796dd1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/package-info.java @@ -20,4 +20,4 @@ * @author Looly * @since 5.7.8 */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/AbstractConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/AbstractConverter.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/AbstractConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/AbstractConverter.java index c39189bb6..6f2ef69c2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/AbstractConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/AbstractConverter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.reflect.TypeUtil; -import org.dromara.hutool.core.text.CharUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.text.CharUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/BasicType.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/BasicType.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/BasicType.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/BasicType.java index 6e4e12201..d3a7c51ce 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/BasicType.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/BasicType.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.map.BiMap; +import cn.hutool.v7.core.map.BiMap; import java.util.HashMap; import java.util.Set; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/CastUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/CastUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/CastUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/CastUtil.java index 93080ff55..514e24c92 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/CastUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/CastUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.util.Collection; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/CompositeConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/CompositeConverter.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/CompositeConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/CompositeConverter.java index e74135cff..8e980a5d7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/CompositeConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/CompositeConverter.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.convert.impl.BeanConverter; -import org.dromara.hutool.core.lang.Opt; -import org.dromara.hutool.core.reflect.TypeReference; -import org.dromara.hutool.core.reflect.TypeUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.convert.impl.BeanConverter; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.reflect.TypeReference; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConvertException.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/ConvertException.java index 614423833..7503fc487 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConvertException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; /** * 转换异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConvertUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/ConvertUtil.java index 9fb58b8f6..70f6c039b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConvertUtil.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.codec.binary.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.math.ChineseNumberFormatter; -import org.dromara.hutool.core.math.ChineseNumberParser; -import org.dromara.hutool.core.math.EnglishNumberFormatter; -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.text.CharUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.codec.binary.HexUtil; +import cn.hutool.v7.core.convert.impl.CollectionConverter; +import cn.hutool.v7.core.convert.impl.EnumConverter; +import cn.hutool.v7.core.convert.impl.MapConverter; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.math.ChineseNumberFormatter; +import cn.hutool.v7.core.math.ChineseNumberParser; +import cn.hutool.v7.core.math.EnglishNumberFormatter; +import cn.hutool.v7.core.reflect.TypeReference; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.UnicodeUtil; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/Converter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/Converter.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/Converter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/Converter.java index ab4db458c..f3c36fd45 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/Converter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/Converter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConverterWithRoot.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConverterWithRoot.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/ConverterWithRoot.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/ConverterWithRoot.java index ca75b1085..a72bb1da4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConverterWithRoot.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConverterWithRoot.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; /** * 带根的转换器
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/MatcherConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/MatcherConverter.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/MatcherConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/MatcherConverter.java index dda64e568..7980fe626 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/MatcherConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/MatcherConverter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.reflect.TypeUtil; +import cn.hutool.v7.core.reflect.TypeUtil; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/RegisterConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/RegisterConverter.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/RegisterConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/RegisterConverter.java index 81efe0a81..b137481df 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/RegisterConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/RegisterConverter.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.collection.set.ConcurrentHashSet; -import org.dromara.hutool.core.convert.impl.*; -import org.dromara.hutool.core.lang.Opt; -import org.dromara.hutool.core.lang.tuple.Pair; -import org.dromara.hutool.core.lang.tuple.Triple; -import org.dromara.hutool.core.lang.tuple.Tuple; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; -import org.dromara.hutool.core.reflect.TypeUtil; -import org.dromara.hutool.core.stream.StreamUtil; +import cn.hutool.v7.core.collection.set.ConcurrentHashSet; +import cn.hutool.v7.core.convert.impl.*; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.lang.tuple.Pair; +import cn.hutool.v7.core.lang.tuple.Triple; +import cn.hutool.v7.core.lang.tuple.Tuple; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.stream.StreamUtil; import javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/SpecialConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/SpecialConverter.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/SpecialConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/SpecialConverter.java index e0ce17b66..678ba3ba1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/SpecialConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/SpecialConverter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.convert.impl.*; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.reflect.TypeUtil; -import org.dromara.hutool.core.stream.StreamUtil; +import cn.hutool.v7.core.convert.impl.*; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.stream.StreamUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ArrayConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ArrayConverter.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ArrayConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ArrayConverter.java index 52ca52cec..2080f5013 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ArrayConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ArrayConverter.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.codec.binary.Base64; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.iter.IterUtil; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.convert.MatcherConverter; -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.util.ByteUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.codec.binary.Base64; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.convert.MatcherConverter; +import cn.hutool.v7.core.io.SerializeUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.util.ByteUtil; import java.io.Serializable; import java.lang.reflect.Array; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicBooleanConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicBooleanConverter.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicBooleanConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicBooleanConverter.java index 408decde8..a4fbf02fc 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicBooleanConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicBooleanConverter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.util.BooleanUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.util.BooleanUtil; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicIntegerArrayConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicIntegerArrayConverter.java similarity index 87% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicIntegerArrayConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicIntegerArrayConverter.java index ff409e4fd..d5b2285e6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicIntegerArrayConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicIntegerArrayConverter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.ConvertUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.ConvertUtil; import java.util.concurrent.atomic.AtomicIntegerArray; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicLongArrayConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicLongArrayConverter.java similarity index 87% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicLongArrayConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicLongArrayConverter.java index d1e7452d5..98eb7753b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicLongArrayConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicLongArrayConverter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.ConvertUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.ConvertUtil; import java.util.concurrent.atomic.AtomicLongArray; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicReferenceConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicReferenceConverter.java similarity index 88% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicReferenceConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicReferenceConverter.java index c8f9ae6aa..cca15005e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicReferenceConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicReferenceConverter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.Converter; -import org.dromara.hutool.core.reflect.TypeUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.Converter; +import cn.hutool.v7.core.reflect.TypeUtil; import java.lang.reflect.Type; import java.util.concurrent.atomic.AtomicReference; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/BeanConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/BeanConverter.java similarity index 80% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/BeanConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/BeanConverter.java index 93053c1cd..4ae11fb0b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/BeanConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/BeanConverter.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -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 org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.bean.copier.BeanCopier; +import cn.hutool.v7.core.bean.copier.CopyOptions; +import cn.hutool.v7.core.bean.copier.ValueProvider; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.convert.Converter; +import cn.hutool.v7.core.io.SerializeUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.MapProxy; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/BooleanConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/BooleanConverter.java similarity index 90% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/BooleanConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/BooleanConverter.java index c168ca559..1ea556669 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/BooleanConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/BooleanConverter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.util.BooleanUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.util.BooleanUtil; /** * 布尔转换器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CalendarConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CalendarConverter.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CalendarConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CalendarConverter.java index 7bdf395b2..4ba49d5b9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CalendarConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CalendarConverter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.date.CalendarUtil; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.date.CalendarUtil; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.text.StrUtil; import javax.xml.datatype.XMLGregorianCalendar; import java.util.Calendar; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CastConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CastConverter.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CastConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CastConverter.java index a6c6ff78c..d0543693d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CastConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CastConverter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.convert.MatcherConverter; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.convert.MatcherConverter; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CharacterConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharacterConverter.java similarity index 86% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CharacterConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharacterConverter.java index 2daf86d57..8a9169a1e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CharacterConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharacterConverter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.util.BooleanUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.util.BooleanUtil; +import cn.hutool.v7.core.text.StrUtil; /** * 字符转换器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CharsetConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharsetConverter.java similarity index 86% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CharsetConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharsetConverter.java index 02984f097..df30dd3f4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CharsetConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharsetConverter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.util.CharsetUtil; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ClassConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ClassConverter.java similarity index 88% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ClassConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ClassConverter.java index ece7fa4d9..5aa20caf9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ClassConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ClassConverter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.convert.MatcherConverter; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.convert.MatcherConverter; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CollectionConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CollectionConverter.java similarity index 88% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CollectionConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CollectionConverter.java index 381c94be0..202243975 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CollectionConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CollectionConverter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.convert.MatcherConverter; -import org.dromara.hutool.core.reflect.TypeReference; -import org.dromara.hutool.core.reflect.TypeUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.convert.MatcherConverter; +import cn.hutool.v7.core.reflect.TypeReference; +import cn.hutool.v7.core.reflect.TypeUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CurrencyConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CurrencyConverter.java similarity index 90% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CurrencyConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CurrencyConverter.java index 535701da5..6ecaee773 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/CurrencyConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CurrencyConverter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.AbstractConverter; import java.util.Currency; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DateConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DateConverter.java similarity index 90% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DateConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DateConverter.java index bd5f3ba01..e886821b1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DateConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DateConverter.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.convert.MatcherConverter; -import org.dromara.hutool.core.date.DateTime; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.date.SqlDateUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.convert.MatcherConverter; +import cn.hutool.v7.core.date.DateTime; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.date.SqlDateUtil; +import cn.hutool.v7.core.text.StrUtil; import java.lang.reflect.Type; import java.time.temporal.TemporalAccessor; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DurationConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DurationConverter.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DurationConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DurationConverter.java index 0ddc0f571..017d86fc1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DurationConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DurationConverter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.AbstractConverter; import java.time.Duration; import java.time.temporal.TemporalAmount; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EmptyBeanConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EmptyBeanConverter.java similarity index 84% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EmptyBeanConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EmptyBeanConverter.java index 2f1936716..9fa7b02b7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EmptyBeanConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EmptyBeanConverter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.MatcherConverter; -import org.dromara.hutool.core.reflect.ConstructorUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.MatcherConverter; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EntryConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EntryConverter.java similarity index 86% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EntryConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EntryConverter.java index 937128a00..9538c0268 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EntryConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EntryConverter.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.convert.Converter; -import org.dromara.hutool.core.convert.ConverterWithRoot; -import org.dromara.hutool.core.convert.MatcherConverter; -import org.dromara.hutool.core.lang.tuple.Pair; -import org.dromara.hutool.core.lang.wrapper.Wrapper; -import org.dromara.hutool.core.map.MapUtil; -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.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.convert.Converter; +import cn.hutool.v7.core.convert.ConverterWithRoot; +import cn.hutool.v7.core.convert.MatcherConverter; +import cn.hutool.v7.core.lang.tuple.Pair; +import cn.hutool.v7.core.lang.wrapper.Wrapper; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.TypeReference; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EnumConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EnumConverter.java similarity index 88% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EnumConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EnumConverter.java index f11ae7ecc..469529ec3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EnumConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EnumConverter.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.convert.MatcherConverter; -import org.dromara.hutool.core.lang.EnumItem; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; -import org.dromara.hutool.core.reflect.ClassUtil; -import org.dromara.hutool.core.reflect.ModifierUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; -import org.dromara.hutool.core.util.EnumUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.convert.MatcherConverter; +import cn.hutool.v7.core.lang.EnumItem; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.ModifierUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.util.EnumUtil; import java.lang.reflect.Method; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/KBeanConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/KBeanConverter.java similarity index 79% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/KBeanConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/KBeanConverter.java index 3f105a026..8dc6d9108 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/KBeanConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/KBeanConverter.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.bean.copier.ValueProvider; -import org.dromara.hutool.core.bean.copier.provider.BeanValueProvider; -import org.dromara.hutool.core.bean.copier.provider.MapValueProvider; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.convert.Converter; -import org.dromara.hutool.core.convert.MatcherConverter; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.reflect.TypeUtil; -import org.dromara.hutool.core.reflect.kotlin.KClassUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.bean.copier.ValueProvider; +import cn.hutool.v7.core.bean.copier.provider.BeanValueProvider; +import cn.hutool.v7.core.bean.copier.provider.MapValueProvider; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.convert.Converter; +import cn.hutool.v7.core.convert.MatcherConverter; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.reflect.kotlin.KClassUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/LocaleConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/LocaleConverter.java similarity index 90% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/LocaleConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/LocaleConverter.java index 6775a8c8e..3848bafff 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/LocaleConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/LocaleConverter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.text.StrUtil; import java.util.Locale; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/MapConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/MapConverter.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/MapConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/MapConverter.java index 0beab9a24..c8173c6b0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/MapConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/MapConverter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.convert.*; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.reflect.TypeReference; -import org.dromara.hutool.core.reflect.TypeUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.convert.*; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.reflect.TypeReference; +import cn.hutool.v7.core.reflect.TypeUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/NumberConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/NumberConverter.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/NumberConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/NumberConverter.java index fbcbe2607..5856314c9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/NumberConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/NumberConverter.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.convert.MatcherConverter; -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 cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.convert.MatcherConverter; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.math.NumberUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.BooleanUtil; +import cn.hutool.v7.core.util.ByteUtil; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/OptConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptConverter.java similarity index 86% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/OptConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptConverter.java index 7feee88cc..a3977e912 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/OptConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptConverter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.lang.Opt; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.lang.Opt; /** * diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/OptionalConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptionalConverter.java similarity index 90% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/OptionalConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptionalConverter.java index 39063e3fa..8d4d9c64b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/OptionalConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptionalConverter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.AbstractConverter; import java.util.Optional; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PairConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PairConverter.java similarity index 88% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PairConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PairConverter.java index a31c14109..12b0cc7ba 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PairConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PairConverter.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.convert.Converter; -import org.dromara.hutool.core.convert.ConverterWithRoot; -import org.dromara.hutool.core.lang.tuple.Pair; -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.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.convert.Converter; +import cn.hutool.v7.core.convert.ConverterWithRoot; +import cn.hutool.v7.core.lang.tuple.Pair; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.reflect.TypeReference; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PathConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PathConverter.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PathConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PathConverter.java index cae6fede9..654556576 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PathConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PathConverter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.AbstractConverter; import java.io.File; import java.net.URI; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PeriodConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PeriodConverter.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PeriodConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PeriodConverter.java index 8427e455d..b8d068949 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PeriodConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PeriodConverter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.AbstractConverter; import java.time.Period; import java.time.temporal.TemporalAmount; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PrimitiveConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PrimitiveConverter.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PrimitiveConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PrimitiveConverter.java index 3e1e9b5f4..939cc6d65 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/PrimitiveConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PrimitiveConverter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.convert.MatcherConverter; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.convert.MatcherConverter; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/RecordConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/RecordConverter.java similarity index 78% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/RecordConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/RecordConverter.java index 8c5bac5b7..f9add0f8d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/RecordConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/RecordConverter.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.bean.RecordUtil; -import org.dromara.hutool.core.bean.copier.ValueProvider; -import org.dromara.hutool.core.bean.copier.provider.BeanValueProvider; -import org.dromara.hutool.core.bean.copier.provider.MapValueProvider; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.convert.MatcherConverter; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.bean.RecordUtil; +import cn.hutool.v7.core.bean.copier.ValueProvider; +import cn.hutool.v7.core.bean.copier.provider.BeanValueProvider; +import cn.hutool.v7.core.bean.copier.provider.MapValueProvider; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.convert.MatcherConverter; import java.lang.reflect.Type; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ReferenceConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ReferenceConverter.java similarity index 87% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ReferenceConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ReferenceConverter.java index 37295d33a..747e9d082 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ReferenceConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ReferenceConverter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.Converter; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.reflect.TypeUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.Converter; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.text.StrUtil; import java.lang.ref.Reference; import java.lang.ref.SoftReference; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/StackTraceElementConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/StackTraceElementConverter.java similarity index 88% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/StackTraceElementConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/StackTraceElementConverter.java index a2a9e4425..0d49ca6bd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/StackTraceElementConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/StackTraceElementConverter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/StringConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/StringConverter.java similarity index 87% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/StringConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/StringConverter.java index 0b0cce42d..14a3bd9ee 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/StringConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/StringConverter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.impl.stringer.BlobStringer; -import org.dromara.hutool.core.convert.impl.stringer.ClobStringer; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.xml.XmlUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.impl.stringer.BlobStringer; +import cn.hutool.v7.core.convert.impl.stringer.ClobStringer; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.xml.XmlUtil; import java.lang.reflect.Type; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TemporalAccessorConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TemporalAccessorConverter.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TemporalAccessorConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TemporalAccessorConverter.java index 58385bdc4..5b258832f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TemporalAccessorConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TemporalAccessorConverter.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -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.TimeUtil; -import org.dromara.hutool.core.date.format.DateFormatManager; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.date.DateTime; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.date.TimeUtil; +import cn.hutool.v7.core.date.format.DateFormatManager; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.time.*; import java.time.chrono.Era; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TimeZoneConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TimeZoneConverter.java similarity index 86% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TimeZoneConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TimeZoneConverter.java index 463c51244..80a1682d4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TimeZoneConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TimeZoneConverter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.MatcherConverter; -import org.dromara.hutool.core.date.ZoneUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.MatcherConverter; +import cn.hutool.v7.core.date.ZoneUtil; import java.lang.reflect.Type; import java.time.ZoneId; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TripleConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TripleConverter.java similarity index 88% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TripleConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TripleConverter.java index e6944d00d..070df660b 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TripleConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TripleConverter.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.convert.Converter; -import org.dromara.hutool.core.convert.ConverterWithRoot; -import org.dromara.hutool.core.lang.tuple.Triple; -import org.dromara.hutool.core.reflect.TypeReference; -import org.dromara.hutool.core.reflect.TypeUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.convert.Converter; +import cn.hutool.v7.core.convert.ConverterWithRoot; +import cn.hutool.v7.core.lang.tuple.Triple; +import cn.hutool.v7.core.reflect.TypeReference; +import cn.hutool.v7.core.reflect.TypeUtil; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TupleConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TupleConverter.java similarity index 84% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TupleConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TupleConverter.java index 447aac274..4b244a1c3 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/TupleConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TupleConverter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.convert.Converter; -import org.dromara.hutool.core.lang.tuple.Tuple; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.convert.Converter; +import cn.hutool.v7.core.lang.tuple.Tuple; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/URIConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URIConverter.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/URIConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URIConverter.java index 04993d7a8..d443175f2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/URIConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URIConverter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.AbstractConverter; import java.io.File; import java.net.URI; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/URLConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URLConverter.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/URLConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URLConverter.java index 774e3bcea..02940537f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/URLConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URLConverter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.AbstractConverter; import java.io.File; import java.net.URI; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/UUIDConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/UUIDConverter.java similarity index 90% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/UUIDConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/UUIDConverter.java index 78d06081a..8b0b52194 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/UUIDConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/UUIDConverter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.AbstractConverter; import java.util.UUID; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/XMLGregorianCalendarConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/XMLGregorianCalendarConverter.java similarity index 90% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/XMLGregorianCalendarConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/XMLGregorianCalendarConverter.java index 02a561e8a..03cfbaf97 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/XMLGregorianCalendarConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/XMLGregorianCalendarConverter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -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 cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.date.DateException; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.text.StrUtil; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ZoneIdConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ZoneIdConverter.java similarity index 86% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ZoneIdConverter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ZoneIdConverter.java index 4de008806..a8fa02bc0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ZoneIdConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ZoneIdConverter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; -import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.MatcherConverter; -import org.dromara.hutool.core.date.ZoneUtil; +import cn.hutool.v7.core.convert.AbstractConverter; +import cn.hutool.v7.core.convert.MatcherConverter; +import cn.hutool.v7.core.date.ZoneUtil; import java.lang.reflect.Type; import java.time.ZoneId; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/package-info.java index b2bd60b7b..a3ebcc286 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.convert.impl; +package cn.hutool.v7.core.convert.impl; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/stringer/BlobStringer.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/stringer/BlobStringer.java similarity index 87% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/stringer/BlobStringer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/stringer/BlobStringer.java index 523936a5e..5eed2fe02 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/stringer/BlobStringer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/stringer/BlobStringer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl.stringer; +package cn.hutool.v7.core.convert.impl.stringer; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.InputStream; import java.sql.Blob; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/stringer/ClobStringer.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/stringer/ClobStringer.java similarity index 90% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/stringer/ClobStringer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/stringer/ClobStringer.java index da54414d7..1d9e40bce 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/stringer/ClobStringer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/stringer/ClobStringer.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert.impl.stringer; +package cn.hutool.v7.core.convert.impl.stringer; -import org.dromara.hutool.core.convert.ConvertException; -import org.dromara.hutool.core.io.IoUtil; +import cn.hutool.v7.core.convert.ConvertException; +import cn.hutool.v7.core.io.IoUtil; import java.io.Reader; import java.sql.Clob; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/stringer/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/stringer/package-info.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/stringer/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/stringer/package-info.java index bb52efe62..2c142539b 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/stringer/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/stringer/package-info.java @@ -17,4 +17,4 @@ /** * 针对对象转换为String的封装 */ -package org.dromara.hutool.core.convert.impl.stringer; +package cn.hutool.v7.core.convert.impl.stringer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/package-info.java similarity index 60% rename from hutool-core/src/main/java/org/dromara/hutool/core/convert/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/convert/package-info.java index c077a7e38..e7d0feb8a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/package-info.java @@ -18,17 +18,17 @@ * 万能类型转换器以及各种类型转换的实现类，其中Convert为转换器入口，提供各种toXXX方法和convert方法
    * 转换器是典型的策略模式应用，可自定义转换策略。Hutool提供了常用类型的转换策略，自定义转换接口包括： *
      - *
    • {@link org.dromara.hutool.core.convert.Converter}，标准转换接口，通过类型匹配策略后调用使用。
      • - *
    • {@link org.dromara.hutool.core.convert.MatcherConverter}，带有match方法的Converter，通过自身匹配判断调用转换。
      • + *
    • {@link cn.hutool.v7.core.convert.Converter}，标准转换接口，通过类型匹配策略后调用使用。
      • + *
    • {@link cn.hutool.v7.core.convert.MatcherConverter}，带有match方法的Converter，通过自身匹配判断调用转换。
      • *
    * * 公共的转换器封装有两种： *
      - *
    • {@link org.dromara.hutool.core.convert.RegisterConverter}，提供预定义的转换规则，也可以注册自定义转换规则。
      • - *
    • {@link org.dromara.hutool.core.convert.CompositeConverter}，复合转换器，封装基于注册的、特别转换（泛型转换）等规则，实现万能转换。
      • + *
    • {@link cn.hutool.v7.core.convert.RegisterConverter}，提供预定义的转换规则，也可以注册自定义转换规则。
      • + *
    • {@link cn.hutool.v7.core.convert.CompositeConverter}，复合转换器，封装基于注册的、特别转换（泛型转换）等规则，实现万能转换。
      • *
    * * @author Looly * */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/CIN.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/CIN.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/CIN.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/CIN.java index 8d34a9ee8..02b4e6b7e 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/CIN.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/CIN.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -import org.dromara.hutool.core.date.DateFormatPool; -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.lang.Validator; -import org.dromara.hutool.core.regex.PatternPool; -import org.dromara.hutool.core.regex.ReUtil; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.date.DateFormatPool; +import cn.hutool.v7.core.date.DateTime; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.Validator; +import cn.hutool.v7.core.regex.PatternPool; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.Date; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/CIN10.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/CIN10.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/CIN10.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/CIN10.java index ff0621d5c..79a3a2796 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/CIN10.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/CIN10.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -import org.dromara.hutool.core.regex.ReUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.HashMap; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/CoordinateUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/CoordinateUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/CoordinateUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/CoordinateUtil.java index cb3611e98..c34f61d11 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/CoordinateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/CoordinateUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/CreditCodeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/CreditCodeUtil.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/CreditCodeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/CreditCodeUtil.java index b5cabef52..e7e67e7ff 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/CreditCodeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/CreditCodeUtil.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; -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.util.RandomUtil; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.regex.PatternPool; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.RandomUtil; import java.util.Map; import java.util.regex.Pattern; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/IdcardUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/IdcardUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/IdcardUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/IdcardUtil.java index b5f24489f..24d6b21bd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/IdcardUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/IdcardUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -import org.dromara.hutool.core.date.DateTime; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.date.DateTime; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.Date; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/MaskingUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/MaskingUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/MaskingUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/MaskingUtil.java index 91c450f8f..d00f47671 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/MaskingUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/MaskingUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -import org.dromara.hutool.core.data.masking.MaskingManager; -import org.dromara.hutool.core.data.masking.MaskingType; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.data.masking.MaskingManager; +import cn.hutool.v7.core.data.masking.MaskingType; +import cn.hutool.v7.core.text.StrUtil; /** * 数据脱敏（Data Masking）工具类，对某些敏感信息（比如，身份证号、手机号、卡号、姓名、地址、邮箱等 ）屏蔽敏感数据。
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/PasswdStrength.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/PasswdStrength.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/PasswdStrength.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/PasswdStrength.java index a89038308..666a17782 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/PasswdStrength.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/PasswdStrength.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * 检测密码强度
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/PhoneUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/PhoneUtil.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/PhoneUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/PhoneUtil.java index 366ead1d3..5e0dd0986 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/PhoneUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/PhoneUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -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 cn.hutool.v7.core.regex.PatternPool; +import cn.hutool.v7.core.lang.Validator; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.text.StrUtil; /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/VIN.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/VIN.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/VIN.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/VIN.java index 02f9d1ea6..511bd80ff 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/VIN.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/VIN.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.regex.PatternPool; -import org.dromara.hutool.core.regex.ReUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.regex.PatternPool; +import cn.hutool.v7.core.regex.ReUtil; import java.time.Year; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/IdConstants.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/IdConstants.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/IdConstants.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/IdConstants.java index 838926f3f..d02e4c652 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/IdConstants.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/IdConstants.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.util.RandomUtil; /** * ID相关常量 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/IdUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/IdUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/IdUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/IdUtil.java index 724b8dfa4..e31ccd146 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/IdUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/IdUtil.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.Singleton; -import org.dromara.hutool.core.net.Ipv4Util; -import org.dromara.hutool.core.util.RuntimeUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.Singleton; +import cn.hutool.v7.core.net.Ipv4Util; +import cn.hutool.v7.core.util.RuntimeUtil; /** * ID生成器工具类，此工具类中主要封装： diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/NanoId.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/NanoId.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/NanoId.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/NanoId.java index 4fa9f4dca..df496182b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/NanoId.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/NanoId.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.util.RandomUtil; import java.security.SecureRandom; import java.util.Random; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/ObjectId.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/ObjectId.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/ObjectId.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/ObjectId.java index 545b1daaa..92530c1f7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/ObjectId.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/ObjectId.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.RandomUtil; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/ObjectIdGenerator.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/ObjectIdGenerator.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/ObjectIdGenerator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/ObjectIdGenerator.java index d6acb5538..de73c7784 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/ObjectIdGenerator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/ObjectIdGenerator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.lang.generator.Generator; +import cn.hutool.v7.core.lang.generator.Generator; /** * ObjectId生成器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Pid.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/Pid.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/Pid.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/Pid.java index 812808d25..279054161 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Pid.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/Pid.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.text.StrUtil; import java.lang.management.ManagementFactory; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/SeataSnowflake.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/SeataSnowflake.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/SeataSnowflake.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/SeataSnowflake.java index 45daf9f8e..aee4c08ec 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/SeataSnowflake.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/SeataSnowflake.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.lang.generator.Generator; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.lang.generator.Generator; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.util.Date; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Snowflake.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/Snowflake.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/Snowflake.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/Snowflake.java index 49ee8a043..feca87a71 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Snowflake.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/Snowflake.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.date.SystemClock; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.generator.Generator; -import org.dromara.hutool.core.lang.tuple.Pair; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.date.SystemClock; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.generator.Generator; +import cn.hutool.v7.core.lang.tuple.Pair; +import cn.hutool.v7.core.util.RandomUtil; import java.io.Serializable; import java.util.Date; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/ULID.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/ULID.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/ULID.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/ULID.java index 5c0e20a32..e6f1d6e3c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/ULID.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/ULID.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.codec.Number128; -import org.dromara.hutool.core.codec.binary.CrockfordBase32Codec; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.codec.Number128; +import cn.hutool.v7.core.codec.binary.CrockfordBase32Codec; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.RandomUtil; import java.io.Serializable; import java.nio.ByteOrder; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/ULIDGenerator.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/ULIDGenerator.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/ULIDGenerator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/ULIDGenerator.java index 1962510b2..7b78e4cd8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/ULIDGenerator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/ULIDGenerator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.lang.generator.Generator; +import cn.hutool.v7.core.lang.generator.Generator; /** * ULID生成器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/UUID.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/UUID.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/UUID.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/UUID.java index 6047f3318..5bcc07ddb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/UUID.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/UUID.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.codec.Number128; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.RandomUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.codec.Number128; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.RandomUtil; +import cn.hutool.v7.core.text.StrUtil; import java.nio.ByteOrder; import java.security.MessageDigest; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/UUIDGenerator.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/UUIDGenerator.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/UUIDGenerator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/UUIDGenerator.java index 669d693e2..8c06f6e5f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/UUIDGenerator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/UUIDGenerator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.lang.generator.Generator; +import cn.hutool.v7.core.lang.generator.Generator; /** * UUID生成器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/id/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/id/package-info.java index c15afe982..78b023810 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/package-info.java @@ -20,4 +20,4 @@ * @author Looly * @since 5.7.5 */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/masking/MaskingHandler.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/masking/MaskingHandler.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/masking/MaskingHandler.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/masking/MaskingHandler.java index 08c9d058b..2f5629e06 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/masking/MaskingHandler.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/masking/MaskingHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.masking; +package cn.hutool.v7.core.data.masking; /** * 脱敏处理器，用于自定义脱敏规则 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/masking/MaskingManager.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/masking/MaskingManager.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/masking/MaskingManager.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/masking/MaskingManager.java index 44cf86a57..1a3f94466 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/masking/MaskingManager.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/masking/MaskingManager.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.masking; +package cn.hutool.v7.core.data.masking; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static org.dromara.hutool.core.data.masking.MaskingType.*; +import static cn.hutool.v7.core.data.masking.MaskingType.*; /** * 脱敏管理器，用于管理所有脱敏处理器，使用方式有三种： diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/masking/MaskingType.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/masking/MaskingType.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/masking/MaskingType.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/masking/MaskingType.java index 1f921b6fa..eb7310d19 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/masking/MaskingType.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/masking/MaskingType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.masking; +package cn.hutool.v7.core.data.masking; /** * 支持的脱敏类型枚举 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/masking/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/masking/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/masking/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/masking/package-info.java index b2e1e9721..173104fad 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/masking/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/masking/package-info.java @@ -19,4 +19,4 @@ * * @author Looly */ -package org.dromara.hutool.core.data.masking; +package cn.hutool.v7.core.data.masking; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/package-info.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/data/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/data/package-info.java index 82bc1b52a..3d886da7c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/package-info.java @@ -21,4 +21,4 @@ * * @author Looly */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/BetweenFormatter.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/BetweenFormatter.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/BetweenFormatter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/BetweenFormatter.java index e29b58034..7e1877b09 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/BetweenFormatter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/BetweenFormatter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.util.function.Function; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/CalendarUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/CalendarUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/CalendarUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/CalendarUtil.java index b0f1f611a..eb4c19e2f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/CalendarUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/CalendarUtil.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.comparator.CompareUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.math.ChineseNumberFormatter; -import org.dromara.hutool.core.date.format.DateFormatManager; -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 cn.hutool.v7.core.comparator.CompareUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.math.ChineseNumberFormatter; +import cn.hutool.v7.core.date.format.DateFormatManager; +import cn.hutool.v7.core.date.format.parser.DateParser; +import cn.hutool.v7.core.date.format.parser.FastDateParser; +import cn.hutool.v7.core.date.format.parser.PositionDateParser; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import javax.xml.datatype.XMLGregorianCalendar; import java.text.ParsePosition; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateBetween.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateBetween.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/DateBetween.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/DateBetween.java index b8ee977f4..a32887d24 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateBetween.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateBetween.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.io.Serializable; import java.util.Calendar; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateBuilder.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/DateBuilder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/DateBuilder.java index 1a8c7ee9a..d8cfa82f0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import java.time.*; import java.util.Calendar; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateException.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateException.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/DateException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/DateException.java index a8f2212b9..e18b1e420 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; /** * 工具类异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateField.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateField.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/DateField.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/DateField.java index ce584de5f..e33e386be 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateField.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateField.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import java.util.Calendar; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateFormatPool.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateFormatPool.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/DateFormatPool.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/DateFormatPool.java index 480898b5b..fe47469c9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateFormatPool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateFormatPool.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.date.format.FastDateFormat; +import cn.hutool.v7.core.date.format.FastDateFormat; import java.time.ZoneId; import java.time.format.DateTimeFormatter; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateModifier.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateModifier.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/DateModifier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/DateModifier.java index 663664210..412344921 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateModifier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateModifier.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.util.Calendar; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateRange.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateRange.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/DateRange.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/DateRange.java index f3633fcaa..8d5810ec7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateRange.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateRange.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.lang.range.Range; +import cn.hutool.v7.core.lang.range.Range; import java.util.Date; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateTime.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateTime.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/DateTime.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/DateTime.java index a11b38a4b..4ba00f7df 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateTime.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateTime.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.date.format.DateFormatManager; -import org.dromara.hutool.core.date.format.DatePrinter; -import org.dromara.hutool.core.date.format.FastDateFormat; -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 cn.hutool.v7.core.date.format.DateFormatManager; +import cn.hutool.v7.core.date.format.DatePrinter; +import cn.hutool.v7.core.date.format.FastDateFormat; +import cn.hutool.v7.core.date.format.parser.DateParser; +import cn.hutool.v7.core.date.format.parser.PositionDateParser; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateUnit.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateUnit.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/DateUnit.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/DateUnit.java index 1e3ae2de9..91f4b832d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateUnit.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateUnit.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import java.time.temporal.ChronoUnit; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/DateUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/DateUtil.java index ce0387b6b..8cf63a8da 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateUtil.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.comparator.CompareUtil; -import org.dromara.hutool.core.date.format.DateFormatManager; -import org.dromara.hutool.core.date.format.DatePrinter; -import org.dromara.hutool.core.date.format.FastDateFormat; -import org.dromara.hutool.core.date.format.parser.PositionDateParser; -import org.dromara.hutool.core.date.format.parser.RegisterDateParser; -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.SystemUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.comparator.CompareUtil; +import cn.hutool.v7.core.date.format.DateFormatManager; +import cn.hutool.v7.core.date.format.DatePrinter; +import cn.hutool.v7.core.date.format.FastDateFormat; +import cn.hutool.v7.core.date.format.parser.PositionDateParser; +import cn.hutool.v7.core.date.format.parser.RegisterDateParser; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.util.SystemUtil; import javax.xml.datatype.XMLGregorianCalendar; import java.text.DateFormat; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/LocalTimeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/LocalTimeUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/LocalTimeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/LocalTimeUtil.java index 8abe1cbd2..0899f6288 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/LocalTimeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/LocalTimeUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import java.time.LocalTime; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/Month.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/Month.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/Month.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/Month.java index 6a561fa5f..64e2c9251 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/Month.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/Month.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.time.format.TextStyle; import java.util.Calendar; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/Quarter.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/Quarter.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/Quarter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/Quarter.java index 6788ae7a0..c51aca273 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/Quarter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/Quarter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.time.temporal.ChronoField; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/SqlDateUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/SqlDateUtil.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/SqlDateUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/SqlDateUtil.java index 3bd7065e0..ee542583b 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/SqlDateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/SqlDateUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; import java.sql.Timestamp; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/StopWatch.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/StopWatch.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/StopWatch.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/StopWatch.java index 2300672cb..a0c3298d4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/StopWatch.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/StopWatch.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.text.StrUtil; import java.text.NumberFormat; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/SystemClock.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/SystemClock.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/SystemClock.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/SystemClock.java index 95cd2041e..290e15b06 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/SystemClock.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/SystemClock.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import java.sql.Timestamp; import java.util.concurrent.Executors; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalAccessorUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/TemporalAccessorUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalAccessorUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/TemporalAccessorUtil.java index e189a572a..59dc50937 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalAccessorUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/TemporalAccessorUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.date.format.DateFormatManager; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.date.format.DateFormatManager; +import cn.hutool.v7.core.text.StrUtil; import java.time.DayOfWeek; import java.time.Instant; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/TemporalUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/TemporalUtil.java index 99ec7faec..fc5aa2dc0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/TemporalUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import java.time.DayOfWeek; import java.time.Duration; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/TimeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/TimeUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/TimeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/TimeUtil.java index ae0014044..b22b3ca4e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/TimeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/TimeUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.date.format.DateFormatManager; -import org.dromara.hutool.core.func.LambdaUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.date.format.DateFormatManager; +import cn.hutool.v7.core.func.LambdaUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.time.*; import java.time.chrono.ChronoLocalDate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/Week.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/Week.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/Week.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/Week.java index 169b444fb..967c12f52 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/Week.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/Week.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; import java.time.DayOfWeek; import java.util.Calendar; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/Zodiac.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/Zodiac.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/Zodiac.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/Zodiac.java index 894240c34..68ba489b3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/Zodiac.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/Zodiac.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.util.Calendar; import java.util.Date; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/ZoneUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/ZoneUtil.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/ZoneUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/ZoneUtil.java index 5075c1f47..39d4913d3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/ZoneUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/ZoneUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.time.ZoneId; import java.util.TimeZone; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDate.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ChineseDate.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDate.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ChineseDate.java index 9cb440f12..8b55f9d67 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDate.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ChineseDate.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; -import org.dromara.hutool.core.date.*; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.math.ChineseNumberFormatter; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.date.*; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.math.ChineseNumberFormatter; +import cn.hutool.v7.core.text.StrUtil; import java.time.LocalDate; import java.util.Calendar; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDateFormat.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ChineseDateFormat.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDateFormat.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ChineseDateFormat.java index a5215d6ee..c3087faf5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDateFormat.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ChineseDateFormat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; /** * 农历标准化输出格式枚举 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseMonth.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ChineseMonth.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseMonth.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ChineseMonth.java index 929634172..deae2f74d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseMonth.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ChineseMonth.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; /** * 农历月份表示
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/GanZhi.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/GanZhi.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/GanZhi.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/GanZhi.java index bd50a1288..9cdcfbced 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/GanZhi.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/GanZhi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; import java.time.LocalDate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarFestival.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/LunarFestival.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarFestival.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/LunarFestival.java index 5158d723a..221833912 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarFestival.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/LunarFestival.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.map.TableMap; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.map.TableMap; import java.util.List; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarInfo.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/LunarInfo.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarInfo.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/LunarInfo.java index c35868f92..99053251b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarInfo.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/LunarInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; import java.time.LocalDate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ShiChen.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ShiChen.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ShiChen.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ShiChen.java index a27b23116..64fd5aebc 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ShiChen.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ShiChen.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; -import org.dromara.hutool.core.date.DateBetween; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.date.DateBetween; +import cn.hutool.v7.core.text.StrUtil; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/SolarTerms.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/SolarTerms.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/SolarTerms.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/SolarTerms.java index 0d30d01ba..853ce735e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/SolarTerms.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/SolarTerms.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; -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 cn.hutool.v7.core.date.DateTime; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.math.NumberUtil; +import cn.hutool.v7.core.text.StrUtil; import java.time.LocalDate; import java.util.Date; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/package-info.java index 95464e1f8..b4ab2bee7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/package-info.java @@ -21,4 +21,4 @@ * @author Looly * */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DateBasic.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DateBasic.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/DateBasic.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/DateBasic.java index 9c8aa7c99..c1c1f8544 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DateBasic.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DateBasic.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format; +package cn.hutool.v7.core.date.format; import java.util.Locale; import java.util.TimeZone; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DateFormatManager.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DateFormatManager.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/DateFormatManager.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/DateFormatManager.java index a77c2667a..eeb6c5218 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DateFormatManager.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DateFormatManager.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format; +package cn.hutool.v7.core.date.format; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import java.time.temporal.TemporalAccessor; import java.util.Date; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DatePattern.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DatePattern.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/DatePattern.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/DatePattern.java index fbdc07279..752d120ab 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DatePattern.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DatePattern.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format; +package cn.hutool.v7.core.date.format; -import org.dromara.hutool.core.date.DateException; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.date.DateException; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import java.io.IOException; import java.text.DateFormatSymbols; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DatePrinter.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DatePrinter.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/DatePrinter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/DatePrinter.java index d9d5d7c33..f14cf7b63 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DatePrinter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DatePrinter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format; +package cn.hutool.v7.core.date.format; import java.util.Calendar; import java.util.Date; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DefaultDateBasic.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DefaultDateBasic.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/DefaultDateBasic.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/DefaultDateBasic.java index 2b3b4f3b5..2e6d2353d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/DefaultDateBasic.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DefaultDateBasic.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format; +package cn.hutool.v7.core.date.format; import java.io.Serializable; import java.util.Locale; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/FastDateFormat.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDateFormat.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/FastDateFormat.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDateFormat.java index 253549630..4e410bae0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/FastDateFormat.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDateFormat.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format; +package cn.hutool.v7.core.date.format; -import org.dromara.hutool.core.date.DateException; -import org.dromara.hutool.core.date.DateFormatPool; -import org.dromara.hutool.core.date.format.parser.FastDateParser; -import org.dromara.hutool.core.date.format.parser.PositionDateParser; +import cn.hutool.v7.core.date.DateException; +import cn.hutool.v7.core.date.DateFormatPool; +import cn.hutool.v7.core.date.format.parser.FastDateParser; +import cn.hutool.v7.core.date.format.parser.PositionDateParser; import java.text.DateFormat; import java.text.FieldPosition; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/FastDatePrinter.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDatePrinter.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/FastDatePrinter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDatePrinter.java index 26832fa3b..e90ce74a4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/FastDatePrinter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDatePrinter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format; +package cn.hutool.v7.core.date.format; -import org.dromara.hutool.core.date.format.parser.FastDateParser; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.date.format.parser.FastDateParser; +import cn.hutool.v7.core.text.StrUtil; import java.util.*; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/FormatCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FormatCache.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/FormatCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/FormatCache.java index 92947bd99..37fa6f3d2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/FormatCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FormatCache.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format; +package cn.hutool.v7.core.date.format; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.tuple.Tuple; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.tuple.Tuple; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import java.text.DateFormat; import java.text.Format; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/SimpleDateBasic.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/SimpleDateBasic.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/SimpleDateBasic.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/SimpleDateBasic.java index dc9fa0d69..25cf897e2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/SimpleDateBasic.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/SimpleDateBasic.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format; +package cn.hutool.v7.core.date.format; import java.io.Serializable; import java.util.Locale; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/package-info.java index 146ab6be7..4dd862995 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.date.format; +package cn.hutool.v7.core.date.format; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/DateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/DateParser.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/DateParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/DateParser.java index d87cafad3..701f97a25 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/DateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/DateParser.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format.parser; +package cn.hutool.v7.core.date.format.parser; -import org.dromara.hutool.core.date.DateException; +import cn.hutool.v7.core.date.DateException; import java.util.Date; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/DefaultRegexDateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/DefaultRegexDateParser.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/DefaultRegexDateParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/DefaultRegexDateParser.java index a27805721..ddd467871 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/DefaultRegexDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/DefaultRegexDateParser.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format.parser; +package cn.hutool.v7.core.date.format.parser; -import org.dromara.hutool.core.date.DateTime; +import cn.hutool.v7.core.date.DateTime; import java.util.regex.Pattern; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/FastDateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/FastDateParser.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/FastDateParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/FastDateParser.java index 2e75fa410..67afd6b56 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/FastDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/FastDateParser.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format.parser; +package cn.hutool.v7.core.date.format.parser; -import org.dromara.hutool.core.date.DateException; -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.concurrent.SafeConcurrentHashMap; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.date.DateException; +import cn.hutool.v7.core.date.format.FastDateFormat; +import cn.hutool.v7.core.date.format.FastDatePrinter; +import cn.hutool.v7.core.date.format.SimpleDateBasic; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.text.StrUtil; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PatternsDateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PatternsDateParser.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PatternsDateParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PatternsDateParser.java index 7d26ba468..6cd198e37 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PatternsDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PatternsDateParser.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format.parser; +package cn.hutool.v7.core.date.format.parser; -import org.dromara.hutool.core.date.CalendarUtil; -import org.dromara.hutool.core.date.DateException; -import org.dromara.hutool.core.date.DateTime; +import cn.hutool.v7.core.date.CalendarUtil; +import cn.hutool.v7.core.date.DateException; +import cn.hutool.v7.core.date.DateTime; import java.io.Serializable; import java.util.Calendar; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PositionDateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PositionDateParser.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PositionDateParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PositionDateParser.java index 27acead78..4260e8e2e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PositionDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PositionDateParser.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format.parser; +package cn.hutool.v7.core.date.format.parser; -import org.dromara.hutool.core.date.DateException; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.date.format.DateBasic; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.date.DateException; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.date.format.DateBasic; +import cn.hutool.v7.core.lang.Assert; import java.text.ParsePosition; import java.util.Calendar; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PredicateDateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PredicateDateParser.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PredicateDateParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PredicateDateParser.java index 098a52cc5..621475768 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/PredicateDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PredicateDateParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format.parser; +package cn.hutool.v7.core.date.format.parser; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/RegexDateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegexDateParser.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/RegexDateParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegexDateParser.java index b4c4df8e3..1057a97a1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/RegexDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegexDateParser.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format.parser; +package cn.hutool.v7.core.date.format.parser; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.date.DateBuilder; -import org.dromara.hutool.core.date.DateException; -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.core.lang.Opt; -import org.dromara.hutool.core.regex.ReUtil; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.dfa.WordTree; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.date.DateBuilder; +import cn.hutool.v7.core.date.DateException; +import cn.hutool.v7.core.date.Month; +import cn.hutool.v7.core.date.Week; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.dfa.WordTree; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/RegisterDateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegisterDateParser.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/RegisterDateParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegisterDateParser.java index 746b7c5cd..fc8ab6780 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/RegisterDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegisterDateParser.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format.parser; +package cn.hutool.v7.core.date.format.parser; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.date.DateException; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.date.DateException; import java.io.Serializable; import java.util.Date; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/TimeParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/TimeParser.java similarity index 83% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/TimeParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/TimeParser.java index 17d2d47e9..91851cdb8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/TimeParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/TimeParser.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format.parser; +package cn.hutool.v7.core.date.format.parser; -import org.dromara.hutool.core.date.DateFormatPool; -import org.dromara.hutool.core.date.DateTime; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.regex.PatternPool; -import org.dromara.hutool.core.regex.ReUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.date.DateFormatPool; +import cn.hutool.v7.core.date.DateTime; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.regex.PatternPool; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/package-info.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/package-info.java index d660e8db8..7daa9b5f8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/package-info.java @@ -25,4 +25,4 @@ * * @author Looly */ -package org.dromara.hutool.core.date.format.parser; +package cn.hutool.v7.core.date.format.parser; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/package-info.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/date/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/date/package-info.java index e024357cc..bc7a4219c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exception/CloneException.java b/hutool-core/src/main/java/cn/hutool/v7/core/exception/CloneException.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/exception/CloneException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/exception/CloneException.java index 3fdb07179..383ec8e2d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/exception/CloneException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/exception/CloneException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.exception; +package cn.hutool.v7.core.exception; /** * 克隆异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exception/DependencyException.java b/hutool-core/src/main/java/cn/hutool/v7/core/exception/DependencyException.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/exception/DependencyException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/exception/DependencyException.java index e617f1662..30cb904f1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/exception/DependencyException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/exception/DependencyException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.exception; +package cn.hutool.v7.core.exception; /** * 依赖异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exception/ExceptionUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/exception/ExceptionUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/exception/ExceptionUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/exception/ExceptionUtil.java index 2e42cae58..5ed2e414c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/exception/ExceptionUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/exception/ExceptionUtil.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.exception; +package cn.hutool.v7.core.exception; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.io.IORuntimeException; -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.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.IOException; import java.io.PrintStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exception/HutoolException.java b/hutool-core/src/main/java/cn/hutool/v7/core/exception/HutoolException.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/exception/HutoolException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/exception/HutoolException.java index 726262e78..b26719bd8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/exception/HutoolException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/exception/HutoolException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.exception; +package cn.hutool.v7.core.exception; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * Hutool工具类异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exception/StatefulException.java b/hutool-core/src/main/java/cn/hutool/v7/core/exception/StatefulException.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/exception/StatefulException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/exception/StatefulException.java index cf3ef2679..07a5ef968 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/exception/StatefulException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/exception/StatefulException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.exception; +package cn.hutool.v7.core.exception; /** * 带有状态码的异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exception/ValidateException.java b/hutool-core/src/main/java/cn/hutool/v7/core/exception/ValidateException.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/exception/ValidateException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/exception/ValidateException.java index 760eb1aa4..a4ad20b7b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/exception/ValidateException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/exception/ValidateException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.exception; +package cn.hutool.v7.core.exception; /** * 验证异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exception/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/exception/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/exception/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/exception/package-info.java index d68072737..44e74b755 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/exception/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/exception/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.exception; +package cn.hutool.v7.core.exception; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/ComposeFunction.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/ComposeFunction.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/ComposeFunction.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/ComposeFunction.java index b651bc75e..6a093bdee 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/ComposeFunction.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/ComposeFunction.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.io.Serializable; import java.util.function.Function; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/FunctionPool.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/FunctionPool.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/FunctionPool.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/FunctionPool.java index 4edcb818d..e8758a3cb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/FunctionPool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/FunctionPool.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.reflect.ConstructorUtil; -import org.dromara.hutool.core.util.JdkUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.util.JdkUtil; import java.lang.reflect.Constructor; import java.util.function.BiFunction; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaFactory.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/LambdaFactory.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaFactory.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/LambdaFactory.java index 99b0dc766..c8c0bc15a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaFactory.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/LambdaFactory.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.mutable.MutableEntry; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; -import org.dromara.hutool.core.reflect.ClassUtil; -import org.dromara.hutool.core.reflect.ReflectUtil; -import org.dromara.hutool.core.reflect.lookup.LookupUtil; -import org.dromara.hutool.core.reflect.method.MethodTypeUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.mutable.MutableEntry; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.ReflectUtil; +import cn.hutool.v7.core.reflect.lookup.LookupUtil; +import cn.hutool.v7.core.reflect.method.MethodTypeUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; import java.lang.invoke.*; import java.lang.reflect.Executable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaInfo.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/LambdaInfo.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaInfo.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/LambdaInfo.java index ab2354031..c8b0a1597 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaInfo.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/LambdaInfo.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -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 cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrPool; import java.lang.invoke.SerializedLambda; import java.lang.reflect.Constructor; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/LambdaUtil.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/LambdaUtil.java index 1efaa7007..b11301477 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/LambdaUtil.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.Opt; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; -import org.dromara.hutool.core.reflect.ClassDescUtil; -import org.dromara.hutool.core.reflect.ModifierUtil; -import org.dromara.hutool.core.reflect.method.MethodInvoker; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.reflect.ClassDescUtil; +import cn.hutool.v7.core.reflect.ModifierUtil; +import cn.hutool.v7.core.reflect.method.MethodInvoker; +import cn.hutool.v7.core.reflect.method.MethodUtil; import java.io.Serializable; import java.lang.invoke.SerializedLambda; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/PredicateUnaryOperator.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/PredicateUnaryOperator.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/PredicateUnaryOperator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/PredicateUnaryOperator.java index 346c94b91..db1e04618 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/PredicateUnaryOperator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/PredicateUnaryOperator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; import java.util.function.Predicate; import java.util.function.UnaryOperator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/PredicateUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/PredicateUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/PredicateUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/PredicateUtil.java index fe8bcfec2..838f85121 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/PredicateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/PredicateUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.stream.StreamUtil; +import cn.hutool.v7.core.stream.StreamUtil; import java.util.function.Predicate; import java.util.stream.Stream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiConsumer.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerBiConsumer.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiConsumer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/SerBiConsumer.java index 30fa62245..4b82d690d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiConsumer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerBiConsumer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiFunction.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerBiFunction.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiFunction.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/SerBiFunction.java index 12335ba7d..4903a7a0e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiFunction.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerBiFunction.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiPredicate.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerBiPredicate.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiPredicate.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/SerBiPredicate.java index c15d2ee90..a52a5d2bd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiPredicate.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerBiPredicate.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBinaryOperator.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerBinaryOperator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/SerBinaryOperator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/SerBinaryOperator.java index f725ef0ca..4f24e43e6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBinaryOperator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerBinaryOperator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; import java.io.Serializable; import java.util.Comparator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerConsumer.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/SerConsumer.java index cf0d6e050..b2619cbae 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerConsumer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer3.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerConsumer3.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer3.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/SerConsumer3.java index 4f5c8a126..86fdbcac5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer3.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerConsumer3.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerFunction.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerFunction.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/SerFunction.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/SerFunction.java index 89a3f16d8..bdf01f6e0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerFunction.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerFunction.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; import java.io.Serializable; import java.util.function.Function; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerPredicate.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerPredicate.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/SerPredicate.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/SerPredicate.java index 883126c94..6fd5d930c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerPredicate.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerPredicate.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerRunnable.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerRunnable.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/SerRunnable.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/SerRunnable.java index 27a215696..90d216759 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerRunnable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerRunnable.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; import java.io.Serializable; import java.util.stream.Stream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerSupplier.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerSupplier.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/SerSupplier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/SerSupplier.java index 450f3818d..8d3ce28d1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerSupplier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerSupplier.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; import java.io.Serializable; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerUnaryOperator.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerUnaryOperator.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/SerUnaryOperator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/SerUnaryOperator.java index 35ac6e2da..5d4f89f34 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerUnaryOperator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/SerUnaryOperator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; import java.io.Serializable; import java.util.function.Function; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/package-info.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/func/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/func/package-info.java index d3a832ec4..eafa0221a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/func/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/package-info.java @@ -23,4 +23,4 @@ * @author Looly * */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/AppendableWriter.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/AppendableWriter.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/AppendableWriter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/AppendableWriter.java index 510208e45..a7d588116 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/AppendableWriter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/AppendableWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; import java.io.Closeable; import java.io.Flushable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/BomReader.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/BomReader.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/BomReader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/BomReader.java index 90689d8d8..1466d8185 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/BomReader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/BomReader.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.io.stream.BOMInputStream; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.io.stream.BOMInputStream; +import cn.hutool.v7.core.lang.Assert; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/ByteOrderMark.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/ByteOrderMark.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/ByteOrderMark.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/ByteOrderMark.java index 48bbdc662..eca3eb97f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/ByteOrderMark.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/ByteOrderMark.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.Serializable; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/CharSequenceReader.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/CharSequenceReader.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/CharSequenceReader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/CharSequenceReader.java index ae6ce785a..fd88576e8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/CharSequenceReader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/CharSequenceReader.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; import java.io.Reader; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/CharsetDetector.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/CharsetDetector.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/CharsetDetector.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/CharsetDetector.java index 3c85de39d..c2f62a5fd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/CharsetDetector.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/CharsetDetector.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/CircularByteBuffer.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/CircularByteBuffer.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/CircularByteBuffer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/CircularByteBuffer.java index e577e97c2..68e01e7cf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/CircularByteBuffer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/CircularByteBuffer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/FastStringWriter.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/FastStringWriter.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/FastStringWriter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/FastStringWriter.java index ab80f4e18..ccb91f46d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/FastStringWriter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/FastStringWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; import java.io.Writer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/IORuntimeException.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/IORuntimeException.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/IORuntimeException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/IORuntimeException.java index f0ce8a1f4..4b0ad7cf4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/IORuntimeException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/IORuntimeException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; /** * IO运行时异常，常用于对IOException的包装 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/IoUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/IoUtil.java index 1e3f3a173..2899c7b66 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/IoUtil.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.codec.binary.HexUtil; -import org.dromara.hutool.core.collection.iter.LineIter; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.func.SerConsumer; -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.text.StrUtil; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.codec.binary.HexUtil; +import cn.hutool.v7.core.collection.iter.LineIter; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.func.SerConsumer; +import cn.hutool.v7.core.io.copy.FileChannelCopier; +import cn.hutool.v7.core.io.copy.ReaderWriterCopier; +import cn.hutool.v7.core.io.copy.StreamCopier; +import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream; +import cn.hutool.v7.core.io.stream.StreamReader; +import cn.hutool.v7.core.io.stream.StreamWriter; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.*; import java.nio.CharBuffer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/LineReader.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/LineReader.java index af688de2e..39391c93e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/LineReader.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.collection.iter.ComputeIter; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.CharUtil; +import cn.hutool.v7.core.collection.iter.ComputeIter; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.CharUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/ManifestUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/ManifestUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/ManifestUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/ManifestUtil.java index 6f1ed6605..442da69a6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/ManifestUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/ManifestUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.resource.ResourceUtil; import java.io.File; import java.io.FileInputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/NioUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/NioUtil.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/NioUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/NioUtil.java index 5235dcbda..f44c718e2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/NioUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/NioUtil.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -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 cn.hutool.v7.core.io.copy.ChannelCopier; +import cn.hutool.v7.core.io.copy.FileChannelCopier; +import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/ReaderWrapper.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/ReaderWrapper.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/ReaderWrapper.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/ReaderWrapper.java index 545bd4b93..c128f32f8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/ReaderWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/ReaderWrapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.wrapper.Wrapper; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.wrapper.Wrapper; import java.io.IOException; import java.io.Reader; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/SerializeUtil.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/SerializeUtil.java index d170f38e1..a920a8af1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/SerializeUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream; import java.io.ByteArrayInputStream; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/StreamProgress.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/StreamProgress.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/StreamProgress.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/StreamProgress.java index 616506a35..a5f5bd817 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/StreamProgress.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/StreamProgress.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; /** * Stream进度条
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/BufferUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/BufferUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/BufferUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/BufferUtil.java index 0fcb3fa18..ce9929b68 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/BufferUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/BufferUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.buffer; +package cn.hutool.v7.core.io.buffer; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.nio.ByteBuffer; import java.nio.CharBuffer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/FastBuffer.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/FastBuffer.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/FastBuffer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/FastBuffer.java index 0dbb12c36..f77b8a523 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/FastBuffer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/FastBuffer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.buffer; +package cn.hutool.v7.core.io.buffer; -import org.dromara.hutool.core.io.IoUtil; +import cn.hutool.v7.core.io.IoUtil; /** * 快速缓冲抽象类，用于快速读取、写入数据到缓冲区，减少内存复制
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/FastByteBuffer.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/FastByteBuffer.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/FastByteBuffer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/FastByteBuffer.java index ff4b91ab4..d396ae54c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/FastByteBuffer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/FastByteBuffer.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.buffer; +package cn.hutool.v7.core.io.buffer; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.lang.Assert; /** * 代码移植自blade
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/FastCharBuffer.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/FastCharBuffer.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/FastCharBuffer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/FastCharBuffer.java index 13a3563be..d39a8c1a3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/FastCharBuffer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/FastCharBuffer.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.buffer; +package cn.hutool.v7.core.io.buffer; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.lang.Assert; /** * 代码移植自jetbrick
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/package-info.java index 4a618ddf7..51bd86f1f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/buffer/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/buffer/package-info.java @@ -19,4 +19,4 @@ * * @author Looly */ -package org.dromara.hutool.core.io.buffer; +package cn.hutool.v7.core.io.buffer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/CRC16.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/CRC16.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/CRC16.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/CRC16.java index 24f8ba7dc..263bf4cad 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/CRC16.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/CRC16.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum; +package cn.hutool.v7.core.io.checksum; -import org.dromara.hutool.core.io.checksum.crc16.CRC16Checksum; -import org.dromara.hutool.core.io.checksum.crc16.CRC16IBM; +import cn.hutool.v7.core.io.checksum.crc16.CRC16Checksum; +import cn.hutool.v7.core.io.checksum.crc16.CRC16IBM; import java.io.Serializable; import java.util.zip.Checksum; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/CRC8.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/CRC8.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/CRC8.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/CRC8.java index cff3659c5..ac2f49d22 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/CRC8.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/CRC8.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum; +package cn.hutool.v7.core.io.checksum; import java.io.Serializable; import java.util.zip.Checksum; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/ChecksumUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/ChecksumUtil.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/ChecksumUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/ChecksumUtil.java index 878c55c33..80d3cf4c1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/ChecksumUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/ChecksumUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum; +package cn.hutool.v7.core.io.checksum; -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 cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.stream.EmptyOutputStream; +import cn.hutool.v7.core.lang.Assert; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Ansi.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Ansi.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Ansi.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Ansi.java index 274eb9cb4..09733d213 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Ansi.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Ansi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum.crc16; +package cn.hutool.v7.core.io.checksum.crc16; /** * CRC16_ANSI diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16CCITT.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITT.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16CCITT.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITT.java index d7d5cbefe..c188ff121 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16CCITT.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum.crc16; +package cn.hutool.v7.core.io.checksum.crc16; /** * CRC16_CCITT：多项式x16+x12+x5+1（0x1021），初始值0x0000，低位在前，高位在后，结果与0x0000异或 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16CCITTFalse.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITTFalse.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16CCITTFalse.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITTFalse.java index cab0b4f8d..ed1e22171 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16CCITTFalse.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITTFalse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum.crc16; +package cn.hutool.v7.core.io.checksum.crc16; /** * CRC16_CCITT_FALSE：多项式x16+x12+x5+1（0x1021），初始值0xFFFF，低位在后，高位在前，结果与0x0000异或 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Checksum.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Checksum.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Checksum.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Checksum.java index 62675c47a..c32a7d7ad 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Checksum.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Checksum.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum.crc16; +package cn.hutool.v7.core.io.checksum.crc16; -import org.dromara.hutool.core.codec.binary.HexUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.codec.binary.HexUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.util.zip.Checksum; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16DNP.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16DNP.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16DNP.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16DNP.java index 1c304248d..66adb7ce5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16DNP.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16DNP.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum.crc16; +package cn.hutool.v7.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/org/dromara/hutool/core/io/checksum/crc16/CRC16IBM.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16IBM.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16IBM.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16IBM.java index 60447719e..a411a25bd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16IBM.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16IBM.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum.crc16; +package cn.hutool.v7.core.io.checksum.crc16; /** * CRC16_IBM：多项式x16+x15+x2+1（0x8005），初始值0x0000，低位在前，高位在后，结果与0x0000异或 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Maxim.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Maxim.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Maxim.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Maxim.java index ee0048361..140c58c31 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Maxim.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Maxim.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum.crc16; +package cn.hutool.v7.core.io.checksum.crc16; /** * CRC16_MAXIM：多项式x16+x15+x2+1（0x8005），初始值0x0000，低位在前，高位在后，结果与0xFFFF异或 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Modbus.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Modbus.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Modbus.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Modbus.java index f9d58d4d1..6528364cb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16Modbus.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Modbus.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum.crc16; +package cn.hutool.v7.core.io.checksum.crc16; /** * CRC-16 (Modbus) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16USB.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16USB.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16USB.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16USB.java index 2fcc15984..e1f7b5ccd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16USB.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16USB.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum.crc16; +package cn.hutool.v7.core.io.checksum.crc16; /** * CRC16_USB：多项式x16+x15+x2+1（0x8005），初始值0xFFFF，低位在前，高位在后，结果与0xFFFF异或 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16X25.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16X25.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16X25.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16X25.java index 5b194d20f..abbc3c209 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16X25.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16X25.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum.crc16; +package cn.hutool.v7.core.io.checksum.crc16; /** * CRC16_X25：多项式x16+x12+x5+1（0x1021），初始值0xffff，低位在前，高位在后，结果与0xFFFF异或 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16XModem.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16XModem.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16XModem.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16XModem.java index 23c11fe53..c3dcf6351 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/CRC16XModem.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16XModem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum.crc16; +package cn.hutool.v7.core.io.checksum.crc16; /** * CRC-CCITT (XModem) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/package-info.java index 4d49d4a34..b2a34b420 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/crc16/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.io.checksum.crc16; +package cn.hutool.v7.core.io.checksum.crc16; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/package-info.java index 058b32603..304a4437f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/checksum/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.io.checksum; +package cn.hutool.v7.core.io.checksum; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/ChannelCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/copy/ChannelCopier.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/copy/ChannelCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/copy/ChannelCopier.java index a755cb56b..4ddab3750 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/ChannelCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/copy/ChannelCopier.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.copy; +package cn.hutool.v7.core.io.copy; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.io.StreamProgress; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.StreamProgress; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/FileChannelCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/copy/FileChannelCopier.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/copy/FileChannelCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/copy/FileChannelCopier.java index 7384d31a1..e66b37003 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/FileChannelCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/copy/FileChannelCopier.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.copy; +package cn.hutool.v7.core.io.copy; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/IoCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/copy/IoCopier.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/copy/IoCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/copy/IoCopier.java index 3c6559bff..9a60140fa 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/IoCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/copy/IoCopier.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.copy; +package cn.hutool.v7.core.io.copy; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.io.StreamProgress; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.StreamProgress; /** * IO拷贝抽象，可自定义包括缓存、进度条等信息
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/ReaderWriterCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/copy/ReaderWriterCopier.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/copy/ReaderWriterCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/copy/ReaderWriterCopier.java index ba1a93566..96c3cefca 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/ReaderWriterCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/copy/ReaderWriterCopier.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.copy; +package cn.hutool.v7.core.io.copy; -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 cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.StreamProgress; +import cn.hutool.v7.core.lang.Assert; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/StreamCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/copy/StreamCopier.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/copy/StreamCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/copy/StreamCopier.java index a4d73fa1d..92dc458d3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/StreamCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/copy/StreamCopier.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.copy; +package cn.hutool.v7.core.io.copy; -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 cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.StreamProgress; +import cn.hutool.v7.core.lang.Assert; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/copy/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/copy/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/copy/package-info.java index 8cf6a1dbd..00e890b3e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/copy/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/copy/package-info.java @@ -20,4 +20,4 @@ * @author Looly * @since 5.7.8 */ -package org.dromara.hutool.core.io.copy; +package cn.hutool.v7.core.io.copy; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileAppender.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileAppender.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileAppender.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileAppender.java index 902ab1f12..55b5b6393 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileAppender.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileAppender.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.thread.lock.LockUtil; -import org.dromara.hutool.core.util.CharsetUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.thread.lock.LockUtil; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.File; import java.io.PrintWriter; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMagicNumber.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileMagicNumber.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMagicNumber.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileMagicNumber.java index 6f4699832..9909802c5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMagicNumber.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileMagicNumber.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.CharsetUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.math.BigInteger; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMode.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileMode.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMode.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileMode.java index d79452e26..64ff0565b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMode.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileMode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; /** * 文件读写模式，常用于RandomAccessFile diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileNameUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileNameUtil.java index e11c95ed7..0ed9b9d5d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileNameUtil.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -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.CharUtil; -import org.dromara.hutool.core.text.StrTrimer; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.SystemUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.net.url.UrlUtil; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrTrimer; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.util.SystemUtil; import java.io.File; import java.util.LinkedList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileReader.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileReader.java index 85b3f0dd2..e64e851db 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileReader.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.exception.ExceptionUtil; -import org.dromara.hutool.core.func.SerConsumer; -import org.dromara.hutool.core.func.SerFunction; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; +import cn.hutool.v7.core.func.SerConsumer; +import cn.hutool.v7.core.func.SerFunction; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.*; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileSystemUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileSystemUtil.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileSystemUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileSystemUtil.java index 0e4d8e6c1..37d55e5e2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileSystemUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileSystemUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -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 cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.IOException; import java.net.URI; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileTypeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileTypeUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileTypeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileTypeUtil.java index af729bcf0..d383090fb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileTypeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileTypeUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.codec.binary.HexUtil; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.codec.binary.HexUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileUtil.java index 1914ea0f1..58d0ee354 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileUtil.java @@ -14,33 +14,33 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.compress.ZipUtil; -import org.dromara.hutool.core.func.SerConsumer; -import org.dromara.hutool.core.func.SerFunction; -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.FileResource; -import org.dromara.hutool.core.io.resource.Resource; -import org.dromara.hutool.core.io.resource.ResourceUtil; -import org.dromara.hutool.core.io.stream.BOMInputStream; -import org.dromara.hutool.core.io.stream.LineCounter; -import org.dromara.hutool.core.io.unit.DataSizeUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.Console; -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.CharUtil; -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.CharsetUtil; -import org.dromara.hutool.core.util.ObjUtil; -import org.dromara.hutool.core.util.SystemUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.compress.ZipUtil; +import cn.hutool.v7.core.func.SerConsumer; +import cn.hutool.v7.core.func.SerFunction; +import cn.hutool.v7.core.io.BomReader; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.resource.FileResource; +import cn.hutool.v7.core.io.resource.Resource; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.io.stream.BOMInputStream; +import cn.hutool.v7.core.io.stream.LineCounter; +import cn.hutool.v7.core.io.unit.DataSizeUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.net.url.UrlUtil; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.thread.ThreadUtil; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.util.ObjUtil; +import cn.hutool.v7.core.util.SystemUtil; import java.io.*; import java.net.URI; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWrapper.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileWrapper.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWrapper.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileWrapper.java index 952fa221e..bbd608c9d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileWrapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.lang.wrapper.Wrapper; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.util.CharsetUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.lang.wrapper.Wrapper; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.File; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWriter.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileWriter.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWriter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileWriter.java index 5845ba29c..4a41c11f3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWriter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileWriter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -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 cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.*; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/LineReadWatcher.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/LineReadWatcher.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/LineReadWatcher.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/LineReadWatcher.java index 42b6509fa..a56751e6c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/LineReadWatcher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/LineReadWatcher.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.watch.watchers.SimpleWatcher; -import org.dromara.hutool.core.func.SerConsumer; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.watch.watchers.SimpleWatcher; +import cn.hutool.v7.core.func.SerConsumer; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/LineSeparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/LineSeparator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/LineSeparator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/LineSeparator.java index fe8104889..1b3e40c50 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/LineSeparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/LineSeparator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; /** * 换行符枚举
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathCopier.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathCopier.java index 2c9344c85..7aa5a3642 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathCopier.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -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.SrcToTargetCopier; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.file.visitor.CopyVisitor; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.copier.SrcToTargetCopier; +import cn.hutool.v7.core.util.ObjUtil; import java.io.IOException; import java.nio.file.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathDeleter.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathDeleter.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathDeleter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathDeleter.java index a393a4d3f..98cddb0ba 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathDeleter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathDeleter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.file.visitor.DelVisitor; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.file.visitor.DelVisitor; +import cn.hutool.v7.core.lang.Assert; import java.io.IOException; import java.nio.file.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathMover.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathMover.java index 41ae7fea5..003ff2016 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathMover.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -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 cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.file.visitor.MoveVisitor; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.IOException; import java.nio.file.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathUtil.java index bd3908da2..9d328d964 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathUtil.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.io.resource.FileResource; -import org.dromara.hutool.core.io.resource.Resource; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.util.CharsetUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.resource.FileResource; +import cn.hutool.v7.core.io.resource.Resource; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.*; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/Tailer.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/Tailer.java index 2afaa0886..b6743d019 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/Tailer.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.date.DateUnit; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.func.SerConsumer; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.io.watch.WatchKind; -import org.dromara.hutool.core.io.watch.WatchMonitor; -import org.dromara.hutool.core.io.watch.WatchUtil; -import org.dromara.hutool.core.io.watch.watchers.SimpleWatcher; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.date.DateUnit; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.func.SerConsumer; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.watch.WatchKind; +import cn.hutool.v7.core.io.watch.WatchMonitor; +import cn.hutool.v7.core.io.watch.WatchUtil; +import cn.hutool.v7.core.io.watch.watchers.SimpleWatcher; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/package-info.java index 66530f481..30571b65f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/CopyVisitor.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/visitor/CopyVisitor.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/CopyVisitor.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/visitor/CopyVisitor.java index 6aec8b589..619e68a3e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/CopyVisitor.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/visitor/CopyVisitor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file.visitor; +package cn.hutool.v7.core.io.file.visitor; -import org.dromara.hutool.core.io.file.PathUtil; +import cn.hutool.v7.core.io.file.PathUtil; import java.io.IOException; import java.nio.file.CopyOption; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/DelVisitor.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/visitor/DelVisitor.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/DelVisitor.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/visitor/DelVisitor.java index 908ac445e..bf1b08dc4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/DelVisitor.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/visitor/DelVisitor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file.visitor; +package cn.hutool.v7.core.io.file.visitor; import java.io.IOException; import java.nio.file.FileVisitResult; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/MoveVisitor.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/visitor/MoveVisitor.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/MoveVisitor.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/visitor/MoveVisitor.java index d03444697..c3c2fbb25 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/MoveVisitor.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/visitor/MoveVisitor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file.visitor; +package cn.hutool.v7.core.io.file.visitor; -import org.dromara.hutool.core.io.file.PathUtil; +import cn.hutool.v7.core.io.file.PathUtil; import java.io.IOException; import java.nio.file.CopyOption; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/visitor/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/file/visitor/package-info.java index 2ba9c70d9..98f48193b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/visitor/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.io.file.visitor; +package cn.hutool.v7.core.io.file.visitor; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/package-info.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/package-info.java index 82e4631db..9a1928733 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/BytesResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/BytesResource.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/BytesResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/BytesResource.java index d905298c6..3f3d6c01e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/BytesResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/BytesResource.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.text.StrUtil; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/CharSequenceResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/CharSequenceResource.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/CharSequenceResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/CharSequenceResource.java index 8824a23ae..1bc429642 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/CharSequenceResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/CharSequenceResource.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ClassPathResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ClassPathResource.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ClassPathResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ClassPathResource.java index a3e25bf14..b718849da 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ClassPathResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ClassPathResource.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -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 cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.io.file.FileNameUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.net.url.UrlUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.net.URL; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/FileObjectResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileObjectResource.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/FileObjectResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileObjectResource.java index 63c4fe725..0b4ebb181 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/FileObjectResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileObjectResource.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.net.url.UrlUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.net.url.UrlUtil; import javax.tools.FileObject; import java.io.BufferedReader; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/FileResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileResource.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/FileResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileResource.java index 43c2b1355..3b6bdaa7f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/FileResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileResource.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.net.url.UrlUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.net.url.UrlUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/HttpResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/HttpResource.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/HttpResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/HttpResource.java index 975e6278a..bb3224289 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/HttpResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/HttpResource.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.io.InputStream; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/InputStreamResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/InputStreamResource.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/InputStreamResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/InputStreamResource.java index e27807010..a5a7b42c5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/InputStreamResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/InputStreamResource.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.stream.ReaderInputStream; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.stream.ReaderInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/JarResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/JarResource.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/JarResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/JarResource.java index 269b35e9c..d5070848f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/JarResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/JarResource.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.compress.ZipUtil; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.net.url.UrlUtil; +import cn.hutool.v7.core.compress.ZipUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.net.url.UrlUtil; import java.io.IOException; import java.net.JarURLConnection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/MultiFileResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiFileResource.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/MultiFileResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiFileResource.java index 6cfcedbe0..e0e1ed8c4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/MultiFileResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiFileResource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; import java.io.File; import java.nio.file.Path; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/MultiResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiResource.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/MultiResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiResource.java index a68776c81..9d8c37931 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/MultiResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiResource.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.io.IORuntimeException; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.io.IORuntimeException; import java.io.BufferedReader; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/NoResourceException.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/NoResourceException.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/NoResourceException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/NoResourceException.java index e9412d07b..19e27f689 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/NoResourceException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/NoResourceException.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.text.StrUtil; /** * 资源文件或资源不存在异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/Resource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/Resource.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/Resource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/Resource.java index 71c58c9eb..2d5ebde5f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/Resource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/Resource.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.BufferedReader; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ResourceFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ResourceFinder.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ResourceFinder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ResourceFinder.java index 4b18aa625..aaa4a9a2a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ResourceFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ResourceFinder.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.collection.iter.EnumerationIter; -import org.dromara.hutool.core.compress.ZipUtil; -import org.dromara.hutool.core.exception.HutoolException; -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.UrlUtil; -import org.dromara.hutool.core.text.AntPathMatcher; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.collection.iter.EnumerationIter; +import cn.hutool.v7.core.compress.ZipUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.net.url.UrlUtil; +import cn.hutool.v7.core.text.AntPathMatcher; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ResourceUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ResourceUtil.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ResourceUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ResourceUtil.java index c8e12656c..f789b174b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/ResourceUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ResourceUtil.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -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.lang.Assert; -import org.dromara.hutool.core.net.url.UrlProtocolUtil; -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 cn.hutool.v7.core.collection.iter.EnumerationIter; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.net.url.UrlProtocolUtil; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.net.url.UrlUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.BufferedReader; import java.io.File; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/StringResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/StringResource.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/StringResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/StringResource.java index 419a88135..6a68292fd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/StringResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/StringResource.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/UrlResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/UrlResource.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/UrlResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/UrlResource.java index 7ec81f210..8ce88c016 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/UrlResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/UrlResource.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.io.file.FileNameUtil; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.net.url.UrlUtil; -import org.dromara.hutool.core.net.url.UrlProtocolUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.io.file.FileNameUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.net.url.UrlUtil; +import cn.hutool.v7.core.net.url.UrlProtocolUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/VfsResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/VfsResource.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/VfsResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/VfsResource.java index 4ef0af80c..deb3ce265 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/VfsResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/VfsResource.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.reflect.method.MethodUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/WebAppResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/WebAppResource.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/WebAppResource.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/WebAppResource.java index ed4eae34b..5ed1d0751 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/WebAppResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/WebAppResource.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; import java.io.File; -import org.dromara.hutool.core.io.file.FileUtil; +import cn.hutool.v7.core.io.file.FileUtil; /** * Web root资源访问对象 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/resource/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/resource/package-info.java index 8e77dad7e..0a533eca2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/BOMInputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/BOMInputStream.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/BOMInputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/BOMInputStream.java index 16f7975bb..e1b27b4bf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/BOMInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/BOMInputStream.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; -import org.dromara.hutool.core.io.ByteOrderMark; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.io.ByteOrderMark; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/EmptyInputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/EmptyInputStream.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/EmptyInputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/EmptyInputStream.java index 8b9419f6b..8000ba079 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/EmptyInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/EmptyInputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/EmptyOutputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/EmptyOutputStream.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/EmptyOutputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/EmptyOutputStream.java index 8168ef5f5..c690b7495 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/EmptyOutputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/EmptyOutputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; import java.io.OutputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/FastByteArrayOutputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/FastByteArrayOutputStream.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/FastByteArrayOutputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/FastByteArrayOutputStream.java index 2ed9b5e05..c638c72be 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/FastByteArrayOutputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/FastByteArrayOutputStream.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.io.buffer.FastByteBuffer; -import org.dromara.hutool.core.util.CharsetUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.buffer.FastByteBuffer; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/LimitedInputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LimitedInputStream.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/LimitedInputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LimitedInputStream.java index 8acf10b5d..b82a94d48 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/LimitedInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LimitedInputStream.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.lang.Assert; import java.io.FilterInputStream; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/LineCounter.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LineCounter.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/LineCounter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LineCounter.java index 331555066..132865073 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/LineCounter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LineCounter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.text.CharUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.text.CharUtil; import java.io.Closeable; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/LineInputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LineInputStream.java similarity index 90% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/LineInputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LineInputStream.java index fd28ed234..a071729f9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/LineInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LineInputStream.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; -import org.dromara.hutool.core.collection.iter.ComputeIter; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.buffer.FastByteBuffer; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.collection.iter.ComputeIter; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.buffer.FastByteBuffer; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.FilterInputStream; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/ReaderInputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/ReaderInputStream.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/ReaderInputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/ReaderInputStream.java index 3d751bcae..fb8a96942 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/ReaderInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/ReaderInputStream.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StrInputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/StrInputStream.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StrInputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/StrInputStream.java index 17014e8a6..b97af9b34 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StrInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/StrInputStream.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.ByteArrayInputStream; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamReader.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/StreamReader.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamReader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/StreamReader.java index 32654b08a..a585b3173 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamReader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/StreamReader.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamWriter.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/StreamWriter.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamWriter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/StreamWriter.java index 4cf66c934..d3c07bdcd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamWriter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/StreamWriter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; import java.io.IOException; import java.io.ObjectOutputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/SyncInputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/SyncInputStream.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/SyncInputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/SyncInputStream.java index ac56f8b0a..3c804cf51 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/SyncInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/SyncInputStream.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; -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 cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.StreamProgress; +import cn.hutool.v7.core.text.StrUtil; import java.io.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/UTF8OutputStreamWriter.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/UTF8OutputStreamWriter.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/UTF8OutputStreamWriter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/UTF8OutputStreamWriter.java index e96b1f897..3a022ff36 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/UTF8OutputStreamWriter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/UTF8OutputStreamWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; import java.io.IOException; import java.io.OutputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/ValidateObjectInputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/ValidateObjectInputStream.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/ValidateObjectInputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/ValidateObjectInputStream.java index c3e8f972b..8ff5e3625 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/ValidateObjectInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/ValidateObjectInputStream.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; -import org.dromara.hutool.core.collection.CollUtil; +import cn.hutool.v7.core.collection.CollUtil; import java.io.IOException; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/WriterOutputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/WriterOutputStream.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/WriterOutputStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/WriterOutputStream.java index 37f9d6129..e98c7e7bc 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/WriterOutputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/WriterOutputStream.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.IOException; import java.io.OutputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/stream/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/stream/package-info.java index 9e3c208b3..c0e049d29 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/package-info.java @@ -19,4 +19,4 @@ * * @author Looly */ -package org.dromara.hutool.core.io.stream; +package cn.hutool.v7.core.io.stream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSize.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/unit/DataSize.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSize.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/unit/DataSize.java index ae4562203..8dcc8e26c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSize.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/unit/DataSize.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.unit; +package cn.hutool.v7.core.io.unit; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; import java.math.BigDecimal; import java.util.regex.Matcher; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSizeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/unit/DataSizeUtil.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSizeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/unit/DataSizeUtil.java index 584ef62b8..e3ceda932 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataSizeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/unit/DataSizeUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.unit; +package cn.hutool.v7.core.io.unit; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.text.StrUtil; import java.text.DecimalFormat; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataUnit.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/unit/DataUnit.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataUnit.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/unit/DataUnit.java index 62979a158..ae440c26f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/DataUnit.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/unit/DataUnit.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.unit; +package cn.hutool.v7.core.io.unit; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * 数据单位封装

    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/unit/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/unit/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/unit/package-info.java index bd2b9f63e..b58bfa262 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/unit/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/unit/package-info.java @@ -20,4 +20,4 @@ * @author Looly * @since 5.3.10 */ -package org.dromara.hutool.core.io.unit; +package cn.hutool.v7.core.io.unit; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchException.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchException.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchException.java index e8e400553..2c8a0d1d8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.watch; +package cn.hutool.v7.core.io.watch; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; /** * 监听异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchKind.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchKind.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchKind.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchKind.java index 6f37d6b39..5ecd893d6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchKind.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchKind.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.watch; +package cn.hutool.v7.core.io.watch; import java.nio.file.StandardWatchEventKinds; import java.nio.file.WatchEvent; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchMonitor.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchMonitor.java index db54d85dd..a89e822f4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchMonitor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.watch; +package cn.hutool.v7.core.io.watch; -import org.dromara.hutool.core.io.file.PathUtil; -import org.dromara.hutool.core.io.watch.watchers.WatcherChain; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.io.file.PathUtil; +import cn.hutool.v7.core.io.watch.watchers.WatcherChain; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Closeable; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchServiceWrapper.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchServiceWrapper.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchServiceWrapper.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchServiceWrapper.java index 4d83da864..39b14ede9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchServiceWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchServiceWrapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.watch; +package cn.hutool.v7.core.io.watch; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.io.file.PathUtil; -import org.dromara.hutool.core.lang.wrapper.SimpleWrapper; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.file.PathUtil; +import cn.hutool.v7.core.lang.wrapper.SimpleWrapper; import java.io.IOException; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchUtil.java index 3e06f278d..bcf513447 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.watch; +package cn.hutool.v7.core.io.watch; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.file.PathUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.net.url.UrlUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.file.PathUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.net.url.UrlUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/Watcher.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/Watcher.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/watch/Watcher.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/watch/Watcher.java index ba0ea6b9c..3b814b7c2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/Watcher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/Watcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.watch; +package cn.hutool.v7.core.io.watch; import java.nio.file.WatchEvent; import java.nio.file.WatchKey; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/watch/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/watch/package-info.java index 3c8db9261..5b89e5a13 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.io.watch; +package cn.hutool.v7.core.io.watch; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/DelayWatcher.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/DelayWatcher.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/DelayWatcher.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/DelayWatcher.java index 1d86aaa7a..3ac5a1406 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/DelayWatcher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/DelayWatcher.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.watch.watchers; +package cn.hutool.v7.core.io.watch.watchers; -import org.dromara.hutool.core.collection.set.ConcurrentHashSet; -import org.dromara.hutool.core.io.watch.Watcher; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.thread.ThreadUtil; +import cn.hutool.v7.core.collection.set.ConcurrentHashSet; +import cn.hutool.v7.core.io.watch.Watcher; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.thread.ThreadUtil; import java.nio.file.*; import java.util.Set; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/SimpleWatcher.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/SimpleWatcher.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/SimpleWatcher.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/SimpleWatcher.java index 20b403d32..1dce42a53 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/SimpleWatcher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/SimpleWatcher.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.watch.watchers; +package cn.hutool.v7.core.io.watch.watchers; -import org.dromara.hutool.core.io.watch.Watcher; +import cn.hutool.v7.core.io.watch.Watcher; import java.io.Serializable; import java.nio.file.WatchEvent; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/WatcherChain.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/WatcherChain.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/WatcherChain.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/WatcherChain.java index 687de0aab..ac0ba5122 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/WatcherChain.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/WatcherChain.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.watch.watchers; +package cn.hutool.v7.core.io.watch.watchers; -import org.dromara.hutool.core.io.watch.Watcher; -import org.dromara.hutool.core.lang.Chain; +import cn.hutool.v7.core.io.watch.Watcher; +import cn.hutool.v7.core.lang.Chain; import java.nio.file.WatchEvent; import java.nio.file.WatchKey; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/package-info.java index be2aa741f..bc5694316 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.io.watch.watchers; +package cn.hutool.v7.core.io.watch.watchers; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Assert.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Assert.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/Assert.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/Assert.java index d6464d945..a80e75d57 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Assert.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Assert.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; -import org.dromara.hutool.core.array.ArrayUtil; -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.util.ObjUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.util.Map; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Chain.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Chain.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/Chain.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/Chain.java index e3c5caf88..86473c43b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Chain.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Chain.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; /** * 责任链接口 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Console.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Console.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/Console.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/Console.java index c9b15ba2f..1c48d195e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Console.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Console.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.Scanner; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ConsoleTable.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ConsoleTable.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ConsoleTable.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ConsoleTable.java index 5ae0c0f63..ae422e6ec 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ConsoleTable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ConsoleTable.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/EnumItem.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/EnumItem.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/EnumItem.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/EnumItem.java index a8eb52452..d66f91570 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/EnumItem.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/EnumItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Opt.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/Opt.java index 1050451a1..d06955dd7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Opt.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; -import org.dromara.hutool.core.func.SerConsumer; -import org.dromara.hutool.core.func.SerFunction; -import org.dromara.hutool.core.func.SerPredicate; -import org.dromara.hutool.core.func.SerSupplier; -import org.dromara.hutool.core.stream.EasyStream; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.func.SerConsumer; +import cn.hutool.v7.core.func.SerFunction; +import cn.hutool.v7.core.func.SerPredicate; +import cn.hutool.v7.core.func.SerSupplier; +import cn.hutool.v7.core.stream.EasyStream; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.util.Collection; import java.util.NoSuchElementException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Singleton.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Singleton.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/Singleton.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/Singleton.java index bc649dd31..2ef638a32 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Singleton.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Singleton.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.func.SerSupplier; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; -import org.dromara.hutool.core.reflect.ConstructorUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.func.SerSupplier; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.Set; import java.util.stream.Collectors; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Validator.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/Validator.java index 88b2fb446..17e0828cc 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Validator.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; -import org.dromara.hutool.core.data.CreditCodeUtil; -import org.dromara.hutool.core.data.IdcardUtil; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.exception.ValidateException; -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.regex.RegexPool; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharsetUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.data.CreditCodeUtil; +import cn.hutool.v7.core.data.IdcardUtil; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.exception.ValidateException; +import cn.hutool.v7.core.math.NumberUtil; +import cn.hutool.v7.core.regex.PatternPool; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.regex.RegexPool; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.net.MalformedURLException; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Version.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Version.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/Version.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/Version.java index 704585dd7..fd441c0d7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Version.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Version.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.comparator.CompareUtil; -import org.dromara.hutool.core.text.CharUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.comparator.CompareUtil; +import cn.hutool.v7.core.text.CharUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/Ansi4BitBackgroundColor.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/Ansi4BitBackgroundColor.java index a246d7cc4..418b71912 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/Ansi4BitBackgroundColor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ansi; +package cn.hutool.v7.core.lang.ansi; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * ANSI背景颜色枚举 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi4BitColor.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/Ansi4BitColor.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi4BitColor.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/Ansi4BitColor.java index 38c726f1f..a0e0b380d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi4BitColor.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/Ansi4BitColor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ansi; +package cn.hutool.v7.core.lang.ansi; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * ANSI标准颜色 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi8BitColor.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/Ansi8BitColor.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi8BitColor.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/Ansi8BitColor.java index a60ce8dcd..046922fab 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/Ansi8BitColor.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/Ansi8BitColor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ansi; +package cn.hutool.v7.core.lang.ansi; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.util.ObjUtil; /** * ANSI 8-bit前景或背景色（即8位编码，共256种颜色（2^8） ）
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiElement.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/AnsiElement.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiElement.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/AnsiElement.java index 6fc56413a..3950339b8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiElement.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/AnsiElement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ansi; +package cn.hutool.v7.core.lang.ansi; /** * ANSI可转义节点接口，实现为ANSI颜色等 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiEncoder.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/AnsiEncoder.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiEncoder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/AnsiEncoder.java index 3e30edb8e..7bfffeea3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiEncoder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/AnsiEncoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ansi; +package cn.hutool.v7.core.lang.ansi; /** * 生成ANSI格式的编码输出 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiStyle.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/AnsiStyle.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiStyle.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/AnsiStyle.java index 60bea26e3..37b06abf2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/AnsiStyle.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/AnsiStyle.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ansi; +package cn.hutool.v7.core.lang.ansi; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * ANSI文本样式风格枚举 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/package-info.java index 7c0387efe..415232a49 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ansi/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ansi/package-info.java @@ -19,4 +19,4 @@ * * @author spring, Looly */ -package org.dromara.hutool.core.lang.ansi; +package cn.hutool.v7.core.lang.ansi; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/Builder.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/Builder.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/Builder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/Builder.java index 4cbaf7028..878fbb0cc 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/Builder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/Builder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.builder; +package cn.hutool.v7.core.lang.builder; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/GenericBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/GenericBuilder.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/GenericBuilder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/GenericBuilder.java index 8eca247eb..5cc4662b6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/GenericBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/GenericBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.builder; +package cn.hutool.v7.core.lang.builder; -import org.dromara.hutool.core.func.SerConsumer3; +import cn.hutool.v7.core.func.SerConsumer3; import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/package-info.java index 777252472..d42f8024f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/builder/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/package-info.java @@ -21,4 +21,4 @@ * @author Looly * */ -package org.dromara.hutool.core.lang.builder; +package cn.hutool.v7.core.lang.builder; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/Caller.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/Caller.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/Caller.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/Caller.java index 2ab262a5b..86b097c84 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/Caller.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/Caller.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.caller; +package cn.hutool.v7.core.lang.caller; /** * 调用者接口
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/CallerUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/CallerUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/CallerUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/CallerUtil.java index 59b23f1e6..1befbb2c5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/CallerUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/CallerUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.caller; +package cn.hutool.v7.core.lang.caller; /** * 调用者。可以通过此类的方法获取调用者、多级调用者以及判断是否被调用 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/SecurityManagerCaller.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/SecurityManagerCaller.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/SecurityManagerCaller.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/SecurityManagerCaller.java index 683ea49db..b2c7c82c9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/SecurityManagerCaller.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/SecurityManagerCaller.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.caller; +package cn.hutool.v7.core.lang.caller; import java.io.Serializable; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.array.ArrayUtil; /** * {@link SecurityManager} 方式获取调用者 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/StackTraceCaller.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/StackTraceCaller.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/StackTraceCaller.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/StackTraceCaller.java index 85d532641..69aecf007 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/StackTraceCaller.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/StackTraceCaller.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.caller; +package cn.hutool.v7.core.lang.caller; import java.io.Serializable; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; /** * 通过StackTrace方式获取调用者。此方式效率最低，不推荐使用 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/package-info.java index 60a1e815a..44dd372c1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.lang.caller; +package cn.hutool.v7.core.lang.caller; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/Copier.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/Copier.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/Copier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/Copier.java index da431c7d0..2f3223dea 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/Copier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/Copier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.copier; +package cn.hutool.v7.core.lang.copier; /** * 拷贝接口 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/SrcToTargetCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/SrcToTargetCopier.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/SrcToTargetCopier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/SrcToTargetCopier.java index 88d559507..766d536ce 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/SrcToTargetCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/SrcToTargetCopier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.copier; +package cn.hutool.v7.core.lang.copier; import java.io.Serializable; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/package-info.java index 4a8754d81..a4dcf170c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/copier/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.lang.copier; +package cn.hutool.v7.core.lang.copier; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/event/Event.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/Event.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/event/Event.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/event/Event.java index 1024ce8ff..b358a995a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/event/Event.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/Event.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.event; +package cn.hutool.v7.core.lang.event; /** * 事件接口，所有事件必须实现此接口 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/event/EventPublisher.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/EventPublisher.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/event/EventPublisher.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/event/EventPublisher.java index 57f91cb32..46e4f2e79 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/event/EventPublisher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/EventPublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.event; +package cn.hutool.v7.core.lang.event; /** * 事件发布者接口，用于发布事件 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/event/SimpleEventPublisher.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/SimpleEventPublisher.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/event/SimpleEventPublisher.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/event/SimpleEventPublisher.java index 7bbc981b4..4d1763995 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/event/SimpleEventPublisher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/SimpleEventPublisher.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.event; +package cn.hutool.v7.core.lang.event; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.loader.LazyFunLoader; -import org.dromara.hutool.core.lang.loader.Loader; -import org.dromara.hutool.core.thread.ThreadUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.loader.LazyFunLoader; +import cn.hutool.v7.core.lang.loader.Loader; +import cn.hutool.v7.core.thread.ThreadUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/event/SourceEvent.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/SourceEvent.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/event/SourceEvent.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/event/SourceEvent.java index 9d2e1b174..a31a8d447 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/event/SourceEvent.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/SourceEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.event; +package cn.hutool.v7.core.lang.event; import java.util.EventObject; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/event/Subscriber.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/Subscriber.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/event/Subscriber.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/event/Subscriber.java index 1e0e5c4e0..f017922fe 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/event/Subscriber.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/Subscriber.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.event; +package cn.hutool.v7.core.lang.event; -import org.dromara.hutool.core.comparator.CompareUtil; +import cn.hutool.v7.core.comparator.CompareUtil; import java.util.EventListener; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/event/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/package-info.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/event/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/event/package-info.java index b0c2c2927..3c21e1f38 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/event/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/package-info.java @@ -28,4 +28,4 @@ * * @author Looly */ -package org.dromara.hutool.core.lang.event; +package cn.hutool.v7.core.lang.event; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/Generator.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/generator/Generator.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/Generator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/generator/Generator.java index 9ad2319f7..9974cca12 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/Generator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/generator/Generator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.generator; +package cn.hutool.v7.core.lang.generator; /** * 生成器泛型接口
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectGenerator.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/generator/ObjectGenerator.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectGenerator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/generator/ObjectGenerator.java index cb6832851..e24b78146 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectGenerator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/generator/ObjectGenerator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.generator; +package cn.hutool.v7.core.lang.generator; -import org.dromara.hutool.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; /** * 对象生成器，通过指定对象的Class类型，调用next方法时生成新的对象。 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/generator/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/generator/package-info.java index fb575015e..13a1c3a76 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/generator/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.lang.generator; +package cn.hutool.v7.core.lang.generator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/GroupedTypeGetter.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/getter/GroupedTypeGetter.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/GroupedTypeGetter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/getter/GroupedTypeGetter.java index dcd5f514a..1b9bcbf71 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/GroupedTypeGetter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/getter/GroupedTypeGetter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.getter; +package cn.hutool.v7.core.lang.getter; -import org.dromara.hutool.core.convert.ConvertUtil; +import cn.hutool.v7.core.convert.ConvertUtil; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/TypeGetter.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/getter/TypeGetter.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/TypeGetter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/getter/TypeGetter.java index 099c0be82..4cfafb101 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/TypeGetter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/getter/TypeGetter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.getter; +package cn.hutool.v7.core.lang.getter; -import org.dromara.hutool.core.convert.CompositeConverter; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.convert.Converter; +import cn.hutool.v7.core.convert.CompositeConverter; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.convert.Converter; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/getter/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/getter/package-info.java index f9eea4afd..b9aaf900a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/getter/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/getter/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.lang.getter; +package cn.hutool.v7.core.lang.getter; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/Intern.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/Intern.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/Intern.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/Intern.java index 4a3d7c8ac..d09e488fd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/Intern.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/Intern.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.intern; +package cn.hutool.v7.core.lang.intern; /** * 规范化表示形式封装
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/InternUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/InternUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/InternUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/InternUtil.java index 85e90b725..3c4bf594c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/InternUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/InternUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.intern; +package cn.hutool.v7.core.lang.intern; /** * 规范化对象生成工具 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/StringIntern.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/StringIntern.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/StringIntern.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/StringIntern.java index b51891fef..8f6b74a70 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/StringIntern.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/StringIntern.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.intern; +package cn.hutool.v7.core.lang.intern; /** * JDK中默认的字符串规范化实现 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/WeakIntern.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/WeakIntern.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/WeakIntern.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/WeakIntern.java index 67626b4fa..c478d1a0b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/WeakIntern.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/WeakIntern.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.intern; +package cn.hutool.v7.core.lang.intern; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; import java.lang.ref.WeakReference; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/package-info.java index ad8694c14..6aad71787 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/intern/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/intern/package-info.java @@ -21,4 +21,4 @@ * * @author Looly */ -package org.dromara.hutool.core.lang.intern; +package cn.hutool.v7.core.lang.intern; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/AtomicLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/AtomicLoader.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/AtomicLoader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/AtomicLoader.java index d435783d8..2efc2a9c6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/AtomicLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/AtomicLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.loader; +package cn.hutool.v7.core.lang.loader; import java.io.Serializable; import java.util.concurrent.atomic.AtomicReference; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/LazyFunLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyFunLoader.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/LazyFunLoader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyFunLoader.java index e9ba74205..8fc2799a6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/LazyFunLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyFunLoader.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.loader; +package cn.hutool.v7.core.lang.loader; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/LazyLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyLoader.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/LazyLoader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyLoader.java index 068d7ced7..7f03ce6a8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/LazyLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.loader; +package cn.hutool.v7.core.lang.loader; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/Loader.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/Loader.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/Loader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/Loader.java index bc53f7443..22e9f90f6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/Loader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/Loader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.loader; +package cn.hutool.v7.core.lang.loader; import java.util.function.Consumer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/package-info.java index 37b569434..1cb36266a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.lang.loader; +package cn.hutool.v7.core.lang.loader; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/Mutable.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/Mutable.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/Mutable.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/Mutable.java index 3233feb52..16b9f624e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/Mutable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/Mutable.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.lang.Opt; +import cn.hutool.v7.core.lang.Opt; import java.util.Objects; import java.util.function.Consumer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableBool.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableBool.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableBool.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableBool.java index d2d3c1531..03dfa7678 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableBool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableBool.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableByte.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableByte.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableByte.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableByte.java index f6d009fa1..5ee39c694 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableByte.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableByte.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.comparator.CompareUtil; +import cn.hutool.v7.core.comparator.CompareUtil; /** * 可变 {@code byte} 类型 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableDouble.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableDouble.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableDouble.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableDouble.java index 9cbc29bd1..227158032 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableDouble.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableDouble.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.comparator.CompareUtil; +import cn.hutool.v7.core.comparator.CompareUtil; /** * 可变 {@code double} 类型 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableEntry.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableEntry.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableEntry.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableEntry.java index 6e0ac2790..6bda9a995 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableEntry.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableEntry.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.map.AbsEntry; +import cn.hutool.v7.core.map.AbsEntry; import java.io.Serializable; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableFloat.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableFloat.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableFloat.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableFloat.java index 14ebfffd9..45e2150d8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableFloat.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableFloat.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.comparator.CompareUtil; +import cn.hutool.v7.core.comparator.CompareUtil; /** * 可变 {@code float} 类型 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableInt.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableInt.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableInt.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableInt.java index 77ff82bfc..ebb32f549 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableInt.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableInt.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.comparator.CompareUtil; +import cn.hutool.v7.core.comparator.CompareUtil; /** * 可变 {@code int} 类型 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableLong.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableLong.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableLong.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableLong.java index 8977ca59a..558905296 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableLong.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableLong.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.comparator.CompareUtil; +import cn.hutool.v7.core.comparator.CompareUtil; /** * 可变 {@code long} 类型 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableObj.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableObj.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableObj.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableObj.java index 901d5c6d0..692f7c641 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableObj.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableObj.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutablePair.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutablePair.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutablePair.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutablePair.java index 674a36c96..f6f477fe9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutablePair.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutablePair.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.lang.tuple.Pair; +import cn.hutool.v7.core.lang.tuple.Pair; /** * 可变二元组对象 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableShort.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableShort.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableShort.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableShort.java index aba1b5a08..0540fd4df 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableShort.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableShort.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.comparator.CompareUtil; +import cn.hutool.v7.core.comparator.CompareUtil; /** * 可变 {@code short} 类型 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableTriple.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableTriple.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableTriple.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableTriple.java index 24bd110ad..2467943c6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableTriple.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableTriple.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.lang.tuple.Triple; +import cn.hutool.v7.core.lang.tuple.Triple; /** * 可变三元组对象 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/package-info.java index 77614e41a..39aa35c65 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/package-info.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/package-info.java index 4df1688fe..f316ff840 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/package-info.java @@ -32,4 +32,4 @@ * * @author Looly */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/NavigatePageInfo.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/page/NavigatePageInfo.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/page/NavigatePageInfo.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/page/NavigatePageInfo.java index 3622ddddc..44d58d76b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/NavigatePageInfo.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/page/NavigatePageInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.page; +package cn.hutool.v7.core.lang.page; /** * 导航分页信息类
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/PageInfo.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/page/PageInfo.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/page/PageInfo.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/page/PageInfo.java index 4b0a52739..5c3a83639 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/PageInfo.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/page/PageInfo.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.page; +package cn.hutool.v7.core.lang.page; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.range.DefaultSegment; -import org.dromara.hutool.core.lang.range.Segment; -import org.dromara.hutool.core.math.NumberUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.range.DefaultSegment; +import cn.hutool.v7.core.lang.range.Segment; +import cn.hutool.v7.core.math.NumberUtil; /** * 分页信息，通过提供的总数、页码、每页记录数等信息，计算总页数等信息
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/page/package-info.java similarity index 74% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/page/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/page/package-info.java index 1f608356f..b25fb8970 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/page/package-info.java @@ -17,10 +17,10 @@ /** * 提供分页信息封装，主要包括： *

      - *
    • {@link org.dromara.hutool.core.lang.page.PageInfo}: 提供分页信息。
      • - *
    • {@link org.dromara.hutool.core.lang.page.NavigatePageInfo}: 提供分页导航信息。
      • + *
    • {@link cn.hutool.v7.core.lang.page.PageInfo}: 提供分页信息。
      • + *
    • {@link cn.hutool.v7.core.lang.page.NavigatePageInfo}: 提供分页导航信息。
      • *
    * * @author Looly */ -package org.dromara.hutool.core.lang.page; +package cn.hutool.v7.core.lang.page; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Bound.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Bound.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Bound.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Bound.java index 61a7b249b..88403c541 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Bound.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Bound.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; import java.util.Objects; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundType.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundType.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundType.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundType.java index 8225ea666..0b162fc5c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundType.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; /** * 边界类型枚举 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundedRange.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundedRange.java index 126eebcdb..5bdbaf22f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundedRange.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; -import org.dromara.hutool.core.func.SerPredicate; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.func.SerPredicate; +import cn.hutool.v7.core.lang.Assert; import java.util.Objects; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRangeOperation.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundedRangeOperation.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRangeOperation.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundedRangeOperation.java index 27655de99..ef33f0c2d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRangeOperation.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundedRangeOperation.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; -import org.dromara.hutool.core.comparator.CompareUtil; -import org.dromara.hutool.core.lang.Opt; +import cn.hutool.v7.core.comparator.CompareUtil; +import cn.hutool.v7.core.lang.Opt; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/DefaultSegment.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/DefaultSegment.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/range/DefaultSegment.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/range/DefaultSegment.java index 189f63ee2..346b562cb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/DefaultSegment.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/DefaultSegment.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * 片段默认实现 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/FiniteBound.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/FiniteBound.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/range/FiniteBound.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/range/FiniteBound.java index ab2a95465..2fbe5c530 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/FiniteBound.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/FiniteBound.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; -import org.dromara.hutool.core.text.CharSequenceUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.text.CharSequenceUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/NoneLowerBound.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/NoneLowerBound.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/range/NoneLowerBound.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/range/NoneLowerBound.java index 6d17f366b..967ae8e8f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/NoneLowerBound.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/NoneLowerBound.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; /** * 无限小的左边界 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/NoneUpperBound.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/NoneUpperBound.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/range/NoneUpperBound.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/range/NoneUpperBound.java index 513324f68..b69d4405c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/NoneUpperBound.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/NoneUpperBound.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; /** * 无限大的右边界 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Range.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Range.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Range.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Range.java index 498ca6c16..8872ff915 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Range.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Range.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.io.Serializable; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Segment.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Segment.java similarity index 88% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Segment.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Segment.java index bb3ab4214..5ebe41f0e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Segment.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Segment.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.math.NumberUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.math.NumberUtil; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/package-info.java similarity index 72% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/range/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/range/package-info.java index dc60f0500..ef34327d3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/package-info.java @@ -17,10 +17,10 @@ /** * 提供区间和边界封装，主要包括： *
      - *
    • {@link org.dromara.hutool.core.lang.range.Bound}: 提供边界的抽象表示，包括边界范围、开闭区间等。
      • - *
    • {@link org.dromara.hutool.core.lang.range.Range}: 提供可迭代的区间。
      • + *
    • {@link cn.hutool.v7.core.lang.range.Bound}: 提供边界的抽象表示，包括边界范围、开闭区间等。
      • + *
    • {@link cn.hutool.v7.core.lang.range.Range}: 提供可迭代的区间。
      • *
    * * @author huangchengxing, Looly */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/PhantomObj.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/PhantomObj.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/PhantomObj.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/PhantomObj.java index ad21c79f5..1f130fb27 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/PhantomObj.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/PhantomObj.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ref; +package cn.hutool.v7.core.lang.ref; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.lang.ref.PhantomReference; import java.lang.ref.ReferenceQueue; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/Ref.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/Ref.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/Ref.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/Ref.java index d521a08ad..d9236a52d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/Ref.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/Ref.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ref; +package cn.hutool.v7.core.lang.ref; /** * 针对{@link java.lang.ref.Reference}的接口定义，用于扩展功能
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/ReferenceType.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/ReferenceType.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/ReferenceType.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/ReferenceType.java index 8303fac20..3b48e68c1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/ReferenceType.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/ReferenceType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ref; +package cn.hutool.v7.core.lang.ref; import java.lang.ref.PhantomReference; import java.lang.ref.ReferenceQueue; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/ReferenceUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/ReferenceUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/ReferenceUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/ReferenceUtil.java index 8b93ce30b..5fffe83f6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/ReferenceUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/ReferenceUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ref; +package cn.hutool.v7.core.lang.ref; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.lang.ref.PhantomReference; import java.lang.ref.Reference; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/SoftObj.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/SoftObj.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/SoftObj.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/SoftObj.java index e8e3b2645..2026fb636 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/SoftObj.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/SoftObj.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ref; +package cn.hutool.v7.core.lang.ref; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/StrongObj.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/StrongObj.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/StrongObj.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/StrongObj.java index 1e6c6edbc..764b0b8e5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/StrongObj.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/StrongObj.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ref; +package cn.hutool.v7.core.lang.ref; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/WeakObj.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/WeakObj.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/WeakObj.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/WeakObj.java index 96b17b74b..10d5944be 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/WeakObj.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/WeakObj.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ref; +package cn.hutool.v7.core.lang.ref; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/package-info.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/package-info.java index fd2459977..ce7b190bd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/ref/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/ref/package-info.java @@ -23,4 +23,4 @@ * 3. {@link java.lang.ref.PhantomReference} 虚引用，在GC时发现虚引用对象，会将{@link java.lang.ref.PhantomReference}插入{@link java.lang.ref.ReferenceQueue}。 此时对象未被真正回收，要等到{@link java.lang.ref.ReferenceQueue}被真正处理后才会被回收。 * */ -package org.dromara.hutool.core.lang.ref; +package cn.hutool.v7.core.lang.ref; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/IncrementSelector.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/IncrementSelector.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/IncrementSelector.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/IncrementSelector.java index 769feca8e..50e7274f0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/IncrementSelector.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/IncrementSelector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.selector; +package cn.hutool.v7.core.lang.selector; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/RandomSelector.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/RandomSelector.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/RandomSelector.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/RandomSelector.java index 7c6c4ed8e..dab0c2751 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/RandomSelector.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/RandomSelector.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.selector; +package cn.hutool.v7.core.lang.selector; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.util.RandomUtil; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/Selector.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/Selector.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/Selector.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/Selector.java index 63c0c10a4..3df8c4fe7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/Selector.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/Selector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.selector; +package cn.hutool.v7.core.lang.selector; /** * 选择器接口
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/SmoothWeightObj.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/SmoothWeightObj.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/SmoothWeightObj.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/SmoothWeightObj.java index a05f5f1e5..269b7633c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/SmoothWeightObj.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/SmoothWeightObj.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.selector; +package cn.hutool.v7.core.lang.selector; /** * 平滑权重对象 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/SmoothWeightSelector.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/SmoothWeightSelector.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/SmoothWeightSelector.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/SmoothWeightSelector.java index 77de147a3..7d4321821 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/SmoothWeightSelector.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/SmoothWeightSelector.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.selector; +package cn.hutool.v7.core.lang.selector; -import org.dromara.hutool.core.collection.CollUtil; +import cn.hutool.v7.core.collection.CollUtil; import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/WeightListRandomSelector.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightListRandomSelector.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/WeightListRandomSelector.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightListRandomSelector.java index fe391a48d..d5b350deb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/WeightListRandomSelector.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightListRandomSelector.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.selector; +package cn.hutool.v7.core.lang.selector; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.util.ObjUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/WeightObj.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightObj.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/WeightObj.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightObj.java index 7ee3bfe7c..d150e9b5a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/WeightObj.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightObj.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.selector; +package cn.hutool.v7.core.lang.selector; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/WeightRandomSelector.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightRandomSelector.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/WeightRandomSelector.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightRandomSelector.java index 73fa5a615..5cd1620e6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/WeightRandomSelector.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightRandomSelector.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.selector; +package cn.hutool.v7.core.lang.selector; -import org.dromara.hutool.core.collection.CollUtil; +import cn.hutool.v7.core.collection.CollUtil; import java.io.Serializable; import java.util.SortedMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/package-info.java similarity index 66% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/package-info.java index 7a8f0dca9..49ef1ec78 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/selector/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/package-info.java @@ -17,12 +17,12 @@ /** * 选择器相关封装，包括： *
      - *
    • {@link org.dromara.hutool.core.lang.selector.IncrementSelector}
      • - *
    • {@link org.dromara.hutool.core.lang.selector.RandomSelector}
      • - *
    • {@link org.dromara.hutool.core.lang.selector.SmoothWeightSelector}
      • - *
    • {@link org.dromara.hutool.core.lang.selector.WeightRandomSelector}
      • + *
    • {@link cn.hutool.v7.core.lang.selector.IncrementSelector}
      • + *
    • {@link cn.hutool.v7.core.lang.selector.RandomSelector}
      • + *
    • {@link cn.hutool.v7.core.lang.selector.SmoothWeightSelector}
      • + *
    • {@link cn.hutool.v7.core.lang.selector.WeightRandomSelector}
      • *
    * * @author Looly */ -package org.dromara.hutool.core.lang.selector; +package cn.hutool.v7.core.lang.selector; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Pair.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Pair.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Pair.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Pair.java index 5923071e1..343b97622 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Pair.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Pair.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.tuple; +package cn.hutool.v7.core.lang.tuple; -import org.dromara.hutool.core.exception.CloneException; +import cn.hutool.v7.core.exception.CloneException; import java.io.Serializable; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Triple.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Triple.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Triple.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Triple.java index 3e6741275..162a74847 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Triple.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Triple.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.tuple; +package cn.hutool.v7.core.lang.tuple; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Tuple.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Tuple.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Tuple.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Tuple.java index 39723c7d0..5f4e244b5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Tuple.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Tuple.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.tuple; +package cn.hutool.v7.core.lang.tuple; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.iter.ArrayIter; -import org.dromara.hutool.core.exception.CloneException; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.iter.ArrayIter; +import cn.hutool.v7.core.exception.CloneException; +import cn.hutool.v7.core.array.ArrayUtil; import java.io.Serializable; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/package-info.java similarity index 77% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/package-info.java index a9a163825..559d9e9d4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/package-info.java @@ -17,10 +17,10 @@ /** * 元组相关封装，包括： *
      - *
    • 类似Python元组的{@link org.dromara.hutool.core.lang.tuple.Tuple}
      • - *
    • 三元组{@link org.dromara.hutool.core.lang.tuple.Triple}
      • + *
    • 类似Python元组的{@link cn.hutool.v7.core.lang.tuple.Tuple}
      • + *
    • 三元组{@link cn.hutool.v7.core.lang.tuple.Triple}
      • *
    * * @author Looly, kirno7 */ -package org.dromara.hutool.core.lang.tuple; +package cn.hutool.v7.core.lang.tuple; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/wrapper/SimpleWrapper.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/wrapper/SimpleWrapper.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/wrapper/SimpleWrapper.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/wrapper/SimpleWrapper.java index b0b103f31..3d8fd52a3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/wrapper/SimpleWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/wrapper/SimpleWrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.wrapper; +package cn.hutool.v7.core.lang.wrapper; /** * 简单包装对象
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/wrapper/Wrapper.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/wrapper/Wrapper.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/wrapper/Wrapper.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/wrapper/Wrapper.java index 5afee9949..baeda34ef 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/wrapper/Wrapper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/wrapper/Wrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.wrapper; +package cn.hutool.v7.core.lang.wrapper; /** * 包装接口 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/wrapper/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/wrapper/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/wrapper/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/lang/wrapper/package-info.java index 999ea2239..417cf2566 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/wrapper/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/wrapper/package-info.java @@ -18,4 +18,4 @@ * 提供包装对象的抽象
    * 通过包装接口，实现装饰模式或代理模式，以增强或目标对象功能。 */ -package org.dromara.hutool.core.lang.wrapper; +package cn.hutool.v7.core.lang.wrapper; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/AbsEntry.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/AbsEntry.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/AbsEntry.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/AbsEntry.java index 6e32deff7..b5f210957 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/AbsEntry.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/AbsEntry.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/BeanMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/BeanMap.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/BeanMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/BeanMap.java index d3455a4fa..c6c3e9480 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/BeanMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/BeanMap.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.bean.PropDesc; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.bean.PropDesc; +import cn.hutool.v7.core.util.ObjUtil; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/BiMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/BiMap.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/BiMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/BiMap.java index 5befad1a1..699857dc3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/BiMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/BiMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import java.util.Map; import java.util.function.BiFunction; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/CamelCaseLinkedMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseLinkedMap.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/CamelCaseLinkedMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseLinkedMap.java index bcfa4b079..fa7e7071e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/CamelCaseLinkedMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseLinkedMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import java.util.LinkedHashMap; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/CamelCaseMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseMap.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/CamelCaseMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseMap.java index a3c62e616..b8b20d7c4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/CamelCaseMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseMap.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveLinkedMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveLinkedMap.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveLinkedMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveLinkedMap.java index 0dd4509f2..f2d1af1b1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveLinkedMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveLinkedMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import java.util.LinkedHashMap; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveMap.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveMap.java index b6d23ca0a..2a18c4cfc 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import java.io.Serializable; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveTreeMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveTreeMap.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveTreeMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveTreeMap.java index 94579b4c4..cf6cd1876 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/CaseInsensitiveTreeMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveTreeMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import java.util.Comparator; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/CustomKeyMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/CustomKeyMap.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/CustomKeyMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/CustomKeyMap.java index 73c073721..dafec984b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/CustomKeyMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/CustomKeyMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/Dict.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/Dict.java index 100cb1c71..f9643d9c0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/Dict.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.bean.copier.CopyOptions; -import org.dromara.hutool.core.bean.path.BeanPath; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.exception.CloneException; -import org.dromara.hutool.core.func.LambdaInfo; -import org.dromara.hutool.core.func.LambdaUtil; -import org.dromara.hutool.core.func.SerFunction; -import org.dromara.hutool.core.func.SerSupplier; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.getter.TypeGetter; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.bean.copier.CopyOptions; +import cn.hutool.v7.core.bean.path.BeanPath; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.exception.CloneException; +import cn.hutool.v7.core.func.LambdaInfo; +import cn.hutool.v7.core.func.LambdaUtil; +import cn.hutool.v7.core.func.SerFunction; +import cn.hutool.v7.core.func.SerSupplier; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.getter.TypeGetter; import java.lang.reflect.Type; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/FixedLinkedHashMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/FixedLinkedHashMap.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/FixedLinkedHashMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/FixedLinkedHashMap.java index 9a1548202..77972d4e4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/FixedLinkedHashMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/FixedLinkedHashMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import java.util.LinkedHashMap; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/ForestMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/ForestMap.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/ForestMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/ForestMap.java index 955f36eea..1ea63570b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/ForestMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/ForestMap.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.lang.Opt; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.util.ObjUtil; import java.util.Collection; import java.util.Collections; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/FuncKeyMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/FuncKeyMap.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/FuncKeyMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/FuncKeyMap.java index 9c809403a..c01ef459f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/FuncKeyMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/FuncKeyMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import java.util.Map; import java.util.function.Function; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/FuncMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/FuncMap.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/FuncMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/FuncMap.java index d6caf96a5..4be6197d6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/FuncMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/FuncMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import java.util.Map; import java.util.function.Function; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/LinkedForestMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/LinkedForestMap.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/LinkedForestMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/LinkedForestMap.java index 3575f2c30..743110997 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/LinkedForestMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/LinkedForestMap.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -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.wrapper.Wrapper; -import org.dromara.hutool.core.reflect.ClassUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.wrapper.Wrapper; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapBuilder.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/MapBuilder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/MapBuilder.java index 2f79bab33..ac9c6045d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.lang.builder.Builder; +import cn.hutool.v7.core.lang.builder.Builder; import java.util.Map; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapGetUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapGetUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/MapGetUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/MapGetUtil.java index 4421cb44e..24633a788 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapGetUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapGetUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.reflect.TypeReference; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.reflect.TypeReference; import java.util.Date; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapJoiner.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapJoiner.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/MapJoiner.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/MapJoiner.java index 06363898a..40cd95da5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapJoiner.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapJoiner.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.text.StrJoiner; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.text.StrJoiner; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.util.Iterator; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapProxy.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapProxy.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/MapProxy.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/MapProxy.java index 11ab44985..8bd26052f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapProxy.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapProxy.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.convert.ConvertUtil; -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 cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.lang.getter.TypeGetter; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.util.BooleanUtil; import java.io.Serializable; import java.lang.reflect.InvocationHandler; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/MapUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/MapUtil.java index 607457d0e..167a7e2cd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapUtil.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -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.func.SerConsumer3; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; -import org.dromara.hutool.core.reflect.ConstructorUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.iter.ArrayIter; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.func.SerConsumer3; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.util.*; import java.util.Map.Entry; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapWrapper.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapWrapper.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/MapWrapper.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/MapWrapper.java index a6abcbaf6..eca65a5f7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapWrapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.wrapper.Wrapper; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.wrapper.Wrapper; +import cn.hutool.v7.core.util.ObjUtil; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/TableMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/TableMap.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/TableMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/TableMap.java index e11b72b2a..021389af4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/TableMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/TableMap.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/TolerantMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/TolerantMap.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/TolerantMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/TolerantMap.java index cbcd5cbc5..77a8dbd9e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/TolerantMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/TolerantMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import java.util.HashMap; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/TransMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/TransMap.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/TransMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/TransMap.java index dd70197da..c8f88de75 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/TransMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/TransMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import java.util.Map; import java.util.function.BiFunction; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/TreeEntry.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/TreeEntry.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/TreeEntry.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/TreeEntry.java index 4246dd3af..d74f84fc5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/TreeEntry.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/TreeEntry.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.util.Map; import java.util.function.Consumer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/TripleTable.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/TripleTable.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/TripleTable.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/TripleTable.java index 914515c2d..4ca139458 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/TripleTable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/TripleTable.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.tuple.Triple; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.tuple.Triple; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/ConcurrentLinkedHashMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/ConcurrentLinkedHashMap.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/ConcurrentLinkedHashMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/ConcurrentLinkedHashMap.java index b2e93082c..5153542da 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/ConcurrentLinkedHashMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/ConcurrentLinkedHashMap.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.hutool.core.map.concurrent; +package cn.hutool.v7.core.map.concurrent; -import org.dromara.hutool.core.collection.queue.DiscardingQueue; -import org.dromara.hutool.core.collection.queue.Linked; -import org.dromara.hutool.core.collection.queue.LinkedDeque; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.util.RuntimeUtil; +import cn.hutool.v7.core.collection.queue.DiscardingQueue; +import cn.hutool.v7.core.collection.queue.Linked; +import cn.hutool.v7.core.collection.queue.LinkedDeque; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.util.RuntimeUtil; import java.io.InvalidObjectException; import java.io.ObjectInputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/EntryWeigher.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/EntryWeigher.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/EntryWeigher.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/EntryWeigher.java index 861747952..169a4b940 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/EntryWeigher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/EntryWeigher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.hutool.core.map.concurrent; +package cn.hutool.v7.core.map.concurrent; /** * A class that can determine the selector of an entry. The total selector threshold diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/SafeConcurrentHashMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/SafeConcurrentHashMap.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/SafeConcurrentHashMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/SafeConcurrentHashMap.java index d764a96ba..1e1fa3587 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/SafeConcurrentHashMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/SafeConcurrentHashMap.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.concurrent; +package cn.hutool.v7.core.map.concurrent; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.util.JdkUtil; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.util.JdkUtil; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/Weigher.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/Weigher.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/Weigher.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/Weigher.java index f5e8ea345..11662b56c 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/Weigher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/Weigher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.hutool.core.map.concurrent; +package cn.hutool.v7.core.map.concurrent; /** * A class that can determine the selector of a value. The total selector threshold diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/Weighers.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/Weighers.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/Weighers.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/Weighers.java index 50947788b..ae31c65f7 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/Weighers.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/Weighers.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.hutool.core.map.concurrent; +package cn.hutool.v7.core.map.concurrent; -import org.dromara.hutool.core.collection.iter.IterUtil; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.lang.Assert; import java.io.Serializable; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/package-info.java index aa7faa490..76d169104 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/package-info.java @@ -20,4 +20,4 @@ * * @author Looly */ -package org.dromara.hutool.core.map.concurrent; +package cn.hutool.v7.core.map.concurrent; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsCollValueMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsCollValueMap.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsCollValueMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsCollValueMap.java index 245598a67..24653ead5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsCollValueMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsCollValueMap.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.multi; +package cn.hutool.v7.core.map.multi; -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 cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.map.MapWrapper; +import cn.hutool.v7.core.util.ObjUtil; import java.util.Collection; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsTable.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsTable.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsTable.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsTable.java index d1cba6047..626e962fa 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsTable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsTable.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.multi; +package cn.hutool.v7.core.map.multi; -import org.dromara.hutool.core.collection.iter.IterUtil; -import org.dromara.hutool.core.collection.iter.TransIter; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.collection.iter.TransIter; +import cn.hutool.v7.core.util.ObjUtil; import java.io.Serializable; import java.util.AbstractCollection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/CollectionValueMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/CollectionValueMap.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/multi/CollectionValueMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/multi/CollectionValueMap.java index d7199a2f1..9d7ecb8ed 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/CollectionValueMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/CollectionValueMap.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.multi; +package cn.hutool.v7.core.map.multi; -import org.dromara.hutool.core.func.SerSupplier; +import cn.hutool.v7.core.func.SerSupplier; import java.util.ArrayList; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/DirectedWeightGraph.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/DirectedWeightGraph.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/multi/DirectedWeightGraph.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/multi/DirectedWeightGraph.java index 97cdcbf9e..16fa36547 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/DirectedWeightGraph.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/DirectedWeightGraph.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.multi; +package cn.hutool.v7.core.map.multi; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/Graph.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/Graph.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/multi/Graph.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/multi/Graph.java index 7d8dea0a1..a5343db41 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/Graph.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/Graph.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.multi; +package cn.hutool.v7.core.map.multi; -import org.dromara.hutool.core.collection.CollUtil; +import cn.hutool.v7.core.collection.CollUtil; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/ListValueMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/ListValueMap.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/multi/ListValueMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/multi/ListValueMap.java index 280a22919..71d52ba28 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/ListValueMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/ListValueMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.multi; +package cn.hutool.v7.core.map.multi; import java.util.*; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/MultiValueMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/MultiValueMap.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/multi/MultiValueMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/multi/MultiValueMap.java index 259239ebd..4462adbac 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/MultiValueMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/MultiValueMap.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.multi; +package cn.hutool.v7.core.map.multi; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.util.*; import java.util.function.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/RowKeyTable.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/RowKeyTable.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/multi/RowKeyTable.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/multi/RowKeyTable.java index e37db1bd2..f89e02ece 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/RowKeyTable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/RowKeyTable.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.multi; +package cn.hutool.v7.core.map.multi; -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 cn.hutool.v7.core.lang.builder.Builder; +import cn.hutool.v7.core.collection.iter.ComputeIter; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.collection.iter.TransIter; +import cn.hutool.v7.core.map.AbsEntry; +import cn.hutool.v7.core.map.MapUtil; import java.util.AbstractMap; import java.util.AbstractSet; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/SetValueMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/SetValueMap.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/multi/SetValueMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/multi/SetValueMap.java index 748c9810f..74a3979c6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/SetValueMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/SetValueMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.multi; +package cn.hutool.v7.core.map.multi; import java.util.*; import java.util.function.Supplier; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/Table.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/Table.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/multi/Table.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/multi/Table.java index 9bba27c43..188a6c5f7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/Table.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/Table.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.multi; +package cn.hutool.v7.core.map.multi; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.lang.Opt; -import org.dromara.hutool.core.func.SerConsumer3; -import org.dromara.hutool.core.map.MapUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.func.SerConsumer3; +import cn.hutool.v7.core.map.MapUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/package-info.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/multi/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/multi/package-info.java index 375f38ae9..8ffed7c8d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/package-info.java @@ -39,4 +39,4 @@ * @author Looly * */ -package org.dromara.hutool.core.map.multi; +package cn.hutool.v7.core.map.multi; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/package-info.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/package-info.java index 074574fb9..4513079a6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/reference/ReferenceConcurrentMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/ReferenceConcurrentMap.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/reference/ReferenceConcurrentMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/reference/ReferenceConcurrentMap.java index 7215a5428..6d82444be 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/reference/ReferenceConcurrentMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/ReferenceConcurrentMap.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.reference; +package cn.hutool.v7.core.map.reference; -import org.dromara.hutool.core.lang.ref.Ref; -import org.dromara.hutool.core.lang.ref.ReferenceUtil; -import org.dromara.hutool.core.map.MapUtil; +import cn.hutool.v7.core.lang.ref.Ref; +import cn.hutool.v7.core.lang.ref.ReferenceUtil; +import cn.hutool.v7.core.map.MapUtil; import java.io.Serializable; import java.lang.ref.Reference; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/reference/SoftConcurrentMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/SoftConcurrentMap.java similarity index 87% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/reference/SoftConcurrentMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/reference/SoftConcurrentMap.java index f6fca8ae9..b68b9f1ee 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/reference/SoftConcurrentMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/SoftConcurrentMap.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.reference; +package cn.hutool.v7.core.map.reference; -import org.dromara.hutool.core.lang.ref.Ref; -import org.dromara.hutool.core.lang.ref.SoftObj; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.lang.ref.Ref; +import cn.hutool.v7.core.lang.ref.SoftObj; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import java.lang.ref.ReferenceQueue; import java.util.concurrent.ConcurrentMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/reference/WeakConcurrentMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/WeakConcurrentMap.java similarity index 87% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/reference/WeakConcurrentMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/reference/WeakConcurrentMap.java index 2d8e44f95..bc7dbbbad 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/reference/WeakConcurrentMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/WeakConcurrentMap.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.reference; +package cn.hutool.v7.core.map.reference; -import org.dromara.hutool.core.lang.ref.Ref; -import org.dromara.hutool.core.lang.ref.WeakObj; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.lang.ref.Ref; +import cn.hutool.v7.core.lang.ref.WeakObj; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import java.lang.ref.ReferenceQueue; import java.util.concurrent.ConcurrentMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/reference/WeakKeyConcurrentMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/WeakKeyConcurrentMap.java similarity index 85% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/reference/WeakKeyConcurrentMap.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/reference/WeakKeyConcurrentMap.java index 371efe646..905640885 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/reference/WeakKeyConcurrentMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/WeakKeyConcurrentMap.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.reference; +package cn.hutool.v7.core.map.reference; -import org.dromara.hutool.core.lang.ref.Ref; -import org.dromara.hutool.core.lang.ref.StrongObj; -import org.dromara.hutool.core.lang.ref.WeakObj; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.lang.ref.Ref; +import cn.hutool.v7.core.lang.ref.StrongObj; +import cn.hutool.v7.core.lang.ref.WeakObj; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import java.lang.ref.ReferenceQueue; import java.util.concurrent.ConcurrentMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/reference/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/map/reference/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/map/reference/package-info.java index b39eaa2e0..bb32833b5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/reference/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/package-info.java @@ -19,4 +19,4 @@ * * @author Looly */ -package org.dromara.hutool.core.map.reference; +package cn.hutool.v7.core.map.reference; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/Arrangement.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/Arrangement.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/Arrangement.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/Arrangement.java index 947be5a37..6f1cbc955 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/Arrangement.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/Arrangement.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/BitStatusUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/BitStatusUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/BitStatusUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/BitStatusUtil.java index d0e1c1d2d..5e620b252 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/BitStatusUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/BitStatusUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; /** * 通过位运算表示状态的工具类
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/Calculator.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/Calculator.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/Calculator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/Calculator.java index f419a8f73..2478a759c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/Calculator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/Calculator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.math.BigDecimal; import java.util.Collections; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/ChineseNumberFormatter.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/ChineseNumberFormatter.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/ChineseNumberFormatter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/ChineseNumberFormatter.java index db04f14e2..e633806ff 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/ChineseNumberFormatter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/ChineseNumberFormatter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.split.SplitUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; import java.math.BigDecimal; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/ChineseNumberParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/ChineseNumberParser.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/ChineseNumberParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/ChineseNumberParser.java index edf69ae24..3a8b7bbb7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/ChineseNumberParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/ChineseNumberParser.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/Combination.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/Combination.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/Combination.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/Combination.java index d0d6b1e7e..afa0c7f42 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/Combination.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/Combination.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/EnglishNumberFormatter.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/EnglishNumberFormatter.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/EnglishNumberFormatter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/EnglishNumberFormatter.java index 28a57bbd3..695529478 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/EnglishNumberFormatter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/EnglishNumberFormatter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * 将浮点数类型的number转换成英语的表达方式
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/Fraction.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/Fraction.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/Fraction.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/Fraction.java index af06bd60f..b0edace93 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/Fraction.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/Fraction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import java.math.BigInteger; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/MathUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/MathUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/MathUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/MathUtil.java index e6d045bf4..5208e928c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/MathUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/MathUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; import java.math.BigInteger; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/Money.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/Money.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/Money.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/Money.java index e5a4d1f06..acb973041 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/Money.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/Money.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.File; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/NumberParser.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/NumberParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/NumberParser.java index 2e1f027a3..f7364b71d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/NumberParser.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.math.BigInteger; import java.text.DecimalFormat; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/NumberUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/NumberUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/NumberUtil.java index 7ea682fea..a81acd5fb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/NumberUtil.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -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.ObjUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.comparator.CompareUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberValidator.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/NumberValidator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/NumberValidator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/NumberValidator.java index c514653cc..8fd69a599 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberValidator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/NumberValidator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.CharUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.CharUtil; /** * 数字检查器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/RomanNumberFormatter.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/RomanNumberFormatter.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/RomanNumberFormatter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/RomanNumberFormatter.java index 0906c620a..b043bda22 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/RomanNumberFormatter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/RomanNumberFormatter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * 数字和罗马数字转换 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/package-info.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/math/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/math/package-info.java index f24fe9cea..82ad3bc01 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Pool.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/Ipv4Pool.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Pool.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/Ipv4Pool.java index 67aa8b961..7d5b9318d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Pool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/Ipv4Pool.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * Ip相关常量 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/Ipv4Util.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/Ipv4Util.java index c4c2bf100..2da961ed3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/Ipv4Util.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -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.Singleton; -import org.dromara.hutool.core.regex.PatternPool; -import org.dromara.hutool.core.regex.ReUtil; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.split.SplitUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.Singleton; +import cn.hutool.v7.core.regex.PatternPool; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; import java.net.Inet4Address; import java.net.InetAddress; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv6Util.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/Ipv6Util.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv6Util.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/Ipv6Util.java index 67d0b142b..3f2ff5842 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv6Util.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/Ipv6Util.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Singleton; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Singleton; import java.math.BigInteger; import java.net.Inet6Address; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/LocalPortGenerator.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/LocalPortGenerator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/LocalPortGenerator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/LocalPortGenerator.java index b7fc644d3..20a57a5b1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/LocalPortGenerator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/LocalPortGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/MacAddressUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/MacAddressUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/MacAddressUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/MacAddressUtil.java index dc8ad01e1..bc040d726 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/MacAddressUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/MacAddressUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; import java.net.InetAddress; import java.net.NetworkInterface; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/MaskBit.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/MaskBit.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/MaskBit.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/MaskBit.java index 9cf1c1ec7..a2a06eb71 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/MaskBit.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/MaskBit.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.map.BiMap; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.BiMap; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/NetUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/NetUtil.java index afffc8772..e019af5a2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/NetUtil.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.iter.EnumerationIter; -import org.dromara.hutool.core.exception.HutoolException; -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.text.split.SplitUtil; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.util.JNDIUtil; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.iter.EnumerationIter; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.util.JNDIUtil; +import cn.hutool.v7.core.util.RandomUtil; import javax.naming.NamingException; import javax.naming.directory.Attribute; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/ProxySocketFactory.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/ProxySocketFactory.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/ProxySocketFactory.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/ProxySocketFactory.java index d54c4d412..c68fff5e0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/ProxySocketFactory.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/ProxySocketFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; import javax.net.SocketFactory; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/UserPassAuthenticator.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/UserPassAuthenticator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/UserPassAuthenticator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/UserPassAuthenticator.java index dc5bceb98..be135737f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/UserPassAuthenticator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/UserPassAuthenticator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; import java.net.Authenticator; import java.net.PasswordAuthentication; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/package-info.java index f506b2155..2fd388161 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/KeyManagerUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/KeyManagerUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/KeyManagerUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/KeyManagerUtil.java index 2db58e3a1..91d10978f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/KeyManagerUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/KeyManagerUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.ssl; +package cn.hutool.v7.core.net.ssl; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.text.StrUtil; import javax.net.ssl.KeyManager; import javax.net.ssl.KeyManagerFactory; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLContextBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLContextBuilder.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLContextBuilder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLContextBuilder.java index 9fd9e37d2..430d7952b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLContextBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLContextBuilder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.ssl; +package cn.hutool.v7.core.net.ssl; -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 cn.hutool.v7.core.lang.builder.Builder; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.text.StrUtil; import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLContextUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLContextUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLContextUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLContextUtil.java index 2ddd3a657..b14ad2886 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLContextUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLContextUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.ssl; +package cn.hutool.v7.core.net.ssl; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.io.IORuntimeException; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.IORuntimeException; import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLProtocols.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLProtocols.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLProtocols.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLProtocols.java index 5732ceb67..a98510bca 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLProtocols.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLProtocols.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.ssl; +package cn.hutool.v7.core.net.ssl; /** * SSL或TLS协议 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyHostnameVerifier.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/TrustAnyHostnameVerifier.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyHostnameVerifier.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/TrustAnyHostnameVerifier.java index e7028ca65..acc664c2c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyHostnameVerifier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/TrustAnyHostnameVerifier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.ssl; +package cn.hutool.v7.core.net.ssl; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyTrustManager.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/TrustAnyTrustManager.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyTrustManager.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/TrustAnyTrustManager.java index 893513fb1..a2ee35817 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustAnyTrustManager.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/TrustAnyTrustManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.ssl; +package cn.hutool.v7.core.net.ssl; import javax.net.ssl.SSLEngine; import javax.net.ssl.X509ExtendedTrustManager; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustManagerUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/TrustManagerUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustManagerUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/TrustManagerUtil.java index c70a35915..480fc2e2d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/TrustManagerUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/TrustManagerUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.ssl; +package cn.hutool.v7.core.net.ssl; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.text.StrUtil; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/package-info.java index ac7af8ef7..9674215ab 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/package-info.java @@ -19,4 +19,4 @@ * * @author Looly */ -package org.dromara.hutool.core.net.ssl; +package cn.hutool.v7.core.net.ssl; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/FormUrlencoded.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/FormUrlencoded.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/url/FormUrlencoded.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/url/FormUrlencoded.java index 8d8af6abc..28ab128b3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/FormUrlencoded.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/FormUrlencoded.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -import org.dromara.hutool.core.codec.PercentCodec; +import cn.hutool.v7.core.codec.PercentCodec; /** * application/x-www-form-urlencoded，遵循W3C HTML Form content types规范，如空格须转+，+须被编码
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/RFC3986.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/RFC3986.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/url/RFC3986.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/url/RFC3986.java index b022d0a82..f25a5ed33 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/RFC3986.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/RFC3986.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -import org.dromara.hutool.core.codec.PercentCodec; +import cn.hutool.v7.core.codec.PercentCodec; /** * RFC3986 编码实现
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlBuilder.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlBuilder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlBuilder.java index e3dc25dad..4c1d21d56 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlBuilder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -import org.dromara.hutool.core.exception.HutoolException; -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 cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.builder.Builder; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.net.MalformedURLException; import java.net.URI; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlDecoder.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlDecoder.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlDecoder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlDecoder.java index 56892009c..83aa9b79f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlDecoder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlDecoder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.Serializable; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlEncoder.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlEncoder.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlEncoder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlEncoder.java index d4230bfe3..0ae854582 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlEncoder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlEncoder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlPath.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlPath.java index ab6f9c33f..cb55a02f5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlPath.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -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.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.nio.charset.Charset; import java.util.LinkedList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlProtocolUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlProtocolUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlProtocolUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlProtocolUtil.java index dee6e5f47..92e58c61d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlProtocolUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlProtocolUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -import org.dromara.hutool.core.io.file.FileNameUtil; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.io.file.FileNameUtil; +import cn.hutool.v7.core.lang.Assert; import java.net.URL; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQuery.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlQuery.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQuery.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlQuery.java index 4362a3e95..7a6cbadae 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQuery.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlQuery.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -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.ConvertUtil; -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.util.ObjUtil; +import cn.hutool.v7.core.codec.PercentCodec; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.map.TableMap; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.nio.charset.Charset; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQueryUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlQueryUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQueryUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlQueryUtil.java index 37479a8c4..108083139 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQueryUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlQueryUtil.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.nio.charset.Charset; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlUtil.java index f2657bcdd..e8f87a58a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlUtil.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.exception.HutoolException; -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.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 cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.BufferedReader; import java.io.File; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/url/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/net/url/package-info.java index 58d1b4f6a..aa3f7a575 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/package-info.java @@ -20,4 +20,4 @@ * @author Looly * @since 5.3.1 */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/package-info.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/package-info.java index 21fdfdf7b..8320fcc62 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core; +package cn.hutool.v7.core; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/pool/ObjectFactory.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/ObjectFactory.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/pool/ObjectFactory.java rename to hutool-core/src/main/java/cn/hutool/v7/core/pool/ObjectFactory.java index ef707d4df..acf8468a5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/pool/ObjectFactory.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/ObjectFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.pool; +package cn.hutool.v7.core.pool; /** * 对象工厂接口，用于自定义对象创建、验证和销毁
    diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/pool/ObjectPool.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/ObjectPool.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/pool/ObjectPool.java rename to hutool-core/src/main/java/cn/hutool/v7/core/pool/ObjectPool.java index d8ff69f65..0ebd11f4e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/pool/ObjectPool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/ObjectPool.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.pool; +package cn.hutool.v7.core.pool; import java.io.Closeable; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/pool/PoolConfig.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolConfig.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/pool/PoolConfig.java rename to hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolConfig.java index 123ed31d1..acf9dc42c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/pool/PoolConfig.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.pool; +package cn.hutool.v7.core.pool; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/pool/PoolException.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolException.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/pool/PoolException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolException.java index 230f5f07a..d1fd7169b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/pool/PoolException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.pool; +package cn.hutool.v7.core.pool; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; /** * 对象池异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/pool/Poolable.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/Poolable.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/pool/Poolable.java rename to hutool-core/src/main/java/cn/hutool/v7/core/pool/Poolable.java index 03d98fa63..0883d3898 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/pool/Poolable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/Poolable.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.pool; +package cn.hutool.v7.core.pool; -import org.dromara.hutool.core.lang.wrapper.Wrapper; +import cn.hutool.v7.core.lang.wrapper.Wrapper; /** * 池化对象 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/pool/SimplePoolable.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/SimplePoolable.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/pool/SimplePoolable.java rename to hutool-core/src/main/java/cn/hutool/v7/core/pool/SimplePoolable.java index c400bb80d..249200489 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/pool/SimplePoolable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/SimplePoolable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.pool; +package cn.hutool.v7.core.pool; /** * 简单可池化对象，此对象会同时持有原始对象和所在的分区 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/pool/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/package-info.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/pool/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/pool/package-info.java index 507b34046..070fc740f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/pool/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/package-info.java @@ -24,4 +24,4 @@ * * @author Looly */ -package org.dromara.hutool.core.pool; +package cn.hutool.v7.core.pool; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/PartitionObjectPool.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionObjectPool.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/PartitionObjectPool.java rename to hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionObjectPool.java index 28a010f5f..b42862a99 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/PartitionObjectPool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionObjectPool.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.pool.partition; +package cn.hutool.v7.core.pool.partition; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.pool.ObjectFactory; -import org.dromara.hutool.core.pool.ObjectPool; -import org.dromara.hutool.core.pool.Poolable; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.thread.ThreadUtil; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.pool.ObjectFactory; +import cn.hutool.v7.core.pool.ObjectPool; +import cn.hutool.v7.core.pool.Poolable; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.thread.ThreadUtil; import java.io.IOException; import java.util.concurrent.ArrayBlockingQueue; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/PartitionPoolConfig.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionPoolConfig.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/PartitionPoolConfig.java rename to hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionPoolConfig.java index 557f3e80e..b685e4d6b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/PartitionPoolConfig.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionPoolConfig.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.pool.partition; +package cn.hutool.v7.core.pool.partition; -import org.dromara.hutool.core.pool.PoolConfig; +import cn.hutool.v7.core.pool.PoolConfig; /** * 分局对象池配置 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/PartitionPoolable.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionPoolable.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/PartitionPoolable.java rename to hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionPoolable.java index 64aee73f5..f793f7f85 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/PartitionPoolable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionPoolable.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.pool.partition; +package cn.hutool.v7.core.pool.partition; -import org.dromara.hutool.core.pool.SimplePoolable; +import cn.hutool.v7.core.pool.SimplePoolable; /** * 分区可池化对象，此对象会同时持有原始对象和所在的分区 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/PoolPartition.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PoolPartition.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/PoolPartition.java rename to hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PoolPartition.java index e3cc5437c..7a6cf4ee0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/PoolPartition.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PoolPartition.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.pool.partition; +package cn.hutool.v7.core.pool.partition; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.pool.*; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.pool.*; import java.io.IOException; import java.util.concurrent.BlockingQueue; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/package-info.java index 477a61b6f..4bd64b4e6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/pool/partition/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/package-info.java @@ -19,4 +19,4 @@ * * @author Daniel, Looly */ -package org.dromara.hutool.core.pool.partition; +package cn.hutool.v7.core.pool.partition; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ActualTypeMapperPool.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ActualTypeMapperPool.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/ActualTypeMapperPool.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/ActualTypeMapperPool.java index 14289ea73..513d1fc20 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ActualTypeMapperPool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ActualTypeMapperPool.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassDescUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassDescUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassDescUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassDescUtil.java index acb40e141..c24ca458c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassDescUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassDescUtil.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.map.TripleTable; -import org.dromara.hutool.core.text.StrTrimer; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.CharUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.TripleTable; +import cn.hutool.v7.core.text.StrTrimer; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.CharUtil; import java.lang.reflect.Executable; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassMember.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassMember.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassMember.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassMember.java index 93fd8599f..3c3ea1e1b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassMember.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassMember.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.lang.reflect.Member; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassScanner.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassScanner.java index 74bd40d47..9af1d1c7a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassScanner.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -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.exception.ExceptionUtil; -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.JarResource; -import org.dromara.hutool.core.io.resource.ResourceUtil; -import org.dromara.hutool.core.net.url.UrlDecoder; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharsetUtil; -import org.dromara.hutool.core.util.SystemUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.iter.EnumerationIter; +import cn.hutool.v7.core.exception.ExceptionUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.file.FileNameUtil; +import cn.hutool.v7.core.io.resource.JarResource; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.net.url.UrlDecoder; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.util.SystemUtil; import java.io.File; import java.io.IOException; @@ -443,7 +443,7 @@ public class ClassScanner implements Serializable { addIfAccept(loadClass(className)); } } else if (classLen > packageLen) { - //检查类名是否以指定包名为前缀，包名后加.（避免类似于org.dromara.hutool.A和org.dromara.hutool.ATest这类类名引起的歧义） + //检查类名是否以指定包名为前缀，包名后加.（避免类似于cn.hutool.v7.A和cn.hutool.v7.ATest这类类名引起的歧义） if (".".equals(this.packageNameWithDot) || className.startsWith(this.packageNameWithDot)) { addIfAccept(loadClass(className)); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassUtil.java index c5bae6c1f..bd410dcb9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassUtil.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.array.ArrayUtil; -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.exception.HutoolException; -import org.dromara.hutool.core.func.PredicateUtil; -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.stream.EasyStream; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.bean.NullWrapperBean; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.convert.BasicType; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.func.PredicateUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.net.url.UrlDecoder; +import cn.hutool.v7.core.net.url.UrlUtil; +import cn.hutool.v7.core.stream.EasyStream; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.IOException; import java.io.Serializable; @@ -120,7 +120,7 @@ public class ClassUtil { * 例如：ClassUtil这个类
    * * 
    -	 * isSimple为false: "org.dromara.hutool.core.reflect.ClassUtil"
+	 * isSimple为false: "cn.hutool.v7.core.reflect.core.ClassUtil"
 	 * isSimple为true: "ClassUtil"
 	 *
    * @@ -138,7 +138,7 @@ public class ClassUtil { /** * 获取完整类名的短格式如：
    - * text.org.dromara.hutool.core.StrUtil -》c.h.c.u.StrUtil + * text.cn.hutool.v7.core.StrUtil -》c.h.c.u.StrUtil * * @param className 类名 * @return 短格式类名 @@ -585,7 +585,7 @@ public class ClassUtil { /** * 获得给定类所在包的名称
    * 例如：
    - * org.dromara.hutool.core.reflect.ClassUtil =》 org.dromara.hutool.core.reflect + * cn.hutool.v7.core.reflect.core.ClassUtil =》 cn.hutool.v7.core.reflect * * @param clazz 类 * @return 包名 @@ -605,7 +605,7 @@ public class ClassUtil { /** * 获得给定类所在包的路径
    * 例如：
    - * org.dromara.hutool.core.reflect.ClassUtil =》 org/dromara/hutool/core/reflect + * cn.hutool.v7.core.reflect.core.ClassUtil =》 cn/hutool/v7/core/reflect * * @param clazz 类 * @return 包名 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ConstructorUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ConstructorUtil.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/ConstructorUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/ConstructorUtil.java index 0b6033d82..fc500b360 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ConstructorUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ConstructorUtil.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; -import org.dromara.hutool.core.reflect.creator.DefaultObjectCreator; -import org.dromara.hutool.core.reflect.creator.PossibleObjectCreator; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.reflect.creator.DefaultObjectCreator; +import cn.hutool.v7.core.reflect.creator.PossibleObjectCreator; import java.lang.reflect.Constructor; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldInvoker.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/FieldInvoker.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldInvoker.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/FieldInvoker.java index 89f5926cc..4f0d73cb7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldInvoker.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/FieldInvoker.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.convert.Converter; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.convert.Converter; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; import java.lang.reflect.Field; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldReflect.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/FieldReflect.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldReflect.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/FieldReflect.java index 61d26a187..d96612303 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldReflect.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/FieldReflect.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.lang.Assert; import java.lang.reflect.Field; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/FieldUtil.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/FieldUtil.java index 1ac03440b..eae7e4392 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/FieldUtil.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.annotation.Alias; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.convert.CompositeConverter; -import org.dromara.hutool.core.convert.Converter; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.annotation.Alias; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.convert.CompositeConverter; +import cn.hutool.v7.core.convert.Converter; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.text.StrUtil; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/Invoker.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/Invoker.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/Invoker.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/Invoker.java index e2893ba0b..18a8ce4e6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/Invoker.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/Invoker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/JdkProxyUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/JdkProxyUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/JdkProxyUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/JdkProxyUtil.java index 340dad64e..2634620b5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/JdkProxyUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/JdkProxyUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.lang.Assert; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierType.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ModifierType.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierType.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/ModifierType.java index 1df9c7c34..7831d434a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierType.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ModifierType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import java.lang.reflect.Modifier; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ModifierUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/ModifierUtil.java index db7d62718..ee3bba0f9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ModifierUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.exception.HutoolException; import java.lang.reflect.Field; import java.lang.reflect.Member; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/NullType.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/NullType.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/NullType.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/NullType.java index b0c4ce087..b830b9a71 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/NullType.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/NullType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ParameterizedTypeImpl.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ParameterizedTypeImpl.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/ParameterizedTypeImpl.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/ParameterizedTypeImpl.java index 5f0713bca..86c5a9a7f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ParameterizedTypeImpl.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ParameterizedTypeImpl.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.io.Serializable; import java.lang.reflect.ParameterizedType; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ReflectUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ReflectUtil.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/ReflectUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/ReflectUtil.java index 8739ee653..d887b2699 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ReflectUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ReflectUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; import java.lang.reflect.*; @@ -26,7 +26,7 @@ import java.lang.reflect.*; *

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

    *

    常用方法变更

    *
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeReference.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/TypeReference.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeReference.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/TypeReference.java index 2b5709388..4fae2bb7c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeReference.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/TypeReference.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/TypeUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/TypeUtil.java index 4ec07ba0d..d58000fa7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/TypeUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.lang.reflect.*; import java.util.List; @@ -510,7 +510,7 @@ public class TypeUtil { * 获取泛型变量和泛型实际类型的对应关系Map，例如： * * 
      -	 *     T    org.dromara.hutool.test.User
+	 *     T    cn.hutool.v7.test.User
 	 *     E    java.lang.Integer
 	 *
      * diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/creator/DefaultObjectCreator.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/creator/DefaultObjectCreator.java similarity index 86% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/creator/DefaultObjectCreator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/creator/DefaultObjectCreator.java index 49975af06..78b887f9f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/creator/DefaultObjectCreator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/creator/DefaultObjectCreator.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.creator; +package cn.hutool.v7.core.reflect.creator; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.reflect.ClassUtil; -import org.dromara.hutool.core.reflect.lookup.LookupUtil; -import org.dromara.hutool.core.reflect.method.MethodHandleUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.lookup.LookupUtil; +import cn.hutool.v7.core.reflect.method.MethodHandleUtil; import java.lang.invoke.MethodHandle; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/creator/ObjectCreator.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/creator/ObjectCreator.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/creator/ObjectCreator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/creator/ObjectCreator.java index b0b188b7c..a36c6bc54 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/creator/ObjectCreator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/creator/ObjectCreator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.creator; +package cn.hutool.v7.core.reflect.creator; /** * 对象创建器，用于自定义创建指定类型、指定参数的对象
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/creator/PossibleObjectCreator.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/creator/PossibleObjectCreator.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/creator/PossibleObjectCreator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/creator/PossibleObjectCreator.java index 0182fa25b..8165292f3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/creator/PossibleObjectCreator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/creator/PossibleObjectCreator.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.creator; +package cn.hutool.v7.core.reflect.creator; -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.ReflectUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.ReflectUtil; import java.lang.reflect.Array; import java.lang.reflect.Constructor; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/creator/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/creator/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/creator/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/creator/package-info.java index 2c409a1f1..fdc359829 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/creator/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/creator/package-info.java @@ -20,4 +20,4 @@ * @author Looly * @since 6.0.0 */ -package org.dromara.hutool.core.reflect.creator; +package cn.hutool.v7.core.reflect.creator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/KCallable.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/KCallable.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/KCallable.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/KCallable.java index 7a343044e..5f9bc6f80 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/KCallable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/KCallable.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.kotlin; +package cn.hutool.v7.core.reflect.kotlin; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/KClassImpl.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/KClassImpl.java similarity index 86% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/KClassImpl.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/KClassImpl.java index 1f6980b94..b02a2c59d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/KClassImpl.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/KClassImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.kotlin; +package cn.hutool.v7.core.reflect.kotlin; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.reflect.ConstructorUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; import java.lang.reflect.Method; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/KClassUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/KClassUtil.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/KClassUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/KClassUtil.java index c00003b1d..83cfe4503 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/KClassUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/KClassUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.kotlin; +package cn.hutool.v7.core.reflect.kotlin; -import org.dromara.hutool.core.bean.copier.ValueProvider; -import org.dromara.hutool.core.bean.copier.provider.MapValueProvider; -import org.dromara.hutool.core.lang.Opt; +import cn.hutool.v7.core.bean.copier.ValueProvider; +import cn.hutool.v7.core.bean.copier.provider.MapValueProvider; +import cn.hutool.v7.core.lang.Opt; import java.lang.annotation.Annotation; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/KParameter.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/KParameter.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/KParameter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/KParameter.java index 1ceea5ac3..68a16ada7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/KParameter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/KParameter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.kotlin; +package cn.hutool.v7.core.reflect.kotlin; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; import java.lang.reflect.Method; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/package-info.java index 07fdeb0b3..9860fe428 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/kotlin/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/kotlin/package-info.java @@ -23,4 +23,4 @@ * * @author VampireAchao, Looly */ -package org.dromara.hutool.core.reflect.kotlin; +package cn.hutool.v7.core.reflect.kotlin; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/ConstructorLookupFactory.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/ConstructorLookupFactory.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/ConstructorLookupFactory.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/ConstructorLookupFactory.java index 18c910ca7..105e442e9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/ConstructorLookupFactory.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/ConstructorLookupFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.lookup; +package cn.hutool.v7.core.reflect.lookup; import java.lang.invoke.MethodHandles; import java.lang.reflect.Constructor; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/LookupFactory.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/LookupFactory.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/LookupFactory.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/LookupFactory.java index 74265e335..68fb96a30 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/LookupFactory.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/LookupFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.lookup; +package cn.hutool.v7.core.reflect.lookup; import java.lang.invoke.MethodHandles; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/LookupUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/LookupUtil.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/LookupUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/LookupUtil.java index 36649ba27..9ac36d7c2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/LookupUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/LookupUtil.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.lookup; +package cn.hutool.v7.core.reflect.lookup; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.caller.CallerUtil; -import org.dromara.hutool.core.reflect.ConstructorUtil; -import org.dromara.hutool.core.reflect.ModifierUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.JdkUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.caller.CallerUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.ModifierUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.JdkUtil; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/MethodLookupFactory.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/MethodLookupFactory.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/MethodLookupFactory.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/MethodLookupFactory.java index e046d2fb4..e66702b38 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/MethodLookupFactory.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/MethodLookupFactory.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.lookup; +package cn.hutool.v7.core.reflect.lookup; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; import java.lang.invoke.MethodHandles; import java.lang.reflect.InvocationTargetException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/package-info.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/package-info.java index fe0d24e35..1069bcf47 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/lookup/package-info.java @@ -29,4 +29,4 @@ * @author Looly * @since 6.0.0 */ -package org.dromara.hutool.core.reflect.lookup; +package cn.hutool.v7.core.reflect.lookup; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodHandleUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodHandleUtil.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodHandleUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodHandleUtil.java index 23b97f157..dd15da545 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodHandleUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodHandleUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.method; +package cn.hutool.v7.core.reflect.method; -import org.dromara.hutool.core.exception.ExceptionUtil; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.reflect.lookup.LookupUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.reflect.lookup.LookupUtil; import java.lang.invoke.MethodHandle; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodInvoker.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodInvoker.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodInvoker.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodInvoker.java index be6b156b0..3b77991cd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodInvoker.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodInvoker.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.method; +package cn.hutool.v7.core.reflect.method; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.reflect.*; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.reflect.*; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodMatcherUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodMatcherUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodMatcherUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodMatcherUtil.java index 60cb80e6e..d0a753bc0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodMatcherUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodMatcherUtil.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.method; +package cn.hutool.v7.core.reflect.method; -import org.dromara.hutool.core.annotation.AnnotatedElementUtil; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.func.PredicateUtil; -import org.dromara.hutool.core.reflect.ClassUtil; -import org.dromara.hutool.core.reflect.ModifierUtil; -import org.dromara.hutool.core.text.CharSequenceUtil; +import cn.hutool.v7.core.annotation.AnnotatedElementUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.func.PredicateUtil; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.ModifierUtil; +import cn.hutool.v7.core.text.CharSequenceUtil; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodNameUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodNameUtil.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodNameUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodNameUtil.java index 741220098..4b9fb5e89 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodNameUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodNameUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.method; +package cn.hutool.v7.core.reflect.method; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; import java.beans.Introspector; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodReflect.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodReflect.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodReflect.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodReflect.java index a04ae5c7f..c3f9fcdcc 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodReflect.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodReflect.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.method; +package cn.hutool.v7.core.reflect.method; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.collection.set.UniqueKeySet; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.reflect.ModifierUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.set.UniqueKeySet; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.reflect.ModifierUtil; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodTypeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodTypeUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodTypeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodTypeUtil.java index d6b8244f9..ab5f2d279 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodTypeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodTypeUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.method; +package cn.hutool.v7.core.reflect.method; import java.lang.invoke.MethodType; import java.lang.reflect.Constructor; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodUtil.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodUtil.java index ae815f222..f5d84944a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodUtil.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.method; +package cn.hutool.v7.core.reflect.method; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.bean.NullWrapperBean; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.exception.ExceptionUtil; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.Singleton; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; -import org.dromara.hutool.core.reflect.ClassUtil; -import org.dromara.hutool.core.reflect.ConstructorUtil; -import org.dromara.hutool.core.reflect.ModifierUtil; -import org.dromara.hutool.core.stream.StreamUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.BooleanUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.bean.NullWrapperBean; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.Singleton; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.ModifierUtil; +import cn.hutool.v7.core.stream.StreamUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.BooleanUtil; import java.lang.reflect.Method; import java.util.Set; @@ -632,7 +632,7 @@ public class MethodUtil { * * @param 对象类型 * @param classNameWithMethodName 类名和方法名表达式，类名与方法名用{@code .}或{@code #}连接 - * 例如：org.dromara.hutool.core.text.StrUtil.isEmpty 或 org.dromara.hutool.core.text.StrUtil#isEmpty + * 例如：cn.hutool.v7.core.text.core.StrUtil.isEmpty 或 cn.hutool.v7.core.text.core.StrUtil#isEmpty * @param args 参数，必须严格对应指定方法的参数类型和数量 * @return 返回结果 */ @@ -647,7 +647,7 @@ public class MethodUtil { * * @param 对象类型 * @param classNameWithMethodName 类名和方法名表达式， - * 例如：org.dromara.hutool.core.text.StrUtil#isEmpty或org.dromara.hutool.core.text.StrUtil.isEmpty + * 例如：cn.hutool.v7.core.text.core.StrUtil#isEmpty或cn.hutool.v7.core.text.StrUtil.isEmpty * @param isSingleton 是否为单例对象，如果此参数为false，每次执行方法时创建一个新对象 * @param args 参数，必须严格对应指定方法的参数类型和数量 * @return 返回结果 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/package-info.java index 1b39b876b..370e800fe 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/package-info.java @@ -20,4 +20,4 @@ * @author huangchengxing, Looly * @since 6.0.0 */ -package org.dromara.hutool.core.reflect.method; +package cn.hutool.v7.core.reflect.method; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/reflect/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/reflect/package-info.java index d4d4073c0..998215ab8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/package-info.java @@ -20,4 +20,4 @@ * @author Looly * @since 5.4.2 */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/regex/PatternPool.java b/hutool-core/src/main/java/cn/hutool/v7/core/regex/PatternPool.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/regex/PatternPool.java rename to hutool-core/src/main/java/cn/hutool/v7/core/regex/PatternPool.java index 586c64c74..88b0a05cb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/regex/PatternPool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/regex/PatternPool.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.regex; +package cn.hutool.v7.core.regex; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; import java.util.regex.Pattern; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/regex/ReUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/regex/ReUtil.java index c583f910c..db6861a9d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/regex/ReUtil.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.dromara.hutool.core.regex; +package cn.hutool.v7.core.regex; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.comparator.CompareUtil; -import org.dromara.hutool.core.comparator.StrLengthComparator; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.func.SerFunction; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.Validator; -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.method.MethodUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.comparator.CompareUtil; +import cn.hutool.v7.core.comparator.StrLengthComparator; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.func.SerFunction; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.Validator; +import cn.hutool.v7.core.lang.mutable.Mutable; +import cn.hutool.v7.core.lang.mutable.MutableObj; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.*; import java.util.function.Consumer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/regex/RegexPool.java b/hutool-core/src/main/java/cn/hutool/v7/core/regex/RegexPool.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/regex/RegexPool.java rename to hutool-core/src/main/java/cn/hutool/v7/core/regex/RegexPool.java index d49e28761..8149e539b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/regex/RegexPool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/regex/RegexPool.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.regex; +package cn.hutool.v7.core.regex; /** * 常用正则表达式字符串池 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/regex/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/regex/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/regex/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/regex/package-info.java index 1c7fb9fea..a5fb41546 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/regex/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/regex/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.regex; +package cn.hutool.v7.core.regex; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/spi/AbsServiceLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/spi/AbsServiceLoader.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/spi/AbsServiceLoader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/spi/AbsServiceLoader.java index c182f58a3..7ed812972 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/spi/AbsServiceLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/spi/AbsServiceLoader.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.spi; +package cn.hutool.v7.core.spi; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import java.nio.charset.Charset; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/spi/JdkServiceLoaderUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/spi/JdkServiceLoaderUtil.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/spi/JdkServiceLoaderUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/spi/JdkServiceLoaderUtil.java index 37318bb28..1d205a860 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/spi/JdkServiceLoaderUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/spi/JdkServiceLoaderUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.spi; +package cn.hutool.v7.core.spi; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.util.Iterator; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/spi/ListServiceLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/spi/ListServiceLoader.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/spi/ListServiceLoader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/spi/ListServiceLoader.java index c84a97170..cb5f5574a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/spi/ListServiceLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/spi/ListServiceLoader.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.spi; +package cn.hutool.v7.core.spi; -import org.dromara.hutool.core.cache.SimpleCache; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.resource.MultiResource; -import org.dromara.hutool.core.io.resource.Resource; -import org.dromara.hutool.core.io.resource.ResourceUtil; -import org.dromara.hutool.core.reflect.ConstructorUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.cache.SimpleCache; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.resource.MultiResource; +import cn.hutool.v7.core.io.resource.Resource; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.BufferedReader; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/spi/MapServiceLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/spi/MapServiceLoader.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/spi/MapServiceLoader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/spi/MapServiceLoader.java index 2c09fc118..a9a8ea5ef 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/spi/MapServiceLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/spi/MapServiceLoader.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.spi; +package cn.hutool.v7.core.spi; -import org.dromara.hutool.core.cache.SimpleCache; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.io.resource.ResourceUtil; -import org.dromara.hutool.core.reflect.ConstructorUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.cache.SimpleCache; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.text.StrUtil; import java.nio.charset.Charset; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/spi/ServiceLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/spi/ServiceLoader.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/spi/ServiceLoader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/spi/ServiceLoader.java index c223805fa..fdcac6a69 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/spi/ServiceLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/spi/ServiceLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.spi; +package cn.hutool.v7.core.spi; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/spi/SpiException.java b/hutool-core/src/main/java/cn/hutool/v7/core/spi/SpiException.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/spi/SpiException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/spi/SpiException.java index e070e4df2..27f8238a3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/spi/SpiException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/spi/SpiException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.spi; +package cn.hutool.v7.core.spi; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; /** * SPI异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/spi/SpiUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/spi/SpiUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/spi/SpiUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/spi/SpiUtil.java index f05620f9b..0c6afa87a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/spi/SpiUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/spi/SpiUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.spi; +package cn.hutool.v7.core.spi; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/spi/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/spi/package-info.java similarity index 74% rename from hutool-core/src/main/java/org/dromara/hutool/core/spi/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/spi/package-info.java index 9737b33a7..36ecdf138 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/spi/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/spi/package-info.java @@ -17,8 +17,8 @@ /** * 服务提供接口SPI（Service Provider interface）机制相关封装，包括： *
        - *
      • {@link org.dromara.hutool.core.spi.ListServiceLoader}，提供列表形式的服务定义
        • - *
      • {@link org.dromara.hutool.core.spi.MapServiceLoader}，提供键值对形式的服务定义
        • + *
      • {@link cn.hutool.v7.core.spi.ListServiceLoader}，提供列表形式的服务定义
        • + *
      • {@link cn.hutool.v7.core.spi.MapServiceLoader}，提供键值对形式的服务定义
        • *
      */ -package org.dromara.hutool.core.spi; +package cn.hutool.v7.core.spi; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/AbstractEnhancedWrappedStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStream.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/AbstractEnhancedWrappedStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStream.java index 6825fa39b..1343a0425 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/AbstractEnhancedWrappedStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; import java.util.Objects; import java.util.stream.Stream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/CollectorUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/CollectorUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/CollectorUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/CollectorUtil.java index 114baaec4..061036156 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/CollectorUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/CollectorUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.lang.tuple.Pair; -import org.dromara.hutool.core.lang.tuple.Triple; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.lang.tuple.Pair; +import cn.hutool.v7.core.lang.tuple.Triple; +import cn.hutool.v7.core.text.StrUtil; import java.util.*; import java.util.function.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/EasyStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/EasyStream.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/EasyStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/EasyStream.java index e5e72875d..3e5c0e225 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/EasyStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/EasyStream.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; -import org.dromara.hutool.core.array.ArrayUtil; -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.util.ObjUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.math.NumberUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.math.BigDecimal; import java.math.RoundingMode; @@ -472,7 +472,7 @@ public class EasyStream extends AbstractEnhancedWrappedStream extends Consumer, org.dromara.hutool.core.lang.builder.Builder> { + public interface Builder extends Consumer, cn.hutool.v7.core.lang.builder.Builder> { /** * Adds an element to the unwrap being built.
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/EntryStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/EntryStream.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/EntryStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/EntryStream.java index ef440f9c2..270769023 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/EntryStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/EntryStream.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; -import org.dromara.hutool.core.collection.set.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 cn.hutool.v7.core.collection.set.ConcurrentHashSet; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.map.multi.RowKeyTable; +import cn.hutool.v7.core.map.multi.Table; +import cn.hutool.v7.core.util.ObjUtil; import java.util.*; import java.util.function.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/SimpleCollector.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/SimpleCollector.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/SimpleCollector.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/SimpleCollector.java index 5b23819fd..aac15e987 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/SimpleCollector.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/SimpleCollector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; import java.util.Set; import java.util.function.BiConsumer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/StreamUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/StreamUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/StreamUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/StreamUtil.java index 0f37d87ab..afe7b943c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/StreamUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/StreamUtil.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; -import org.dromara.hutool.core.io.IORuntimeException; -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.tree.HierarchyIterator; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.stream.spliterators.DropWhileSpliterator; +import cn.hutool.v7.core.stream.spliterators.IterateSpliterator; +import cn.hutool.v7.core.stream.spliterators.TakeWhileSpliterator; +import cn.hutool.v7.core.tree.HierarchyIterator; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/TerminableWrappedStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/TerminableWrappedStream.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/TerminableWrappedStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/TerminableWrappedStream.java index ee176e858..cd791883d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/TerminableWrappedStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/TerminableWrappedStream.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; -import org.dromara.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 cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.lang.mutable.MutableInt; +import cn.hutool.v7.core.lang.mutable.MutableObj; import java.util.*; import java.util.function.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/TransformableWrappedStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/TransformableWrappedStream.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/TransformableWrappedStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/TransformableWrappedStream.java index aac382a2c..f6b0bc0ce 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/TransformableWrappedStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/TransformableWrappedStream.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; -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.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.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.lang.mutable.MutableInt; +import cn.hutool.v7.core.lang.mutable.MutableObj; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/WrappedStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/WrappedStream.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/WrappedStream.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/WrappedStream.java index 755d44281..f685f7ce4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/WrappedStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/WrappedStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; import java.util.*; import java.util.function.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/package-info.java index c2b358025..0fd58b5fd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/package-info.java @@ -19,4 +19,4 @@ * * @author Looly, VampireAchao, huangchengxing, emptypoint */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/DropWhileSpliterator.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/DropWhileSpliterator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/DropWhileSpliterator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/DropWhileSpliterator.java index 6a328a4a2..d6ed6aece 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/DropWhileSpliterator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/DropWhileSpliterator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream.spliterators; +package cn.hutool.v7.core.stream.spliterators; import java.util.Comparator; import java.util.Spliterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/IterateSpliterator.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/IterateSpliterator.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/IterateSpliterator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/IterateSpliterator.java index 445ae57d7..82902e09b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/IterateSpliterator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/IterateSpliterator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream.spliterators; +package cn.hutool.v7.core.stream.spliterators; import java.util.Objects; import java.util.Spliterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/TakeWhileSpliterator.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/TakeWhileSpliterator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/TakeWhileSpliterator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/TakeWhileSpliterator.java index f4db90b6f..4d08d12f7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/TakeWhileSpliterator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/TakeWhileSpliterator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream.spliterators; +package cn.hutool.v7.core.stream.spliterators; import java.util.Comparator; import java.util.Spliterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/package-info.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/package-info.java index 8a2afe98d..52226cc30 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/stream/spliterators/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/package-info.java @@ -19,4 +19,4 @@ * * @author Looly */ -package org.dromara.hutool.core.stream.spliterators; +package cn.hutool.v7.core.stream.spliterators; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/ASCIIStrCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/ASCIIStrCache.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/ASCIIStrCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/ASCIIStrCache.java index ea7197cc1..facfb4ccf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/ASCIIStrCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/ASCIIStrCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; /** * ASCII字符对应的字符串缓存 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/AntPathMatcher.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/AntPathMatcher.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/AntPathMatcher.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/AntPathMatcher.java index 41c22e02b..0a53f38d7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/AntPathMatcher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/AntPathMatcher.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; -import org.dromara.hutool.core.text.split.SplitUtil; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.text.split.SplitUtil; import java.util.ArrayList; import java.util.Comparator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharArray.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/CharArray.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/CharArray.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/CharArray.java index 46f232da1..5fd6ef3f8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharArray.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/CharArray.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.collection.iter.ArrayIter; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.iter.ArrayIter; import java.util.Arrays; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharPool.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/CharPool.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/CharPool.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/CharPool.java index c9db2e417..c29347433 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharPool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/CharPool.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; /** * 常用字符常量 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/CharSequenceUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/CharSequenceUtil.java index 6400b9f40..6bbc480cf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/CharSequenceUtil.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -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.func.SerFunction; -import org.dromara.hutool.core.lang.Assert; -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.placeholder.StrFormatter; -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.ByteUtil; -import org.dromara.hutool.core.util.CharsetUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.comparator.VersionComparator; +import cn.hutool.v7.core.func.SerFunction; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.text.finder.CharFinder; +import cn.hutool.v7.core.text.finder.CharMatcherFinder; +import cn.hutool.v7.core.text.finder.Finder; +import cn.hutool.v7.core.text.finder.StrFinder; +import cn.hutool.v7.core.text.placeholder.StrFormatter; +import cn.hutool.v7.core.text.replacer.RangeReplacerByChar; +import cn.hutool.v7.core.text.replacer.RangeReplacerByStr; +import cn.hutool.v7.core.text.replacer.SearchReplacer; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.nio.ByteBuffer; import java.nio.CharBuffer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/CharUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/CharUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/CharUtil.java index a7d761487..f3d4ca39e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/CharUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; /** * 字符工具类
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/CodePointIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/CodePointIter.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/CodePointIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/CodePointIter.java index 4411f26d0..5e7144447 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/CodePointIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/CodePointIter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import java.util.Iterator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/NamingCase.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/NamingCase.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/NamingCase.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/NamingCase.java index 9fbd591e2..96d02bc63 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/NamingCase.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/NamingCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; /** * 命名规则封装，主要是针对驼峰风格命名、连接符命名等的封装 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrJoiner.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrJoiner.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/StrJoiner.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/StrJoiner.java index cac0b83ed..52a106e3c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrJoiner.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrJoiner.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.collection.iter.ArrayIter; -import org.dromara.hutool.core.collection.iter.IterUtil; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.iter.ArrayIter; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.array.ArrayUtil; import java.io.IOException; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrPool.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrPool.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/StrPool.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/StrPool.java index c982c3809..200a22a27 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrPool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrPool.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; /** * 常用字符串常量定义 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrRegionMatcher.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrRegionMatcher.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/StrRegionMatcher.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/StrRegionMatcher.java index 3cddeb127..08c7f93d5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrRegionMatcher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrRegionMatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import java.io.Serializable; import java.util.function.BiPredicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrRepeater.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrRepeater.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/StrRepeater.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/StrRepeater.java index c17fde3f1..13edf1683 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrRepeater.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrRepeater.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrStripper.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrStripper.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/StrStripper.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/StrStripper.java index 160dd610d..efe3c8f98 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrStripper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrStripper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import java.io.Serializable; import java.util.function.UnaryOperator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrTrimer.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/StrTrimer.java index e60e5e64c..3ebe41880 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrTrimer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrTrimer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import java.io.Serializable; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/StrUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/StrUtil.java index 898c298fd..d45b04472 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.func.FunctionPool; -import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.func.FunctionPool; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.util.CharsetUtil; import java.io.StringReader; import java.io.StringWriter; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrValidator.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrValidator.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/StrValidator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/StrValidator.java index 7bab140d8..2f163813c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrValidator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrValidator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/TextSimilarity.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/TextSimilarity.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/TextSimilarity.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/TextSimilarity.java index eb5cc7096..b56cda95c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/TextSimilarity.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/TextSimilarity.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.math.NumberUtil; +import cn.hutool.v7.core.math.NumberUtil; /** * 文本相似度计算
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/UnicodeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/UnicodeUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/UnicodeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/UnicodeUtil.java index 59896a634..d6d62ed08 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/UnicodeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/UnicodeUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.codec.binary.HexUtil; +import cn.hutool.v7.core.codec.binary.HexUtil; /** * 提供Unicode字符串和普通字符串之间的转换 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/AbstractFilter.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/AbstractFilter.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/AbstractFilter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/AbstractFilter.java index f0421fb92..108a38e58 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/AbstractFilter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/AbstractFilter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.bloom; +package cn.hutool.v7.core.text.bloom; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.util.BitSet; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/BloomFilter.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/BloomFilter.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/BloomFilter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/BloomFilter.java index fbba262ac..d26cf4f3e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/BloomFilter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/BloomFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.bloom; +package cn.hutool.v7.core.text.bloom; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/CombinedBloomFilter.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/CombinedBloomFilter.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/CombinedBloomFilter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/CombinedBloomFilter.java index f74425b67..4285f454d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/CombinedBloomFilter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/CombinedBloomFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.bloom; +package cn.hutool.v7.core.text.bloom; /** * 组合BloomFilter 实现
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/FuncFilter.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/FuncFilter.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/FuncFilter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/FuncFilter.java index 69fdf2108..12e652231 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/FuncFilter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/FuncFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.bloom; +package cn.hutool.v7.core.text.bloom; import java.util.function.Function; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/package-info.java index c9f694f1e..5eaff9a63 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/bloom/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.text.bloom; +package cn.hutool.v7.core.text.bloom; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/FoundWord.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/FoundWord.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/FoundWord.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/FoundWord.java index 18484f9f4..fb190936c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/FoundWord.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/FoundWord.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.dfa; +package cn.hutool.v7.core.text.dfa; -import org.dromara.hutool.core.lang.range.DefaultSegment; +import cn.hutool.v7.core.lang.range.DefaultSegment; /** *

      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/NFA.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/NFA.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/NFA.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/NFA.java index 052510199..4da261a42 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/NFA.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/NFA.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.dfa; +package cn.hutool.v7.core.text.dfa; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveProcessor.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/SensitiveProcessor.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveProcessor.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/SensitiveProcessor.java index 876beedde..0b9eb97ae 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveProcessor.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/SensitiveProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.dfa; +package cn.hutool.v7.core.text.dfa; /** * @author 肖海斌 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/SensitiveUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/SensitiveUtil.java index 709f06a9d..6c2c401d8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/SensitiveUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.dfa; +package cn.hutool.v7.core.text.dfa; -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 cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.thread.ThreadUtil; import java.util.Collection; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/StopChar.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/StopChar.java index 506874629..cd0ce0110 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/StopChar.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.dfa; +package cn.hutool.v7.core.text.dfa; -import org.dromara.hutool.core.collection.set.SetUtil; +import cn.hutool.v7.core.collection.set.SetUtil; import java.util.Set; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/WordTree.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/WordTree.java index 7a6f3b841..20f43eb97 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/WordTree.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.dfa; +package cn.hutool.v7.core.text.dfa; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.stream.EasyStream; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.stream.EasyStream; +import cn.hutool.v7.core.text.StrUtil; import java.util.*; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/package-info.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/package-info.java index 36dffadac..652189feb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/package-info.java @@ -22,4 +22,4 @@ * @author Looly * */ -package org.dromara.hutool.core.text.dfa; +package cn.hutool.v7.core.text.dfa; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/EscapeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/EscapeUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/escape/EscapeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/escape/EscapeUtil.java index 156356dc2..41d3917eb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/EscapeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/EscapeUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.escape; +package cn.hutool.v7.core.text.escape; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/Html4Escape.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Escape.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/escape/Html4Escape.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Escape.java index 672457c6e..105c0f910 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/Html4Escape.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Escape.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.escape; +package cn.hutool.v7.core.text.escape; -import org.dromara.hutool.core.text.replacer.LookupReplacer; -import org.dromara.hutool.core.text.replacer.ReplacerChain; +import cn.hutool.v7.core.text.replacer.LookupReplacer; +import cn.hutool.v7.core.text.replacer.ReplacerChain; /** * HTML4的ESCAPE diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/Html4Unescape.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Unescape.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/escape/Html4Unescape.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Unescape.java index 111ddc085..64dc94810 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/Html4Unescape.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Unescape.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.escape; +package cn.hutool.v7.core.text.escape; -import org.dromara.hutool.core.text.replacer.LookupReplacer; +import cn.hutool.v7.core.text.replacer.LookupReplacer; /** * HTML4的UNESCAPE diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/InternalEscapeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/InternalEscapeUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/escape/InternalEscapeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/escape/InternalEscapeUtil.java index 6bd6d04d3..bb56fb42d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/InternalEscapeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/InternalEscapeUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.escape; +package cn.hutool.v7.core.text.escape; /** * 内部Escape工具类 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/NumericEntityUnescaper.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/NumericEntityUnescaper.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/escape/NumericEntityUnescaper.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/escape/NumericEntityUnescaper.java index b6d145257..d88637d25 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/NumericEntityUnescaper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/NumericEntityUnescaper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.escape; +package cn.hutool.v7.core.text.escape; -import org.dromara.hutool.core.text.replacer.StrReplacer; -import org.dromara.hutool.core.text.CharUtil; +import cn.hutool.v7.core.text.replacer.StrReplacer; +import cn.hutool.v7.core.text.CharUtil; /** * 形如'的反转义器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/XmlEscape.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlEscape.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/escape/XmlEscape.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlEscape.java index 5a7750877..93114462a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/XmlEscape.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlEscape.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.escape; +package cn.hutool.v7.core.text.escape; -import org.dromara.hutool.core.text.replacer.LookupReplacer; -import org.dromara.hutool.core.text.replacer.ReplacerChain; +import cn.hutool.v7.core.text.replacer.LookupReplacer; +import cn.hutool.v7.core.text.replacer.ReplacerChain; /** * XML特殊字符转义
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/XmlUnescape.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlUnescape.java similarity index 86% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/escape/XmlUnescape.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlUnescape.java index b19d7dae1..2210dccb0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/XmlUnescape.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlUnescape.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.escape; +package cn.hutool.v7.core.text.escape; -import org.dromara.hutool.core.text.replacer.LookupReplacer; -import org.dromara.hutool.core.text.replacer.ReplacerChain; +import cn.hutool.v7.core.text.replacer.LookupReplacer; +import cn.hutool.v7.core.text.replacer.ReplacerChain; /** * XML的UNESCAPE diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/escape/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/escape/package-info.java index 130342d18..ece65b606 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.text.escape; +package cn.hutool.v7.core.text.escape; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharFinder.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharFinder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharFinder.java index 7067d75ff..6eb018541 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharFinder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.finder; +package cn.hutool.v7.core.text.finder; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.CharUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.CharUtil; /** * 字符查找器
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharMatcherFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharMatcherFinder.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharMatcherFinder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharMatcherFinder.java index add1bb09e..eb043edae 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/CharMatcherFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharMatcherFinder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.finder; +package cn.hutool.v7.core.text.finder; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.util.function.Predicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/Finder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/Finder.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/finder/Finder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/finder/Finder.java index fe342ec7f..9b187781a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/Finder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/Finder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.finder; +package cn.hutool.v7.core.text.finder; /** * 字符串查找接口，通过调用{@link #start(int)}查找开始位置，再调用{@link #end(int)}找结束位置 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/LengthFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/LengthFinder.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/finder/LengthFinder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/finder/LengthFinder.java index 51bef2a47..94e4c7be6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/LengthFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/LengthFinder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.finder; +package cn.hutool.v7.core.text.finder; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; /** * 固定长度查找器
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/MultiStrFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/MultiStrFinder.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/finder/MultiStrFinder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/finder/MultiStrFinder.java index 7f579c344..d8edcdb01 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/MultiStrFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/MultiStrFinder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.finder; +package cn.hutool.v7.core.text.finder; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/PatternFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/PatternFinder.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/finder/PatternFinder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/finder/PatternFinder.java index e777bb62d..f10ce4482 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/PatternFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/PatternFinder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.finder; +package cn.hutool.v7.core.text.finder; -import org.dromara.hutool.core.regex.PatternPool; +import cn.hutool.v7.core.regex.PatternPool; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/StrFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/StrFinder.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/finder/StrFinder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/finder/StrFinder.java index 12391c478..2abf12b62 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/StrFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/StrFinder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.finder; +package cn.hutool.v7.core.text.finder; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.CharSequenceUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.CharSequenceUtil; /** * 字符串查找器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/TextFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/TextFinder.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/finder/TextFinder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/finder/TextFinder.java index f99828ed8..112996a68 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/TextFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/TextFinder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.finder; +package cn.hutool.v7.core.text.finder; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/package-info.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/finder/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/finder/package-info.java index 9226c2ae4..e9b93d71d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/finder/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/package-info.java @@ -26,4 +26,4 @@ * @author Looly * */ -package org.dromara.hutool.core.text.finder; +package cn.hutool.v7.core.text.finder; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/package-info.java index f8b62cb51..e7276fee5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/PlaceholderParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/PlaceholderParser.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/PlaceholderParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/PlaceholderParser.java index 02df01bc0..cf0eae479 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/PlaceholderParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/PlaceholderParser.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.placeholder; +package cn.hutool.v7.core.text.placeholder; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrValidator; -import org.dromara.hutool.core.text.CharUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrValidator; +import cn.hutool.v7.core.text.CharUtil; import java.util.Objects; import java.util.function.UnaryOperator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrFormatter.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/StrFormatter.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrFormatter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/StrFormatter.java index a80cdb5e2..7a2bb4d4e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrFormatter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/StrFormatter.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.placeholder; +package cn.hutool.v7.core.text.placeholder; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.lang.mutable.MutableEntry; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.placeholder.template.NamedPlaceholderStrTemplate; -import org.dromara.hutool.core.text.placeholder.template.SinglePlaceholderStrTemplate; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.lang.mutable.MutableEntry; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.placeholder.template.NamedPlaceholderStrTemplate; +import cn.hutool.v7.core.text.placeholder.template.SinglePlaceholderStrTemplate; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrMatcher.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/StrMatcher.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrMatcher.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/StrMatcher.java index aa227f314..6710da4f2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrMatcher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/StrMatcher.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.placeholder; +package cn.hutool.v7.core.text.placeholder; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.text.StrUtil; import java.util.ArrayList; import java.util.HashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrTemplate.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/StrTemplate.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrTemplate.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/StrTemplate.java index cb7b2d1c2..d1dadb6e4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrTemplate.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/StrTemplate.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.placeholder; +package cn.hutool.v7.core.text.placeholder; -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.exception.HutoolException; -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.text.placeholder.segment.AbstractPlaceholderSegment; -import org.dromara.hutool.core.text.placeholder.segment.LiteralSegment; -import org.dromara.hutool.core.text.placeholder.segment.StrTemplateSegment; -import org.dromara.hutool.core.text.placeholder.template.NamedPlaceholderStrTemplate; -import org.dromara.hutool.core.text.placeholder.template.SinglePlaceholderStrTemplate; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.CharPool; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.placeholder.segment.AbstractPlaceholderSegment; +import cn.hutool.v7.core.text.placeholder.segment.LiteralSegment; +import cn.hutool.v7.core.text.placeholder.segment.StrTemplateSegment; +import cn.hutool.v7.core.text.placeholder.template.NamedPlaceholderStrTemplate; +import cn.hutool.v7.core.text.placeholder.template.SinglePlaceholderStrTemplate; import java.util.*; import java.util.function.BiConsumer; @@ -36,7 +36,7 @@ import java.util.function.Supplier; import java.util.function.UnaryOperator; import java.util.stream.Collectors; -import static org.dromara.hutool.core.text.placeholder.StrTemplate.Feature.*; +import static cn.hutool.v7.core.text.placeholder.StrTemplate.Feature.*; /** * 字符串模板 格式化 和 反解析 抽象父类 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/package-info.java index ce99f8b44..af3158c97 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/package-info.java @@ -17,4 +17,4 @@ /** * 字符串占位符相关封装，包括占位符替换变量和解析变量 */ -package org.dromara.hutool.core.text.placeholder; +package cn.hutool.v7.core.text.placeholder; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/AbstractPlaceholderSegment.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/AbstractPlaceholderSegment.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/AbstractPlaceholderSegment.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/AbstractPlaceholderSegment.java index 64d8e58d4..ba68e31ca 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/AbstractPlaceholderSegment.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/AbstractPlaceholderSegment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.placeholder.segment; +package cn.hutool.v7.core.text.placeholder.segment; /** * 字符串模板-占位符-抽象 Segment diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/IndexedPlaceholderSegment.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/IndexedPlaceholderSegment.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/IndexedPlaceholderSegment.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/IndexedPlaceholderSegment.java index 7e97eb60f..b5f876593 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/IndexedPlaceholderSegment.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/IndexedPlaceholderSegment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.placeholder.segment; +package cn.hutool.v7.core.text.placeholder.segment; /** * 基字符串模板-基于下标的占位符 Segment diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/LiteralSegment.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/LiteralSegment.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/LiteralSegment.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/LiteralSegment.java index f0c23e361..7bc700bbf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/LiteralSegment.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/LiteralSegment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.placeholder.segment; +package cn.hutool.v7.core.text.placeholder.segment; /** * 字符串模板-固定文本 Segment diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/NamedPlaceholderSegment.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/NamedPlaceholderSegment.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/NamedPlaceholderSegment.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/NamedPlaceholderSegment.java index 39de51be2..4f9586a58 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/NamedPlaceholderSegment.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/NamedPlaceholderSegment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.placeholder.segment; +package cn.hutool.v7.core.text.placeholder.segment; /** * 字符串模板-有前后缀的变量占位符 Segment diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/SinglePlaceholderSegment.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/SinglePlaceholderSegment.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/SinglePlaceholderSegment.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/SinglePlaceholderSegment.java index b1c8c3741..0d9088fc9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/SinglePlaceholderSegment.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/SinglePlaceholderSegment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.placeholder.segment; +package cn.hutool.v7.core.text.placeholder.segment; /** * 字符串模板-单变量占位符 Segment diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/StrTemplateSegment.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/StrTemplateSegment.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/StrTemplateSegment.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/StrTemplateSegment.java index 7dd0b645d..5f79aa4b6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/StrTemplateSegment.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/StrTemplateSegment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.placeholder.segment; +package cn.hutool.v7.core.text.placeholder.segment; /** * 字符串模板-抽象 Segment diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/package-info.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/package-info.java index 2089f2a00..2ee12eb7c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/segment/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/package-info.java @@ -17,4 +17,4 @@ /** * 占位符节点 */ -package org.dromara.hutool.core.text.placeholder.segment; +package cn.hutool.v7.core.text.placeholder.segment; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/NamedPlaceholderStrTemplate.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/NamedPlaceholderStrTemplate.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/NamedPlaceholderStrTemplate.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/NamedPlaceholderStrTemplate.java index 853de09a7..48349ce03 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/NamedPlaceholderStrTemplate.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/NamedPlaceholderStrTemplate.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.placeholder.template; +package cn.hutool.v7.core.text.placeholder.template; -import org.dromara.hutool.core.array.ArrayUtil; -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.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.math.NumberUtil; -import org.dromara.hutool.core.text.StrPool; -import org.dromara.hutool.core.text.placeholder.StrTemplate; -import org.dromara.hutool.core.text.placeholder.segment.*; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.math.NumberUtil; +import cn.hutool.v7.core.text.StrPool; +import cn.hutool.v7.core.text.placeholder.StrTemplate; +import cn.hutool.v7.core.text.placeholder.segment.*; import java.util.*; import java.util.function.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/SinglePlaceholderStrTemplate.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/SinglePlaceholderStrTemplate.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/SinglePlaceholderStrTemplate.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/SinglePlaceholderStrTemplate.java index 3a29f4317..e54e7b782 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/SinglePlaceholderStrTemplate.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/SinglePlaceholderStrTemplate.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.placeholder.template; +package cn.hutool.v7.core.text.placeholder.template; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrPool; -import org.dromara.hutool.core.text.placeholder.StrTemplate; -import org.dromara.hutool.core.text.placeholder.segment.LiteralSegment; -import org.dromara.hutool.core.text.placeholder.segment.SinglePlaceholderSegment; -import org.dromara.hutool.core.text.placeholder.segment.StrTemplateSegment; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrPool; +import cn.hutool.v7.core.text.placeholder.StrTemplate; +import cn.hutool.v7.core.text.placeholder.segment.LiteralSegment; +import cn.hutool.v7.core.text.placeholder.segment.SinglePlaceholderSegment; +import cn.hutool.v7.core.text.placeholder.segment.StrTemplateSegment; import java.util.ArrayList; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/package-info.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/package-info.java index a5a5dfce2..095c7b3c1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/package-info.java @@ -17,4 +17,4 @@ /** * 字符串模板 */ -package org.dromara.hutool.core.text.placeholder.template; +package cn.hutool.v7.core.text.placeholder.template; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/HighMultiReplacer.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/HighMultiReplacer.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/HighMultiReplacer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/HighMultiReplacer.java index 373bbc0c2..479c47a6d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/HighMultiReplacer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/HighMultiReplacer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.replacer; +package cn.hutool.v7.core.text.replacer; import java.util.HashMap; import java.util.LinkedList; @@ -49,7 +49,7 @@ public class HighMultiReplacer extends StrReplacer { * 生成一个HighMultiReplacer对象 * * @param map key为需要被查找的字符串，value为对应的替换的值 - * @return org.dromara.hutool.core.text.replacer.HighMultiReplacer + * @return cn.hutool.v7.core.text.replacer.HighMultiReplacer */ public static HighMultiReplacer of(final Map map) { return new HighMultiReplacer(map); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/HighMultiReplacerV2.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerV2.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/HighMultiReplacerV2.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerV2.java index 61627a768..7c4b94c5e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/HighMultiReplacerV2.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerV2.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.replacer; +package cn.hutool.v7.core.text.replacer; -import org.dromara.hutool.core.text.finder.MultiStrFinder; +import cn.hutool.v7.core.text.finder.MultiStrFinder; import java.util.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/LookupReplacer.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/LookupReplacer.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/LookupReplacer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/LookupReplacer.java index ff425b3d9..b21a0fd1b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/LookupReplacer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/LookupReplacer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.replacer; +package cn.hutool.v7.core.text.replacer; import java.util.HashMap; import java.util.HashSet; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/RangeReplacerByChar.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByChar.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/RangeReplacerByChar.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByChar.java index 9f1e7a2ea..df47e61b7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/RangeReplacerByChar.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByChar.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.replacer; +package cn.hutool.v7.core.text.replacer; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * 区间字符串替换，指定区间，将区间中的所有字符去除，替换为指定的字符，字符重复次数为区间长度，即替换后字符串长度不变
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/RangeReplacerByStr.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByStr.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/RangeReplacerByStr.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByStr.java index 756de0791..386a8bd0f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/RangeReplacerByStr.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByStr.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.replacer; +package cn.hutool.v7.core.text.replacer; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * 区间字符串替换，指定区间，将区间中的所有字符去除，替换为指定的字符串，字符串只重复一次
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/ReplacerChain.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/ReplacerChain.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/ReplacerChain.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/ReplacerChain.java index d0ab24e5f..dbc890137 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/ReplacerChain.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/ReplacerChain.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.replacer; +package cn.hutool.v7.core.text.replacer; -import org.dromara.hutool.core.lang.Chain; +import cn.hutool.v7.core.lang.Chain; import java.util.Iterator; import java.util.LinkedList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/SearchReplacer.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/SearchReplacer.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/SearchReplacer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/SearchReplacer.java index ee2ccf9c9..cb1750092 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/SearchReplacer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/SearchReplacer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.replacer; +package cn.hutool.v7.core.text.replacer; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.finder.Finder; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.finder.Finder; /** * 查找替换器
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/StrReplacer.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/StrReplacer.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/StrReplacer.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/StrReplacer.java index e55f8939c..e8883f71b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/StrReplacer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/StrReplacer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.replacer; +package cn.hutool.v7.core.text.replacer; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.util.function.UnaryOperator; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/package-info.java index 28b8af3e8..4a314d426 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/replacer/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.text.replacer; +package cn.hutool.v7.core.text.replacer; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/split/SplitIter.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitIter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/split/SplitIter.java index d63c64c45..326e1a7f2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/split/SplitIter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.split; +package cn.hutool.v7.core.text.split; -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 cn.hutool.v7.core.collection.iter.ComputeIter; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.finder.TextFinder; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/split/SplitUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/split/SplitUtil.java index 4ac9440cb..ac7793df5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/split/SplitUtil.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.split; +package cn.hutool.v7.core.text.split; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.convert.ConvertUtil; -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.text.CharUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.regex.PatternPool; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.finder.*; +import cn.hutool.v7.core.text.CharUtil; import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/split/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/split/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/text/split/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/text/split/package-info.java index b61a71507..30a9c15dc 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/split/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/split/package-info.java @@ -19,4 +19,4 @@ * * @author Looly */ -package org.dromara.hutool.core.text.split; +package cn.hutool.v7.core.text.split; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/AsyncUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/AsyncUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/AsyncUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/AsyncUtil.java index f5a27eb20..86435bd77 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/AsyncUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/AsyncUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.exception.ExceptionUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.stream.StreamUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.stream.StreamUtil; import java.lang.reflect.UndeclaredThrowableException; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/BlockPolicy.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/BlockPolicy.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/BlockPolicy.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/BlockPolicy.java index 9ccdbff54..e8adef1a1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/BlockPolicy.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/BlockPolicy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.RejectedExecutionHandler; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ConcurrencyTester.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ConcurrencyTester.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/ConcurrencyTester.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/ConcurrencyTester.java index b3f5840fb..1e79ca4e5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ConcurrencyTester.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ConcurrencyTester.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.date.StopWatch; +import cn.hutool.v7.core.date.StopWatch; import java.io.Closeable; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/DelegatedExecutorService.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/DelegatedExecutorService.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/DelegatedExecutorService.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/DelegatedExecutorService.java index 535fdc21e..bffe78522 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/DelegatedExecutorService.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/DelegatedExecutorService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.wrapper.Wrapper; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.wrapper.Wrapper; import java.util.Collection; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ExecutorBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ExecutorBuilder.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/ExecutorBuilder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/ExecutorBuilder.java index 4cc54e28f..88eec9b72 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ExecutorBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ExecutorBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.lang.builder.Builder; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.lang.builder.Builder; +import cn.hutool.v7.core.util.ObjUtil; import java.util.concurrent.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/FinalizableDelegatedExecutorService.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/FinalizableDelegatedExecutorService.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/FinalizableDelegatedExecutorService.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/FinalizableDelegatedExecutorService.java index 39f5bce31..6fae7880d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/FinalizableDelegatedExecutorService.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/FinalizableDelegatedExecutorService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; import java.util.concurrent.ExecutorService; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/GlobalThreadPool.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/GlobalThreadPool.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/GlobalThreadPool.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/GlobalThreadPool.java index af9a37459..d77bdb91a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/GlobalThreadPool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/GlobalThreadPool.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/NamedThreadFactory.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/NamedThreadFactory.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/NamedThreadFactory.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/NamedThreadFactory.java index 9c2b5ea76..97a78ef22 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/NamedThreadFactory.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/NamedThreadFactory.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; import java.lang.Thread.UncaughtExceptionHandler; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * 线程创建工厂类，此工厂可选配置： diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/RejectPolicy.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/RejectPolicy.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/RejectPolicy.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/RejectPolicy.java index a59c71a55..ff9bb34e9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/RejectPolicy.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/RejectPolicy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ThreadPoolExecutor; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/RetryUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/RetryUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/RetryUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/RetryUtil.java index 60c9a2bc8..3927dd3f5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/RetryUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/RetryUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.array.ArrayUtil; import java.time.Duration; import java.util.function.BiPredicate; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/RetryableTask.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/RetryableTask.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/RetryableTask.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/RetryableTask.java index 2189cf5d5..ff41f7eae 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/RetryableTask.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/RetryableTask.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import java.time.Duration; import java.util.Arrays; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/SemaphoreRunnable.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/SemaphoreRunnable.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/SemaphoreRunnable.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/SemaphoreRunnable.java index d80c64f37..5b9524cc8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/SemaphoreRunnable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/SemaphoreRunnable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; import java.util.concurrent.Semaphore; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/SimpleScheduler.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/SimpleScheduler.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/SimpleScheduler.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/SimpleScheduler.java index c949b9457..d3b21dd33 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/SimpleScheduler.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/SimpleScheduler.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.util.RuntimeUtil; +import cn.hutool.v7.core.util.RuntimeUtil; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/SyncFinisher.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/SyncFinisher.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/SyncFinisher.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/SyncFinisher.java index fe6816432..97c05e468 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/SyncFinisher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/SyncFinisher.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; import java.io.Closeable; import java.util.LinkedHashSet; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadException.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadException.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadException.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadException.java index ac8b8c3f4..a9009d2fb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; /** * 线程异常 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadFactoryBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadFactoryBuilder.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadFactoryBuilder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadFactoryBuilder.java index 6d19cda5f..97f65a236 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadFactoryBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadFactoryBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.lang.builder.Builder; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.lang.builder.Builder; +import cn.hutool.v7.core.text.StrUtil; import java.lang.Thread.UncaughtExceptionHandler; import java.util.concurrent.Executors; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadUtil.java index 45130909c..5d641fefd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.util.RuntimeUtil; +import cn.hutool.v7.core.util.RuntimeUtil; import java.lang.Thread.UncaughtExceptionHandler; import java.time.Duration; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/thread/lock/LockUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/lock/LockUtil.java new file mode 100644 index 000000000..c38942702 --- /dev/null +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/lock/LockUtil.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2013-2025 Hutool Team and hutool.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cn.hutool.v7.core.thread.lock; + +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.concurrent.locks.StampedLock; + +/** + * 锁相关工具 + * + * @author Looly + * @since 5.2.5 + */ +public class LockUtil { + + private static final NoLock NO_LOCK = new NoLock(); + + /** + * 创建{@link StampedLock}锁 + * + * @return {@link StampedLock}锁 + */ + public static StampedLock createStampLock() { + return new StampedLock(); + } + + /** + * 创建{@link ReentrantReadWriteLock}锁 + * + * @param fair 是否公平锁 + * @return {@link ReentrantReadWriteLock}锁 + */ + public static ReentrantReadWriteLock createReadWriteLock(final boolean fair) { + return new ReentrantReadWriteLock(fair); + } + + /** + * 获取单例的无锁对象 + * + * @return {@link NoLock} + */ + public static NoLock getNoLock(){ + return NO_LOCK; + } +} diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/NoLock.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/lock/NoLock.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/NoLock.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/lock/NoLock.java index cfabc6374..dee0d6cd2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/NoLock.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/lock/NoLock.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread.lock; +package cn.hutool.v7.core.thread.lock; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/NoReadWriteLock.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/lock/NoReadWriteLock.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/NoReadWriteLock.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/lock/NoReadWriteLock.java index 4daa8fec8..4b0f13d19 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/NoReadWriteLock.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/lock/NoReadWriteLock.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread.lock; +package cn.hutool.v7.core.thread.lock; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/thread/lock/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/lock/package-info.java new file mode 100644 index 000000000..c98aed279 --- /dev/null +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/lock/package-info.java @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2013-2025 Hutool Team and hutool.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * 锁的实现 + * + * @author Looly + * + */ +package cn.hutool.v7.core.thread.lock; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/package-info.java index f0b2f1dbb..208a9baf3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/RateLimiter.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/RateLimiter.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/RateLimiter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/RateLimiter.java index 34373cd51..f2e82e1b6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/RateLimiter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/RateLimiter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread.ratelimiter; +package cn.hutool.v7.core.thread.ratelimiter; /** * 限流接口
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/RateLimiterConfig.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/RateLimiterConfig.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/RateLimiterConfig.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/RateLimiterConfig.java index 2116ffe3e..6dc690a60 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/RateLimiterConfig.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/RateLimiterConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread.ratelimiter; +package cn.hutool.v7.core.thread.ratelimiter; import java.time.Duration; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiter.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/SemaphoreRateLimiter.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/SemaphoreRateLimiter.java index 564a1c889..e8c9f3b3c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/SemaphoreRateLimiter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread.ratelimiter; +package cn.hutool.v7.core.thread.ratelimiter; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.Opt; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.Opt; import java.util.concurrent.Semaphore; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/TokenBucketRateLimiter.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/TokenBucketRateLimiter.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/TokenBucketRateLimiter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/TokenBucketRateLimiter.java index ecdbe5dec..0f447830e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/TokenBucketRateLimiter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/TokenBucketRateLimiter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread.ratelimiter; +package cn.hutool.v7.core.thread.ratelimiter; -import org.dromara.hutool.core.thread.NamedThreadFactory; +import cn.hutool.v7.core.thread.NamedThreadFactory; import java.io.Closeable; import java.util.concurrent.ScheduledExecutorService; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/package-info.java index bd1842e9f..707b9b9e5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/package-info.java @@ -27,4 +27,4 @@ * @author Looly * @since 6.0.0 */ -package org.dromara.hutool.core.thread.ratelimiter; +package cn.hutool.v7.core.thread.ratelimiter; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/NamedInheritableThreadLocal.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/threadlocal/NamedInheritableThreadLocal.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/NamedInheritableThreadLocal.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/threadlocal/NamedInheritableThreadLocal.java index 3ed4f3e60..00aaad881 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/NamedInheritableThreadLocal.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/threadlocal/NamedInheritableThreadLocal.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread.threadlocal; +package cn.hutool.v7.core.thread.threadlocal; /** * 带有Name标识的 {@link InheritableThreadLocal}，调用toString返回name diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/NamedThreadLocal.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/threadlocal/NamedThreadLocal.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/NamedThreadLocal.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/threadlocal/NamedThreadLocal.java index 2f880e0ca..944f4383b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/NamedThreadLocal.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/threadlocal/NamedThreadLocal.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread.threadlocal; +package cn.hutool.v7.core.thread.threadlocal; /** * 带有Name标识的 {@link ThreadLocal}，调用toString返回name diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/threadlocal/package-info.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/thread/threadlocal/package-info.java index 41b0bd364..55ae3f778 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/threadlocal/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/threadlocal/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.thread.threadlocal; +package cn.hutool.v7.core.thread.threadlocal; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/BeanTree.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/BeanTree.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/BeanTree.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/BeanTree.java index d2372f459..2a364d2e1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/BeanTree.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/BeanTree.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.func.SerBiConsumer; -import org.dromara.hutool.core.func.SerConsumer; -import org.dromara.hutool.core.func.SerFunction; -import org.dromara.hutool.core.func.SerPredicate; -import org.dromara.hutool.core.lang.Opt; -import org.dromara.hutool.core.stream.EasyStream; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.func.SerBiConsumer; +import cn.hutool.v7.core.func.SerConsumer; +import cn.hutool.v7.core.func.SerFunction; +import cn.hutool.v7.core.func.SerPredicate; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.stream.EasyStream; import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/HierarchyIterator.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/HierarchyIterator.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/HierarchyIterator.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/HierarchyIterator.java index 1efcc47d4..233d916c3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/HierarchyIterator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/HierarchyIterator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.stream.EasyStream; -import org.dromara.hutool.core.stream.StreamUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.stream.EasyStream; +import cn.hutool.v7.core.stream.StreamUtil; import java.util.Collection; import java.util.HashSet; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/LambdaTreeNodeConfig.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/LambdaTreeNodeConfig.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/LambdaTreeNodeConfig.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/LambdaTreeNodeConfig.java index 2d578695b..70b9358bd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/LambdaTreeNodeConfig.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/LambdaTreeNodeConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; -import org.dromara.hutool.core.func.LambdaUtil; -import org.dromara.hutool.core.func.SerFunction; +import cn.hutool.v7.core.func.LambdaUtil; +import cn.hutool.v7.core.func.SerFunction; import java.util.List; import java.util.Objects; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/MapTree.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/MapTree.java index 7dc665708..bfa113e57 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/MapTree.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; -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.text.CharUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.util.ObjUtil; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/Node.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/Node.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/Node.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/Node.java index baf614170..37761d086 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/Node.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/Node.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; -import org.dromara.hutool.core.comparator.CompareUtil; +import cn.hutool.v7.core.comparator.CompareUtil; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeBuilder.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeBuilder.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeBuilder.java index 1b4ee505d..6e869a18d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeBuilder.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; -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 cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.builder.Builder; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.tree.parser.NodeParser; +import cn.hutool.v7.core.util.ObjUtil; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNode.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNode.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNode.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNode.java index d2b930f0b..d45d9bc85 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNode.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNodeConfig.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNodeConfig.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNodeConfig.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNodeConfig.java index f7a2f3f9a..4316ac0bf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeNodeConfig.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNodeConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; import java.io.Serializable; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeUtil.java index 9c352eb47..acf891968 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/TreeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; -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 cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.tree.parser.DefaultNodeParser; +import cn.hutool.v7.core.tree.parser.NodeParser; +import cn.hutool.v7.core.util.ObjUtil; import java.util.ArrayList; import java.util.List; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/package-info.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/package-info.java index eadef0fd1..4e6c0b65c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/package-info.java @@ -27,4 +27,4 @@ * @author liangbaikai（https://gitee.com/liangbaikai00/） * @since 5.2.1 */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/DefaultNodeParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/parser/DefaultNodeParser.java similarity index 86% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/DefaultNodeParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/parser/DefaultNodeParser.java index eb03c230a..cfc1009b9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/DefaultNodeParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/parser/DefaultNodeParser.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree.parser; +package cn.hutool.v7.core.tree.parser; -import org.dromara.hutool.core.tree.TreeNode; -import org.dromara.hutool.core.tree.MapTree; -import org.dromara.hutool.core.map.MapUtil; +import cn.hutool.v7.core.tree.TreeNode; +import cn.hutool.v7.core.tree.MapTree; +import cn.hutool.v7.core.map.MapUtil; import java.util.Map; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/NodeParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/parser/NodeParser.java similarity index 91% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/NodeParser.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/parser/NodeParser.java index 5659e310d..05d8996b3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/NodeParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/parser/NodeParser.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree.parser; +package cn.hutool.v7.core.tree.parser; -import org.dromara.hutool.core.tree.MapTree; +import cn.hutool.v7.core.tree.MapTree; /** * 树节点解析器 可以参考{@link DefaultNodeParser} diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/parser/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/tree/parser/package-info.java index 15d45f5d8..2240c124e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/parser/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/parser/package-info.java @@ -17,4 +17,4 @@ /** * 节点解析器封装 */ -package org.dromara.hutool.core.tree.parser; +package cn.hutool.v7.core.tree.parser; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/util/BooleanUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/util/BooleanUtil.java index 637e56f2b..0c7944eb0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/util/BooleanUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.text.StrUtil; import java.lang.reflect.Type; import java.util.Set; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/ByteUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/util/ByteUtil.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/ByteUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/util/ByteUtil.java index ada42cb34..7bd71e16b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/ByteUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/util/ByteUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.io.buffer.FastByteBuffer; -import org.dromara.hutool.core.math.NumberUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.io.buffer.FastByteBuffer; +import cn.hutool.v7.core.math.NumberUtil; +import cn.hutool.v7.core.text.StrUtil; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/CharsetUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/util/CharsetUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/CharsetUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/util/CharsetUtil.java index 3c39f84d1..6dfb56638 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/CharsetUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/util/CharsetUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.io.CharsetDetector; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.io.CharsetDetector; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; import java.io.File; import java.io.InputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/EnumUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/util/EnumUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/EnumUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/util/EnumUtil.java index f7b1e731b..0096226d9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/EnumUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/util/EnumUtil.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.func.LambdaUtil; -import org.dromara.hutool.core.func.SerFunction; -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.TypeUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.func.LambdaUtil; +import cn.hutool.v7.core.func.SerFunction; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.reflect.FieldUtil; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.text.StrUtil; import java.lang.reflect.Field; import java.lang.reflect.Type; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/JNDIUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/util/JNDIUtil.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/JNDIUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/util/JNDIUtil.java index d1cba00fc..2d6a88c7b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/JNDIUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/util/JNDIUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.map.MapUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.map.MapUtil; import javax.naming.InitialContext; import javax.naming.NamingException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/JdkUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/util/JdkUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/JdkUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/util/JdkUtil.java index 14f637a06..4c0750761 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/JdkUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/util/JdkUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * JDK相关工具类，包括判断JDK版本等
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/util/ObjUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/util/ObjUtil.java index 59f9aa19c..ded323d9e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/util/ObjUtil.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -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.exception.HutoolException; -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.method.MethodUtil; -import org.dromara.hutool.core.text.CharSequenceUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.SerializeUtil; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.math.NumberUtil; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.text.CharSequenceUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.Serializable; import java.lang.reflect.Array; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/util/RandomUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/util/RandomUtil.java index 8456f27b0..894153553 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/util/RandomUtil.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -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.exception.HutoolException; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.selector.WeightObj; -import org.dromara.hutool.core.lang.selector.WeightRandomSelector; -import org.dromara.hutool.core.math.NumberUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.date.DateField; +import cn.hutool.v7.core.date.DateTime; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.selector.WeightObj; +import cn.hutool.v7.core.lang.selector.WeightRandomSelector; +import cn.hutool.v7.core.math.NumberUtil; +import cn.hutool.v7.core.text.StrUtil; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/util/RuntimeUtil.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/util/RuntimeUtil.java index afbaec2b9..e5a750f87 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/util/RuntimeUtil.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.data.id.Pid; -import org.dromara.hutool.core.text.CharUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.data.id.Pid; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.text.StrUtil; import java.io.File; import java.io.IOException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/util/SystemUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/util/SystemUtil.java index 960c64e4e..a51bd11cc 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/util/SystemUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.lang.Console; import java.util.Properties; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/util/package-info.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/util/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/util/package-info.java index 711d28203..180e7be79 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/util/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/xml/DocumentBuilderUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/xml/DocumentBuilderUtil.java similarity index 95% rename from hutool-core/src/main/java/org/dromara/hutool/core/xml/DocumentBuilderUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/xml/DocumentBuilderUtil.java index 58c31b8cf..8195ae126 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/xml/DocumentBuilderUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/xml/DocumentBuilderUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/xml/SAXParserFactoryUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/xml/SAXParserFactoryUtil.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/xml/SAXParserFactoryUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/xml/SAXParserFactoryUtil.java index f5da36c55..b851774c8 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/xml/SAXParserFactoryUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/xml/SAXParserFactoryUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; -import org.dromara.hutool.core.lang.loader.LazyFunLoader; -import org.dromara.hutool.core.lang.loader.Loader; +import cn.hutool.v7.core.lang.loader.LazyFunLoader; +import cn.hutool.v7.core.lang.loader.Loader; import javax.xml.parsers.SAXParserFactory; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/xml/UniversalNamespaceCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/xml/UniversalNamespaceCache.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/xml/UniversalNamespaceCache.java rename to hutool-core/src/main/java/cn/hutool/v7/core/xml/UniversalNamespaceCache.java index c1507c6b8..77051038c 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/xml/UniversalNamespaceCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/xml/UniversalNamespaceCache.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; -import org.dromara.hutool.core.map.BiMap; +import cn.hutool.v7.core.map.BiMap; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XPathUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XPathUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/xml/XPathUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/xml/XPathUtil.java index 6e58fe8a6..c3327322c 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XPathUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XPathUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XXEUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XXEUtil.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/xml/XXEUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/xml/XXEUtil.java index caeb55d6e..9cecaa34f 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XXEUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XXEUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.text.StrUtil; import org.xml.sax.XMLReader; import javax.xml.XMLConstants; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlConstants.java b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlConstants.java similarity index 96% rename from hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlConstants.java rename to hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlConstants.java index e3bcb048f..cf35c669c 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlConstants.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlConstants.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; -import org.dromara.hutool.core.text.CharUtil; +import cn.hutool.v7.core.text.CharUtil; import java.util.regex.Pattern; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlFeatures.java b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlFeatures.java similarity index 97% rename from hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlFeatures.java rename to hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlFeatures.java index 3a6340cc6..6dfe1f3d5 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlFeatures.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlFeatures.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; /** * XXE安全相关参数
      diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlMapper.java b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlMapper.java similarity index 92% rename from hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlMapper.java rename to hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlMapper.java index ed82a1808..1a28a6638 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlMapper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlMapper.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.bean.copier.CopyOptions; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.map.MapUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.bean.copier.CopyOptions; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.map.MapUtil; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlSaxReader.java b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlSaxReader.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlSaxReader.java rename to hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlSaxReader.java index 57bd28f79..74613ac80 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlSaxReader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlSaxReader.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.io.IORuntimeException; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.IORuntimeException; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlUtil.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlUtil.java rename to hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlUtil.java index b4341c4f1..0539717d3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlUtil.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.bean.copier.CopyOptions; -import org.dromara.hutool.core.exception.HutoolException; -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.regex.ReUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.bean.copier.CopyOptions; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.regex.ReUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.CharsetUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlWriter.java b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlWriter.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlWriter.java rename to hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlWriter.java index faa0671e6..3804b89cf 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlWriter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/xml/XmlWriter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharsetUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.util.ObjUtil; import org.w3c.dom.Node; import javax.xml.transform.*; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/xml/package-info.java b/hutool-core/src/main/java/cn/hutool/v7/core/xml/package-info.java similarity index 94% rename from hutool-core/src/main/java/org/dromara/hutool/core/xml/package-info.java rename to hutool-core/src/main/java/cn/hutool/v7/core/xml/package-info.java index c81c731ee..df7dc80ad 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/xml/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/xml/package-info.java @@ -20,4 +20,4 @@ * @author Looly * @since 6.0.0 */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/LockUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/LockUtil.java deleted file mode 100644 index 2b75edc9b..000000000 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/LockUtil.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright (c) 2013-2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.dromara.hutool.core.thread.lock; - -import java.util.concurrent.Semaphore; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import java.util.concurrent.locks.StampedLock; - -/** - * 锁相关工具 - * - * @author Looly - * @since 5.2.5 - */ -public class LockUtil { - - private static final NoLock NO_LOCK = new NoLock(); - - /** - * 创建{@link StampedLock}锁 - * - * @return {@link StampedLock}锁 - */ - public static StampedLock createStampLock() { - return new StampedLock(); - } - - /** - * 创建{@link ReentrantReadWriteLock}锁 - * - * @param fair 是否公平锁 - * @return {@link ReentrantReadWriteLock}锁 - */ - public static ReentrantReadWriteLock createReadWriteLock(final boolean fair) { - return new ReentrantReadWriteLock(fair); - } - - // region ----- SegmentLock - /** - * 创建分段锁（强引用），使用 ReentrantLock - * - * @param segments 分段数量，必须大于 0 - * @return 分段锁实例 - */ - public static SegmentLock createSegmentLock(final int segments) { - return SegmentLock.lock(segments); - } - - /** - * 创建分段读写锁（强引用），使用 ReentrantReadWriteLock - * - * @param segments 分段数量，必须大于 0 - * @return 分段读写锁实例 - */ - public static SegmentLock createSegmentReadWriteLock(final int segments) { - return SegmentLock.readWriteLock(segments); - } - - /** - * 创建分段信号量（强引用） - * - * @param segments 分段数量，必须大于 0 - * @param permits 每个信号量的许可数 - * @return 分段信号量实例 - */ - public static SegmentLock createSegmentSemaphore(final int segments, final int permits) { - return SegmentLock.semaphore(segments, permits); - } - - /** - * 创建弱引用分段锁，使用 ReentrantLock，懒加载 - * - * @param segments 分段数量，必须大于 0 - * @return 弱引用分段锁实例 - */ - public static SegmentLock createLazySegmentLock(final int segments) { - return SegmentLock.lazyWeakLock(segments); - } - - /** - * 根据 key 获取分段锁（强引用） - * - * @param segments 分段数量，必须大于 0 - * @param key 用于映射分段的 key - * @return 对应的 Lock 实例 - */ - public static Lock getSegmentLock(final int segments, final Object key) { - return SegmentLock.lock(segments).get(key); - } - - /** - * 根据 key 获取分段读锁（强引用） - * - * @param segments 分段数量，必须大于 0 - * @param key 用于映射分段的 key - * @return 对应的读锁实例 - */ - public static Lock getSegmentReadLock(final int segments, final Object key) { - return SegmentLock.readWriteLock(segments).get(key).readLock(); - } - - /** - * 根据 key 获取分段写锁（强引用） - * - * @param segments 分段数量，必须大于 0 - * @param key 用于映射分段的 key - * @return 对应的写锁实例 - */ - public static Lock getSegmentWriteLock(final int segments, final Object key) { - return SegmentLock.readWriteLock(segments).get(key).writeLock(); - } - - /** - * 根据 key 获取分段信号量（强引用） - * - * @param segments 分段数量，必须大于 0 - * @param permits 每个信号量的许可数 - * @param key 用于映射分段的 key - * @return 对应的 Semaphore 实例 - */ - public static Semaphore getSegmentSemaphore(final int segments, final int permits, final Object key) { - return SegmentLock.semaphore(segments, permits).get(key); - } - - /** - * 根据 key 获取弱引用分段锁，懒加载 - * - * @param segments 分段数量，必须大于 0 - * @param key 用于映射分段的 key - * @return 对应的 Lock 实例 - */ - public static Lock getLazySegmentLock(final int segments, final Object key) { - return SegmentLock.lazyWeakLock(segments).get(key); - } - // endregion - - /** - * 获取单例的无锁对象 - * - * @return {@link NoLock} - */ - public static NoLock getNoLock(){ - return NO_LOCK; - } -} diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/SegmentLock.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/SegmentLock.java deleted file mode 100644 index b4a158b0f..000000000 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/SegmentLock.java +++ /dev/null @@ -1,523 +0,0 @@ -/* - * Copyright (c) 2025 Hutool Team and hutool.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.dromara.hutool.core.thread.lock; - -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.lang.Assert; - -import java.lang.ref.Reference; -import java.lang.ref.ReferenceQueue; -import java.lang.ref.WeakReference; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.Semaphore; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReferenceArray; -import java.util.concurrent.locks.*; -import java.util.function.Supplier; - -/** - * 分段锁工具类，支持 Lock、Semaphore 和 ReadWriteLock 的分段实现。 - *

      - * 通过将锁分成多个段（segments），不同的操作可以并发使用不同的段，避免所有线程竞争同一把锁。 - * 相等的 key 保证映射到同一段锁（如 key1.equals(key2) 时，get(key1) 和 get(key2) 返回相同对象）。 - * 但不同 key 可能因哈希冲突映射到同一段，段数越少冲突概率越高。 - *

      - * 支持两种实现： - *

        - *
      • 强引用：创建时初始化所有段，内存占用稳定。
        • - *
      • 弱引用：懒加载，首次使用时创建段，未使用时可被垃圾回收，适合大量段但使用较少的场景。
        • - *
      - * - * @param - * @author Guava,dakuo - * @since 5.8.38 - */ -public abstract class SegmentLock { - - /** 当段数大于此阈值时，使用 ConcurrentMap 替代大数组以节省内存（适用于懒加载场景） */ - private static final int LARGE_LAZY_CUTOFF = 1024; - - private SegmentLock() {} - - /** - * 根据 key 获取对应的锁段，保证相同 key 返回相同对象。 - * - * @param key 非空 key - * @return 对应的锁段 - */ - public abstract L get(Object key); - - /** - * 根据索引获取锁段，索引范围为 [0, size())。 - * - * @param index 索引 - * @return 指定索引的锁段 - */ - public abstract L getAt(int index); - - /** - * 计算 key 对应的段索引。 - * - * @param key 非空 key - * @return 段索引 - */ - abstract int indexFor(Object key); - - /** - * 获取总段数。 - * - * @return 段数 - */ - public abstract int size(); - - /** - * 批量获取多个 key 对应的锁段列表，按索引升序排列，避免死锁。 - * - * @param keys 非空 key 集合 - * @return 锁段列表（可能有重复） - */ - @SuppressWarnings("unchecked") - public Iterable bulkGet(final Iterable keys) { - final List result = (List) ListUtil.of(keys); - if (CollUtil.isEmpty(result)) { - return Collections.emptyList(); - } - final int[] stripes = new int[result.size()]; - for (int i = 0; i < result.size(); i++) { - stripes[i] = indexFor(result.get(i)); - } - Arrays.sort(stripes); - int previousStripe = stripes[0]; - result.set(0, getAt(previousStripe)); - for (int i = 1; i < result.size(); i++) { - final int currentStripe = stripes[i]; - if (currentStripe == previousStripe) { - result.set(i, result.get(i - 1)); - } else { - result.set(i, getAt(currentStripe)); - previousStripe = currentStripe; - } - } - final List asStripes = (List) result; - return Collections.unmodifiableList(asStripes); - } - - // 静态工厂方法 - - /** - * 创建强引用的分段锁，所有段在创建时初始化。 - * - * @param stripes 段数 - * @param supplier 锁提供者 - * @param 锁类型 - * @return 分段锁实例 - */ - public static SegmentLock custom(final int stripes, final Supplier supplier) { - return new CompactSegmentLock<>(stripes, supplier); - } - - /** - * 创建强引用的可重入锁分段实例。 - * - * @param stripes 段数 - * @return 分段锁实例 - */ - public static SegmentLock lock(final int stripes) { - return custom(stripes, PaddedLock::new); - } - - /** - * 创建弱引用的可重入锁分段实例，懒加载。 - * - * @param stripes 段数 - * @return 分段锁实例 - */ - public static SegmentLock lazyWeakLock(final int stripes) { - return lazyWeakCustom(stripes, () -> new ReentrantLock(false)); - } - - /** - * 创建弱引用的分段锁，懒加载。 - * - * @param stripes 段数 - * @param supplier 锁提供者 - * @param 锁类型 - * @return 分段锁实例 - */ - private static SegmentLock lazyWeakCustom(final int stripes, final Supplier supplier) { - return stripes < LARGE_LAZY_CUTOFF - ? new SmallLazySegmentLock<>(stripes, supplier) - : new LargeLazySegmentLock<>(stripes, supplier); - } - - /** - * 创建强引用的信号量分段实例。 - * - * @param stripes 段数 - * @param permits 每个信号量的许可数 - * @return 分段信号量实例 - */ - public static SegmentLock semaphore(final int stripes, final int permits) { - return custom(stripes, () -> new PaddedSemaphore(permits)); - } - - /** - * 创建弱引用的信号量分段实例，懒加载。 - * - * @param stripes 段数 - * @param permits 每个信号量的许可数 - * @return 分段信号量实例 - */ - public static SegmentLock lazyWeakSemaphore(final int stripes, final int permits) { - return lazyWeakCustom(stripes, () -> new Semaphore(permits, false)); - } - - /** - * 创建强引用的读写锁分段实例。 - * - * @param stripes 段数 - * @return 分段读写锁实例 - */ - public static SegmentLock readWriteLock(final int stripes) { - return custom(stripes, ReentrantReadWriteLock::new); - } - - /** - * 创建弱引用的读写锁分段实例，懒加载。 - * - * @param stripes 段数 - * @return 分段读写锁实例 - */ - public static SegmentLock lazyWeakReadWriteLock(final int stripes) { - return lazyWeakCustom(stripes, WeakSafeReadWriteLock::new); - } - - // 内部实现类 - - /** - * 弱引用安全的读写锁实现，确保读锁和写锁持有对自身的强引用。 - */ - private static final class WeakSafeReadWriteLock implements ReadWriteLock { - private final ReadWriteLock delegate; - - WeakSafeReadWriteLock() { - this.delegate = new ReentrantReadWriteLock(); - } - - @Override - public Lock readLock() { - return new WeakSafeLock(delegate.readLock(), this); - } - - @Override - public Lock writeLock() { - return new WeakSafeLock(delegate.writeLock(), this); - } - } - - /** - * 弱引用安全的锁包装类，确保持有强引用。 - */ - private static final class WeakSafeLock implements Lock { - private final Lock delegate; - private final WeakSafeReadWriteLock strongReference; - - WeakSafeLock(final Lock delegate, final WeakSafeReadWriteLock strongReference) { - this.delegate = delegate; - this.strongReference = strongReference; - } - - @Override - public void lock() { - delegate.lock(); - } - - @Override - public void lockInterruptibly() throws InterruptedException { - delegate.lockInterruptibly(); - } - - @Override - public boolean tryLock() { - return delegate.tryLock(); - } - - @Override - public boolean tryLock(final long time, final java.util.concurrent.TimeUnit unit) throws InterruptedException { - return delegate.tryLock(time, unit); - } - - @Override - public void unlock() { - delegate.unlock(); - } - - @Override - public Condition newCondition() { - return new WeakSafeCondition(delegate.newCondition(), strongReference); - } - } - - /** - * 弱引用安全的条件包装类。 - */ - private static final class WeakSafeCondition implements Condition { - private final Condition delegate; - - /** 防止垃圾回收 */ - @SuppressWarnings("FieldCanBeLocal") - private final WeakSafeReadWriteLock strongReference; - - WeakSafeCondition(final Condition delegate, final WeakSafeReadWriteLock strongReference) { - this.delegate = delegate; - this.strongReference = strongReference; - } - - @Override - public void await() throws InterruptedException { - delegate.await(); - } - - @Override - public void awaitUninterruptibly() { - delegate.awaitUninterruptibly(); - } - - @Override - public long awaitNanos(final long nanosTimeout) throws InterruptedException { - return delegate.awaitNanos(nanosTimeout); - } - - @Override - public boolean await(final long time, final TimeUnit unit) throws InterruptedException { - return delegate.await(time, unit); - } - - @Override - public boolean awaitUntil(final Date deadline) throws InterruptedException { - return delegate.awaitUntil(deadline); - } - - @Override - public void signal() { - delegate.signal(); - } - - @Override - public void signalAll() { - delegate.signalAll(); - } - } - - /** - * 抽象基类，确保段数为 2 的幂。 - */ - private abstract static class PowerOfTwoSegmentLock extends SegmentLock { - final int mask; - - PowerOfTwoSegmentLock(final int stripes) { - Assert.isTrue(stripes > 0, "Segment count must be positive"); - this.mask = stripes > Integer.MAX_VALUE / 2 ? ALL_SET : ceilToPowerOfTwo(stripes) - 1; - } - - @Override - final int indexFor(final Object key) { - final int hash = smear(key.hashCode()); - return hash & mask; - } - - @Override - public final L get(final Object key) { - return getAt(indexFor(key)); - } - } - - /** - * 强引用实现，使用固定数组存储段。 - */ - private static class CompactSegmentLock extends PowerOfTwoSegmentLock { - private final Object[] array; - - CompactSegmentLock(final int stripes, final Supplier supplier) { - super(stripes); - Assert.isTrue(stripes <= Integer.MAX_VALUE / 2, "Segment count must be <= 2^30"); - this.array = new Object[mask + 1]; - for (int i = 0; i < array.length; i++) { - array[i] = supplier.get(); - } - } - - @SuppressWarnings("unchecked") - @Override - public L getAt(final int index) { - if (index < 0 || index >= array.length) { - throw new IllegalArgumentException("Index " + index + " out of bounds for size " + array.length); - } - return (L) array[index]; - } - - @Override - public int size() { - return array.length; - } - } - - /** - * 小规模弱引用实现，使用 AtomicReferenceArray 存储段。 - */ - private static class SmallLazySegmentLock extends PowerOfTwoSegmentLock { - final AtomicReferenceArray> locks; - final Supplier supplier; - final int size; - final ReferenceQueue queue = new ReferenceQueue<>(); - - SmallLazySegmentLock(final int stripes, final Supplier supplier) { - super(stripes); - this.size = (mask == ALL_SET) ? Integer.MAX_VALUE : mask + 1; - this.locks = new AtomicReferenceArray<>(size); - this.supplier = supplier; - } - - @Override - public L getAt(final int index) { - if (size != Integer.MAX_VALUE) { - Assert.isTrue(index >= 0 && index < size, "Index out of bounds"); - } - ArrayReference existingRef = locks.get(index); - L existing = existingRef == null ? null : existingRef.get(); - if (existing != null) { - return existing; - } - final L created = supplier.get(); - final ArrayReference newRef = new ArrayReference<>(created, index, queue); - while (!locks.compareAndSet(index, existingRef, newRef)) { - existingRef = locks.get(index); - existing = existingRef == null ? null : existingRef.get(); - if (existing != null) { - return existing; - } - } - drainQueue(); - return created; - } - - private void drainQueue() { - Reference ref; - while ((ref = queue.poll()) != null) { - final ArrayReference arrayRef = (ArrayReference) ref; - locks.compareAndSet(arrayRef.index, arrayRef, null); - } - } - - @Override - public int size() { - return size; - } - - private static final class ArrayReference extends WeakReference { - final int index; - - ArrayReference(final L referent, final int index, final ReferenceQueue queue) { - super(referent, queue); - this.index = index; - } - } - } - - /** - * 大规模弱引用实现，使用 ConcurrentMap 存储段。 - */ - private static class LargeLazySegmentLock extends PowerOfTwoSegmentLock { - final ConcurrentMap locks; - final Supplier supplier; - final int size; - - LargeLazySegmentLock(final int stripes, final Supplier supplier) { - super(stripes); - this.size = (mask == ALL_SET) ? Integer.MAX_VALUE : mask + 1; - this.locks = new ConcurrentHashMap<>(); - this.supplier = supplier; - } - - @Override - public L getAt(final int index) { - if (size != Integer.MAX_VALUE) { - Assert.isTrue(index >= 0 && index < size, "Index out of bounds"); - } - L existing = locks.get(index); - if (existing != null) { - return existing; - } - final L created = supplier.get(); - existing = locks.putIfAbsent(index, created); - return existing != null ? existing : created; - } - - @Override - public int size() { - return size; - } - } - - private static final int ALL_SET = ~0; - - private static int ceilToPowerOfTwo(final int x) { - return 1 << (Integer.SIZE - Integer.numberOfLeadingZeros(x - 1)); - } - - private static int smear(int hashCode) { - hashCode ^= (hashCode >>> 20) ^ (hashCode >>> 12); - return hashCode ^ (hashCode >>> 7) ^ (hashCode >>> 4); - } - - /** - * 填充锁，避免缓存行干扰。 - */ - private static class PaddedLock extends ReentrantLock { - private static final long serialVersionUID = 1L; - - long unused1; - long unused2; - long unused3; - - PaddedLock() { - super(false); - } - } - - /** - * 填充信号量，避免缓存行干扰。 - */ - private static class PaddedSemaphore extends Semaphore { - private static final long serialVersionUID = 1L; - - long unused1; - long unused2; - long unused3; - - PaddedSemaphore(final int permits) { - super(permits, false); - } - } - -} diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/AnnotatedElementUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/AnnotatedElementUtilTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/annotation/AnnotatedElementUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/annotation/AnnotatedElementUtilTest.java index d1b9b986f..dd0d8169c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/AnnotatedElementUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/AnnotatedElementUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/AnnotationUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/AnnotationUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/annotation/AnnotationUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/annotation/AnnotationUtilTest.java index 2af82a572..2e6edd22e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/AnnotationUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/AnnotationUtilTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; -import org.dromara.hutool.core.annotation.elements.CombinationAnnotatedElement; -import org.dromara.hutool.core.array.ArrayUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.annotation.elements.CombinationAnnotatedElement; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.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/org/dromara/hutool/core/annotation/CombinationAnnotatedElementTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/CombinationAnnotatedElementTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/annotation/CombinationAnnotatedElementTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/annotation/CombinationAnnotatedElementTest.java index cd08a9182..b780a141c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/CombinationAnnotatedElementTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/CombinationAnnotatedElementTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; -import org.dromara.hutool.core.annotation.elements.CombinationAnnotatedElement; +import cn.hutool.v7.core.annotation.elements.CombinationAnnotatedElement; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/GenericAnnotationMappingTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/GenericAnnotationMappingTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/annotation/GenericAnnotationMappingTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/annotation/GenericAnnotationMappingTest.java index f4c6ecf12..8660a022c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/GenericAnnotationMappingTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/GenericAnnotationMappingTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; import lombok.SneakyThrows; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElementTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/HierarchicalAnnotatedElementTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElementTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/annotation/HierarchicalAnnotatedElementTest.java index 66b8e459e..ad8afce76 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElementTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/HierarchicalAnnotatedElementTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; import lombok.SneakyThrows; -import org.dromara.hutool.core.annotation.elements.HierarchicalAnnotatedElements; +import cn.hutool.v7.core.annotation.elements.HierarchicalAnnotatedElements; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/MetaAnnotatedElementTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/MetaAnnotatedElementTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/annotation/MetaAnnotatedElementTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/annotation/MetaAnnotatedElementTest.java index 2984faa5a..403af4082 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/MetaAnnotatedElementTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/MetaAnnotatedElementTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; -import org.dromara.hutool.core.annotation.elements.MetaAnnotatedElement; +import cn.hutool.v7.core.annotation.elements.MetaAnnotatedElement; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollectorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/RepeatableAnnotationCollectorTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollectorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/annotation/RepeatableAnnotationCollectorTest.java index b64d25563..3dd03b85a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollectorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/RepeatableAnnotationCollectorTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; -import org.dromara.hutool.core.text.CharSequenceUtil; +import cn.hutool.v7.core.text.CharSequenceUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/RepeatableMetaAnnotatedElementTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/RepeatableMetaAnnotatedElementTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/annotation/RepeatableMetaAnnotatedElementTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/annotation/RepeatableMetaAnnotatedElementTest.java index 79bad4a42..fa616a992 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/RepeatableMetaAnnotatedElementTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/RepeatableMetaAnnotatedElementTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; -import org.dromara.hutool.core.annotation.elements.RepeatableMetaAnnotatedElement; -import org.dromara.hutool.core.collection.iter.IterUtil; +import cn.hutool.v7.core.annotation.elements.RepeatableMetaAnnotatedElement; +import cn.hutool.v7.core.collection.iter.IterUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMappingTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/ResolvedAnnotationMappingTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMappingTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/annotation/ResolvedAnnotationMappingTest.java index 666d6f9c1..47d3a20a8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMappingTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/ResolvedAnnotationMappingTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.annotation; +package cn.hutool.v7.core.annotation; import lombok.SneakyThrows; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/array/ArrayUtilTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/array/ArrayUtilTest.java index f432827e8..10828d602 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/array/ArrayUtilTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.array; +package cn.hutool.v7.core.array; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayWrapperTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/array/ArrayWrapperTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayWrapperTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/array/ArrayWrapperTest.java index cd71d8ed4..df014049a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayWrapperTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/array/ArrayWrapperTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.array; +package cn.hutool.v7.core.array; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/array/IssueIAQ16ETest.java b/hutool-core/src/test/java/cn/hutool/v7/core/array/IssueIAQ16ETest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/array/IssueIAQ16ETest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/array/IssueIAQ16ETest.java index 80a584fac..00e06f0ab 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/array/IssueIAQ16ETest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/array/IssueIAQ16ETest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.array; +package cn.hutool.v7.core.array; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanCopyMappingTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanCopyMappingTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanCopyMappingTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanCopyMappingTest.java index 00c57234c..106cfaecb 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanCopyMappingTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanCopyMappingTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.bean.copier.CopyOptions; -import org.dromara.hutool.core.map.MapUtil; +import cn.hutool.v7.core.bean.copier.CopyOptions; +import cn.hutool.v7.core.map.MapUtil; import lombok.Builder; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescFactoryTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanDescFactoryTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescFactoryTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanDescFactoryTest.java index 2ae9417a8..65d599d64 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescFactoryTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanDescFactoryTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import lombok.Data; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanDescTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanDescTest.java index e16a3f5dd..08becd3b1 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanDescTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.bean.path.AbstractBeanDesc; -import org.dromara.hutool.core.reflect.method.MethodInvoker; +import cn.hutool.v7.core.bean.path.AbstractBeanDesc; +import cn.hutool.v7.core.reflect.method.MethodInvoker; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanUtilTest.java index 28ea13b33..0bf3cc87f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanUtilTest.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import lombok.Data; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; -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.bean.path.BeanPath; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.map.Dict; -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 cn.hutool.v7.core.annotation.Alias; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.bean.copier.CopyOptions; +import cn.hutool.v7.core.bean.copier.ValueProvider; +import cn.hutool.v7.core.bean.path.BeanPath; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.map.Dict; +import cn.hutool.v7.core.map.MapBuilder; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.thread.ThreadUtil; +import cn.hutool.v7.core.util.ObjUtil; 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/org/dromara/hutool/core/bean/BeanWithReturnThisTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanWithReturnThisTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanWithReturnThisTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanWithReturnThisTest.java index 4fb8f48e2..249e6b3f8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanWithReturnThisTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/BeanWithReturnThisTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/DynaBeanTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/DynaBeanTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/DynaBeanTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/DynaBeanTest.java index 9ee6fd91a..2ac6a1f3b 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/DynaBeanTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/DynaBeanTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue1687Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue1687Test.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue1687Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue1687Test.java index f121a0c76..4a7a01137 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue1687Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue1687Test.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.annotation.Alias; -import org.dromara.hutool.core.bean.copier.CopyOptions; -import org.dromara.hutool.core.map.MapUtil; +import cn.hutool.v7.core.annotation.Alias; +import cn.hutool.v7.core.bean.copier.CopyOptions; +import cn.hutool.v7.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/org/dromara/hutool/core/bean/Issue2009Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2009Test.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2009Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2009Test.java index 51084a7f0..59a011a77 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2009Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2009Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2082Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2082Test.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2082Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2082Test.java index 335a7880b..38f348308 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2082Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2082Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2202Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2202Test.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2202Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2202Test.java index 8c03328b1..6dd2d6f76 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2202Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2202Test.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.bean.copier.CopyOptions; -import org.dromara.hutool.core.text.NamingCase; +import cn.hutool.v7.core.bean.copier.CopyOptions; +import cn.hutool.v7.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/org/dromara/hutool/core/bean/Issue2649Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2649Test.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2649Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2649Test.java index b0fd75f42..ee25a872a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2649Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2649Test.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.date.StopWatch; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.date.StopWatch; +import cn.hutool.v7.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/org/dromara/hutool/core/bean/Issue2683Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2683Test.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2683Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2683Test.java index 7da610342..9acf19adf 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue2683Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue2683Test.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.collection.CollUtil; +import cn.hutool.v7.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/org/dromara/hutool/core/bean/Issue3091Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3091Test.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3091Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3091Test.java index 640669953..fdc0f94f4 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3091Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3091Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3096Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3096Test.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3096Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3096Test.java index a0e5c6d84..4759d9720 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3096Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3096Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3346Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3346Test.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3346Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3346Test.java index fbe3ca354..5745b3832 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3346Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3346Test.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import lombok.Data; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.lang.Console; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3452Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3452Test.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3452Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3452Test.java index 3066dce25..65ee47095 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3452Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3452Test.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import lombok.Data; -import org.dromara.hutool.core.bean.copier.CopyOptions; +import cn.hutool.v7.core.bean.copier.CopyOptions; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3497Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3497Test.java similarity index 85% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3497Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3497Test.java index 9d15f5361..0a01f1990 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3497Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3497Test.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.bean.copier.CopyOptions; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.bean.copier.CopyOptions; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3645Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3645Test.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3645Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3645Test.java index 7eb5cfe08..08cd30b25 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3645Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3645Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import lombok.Data; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI5DDZXTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueI5DDZXTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI5DDZXTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueI5DDZXTest.java index ede397ade..ce82f2752 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI5DDZXTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueI5DDZXTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import lombok.Data; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI80FP4Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueI80FP4Test.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI80FP4Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueI80FP4Test.java index afa3bff66..3cb73766a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI80FP4Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueI80FP4Test.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import lombok.Data; -import org.dromara.hutool.core.bean.copier.CopyOptions; +import cn.hutool.v7.core.bean.copier.CopyOptions; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI8M38TTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueI8M38TTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI8M38TTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueI8M38TTest.java index 7f5f928dd..cea5a79cc 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI8M38TTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueI8M38TTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.hutool.core.bean.copier.CopyOptions; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.map.MapUtil; +import cn.hutool.v7.core.bean.copier.CopyOptions; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.map.MapUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI96JIPTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueI96JIPTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI96JIPTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueI96JIPTest.java index d8f982479..6ae90dbe4 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI96JIPTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueI96JIPTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import lombok.Data; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueIAYGT0Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueIAYGT0Test.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueIAYGT0Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueIAYGT0Test.java index 456d1cc8b..1cacf3aff 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueIAYGT0Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/IssueIAYGT0Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/PrimitiveMatchTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/PrimitiveMatchTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/PrimitiveMatchTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/PrimitiveMatchTest.java index a84970614..ed1cf2217 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/PrimitiveMatchTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/PrimitiveMatchTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/ProxyBeanTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/ProxyBeanTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/ProxyBeanTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/ProxyBeanTest.java index af516376a..65271eadb 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/ProxyBeanTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/ProxyBeanTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean; +package cn.hutool.v7.core.bean; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.reflect.JdkProxyUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.reflect.JdkProxyUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/copier/BeanCopierTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/copier/BeanCopierTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/copier/BeanCopierTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/copier/BeanCopierTest.java index 210cde086..7e4456faf 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/copier/BeanCopierTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/copier/BeanCopierTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier; +package cn.hutool.v7.core.bean.copier; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/copier/Issue3702Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/copier/Issue3702Test.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/copier/Issue3702Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/copier/Issue3702Test.java index b78361c35..faa432709 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/copier/Issue3702Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/copier/Issue3702Test.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.copier; +package cn.hutool.v7.core.bean.copier; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.util.ObjUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.util.ObjUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/path/BeanPathGetOrSetValueTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/path/BeanPathGetOrSetValueTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/path/BeanPathGetOrSetValueTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/path/BeanPathGetOrSetValueTest.java index fd35c7cc6..60ffd0c0f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/path/BeanPathGetOrSetValueTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/path/BeanPathGetOrSetValueTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.path; +package cn.hutool.v7.core.bean.path; import lombok.Data; -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 cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.lang.test.bean.ExamInfoDict; +import cn.hutool.v7.core.lang.test.bean.UserInfoDict; +import cn.hutool.v7.core.map.Dict; 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/org/dromara/hutool/core/bean/path/BeanPathTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/path/BeanPathTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/bean/path/BeanPathTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/bean/path/BeanPathTest.java index eadae091c..8fed802e6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/path/BeanPathTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/path/BeanPathTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.bean.path; +package cn.hutool.v7.core.bean.path; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/cache/CacheConcurrentTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/cache/CacheConcurrentTest.java similarity index 90% rename from hutool-core/src/test/java/org/dromara/hutool/core/cache/CacheConcurrentTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/cache/CacheConcurrentTest.java index 3f5e83644..5ebb1c11e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/cache/CacheConcurrentTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/cache/CacheConcurrentTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; -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 cn.hutool.v7.core.cache.impl.FIFOCache; +import cn.hutool.v7.core.cache.impl.LRUCache; +import cn.hutool.v7.core.cache.impl.WeakCache; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.thread.ConcurrencyTester; +import cn.hutool.v7.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/org/dromara/hutool/core/cache/CacheTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/cache/CacheTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/cache/CacheTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/cache/CacheTest.java index d3677a841..6e13e9e81 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/cache/CacheTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/cache/CacheTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; -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 cn.hutool.v7.core.cache.impl.TimedCache; +import cn.hutool.v7.core.date.DateUnit; +import cn.hutool.v7.core.thread.ThreadUtil; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/cache/FileCacheTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/cache/FileCacheTest.java similarity index 90% rename from hutool-core/src/test/java/org/dromara/hutool/core/cache/FileCacheTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/cache/FileCacheTest.java index 9f0f640f6..e77227490 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/cache/FileCacheTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/cache/FileCacheTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; -import org.dromara.hutool.core.cache.file.LFUFileCache; +import cn.hutool.v7.core.cache.file.LFUFileCache; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/cache/Issue3618Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/cache/Issue3618Test.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/cache/Issue3618Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/cache/Issue3618Test.java index 3e08ac60a..dc5635027 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/cache/Issue3618Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/cache/Issue3618Test.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; -import org.dromara.hutool.core.cache.impl.FIFOCache; +import cn.hutool.v7.core.cache.impl.FIFOCache; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/cache/Issue3686Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/cache/Issue3686Test.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/cache/Issue3686Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/cache/Issue3686Test.java index 327750e32..451927c8a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/cache/Issue3686Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/cache/Issue3686Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; public class Issue3686Test { public static void main(final String[] args) { diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/cache/IssueI8MEIXTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/cache/IssueI8MEIXTest.java similarity index 87% rename from hutool-core/src/test/java/org/dromara/hutool/core/cache/IssueI8MEIXTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/cache/IssueI8MEIXTest.java index a2f1c039f..550d32612 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/cache/IssueI8MEIXTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/cache/IssueI8MEIXTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; -import org.dromara.hutool.core.cache.impl.TimedCache; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.thread.ThreadUtil; +import cn.hutool.v7.core.cache.impl.TimedCache; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.thread.ThreadUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/cache/LRUCacheTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/cache/LRUCacheTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/cache/LRUCacheTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/cache/LRUCacheTest.java index bdea382ef..7d774ee2c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/cache/LRUCacheTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/cache/LRUCacheTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; -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 cn.hutool.v7.core.cache.impl.LRUCache; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.thread.ThreadUtil; +import cn.hutool.v7.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/org/dromara/hutool/core/cache/SimpleCacheTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/cache/SimpleCacheTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/cache/SimpleCacheTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/cache/SimpleCacheTest.java index b1cfd4028..6b5503230 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/cache/SimpleCacheTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/cache/SimpleCacheTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; -import org.dromara.hutool.core.thread.ConcurrencyTester; -import org.dromara.hutool.core.thread.ThreadUtil; +import cn.hutool.v7.core.thread.ConcurrencyTester; +import cn.hutool.v7.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/org/dromara/hutool/core/cache/WeakCacheTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/cache/WeakCacheTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/cache/WeakCacheTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/cache/WeakCacheTest.java index 0368e7199..181a9d28b 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/cache/WeakCacheTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/cache/WeakCacheTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.cache; +package cn.hutool.v7.core.cache; -import org.dromara.hutool.core.cache.impl.WeakCache; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.cache.impl.WeakCache; +import cn.hutool.v7.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/org/dromara/hutool/core/classloader/ClassLoaderUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/classloader/ClassLoaderUtilTest.java similarity index 74% rename from hutool-core/src/test/java/org/dromara/hutool/core/classloader/ClassLoaderUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/classloader/ClassLoaderUtilTest.java index f6de99319..90ff69ab7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/classloader/ClassLoaderUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/classloader/ClassLoaderUtilTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.classloader; +package cn.hutool.v7.core.classloader; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.map.Dict; -import org.dromara.hutool.core.reflect.ClassUtil; -import org.dromara.hutool.core.reflect.FieldUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.map.Dict; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.FieldUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -37,7 +37,7 @@ public class ClassLoaderUtilTest { @Test public void isPresentTest() { - final boolean present = ClassLoaderUtil.isPresent("org.dromara.hutool.core.classloader.ClassLoaderUtil"); + final boolean present = ClassLoaderUtil.isPresent("cn.hutool.v7.core.classloader.core.ClassLoaderUtil"); Assertions.assertTrue(present); } @@ -60,10 +60,10 @@ public class ClassLoaderUtilTest { @Test public void loadInnerClassTest() { - 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); + String name = ClassLoaderUtil.loadClass("cn.hutool.v7.core.classloader.ClassLoaderUtilTest.A").getName(); + Assertions.assertEquals("cn.hutool.v7.core.classloader.ClassLoaderUtilTest$A", name); + name = ClassLoaderUtil.loadClass("cn.hutool.v7.core.classloader.ClassLoaderUtilTest.A.B").getName(); + Assertions.assertEquals("cn.hutool.v7.core.classloader.ClassLoaderUtilTest$A$B", name); } @SuppressWarnings("unused") diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base32Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/Base32Test.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/Base32Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/Base32Test.java index e10703cf3..049711ea3 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base32Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/Base32Test.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; -import org.dromara.hutool.core.codec.binary.Base32; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.codec.binary.Base32; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base58Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/Base58Test.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/Base58Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/Base58Test.java index de048ae60..983ad1d5d 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base58Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/Base58Test.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; -import org.dromara.hutool.core.codec.binary.Base58; +import cn.hutool.v7.core.codec.binary.Base58; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base62Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/Base62Test.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/Base62Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/Base62Test.java index 5a576fa80..dc6b6c700 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base62Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/Base62Test.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; -import org.dromara.hutool.core.codec.binary.Base62; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.codec.binary.Base62; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base64Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/Base64Test.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/Base64Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/Base64Test.java index b28dcb5a0..a02a3f2ba 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Base64Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/Base64Test.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; -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 cn.hutool.v7.core.codec.binary.Base64; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/CaesarTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/CaesarTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/CaesarTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/CaesarTest.java index cc2c047a9..fbbfcc417 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/CaesarTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/CaesarTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/HashidsTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/HashidsTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/HashidsTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/HashidsTest.java index c3ef6cf42..ff5ae4590 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/HashidsTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/HashidsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/LuhnTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/LuhnTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/LuhnTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/LuhnTest.java index d184b6c09..4f76991fa 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/LuhnTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/LuhnTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/MorseTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/MorseTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/MorseTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/MorseTest.java index f08d198cc..7cd91d18f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/MorseTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/MorseTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/PercentCodecTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/PercentCodecTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/PercentCodecTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/PercentCodecTest.java index d90f8654e..4d26f70dc 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/PercentCodecTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/PercentCodecTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/PunyCodeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/PunyCodeTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/PunyCodeTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/PunyCodeTest.java index af1ca4c4e..a306a37a9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/PunyCodeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/PunyCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/RotTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/RotTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/RotTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/RotTest.java index 1a54cb41f..3af215152 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/RotTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/RotTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Z85Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/Z85Test.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/Z85Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/Z85Test.java index 0a93b1ba8..43df66d1e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/Z85Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/Z85Test.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec; +package cn.hutool.v7.core.codec; -import org.dromara.hutool.core.codec.binary.Z85Codec; +import cn.hutool.v7.core.codec.binary.Z85Codec; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/CityHashTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/CityHashTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/CityHashTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/CityHashTest.java index fbc8aae6c..2ce394012 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/CityHashTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/CityHashTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; -import org.dromara.hutool.core.util.ByteUtil; +import cn.hutool.v7.core.util.ByteUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/MurmurHashTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/MurmurHashTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/MurmurHashTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/MurmurHashTest.java index 33bbe10d8..c6928ecf8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/MurmurHashTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/MurmurHashTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; -import org.dromara.hutool.core.util.ByteUtil; +import cn.hutool.v7.core.util.ByteUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/SimhashTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/SimhashTest.java similarity index 89% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/SimhashTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/SimhashTest.java index d7f2170ca..8be6c5a26 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/SimhashTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/SimhashTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash; +package cn.hutool.v7.core.codec.hash; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.text.split.SplitUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.text.split.SplitUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHash128Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/metro/MetroHash128Test.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHash128Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/metro/MetroHash128Test.java index b8eec64a3..83fe70793 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHash128Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/metro/MetroHash128Test.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash.metro; +package cn.hutool.v7.core.codec.hash.metro; -import org.dromara.hutool.core.codec.binary.HexUtil; -import org.dromara.hutool.core.codec.Number128; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.codec.binary.HexUtil; +import cn.hutool.v7.core.codec.Number128; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHash64Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/metro/MetroHash64Test.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHash64Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/metro/MetroHash64Test.java index d089189fc..527da0548 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHash64Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/metro/MetroHash64Test.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash.metro; +package cn.hutool.v7.core.codec.hash.metro; -import org.dromara.hutool.core.codec.binary.HexUtil; -import org.dromara.hutool.core.util.ByteUtil; +import cn.hutool.v7.core.codec.binary.HexUtil; +import cn.hutool.v7.core.util.ByteUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHashTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/metro/MetroHashTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHashTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/metro/MetroHashTest.java index 9f62cd7f1..9039a3e3a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/codec/hash/metro/MetroHashTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/hash/metro/MetroHashTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.codec.hash.metro; +package cn.hutool.v7.core.codec.hash.metro; -import org.dromara.hutool.core.codec.binary.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 cn.hutool.v7.core.codec.binary.HexUtil; +import cn.hutool.v7.core.codec.hash.CityHash; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.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/org/dromara/hutool/core/collection/CollStreamUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/CollStreamUtilTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/CollStreamUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/CollStreamUtilTest.java index 98c07c562..79993a515 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/CollStreamUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/CollStreamUtilTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; import lombok.AllArgsConstructor; import lombok.Data; import lombok.ToString; -import org.dromara.hutool.core.map.MapUtil; +import cn.hutool.v7.core.map.MapUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/CollUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/CollUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/CollUtilTest.java index 3c0591782..fdd7b6181 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/CollUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/CollUtilTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; import lombok.*; -import org.dromara.hutool.core.collection.iter.IterUtil; -import org.dromara.hutool.core.collection.set.SetUtil; -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 cn.hutool.v7.core.collection.iter.IterUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.comparator.CompareUtil; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.map.Dict; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/Issue3308Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/Issue3308Test.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/Issue3308Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/Issue3308Test.java index a8eb75cda..718751c8a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/Issue3308Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/Issue3308Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/ListUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/ListUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/ListUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/ListUtilTest.java index a78681e47..af5d05193 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/ListUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/ListUtilTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; import lombok.AllArgsConstructor; import lombok.Data; -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 cn.hutool.v7.core.date.StopWatch; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.lang.page.PageInfo; +import cn.hutool.v7.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/org/dromara/hutool/core/collection/MapProxyTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/MapProxyTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/MapProxyTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/MapProxyTest.java index fe292a9ed..f0a223a1f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/MapProxyTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/MapProxyTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; -import org.dromara.hutool.core.map.MapProxy; +import cn.hutool.v7.core.map.MapProxy; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/MemorySafeLinkedBlockingQueueTest.java similarity index 87% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/MemorySafeLinkedBlockingQueueTest.java index d8bd0def4..043aab6e2 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/MemorySafeLinkedBlockingQueueTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; -import org.dromara.hutool.core.collection.queue.MemorySafeLinkedBlockingQueue; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.collection.queue.MemorySafeLinkedBlockingQueue; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/PartitionIterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/PartitionIterTest.java similarity index 84% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/PartitionIterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/PartitionIterTest.java index 0905960da..3debd4bc6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/PartitionIterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/PartitionIterTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; -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 cn.hutool.v7.core.collection.iter.LineIter; +import cn.hutool.v7.core.collection.iter.PartitionIter; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.array.ArrayUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/RingIndexUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/RingIndexUtilTest.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/RingIndexUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/RingIndexUtilTest.java index a6a775d99..8f214814a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/RingIndexUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/RingIndexUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; -import org.dromara.hutool.core.thread.ThreadUtil; +import cn.hutool.v7.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/UniqueKeySetTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/UniqueKeySetTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/UniqueKeySetTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/UniqueKeySetTest.java index a15f76570..935d5f86c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/UniqueKeySetTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/UniqueKeySetTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection; +package cn.hutool.v7.core.collection; import lombok.AllArgsConstructor; import lombok.Data; -import org.dromara.hutool.core.collection.set.UniqueKeySet; +import cn.hutool.v7.core.collection.set.UniqueKeySet; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/ArrayIterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/ArrayIterTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/ArrayIterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/ArrayIterTest.java index af2372bc3..3e0030b9b 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/ArrayIterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/ArrayIterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/CopiedIterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/CopiedIterTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/CopiedIterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/CopiedIterTest.java index 72d164ed4..033f86029 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/CopiedIterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/CopiedIterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/EnumerationIterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/EnumerationIterTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/EnumerationIterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/EnumerationIterTest.java index 95aab116e..e956e8594 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/EnumerationIterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/EnumerationIterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/FilterIterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/FilterIterTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/FilterIterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/FilterIterTest.java index dde2067ba..0ab0b2eda 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/FilterIterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/FilterIterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IterChainTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/IterChainTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IterChainTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/IterChainTest.java index dbc931af7..31c8529ee 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IterChainTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/IterChainTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IterUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/IterUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IterUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/IterUtilTest.java index 38c1d44e5..8429eab9c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IterUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/IterUtilTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import lombok.AllArgsConstructor; import lombok.Data; import lombok.RequiredArgsConstructor; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.set.SetUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.set.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.w3c.dom.NodeList; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IteratorEnumerationTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/IteratorEnumerationTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IteratorEnumerationTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/IteratorEnumerationTest.java index b520dd698..0c0869583 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/IteratorEnumerationTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/IteratorEnumerationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/LineIterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/LineIterTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/LineIterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/LineIterTest.java index 1285991f0..e0353d14f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/LineIterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/LineIterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/PartitionIterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/PartitionIterTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/PartitionIterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/PartitionIterTest.java index cf2d52e15..97aea4ee9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/PartitionIterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/PartitionIterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/TransIterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/TransIterTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/TransIterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/TransIterTest.java index 2df86cdc5..69c6e9d0c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/iter/TransIterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/iter/TransIterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.iter; +package cn.hutool.v7.core.collection.iter; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/partition/PartitionTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/partition/PartitionTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/collection/partition/PartitionTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/collection/partition/PartitionTest.java index cd3294d82..2a5517176 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/partition/PartitionTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/partition/PartitionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.collection.partition; +package cn.hutool.v7.core.collection.partition; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/CompareUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/CompareUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/comparator/CompareUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/comparator/CompareUtilTest.java index fc09887e9..425e83c80 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/CompareUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/CompareUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/IndexedComparatorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/IndexedComparatorTest.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/comparator/IndexedComparatorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/comparator/IndexedComparatorTest.java index f4e9937ff..14f9830f4 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/IndexedComparatorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/IndexedComparatorTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; import lombok.AllArgsConstructor; import lombok.Data; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.date.StopWatch; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.date.StopWatch; +import cn.hutool.v7.core.lang.Console; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/Issue3259Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/Issue3259Test.java similarity index 88% rename from hutool-core/src/test/java/org/dromara/hutool/core/comparator/Issue3259Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/comparator/Issue3259Test.java index f675cc1c2..4b8b613a8 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/Issue3259Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/Issue3259Test.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; import lombok.AllArgsConstructor; import lombok.ToString; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.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/org/dromara/hutool/core/comparator/IssueI81N3HTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/IssueI81N3HTest.java similarity index 82% rename from hutool-core/src/test/java/org/dromara/hutool/core/comparator/IssueI81N3HTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/comparator/IssueI81N3HTest.java index 4d01ba9e8..34b9df6f7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/IssueI81N3HTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/IssueI81N3HTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.resource.ResourceUtil; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/PropertyComparatorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/PropertyComparatorTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/comparator/PropertyComparatorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/comparator/PropertyComparatorTest.java index 728910a39..5ba2631ae 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/PropertyComparatorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/PropertyComparatorTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.core.collection.ListUtil; import lombok.AllArgsConstructor; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/VersionComparatorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/VersionComparatorTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/comparator/VersionComparatorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/comparator/VersionComparatorTest.java index 6462331f8..6e3cf7434 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/VersionComparatorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/VersionComparatorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/WindowsExplorerStringComparatorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/WindowsExplorerStringComparatorTest.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/comparator/WindowsExplorerStringComparatorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/comparator/WindowsExplorerStringComparatorTest.java index c8c1039a9..df8307b20 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/comparator/WindowsExplorerStringComparatorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/comparator/WindowsExplorerStringComparatorTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.comparator; +package cn.hutool.v7.core.comparator; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.lang.Assert; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/compress/Issue3018Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/compress/Issue3018Test.java similarity index 87% rename from hutool-core/src/test/java/org/dromara/hutool/core/compress/Issue3018Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/compress/Issue3018Test.java index a57d1abaf..3f78f3571 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/compress/Issue3018Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/compress/Issue3018Test.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueI3UZ28Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/compress/IssueI3UZ28Test.java similarity index 90% rename from hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueI3UZ28Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/compress/IssueI3UZ28Test.java index 59ea7ef24..e1dd9ad90 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueI3UZ28Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/compress/IssueI3UZ28Test.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.io.file.FileUtil; +import cn.hutool.v7.core.io.file.FileUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueI5DRU0Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/compress/IssueI5DRU0Test.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueI5DRU0Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/compress/IssueI5DRU0Test.java index 15728c97c..82fbe037e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueI5DRU0Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/compress/IssueI5DRU0Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueIAGYDGTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/compress/IssueIAGYDGTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueIAGYDGTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/compress/IssueIAGYDGTest.java index e682454fb..a7ba38735 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueIAGYDGTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/compress/IssueIAGYDGTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipReaderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/compress/ZipReaderTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipReaderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/compress/ZipReaderTest.java index 32dc54ea3..0a34a2942 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipReaderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/compress/ZipReaderTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.lang.Console; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/compress/ZipUtilTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/compress/ZipUtilTest.java index 0f42cf607..7c1e8d70c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/compress/ZipUtilTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.io.IORuntimeException; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.io.file.PathUtil; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.ByteUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.io.file.PathUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ByteUtil; +import cn.hutool.v7.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-core/src/test/java/org/dromara/hutool/core/compress/ZipWriterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/compress/ZipWriterTest.java similarity index 84% rename from hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipWriterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/compress/ZipWriterTest.java index ccafc544b..803755c7e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/compress/ZipWriterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/compress/ZipWriterTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.compress; +package cn.hutool.v7.core.compress; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.io.resource.FileResource; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.io.resource.FileResource; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/BasicTypeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/BasicTypeTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/BasicTypeTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/BasicTypeTest.java index f416db9b7..334d0d087 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/BasicTypeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/BasicTypeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/CastUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/CastUtilTest.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/CastUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/CastUtilTest.java index bc1fd839a..f159dbbc9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/CastUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/CastUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.set.SetUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.set.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/CompositeConverterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/CompositeConverterTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/CompositeConverterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/CompositeConverterTest.java index d28058f76..80c40505b 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/CompositeConverterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/CompositeConverterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; import lombok.Data; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertKBeanTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertKBeanTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertKBeanTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertKBeanTest.java index 985f0f5bd..c593a31ed 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertKBeanTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertKBeanTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.reflect.kotlin.TestKBean; +import cn.hutool.v7.core.reflect.kotlin.TestKBean; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertOtherTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertOtherTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertOtherTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertOtherTest.java index 76e4d5acd..0bdc87cef 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertOtherTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertOtherTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertTest.java index bbed8a357..b5cf8b0cf 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.codec.binary.HexUtil; -import org.dromara.hutool.core.collection.set.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 cn.hutool.v7.core.codec.binary.HexUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.date.DateException; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.reflect.TypeReference; +import cn.hutool.v7.core.util.ByteUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; @@ -329,7 +329,7 @@ public class ConvertTest { @Test public void toClassTest(){ - final Class convert = ConvertUtil.convert(Class.class, "org.dromara.hutool.core.convert.ConvertTest.Product"); + final Class convert = ConvertUtil.convert(Class.class, "cn.hutool.v7.core.convert.ConvertTest.Product"); Assertions.assertSame(Product.class, convert); } diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToArrayTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToArrayTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToArrayTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToArrayTest.java index be91c1855..d1bb33fc7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToArrayTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToArrayTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.convert.impl.ArrayConverter; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.convert.impl.ArrayConverter; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.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/org/dromara/hutool/core/convert/ConvertToBeanTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToBeanTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToBeanTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToBeanTest.java index 4644f39df..74239f050 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToBeanTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToBeanTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.bean.BeanUtilTest.SubPerson; -import org.dromara.hutool.core.map.CaseInsensitiveMap; -import org.dromara.hutool.core.reflect.TypeReference; +import cn.hutool.v7.core.bean.BeanUtilTest.SubPerson; +import cn.hutool.v7.core.map.CaseInsensitiveMap; +import cn.hutool.v7.core.reflect.TypeReference; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToBooleanTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToBooleanTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToBooleanTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToBooleanTest.java index e9ae2cf69..741f95006 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToBooleanTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToBooleanTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToCollectionTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToCollectionTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToCollectionTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToCollectionTest.java index 09e289e36..199a94cc9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToCollectionTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToCollectionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.reflect.TypeReference; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.reflect.TypeReference; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToNumberTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToNumberTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToNumberTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToNumberTest.java index 1b87e68ce..ee06662c7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToNumberTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToNumberTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.date.DateUtil; +import cn.hutool.v7.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToSBCAndDBCTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToSBCAndDBCTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToSBCAndDBCTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToSBCAndDBCTest.java index ebdf6d511..bb4303815 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/ConvertToSBCAndDBCTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToSBCAndDBCTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/DateConvertTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/DateConvertTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/DateConvertTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/DateConvertTest.java index 03f88b1de..f4350600c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/DateConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/DateConvertTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.date.DateUtil; +import cn.hutool.v7.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/EntryConvertTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/EntryConvertTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/EntryConvertTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/EntryConvertTest.java index 9cb68b0ef..64cc3a7d2 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/EntryConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/EntryConvertTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/EnumConvertTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/EnumConvertTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/EnumConvertTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/EnumConvertTest.java index 4c61488f9..b01bf60c0 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/EnumConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/EnumConvertTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/Issue3105Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/Issue3105Test.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/Issue3105Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/Issue3105Test.java index 314689324..7cb196a97 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/Issue3105Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/Issue3105Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/IssueI7WJHHTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/IssueI7WJHHTest.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/IssueI7WJHHTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/IssueI7WJHHTest.java index 6934756c5..2eaf6dc45 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/IssueI7WJHHTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/IssueI7WJHHTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.lang.Opt; +import cn.hutool.v7.core.lang.Opt; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/IssueIALV38Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/IssueIALV38Test.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/IssueIALV38Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/IssueIALV38Test.java index 02ec42ced..0541383f5 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/IssueIALV38Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/IssueIALV38Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/MapConvertTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/MapConvertTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/MapConvertTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/MapConvertTest.java index 485511df6..0810e82ac 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/MapConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/MapConvertTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.map.MapBuilder; +import cn.hutool.v7.core.map.MapBuilder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/NumberConverterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/NumberConverterTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/NumberConverterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/NumberConverterTest.java index f2f8341bc..4ab83a8ec 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/NumberConverterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/NumberConverterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.convert.impl.NumberConverter; +import cn.hutool.v7.core.convert.impl.NumberConverter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/PrimitiveConvertTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/PrimitiveConvertTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/PrimitiveConvertTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/PrimitiveConvertTest.java index f434c66be..bc3eda5a8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/PrimitiveConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/PrimitiveConvertTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.convert.impl.PrimitiveConverter; +import cn.hutool.v7.core.convert.impl.PrimitiveConverter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/StringConvertTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/StringConvertTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/StringConvertTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/StringConvertTest.java index 7690bdab1..49d7200f7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/StringConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/StringConvertTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/TemporalAccessorConverterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/TemporalAccessorConverterTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/TemporalAccessorConverterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/TemporalAccessorConverterTest.java index 40d6dbed3..4d77a2e5f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/TemporalAccessorConverterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/TemporalAccessorConverterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.date.DateUtil; +import cn.hutool.v7.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/convert/XMLGregorianCalendarConverterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/XMLGregorianCalendarConverterTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/convert/XMLGregorianCalendarConverterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/convert/XMLGregorianCalendarConverterTest.java index 1d9e42130..be4505852 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/convert/XMLGregorianCalendarConverterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/XMLGregorianCalendarConverterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.convert; +package cn.hutool.v7.core.convert; -import org.dromara.hutool.core.date.DateUtil; +import cn.hutool.v7.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/CoordinateUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/CoordinateUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/CoordinateUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/CoordinateUtilTest.java index 445294994..cf6b9eda9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/CoordinateUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/CoordinateUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/CreditCodeUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/CreditCodeUtilTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/CreditCodeUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/CreditCodeUtilTest.java index fcd043727..150d8d0f1 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/CreditCodeUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/CreditCodeUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -import org.dromara.hutool.core.data.CreditCodeUtil; +import cn.hutool.v7.core.data.CreditCodeUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/IdcardUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/IdcardUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/IdcardUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/IdcardUtilTest.java index 736f19ee7..ea6d2ee17 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/IdcardUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/IdcardUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -import org.dromara.hutool.core.date.DateTime; -import org.dromara.hutool.core.date.DateUtil; +import cn.hutool.v7.core.date.DateTime; +import cn.hutool.v7.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/Issue3081Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/Issue3081Test.java similarity index 88% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/Issue3081Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/Issue3081Test.java index 4b13fcbb9..7f34536fc 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/Issue3081Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/Issue3081Test.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -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 cn.hutool.v7.core.date.DateField; +import cn.hutool.v7.core.date.DateRange; +import cn.hutool.v7.core.date.DateTime; +import cn.hutool.v7.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/IssueI7XMYWTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/IssueI7XMYWTest.java similarity index 88% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/IssueI7XMYWTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/IssueI7XMYWTest.java index 8882b4bea..1db4d423b 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/IssueI7XMYWTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/IssueI7XMYWTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -import org.dromara.hutool.core.date.DateTime; -import org.dromara.hutool.core.date.DateUtil; +import cn.hutool.v7.core.date.DateTime; +import cn.hutool.v7.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/IssueIBP6T1Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/IssueIBP6T1Test.java similarity index 88% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/IssueIBP6T1Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/IssueIBP6T1Test.java index 5deb8fa0a..370cdfe01 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/IssueIBP6T1Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/IssueIBP6T1Test.java @@ -1,4 +1,4 @@ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/MaskingUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/MaskingUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/MaskingUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/MaskingUtilTest.java index c2ff8d499..6f8411b26 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/MaskingUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/MaskingUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -import org.dromara.hutool.core.data.masking.MaskingManager; -import org.dromara.hutool.core.data.masking.MaskingType; +import cn.hutool.v7.core.data.masking.MaskingManager; +import cn.hutool.v7.core.data.masking.MaskingType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/PasswdStrengthTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/PasswdStrengthTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/PasswdStrengthTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/PasswdStrengthTest.java index 7c7c32c93..e805d1200 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/PasswdStrengthTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/PasswdStrengthTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/PhoneUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/PhoneUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/PhoneUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/PhoneUtilTest.java index 138b2e712..918feda81 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/PhoneUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/PhoneUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; -import org.dromara.hutool.core.data.PhoneUtil; +import cn.hutool.v7.core.data.PhoneUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/VinTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/VinTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/VinTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/VinTest.java index b81594aff..319548638 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/VinTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/VinTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.data; +package cn.hutool.v7.core.data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/id/NanoIdTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/id/NanoIdTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/id/NanoIdTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/id/NanoIdTest.java index 160e51618..8f3d08ecb 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/id/NanoIdTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/id/NanoIdTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.data.id.NanoId; +import cn.hutool.v7.core.data.id.NanoId; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/id/ObjectIdTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/id/ObjectIdTest.java similarity index 89% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/id/ObjectIdTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/id/ObjectIdTest.java index cf95138e3..5b2b470fe 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/id/ObjectIdTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/id/ObjectIdTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.data.id.ObjectId; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.data.id.ObjectId; +import cn.hutool.v7.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/org/dromara/hutool/core/data/id/SeataSnowflakeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/id/SeataSnowflakeTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/id/SeataSnowflakeTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/id/SeataSnowflakeTest.java index 4aade0e3b..d830a63ec 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/id/SeataSnowflakeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/id/SeataSnowflakeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/data/id/SnowflakeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/id/SnowflakeTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/id/SnowflakeTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/id/SnowflakeTest.java index 96ec2a19e..14d33044e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/id/SnowflakeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/id/SnowflakeTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.collection.set.ConcurrentHashSet; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.lang.tuple.Pair; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.thread.ThreadUtil; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.collection.set.ConcurrentHashSet; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.lang.tuple.Pair; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.thread.ThreadUtil; +import cn.hutool.v7.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/org/dromara/hutool/core/data/id/UUIDTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/id/UUIDTest.java similarity index 86% rename from hutool-core/src/test/java/org/dromara/hutool/core/data/id/UUIDTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/data/id/UUIDTest.java index 5bdc942ec..a2fc146c8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/data/id/UUIDTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/id/UUIDTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.data.id; +package cn.hutool.v7.core.data.id; -import org.dromara.hutool.core.collection.set.ConcurrentHashSet; -import org.dromara.hutool.core.thread.ThreadUtil; +import cn.hutool.v7.core.collection.set.ConcurrentHashSet; +import cn.hutool.v7.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/BetweenFormatterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/BetweenFormatterTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/BetweenFormatterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/BetweenFormatterTest.java index fda5db4ae..31e5025b8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/BetweenFormatterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/BetweenFormatterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/CalendarUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/CalendarUtilTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/CalendarUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/CalendarUtilTest.java index d6169a3ac..3ecfeed34 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/CalendarUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/CalendarUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.lang.Console; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/ChineseDateTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/ChineseDateTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/ChineseDateTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/ChineseDateTest.java index 6133c1797..8779708da 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/ChineseDateTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/ChineseDateTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.date.chinese.ChineseDate; -import org.dromara.hutool.core.date.chinese.ChineseDateFormat; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.date.chinese.ChineseDate; +import cn.hutool.v7.core.date.chinese.ChineseDateFormat; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateBetweenTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateBetweenTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/DateBetweenTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/DateBetweenTest.java index 96ad839cc..4dbb6f1bf 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateBetweenTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateBetweenTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateBuilderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateBuilderTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/DateBuilderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/DateBuilderTest.java index 46ccdeebc..e4e8ddb7d 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateBuilderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateBuilderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateFieldTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateFieldTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/DateFieldTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/DateFieldTest.java index 3794e9d72..2625c75c7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateFieldTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateFieldTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateModifierTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateModifierTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/DateModifierTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/DateModifierTest.java index 968d52c81..05b3a0f22 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateModifierTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateModifierTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateRangeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateRangeTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/DateRangeTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/DateRangeTest.java index a1f18ebf5..b1b85887f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateRangeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateRangeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateTimeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateTimeTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/DateTimeTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/DateTimeTest.java index 92ff418bf..32f49e751 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateTimeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateTimeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateUtilTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/DateUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/DateUtilTest.java index eaa165a36..52ba3a133 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/DateUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/DateUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.date.format.FastDateFormat; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.date.format.FastDateFormat; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/GanzhiTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/GanzhiTest.java similarity index 90% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/GanzhiTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/GanzhiTest.java index ef927f823..871dc3849 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/GanzhiTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/GanzhiTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.date.chinese.ChineseDate; -import org.dromara.hutool.core.date.chinese.ChineseDateFormat; -import org.dromara.hutool.core.date.chinese.GanZhi; +import cn.hutool.v7.core.date.chinese.ChineseDate; +import cn.hutool.v7.core.date.chinese.ChineseDateFormat; +import cn.hutool.v7.core.date.chinese.GanZhi; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue2612Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue2612Test.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/Issue2612Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/Issue2612Test.java index 51b02f4a5..593312f5c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue2612Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue2612Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue2981Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue2981Test.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/Issue2981Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/Issue2981Test.java index 7a64eb0f9..f521da184 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue2981Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue2981Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3011Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3011Test.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3011Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3011Test.java index aa3188147..d99d19cba 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3011Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3011Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3301Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3301Test.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3301Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3301Test.java index a07fec1f4..d29c577bd 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3301Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3301Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3348Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3348Test.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3348Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3348Test.java index 2752ff125..6ed9d0bb0 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3348Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3348Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3713Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3713Test.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3713Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3713Test.java index 9b7ae7350..2984eba1f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3713Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3713Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3798Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3798Test.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3798Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3798Test.java index 151c3557d..0e72f8968 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/Issue3798Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/Issue3798Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI7QI6RTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/IssueI7QI6RTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI7QI6RTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/IssueI7QI6RTest.java index 1fa312912..1dfbb6aa0 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI7QI6RTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/IssueI7QI6RTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.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/org/dromara/hutool/core/date/IssueI82Y1LTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/IssueI82Y1LTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI82Y1LTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/IssueI82Y1LTest.java index 706efb945..c0c8ce77e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI82Y1LTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/IssueI82Y1LTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI8IUTBTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/IssueI8IUTBTest.java similarity index 90% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI8IUTBTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/IssueI8IUTBTest.java index 2e3ebdac1..4127066a3 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI8IUTBTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/IssueI8IUTBTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.lang.Console; import org.junit.jupiter.api.Test; import java.util.Date; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI9C2D4Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/IssueI9C2D4Test.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI9C2D4Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/IssueI9C2D4Test.java index eb28cb836..d1cca521e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueI9C2D4Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/IssueI9C2D4Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueIB8OFSTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/IssueIB8OFSTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/IssueIB8OFSTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/IssueIB8OFSTest.java index b9f470a7b..aaabebf1a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueIB8OFSTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/IssueIB8OFSTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueIBB6I5Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/IssueIBB6I5Test.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/IssueIBB6I5Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/IssueIBB6I5Test.java index 85df8d104..39d3e07be 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/IssueIBB6I5Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/IssueIBB6I5Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/MonthTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/MonthTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/MonthTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/MonthTest.java index 809705b7d..af79befa1 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/MonthTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/MonthTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/QuarterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/QuarterTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/QuarterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/QuarterTest.java index c02cc2a2a..c3eec41bc 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/QuarterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/QuarterTest.java @@ -1,4 +1,4 @@ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/StopWatchTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/StopWatchTest.java similarity index 89% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/StopWatchTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/StopWatchTest.java index 7da0c5ee0..76c5244a9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/StopWatchTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/StopWatchTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.thread.ThreadUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.thread.ThreadUtil; import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/TemporalAccessorUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/TemporalAccessorUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/TemporalAccessorUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/TemporalAccessorUtilTest.java index 34e96c7a8..fd97c5afc 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/TemporalAccessorUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/TemporalAccessorUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/TimeUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/TimeUtilTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/TimeUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/TimeUtilTest.java index a42859c73..d2270224b 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/TimeUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/TimeUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.lang.Console; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/TimeZoneTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/TimeZoneTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/TimeZoneTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/TimeZoneTest.java index f62a645d8..c538c91e8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/TimeZoneTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/TimeZoneTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import java.util.TimeZone; -import org.dromara.hutool.core.date.format.FastDateFormat; +import cn.hutool.v7.core.date.format.FastDateFormat; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/WeekTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/WeekTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/WeekTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/WeekTest.java index ee15aeb8f..8007645b9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/WeekTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/WeekTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/ZodiacTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/ZodiacTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/ZodiacTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/ZodiacTest.java index ae6e4742a..d9ab4f98f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/ZodiacTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/ZodiacTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/ZoneUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/ZoneUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/ZoneUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/ZoneUtilTest.java index 6bfefc10e..69695d672 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/ZoneUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/ZoneUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date; +package cn.hutool.v7.core.date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/IssueI5YB1ATest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/chinese/IssueI5YB1ATest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/IssueI5YB1ATest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/chinese/IssueI5YB1ATest.java index 6909e428b..b6ebd2685 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/IssueI5YB1ATest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/chinese/IssueI5YB1ATest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/IssueI97WU6Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/chinese/IssueI97WU6Test.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/IssueI97WU6Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/chinese/IssueI97WU6Test.java index 4795dde65..c1120b0cd 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/IssueI97WU6Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/chinese/IssueI97WU6Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/ShiChenTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/chinese/ShiChenTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/ShiChenTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/chinese/ShiChenTest.java index 144b44d9c..9bced4142 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/ShiChenTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/chinese/ShiChenTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; -import org.dromara.hutool.core.date.DateUnit; +import cn.hutool.v7.core.date.DateUnit; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/SolarTermsTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/chinese/SolarTermsTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/SolarTermsTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/chinese/SolarTermsTest.java index 44c118550..90ba0ce20 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/SolarTermsTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/chinese/SolarTermsTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.chinese; +package cn.hutool.v7.core.date.chinese; -import org.dromara.hutool.core.date.DateUtil; +import cn.hutool.v7.core.date.DateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/format/FastDateFormatTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/format/FastDateFormatTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/format/FastDateFormatTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/format/FastDateFormatTest.java index 4cd1cf5dc..0b36d335c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/format/FastDateFormatTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/format/FastDateFormatTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format; +package cn.hutool.v7.core.date.format; -import org.dromara.hutool.core.date.DateUtil; +import cn.hutool.v7.core.date.DateUtil; import org.junit.jupiter.api.Test; import java.text.SimpleDateFormat; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/format/parser/DefaultRegexDateParserTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/format/parser/DefaultRegexDateParserTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/format/parser/DefaultRegexDateParserTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/format/parser/DefaultRegexDateParserTest.java index 52a50fd6e..478c9ddac 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/format/parser/DefaultRegexDateParserTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/format/parser/DefaultRegexDateParserTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format.parser; +package cn.hutool.v7.core.date.format.parser; -import org.dromara.hutool.core.date.DateUtil; +import cn.hutool.v7.core.date.DateUtil; import org.junit.jupiter.api.Test; import java.util.Date; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/format/parser/RegexDateParserTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/format/parser/RegexDateParserTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/date/format/parser/RegexDateParserTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/date/format/parser/RegexDateParserTest.java index d6f40152e..1b0542820 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/format/parser/RegexDateParserTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/format/parser/RegexDateParserTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.date.format.parser; +package cn.hutool.v7.core.date.format.parser; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.date.Week; -import org.dromara.hutool.core.regex.ReUtil; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.date.Week; +import cn.hutool.v7.core.regex.ReUtil; import org.junit.jupiter.api.Test; import java.util.Date; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/exception/ExceptionUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/exception/ExceptionUtilTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/exception/ExceptionUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/exception/ExceptionUtilTest.java index c9c30d09a..ceba0af7d 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/exception/ExceptionUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/exception/ExceptionUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.exception; +package cn.hutool.v7.core.exception; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.io.IORuntimeException; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.io.IORuntimeException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/func/FunctionPoolTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/func/FunctionPoolTest.java similarity index 85% rename from hutool-core/src/test/java/org/dromara/hutool/core/func/FunctionPoolTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/func/FunctionPoolTest.java index c96338d33..1560454e7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/func/FunctionPoolTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/func/FunctionPoolTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -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 cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.date.StopWatch; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/func/LambdaFactoryTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/func/LambdaFactoryTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/func/LambdaFactoryTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/func/LambdaFactoryTest.java index 8d4a6da47..ddc4fd6c1 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/func/LambdaFactoryTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/func/LambdaFactoryTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; import lombok.Data; import lombok.Getter; import lombok.Setter; import lombok.SneakyThrows; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.exception.ExceptionUtil; -import org.dromara.hutool.core.reflect.ConstructorUtil; -import org.dromara.hutool.core.reflect.lookup.LookupUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.exception.ExceptionUtil; +import cn.hutool.v7.core.reflect.ConstructorUtil; +import cn.hutool.v7.core.reflect.lookup.LookupUtil; 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/org/dromara/hutool/core/func/LambdaUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/func/LambdaUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/func/LambdaUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/func/LambdaUtilTest.java index 543ec144c..e5715c6c7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/func/LambdaUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/func/LambdaUtilTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.FieldNameConstants; -import org.dromara.hutool.core.lang.tuple.Tuple; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.lang.tuple.Tuple; +import cn.hutool.v7.core.reflect.method.MethodUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/func/PredicateUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/func/PredicateUtilTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/func/PredicateUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/func/PredicateUtilTest.java index 1fd0f9d82..2a92dad36 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/func/PredicateUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/func/PredicateUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.func; +package cn.hutool.v7.core.func; -import org.dromara.hutool.core.collection.set.SetUtil; -import org.dromara.hutool.core.func.PredicateUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.func.PredicateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/BomReaderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/BomReaderTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/BomReaderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/BomReaderTest.java index ad296d627..db8aa5976 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/BomReaderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/BomReaderTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.io.file.FileUtil; +import cn.hutool.v7.core.io.file.FileUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/CharsetDetectorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/CharsetDetectorTest.java similarity index 88% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/CharsetDetectorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/CharsetDetectorTest.java index 19a1b8d64..3427a6272 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/CharsetDetectorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/CharsetDetectorTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.io.resource.ResourceUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/ClassPathResourceTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/ClassPathResourceTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/ClassPathResourceTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/ClassPathResourceTest.java index 628aca21e..71f49d1d6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/ClassPathResourceTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/ClassPathResourceTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.io.resource.ClassPathResource; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.io.resource.ClassPathResource; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/FastStringWriterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/FastStringWriterTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/FastStringWriterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/FastStringWriterTest.java index ac727cc5d..00690ed28 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/FastStringWriterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/FastStringWriterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/IoUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/IoUtilTest.java similarity index 90% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/IoUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/IoUtilTest.java index 8c4dfcc47..52c4644b6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/IoUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/IoUtilTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -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.func.SerConsumer; -import org.dromara.hutool.core.util.CharsetUtil; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.iter.LineIter; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.io.stream.EmptyOutputStream; +import cn.hutool.v7.core.io.stream.StrInputStream; +import cn.hutool.v7.core.func.SerConsumer; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/Issue3846Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/Issue3846Test.java similarity index 67% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/Issue3846Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/Issue3846Test.java index 1a8522c3f..57d6a52a9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/Issue3846Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/Issue3846Test.java @@ -1,9 +1,9 @@ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.date.StopWatch; -import org.dromara.hutool.core.io.resource.ResourceUtil; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.date.StopWatch; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.lang.Console; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/LineInputStreamTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/LineInputStreamTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/LineInputStreamTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/LineInputStreamTest.java index 07dbc3ed7..d9bd3e7b7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/LineInputStreamTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/LineInputStreamTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.io.stream.LineInputStream; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.io.stream.LineInputStream; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/LineReaderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/LineReaderTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/LineReaderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/LineReaderTest.java index 8d4a80c29..db0598a53 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/LineReaderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/LineReaderTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.io.resource.ResourceUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/ManifestUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/ManifestUtilTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/ManifestUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/ManifestUtilTest.java index afcc8c96d..f7b01d0c8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/ManifestUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/ManifestUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/NioUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/NioUtilTest.java similarity index 88% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/NioUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/NioUtilTest.java index cf1a56ac4..6261ff529 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/NioUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/NioUtilTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.io; +package cn.hutool.v7.core.io; -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 cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.io.stream.EmptyOutputStream; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.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/org/dromara/hutool/core/io/buffer/BufferUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/buffer/BufferUtilTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/buffer/BufferUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/buffer/BufferUtilTest.java index 30ea7437b..48cb6737b 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/buffer/BufferUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/buffer/BufferUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.buffer; +package cn.hutool.v7.core.io.buffer; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/checksum/CRC16Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/checksum/CRC16Test.java similarity index 81% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/checksum/CRC16Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/checksum/CRC16Test.java index 8669bddb7..d6708a476 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/checksum/CRC16Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/checksum/CRC16Test.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum; +package cn.hutool.v7.core.io.checksum; -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 cn.hutool.v7.core.io.checksum.crc16.CRC16Ansi; +import cn.hutool.v7.core.io.checksum.crc16.CRC16CCITT; +import cn.hutool.v7.core.io.checksum.crc16.CRC16CCITTFalse; +import cn.hutool.v7.core.io.checksum.crc16.CRC16DNP; +import cn.hutool.v7.core.io.checksum.crc16.CRC16IBM; +import cn.hutool.v7.core.io.checksum.crc16.CRC16Maxim; +import cn.hutool.v7.core.io.checksum.crc16.CRC16Modbus; +import cn.hutool.v7.core.io.checksum.crc16.CRC16USB; +import cn.hutool.v7.core.io.checksum.crc16.CRC16X25; +import cn.hutool.v7.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/org/dromara/hutool/core/io/checksum/CrcTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/checksum/CrcTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/checksum/CrcTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/checksum/CrcTest.java index 9318decce..d4c3b30a5 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/checksum/CrcTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/checksum/CrcTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.checksum; +package cn.hutool.v7.core.io.checksum; -import org.dromara.hutool.core.codec.binary.HexUtil; -import org.dromara.hutool.core.io.checksum.crc16.CRC16XModem; -import org.dromara.hutool.core.util.ByteUtil; +import cn.hutool.v7.core.codec.binary.HexUtil; +import cn.hutool.v7.core.io.checksum.crc16.CRC16XModem; +import cn.hutool.v7.core.util.ByteUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileNameUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileNameUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileNameUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileNameUtilTest.java index fce4355a9..4bfcf6535 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileNameUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileNameUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileReaderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileReaderTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileReaderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileReaderTest.java index 6740ce7f5..2aae98529 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileReaderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileReaderTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileSystemUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileSystemUtilTest.java similarity index 90% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileSystemUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileSystemUtilTest.java index d561b9360..5269f7257 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileSystemUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileSystemUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileTypeUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileTypeUtilTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileTypeUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileTypeUtilTest.java index 04b63406e..95e5c297f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileTypeUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileTypeUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.io.resource.ResourceUtil; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.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/org/dromara/hutool/core/io/file/FileUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileUtilTest.java index c28163b5b..bef105e93 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileUtilTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.util.CharsetUtil; -import org.dromara.hutool.core.util.SystemUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.util.CharsetUtil; +import cn.hutool.v7.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/org/dromara/hutool/core/io/file/FileWriterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileWriterTest.java similarity index 85% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileWriterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileWriterTest.java index aacce41a3..f10be16fb 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileWriterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileWriterTest.java @@ -1,6 +1,6 @@ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.core.collection.ListUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/Issue3557Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/Issue3557Test.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/Issue3557Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/Issue3557Test.java index b1c545d47..386a3ad22 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/Issue3557Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/Issue3557Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/IssueI666HBTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/IssueI666HBTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/IssueI666HBTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/IssueI666HBTest.java index 9a0a78c2e..62763f6e2 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/IssueI666HBTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/IssueI666HBTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/IssueIAB65VTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/IssueIAB65VTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/IssueIAB65VTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/IssueIAB65VTest.java index b6c6dfb37..72bd3b7f2 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/IssueIAB65VTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/IssueIAB65VTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathCopyTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/PathCopyTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathCopyTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/PathCopyTest.java index 4fe984d3d..5a3fc1347 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathCopyTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/PathCopyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathDeleterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/PathDeleterTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathDeleterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/PathDeleterTest.java index 144fd6788..c29749bba 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathDeleterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/PathDeleterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/PathUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/PathUtilTest.java index 14c41976b..d90d66c1e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/PathUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.array.ArrayUtil; +import cn.hutool.v7.core.array.ArrayUtil; 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/org/dromara/hutool/core/io/file/TailerTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/TailerTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/file/TailerTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/file/TailerTest.java index bf36891da..0a35b909c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/TailerTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/TailerTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.file; +package cn.hutool.v7.core.io.file; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/resource/ResourceFinderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/resource/ResourceFinderTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/resource/ResourceFinderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/resource/ResourceFinderTest.java index b90e75cc0..518f492ec 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/resource/ResourceFinderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/resource/ResourceFinderTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.lang.Console; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/resource/ResourceUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/resource/ResourceUtilTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/resource/ResourceUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/resource/ResourceUtilTest.java index b88edd122..6a7031d9e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/resource/ResourceUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/resource/ResourceUtilTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.resource; +package cn.hutool.v7.core.io.resource; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/unit/DataSizeUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/unit/DataSizeUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/unit/DataSizeUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/unit/DataSizeUtilTest.java index 74c86364f..5a31ddf0e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/unit/DataSizeUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/unit/DataSizeUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.unit; +package cn.hutool.v7.core.io.unit; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/TestConsoleWatcher.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/watch/TestConsoleWatcher.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/watch/TestConsoleWatcher.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/watch/TestConsoleWatcher.java index 3e1776e51..298b46fcf 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/TestConsoleWatcher.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/watch/TestConsoleWatcher.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.watch; +package cn.hutool.v7.core.io.watch; -import org.dromara.hutool.core.io.watch.watchers.SimpleWatcher; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.io.watch.watchers.SimpleWatcher; +import cn.hutool.v7.core.lang.Console; import java.nio.file.WatchEvent; import java.nio.file.WatchKey; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/WatchMonitorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/watch/WatchMonitorTest.java similarity index 84% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/watch/WatchMonitorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/watch/WatchMonitorTest.java index fbfd53156..3b0cb34b5 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/WatchMonitorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/watch/WatchMonitorTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.watch; +package cn.hutool.v7.core.io.watch; -import org.dromara.hutool.core.io.file.PathUtil; -import org.dromara.hutool.core.io.watch.watchers.DelayWatcher; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.io.file.PathUtil; +import cn.hutool.v7.core.io.watch.watchers.DelayWatcher; +import cn.hutool.v7.core.lang.Console; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/WatchServiceWrapperTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/watch/WatchServiceWrapperTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/io/watch/WatchServiceWrapperTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/io/watch/WatchServiceWrapperTest.java index 8f3f45e37..e88d8bf76 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/WatchServiceWrapperTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/watch/WatchServiceWrapperTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.io.watch; +package cn.hutool.v7.core.io.watch; -import org.dromara.hutool.core.io.file.PathUtil; +import cn.hutool.v7.core.io.file.PathUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/AssertTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/AssertTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/AssertTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/AssertTest.java index 4c65512c9..5185133a5 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/AssertTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/AssertTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ConsoleTableTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/ConsoleTableTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/ConsoleTableTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/ConsoleTableTest.java index 5e4f2a09e..33855ad5b 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ConsoleTableTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/ConsoleTableTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ConsoleTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/ConsoleTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/ConsoleTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/ConsoleTest.java index 008f1207c..007500206 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ConsoleTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/ConsoleTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; -import org.dromara.hutool.core.thread.ThreadUtil; +import cn.hutool.v7.core.thread.ThreadUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/OptTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/OptTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/OptTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/OptTest.java index 72de16f26..6f83e2f84 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/OptTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/OptTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.hutool.core.collection.CollUtil; +import cn.hutool.v7.core.collection.CollUtil; 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/org/dromara/hutool/core/lang/SingletonTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/SingletonTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/SingletonTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/SingletonTest.java index 16c215e91..b3832fc1f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/SingletonTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/SingletonTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; import lombok.Data; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.thread.ThreadUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.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/org/dromara/hutool/core/lang/ValidatorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/ValidatorTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/ValidatorTest.java index b688505ce..64d7aec99 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/ValidatorTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang; +package cn.hutool.v7.core.lang; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.exception.ValidateException; -import org.dromara.hutool.core.data.id.IdUtil; -import org.dromara.hutool.core.regex.PatternPool; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.exception.ValidateException; +import cn.hutool.v7.core.data.id.IdUtil; +import cn.hutool.v7.core.regex.PatternPool; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ansi/AnsiEncoderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/ansi/AnsiEncoderTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/ansi/AnsiEncoderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/ansi/AnsiEncoderTest.java index 2268182d5..071094142 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ansi/AnsiEncoderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/ansi/AnsiEncoderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.ansi; +package cn.hutool.v7.core.lang.ansi; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/builder/GenericBuilderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/builder/GenericBuilderTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/builder/GenericBuilderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/builder/GenericBuilderTest.java index 404c4bc12..43fabfde2 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/builder/GenericBuilderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/builder/GenericBuilderTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.builder; +package cn.hutool.v7.core.lang.builder; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/caller/CallerTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/caller/CallerTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/caller/CallerTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/caller/CallerTest.java index 36b7c5837..45d04759b 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/caller/CallerTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/caller/CallerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.caller; +package cn.hutool.v7.core.lang.caller; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/caller/CallerUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/caller/CallerUtilTest.java similarity index 85% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/caller/CallerUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/caller/CallerUtilTest.java index 4fb3c9c16..66d4793c7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/caller/CallerUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/caller/CallerUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.caller; +package cn.hutool.v7.core.lang.caller; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -27,6 +27,6 @@ public class CallerUtilTest { Assertions.assertEquals("getCallerMethodNameTest", callerMethodName); final String fullCallerMethodName = CallerUtil.getCallerMethodName(true); - Assertions.assertEquals("org.dromara.hutool.core.lang.caller.CallerUtilTest.getCallerMethodNameTest", fullCallerMethodName); + Assertions.assertEquals("cn.hutool.v7.core.lang.caller.CallerUtilTest.getCallerMethodNameTest", fullCallerMethodName); } } diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/event/SimpleEventPublisherTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/event/SimpleEventPublisherTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/event/SimpleEventPublisherTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/event/SimpleEventPublisherTest.java index b1a23730e..0b6d5187c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/event/SimpleEventPublisherTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/event/SimpleEventPublisherTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.event; +package cn.hutool.v7.core.lang.event; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/intern/InternUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/intern/InternUtilTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/intern/InternUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/intern/InternUtilTest.java index 00b2b33e8..f826a4f9a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/intern/InternUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/intern/InternUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.intern; +package cn.hutool.v7.core.lang.intern; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/loader/LazyFunLoaderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/loader/LazyFunLoaderTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/loader/LazyFunLoaderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/loader/LazyFunLoaderTest.java index 2be0b94c4..c0afec2c8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/loader/LazyFunLoaderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/loader/LazyFunLoaderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.loader; +package cn.hutool.v7.core.lang.loader; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/BaseMutableTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/BaseMutableTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/BaseMutableTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/BaseMutableTest.java index 1df2416ae..9b544bca9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/BaseMutableTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/BaseMutableTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.text.StrValidator; +import cn.hutool.v7.core.text.StrValidator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableBoolTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableBoolTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableBoolTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableBoolTest.java index f68b3fc43..b5c927296 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableBoolTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableBoolTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; /** * test for {@link MutableBool} diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableByteTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableByteTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableByteTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableByteTest.java index 9da8fc45d..e90e6f3c7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableByteTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableByteTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; /** * @author huangchengxing diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableDoubleTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableDoubleTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableDoubleTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableDoubleTest.java index 12382ce3d..1d48d0bf5 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableDoubleTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableDoubleTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; /** * @author huangchengxing diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableEntryTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableEntryTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableEntryTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableEntryTest.java index fa1194f6c..e4774ef83 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableEntryTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableEntryTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; -import org.dromara.hutool.core.map.MapUtil; +import cn.hutool.v7.core.map.MapUtil; import java.util.Map; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableFloatTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableFloatTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableFloatTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableFloatTest.java index 999d3aa7c..ad10ef2a6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableFloatTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableFloatTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; /** * @author huangchengxing diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableIntTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableIntTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableIntTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableIntTest.java index b00b9e08e..9ee583a0a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableIntTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableIntTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; /** * @author huangchengxing diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableLongTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableLongTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableLongTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableLongTest.java index 499cf76b6..00c04c778 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableLongTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableLongTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; /** * @author huangchengxing diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableObjTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableObjTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableObjTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableObjTest.java index b2df77363..691d9c171 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableObjTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableObjTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; /** * test for {@link MutableObj} diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableShortTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableShortTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableShortTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableShortTest.java index 7d3fa3b3e..b61b4336c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableShortTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableShortTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; /** * @author huangchengxing diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableTripleTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableTripleTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableTripleTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableTripleTest.java index 54ddf094a..fdb69ec23 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/mutable/MutableTripleTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/MutableTripleTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.mutable; +package cn.hutool.v7.core.lang.mutable; /** * @author huangchengxing diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/page/NavigatePageInfoTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/page/NavigatePageInfoTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/page/NavigatePageInfoTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/page/NavigatePageInfoTest.java index 3c7e5279a..3ee94c971 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/page/NavigatePageInfoTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/page/NavigatePageInfoTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.page; +package cn.hutool.v7.core.lang.page; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/page/PageInfoTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/page/PageInfoTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/page/PageInfoTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/page/PageInfoTest.java index 51881ba70..49cbefc7a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/page/PageInfoTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/page/PageInfoTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.page; +package cn.hutool.v7.core.lang.page; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTest.java index 7e1e80dce..ddc5ca057 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundTypeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTypeTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundTypeTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTypeTest.java index 776a8777f..4813bbfe4 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundTypeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTypeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundedRangeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundedRangeTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundedRangeTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundedRangeTest.java index d0ff50edc..a101c5df3 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/BoundedRangeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundedRangeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/RangeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/RangeTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/range/RangeTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/range/RangeTest.java index 9a3b42772..127ecceac 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/range/RangeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/RangeTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.range; +package cn.hutool.v7.core.lang.range; -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 cn.hutool.v7.core.date.DateField; +import cn.hutool.v7.core.date.DateRange; +import cn.hutool.v7.core.date.DateTime; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/selector/SmoothWeightSelectorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/selector/SmoothWeightSelectorTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/selector/SmoothWeightSelectorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/selector/SmoothWeightSelectorTest.java index 7828305f5..dd4afa9e6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/selector/SmoothWeightSelectorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/selector/SmoothWeightSelectorTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.selector; +package cn.hutool.v7.core.lang.selector; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/selector/WeightListRandomSelectorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/selector/WeightListRandomSelectorTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/selector/WeightListRandomSelectorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/selector/WeightListRandomSelectorTest.java index 8ac6b0cb8..dce97b053 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/selector/WeightListRandomSelectorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/selector/WeightListRandomSelectorTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.selector; +package cn.hutool.v7.core.lang.selector; -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.util.RandomUtil; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.date.StopWatch; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/selector/WeightRandomSelectorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/selector/WeightRandomSelectorTest.java similarity index 88% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/selector/WeightRandomSelectorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/selector/WeightRandomSelectorTest.java index b4f549614..34efd8914 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/selector/WeightRandomSelectorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/selector/WeightRandomSelectorTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.selector; +package cn.hutool.v7.core.lang.selector; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.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/org/dromara/hutool/core/lang/test/bean/ExamInfoDict.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/ExamInfoDict.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/ExamInfoDict.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/ExamInfoDict.java index 7892c598b..017a3fc92 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/ExamInfoDict.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/ExamInfoDict.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.test.bean; +package cn.hutool.v7.core.lang.test.bean; import lombok.Data; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/UserInfoDict.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoDict.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/UserInfoDict.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoDict.java index 0e3cb8c12..3b7269f3c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/UserInfoDict.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoDict.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.test.bean; +package cn.hutool.v7.core.lang.test.bean; import java.io.Serializable; import java.util.List; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/UserInfoRedundCount.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoRedundCount.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/UserInfoRedundCount.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoRedundCount.java index 04d21c953..7673c1a8d 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/test/bean/UserInfoRedundCount.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoRedundCount.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.test.bean; +package cn.hutool.v7.core.lang.test.bean; import java.io.Serializable; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/tuple/PairTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/tuple/PairTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/tuple/PairTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/tuple/PairTest.java index ad5057367..c0c375f90 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/tuple/PairTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/tuple/PairTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.tuple; +package cn.hutool.v7.core.lang.tuple; -import org.dromara.hutool.core.lang.mutable.MutablePair; +import cn.hutool.v7.core.lang.mutable.MutablePair; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/tuple/TripleTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/tuple/TripleTest.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/tuple/TripleTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/tuple/TripleTest.java index f01a84b56..0a1162f15 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/tuple/TripleTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/tuple/TripleTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.tuple; +package cn.hutool.v7.core.lang.tuple; -import org.dromara.hutool.core.lang.mutable.MutableTriple; +import cn.hutool.v7.core.lang.mutable.MutableTriple; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/tuple/TupleTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/tuple/TupleTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/lang/tuple/TupleTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/lang/tuple/TupleTest.java index f84c03caf..7aa7e33dc 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/tuple/TupleTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/tuple/TupleTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.lang.tuple; +package cn.hutool.v7.core.lang.tuple; -import org.dromara.hutool.core.lang.tuple.Tuple; +import cn.hutool.v7.core.lang.tuple.Tuple; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/BiMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/BiMapTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/BiMapTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/BiMapTest.java index 7324b7215..832138ede 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/BiMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/BiMapTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/CamelCaseMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/CamelCaseMapTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/CamelCaseMapTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/CamelCaseMapTest.java index a7999cdd7..a7a4d61ac 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/CamelCaseMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/CamelCaseMapTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.io.SerializeUtil; +import cn.hutool.v7.core.io.SerializeUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/CaseInsensitiveMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/CaseInsensitiveMapTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/CaseInsensitiveMapTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/CaseInsensitiveMapTest.java index 6d4436314..4948d0554 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/CaseInsensitiveMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/CaseInsensitiveMapTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/CollectionValueMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/CollectionValueMapTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/CollectionValueMapTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/CollectionValueMapTest.java index 89fffe9b7..12ac734bf 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/CollectionValueMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/CollectionValueMapTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.map.multi.CollectionValueMap; -import org.dromara.hutool.core.map.multi.MultiValueMap; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.map.multi.CollectionValueMap; +import cn.hutool.v7.core.map.multi.MultiValueMap; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/DictTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/DictTest.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/DictTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/DictTest.java index cae279751..fe6305fe1 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/DictTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/DictTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.lang.builder.GenericBuilder; -import org.dromara.hutool.core.date.DateTime; -import org.dromara.hutool.core.map.Dict; +import cn.hutool.v7.core.lang.builder.GenericBuilder; +import cn.hutool.v7.core.date.DateTime; +import cn.hutool.v7.core.map.Dict; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/DirectedWeightGraphTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/DirectedWeightGraphTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/DirectedWeightGraphTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/DirectedWeightGraphTest.java index c7f4dc02e..22b2dd909 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/DirectedWeightGraphTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/DirectedWeightGraphTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.map.multi.DirectedWeightGraph; +import cn.hutool.v7.core.map.multi.DirectedWeightGraph; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/GraphTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/GraphTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/GraphTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/GraphTest.java index 1ffa5b888..d31b4371a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/GraphTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/GraphTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.map.multi.Graph; +import cn.hutool.v7.core.map.multi.Graph; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/Issue2349Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/Issue2349Test.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/Issue2349Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/Issue2349Test.java index add6a6898..1ba1e5ed6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/Issue2349Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/Issue2349Test.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; +import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/Issue3340Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/Issue3340Test.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/Issue3340Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/Issue3340Test.java index 428c37269..3f7b5bebe 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/Issue3340Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/Issue3340Test.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/IssueI88R5MTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/IssueI88R5MTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/IssueI88R5MTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/IssueI88R5MTest.java index 9dd052900..651785a18 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/IssueI88R5MTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/IssueI88R5MTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/ListValueMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/ListValueMapTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/ListValueMapTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/ListValueMapTest.java index 682a48cde..c3e9b0542 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/ListValueMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/ListValueMapTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.map.multi.ListValueMap; -import org.dromara.hutool.core.map.multi.MultiValueMap; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.map.multi.ListValueMap; +import cn.hutool.v7.core.map.multi.MultiValueMap; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/MapBuilderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/MapBuilderTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/MapBuilderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/MapBuilderTest.java index 68366024b..e337e76d3 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/MapBuilderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/MapBuilderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/MapJoinerTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/MapJoinerTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/MapJoinerTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/MapJoinerTest.java index 7072bf0c0..cc9abb94c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/MapJoinerTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/MapJoinerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/MapUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/MapUtilTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/MapUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/MapUtilTest.java index c232c95f2..674679bb8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/MapUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/MapUtilTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import lombok.Builder; import lombok.Data; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.lang.Opt; -import org.dromara.hutool.core.reflect.TypeReference; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.reflect.TypeReference; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/RowKeyTableTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/RowKeyTableTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/RowKeyTableTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/RowKeyTableTest.java index 8a993e5ed..5caf20d4a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/RowKeyTableTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/RowKeyTableTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.map.multi.RowKeyTable; -import org.dromara.hutool.core.map.multi.Table; +import cn.hutool.v7.core.map.multi.RowKeyTable; +import cn.hutool.v7.core.map.multi.Table; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/SerFunctionMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/SerFunctionMapTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/SerFunctionMapTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/SerFunctionMapTest.java index 3c4d86a57..3854d8851 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/SerFunctionMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/SerFunctionMapTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/SetValueMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/SetValueMapTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/SetValueMapTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/SetValueMapTest.java index d9e5e1b17..a68c90733 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/SetValueMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/SetValueMapTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.map.multi.MultiValueMap; -import org.dromara.hutool.core.map.multi.SetValueMap; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.map.multi.MultiValueMap; +import cn.hutool.v7.core.map.multi.SetValueMap; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/TableMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/TableMapTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/TableMapTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/TableMapTest.java index 1922a73b3..23cfa909a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/TableMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/TableMapTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/TolerantMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/TolerantMapTest.java similarity index 90% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/TolerantMapTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/TolerantMapTest.java index 35dbd492d..bb4af207c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/TolerantMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/TolerantMapTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.io.SerializeUtil; -import org.dromara.hutool.core.util.ObjUtil; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.io.SerializeUtil; +import cn.hutool.v7.core.util.ObjUtil; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/WeakConcurrentMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/WeakConcurrentMapTest.java similarity index 87% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/WeakConcurrentMapTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/WeakConcurrentMapTest.java index 868ce5c61..fab14d9ca 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/WeakConcurrentMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/WeakConcurrentMapTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.map; +package cn.hutool.v7.core.map; -import org.dromara.hutool.core.map.reference.WeakConcurrentMap; -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 cn.hutool.v7.core.map.reference.WeakConcurrentMap; +import cn.hutool.v7.core.thread.ConcurrencyTester; +import cn.hutool.v7.core.thread.ThreadUtil; +import cn.hutool.v7.core.util.ObjUtil; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/map/reference/WeakConcurrentMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/reference/WeakConcurrentMapTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/map/reference/WeakConcurrentMapTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/map/reference/WeakConcurrentMapTest.java index 6a196f3c2..aa36eada1 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/map/reference/WeakConcurrentMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/reference/WeakConcurrentMapTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.map.reference; +package cn.hutool.v7.core.map.reference; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/ArrangementTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/ArrangementTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/ArrangementTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/ArrangementTest.java index 59fdecbdf..21898b412 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/ArrangementTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/ArrangementTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.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/org/dromara/hutool/core/math/BitStatusUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/BitStatusUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/BitStatusUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/BitStatusUtilTest.java index 20553f614..cd3b664c3 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/BitStatusUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/BitStatusUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/CalculatorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/CalculatorTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/CalculatorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/CalculatorTest.java index 845d89361..fbda26d60 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/CalculatorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/CalculatorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/ChineseNumberFormatterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/ChineseNumberFormatterTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/ChineseNumberFormatterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/ChineseNumberFormatterTest.java index de09dc42c..743704d95 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/ChineseNumberFormatterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/ChineseNumberFormatterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.convert.ConvertUtil; +import cn.hutool.v7.core.convert.ConvertUtil; import org.junit.jupiter.api.Test; import java.math.BigDecimal; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/ChineseNumberParserTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/ChineseNumberParserTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/ChineseNumberParserTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/ChineseNumberParserTest.java index 02665e871..d24029ad5 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/ChineseNumberParserTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/ChineseNumberParserTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/CombinationTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/CombinationTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/CombinationTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/CombinationTest.java index d4eac7a05..169c29278 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/CombinationTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/CombinationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/EnglishNumberFormatterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/EnglishNumberFormatterTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/EnglishNumberFormatterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/EnglishNumberFormatterTest.java index daa4df1d2..ecaccb59c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/EnglishNumberFormatterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/EnglishNumberFormatterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/FractionTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/FractionTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/FractionTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/FractionTest.java index 56272fea5..79637e54f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/FractionTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/FractionTest.java @@ -1,4 +1,4 @@ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/Issue3423Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/Issue3423Test.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/Issue3423Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/Issue3423Test.java index 6a6a432e5..ffbdb26f0 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/Issue3423Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/Issue3423Test.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.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/org/dromara/hutool/core/math/Issue3809Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/Issue3809Test.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/Issue3809Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/Issue3809Test.java index 567a77b0e..1c90efa1e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/Issue3809Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/Issue3809Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/IssueI79VS7Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/IssueI79VS7Test.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/IssueI79VS7Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/IssueI79VS7Test.java index 5070ff1db..367446dea 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/IssueI79VS7Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/IssueI79VS7Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/IssueI7NIW0Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/IssueI7NIW0Test.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/IssueI7NIW0Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/IssueI7NIW0Test.java index 46523c986..4c9a19972 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/IssueI7NIW0Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/IssueI7NIW0Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/IssueI7R2B6Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/IssueI7R2B6Test.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/IssueI7R2B6Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/IssueI7R2B6Test.java index d4e402e1c..d23f0dd1e 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/IssueI7R2B6Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/IssueI7R2B6Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/MathUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/MathUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/MathUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/MathUtilTest.java index 1f052ea87..7c30ba5d7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/MathUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/MathUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/MoneyTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/MoneyTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/MoneyTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/MoneyTest.java index 1977f6da6..3ed2ecb66 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/MoneyTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/MoneyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/NumberParserTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/NumberParserTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/NumberParserTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/NumberParserTest.java index eecd7e0d9..c43badca5 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/NumberParserTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/NumberParserTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/NumberUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/NumberUtilTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/NumberUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/NumberUtilTest.java index 9a19b5397..ac717e827 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/NumberUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/NumberUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.JRE; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/NumberWordFormatTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/NumberWordFormatTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/math/NumberWordFormatTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/math/NumberWordFormatTest.java index 311d1a329..c27574c04 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/NumberWordFormatTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/NumberWordFormatTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.math; +package cn.hutool.v7.core.math; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/FormUrlencodedTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/FormUrlencodedTest.java similarity index 87% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/FormUrlencodedTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/FormUrlencodedTest.java index 2a5548446..20a153e98 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/FormUrlencodedTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/FormUrlencodedTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.net.url.FormUrlencoded; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.net.url.FormUrlencoded; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/Ipv4UtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/Ipv4UtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/Ipv4UtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/Ipv4UtilTest.java index 15bcebacd..5d70c7768 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/Ipv4UtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/Ipv4UtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.regex.PatternPool; -import org.dromara.hutool.core.regex.ReUtil; +import cn.hutool.v7.core.regex.PatternPool; +import cn.hutool.v7.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/org/dromara/hutool/core/net/Ipv6UtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/Ipv6UtilTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/Ipv6UtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/Ipv6UtilTest.java index dbc8bf917..784dc03e2 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/Ipv6UtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/Ipv6UtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/IssueIBRVE4Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/IssueIBRVE4Test.java similarity index 83% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/IssueIBRVE4Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/IssueIBRVE4Test.java index cb8282b27..f3f002b34 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/IssueIBRVE4Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/IssueIBRVE4Test.java @@ -1,7 +1,7 @@ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.net.url.UrlQueryUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.net.url.UrlQueryUtil; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/NetUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/NetUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/NetUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/NetUtilTest.java index ce17f55f6..90df5c9a9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/NetUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/NetUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.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/org/dromara/hutool/core/net/RFC3986Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/RFC3986Test.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/RFC3986Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/RFC3986Test.java index b5f8cd33a..8993447ca 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/RFC3986Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/RFC3986Test.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.net.url.RFC3986; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.net.url.RFC3986; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/URLEncoderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/URLEncoderTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/URLEncoderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/URLEncoderTest.java index 49458a128..0eb29c368 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/URLEncoderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/URLEncoderTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.net.url.UrlDecoder; -import org.dromara.hutool.core.net.url.UrlEncoder; +import cn.hutool.v7.core.net.url.UrlDecoder; +import cn.hutool.v7.core.net.url.UrlEncoder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/URLUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/URLUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/URLUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/URLUtilTest.java index a98e5c82d..ff1cb7657 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/URLUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/URLUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.net.url.UrlUtil; +import cn.hutool.v7.core.net.url.UrlUtil; import org.junit.jupiter.api.Test; import java.net.MalformedURLException; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/UrlBuilderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/UrlBuilderTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/UrlBuilderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/UrlBuilderTest.java index 9e5c5994f..39e4df08f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/UrlBuilderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/UrlBuilderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.net.url.UrlBuilder; -import org.dromara.hutool.core.net.url.UrlPath; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.net.url.UrlBuilder; +import cn.hutool.v7.core.net.url.UrlPath; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/UrlDecoderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/UrlDecoderTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/UrlDecoderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/UrlDecoderTest.java index b63072b8f..548ac72cf 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/UrlDecoderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/UrlDecoderTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -import org.dromara.hutool.core.net.url.UrlDecoder; -import org.dromara.hutool.core.net.url.UrlEncoder; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.net.url.UrlDecoder; +import cn.hutool.v7.core.net.url.UrlEncoder; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/UrlQueryTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/UrlQueryTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/UrlQueryTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/UrlQueryTest.java index 9431c236b..33b8b5bb4 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/UrlQueryTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/UrlQueryTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.net; +package cn.hutool.v7.core.net; -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 cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.net.url.UrlUtil; +import cn.hutool.v7.core.net.url.UrlBuilder; +import cn.hutool.v7.core.net.url.UrlQuery; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/ssl/SSLContextUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/ssl/SSLContextUtilTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/ssl/SSLContextUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/ssl/SSLContextUtilTest.java index 49f6d74bd..912c78cde 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/ssl/SSLContextUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/ssl/SSLContextUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.ssl; +package cn.hutool.v7.core.net.ssl; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/url/IssueI6ZF6KTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/url/IssueI6ZF6KTest.java similarity index 85% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/url/IssueI6ZF6KTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/url/IssueI6ZF6KTest.java index e97e4998c..ddb17c30a 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/url/IssueI6ZF6KTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/url/IssueI6ZF6KTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.map.MapBuilder; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.map.MapBuilder; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/url/IssueI73J6XTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/url/IssueI73J6XTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/url/IssueI73J6XTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/url/IssueI73J6XTest.java index 4fce43c96..ea4eefb90 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/url/IssueI73J6XTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/url/IssueI73J6XTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/net/url/UrlQueryUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/net/url/UrlQueryUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/net/url/UrlQueryUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/net/url/UrlQueryUtilTest.java index 19eb971d0..a2f0650b5 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/net/url/UrlQueryUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/net/url/UrlQueryUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.url; +package cn.hutool.v7.core.net.url; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/pool/PartitionObjectPoolTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/pool/PartitionObjectPoolTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/pool/PartitionObjectPoolTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/pool/PartitionObjectPoolTest.java index 50f879889..781f9fec3 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/pool/PartitionObjectPoolTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/pool/PartitionObjectPoolTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.pool; +package cn.hutool.v7.core.pool; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.io.IoUtil; -import org.dromara.hutool.core.pool.partition.PartitionObjectPool; -import org.dromara.hutool.core.pool.partition.PartitionPoolConfig; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.io.IoUtil; +import cn.hutool.v7.core.pool.partition.PartitionObjectPool; +import cn.hutool.v7.core.pool.partition.PartitionPoolConfig; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ActualTypeMapperPoolTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ActualTypeMapperPoolTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/ActualTypeMapperPoolTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/ActualTypeMapperPoolTest.java index bd456eebd..19fb274b6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ActualTypeMapperPoolTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ActualTypeMapperPoolTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ClassDescTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ClassDescTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/ClassDescTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/ClassDescTest.java index 610c85f10..c86b0589a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ClassDescTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ClassDescTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import lombok.SneakyThrows; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ClassScannerTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ClassScannerTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/ClassScannerTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/ClassScannerTest.java index 6e0c522d0..75b1195be 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ClassScannerTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ClassScannerTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.lang.Console; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ public class ClassScannerTest { @Test @Disabled public void scanTest() { - final ClassScanner scaner = new ClassScanner("org.dromara.hutool.core.util", null); + final ClassScanner scaner = new ClassScanner("cn.hutool.v7.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/org/dromara/hutool/core/reflect/ClassUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ClassUtilTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/ClassUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/ClassUtilTest.java index 11ea7bea5..57968367c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ClassUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ClassUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ConstructorUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ConstructorUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/ConstructorUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/ConstructorUtilTest.java index 4b4a5b484..e0cafa1ea 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ConstructorUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ConstructorUtilTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.hutool.core.date.Week; +import cn.hutool.v7.core.date.Week; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/FieldUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/FieldUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/FieldUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/FieldUtilTest.java index 237cb3c22..cf7cd49a7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/FieldUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/FieldUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/Issue3516Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/Issue3516Test.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/Issue3516Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/Issue3516Test.java index 9bc6a4d57..3224a026a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/Issue3516Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/Issue3516Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/IssueI7CRIWTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/IssueI7CRIWTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/IssueI7CRIWTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/IssueI7CRIWTest.java index 9da1451a5..171781b3e 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/IssueI7CRIWTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/IssueI7CRIWTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/MethodHandleUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/MethodHandleUtilTest.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/MethodHandleUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/MethodHandleUtilTest.java index d133681f8..6441dc47d 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/MethodHandleUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/MethodHandleUtilTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; -import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.core.reflect.method.MethodHandleUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.classloader.ClassLoaderUtil; +import cn.hutool.v7.core.reflect.method.MethodHandleUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ModifierUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ModifierUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/ModifierUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/ModifierUtilTest.java index 9632f2e59..aa2f29e51 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ModifierUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ModifierUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ReflectTestBeans.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ReflectTestBeans.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/ReflectTestBeans.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/ReflectTestBeans.java index 68cf5cb90..3ed5871a3 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/ReflectTestBeans.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/ReflectTestBeans.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect; +package cn.hutool.v7.core.reflect; import lombok.Data; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/kotlin/KClassUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/kotlin/KClassUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/kotlin/KClassUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/kotlin/KClassUtilTest.java index 917b740c3..f2d0e2448 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/kotlin/KClassUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/kotlin/KClassUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.kotlin; +package cn.hutool.v7.core.reflect.kotlin; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/kotlin/TestKBean.kt b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/kotlin/TestKBean.kt similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/kotlin/TestKBean.kt rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/kotlin/TestKBean.kt index 10bd4da52..7cdaf758e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/kotlin/TestKBean.kt +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/kotlin/TestKBean.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.kotlin +package cn.hutool.v7.core.reflect.kotlin data class TestKBean(val id: String, var name: String?, var country: String?) diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/lookup/LookupUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/lookup/LookupUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/lookup/LookupUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/lookup/LookupUtilTest.java index bc9f4f430..6aa628dff 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/lookup/LookupUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/lookup/LookupUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.lookup; +package cn.hutool.v7.core.reflect.lookup; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/method/MethodMatcherTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/method/MethodMatcherTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/method/MethodMatcherTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/method/MethodMatcherTest.java index e0cb27949..9f5258952 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/method/MethodMatcherTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/method/MethodMatcherTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.method; +package cn.hutool.v7.core.reflect.method; import lombok.SneakyThrows; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/method/MethodMatcherUtilsTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/method/MethodMatcherUtilsTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/method/MethodMatcherUtilsTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/method/MethodMatcherUtilsTest.java index e8f5b2216..287a99050 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/method/MethodMatcherUtilsTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/method/MethodMatcherUtilsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.method; +package cn.hutool.v7.core.reflect.method; import lombok.Getter; import lombok.Setter; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/method/MethodUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/method/MethodUtilTest.java similarity index 91% rename from hutool-core/src/test/java/org/dromara/hutool/core/reflect/method/MethodUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/reflect/method/MethodUtilTest.java index 57635a65e..14723af64 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/reflect/method/MethodUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/method/MethodUtilTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.reflect.method; +package cn.hutool.v7.core.reflect.method; import lombok.Data; -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.reflect.ClassUtil; -import org.dromara.hutool.core.reflect.ReflectTestBeans; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.core.util.JdkUtil; +import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.date.StopWatch; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.lang.test.bean.ExamInfoDict; +import cn.hutool.v7.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.ReflectTestBeans; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.JdkUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -164,11 +164,11 @@ public class MethodUtilTest extends ReflectTestBeans { Assertions.assertEquals(3, methods.length); // getA属于本类 - Assertions.assertEquals("public void org.dromara.hutool.core.reflect.ReflectTestBeans$C2.getA()", methods[0].toString()); + Assertions.assertEquals("public void cn.hutool.v7.core.reflect.ReflectTestBeans$C2.getA()", methods[0].toString()); // getB属于父类 - Assertions.assertEquals("public void org.dromara.hutool.core.reflect.ReflectTestBeans$C1.getB()", methods[1].toString()); + Assertions.assertEquals("public void cn.hutool.v7.core.reflect.ReflectTestBeans$C1.getB()", methods[1].toString()); // getC属于接口中的默认方法 - Assertions.assertEquals("public default void org.dromara.hutool.core.reflect.ReflectTestBeans$TestInterface1.getC()", methods[2].toString()); + Assertions.assertEquals("public default void cn.hutool.v7.core.reflect.ReflectTestBeans$TestInterface1.getC()", methods[2].toString()); } @Test diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/regex/IssueIB95X4Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/regex/IssueIB95X4Test.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/regex/IssueIB95X4Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/regex/IssueIB95X4Test.java index c35fcb9fa..e92c10251 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/regex/IssueIB95X4Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/regex/IssueIB95X4Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.regex; +package cn.hutool.v7.core.regex; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/regex/ReUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/regex/ReUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/regex/ReUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/regex/ReUtilTest.java index 47eea956f..065e8421f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/regex/ReUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/regex/ReUtilTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.regex; +package cn.hutool.v7.core.regex; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/spi/ListServiceLoaderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/spi/ListServiceLoaderTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/spi/ListServiceLoaderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/spi/ListServiceLoaderTest.java index 364617be8..da3d470ec 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/spi/ListServiceLoaderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/spi/ListServiceLoaderTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.spi; +package cn.hutool.v7.core.spi; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/spi/MapServiceLoaderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/spi/MapServiceLoaderTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/spi/MapServiceLoaderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/spi/MapServiceLoaderTest.java index a560535f0..c928d6ada 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/spi/MapServiceLoaderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/spi/MapServiceLoaderTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.spi; +package cn.hutool.v7.core.spi; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java index 3077d8e38..ba1a08743 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.core.collection.ListUtil; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/stream/CollectorUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/stream/CollectorUtilTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/stream/CollectorUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/stream/CollectorUtilTest.java index 4b47e2075..1362c65f0 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/stream/CollectorUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/stream/CollectorUtilTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.lang.tuple.Pair; -import org.dromara.hutool.core.lang.tuple.Triple; -import org.dromara.hutool.core.map.MapUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.lang.tuple.Pair; +import cn.hutool.v7.core.lang.tuple.Triple; +import cn.hutool.v7.core.map.MapUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/stream/EasyStreamTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/stream/EasyStreamTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/stream/EasyStreamTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/stream/EasyStreamTest.java index 2de8bd519..8cbd5ffd4 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/stream/EasyStreamTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/stream/EasyStreamTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; import static java.util.Collections.singletonList; import lombok.Builder; import lombok.Data; -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 cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.lang.Opt; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.math.NumberUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/stream/EntryStreamTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/stream/EntryStreamTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/stream/EntryStreamTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/stream/EntryStreamTest.java index 248680e76..923cedae1 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/stream/EntryStreamTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/stream/EntryStreamTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; -import org.dromara.hutool.core.map.multi.Table; +import cn.hutool.v7.core.map.multi.Table; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/stream/StreamUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/stream/StreamUtilTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/stream/StreamUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/stream/StreamUtilTest.java index 239e7e7c8..3ea6cfaaa 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/stream/StreamUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/stream/StreamUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.stream; +package cn.hutool.v7.core.stream; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.set.SetUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.set.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/AntPathMatcherTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/AntPathMatcherTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/AntPathMatcherTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/AntPathMatcherTest.java index df94b0733..8d600e439 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/AntPathMatcherTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/AntPathMatcherTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/CharSequenceUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/CharSequenceUtilTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/CharSequenceUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/CharSequenceUtilTest.java index 5f24e5b2f..983ec5ba2 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/CharSequenceUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/CharSequenceUtilTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.date.DateFormatPool; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.date.DateFormatPool; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.util.CharsetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/CharUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/CharUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/CharUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/CharUtilTest.java index 0bd4e4734..8ab5fd34d 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/CharUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/CharUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/IssueI73AB9Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/IssueI73AB9Test.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/IssueI73AB9Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/IssueI73AB9Test.java index a8b15f71b..b593d29de 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/IssueI73AB9Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/IssueI73AB9Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/IssueI96LWHTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/IssueI96LWHTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/IssueI96LWHTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/IssueI96LWHTest.java index 874a65a9f..3a0cdd9a8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/IssueI96LWHTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/IssueI96LWHTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/NamingCaseTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/NamingCaseTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/NamingCaseTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/NamingCaseTest.java index bd48b94e7..0bf488d44 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/NamingCaseTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/NamingCaseTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.map.Dict; +import cn.hutool.v7.core.map.Dict; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/PlaceholderParserTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/PlaceholderParserTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/PlaceholderParserTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/PlaceholderParserTest.java index 7fe46ebad..3c476bfc8 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/PlaceholderParserTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/PlaceholderParserTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.text.placeholder.PlaceholderParser; +import cn.hutool.v7.core.text.placeholder.PlaceholderParser; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/SplitUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/SplitUtilTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/SplitUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/SplitUtilTest.java index f59baf6c8..e7f7d2e00 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/SplitUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/SplitUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.text.split.SplitUtil; +import cn.hutool.v7.core.text.split.SplitUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrCheckerTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrCheckerTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/StrCheckerTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/StrCheckerTest.java index 49b3f46fc..8855f7789 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrCheckerTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrCheckerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrFormatterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrFormatterTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/StrFormatterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/StrFormatterTest.java index 56dd54d87..54ba55f06 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrFormatterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrFormatterTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import lombok.AllArgsConstructor; import lombok.Data; -import org.dromara.hutool.core.text.placeholder.StrFormatter; +import cn.hutool.v7.core.text.placeholder.StrFormatter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrJoinerTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrJoinerTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/StrJoinerTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/StrJoinerTest.java index b6d26b100..de9c23146 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrJoinerTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrJoinerTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.set.SetUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.set.SetUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrMatcherTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrMatcherTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/StrMatcherTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/StrMatcherTest.java index 13683ce85..82bd19bc3 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrMatcherTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrMatcherTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.text.placeholder.StrMatcher; +import cn.hutool.v7.core.text.placeholder.StrMatcher; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrRegionMatcherTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrRegionMatcherTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/StrRegionMatcherTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/StrRegionMatcherTest.java index 01eaf6a70..8b1b8e9d0 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrRegionMatcherTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrRegionMatcherTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrRepeaterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrRepeaterTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/StrRepeaterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/StrRepeaterTest.java index bbbd2101a..2463d83f6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrRepeaterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrRepeaterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrStripperTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrStripperTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/StrStripperTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/StrStripperTest.java index 682e5c6f4..2a2908d81 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrStripperTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrStripperTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrTemplateTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrTemplateTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/StrTemplateTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/StrTemplateTest.java index 7b7973b7a..326b46a92 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrTemplateTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrTemplateTest.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.text.placeholder.StrTemplate; -import org.dromara.hutool.core.text.placeholder.template.NamedPlaceholderStrTemplate; -import org.dromara.hutool.core.text.placeholder.template.SinglePlaceholderStrTemplate; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.text.placeholder.StrTemplate; +import cn.hutool.v7.core.text.placeholder.template.NamedPlaceholderStrTemplate; +import cn.hutool.v7.core.text.placeholder.template.SinglePlaceholderStrTemplate; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrUtilTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/StrUtilTest.java index 27a6cac1d..ea4fc2903 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/StrUtilTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.map.Dict; -import org.dromara.hutool.core.text.split.SplitUtil; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.map.Dict; +import cn.hutool.v7.core.text.split.SplitUtil; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/TextSimilarityTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/TextSimilarityTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/TextSimilarityTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/TextSimilarityTest.java index bc51a4f34..2ae73e1f4 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/TextSimilarityTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/TextSimilarityTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.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/org/dromara/hutool/core/text/UnicodeUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/UnicodeUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/UnicodeUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/UnicodeUtilTest.java index ac09906f1..2d2710b78 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/UnicodeUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/UnicodeUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text; +package cn.hutool.v7.core.text; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/bloom/BitMapBloomFilterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/bloom/BitMapBloomFilterTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/bloom/BitMapBloomFilterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/bloom/BitMapBloomFilterTest.java index 5db169336..6706e34d7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/bloom/BitMapBloomFilterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/bloom/BitMapBloomFilterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.bloom; +package cn.hutool.v7.core.text.bloom; -import org.dromara.hutool.core.codec.hash.HashUtil; +import cn.hutool.v7.core.codec.hash.HashUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/DfaTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/dfa/DfaTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/DfaTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/dfa/DfaTest.java index 554166831..4baeb9c7c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/DfaTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/dfa/DfaTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.dfa; +package cn.hutool.v7.core.text.dfa; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.core.collection.ListUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/IssueI5Q4HDTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/dfa/IssueI5Q4HDTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/IssueI5Q4HDTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/dfa/IssueI5Q4HDTest.java index c817495a3..f9b9c8159 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/IssueI5Q4HDTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/dfa/IssueI5Q4HDTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.dfa; +package cn.hutool.v7.core.text.dfa; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/NFATest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/dfa/NFATest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/NFATest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/dfa/NFATest.java index ec4346b64..e1af546a6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/NFATest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/dfa/NFATest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.dfa; +package cn.hutool.v7.core.text.dfa; -import org.dromara.hutool.core.date.StopWatch; +import cn.hutool.v7.core.date.StopWatch; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/SensitiveUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/dfa/SensitiveUtilTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/SensitiveUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/dfa/SensitiveUtilTest.java index a8813da7f..27091fe09 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/dfa/SensitiveUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/dfa/SensitiveUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.dfa; +package cn.hutool.v7.core.text.dfa; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.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/org/dromara/hutool/core/text/escape/EscapeUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/escape/EscapeUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/escape/EscapeUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/escape/EscapeUtilTest.java index dc618a8fe..93f2ec620 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/escape/EscapeUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/escape/EscapeUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.escape; +package cn.hutool.v7.core.text.escape; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/finder/CharFinderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/finder/CharFinderTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/finder/CharFinderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/finder/CharFinderTest.java index 7d422d5e4..e04a3b638 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/finder/CharFinderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/finder/CharFinderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.finder; +package cn.hutool.v7.core.text.finder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/finder/MultiStrFinderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/finder/MultiStrFinderTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/finder/MultiStrFinderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/finder/MultiStrFinderTest.java index 53216905d..26f36531e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/finder/MultiStrFinderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/finder/MultiStrFinderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.finder; +package cn.hutool.v7.core.text.finder; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/replacer/HighMultiReplacerTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/replacer/HighMultiReplacerTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerTest.java index fab7d7817..301a8d05f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/replacer/HighMultiReplacerTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.replacer; +package cn.hutool.v7.core.text.replacer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/replacer/HighMultiReplacerV2Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerV2Test.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/replacer/HighMultiReplacerV2Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerV2Test.java index d5dd54cf7..fbc879fc1 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/replacer/HighMultiReplacerV2Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerV2Test.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.replacer; +package cn.hutool.v7.core.text.replacer; -import org.dromara.hutool.core.text.finder.MultiStrFinder; +import cn.hutool.v7.core.text.finder.MultiStrFinder; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/replacer/SearchReplacerTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/SearchReplacerTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/replacer/SearchReplacerTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/SearchReplacerTest.java index d776c8480..e801c8de1 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/replacer/SearchReplacerTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/SearchReplacerTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.replacer; +package cn.hutool.v7.core.text.replacer; -import org.dromara.hutool.core.text.CharSequenceUtil; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.CharSequenceUtil; +import cn.hutool.v7.core.text.StrUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/split/Issue3660Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/split/Issue3660Test.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/split/Issue3660Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/split/Issue3660Test.java index 8cfd8e9b7..58b40b222 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/split/Issue3660Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/split/Issue3660Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.split; +package cn.hutool.v7.core.text.split; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/split/IssueI9UK5VTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/split/IssueI9UK5VTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/split/IssueI9UK5VTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/split/IssueI9UK5VTest.java index 8fe4ba95d..2fba412f0 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/split/IssueI9UK5VTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/split/IssueI9UK5VTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.split; +package cn.hutool.v7.core.text.split; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/split/SplitIterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/split/SplitIterTest.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/split/SplitIterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/split/SplitIterTest.java index 5e44d0a35..d491e9235 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/split/SplitIterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/split/SplitIterTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.split; +package cn.hutool.v7.core.text.split; -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 cn.hutool.v7.core.text.finder.CharFinder; +import cn.hutool.v7.core.text.finder.LengthFinder; +import cn.hutool.v7.core.text.finder.PatternFinder; +import cn.hutool.v7.core.text.finder.StrFinder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/split/SplitUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/split/SplitUtilTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/text/split/SplitUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/text/split/SplitUtilTest.java index 61b1a2a1a..e5d97d564 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/text/split/SplitUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/split/SplitUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.text.split; +package cn.hutool.v7.core.text.split; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.text.finder.PatternFinder; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.text.finder.PatternFinder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/thread/AsyncUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/thread/AsyncUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/thread/AsyncUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/thread/AsyncUtilTest.java index 8561b2e51..fd31a8402 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/thread/AsyncUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/thread/AsyncUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.core.collection.ListUtil; 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/org/dromara/hutool/core/thread/ConcurrencyTesterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/thread/ConcurrencyTesterTest.java similarity index 89% rename from hutool-core/src/test/java/org/dromara/hutool/core/thread/ConcurrencyTesterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/thread/ConcurrencyTesterTest.java index e5ad4b8a0..47ce438bb 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/thread/ConcurrencyTesterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/thread/ConcurrencyTesterTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.util.RandomUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/thread/Issue3167Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/thread/Issue3167Test.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/thread/Issue3167Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/thread/Issue3167Test.java index aefa8b362..ee9ab750a 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/thread/Issue3167Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/thread/Issue3167Test.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.lang.Console; import java.util.concurrent.ExecutorService; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/thread/RetryUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/thread/RetryUtilTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/thread/RetryUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/thread/RetryUtilTest.java index d8a3f61a4..454bd3faf 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/thread/RetryUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/thread/RetryUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.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/org/dromara/hutool/core/thread/SimpleSchedulerTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/thread/SimpleSchedulerTest.java similarity index 88% rename from hutool-core/src/test/java/org/dromara/hutool/core/thread/SimpleSchedulerTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/thread/SimpleSchedulerTest.java index 5049e140f..54e7f3e2a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/thread/SimpleSchedulerTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/thread/SimpleSchedulerTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.io.file.FileUtil; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.util.RuntimeUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.util.RuntimeUtil; /** * 简单定时任务测试 diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/thread/SyncFinisherTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/thread/SyncFinisherTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/thread/SyncFinisherTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/thread/SyncFinisherTest.java index 20a9e8556..801dcf4d8 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/thread/SyncFinisherTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/thread/SyncFinisherTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.core.lang.Console; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/thread/ThreadUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/thread/ThreadUtilTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/thread/ThreadUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/thread/ThreadUtilTest.java index 5c08bbee8..3d971a770 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/thread/ThreadUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/thread/ThreadUtilTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread; +package cn.hutool.v7.core.thread; -import org.dromara.hutool.core.date.TimeUtil; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.util.RandomUtil; +import cn.hutool.v7.core.date.TimeUtil; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.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/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/thread/ratelimiter/SemaphoreRateLimiterTest.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiterTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/thread/ratelimiter/SemaphoreRateLimiterTest.java index 7ea11716f..e2ef2cedf 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/thread/ratelimiter/SemaphoreRateLimiterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.thread.ratelimiter; +package cn.hutool.v7.core.thread.ratelimiter; -import org.dromara.hutool.core.thread.ThreadUtil; +import cn.hutool.v7.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/tree/BeanTreeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/tree/BeanTreeTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/tree/BeanTreeTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/tree/BeanTreeTest.java index a689a16fe..00d9f4ef9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/tree/BeanTreeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/tree/BeanTreeTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; -import org.dromara.hutool.core.stream.EasyStream; +import cn.hutool.v7.core.stream.EasyStream; import lombok.Builder; import lombok.Data; import lombok.experimental.Tolerate; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/tree/HierarchyIteratorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/tree/HierarchyIteratorTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/tree/HierarchyIteratorTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/tree/HierarchyIteratorTest.java index c58c1ff73..179d06c5c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/tree/HierarchyIteratorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/tree/HierarchyIteratorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/tree/Issue2279Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/tree/Issue2279Test.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/tree/Issue2279Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/tree/Issue2279Test.java index 8de2a5296..9a5f40d31 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/tree/Issue2279Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/tree/Issue2279Test.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.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/org/dromara/hutool/core/tree/IssueI6NR2ZTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/tree/IssueI6NR2ZTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueI6NR2ZTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/tree/IssueI6NR2ZTest.java index 67af19764..7cb0a505a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueI6NR2ZTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/tree/IssueI6NR2ZTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueI795INTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/tree/IssueI795INTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueI795INTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/tree/IssueI795INTest.java index efc8a3a14..a2be05622 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueI795INTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/tree/IssueI795INTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueI9PDVFTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/tree/IssueI9PDVFTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueI9PDVFTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/tree/IssueI9PDVFTest.java index 7bdbeed20..1de3018cd 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueI9PDVFTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/tree/IssueI9PDVFTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; import lombok.AllArgsConstructor; import lombok.Data; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.lang.Assert; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueIAUSHRTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/tree/IssueIAUSHRTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueIAUSHRTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/tree/IssueIAUSHRTest.java index 7468f85ac..ad5ea81a4 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/tree/IssueIAUSHRTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/tree/IssueIAUSHRTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; import lombok.Data; -import org.dromara.hutool.core.tree.parser.NodeParser; +import cn.hutool.v7.core.tree.parser.NodeParser; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeBuilderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeBuilderTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeBuilderTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeBuilderTest.java index 4b702b9b8..5a8240790 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeBuilderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeBuilderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeSearchTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeSearchTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeSearchTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeSearchTest.java index adcffa14c..53342b804 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeSearchTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeSearchTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeTest.java similarity index 96% rename from hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeTest.java index 406221418..419ba844e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/tree/TreeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.tree; +package cn.hutool.v7.core.tree; import lombok.Data; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.tree.parser.DefaultNodeParser; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.tree.parser.DefaultNodeParser; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/BooleanUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/BooleanUtilTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/BooleanUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/BooleanUtilTest.java index e96641a9c..bddd101c2 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/BooleanUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/BooleanUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/ByteUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/ByteUtilTest.java similarity index 99% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/ByteUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/ByteUtilTest.java index 6b728063d..2c0b3c515 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/ByteUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/ByteUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/ClassUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/ClassUtilTest.java similarity index 88% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/ClassUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/ClassUtilTest.java index be949439b..5043c96e9 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/ClassUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/ClassUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.reflect.ClassUtil; +import cn.hutool.v7.core.reflect.ClassUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -33,7 +33,7 @@ public class ClassUtilTest { @Test public void getClassNameTest() { final String className = ClassUtil.getClassName(ClassUtil.class, false); - Assertions.assertEquals("org.dromara.hutool.core.reflect.ClassUtil", className); + Assertions.assertEquals("cn.hutool.v7.core.reflect.core.ClassUtil", className); final String simpleClassName = ClassUtil.getClassName(ClassUtil.class, true); Assertions.assertEquals("ClassUtil", simpleClassName); @@ -47,7 +47,7 @@ public class ClassUtilTest { @Test public void getShortClassNameTest() { - final String className = "org.dromara.hutool.core.text.StrUtil"; + final String className = "cn.hutool.v7.core.text.core.StrUtil"; final String result = ClassUtil.getShortClassName(className); Assertions.assertEquals("o.d.h.c.t.StrUtil", result); } diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/CloneTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/CloneTest.java index d8783c9a8..d931c228e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/CloneTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.exception.CloneException; +import cn.hutool.v7.core.exception.CloneException; import lombok.Data; import lombok.EqualsAndHashCode; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/DefaultCloneTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/DefaultCloneTest.java index 3a3d1f75a..685469dcf 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/DefaultCloneTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.exception.CloneException; +import cn.hutool.v7.core.exception.CloneException; import lombok.AllArgsConstructor; import lombok.Data; import org.junit.jupiter.api.Assertions; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/EnumUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/EnumUtilTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/EnumUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/EnumUtilTest.java index e94fd3ccc..8a3aad3f7 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/EnumUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/EnumUtilTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.util.EnumUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.util.EnumUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/HashUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/HashUtilTest.java similarity index 94% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/HashUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/HashUtilTest.java index b70690ac4..76b1557ea 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/HashUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/HashUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.codec.hash.HashUtil; +import cn.hutool.v7.core.codec.hash.HashUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/HexUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/HexUtilTest.java similarity index 97% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/HexUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/HexUtilTest.java index 4b90a8d4e..29be70f5c 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/HexUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/HexUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.codec.binary.HexUtil; +import cn.hutool.v7.core.codec.binary.HexUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/IdUtilTest.java similarity index 84% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/IdUtilTest.java index 3b8588a0a..7b78c1300 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/IdUtilTest.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.collection.set.ConcurrentHashSet; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.date.StopWatch; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.data.id.IdUtil; -import org.dromara.hutool.core.data.id.Snowflake; -import org.dromara.hutool.core.thread.ThreadUtil; +import cn.hutool.v7.core.collection.set.ConcurrentHashSet; +import cn.hutool.v7.core.data.id.UUID; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.date.StopWatch; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.data.id.IdUtil; +import cn.hutool.v7.core.data.id.Snowflake; +import cn.hutool.v7.core.thread.ThreadUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.RepeatedTest; @@ -168,7 +169,7 @@ public class IdUtilTest { @Test public void testUUIDv7Format() { - final org.dromara.hutool.core.data.id.UUID uuid = org.dromara.hutool.core.data.id.UUID.randomUUID7(); + final cn.hutool.v7.core.data.id.UUID uuid = cn.hutool.v7.core.data.id.UUID.randomUUID7(); final String uuidStr = uuid.toString(); // 验证UUID字符串格式是否符合标准 @@ -177,7 +178,7 @@ public class IdUtilTest { @Test public void testUUIDv7Properties() { - final org.dromara.hutool.core.data.id.UUID uuid = org.dromara.hutool.core.data.id.UUID.randomUUID7(); + final cn.hutool.v7.core.data.id.UUID uuid = cn.hutool.v7.core.data.id.UUID.randomUUID7(); // 验证版本号是否为7 assertEquals(7, uuid.version()); @@ -190,11 +191,11 @@ public class IdUtilTest { @RepeatedTest(10) @Disabled public void testUUIDv7Uniqueness() { - final Set uuids = new HashSet<>(); + final Set uuids = new HashSet<>(); // 生成100万个UUIDv7，验证是否有重复 for (int i = 0; i < 1000000; i++) { - final org.dromara.hutool.core.data.id.UUID uuid = org.dromara.hutool.core.data.id.UUID.randomUUID7(); + final cn.hutool.v7.core.data.id.UUID uuid = cn.hutool.v7.core.data.id.UUID.randomUUID7(); assertFalse(uuids.contains(uuid)); uuids.add(uuid); } @@ -203,11 +204,11 @@ public class IdUtilTest { @Test public void testUUIDv7Monotonicity() { - org.dromara.hutool.core.data.id.UUID prev = org.dromara.hutool.core.data.id.UUID.randomUUID7(); + cn.hutool.v7.core.data.id.UUID prev = cn.hutool.v7.core.data.id.UUID.randomUUID7(); // 验证连续生成的1000个UUIDv7是否呈单调递增趋势 for (int i = 0; i < 1000; i++) { - final org.dromara.hutool.core.data.id.UUID next = org.dromara.hutool.core.data.id.UUID.randomUUID7(); + final cn.hutool.v7.core.data.id.UUID next = cn.hutool.v7.core.data.id.UUID.randomUUID7(); assertTrue(next.compareTo(prev) > 0); prev = next; } diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/Issue3136Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/Issue3136Test.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/Issue3136Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/Issue3136Test.java index 6f5aa3773..743713081 100755 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/Issue3136Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/Issue3136Test.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; import lombok.Data; -import org.dromara.hutool.core.xml.XmlUtil; +import cn.hutool.v7.core.xml.XmlUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/IssueI9NSZ4Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/IssueI9NSZ4Test.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/IssueI9NSZ4Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/IssueI9NSZ4Test.java index 7e8af7011..088ed1d1f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/IssueI9NSZ4Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/IssueI9NSZ4Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/JNDIUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/JNDIUtilTest.java similarity index 85% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/JNDIUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/JNDIUtilTest.java index fcbb24bb0..3eb94620b 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/JNDIUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/JNDIUtilTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.collection.iter.EnumerationIter; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.util.JNDIUtil; +import cn.hutool.v7.core.collection.iter.EnumerationIter; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.util.JNDIUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/JdkUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/JdkUtilTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/JdkUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/JdkUtilTest.java index b4cc434d5..94c1ea494 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/JdkUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/JdkUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.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/org/dromara/hutool/core/util/ObjUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/ObjUtilTest.java similarity index 98% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/ObjUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/ObjUtilTest.java index 967684760..107ad072b 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/ObjUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/ObjUtilTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.collection.ListUtil; +import cn.hutool.v7.core.collection.ListUtil; import lombok.EqualsAndHashCode; import lombok.RequiredArgsConstructor; -import org.dromara.hutool.core.convert.ConvertUtil; +import cn.hutool.v7.core.convert.ConvertUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/RandomUtilTest.java similarity index 92% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/RandomUtilTest.java index 09203b49c..f6f68b33f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/RandomUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/RandomUtilTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.convert.ConvertUtil; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.math.NumberUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.convert.ConvertUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.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/org/dromara/hutool/core/util/ReferenceUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/ReferenceUtilTest.java similarity index 90% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/ReferenceUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/ReferenceUtilTest.java index 7d706dcc8..7c444116e 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/ReferenceUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/ReferenceUtilTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.lang.mutable.MutableObj; -import org.dromara.hutool.core.lang.ref.ReferenceType; -import org.dromara.hutool.core.lang.ref.ReferenceUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.lang.mutable.MutableObj; +import cn.hutool.v7.core.lang.ref.ReferenceType; +import cn.hutool.v7.core.lang.ref.ReferenceUtil; 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/org/dromara/hutool/core/util/RuntimeUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/RuntimeUtilTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/RuntimeUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/RuntimeUtilTest.java index 7bdb1678f..3afd4cbbd 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/RuntimeUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/RuntimeUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; -import org.dromara.hutool.core.lang.Console; +import cn.hutool.v7.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/org/dromara/hutool/core/util/SystemUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/SystemUtilTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/SystemUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/SystemUtilTest.java index b41f1c8fc..4bc412755 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/SystemUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/SystemUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/TypeUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/TypeUtilTest.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/util/TypeUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/util/TypeUtilTest.java index 6874d16e0..f280e3012 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/util/TypeUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/TypeUtilTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.core.util; +package cn.hutool.v7.core.util; import lombok.Data; -import org.dromara.hutool.core.reflect.FieldUtil; -import org.dromara.hutool.core.reflect.TypeReference; -import org.dromara.hutool.core.reflect.TypeUtil; -import org.dromara.hutool.core.reflect.method.MethodUtil; +import cn.hutool.v7.core.reflect.FieldUtil; +import cn.hutool.v7.core.reflect.TypeReference; +import cn.hutool.v7.core.reflect.TypeUtil; +import cn.hutool.v7.core.reflect.method.MethodUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/xml/IssueIASB22Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/xml/IssueIASB22Test.java similarity index 93% rename from hutool-core/src/test/java/org/dromara/hutool/core/xml/IssueIASB22Test.java rename to hutool-core/src/test/java/cn/hutool/v7/core/xml/IssueIASB22Test.java index 35d3774fe..1a3a96197 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/xml/IssueIASB22Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/xml/IssueIASB22Test.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; -import org.dromara.hutool.core.io.file.FileUtil; +import cn.hutool.v7.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-core/src/test/java/org/dromara/hutool/core/xml/XmlUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/xml/XmlUtilTest.java similarity index 95% rename from hutool-core/src/test/java/org/dromara/hutool/core/xml/XmlUtilTest.java rename to hutool-core/src/test/java/cn/hutool/v7/core/xml/XmlUtilTest.java index a758bcb12..a0a46c8b3 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/xml/XmlUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/xml/XmlUtilTest.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.dromara.hutool.core.xml; +package cn.hutool.v7.core.xml; import lombok.Data; -import org.dromara.hutool.core.bean.BeanUtil; -import org.dromara.hutool.core.bean.copier.CopyOptions; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.collection.set.SetUtil; -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.map.MapBuilder; -import org.dromara.hutool.core.map.MapUtil; -import org.dromara.hutool.core.util.CharsetUtil; +import cn.hutool.v7.core.bean.BeanUtil; +import cn.hutool.v7.core.bean.copier.CopyOptions; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.collection.set.SetUtil; +import cn.hutool.v7.core.io.file.FileUtil; +import cn.hutool.v7.core.io.resource.ResourceUtil; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.map.MapBuilder; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.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-core/src/test/java/org/dromara/hutool/core/thread/lock/SegmentLockTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/thread/lock/SegmentLockTest.java deleted file mode 100644 index f331c82dd..000000000 --- a/hutool-core/src/test/java/org/dromara/hutool/core/thread/lock/SegmentLockTest.java +++ /dev/null @@ -1,203 +0,0 @@ -package org.dromara.hutool.core.thread.lock; - -import org.dromara.hutool.core.collection.ListUtil; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReadWriteLock; - -import static org.junit.jupiter.api.Assertions.*; - -public class SegmentLockTest { - private static final int SEGMENT_COUNT = 4; - private SegmentLock strongLock; - private SegmentLock weakLock; - private SegmentLock semaphore; - private SegmentLock readWriteLock; - - @BeforeEach - public void setUp() { - strongLock = SegmentLock.lock(SEGMENT_COUNT); - weakLock = SegmentLock.lazyWeakLock(SEGMENT_COUNT); - semaphore = SegmentLock.semaphore(SEGMENT_COUNT, 2); - readWriteLock = SegmentLock.readWriteLock(SEGMENT_COUNT); - } - - @Test - public void testSize() { - assertEquals(SEGMENT_COUNT, strongLock.size()); - assertEquals(SEGMENT_COUNT, weakLock.size()); - assertEquals(SEGMENT_COUNT, semaphore.size()); - assertEquals(SEGMENT_COUNT, readWriteLock.size()); - } - - @SuppressWarnings("StringOperationCanBeSimplified") - @Test - public void testGetWithSameKey() { - // 相同 key 应返回相同锁 - final String key1 = "testKey"; - final String key2 = new String("testKey"); // equals 但不同对象 - final Lock lock1 = strongLock.get(key1); - final Lock lock2 = strongLock.get(key2); - assertSame(lock1, lock2, "相同 key 应返回同一锁对象"); - - final Lock weakLock1 = weakLock.get(key1); - final Lock weakLock2 = weakLock.get(key2); - assertSame(weakLock1, weakLock2, "弱引用锁相同 key 应返回同一锁对象"); - } - - @Test - public void testGetAt() { - for (int i = 0; i < SEGMENT_COUNT; i++) { - final Lock lock = strongLock.getAt(i); - assertNotNull(lock, "getAt 返回的锁不应为 null"); - } - assertThrows(IllegalArgumentException.class, () -> strongLock.getAt(SEGMENT_COUNT), - "超出段数的索引应抛出异常"); - } - - @Test - public void testBulkGet() { - final List keys = ListUtil.of("key1", "key2", "key3"); - final Iterable locks = strongLock.bulkGet(keys); - final List lockList = ListUtil.of(locks); - - assertEquals(3, lockList.size(), "bulkGet 返回的锁数量应与 key 数量一致"); - - // 检查顺序性 - int prevIndex = -1; - for (final Lock lock : lockList) { - final int index = findIndex(strongLock, lock); - assertTrue(index >= prevIndex, "bulkGet 返回的锁应按索引升序"); - prevIndex = index; - } - } - - @Test - public void testLockConcurrency() throws InterruptedException { - final int threadCount = SEGMENT_COUNT * 2; - final CountDownLatch startLatch = new CountDownLatch(1); - final CountDownLatch endLatch = new CountDownLatch(threadCount); - final ExecutorService executor = Executors.newFixedThreadPool(threadCount); - final List keys = new ArrayList<>(); - for (int i = 0; i < threadCount; i++) { - keys.add("key" + i); - } - - for (int i = 0; i < threadCount; i++) { - final String key = keys.get(i); - executor.submit(() -> { - try { - startLatch.await(); - final Lock lock = strongLock.get(key); - lock.lock(); - try { - Thread.sleep(100); // 模拟工作 - } finally { - lock.unlock(); - } - } catch (final InterruptedException e) { - Thread.currentThread().interrupt(); - } finally { - endLatch.countDown(); - } - }); - } - - startLatch.countDown(); - assertTrue(endLatch.await(2000, java.util.concurrent.TimeUnit.MILLISECONDS), - "并发锁测试应在 2 秒内完成"); - executor.shutdown(); - } - - @Test - public void testSemaphore() { - final Semaphore sem = semaphore.get("testKey"); - assertEquals(2, sem.availablePermits(), "信号量初始许可应为 2"); - - sem.acquireUninterruptibly(2); - assertEquals(0, sem.availablePermits(), "获取所有许可后应为 0"); - - sem.release(1); - assertEquals(1, sem.availablePermits(), "释放一个许可后应为 1"); - } - - @SuppressWarnings("ResultOfMethodCallIgnored") - @Test - public void testReadWriteLock() throws InterruptedException { - final ReadWriteLock rwLock = readWriteLock.get("testKey"); - final Lock readLock = rwLock.readLock(); - final Lock writeLock = rwLock.writeLock(); - - // 测试读锁可重入 - readLock.lock(); - assertTrue(readLock.tryLock(), "读锁应允许多个线程同时持有"); - readLock.unlock(); - readLock.unlock(); - - final CountDownLatch latch = new CountDownLatch(1); - final ExecutorService executor = Executors.newSingleThreadExecutor(); - final AtomicBoolean readLockAcquired = new AtomicBoolean(false); - - writeLock.lock(); - executor.submit(() -> { - readLockAcquired.set(readLock.tryLock()); - latch.countDown(); - }); - - latch.await(500, TimeUnit.MILLISECONDS); - assertFalse(readLockAcquired.get(), "写锁持有时读锁应失败"); - writeLock.unlock(); - - executor.shutdown(); - executor.awaitTermination(1, TimeUnit.SECONDS); - } - - @Test - public void testWeakReferenceCleanup() throws InterruptedException { - final SegmentLock weakLockLarge = SegmentLock.lazyWeakLock(1024); // 超过 LARGE_LAZY_CUTOFF - final Lock lock = weakLockLarge.get("testKey"); - - System.gc(); - Thread.sleep(100); - - // 弱引用锁未被其他引用，应仍可获取 - final Lock lockAgain = weakLockLarge.get("testKey"); - assertSame(lock, lockAgain, "弱引用锁未被回收时应返回同一对象"); - } - - @Test - public void testInvalidSegmentCount() { - assertThrows(IllegalArgumentException.class, () -> SegmentLock.lock(0), - "段数为 0 应抛出异常"); - assertThrows(IllegalArgumentException.class, () -> SegmentLock.lock(-1), - "负段数应抛出异常"); - } - - @Test - public void testHashDistribution() { - final SegmentLock lock = SegmentLock.lock(4); - final int[] counts = new int[4]; - for (int i = 0; i < 100; i++) { - final int index = findIndex(lock, lock.get("key" + i)); - counts[index]++; - } - for (final int count : counts) { - assertTrue(count > 0, "每个段都应至少被分配到一个 key"); - } - } - - private int findIndex(final SegmentLock lock, final Lock target) { - for (int i = 0; i < lock.size(); i++) { - if (lock.getAt(i) == target) { - return i; - } - } - return -1; - } -} diff --git a/hutool-core/src/test/resources/META-INF/hutool/cn.hutool.v7.core.spi.MapServiceLoaderTest$TestSPI1 b/hutool-core/src/test/resources/META-INF/hutool/cn.hutool.v7.core.spi.MapServiceLoaderTest$TestSPI1 new file mode 100644 index 000000000..3c8d2d739 --- /dev/null +++ b/hutool-core/src/test/resources/META-INF/hutool/cn.hutool.v7.core.spi.MapServiceLoaderTest$TestSPI1 @@ -0,0 +1,6 @@ +# 无服务 +serviceEmpty = +# 正常服务 +service1 = cn.hutool.v7.core.spi.MapServiceLoaderTest$TestService1 +# 此服务类未定义 +service2 = cn.hutool.v7.core.spi.MapServiceLoaderTest$TestService2 diff --git a/hutool-core/src/test/resources/META-INF/hutool/org.dromara.hutool.core.spi.MapServiceLoaderTest$TestSPI1 b/hutool-core/src/test/resources/META-INF/hutool/org.dromara.hutool.core.spi.MapServiceLoaderTest$TestSPI1 deleted file mode 100644 index 97d0d9aef..000000000 --- a/hutool-core/src/test/resources/META-INF/hutool/org.dromara.hutool.core.spi.MapServiceLoaderTest$TestSPI1 +++ /dev/null @@ -1,6 +0,0 @@ -# 无服务 -serviceEmpty = -# 正常服务 -service1 = org.dromara.hutool.core.spi.MapServiceLoaderTest$TestService1 -# 此服务类未定义 -service2 = org.dromara.hutool.core.spi.MapServiceLoaderTest$TestService2 diff --git a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.aop.engine.ProxyEngine b/hutool-core/src/test/resources/META-INF/services/cn.hutool.v7.core.spi.ListServiceLoaderTest$TestSPI1 similarity index 83% rename from hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.aop.engine.ProxyEngine rename to hutool-core/src/test/resources/META-INF/services/cn.hutool.v7.core.spi.ListServiceLoaderTest$TestSPI1 index c801aafab..8ef331c6e 100644 --- a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.aop.engine.ProxyEngine +++ b/hutool-core/src/test/resources/META-INF/services/cn.hutool.v7.core.spi.ListServiceLoaderTest$TestSPI1 @@ -14,5 +14,5 @@ # limitations under the License. # -org.dromara.hutool.extra.aop.engine.spring.SpringCglibProxyEngine -org.dromara.hutool.extra.aop.engine.jdk.JdkProxyEngine +cn.hutool.v7.extra.aop.engine.spring.SpringCglibProxyEngine +cn.hutool.v7.extra.aop.engine.jdk.JdkProxyEngine diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index 36007252b..0e6bcbe86 100755 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -23,9 +23,9 @@ jar - org.dromara.hutool + cn.hutool.v7 hutool-parent - 6.0.0-M22 + 7.0.0.M1 hutool-cron @@ -33,17 +33,17 @@ Hutool 定时任务 - org.dromara.hutool.cron + cn.hutool.v7.cron - org.dromara.hutool + cn.hutool.v7 hutool-core ${project.parent.version} - org.dromara.hutool + cn.hutool.v7 hutool-setting ${project.parent.version} diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronConfig.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/CronConfig.java similarity index 98% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/CronConfig.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/CronConfig.java index 0bdf48321..1b31192d4 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronConfig.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/CronConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.cron; +package cn.hutool.v7.cron; import java.util.TimeZone; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronException.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/CronException.java similarity index 95% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/CronException.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/CronException.java index 9d928607f..a35b03c0b 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronException.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/CronException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.cron; +package cn.hutool.v7.cron; -import org.dromara.hutool.core.exception.HutoolException; +import cn.hutool.v7.core.exception.HutoolException; /** * 定时任务异常 diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronTimer.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/CronTimer.java similarity index 94% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/CronTimer.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/CronTimer.java index a3eb3f564..6c1adc979 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronTimer.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/CronTimer.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.cron; +package cn.hutool.v7.cron; -import org.dromara.hutool.core.date.DateUnit; -import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.thread.ThreadUtil; -import org.dromara.hutool.log.Log; +import cn.hutool.v7.core.date.DateUnit; +import cn.hutool.v7.core.lang.Console; +import cn.hutool.v7.core.thread.ThreadUtil; +import cn.hutool.v7.log.Log; import java.io.Serializable; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronUtil.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/CronUtil.java similarity index 93% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/CronUtil.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/CronUtil.java index 4ceb8b0dd..880a1a4c0 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronUtil.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/CronUtil.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hutool.cron; +package cn.hutool.v7.cron; -import org.dromara.hutool.core.exception.HutoolException; -import org.dromara.hutool.core.io.resource.NoResourceException; -import org.dromara.hutool.cron.pattern.CronPattern; -import org.dromara.hutool.cron.pattern.parser.PatternParser; -import org.dromara.hutool.cron.task.Task; -import org.dromara.hutool.setting.Setting; -import org.dromara.hutool.setting.SettingException; +import cn.hutool.v7.core.exception.HutoolException; +import cn.hutool.v7.core.io.resource.NoResourceException; +import cn.hutool.v7.cron.pattern.CronPattern; +import cn.hutool.v7.cron.pattern.parser.PatternParser; +import cn.hutool.v7.cron.task.Task; +import cn.hutool.v7.setting.Setting; +import cn.hutool.v7.setting.SettingException; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/Scheduler.java similarity index 94% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/Scheduler.java index c538eb1d6..5d9c65517 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/Scheduler.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.dromara.hutool.cron; +package cn.hutool.v7.cron; -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.text.CharUtil; -import org.dromara.hutool.core.data.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.LogUtil; -import org.dromara.hutool.setting.Setting; +import cn.hutool.v7.core.map.MapUtil; +import cn.hutool.v7.core.thread.ExecutorBuilder; +import cn.hutool.v7.core.thread.ThreadFactoryBuilder; +import cn.hutool.v7.core.text.CharUtil; +import cn.hutool.v7.core.data.id.IdUtil; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.cron.listener.TaskListener; +import cn.hutool.v7.cron.listener.TaskListenerManager; +import cn.hutool.v7.cron.pattern.CronPattern; +import cn.hutool.v7.cron.task.InvokeTask; +import cn.hutool.v7.cron.task.RunnableTask; +import cn.hutool.v7.cron.task.Task; +import cn.hutool.v7.log.LogUtil; +import cn.hutool.v7.setting.Setting; import java.io.Serializable; import java.util.LinkedHashMap; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutor.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/TaskExecutor.java similarity index 93% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutor.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/TaskExecutor.java index 0440f37bd..b79169f66 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutor.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/TaskExecutor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.cron; +package cn.hutool.v7.cron; -import org.dromara.hutool.cron.task.CronTask; -import org.dromara.hutool.cron.task.Task; +import cn.hutool.v7.cron.task.CronTask; +import cn.hutool.v7.cron.task.Task; /** * 作业执行器
      diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutorManager.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/TaskExecutorManager.java similarity index 95% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutorManager.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/TaskExecutorManager.java index 0e09ed739..0b9ee5c7a 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskExecutorManager.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/TaskExecutorManager.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.cron; +package cn.hutool.v7.cron; -import org.dromara.hutool.cron.task.CronTask; -import org.dromara.hutool.cron.task.Task; +import cn.hutool.v7.cron.task.CronTask; +import cn.hutool.v7.cron.task.Task; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskLauncher.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/TaskLauncher.java similarity index 97% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/TaskLauncher.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/TaskLauncher.java index 178eea884..838c06b5c 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskLauncher.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/TaskLauncher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.cron; +package cn.hutool.v7.cron; /** * 作业启动器
      diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskLauncherManager.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/TaskLauncherManager.java similarity index 98% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/TaskLauncherManager.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/TaskLauncherManager.java index b50a063b7..dcdf302db 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskLauncherManager.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/TaskLauncherManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.cron; +package cn.hutool.v7.cron; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskTable.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/TaskTable.java similarity index 96% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/TaskTable.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/TaskTable.java index 79251543d..204b37995 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/TaskTable.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/TaskTable.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.dromara.hutool.cron; +package cn.hutool.v7.cron; -import org.dromara.hutool.core.map.TripleTable; -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 cn.hutool.v7.core.map.TripleTable; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.cron.pattern.CronPattern; +import cn.hutool.v7.cron.task.CronTask; +import cn.hutool.v7.cron.task.Task; import java.io.Serializable; import java.util.List; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/SimpleTaskListener.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/listener/SimpleTaskListener.java similarity index 92% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/listener/SimpleTaskListener.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/listener/SimpleTaskListener.java index 4a63d6810..4d41c260a 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/SimpleTaskListener.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/listener/SimpleTaskListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.cron.listener; +package cn.hutool.v7.cron.listener; -import org.dromara.hutool.cron.TaskExecutor; +import cn.hutool.v7.cron.TaskExecutor; /** * 简单监听实现，不做任何操作
      diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/TaskListener.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/listener/TaskListener.java similarity index 93% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/listener/TaskListener.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/listener/TaskListener.java index adfbbe538..1d31ea26e 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/TaskListener.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/listener/TaskListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.cron.listener; +package cn.hutool.v7.cron.listener; -import org.dromara.hutool.cron.TaskExecutor; +import cn.hutool.v7.cron.TaskExecutor; /** * 定时任务监听接口
      diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/TaskListenerManager.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/listener/TaskListenerManager.java similarity index 95% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/listener/TaskListenerManager.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/listener/TaskListenerManager.java index 614fea8c5..25b90783e 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/TaskListenerManager.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/listener/TaskListenerManager.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.cron.listener; +package cn.hutool.v7.cron.listener; -import org.dromara.hutool.cron.TaskExecutor; -import org.dromara.hutool.log.LogUtil; +import cn.hutool.v7.cron.TaskExecutor; +import cn.hutool.v7.log.LogUtil; import java.io.Serializable; import java.util.ArrayList; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/package-info.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/listener/package-info.java similarity index 94% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/listener/package-info.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/listener/package-info.java index ef90e0bdf..4a4784b7b 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/listener/package-info.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/listener/package-info.java @@ -20,4 +20,4 @@ * @author Looly * */ -package org.dromara.hutool.cron.listener; +package cn.hutool.v7.cron.listener; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/package-info.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/package-info.java similarity index 62% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/package-info.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/package-info.java index 81690556e..b08312095 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/package-info.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/package-info.java @@ -18,13 +18,13 @@ * 定时任务模块，提供类Crontab表达式的定时任务，实现参考了Cron4j，同时可以支持秒级别的定时任务定义和年的定义（同时兼容Crontab、Cron4j、Quartz表达式）
      * 定时任务模块由三部分组成： *
        - *
      • {@link org.dromara.hutool.cron.Scheduler} 定时任务调度器，用于整体管理任务的增删、启停和触发运行。
        • - *
      • {@link org.dromara.hutool.cron.task.Task} 定时任务实现，用于定义具体的任务
        • - *
      • {@link org.dromara.hutool.cron.pattern.CronPattern} 定时任务表达式，用于定义任务触发时间
        • + *
      • {@link cn.hutool.v7.cron.Scheduler} 定时任务调度器，用于整体管理任务的增删、启停和触发运行。
        • + *
      • {@link cn.hutool.v7.cron.task.Task} 定时任务实现，用于定义具体的任务
        • + *
      • {@link cn.hutool.v7.cron.pattern.CronPattern} 定时任务表达式，用于定义任务触发时间
        • *
      * - * 同时，提供了{@link org.dromara.hutool.cron.CronUtil}工具类，维护一个全局的{@link org.dromara.hutool.cron.Scheduler}。 + * 同时，提供了{@link cn.hutool.v7.cron.CronUtil}工具类，维护一个全局的{@link cn.hutool.v7.cron.Scheduler}。 * * @author Looly */ -package org.dromara.hutool.cron; +package cn.hutool.v7.cron; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPattern.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/CronPattern.java similarity index 96% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPattern.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/CronPattern.java index c12bdade1..4a2b07721 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPattern.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/CronPattern.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.cron.pattern; +package cn.hutool.v7.cron.pattern; -import org.dromara.hutool.core.comparator.CompareUtil; -import org.dromara.hutool.core.date.CalendarUtil; -import org.dromara.hutool.cron.pattern.matcher.PatternMatcher; -import org.dromara.hutool.cron.pattern.parser.PatternParser; +import cn.hutool.v7.core.comparator.CompareUtil; +import cn.hutool.v7.core.date.CalendarUtil; +import cn.hutool.v7.cron.pattern.matcher.PatternMatcher; +import cn.hutool.v7.cron.pattern.parser.PatternParser; import java.time.LocalDateTime; import java.util.*; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPatternUtil.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/CronPatternUtil.java similarity index 94% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPatternUtil.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/CronPatternUtil.java index 7f06c0be9..d3194462b 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPatternUtil.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/CronPatternUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.cron.pattern; +package cn.hutool.v7.cron.pattern; -import org.dromara.hutool.core.date.CalendarUtil; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.core.lang.Assert; +import cn.hutool.v7.core.date.CalendarUtil; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.core.lang.Assert; import java.util.ArrayList; import java.util.Calendar; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/Part.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/Part.java similarity index 93% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/Part.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/Part.java index 704bd1323..8aaff1722 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/Part.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/Part.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.dromara.hutool.cron.pattern; +package cn.hutool.v7.cron.pattern; -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 cn.hutool.v7.core.date.Month; +import cn.hutool.v7.core.date.Week; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.cron.CronException; import java.util.Calendar; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/PatternUtil.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/PatternUtil.java similarity index 96% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/PatternUtil.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/PatternUtil.java index edf393934..45519a0b1 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/PatternUtil.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/PatternUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.cron.pattern; +package cn.hutool.v7.cron.pattern; -import org.dromara.hutool.core.date.Week; +import cn.hutool.v7.core.date.Week; import java.time.LocalDateTime; import java.util.Calendar; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/builder/PartBuilder.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PartBuilder.java similarity index 95% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/builder/PartBuilder.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PartBuilder.java index 9c5ba3820..0568148e2 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/builder/PartBuilder.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PartBuilder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.cron.pattern.builder; +package cn.hutool.v7.cron.pattern.builder; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.collection.ListUtil; -import org.dromara.hutool.core.lang.builder.Builder; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.collection.ListUtil; +import cn.hutool.v7.core.lang.builder.Builder; import java.util.ArrayList; import java.util.List; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/builder/PatternBuilder.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PatternBuilder.java similarity index 92% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/builder/PatternBuilder.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PatternBuilder.java index a10e4611b..7f1f278d9 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/builder/PatternBuilder.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PatternBuilder.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.dromara.hutool.cron.pattern.builder; +package cn.hutool.v7.cron.pattern.builder; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.lang.builder.Builder; -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.cron.pattern.Part; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.lang.builder.Builder; +import cn.hutool.v7.core.text.StrJoiner; +import cn.hutool.v7.core.text.StrUtil; +import cn.hutool.v7.core.util.ObjUtil; +import cn.hutool.v7.cron.pattern.Part; /** * 定时任务表达式构建器 diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/builder/package-info.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/package-info.java similarity index 93% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/builder/package-info.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/package-info.java index 5f60ea197..420526a2b 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/builder/package-info.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/package-info.java @@ -20,4 +20,4 @@ * @author Looly * @since 6.0.0 */ -package org.dromara.hutool.cron.pattern.builder; +package cn.hutool.v7.cron.pattern.builder; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/AlwaysTrueMatcher.java similarity index 91% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/AlwaysTrueMatcher.java index 7feb2c7be..c6b631ce8 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/AlwaysTrueMatcher.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/AlwaysTrueMatcher.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.cron.pattern.matcher; +package cn.hutool.v7.cron.pattern.matcher; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.text.StrUtil; /** * 所有值匹配，始终返回{@code true} diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/BoolArrayMatcher.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/BoolArrayMatcher.java similarity index 92% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/BoolArrayMatcher.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/BoolArrayMatcher.java index fa394cce8..2ec06e1af 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/BoolArrayMatcher.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/BoolArrayMatcher.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.dromara.hutool.cron.pattern.matcher; +package cn.hutool.v7.cron.pattern.matcher; -import org.dromara.hutool.core.collection.CollUtil; -import org.dromara.hutool.core.lang.Assert; -import org.dromara.hutool.core.text.StrUtil; +import cn.hutool.v7.core.collection.CollUtil; +import cn.hutool.v7.core.lang.Assert; +import cn.hutool.v7.core.text.StrUtil; import java.util.Collections; import java.util.List; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/DayOfMonthMatcher.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/DayOfMonthMatcher.java similarity index 97% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/DayOfMonthMatcher.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/DayOfMonthMatcher.java index 3c42615b6..77f826860 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/DayOfMonthMatcher.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/DayOfMonthMatcher.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.dromara.hutool.cron.pattern.matcher; +package cn.hutool.v7.cron.pattern.matcher; -import org.dromara.hutool.core.date.Month; +import cn.hutool.v7.core.date.Month; import java.util.List; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PartMatcher.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/PartMatcher.java similarity index 95% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PartMatcher.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/PartMatcher.java index 0813fc94e..f70f5028e 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PartMatcher.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/PartMatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.cron.pattern.matcher; +package cn.hutool.v7.cron.pattern.matcher; import java.util.function.Predicate; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PatternMatcher.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/PatternMatcher.java similarity index 98% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PatternMatcher.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/PatternMatcher.java index 02d5207f2..32f4de559 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PatternMatcher.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/PatternMatcher.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.dromara.hutool.cron.pattern.matcher; +package cn.hutool.v7.cron.pattern.matcher; -import org.dromara.hutool.core.date.DateUtil; -import org.dromara.hutool.cron.pattern.Part; +import cn.hutool.v7.core.date.DateUtil; +import cn.hutool.v7.cron.pattern.Part; import java.time.Year; import java.util.Arrays; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/YearValueMatcher.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/YearValueMatcher.java similarity index 96% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/YearValueMatcher.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/YearValueMatcher.java index 51774ed97..fdb30b7fe 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/YearValueMatcher.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/YearValueMatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.cron.pattern.matcher; +package cn.hutool.v7.cron.pattern.matcher; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/package-info.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/package-info.java similarity index 75% rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/package-info.java rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/package-info.java index a1c047a87..e96ffe5c6 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/package-info.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/matcher/package-info.java @@ -16,8 +16,8 @@ /** * 定时任务表达式匹配器，内部使用
      - * 单一表达式使用{@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}组成， + * 单一表达式使用{@link cn.hutool.v7.cron.pattern.matcher.PatternMatcher}表示
      + * {@link cn.hutool.v7.cron.pattern.matcher.PatternMatcher}由7个{@link cn.hutool.v7.cron.pattern.matcher.PartMatcher}组成， * 分别表示定时任务表达式中的7个位置: * 
        *         0      1     2        3         4       5        6
@@ -27,4 +27,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.cron.pattern.matcher;
+package cn.hutool.v7.cron.pattern.matcher;
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/package-info.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/package-info.java
similarity index 94%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/package-info.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/package-info.java
index 1c767540b..444775baa 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/package-info.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.cron.pattern;
+package cn.hutool.v7.cron.pattern;
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PartParser.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/parser/PartParser.java
similarity index 94%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PartParser.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/parser/PartParser.java
index f6600922e..3f2ab04c3 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PartParser.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/parser/PartParser.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.pattern.parser;
+package cn.hutool.v7.cron.pattern.parser;
 
-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 cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.date.Month;
+import cn.hutool.v7.core.date.Week;
+import cn.hutool.v7.core.math.NumberUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.cron.CronException;
+import cn.hutool.v7.cron.pattern.Part;
+import cn.hutool.v7.cron.pattern.matcher.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PatternParser.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/parser/PatternParser.java
similarity index 89%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PatternParser.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/parser/PatternParser.java
index 8a5f9a6a1..959085214 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PatternParser.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/parser/PatternParser.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.pattern.parser;
+package cn.hutool.v7.cron.pattern.parser;
 
-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 cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.cron.CronException;
+import cn.hutool.v7.cron.pattern.Part;
+import cn.hutool.v7.cron.pattern.matcher.AlwaysTrueMatcher;
+import cn.hutool.v7.cron.pattern.matcher.PartMatcher;
+import cn.hutool.v7.cron.pattern.matcher.PatternMatcher;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/package-info.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/parser/package-info.java
similarity index 93%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/package-info.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/parser/package-info.java
index 5054eecd7..8f4e85cb3 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/package-info.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/parser/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.cron.pattern.parser;
+package cn.hutool.v7.cron.pattern.parser;
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/task/CronTask.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/task/CronTask.java
similarity index 94%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/task/CronTask.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/task/CronTask.java
index d92105177..73bbfb35f 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/task/CronTask.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/task/CronTask.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.task;
+package cn.hutool.v7.cron.task;
 
-import org.dromara.hutool.cron.pattern.CronPattern;
+import cn.hutool.v7.cron.pattern.CronPattern;
 
 /**
  * 定时作业，此类除了定义了作业，也定义了作业的执行周期以及ID。
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/task/InvokeTask.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/task/InvokeTask.java
similarity index 87%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/task/InvokeTask.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/task/InvokeTask.java
index 006451824..f37922a7e 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/task/InvokeTask.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/task/InvokeTask.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.task;
+package cn.hutool.v7.cron.task;
 
-import org.dromara.hutool.core.classloader.ClassLoaderUtil;
-import org.dromara.hutool.core.exception.HutoolException;
-import org.dromara.hutool.core.reflect.ConstructorUtil;
-import org.dromara.hutool.core.reflect.method.MethodUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.cron.CronException;
+import cn.hutool.v7.core.classloader.ClassLoaderUtil;
+import cn.hutool.v7.core.exception.HutoolException;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.reflect.method.MethodUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.cron.CronException;
 
 import java.lang.reflect.Method;
 
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/task/RunnableTask.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/task/RunnableTask.java
similarity index 96%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/task/RunnableTask.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/task/RunnableTask.java
index 7072f9151..196ca598d 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/task/RunnableTask.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/task/RunnableTask.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.task;
+package cn.hutool.v7.cron.task;
 
 /**
  * {@link Runnable} 的 {@link Task}包装
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/task/Task.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/task/Task.java
similarity index 97%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/task/Task.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/task/Task.java
index 4ea02c946..1303d015e 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/task/Task.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/task/Task.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.task;
+package cn.hutool.v7.cron.task;
 
 /**
  * 定时作业接口，通过实现execute方法执行具体的任务
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/task/package-info.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/task/package-info.java
similarity index 77%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/task/package-info.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/task/package-info.java
index 3a0e32edd..3acfe0168 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/task/package-info.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/task/package-info.java
@@ -16,9 +16,9 @@
 
 /**
  * 定时任务中作业的抽象封装和实现，包括Runnable实现和反射实现
      
- * {@link org.dromara.hutool.cron.task.Task}表示一个具体的任务，当满足时间匹配要求时，会执行{@link org.dromara.hutool.cron.task.Task#execute()}方法。
+ * {@link cn.hutool.v7.cron.task.Task}表示一个具体的任务，当满足时间匹配要求时，会执行{@link cn.hutool.v7.cron.task.Task#execute()}方法。
  *
  * @author Looly
  *
  */
-package org.dromara.hutool.cron.task;
+package cn.hutool.v7.cron.task;
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/SystemTimer.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/SystemTimer.java
similarity index 97%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/SystemTimer.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/SystemTimer.java
index 070b7a99e..9d62e9224 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/SystemTimer.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/SystemTimer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.timingwheel;
+package cn.hutool.v7.cron.timingwheel;
 
-import org.dromara.hutool.core.thread.ThreadUtil;
+import cn.hutool.v7.core.thread.ThreadUtil;
 
 import java.util.concurrent.DelayQueue;
 import java.util.concurrent.ExecutorService;
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTask.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/TimerTask.java
similarity index 97%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTask.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/TimerTask.java
index eed1bf341..54b49946c 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTask.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/TimerTask.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.timingwheel;
+package cn.hutool.v7.cron.timingwheel;
 
 /**
  * 延迟任务
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTaskList.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/TimerTaskList.java
similarity index 98%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTaskList.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/TimerTaskList.java
index 8b4b38a94..51e07d839 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTaskList.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/TimerTaskList.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.timingwheel;
+package cn.hutool.v7.cron.timingwheel;
 
 import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimingWheel.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/TimingWheel.java
similarity index 98%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimingWheel.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/TimingWheel.java
index 809ad4584..21b34ec4a 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimingWheel.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/TimingWheel.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.timingwheel;
+package cn.hutool.v7.cron.timingwheel;
 
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.log.LogUtil;
 
 import java.util.function.Consumer;
 
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/package-info.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/package-info.java
similarity index 96%
rename from hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/package-info.java
rename to hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/package-info.java
index ff79b1e81..e873d207c 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/package-info.java
+++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/timingwheel/package-info.java
@@ -24,4 +24,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.cron.timingwheel;
+package cn.hutool.v7.cron.timingwheel;
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/TaskTableTest.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/TaskTableTest.java
similarity index 91%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/TaskTableTest.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/TaskTableTest.java
index 14eeb1809..bbf5d1ae8 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/TaskTableTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/TaskTableTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron;
+package cn.hutool.v7.cron;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.data.id.IdUtil;
-import org.dromara.hutool.cron.pattern.CronPattern;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.data.id.IdUtil;
+import cn.hutool.v7.cron.pattern.CronPattern;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/AddAndRemoveMainTest.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/AddAndRemoveMainTest.java
similarity index 86%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/demo/AddAndRemoveMainTest.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/demo/AddAndRemoveMainTest.java
index 8bc400d99..927a88802 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/AddAndRemoveMainTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/AddAndRemoveMainTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.demo;
+package cn.hutool.v7.cron.demo;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.thread.ThreadUtil;
-import org.dromara.hutool.cron.CronUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.thread.ThreadUtil;
+import cn.hutool.v7.cron.CronUtil;
 
 public class AddAndRemoveMainTest {
 
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/CronTest.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/CronTest.java
similarity index 89%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/demo/CronTest.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/demo/CronTest.java
index fa0a31d33..1ce75ba3a 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/CronTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/CronTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.demo;
+package cn.hutool.v7.cron.demo;
 
-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 cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.thread.ThreadUtil;
+import cn.hutool.v7.cron.CronUtil;
+import cn.hutool.v7.cron.TaskExecutor;
+import cn.hutool.v7.cron.listener.TaskListener;
+import cn.hutool.v7.cron.task.Task;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/DeamonMainTest.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/DeamonMainTest.java
similarity index 79%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/demo/DeamonMainTest.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/demo/DeamonMainTest.java
index e40edb0e9..3dcc99de4 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/DeamonMainTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/DeamonMainTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.demo;
+package cn.hutool.v7.cron.demo;
 
-import org.dromara.hutool.core.thread.ThreadUtil;
-import org.dromara.hutool.cron.CronUtil;
-import org.dromara.hutool.cron.task.InvokeTask;
+import cn.hutool.v7.core.thread.ThreadUtil;
+import cn.hutool.v7.cron.CronUtil;
+import cn.hutool.v7.cron.task.InvokeTask;
 
 public class DeamonMainTest {
 	public static void main(final String[] args) {
 		// 测试守护线程是否对作业线程有效
-		CronUtil.schedule("*/2 * * * * *", new InvokeTask("org.dromara.hutool.cron.demo.TestJob.doWhileTest"));
+		CronUtil.schedule("*/2 * * * * *", new InvokeTask("cn.hutool.v7.cron.demo.TestJob.doWhileTest"));
 		// 当为守护线程时，stop方法调用后doWhileTest里的循环输出将终止，表示作业线程正常结束
 		// 当非守护线程时，stop方法调用后，不再产生新的作业，原作业正常执行。
 		CronUtil.setMatchSecond(true);
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/JobMainTest.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/JobMainTest.java
similarity index 90%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/demo/JobMainTest.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/demo/JobMainTest.java
index 591af4c14..ea0a598c5 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/JobMainTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/JobMainTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.demo;
+package cn.hutool.v7.cron.demo;
 
-import org.dromara.hutool.cron.CronUtil;
+import cn.hutool.v7.cron.CronUtil;
 
 /**
  * 定时任务样例
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/SimpleDemo.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/SimpleDemo.java
similarity index 87%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/demo/SimpleDemo.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/demo/SimpleDemo.java
index 576fd0141..8d94b57ba 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/SimpleDemo.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/SimpleDemo.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.demo;
+package cn.hutool.v7.cron.demo;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.cron.CronUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.cron.CronUtil;
 
 public class SimpleDemo {
 	public static void main(String[] args) {
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/TestJob.java
similarity index 85%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/demo/TestJob.java
index 08cfd4659..f92124893 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/TestJob.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.demo;
+package cn.hutool.v7.cron.demo;
 
-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.data.id.IdUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.thread.ThreadUtil;
+import cn.hutool.v7.core.data.id.IdUtil;
 
 /**
  * 测试定时任务，当触发到定时的时间点时，执行doTest方法
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob2.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/TestJob2.java
similarity index 85%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob2.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/demo/TestJob2.java
index 665b7d543..2cf629b55 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/TestJob2.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/TestJob2.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.demo;
+package cn.hutool.v7.cron.demo;
 
 import java.util.concurrent.TimeUnit;
 
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.thread.ThreadUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.thread.ThreadUtil;
 
 /**
  * 测试定时任务，当触发到定时的时间点时，执行doTest方法
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/package-info.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/package-info.java
similarity index 94%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/demo/package-info.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/demo/package-info.java
index 9d694a9af..552c29d5a 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/demo/package-info.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/demo/package-info.java
@@ -18,4 +18,4 @@
  * 定时任务示例
  *
  */
-package org.dromara.hutool.cron.demo;
+package cn.hutool.v7.cron.demo;
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternNextMatchTest.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/CronPatternNextMatchTest.java
similarity index 96%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternNextMatchTest.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/CronPatternNextMatchTest.java
index b37359f94..aeaacf749 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternNextMatchTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/CronPatternNextMatchTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.pattern;
+package cn.hutool.v7.cron.pattern;
 
-import org.dromara.hutool.core.date.DateField;
-import org.dromara.hutool.core.date.DateTime;
-import org.dromara.hutool.core.date.DateUtil;
+import cn.hutool.v7.core.date.DateField;
+import cn.hutool.v7.core.date.DateTime;
+import cn.hutool.v7.core.date.DateUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternTest.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/CronPatternTest.java
similarity index 97%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternTest.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/CronPatternTest.java
index 60e7aece6..a6b11ee93 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/CronPatternTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.pattern;
+package cn.hutool.v7.cron.pattern;
 
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.cron.CronException;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.cron.CronException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternUtilTest.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/CronPatternUtilTest.java
similarity index 96%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternUtilTest.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/CronPatternUtilTest.java
index 768f54012..0736d1fb3 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/CronPatternUtilTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/CronPatternUtilTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.pattern;
+package cn.hutool.v7.cron.pattern;
 
-import org.dromara.hutool.core.date.DateUtil;
+import cn.hutool.v7.core.date.DateUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/Issue3685Test.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/Issue3685Test.java
similarity index 94%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/Issue3685Test.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/Issue3685Test.java
index 520fd3f97..bb410ff48 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/Issue3685Test.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/Issue3685Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.pattern;
+package cn.hutool.v7.cron.pattern;
 
-import org.dromara.hutool.core.date.DateUtil;
+import cn.hutool.v7.core.date.DateUtil;
 import org.junit.jupiter.api.Test;
 
 import java.util.Date;
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/IssueI82CSHTest.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/IssueI82CSHTest.java
similarity index 89%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/IssueI82CSHTest.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/IssueI82CSHTest.java
index bc99acb5d..e366ea5bd 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/IssueI82CSHTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/IssueI82CSHTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.pattern;
+package cn.hutool.v7.cron.pattern;
 
-import org.dromara.hutool.core.date.DateTime;
-import org.dromara.hutool.core.date.DateUtil;
+import cn.hutool.v7.core.date.DateTime;
+import cn.hutool.v7.core.date.DateUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/IssueI92H5HTest.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/IssueI92H5HTest.java
similarity index 89%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/IssueI92H5HTest.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/IssueI92H5HTest.java
index e95ad675e..0c182c162 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/IssueI92H5HTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/IssueI92H5HTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.pattern;
+package cn.hutool.v7.cron.pattern;
 
-import org.dromara.hutool.core.date.DateTime;
-import org.dromara.hutool.core.date.DateUtil;
+import cn.hutool.v7.core.date.DateTime;
+import cn.hutool.v7.core.date.DateUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/IssueI9FQUATest.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/IssueI9FQUATest.java
similarity index 90%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/IssueI9FQUATest.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/IssueI9FQUATest.java
index da8a6d3a1..de297ab90 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/IssueI9FQUATest.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/IssueI9FQUATest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.pattern;
+package cn.hutool.v7.cron.pattern;
 
-import org.dromara.hutool.core.date.DateTime;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.date.StopWatch;
-import org.dromara.hutool.core.lang.Console;
+import cn.hutool.v7.core.date.DateTime;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.date.StopWatch;
+import cn.hutool.v7.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-cron/src/test/java/org/dromara/hutool/cron/pattern/builder/PatternBuilderTest.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/builder/PatternBuilderTest.java
similarity index 95%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/builder/PatternBuilderTest.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/builder/PatternBuilderTest.java
index 4d2bd9bd5..64cf4f961 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/builder/PatternBuilderTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/builder/PatternBuilderTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.pattern.builder;
+package cn.hutool.v7.cron.pattern.builder;
 
-import org.dromara.hutool.cron.CronException;
-import org.dromara.hutool.cron.pattern.Part;
+import cn.hutool.v7.cron.CronException;
+import cn.hutool.v7.cron.pattern.Part;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/parser/IssueI7SMP7Test.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/parser/IssueI7SMP7Test.java
similarity index 89%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/parser/IssueI7SMP7Test.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/parser/IssueI7SMP7Test.java
index 9f1468333..175c33828 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/pattern/parser/IssueI7SMP7Test.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/pattern/parser/IssueI7SMP7Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.pattern.parser;
+package cn.hutool.v7.cron.pattern.parser;
 
-import org.dromara.hutool.cron.pattern.matcher.PatternMatcher;
+import cn.hutool.v7.cron.pattern.matcher.PatternMatcher;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-cron/src/test/java/org/dromara/hutool/cron/timingwheel/Issue3090Test.java b/hutool-cron/src/test/java/cn/hutool/v7/cron/timingwheel/Issue3090Test.java
similarity index 95%
rename from hutool-cron/src/test/java/org/dromara/hutool/cron/timingwheel/Issue3090Test.java
rename to hutool-cron/src/test/java/cn/hutool/v7/cron/timingwheel/Issue3090Test.java
index 0d6667d3e..6397718bd 100644
--- a/hutool-cron/src/test/java/org/dromara/hutool/cron/timingwheel/Issue3090Test.java
+++ b/hutool-cron/src/test/java/cn/hutool/v7/cron/timingwheel/Issue3090Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.cron.timingwheel;
+package cn.hutool.v7.cron.timingwheel;
 
 public class Issue3090Test {
 	public static void main(String[] args) {
diff --git a/hutool-cron/src/test/resources/config/cron.setting b/hutool-cron/src/test/resources/config/cron.setting
index b224257f6..a2f2380f8 100644
--- a/hutool-cron/src/test/resources/config/cron.setting
+++ b/hutool-cron/src/test/resources/config/cron.setting
@@ -22,9 +22,9 @@
 # 3. 表达式为7位，此时兼容Quartz模式，第一位匹配秒，最后一位匹配年
 #------------------------------------------------------------------
 
-# demo.org.dromara.hutool.cron.TestJob.doTest = */1 * * * * *
+# demo.cn.hutool.v7.cron.TestJob.doTest = */1 * * * * *
 
-[org.dromara.hutool.cron.demo]
+[cn.hutool.v7.cron.demo]
 # 6位表达式在秒匹配模式下可用，此处表示每秒执行一次
 # TestJob.doTest = */1 * * * * *
 # 5位表达式在分匹配模式下可用，此处表示每分钟执行一次
diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml
index 6b031680f..60cc5403e 100755
--- a/hutool-crypto/pom.xml
+++ b/hutool-crypto/pom.xml
@@ -23,9 +23,9 @@
 	jar
 
 	
-		org.dromara.hutool
+		cn.hutool.v7
 		hutool-parent
-		6.0.0-M22
+		7.0.0.M1
 	
 
 	hutool-crypto
@@ -33,12 +33,12 @@
 	Hutool 加密解密
 
 	
-		org.dromara.hutool.crypto
+		cn.hutool.v7.crypto
 	
 
 	
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-core
 			${project.parent.version}
 		
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/Cipher.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/Cipher.java
similarity index 99%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/Cipher.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/Cipher.java
index 2ad9fbeb0..07b26bf23 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/Cipher.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/Cipher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
 import java.util.Arrays;
 
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CipherMode.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/CipherMode.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/CipherMode.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/CipherMode.java
index 0315e9532..d951811a1 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CipherMode.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/CipherMode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
 import javax.crypto.Cipher;
 
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CryptoException.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/CryptoException.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/CryptoException.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/CryptoException.java
index e9667424d..776cf8e14 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CryptoException.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/CryptoException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * 加密异常
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/JceCipher.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/JceCipher.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/JceCipher.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/JceCipher.java
index 0f7c9d5fb..62b9292e1 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/JceCipher.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/JceCipher.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
 
 import javax.crypto.ShortBufferException;
 import java.security.InvalidAlgorithmParameterException;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyStoreUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/KeyStoreUtil.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyStoreUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/KeyStoreUtil.java
index 0a51fd982..22eb245bd 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyStoreUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/KeyStoreUtil.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.file.FileNameUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.crypto.provider.GlobalProviderFactory;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileNameUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.crypto.provider.GlobalProviderFactory;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/KeyUtil.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/KeyUtil.java
index 361acfff5..d9952b91d 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/KeyUtil.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.codec.binary.Base64;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.crypto.asymmetric.AsymmetricAlgorithm;
-import org.dromara.hutool.crypto.bc.ECKeyUtil;
-import org.dromara.hutool.crypto.bc.SM2Constant;
-import org.dromara.hutool.crypto.cert.CertUtil;
-import org.dromara.hutool.crypto.provider.GlobalProviderFactory;
-import org.dromara.hutool.crypto.symmetric.SymmetricAlgorithm;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.crypto.asymmetric.AsymmetricAlgorithm;
+import cn.hutool.v7.crypto.bc.ECKeyUtil;
+import cn.hutool.v7.crypto.bc.SM2Constant;
+import cn.hutool.v7.crypto.cert.CertUtil;
+import cn.hutool.v7.crypto.provider.GlobalProviderFactory;
+import cn.hutool.v7.crypto.symmetric.SymmetricAlgorithm;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/Mode.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/Mode.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/Mode.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/Mode.java
index 050d6d59f..6e43decb7 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/Mode.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/Mode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
 /**
  * 模式
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/Padding.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/Padding.java
similarity index 98%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/Padding.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/Padding.java
index 67ced9534..82ea1e3d7 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/Padding.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/Padding.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
 /**
  * 补码方式
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SecureUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/SecureUtil.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/SecureUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/SecureUtil.java
index cc52907f7..5803f24a4 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SecureUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/SecureUtil.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
 import org.bouncycastle.crypto.AlphabetMapper;
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.codec.binary.Base64;
-import org.dromara.hutool.core.codec.binary.Hex;
-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.core.util.SystemUtil;
-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.MD5;
-import org.dromara.hutool.crypto.digest.mac.HMac;
-import org.dromara.hutool.crypto.digest.mac.HmacAlgorithm;
-import org.dromara.hutool.crypto.provider.GlobalProviderFactory;
-import org.dromara.hutool.crypto.symmetric.*;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.codec.binary.Hex;
+import cn.hutool.v7.core.lang.Validator;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.core.util.SystemUtil;
+import cn.hutool.v7.crypto.asymmetric.AsymmetricAlgorithm;
+import cn.hutool.v7.crypto.asymmetric.RSA;
+import cn.hutool.v7.crypto.digest.DigestAlgorithm;
+import cn.hutool.v7.crypto.digest.Digester;
+import cn.hutool.v7.crypto.digest.MD5;
+import cn.hutool.v7.crypto.digest.mac.HMac;
+import cn.hutool.v7.crypto.digest.mac.HmacAlgorithm;
+import cn.hutool.v7.crypto.provider.GlobalProviderFactory;
+import cn.hutool.v7.crypto.symmetric.*;
 
 import javax.crypto.Cipher;
 import javax.crypto.Mac;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SignUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/SignUtil.java
similarity index 93%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/SignUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/SignUtil.java
index 43b5205c0..3cc76cfdf 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SignUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/SignUtil.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
-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.provider.GlobalProviderFactory;
-import org.dromara.hutool.crypto.symmetric.SymmetricCrypto;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.crypto.asymmetric.AsymmetricAlgorithm;
+import cn.hutool.v7.crypto.asymmetric.Sign;
+import cn.hutool.v7.crypto.asymmetric.SignAlgorithm;
+import cn.hutool.v7.crypto.digest.DigestAlgorithm;
+import cn.hutool.v7.crypto.digest.Digester;
+import cn.hutool.v7.crypto.provider.GlobalProviderFactory;
+import cn.hutool.v7.crypto.symmetric.SymmetricCrypto;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.Provider;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SpecUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/SpecUtil.java
similarity index 96%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/SpecUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/SpecUtil.java
index d659118e7..c8887ed70 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/SpecUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/SpecUtil.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
-import org.dromara.hutool.core.util.RandomUtil;
+import cn.hutool.v7.core.util.RandomUtil;
 
 import javax.crypto.spec.*;
 import java.security.InvalidKeyException;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AbstractAsymmetricCrypto.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AbstractAsymmetricCrypto.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AbstractAsymmetricCrypto.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AbstractAsymmetricCrypto.java
index 97f25fbaf..18cd5425b 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AbstractAsymmetricCrypto.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AbstractAsymmetricCrypto.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
 import java.security.KeyPair;
 
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricAlgorithm.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricAlgorithm.java
similarity index 96%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricAlgorithm.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricAlgorithm.java
index 3ed7a6ad4..ebf42f880 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricAlgorithm.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricAlgorithm.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
 /**
  * 非对称算法类型
      
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricCrypto.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricCrypto.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricCrypto.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricCrypto.java
index e91579980..acf3f87f9 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricCrypto.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricCrypto.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
-import org.dromara.hutool.core.codec.binary.Base64;
-import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
-import org.dromara.hutool.crypto.*;
-import org.dromara.hutool.crypto.symmetric.SymmetricAlgorithm;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream;
+import cn.hutool.v7.crypto.*;
+import cn.hutool.v7.crypto.symmetric.SymmetricAlgorithm;
 
 import java.io.IOException;
 import java.security.*;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricDecryptor.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricDecryptor.java
similarity index 90%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricDecryptor.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricDecryptor.java
index 20c17f6ed..1f73f8770 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricDecryptor.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricDecryptor.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
-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 cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.crypto.SecureUtil;
 
 import java.io.InputStream;
 import java.nio.charset.Charset;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricEncryptor.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricEncryptor.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricEncryptor.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricEncryptor.java
index 88b373eea..4da527c57 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/AsymmetricEncryptor.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricEncryptor.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
-import org.dromara.hutool.core.codec.binary.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 cn.hutool.v7.core.codec.binary.HexUtil;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.util.ByteUtil;
 
 import java.io.InputStream;
 import java.nio.charset.Charset;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/BaseAsymmetric.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/BaseAsymmetric.java
similarity index 93%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/BaseAsymmetric.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/BaseAsymmetric.java
index 7e3d9447e..75a8c82a6 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/BaseAsymmetric.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/BaseAsymmetric.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
-import org.dromara.hutool.core.codec.binary.Base64;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.crypto.CryptoException;
-import org.dromara.hutool.crypto.KeyUtil;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.thread.lock.NoLock;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.KeyUtil;
 
 import java.io.Serializable;
 import java.security.Key;
@@ -115,7 +116,7 @@ public class BaseAsymmetric> implements Serializable
 	}
 
 	/**
-	 * 自定义锁，无需锁使用{@link org.dromara.hutool.core.thread.lock.NoLock}
+	 * 自定义锁，无需锁使用{@link NoLock}
 	 *
 	 * @param lock 自定义锁
 	 * @return this
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/ECIES.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/ECIES.java
similarity index 98%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/ECIES.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/ECIES.java
index 55ee5f9ad..6238977a5 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/ECIES.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/ECIES.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
 import java.security.KeyPair;
 
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/KeyType.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/KeyType.java
similarity index 96%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/KeyType.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/KeyType.java
index 9931b72bf..35bb6a54b 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/KeyType.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/KeyType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
 import javax.crypto.Cipher;
 
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/RSA.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/RSA.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/RSA.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/RSA.java
index b8c15f58b..9889b6c7e 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/RSA.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/RSA.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
-import org.dromara.hutool.crypto.CryptoException;
-import org.dromara.hutool.crypto.provider.GlobalProviderFactory;
-import org.dromara.hutool.crypto.KeyUtil;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.provider.GlobalProviderFactory;
+import cn.hutool.v7.crypto.KeyUtil;
 
 import java.math.BigInteger;
 import java.security.KeyPair;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SM2.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SM2.java
similarity index 98%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SM2.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SM2.java
index 9877ae6ca..b70192bbf 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SM2.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SM2.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Digest;
@@ -31,14 +31,14 @@ 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.core.array.ArrayUtil;
-import org.dromara.hutool.core.codec.binary.HexUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.crypto.CryptoException;
-import org.dromara.hutool.crypto.SecureUtil;
-import org.dromara.hutool.crypto.bc.ECKeyUtil;
-import org.dromara.hutool.crypto.bc.SmUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.codec.binary.HexUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.SecureUtil;
+import cn.hutool.v7.crypto.bc.ECKeyUtil;
+import cn.hutool.v7.crypto.bc.SmUtil;
 
 import java.io.InputStream;
 import java.math.BigInteger;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/Sign.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/Sign.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/Sign.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/Sign.java
index 57bbef70f..dbaaea97e 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/Sign.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/Sign.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
-import org.dromara.hutool.core.codec.binary.Base64;
-import org.dromara.hutool.core.codec.binary.HexUtil;
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.io.IoUtil;
-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 cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.codec.binary.HexUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.SecureUtil;
+import cn.hutool.v7.crypto.SignUtil;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SignAlgorithm.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SignAlgorithm.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SignAlgorithm.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SignAlgorithm.java
index 5fc10b872..83033b9b3 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SignAlgorithm.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SignAlgorithm.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
 /**
  * 签名算法类型
      
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/package-info.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/package-info.java
similarity index 93%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/package-info.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/package-info.java
index 1da43a378..50194a278 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/package-info.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCipher.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCipher.java
similarity index 91%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCipher.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCipher.java
index f658dcd41..e298deee3 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCipher.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCipher.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric.paillier;
+package cn.hutool.v7.crypto.asymmetric.paillier;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.crypto.Cipher;
-import org.dromara.hutool.crypto.CipherMode;
-import org.dromara.hutool.crypto.CryptoException;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.crypto.Cipher;
+import cn.hutool.v7.crypto.CipherMode;
+import cn.hutool.v7.crypto.CryptoException;
 
 import java.security.InvalidKeyException;
 import java.security.Key;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCipherSpiImpl.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCipherSpiImpl.java
similarity index 99%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCipherSpiImpl.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCipherSpiImpl.java
index bc2305dc3..b088695c3 100755
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCipherSpiImpl.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCipherSpiImpl.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric.paillier;
+package cn.hutool.v7.crypto.asymmetric.paillier;
 
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.crypto.CryptoException;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.crypto.CryptoException;
 
 import javax.crypto.Cipher;
 import javax.crypto.CipherSpi;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCrypto.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCrypto.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCrypto.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCrypto.java
index 4ada82866..ed65a3770 100755
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierCrypto.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCrypto.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric.paillier;
+package cn.hutool.v7.crypto.asymmetric.paillier;
 
-import org.dromara.hutool.crypto.CipherMode;
-import org.dromara.hutool.crypto.CryptoException;
-import org.dromara.hutool.crypto.asymmetric.AbstractAsymmetricCrypto;
-import org.dromara.hutool.crypto.asymmetric.KeyType;
+import cn.hutool.v7.crypto.CipherMode;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.asymmetric.AbstractAsymmetricCrypto;
+import cn.hutool.v7.crypto.asymmetric.KeyType;
 
 import javax.crypto.Cipher;
 import java.security.Key;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierKey.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierKey.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierKey.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierKey.java
index 6ad5687af..7e946b0de 100755
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierKey.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierKey.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric.paillier;
+package cn.hutool.v7.crypto.asymmetric.paillier;
 
 import java.math.BigInteger;
 import java.security.Key;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierKeyPairGenerator.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierKeyPairGenerator.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierKeyPairGenerator.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierKeyPairGenerator.java
index 7fffb11dc..2cb60c6be 100755
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierKeyPairGenerator.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierKeyPairGenerator.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric.paillier;
+package cn.hutool.v7.crypto.asymmetric.paillier;
 
-import org.dromara.hutool.core.util.RandomUtil;
+import cn.hutool.v7.core.util.RandomUtil;
 
 import java.math.BigInteger;
 import java.security.KeyPair;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierPrivateKey.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPrivateKey.java
similarity index 93%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierPrivateKey.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPrivateKey.java
index 5d1b06d1a..bdf0e4357 100755
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierPrivateKey.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPrivateKey.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric.paillier;
+package cn.hutool.v7.crypto.asymmetric.paillier;
 
-import org.dromara.hutool.core.lang.Assert;
+import cn.hutool.v7.core.lang.Assert;
 
 import java.math.BigInteger;
 import java.security.PrivateKey;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierPublicKey.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPublicKey.java
similarity index 92%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierPublicKey.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPublicKey.java
index d0ed3216d..72f63b5da 100755
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/PaillierPublicKey.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPublicKey.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric.paillier;
+package cn.hutool.v7.crypto.asymmetric.paillier;
 
-import org.dromara.hutool.core.lang.Assert;
+import cn.hutool.v7.core.lang.Assert;
 
 import java.math.BigInteger;
 import java.security.PublicKey;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/package-info.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/package-info.java
similarity index 92%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/package-info.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/package-info.java
index a69c82705..8c3866eb9 100755
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/paillier/package-info.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Revers
  */
-package org.dromara.hutool.crypto.asymmetric.paillier;
+package cn.hutool.v7.crypto.asymmetric.paillier;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/ASN1Util.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/ASN1Util.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/ASN1Util.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/ASN1Util.java
index f0e40be74..57132a735 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/ASN1Util.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/ASN1Util.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
 import org.bouncycastle.asn1.*;
 import org.bouncycastle.asn1.util.ASN1Dump;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x500.X500NameBuilder;
 import org.bouncycastle.asn1.x500.style.BCStyle;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
-import org.dromara.hutool.crypto.CryptoException;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream;
+import cn.hutool.v7.crypto.CryptoException;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/BCCipher.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/BCCipher.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/BCCipher.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/BCCipher.java
index ece23c41c..0f793821b 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/BCCipher.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/BCCipher.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
 import org.bouncycastle.crypto.*;
 import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.wrapper.Wrapper;
-import org.dromara.hutool.crypto.Cipher;
-import org.dromara.hutool.crypto.CipherMode;
-import org.dromara.hutool.crypto.CryptoException;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.wrapper.Wrapper;
+import cn.hutool.v7.crypto.Cipher;
+import cn.hutool.v7.crypto.CipherMode;
+import cn.hutool.v7.crypto.CryptoException;
 
 import java.util.Arrays;
 
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/BCUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/BCUtil.java
similarity index 96%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/BCUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/BCUtil.java
index 6310d7394..b050e0f9b 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/BCUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/BCUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
@@ -29,9 +29,9 @@ import org.bouncycastle.crypto.paddings.ZeroBytePadding;
 import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
 import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.crypto.Mode;
-import org.dromara.hutool.crypto.Padding;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.crypto.Mode;
+import cn.hutool.v7.crypto.Padding;
 
 import java.io.IOException;
 import java.security.PrivateKey;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/ECKeySpecUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/ECKeySpecUtil.java
similarity index 99%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/ECKeySpecUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/ECKeySpecUtil.java
index 525a2ca6e..a8cb28dce 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/ECKeySpecUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/ECKeySpecUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
 import org.bouncycastle.jcajce.spec.OpenSSHPrivateKeySpec;
 import org.bouncycastle.jcajce.spec.OpenSSHPublicKeySpec;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/ECKeyUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/ECKeyUtil.java
similarity index 98%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/ECKeyUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/ECKeyUtil.java
index e74fa1cfb..121712f8c 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/ECKeyUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/ECKeyUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
@@ -35,10 +35,10 @@ import org.bouncycastle.jce.spec.ECPrivateKeySpec;
 import org.bouncycastle.math.ec.ECCurve;
 import org.bouncycastle.math.ec.ECPoint;
 import org.bouncycastle.util.BigIntegers;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.crypto.CryptoException;
-import org.dromara.hutool.crypto.KeyUtil;
-import org.dromara.hutool.crypto.SecureUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.SecureUtil;
 
 import java.io.IOException;
 import java.math.BigInteger;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/OpensslKeyUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/OpensslKeyUtil.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/OpensslKeyUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/OpensslKeyUtil.java
index 5911f5d0f..18dc629f5 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/OpensslKeyUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/OpensslKeyUtil.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
-import org.dromara.hutool.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IORuntimeException;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.cert.X509CertificateHolder;
@@ -34,8 +34,8 @@ import org.bouncycastle.operator.OperatorCreationException;
 import org.bouncycastle.pkcs.PKCS10CertificationRequest;
 import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
 import org.bouncycastle.pkcs.PKCSException;
-import org.dromara.hutool.crypto.CryptoException;
-import org.dromara.hutool.crypto.provider.GlobalProviderFactory;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.provider.GlobalProviderFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/PemUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/PemUtil.java
similarity index 96%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/PemUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/PemUtil.java
index 25f3c9553..85f8238be 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/PemUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/PemUtil.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
 import org.bouncycastle.util.io.pem.PemObject;
 import org.bouncycastle.util.io.pem.PemObjectGenerator;
 import org.bouncycastle.util.io.pem.PemReader;
 import org.bouncycastle.util.io.pem.PemWriter;
-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.crypto.KeyUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.crypto.KeyUtil;
 
 import java.io.*;
 import java.security.Key;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/SM2Constant.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/SM2Constant.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/SM2Constant.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/SM2Constant.java
index 584447b4b..c640b11d1 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/SM2Constant.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/SM2Constant.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.crypto.params.ECDomainParameters;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/SmUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/SmUtil.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/SmUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/SmUtil.java
index d25a8378f..b35c06731 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/SmUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/SmUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
 import org.bouncycastle.crypto.digests.SM3Digest;
 import org.bouncycastle.crypto.params.ECDomainParameters;
@@ -23,17 +23,17 @@ import org.bouncycastle.crypto.params.ECPublicKeyParameters;
 import org.bouncycastle.crypto.signers.StandardDSAEncoding;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.encoders.Hex;
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.crypto.CryptoException;
-import org.dromara.hutool.crypto.asymmetric.SM2;
-import org.dromara.hutool.crypto.digest.SM3;
-import org.dromara.hutool.crypto.digest.mac.BCHMacEngine;
-import org.dromara.hutool.crypto.digest.mac.HMac;
-import org.dromara.hutool.crypto.digest.mac.HmacAlgorithm;
-import org.dromara.hutool.crypto.digest.mac.MacEngine;
-import org.dromara.hutool.crypto.symmetric.SM4;
-import org.dromara.hutool.crypto.symmetric.SymmetricCrypto;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.asymmetric.SM2;
+import cn.hutool.v7.crypto.digest.SM3;
+import cn.hutool.v7.crypto.digest.mac.BCHMacEngine;
+import cn.hutool.v7.crypto.digest.mac.HMac;
+import cn.hutool.v7.crypto.digest.mac.HmacAlgorithm;
+import cn.hutool.v7.crypto.digest.mac.MacEngine;
+import cn.hutool.v7.crypto.symmetric.SM4;
+import cn.hutool.v7.crypto.symmetric.SymmetricCrypto;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/package-info.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/package-info.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/package-info.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/package-info.java
index 8a2a264cc..811032f38 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/package-info.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/bc/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/cert/CertUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/cert/CertUtil.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/cert/CertUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/cert/CertUtil.java
index e5e66ca12..623208d86 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/cert/CertUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/cert/CertUtil.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.cert;
+package cn.hutool.v7.crypto.cert;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.crypto.CryptoException;
-import org.dromara.hutool.crypto.KeyStoreUtil;
-import org.dromara.hutool.crypto.provider.GlobalProviderFactory;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.KeyStoreUtil;
+import cn.hutool.v7.crypto.provider.GlobalProviderFactory;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/cert/package-info.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/cert/package-info.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/cert/package-info.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/cert/package-info.java
index 9496cd6ad..ad325eb7a 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/cert/package-info.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/cert/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.crypto.cert;
+package cn.hutool.v7.crypto.cert;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/Argon2.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/Argon2.java
similarity index 98%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/Argon2.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/Argon2.java
index 39b974fc6..f95673c0b 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/Argon2.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/Argon2.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
 import org.bouncycastle.crypto.generators.Argon2BytesGenerator;
 import org.bouncycastle.crypto.params.Argon2Parameters;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/BCrypt.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/BCrypt.java
similarity index 99%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/BCrypt.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/BCrypt.java
index 9976ee3c4..ecb1d0aab 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/BCrypt.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/BCrypt.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 
 import java.security.SecureRandom;
 
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigestAlgorithm.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/DigestAlgorithm.java
similarity index 96%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigestAlgorithm.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/DigestAlgorithm.java
index 5b570126a..b601a4aff 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigestAlgorithm.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/DigestAlgorithm.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
 /**
  * 摘要算法类型
      
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigestUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/DigestUtil.java
similarity index 98%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigestUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/DigestUtil.java
index 73dff29d9..1bcc21612 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigestUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/DigestUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.crypto.digest.mac.HMac;
-import org.dromara.hutool.crypto.digest.mac.HmacAlgorithm;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.crypto.digest.mac.HMac;
+import cn.hutool.v7.crypto.digest.mac.HmacAlgorithm;
 
 import javax.crypto.SecretKey;
 import java.io.File;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/Digester.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/Digester.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/Digester.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/Digester.java
index 51851cd3d..c98dee1a0 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/Digester.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/Digester.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.codec.binary.HexUtil;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-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.util.ByteUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.crypto.CryptoException;
-import org.dromara.hutool.crypto.SecureUtil;
-import org.dromara.hutool.crypto.provider.GlobalProviderFactory;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.codec.binary.HexUtil;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.SecureUtil;
+import cn.hutool.v7.crypto.provider.GlobalProviderFactory;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigesterFactory.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/DigesterFactory.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigesterFactory.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/DigesterFactory.java
index 2773c2769..52575733c 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/DigesterFactory.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/DigesterFactory.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
-import org.dromara.hutool.crypto.SecureUtil;
-import org.dromara.hutool.crypto.provider.GlobalProviderFactory;
+import cn.hutool.v7.crypto.SecureUtil;
+import cn.hutool.v7.crypto.provider.GlobalProviderFactory;
 
 import java.security.MessageDigest;
 import java.security.Provider;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/MD5.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/MD5.java
similarity index 98%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/MD5.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/MD5.java
index a720d7acf..93fb1c13b 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/MD5.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/MD5.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/SM3.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/SM3.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/SM3.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/SM3.java
index 10c0fdaca..7d9806510 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/SM3.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/SM3.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
 /**
  * 国密SM3杂凑（摘要）算法
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/BCHMacEngine.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/BCHMacEngine.java
similarity index 98%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/BCHMacEngine.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/BCHMacEngine.java
index 4892ea4cb..110fc0f3f 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/BCHMacEngine.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/BCHMacEngine.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest.mac;
+package cn.hutool.v7.crypto.digest.mac;
 
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Digest;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/BCMacEngine.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/BCMacEngine.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/BCMacEngine.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/BCMacEngine.java
index 4ac17f0bc..0a10b1b45 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/BCMacEngine.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/BCMacEngine.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest.mac;
+package cn.hutool.v7.crypto.digest.mac;
 
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Mac;
 import org.bouncycastle.crypto.params.KeyParameter;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
 
 /**
  * BouncyCastle的MAC算法实现引擎，使用{@link Mac} 实现摘要
      
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/CBCBlockCipherMacEngine.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/CBCBlockCipherMacEngine.java
similarity index 98%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/CBCBlockCipherMacEngine.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/CBCBlockCipherMacEngine.java
index 4e4fc1888..a2efd5706 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/CBCBlockCipherMacEngine.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/CBCBlockCipherMacEngine.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest.mac;
+package cn.hutool.v7.crypto.digest.mac;
 
 import org.bouncycastle.crypto.BlockCipher;
 import org.bouncycastle.crypto.CipherParameters;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/HMac.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/HMac.java
similarity index 98%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/HMac.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/HMac.java
index 2c606a7b4..975ca163f 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/HMac.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/HMac.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest.mac;
+package cn.hutool.v7.crypto.digest.mac;
 
 import javax.crypto.spec.SecretKeySpec;
 import java.security.Key;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/HmacAlgorithm.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/HmacAlgorithm.java
similarity index 96%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/HmacAlgorithm.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/HmacAlgorithm.java
index b8ddb2e50..a4a8c6835 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/HmacAlgorithm.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/HmacAlgorithm.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest.mac;
+package cn.hutool.v7.crypto.digest.mac;
 
 /**
  * HMAC算法类型
      
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/JCEMacEngine.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/JCEMacEngine.java
similarity index 92%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/JCEMacEngine.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/JCEMacEngine.java
index ae8b80640..d7d29b2e3 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/JCEMacEngine.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/JCEMacEngine.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest.mac;
+package cn.hutool.v7.crypto.digest.mac;
 
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-import org.dromara.hutool.crypto.CryptoException;
-import org.dromara.hutool.crypto.KeyUtil;
-import org.dromara.hutool.crypto.SecureUtil;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.SecureUtil;
 
 import javax.crypto.Mac;
 import javax.crypto.SecretKey;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/Mac.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/Mac.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/Mac.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/Mac.java
index bb65e35f1..c617bd347 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/Mac.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/Mac.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest.mac;
+package cn.hutool.v7.crypto.digest.mac;
 
-import org.dromara.hutool.core.codec.binary.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 cn.hutool.v7.core.codec.binary.HexUtil;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.crypto.CryptoException;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/MacEngine.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/MacEngine.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/MacEngine.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/MacEngine.java
index dd0a4f49b..65adbee26 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/MacEngine.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/MacEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest.mac;
+package cn.hutool.v7.crypto.digest.mac;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.crypto.CryptoException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.crypto.CryptoException;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/MacEngineFactory.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/MacEngineFactory.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/MacEngineFactory.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/MacEngineFactory.java
index 4432ccb06..764f0383d 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/MacEngineFactory.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/MacEngineFactory.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest.mac;
+package cn.hutool.v7.crypto.digest.mac;
 
-import org.dromara.hutool.crypto.bc.SmUtil;
+import cn.hutool.v7.crypto.bc.SmUtil;
 
 import java.security.Key;
 import java.security.spec.AlgorithmParameterSpec;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/SM4MacEngine.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/SM4MacEngine.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/SM4MacEngine.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/SM4MacEngine.java
index 299787fa9..d9e0bce97 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/SM4MacEngine.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/SM4MacEngine.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest.mac;
+package cn.hutool.v7.crypto.digest.mac;
 
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.engines.SM4Engine;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/package-info.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/package-info.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/package-info.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/package-info.java
index 8903a3d52..6a2605c05 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/mac/package-info.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/package-info.java
@@ -44,4 +44,4 @@
  * @author Looly
  * @since 4.5.13
  */
-package org.dromara.hutool.crypto.digest.mac;
+package cn.hutool.v7.crypto.digest.mac;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/HOTP.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/otp/HOTP.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/HOTP.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/otp/HOTP.java
index 2e0ab4fd7..b463c600d 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/HOTP.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/otp/HOTP.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest.otp;
+package cn.hutool.v7.crypto.digest.otp;
 
-import org.dromara.hutool.core.codec.binary.Base32;
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.crypto.digest.mac.HMac;
-import org.dromara.hutool.crypto.digest.mac.HmacAlgorithm;
+import cn.hutool.v7.core.codec.binary.Base32;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.crypto.digest.mac.HMac;
+import cn.hutool.v7.crypto.digest.mac.HmacAlgorithm;
 
 /**
  * 
      HMAC-based one-time passwords (HOTP) 基于HMAC算法一次性密码生成器，
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/TOTP.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/otp/TOTP.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/TOTP.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/otp/TOTP.java
index dc4930894..2c435fd1f 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/TOTP.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/otp/TOTP.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest.otp;
+package cn.hutool.v7.crypto.digest.otp;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.crypto.digest.mac.HmacAlgorithm;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.crypto.digest.mac.HmacAlgorithm;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/package-info.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/otp/package-info.java
similarity index 96%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/package-info.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/otp/package-info.java
index 76cff6707..9847bf5dc 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/otp/package-info.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/otp/package-info.java
@@ -33,4 +33,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.crypto.digest.otp;
+package cn.hutool.v7.crypto.digest.otp;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/package-info.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/package-info.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/package-info.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/package-info.java
index fbfb175e9..1017029db 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/digest/package-info.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/OpenSSLPBEInputStream.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/OpenSSLPBEInputStream.java
similarity index 89%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/OpenSSLPBEInputStream.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/OpenSSLPBEInputStream.java
index f27cd6607..5c113b3f2 100755
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/OpenSSLPBEInputStream.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/OpenSSLPBEInputStream.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.openssl;
+package cn.hutool.v7.crypto.openssl;
 
-import org.dromara.hutool.crypto.CryptoException;
-import org.dromara.hutool.crypto.KeyUtil;
-import org.dromara.hutool.crypto.SecureUtil;
-import org.dromara.hutool.crypto.SpecUtil;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.SecureUtil;
+import cn.hutool.v7.crypto.SpecUtil;
 
 import javax.crypto.Cipher;
 import javax.crypto.CipherInputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/OpenSSLPBEOutputStream.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/OpenSSLPBEOutputStream.java
similarity index 87%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/OpenSSLPBEOutputStream.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/OpenSSLPBEOutputStream.java
index 956c6c3cb..745276d54 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/OpenSSLPBEOutputStream.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/OpenSSLPBEOutputStream.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.openssl;
+package cn.hutool.v7.crypto.openssl;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.crypto.CryptoException;
-import org.dromara.hutool.crypto.KeyUtil;
-import org.dromara.hutool.crypto.SecureUtil;
-import org.dromara.hutool.crypto.SpecUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.crypto.CryptoException;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.SecureUtil;
+import cn.hutool.v7.crypto.SpecUtil;
 
 import javax.crypto.Cipher;
 import javax.crypto.CipherOutputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/OpenSSLSaltParser.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/OpenSSLSaltParser.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/OpenSSLSaltParser.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/OpenSSLSaltParser.java
index 50b87f55b..98b929843 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/OpenSSLSaltParser.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/OpenSSLSaltParser.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.openssl;
+package cn.hutool.v7.crypto.openssl;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ByteUtil;
-import org.dromara.hutool.crypto.digest.MD5;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.crypto.digest.MD5;
 
 import java.security.MessageDigest;
 import java.util.Arrays;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/SaltMagic.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/SaltMagic.java
similarity index 92%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/SaltMagic.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/SaltMagic.java
index 382bf65ba..7638fc241 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/SaltMagic.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/SaltMagic.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.openssl;
+package cn.hutool.v7.crypto.openssl;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ByteUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ByteUtil;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/package-info.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/package-info.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/package-info.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/package-info.java
index c4be65533..53e27a91b 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/openssl/package-info.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/openssl/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.crypto.openssl;
+package cn.hutool.v7.crypto.openssl;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/package-info.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/package-info.java
similarity index 96%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/package-info.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/package-info.java
index c9429b7b5..18e51c3aa 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/package-info.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/package-info.java
@@ -26,4 +26,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/provider/BouncyCastleProviderFactory.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/provider/BouncyCastleProviderFactory.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/provider/BouncyCastleProviderFactory.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/provider/BouncyCastleProviderFactory.java
index 470c2a53a..147f56592 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/provider/BouncyCastleProviderFactory.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/provider/BouncyCastleProviderFactory.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.provider;
+package cn.hutool.v7.crypto.provider;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.dromara.hutool.core.lang.Assert;
+import cn.hutool.v7.core.lang.Assert;
 
 import java.security.Provider;
 import java.security.Security;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/provider/GlobalProviderFactory.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/provider/GlobalProviderFactory.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/provider/GlobalProviderFactory.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/provider/GlobalProviderFactory.java
index cf0bdfe64..dec5d90cc 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/provider/GlobalProviderFactory.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/provider/GlobalProviderFactory.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.provider;
+package cn.hutool.v7.crypto.provider;
 
-import org.dromara.hutool.core.spi.SpiUtil;
-import org.dromara.hutool.crypto.SecureUtil;
+import cn.hutool.v7.core.spi.SpiUtil;
+import cn.hutool.v7.crypto.SecureUtil;
 
 import java.security.Provider;
 
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/provider/ProviderFactory.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/provider/ProviderFactory.java
similarity index 87%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/provider/ProviderFactory.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/provider/ProviderFactory.java
index 2130c1f38..eaee9826d 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/provider/ProviderFactory.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/provider/ProviderFactory.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.provider;
+package cn.hutool.v7.crypto.provider;
 
 import java.security.Provider;
 
 /**
  * Provider对象生产工厂类
      
  * 通过SPI方式加载可用的{@link ProviderFactory}，并创建对应的{@link Provider}
      
- * spi定义在：META-INF/services/org.dromara.hutool.crypto.provider.ProviderFactory
+ * spi定义在：META-INF/services/cn.hutool.v7.crypto.provider.ProviderFactory
  *
  * @author Looly
  * @since 6.0.0
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/provider/package-info.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/provider/package-info.java
similarity index 88%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/provider/package-info.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/provider/package-info.java
index 820cf407e..fac4b3b12 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/provider/package-info.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/provider/package-info.java
@@ -16,7 +16,7 @@
 
 /**
  * {@link java.security.Provider}相关封装，通过SPI机制，提供灵活的Provider注入。
      
- * spi定义在：META-INF/services/org.dromara.hutool.crypto.provider.ProviderFactory
+ * spi定义在：META-INF/services/cn.hutool.v7.crypto.provider.ProviderFactory
  *
  * 
        *                    GlobalProviderFactory（单例持有Provider）
@@ -30,4 +30,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.crypto.provider;
+package cn.hutool.v7.crypto.provider;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/sasl/SaslUtil.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/sasl/SaslUtil.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/sasl/SaslUtil.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/sasl/SaslUtil.java
index b72e2afa5..ca5c7483a 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/sasl/SaslUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/sasl/SaslUtil.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.sasl;
+package cn.hutool.v7.crypto.sasl;
 
-import org.dromara.hutool.crypto.CryptoException;
+import cn.hutool.v7.crypto.CryptoException;
 
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.sasl.Sasl;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/sasl/package-info.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/sasl/package-info.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/sasl/package-info.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/sasl/package-info.java
index 246d4e988..05c0f7e52 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/sasl/package-info.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/sasl/package-info.java
@@ -17,4 +17,4 @@
 /**
  * 解简单认证和安全层（SASL）封装，一般用于保证通信安全
  */
-package org.dromara.hutool.crypto.sasl;
+package cn.hutool.v7.crypto.sasl;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/AES.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/AES.java
similarity index 96%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/AES.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/AES.java
index 58f0c3a21..48c12bd99 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/AES.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/AES.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-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 cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.Mode;
+import cn.hutool.v7.crypto.Padding;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/ChaCha20.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ChaCha20.java
similarity index 92%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/ChaCha20.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ChaCha20.java
index d5325acab..fa1f388e1 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/ChaCha20.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ChaCha20.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.crypto.KeyUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.crypto.KeyUtil;
 
 import javax.crypto.spec.IvParameterSpec;
 
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/DES.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DES.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/DES.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DES.java
index d540644e2..4c8d137af 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/DES.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DES.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-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 cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.Mode;
+import cn.hutool.v7.crypto.Padding;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/DESede.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DESede.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/DESede.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DESede.java
index 1bc496754..0a16d52a2 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/DESede.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DESede.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-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 cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.Mode;
+import cn.hutool.v7.crypto.Padding;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/FPE.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/FPE.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/FPE.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/FPE.java
index 6f7ca3645..c1f5e1fd7 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/FPE.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/FPE.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.crypto.KeyUtil;
-import org.dromara.hutool.crypto.Padding;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.Padding;
 import org.bouncycastle.crypto.AlphabetMapper;
 import org.bouncycastle.jcajce.spec.FPEParameterSpec;
 
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/PBKDF2.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/PBKDF2.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/PBKDF2.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/PBKDF2.java
index 27ec0e523..e357fa106 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/PBKDF2.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/PBKDF2.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.core.codec.binary.HexUtil;
-import org.dromara.hutool.crypto.KeyUtil;
+import cn.hutool.v7.core.codec.binary.HexUtil;
+import cn.hutool.v7.crypto.KeyUtil;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.PBEKeySpec;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SM4.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SM4.java
similarity index 94%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SM4.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SM4.java
index e1847bd0b..191c4e4bd 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SM4.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SM4.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-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 cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.Mode;
+import cn.hutool.v7.crypto.Padding;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricAlgorithm.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricAlgorithm.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricAlgorithm.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricAlgorithm.java
index 2512bb6ad..65ac67369 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricAlgorithm.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricAlgorithm.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
 /**
  * 对称算法类型
      
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricCrypto.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricCrypto.java
similarity index 96%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricCrypto.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricCrypto.java
index 70d863ffa..af76efe00 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricCrypto.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricCrypto.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.codec.binary.HexUtil;
-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.text.StrUtil;
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.crypto.*;
-import org.dromara.hutool.crypto.openssl.OpenSSLSaltParser;
-import org.dromara.hutool.crypto.openssl.SaltMagic;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.codec.binary.HexUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.Opt;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.crypto.*;
+import cn.hutool.v7.crypto.openssl.OpenSSLSaltParser;
+import cn.hutool.v7.crypto.openssl.SaltMagic;
 
 import javax.crypto.Cipher;
 import javax.crypto.CipherInputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricDecryptor.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricDecryptor.java
similarity index 92%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricDecryptor.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricDecryptor.java
index ba26008a9..48d95f716 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricDecryptor.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricDecryptor.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-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 cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.crypto.SecureUtil;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricEncryptor.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricEncryptor.java
similarity index 91%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricEncryptor.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricEncryptor.java
index 978524dcb..dcf9f699b 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricEncryptor.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricEncryptor.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.core.codec.binary.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 cn.hutool.v7.core.codec.binary.HexUtil;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/Vigenere.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/Vigenere.java
similarity index 98%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/Vigenere.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/Vigenere.java
index b7d9909a8..1b19875ae 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/Vigenere.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/Vigenere.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
 /**
  * 维吉尼亚密码实现。
      
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/XXTEA.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/XXTEA.java
similarity index 97%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/XXTEA.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/XXTEA.java
index c933bfd2b..2d1853067 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/XXTEA.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/XXTEA.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.core.io.IoUtil;
+import cn.hutool.v7.core.io.IoUtil;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/ZUC.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ZUC.java
similarity index 95%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/ZUC.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ZUC.java
index 356b78773..6ff01b727 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/ZUC.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ZUC.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.crypto.KeyUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.crypto.KeyUtil;
 
 import javax.crypto.spec.IvParameterSpec;
 
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/package-info.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/package-info.java
similarity index 93%
rename from hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/package-info.java
rename to hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/package-info.java
index 02186bc59..6cbfd3baf 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/package-info.java
+++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
diff --git a/hutool-crypto/src/main/resources/META-INF/services/org.dromara.hutool.crypto.provider.ProviderFactory b/hutool-crypto/src/main/resources/META-INF/services/cn.hutool.v7.crypto.provider.ProviderFactory
similarity index 90%
rename from hutool-crypto/src/main/resources/META-INF/services/org.dromara.hutool.crypto.provider.ProviderFactory
rename to hutool-crypto/src/main/resources/META-INF/services/cn.hutool.v7.crypto.provider.ProviderFactory
index d12d74006..1a0c5fdf0 100644
--- a/hutool-crypto/src/main/resources/META-INF/services/org.dromara.hutool.crypto.provider.ProviderFactory
+++ b/hutool-crypto/src/main/resources/META-INF/services/cn.hutool.v7.crypto.provider.ProviderFactory
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-org.dromara.hutool.crypto.provider.BouncyCastleProviderFactory
+cn.hutool.v7.crypto.provider.BouncyCastleProviderFactory
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/IssueI99FKETest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/IssueI99FKETest.java
similarity index 97%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/IssueI99FKETest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/IssueI99FKETest.java
index f7f255011..9cd28b69c 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/IssueI99FKETest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/IssueI99FKETest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
 import org.bouncycastle.jce.interfaces.ECPrivateKey;
 import org.bouncycastle.jce.interfaces.ECPublicKey;
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/KeyUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/KeyUtilTest.java
similarity index 96%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/KeyUtilTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/KeyUtilTest.java
index 28d3f7ebf..708d22df2 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/KeyUtilTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/KeyUtilTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
-import org.dromara.hutool.crypto.provider.GlobalProviderFactory;
+import cn.hutool.v7.crypto.provider.GlobalProviderFactory;
 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/org/dromara/hutool/crypto/SignUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/SignUtilTest.java
similarity index 90%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/SignUtilTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/SignUtilTest.java
index def408421..e41f0fed8 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/SignUtilTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/SignUtilTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto;
+package cn.hutool.v7.crypto;
 
-import org.dromara.hutool.core.codec.binary.Base64;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.crypto.asymmetric.Sign;
-import org.dromara.hutool.crypto.asymmetric.SignAlgorithm;
-import org.dromara.hutool.crypto.bc.PemUtil;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.crypto.asymmetric.Sign;
+import cn.hutool.v7.crypto.asymmetric.SignAlgorithm;
+import cn.hutool.v7.crypto.bc.PemUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/ECIESTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/ECIESTest.java
similarity index 95%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/ECIESTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/ECIESTest.java
index b110f176e..b2bd23cc1 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/ECIESTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/ECIESTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
 import org.bouncycastle.jce.spec.IESParameterSpec;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/Issue3728Test.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/Issue3728Test.java
similarity index 93%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/Issue3728Test.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/Issue3728Test.java
index 996bd33ef..991d19725 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/Issue3728Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/Issue3728Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/IssueIB1GVPTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/IssueIB1GVPTest.java
similarity index 89%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/IssueIB1GVPTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/IssueIB1GVPTest.java
index e11afcf02..5d2e8ccec 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/IssueIB1GVPTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/IssueIB1GVPTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ByteUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/PaillierTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/PaillierTest.java
similarity index 87%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/PaillierTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/PaillierTest.java
index 5b1599954..be4cc519f 100755
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/PaillierTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/PaillierTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.crypto.asymmetric.paillier.PaillierCrypto;
-import org.dromara.hutool.crypto.asymmetric.paillier.PaillierKeyPairGenerator;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.crypto.asymmetric.paillier.PaillierCrypto;
+import cn.hutool.v7.crypto.asymmetric.paillier.PaillierKeyPairGenerator;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/RSATest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/RSATest.java
similarity index 95%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/RSATest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/RSATest.java
index b59039322..1dfd4633b 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/RSATest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/RSATest.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.codec.binary.Base64;
-import org.dromara.hutool.core.codec.binary.HexUtil;
-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.core.util.RandomUtil;
-import org.dromara.hutool.crypto.KeyUtil;
-import org.dromara.hutool.crypto.SecureUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.codec.binary.HexUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.SecureUtil;
 import org.junit.jupiter.api.Test;
 
 import javax.crypto.Cipher;
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SM2Test.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/SM2Test.java
similarity index 96%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SM2Test.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/SM2Test.java
index 438afbabc..17277c62f 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SM2Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/SM2Test.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
-import org.dromara.hutool.core.codec.binary.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.bc.ECKeyUtil;
-import org.dromara.hutool.crypto.KeyUtil;
-import org.dromara.hutool.crypto.SecureUtil;
-import org.dromara.hutool.crypto.bc.SM2Constant;
-import org.dromara.hutool.crypto.bc.SmUtil;
+import cn.hutool.v7.core.codec.binary.HexUtil;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.crypto.bc.ECKeyUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.SecureUtil;
+import cn.hutool.v7.crypto.bc.SM2Constant;
+import cn.hutool.v7.crypto.bc.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/org/dromara/hutool/crypto/asymmetric/SignTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/SignTest.java
similarity index 96%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SignTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/SignTest.java
index 8d3d7cb5a..5c00d1984 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SignTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/SignTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.util.ByteUtil;
-import org.dromara.hutool.crypto.SignUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.crypto.SignUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SmForJsTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/SmForJsTest.java
similarity index 96%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SmForJsTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/SmForJsTest.java
index e98c76429..5ca58ddd3 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/asymmetric/SmForJsTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/asymmetric/SmForJsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.asymmetric;
+package cn.hutool.v7.crypto.asymmetric;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/BCCipherTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/BCCipherTest.java
similarity index 92%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/BCCipherTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/BCCipherTest.java
index d98576e69..ac3a88326 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/BCCipherTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/BCCipherTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
 import org.bouncycastle.crypto.BufferedBlockCipher;
 import org.bouncycastle.crypto.DefaultBufferedBlockCipher;
 import org.bouncycastle.crypto.engines.SM4Engine;
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
 import org.bouncycastle.crypto.params.KeyParameter;
-import org.dromara.hutool.core.util.ByteUtil;
-import org.dromara.hutool.crypto.CipherMode;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.crypto.CipherMode;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/BCUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/BCUtilTest.java
similarity index 94%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/BCUtilTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/BCUtilTest.java
index c17929a9f..32b4c83e3 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/BCUtilTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/BCUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
 public class BCUtilTest {
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/ECKeyUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/ECKeyUtilTest.java
similarity index 96%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/ECKeyUtilTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/ECKeyUtilTest.java
index 305f34a38..6bc7d23d7 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/ECKeyUtilTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/ECKeyUtilTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
 import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
 import org.bouncycastle.crypto.params.ECPublicKeyParameters;
 import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.dromara.hutool.crypto.KeyUtil;
+import cn.hutool.v7.crypto.KeyUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/OpensslKeyUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/OpensslKeyUtilTest.java
similarity index 93%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/OpensslKeyUtilTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/OpensslKeyUtilTest.java
index 3bd989f3b..53d81623d 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/OpensslKeyUtilTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/OpensslKeyUtilTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.core.util.ByteUtil;
-import org.dromara.hutool.crypto.asymmetric.SM2;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.crypto.asymmetric.SM2;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/PemUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/PemUtilTest.java
similarity index 91%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/PemUtilTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/PemUtilTest.java
index 6f0bf8b0b..3335adeb2 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/PemUtilTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/PemUtilTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
-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 cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.crypto.asymmetric.KeyType;
+import cn.hutool.v7.crypto.asymmetric.RSA;
+import cn.hutool.v7.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/org/dromara/hutool/crypto/bc/SmTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/SmTest.java
similarity index 91%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/SmTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/SmTest.java
index 35b34c0c0..a3fa925b3 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/bc/SmTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/bc/SmTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.bc;
+package cn.hutool.v7.crypto.bc;
 
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.crypto.KeyUtil;
-import org.dromara.hutool.crypto.Mode;
-import org.dromara.hutool.crypto.Padding;
-import org.dromara.hutool.crypto.digest.mac.HMac;
-import org.dromara.hutool.crypto.symmetric.SM4;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.Mode;
+import cn.hutool.v7.crypto.Padding;
+import cn.hutool.v7.crypto.digest.mac.HMac;
+import cn.hutool.v7.crypto.symmetric.SM4;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/Argon2Test.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/Argon2Test.java
similarity index 86%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/Argon2Test.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/Argon2Test.java
index 35f1e89a8..d1e743711 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/Argon2Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/Argon2Test.java
@@ -1,6 +1,6 @@
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
-import org.dromara.hutool.core.codec.binary.Base64;
+import cn.hutool.v7.core.codec.binary.Base64;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/BCryptTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/BCryptTest.java
similarity index 95%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/BCryptTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/BCryptTest.java
index aff7cb980..fdfc702fc 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/BCryptTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/BCryptTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/CBCBlockCipherMacEngineTest.java
similarity index 90%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/CBCBlockCipherMacEngineTest.java
index a345dfb1f..d2375d302 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/CBCBlockCipherMacEngineTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
-import org.dromara.hutool.crypto.KeyUtil;
-import org.dromara.hutool.crypto.digest.mac.Mac;
-import org.dromara.hutool.crypto.digest.mac.SM4MacEngine;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.digest.mac.Mac;
+import cn.hutool.v7.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/org/dromara/hutool/crypto/digest/DigestTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/DigestTest.java
similarity index 95%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/DigestTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/DigestTest.java
index f30d64a2a..0c5bd88c3 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/DigestTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/DigestTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 
 /**
  * 摘要算法单元测试
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/HmacTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/HmacTest.java
similarity index 89%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/HmacTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/HmacTest.java
index c3c7338c8..ac638364c 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/HmacTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/HmacTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
-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.digest.mac.HMac;
-import org.dromara.hutool.crypto.digest.mac.HmacAlgorithm;
-import org.dromara.hutool.crypto.symmetric.ZUC;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.SecureUtil;
+import cn.hutool.v7.crypto.digest.mac.HMac;
+import cn.hutool.v7.crypto.digest.mac.HmacAlgorithm;
+import cn.hutool.v7.crypto.symmetric.ZUC;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/Md5Test.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/Md5Test.java
similarity index 92%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/Md5Test.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/Md5Test.java
index 47f493611..9f16b448c 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/Md5Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/Md5Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.thread.ConcurrencyTester;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.thread.ConcurrencyTester;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/OTPTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/OTPTest.java
similarity index 95%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/OTPTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/OTPTest.java
index 6be249bc7..21dcad123 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/digest/OTPTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/digest/OTPTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.digest;
+package cn.hutool.v7.crypto.digest;
 
-import org.dromara.hutool.core.codec.binary.Base32;
-import org.dromara.hutool.crypto.digest.mac.HmacAlgorithm;
-import org.dromara.hutool.crypto.digest.otp.HOTP;
-import org.dromara.hutool.crypto.digest.otp.TOTP;
+import cn.hutool.v7.core.codec.binary.Base32;
+import cn.hutool.v7.crypto.digest.mac.HmacAlgorithm;
+import cn.hutool.v7.crypto.digest.otp.HOTP;
+import cn.hutool.v7.crypto.digest.otp.TOTP;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/openssl/SaltTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/openssl/SaltTest.java
similarity index 91%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/openssl/SaltTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/openssl/SaltTest.java
index 4e8b11bfc..1679d2412 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/openssl/SaltTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/openssl/SaltTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.openssl;
+package cn.hutool.v7.crypto.openssl;
 
-import org.dromara.hutool.core.codec.binary.Base64;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.crypto.KeyUtil;
-import org.dromara.hutool.crypto.SecureUtil;
-import org.dromara.hutool.crypto.symmetric.SymmetricCrypto;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.SecureUtil;
+import cn.hutool.v7.crypto.symmetric.SymmetricCrypto;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/provider/GlobalProviderFactoryTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/provider/GlobalProviderFactoryTest.java
similarity index 96%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/provider/GlobalProviderFactoryTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/provider/GlobalProviderFactoryTest.java
index cea7b921b..052f91460 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/provider/GlobalProviderFactoryTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/provider/GlobalProviderFactoryTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.provider;
+package cn.hutool.v7.crypto.provider;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/AESTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/AESTest.java
similarity index 94%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/AESTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/AESTest.java
index 102dddd32..d0ed9fde4 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/AESTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/AESTest.java
@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.core.codec.binary.Base64;
-import org.dromara.hutool.core.codec.binary.HexUtil;
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.crypto.*;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.codec.binary.HexUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.Mode;
+import cn.hutool.v7.crypto.Padding;
+import cn.hutool.v7.crypto.SecureUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ChaCha20Test.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/ChaCha20Test.java
similarity index 90%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ChaCha20Test.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/ChaCha20Test.java
index 1c37e6b48..5440c5c28 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ChaCha20Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/ChaCha20Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.core.util.RandomUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.RandomUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/DesTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/DesTest.java
similarity index 91%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/DesTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/DesTest.java
index 6e47d2f04..70c3bdd42 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/DesTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/DesTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-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 cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.crypto.Mode;
+import cn.hutool.v7.crypto.Padding;
+import cn.hutool.v7.crypto.SecureUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Issue2613Test.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/Issue2613Test.java
similarity index 92%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Issue2613Test.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/Issue2613Test.java
index 510fd32ed..d5475daa9 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Issue2613Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/Issue2613Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.crypto.Padding;
+import cn.hutool.v7.crypto.Padding;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Issue3871Test.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/Issue3871Test.java
similarity index 83%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Issue3871Test.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/Issue3871Test.java
index 2f33c101a..763745a59 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Issue3871Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/Issue3871Test.java
@@ -1,7 +1,7 @@
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.crypto.Mode;
-import org.dromara.hutool.crypto.SecureUtil;
+import cn.hutool.v7.crypto.Mode;
+import cn.hutool.v7.crypto.SecureUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/PBKDF2Test.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/PBKDF2Test.java
similarity index 86%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/PBKDF2Test.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/PBKDF2Test.java
index 9ff7905c9..97d8dd7a6 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/PBKDF2Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/PBKDF2Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.crypto.SecureUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.crypto.SecureUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/RC4Test.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/RC4Test.java
similarity index 97%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/RC4Test.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/RC4Test.java
index 324de36fc..8a2d0f518 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/RC4Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/RC4Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Sm4StreamTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/Sm4StreamTest.java
similarity index 95%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Sm4StreamTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/Sm4StreamTest.java
index e8e4c9a48..0aa92beff 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/Sm4StreamTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/Sm4StreamTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IORuntimeException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/SymmetricTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/SymmetricTest.java
similarity index 96%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/SymmetricTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/SymmetricTest.java
index e37513136..e6385d0cf 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/SymmetricTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/SymmetricTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-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.RandomUtil;
-import org.dromara.hutool.crypto.*;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.crypto.*;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/TEATest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/TEATest.java
similarity index 97%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/TEATest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/TEATest.java
index 3e8876953..cdcf57d78 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/TEATest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/TEATest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ZucTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/ZucTest.java
similarity index 91%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ZucTest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/ZucTest.java
index 20204dcc0..d1c4bdc86 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/ZucTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/ZucTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric;
+package cn.hutool.v7.crypto.symmetric;
 
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.core.util.RandomUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.RandomUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/fpe/FPETest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/fpe/FPETest.java
similarity index 93%
rename from hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/fpe/FPETest.java
rename to hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/fpe/FPETest.java
index 9e91fc990..ffaa65ab1 100644
--- a/hutool-crypto/src/test/java/org/dromara/hutool/crypto/symmetric/fpe/FPETest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/symmetric/fpe/FPETest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.crypto.symmetric.fpe;
+package cn.hutool.v7.crypto.symmetric.fpe;
 
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.crypto.symmetric.FPE;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.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 a34b37900..bc9ee0396 100755
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -23,9 +23,9 @@
 	jar
 
 	
-		org.dromara.hutool
+		cn.hutool.v7
 		hutool-parent
-		6.0.0-M22
+		7.0.0.M1
 	
 
 	hutool-db
@@ -33,7 +33,7 @@
 	Hutool 数据库JDBC的ORM封装
 
 	
-		org.dromara.hutool.db
+		cn.hutool.v7.db
 		
 		0.10.1
 		2.12.0
@@ -49,17 +49,17 @@
 
 	
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-core
 			${project.parent.version}
 		
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-setting
 			${project.parent.version}
 		
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-log
 			${project.parent.version}
 		
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java b/hutool-db/src/main/java/cn/hutool/v7/db/AbstractDb.java
similarity index 98%
rename from hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/AbstractDb.java
index 34ac66787..d7ca37f23 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/AbstractDb.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.func.SerFunction;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.Dialect;
-import org.dromara.hutool.db.ds.DSWrapper;
-import org.dromara.hutool.db.handler.*;
-import org.dromara.hutool.db.sql.*;
-import org.dromara.hutool.db.sql.Condition.LikeType;
+import cn.hutool.v7.core.func.SerFunction;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.Dialect;
+import cn.hutool.v7.db.ds.DSWrapper;
+import cn.hutool.v7.db.handler.*;
+import cn.hutool.v7.db.sql.*;
+import cn.hutool.v7.db.sql.Condition.LikeType;
 
 import javax.sql.DataSource;
 import java.io.Serializable;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ActiveEntity.java b/hutool-db/src/main/java/cn/hutool/v7/db/ActiveEntity.java
similarity index 97%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ActiveEntity.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ActiveEntity.java
index 4cead6262..3a6219f10 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ActiveEntity.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ActiveEntity.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.func.SerSupplier;
-import org.dromara.hutool.core.map.MapUtil;
+import cn.hutool.v7.core.func.SerSupplier;
+import cn.hutool.v7.core.map.MapUtil;
 
 /**
  * 动态实体类
      
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ConnectionHolder.java b/hutool-db/src/main/java/cn/hutool/v7/db/ConnectionHolder.java
similarity index 97%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ConnectionHolder.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ConnectionHolder.java
index bbbff0d67..bb7a21092 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ConnectionHolder.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ConnectionHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
 import java.sql.Connection;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/DaoTemplate.java b/hutool-db/src/main/java/cn/hutool/v7/db/DaoTemplate.java
similarity index 98%
rename from hutool-db/src/main/java/org/dromara/hutool/db/DaoTemplate.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/DaoTemplate.java
index e8608ff78..bc36ee65a 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/DaoTemplate.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/DaoTemplate.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.ds.DSUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.ds.DSUtil;
 
 import javax.sql.DataSource;
 import java.util.Arrays;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/Db.java b/hutool-db/src/main/java/cn/hutool/v7/db/Db.java
similarity index 92%
rename from hutool-db/src/main/java/org/dromara/hutool/db/Db.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/Db.java
index 826d29854..4a3378c77 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/Db.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/Db.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.func.SerConsumer;
-import org.dromara.hutool.db.config.DbConfig;
-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.ds.DSWrapper;
-import org.dromara.hutool.db.transaction.TransactionLevel;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.func.SerConsumer;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.Dialect;
+import cn.hutool.v7.db.dialect.DialectFactory;
+import cn.hutool.v7.db.ds.DSUtil;
+import cn.hutool.v7.db.ds.DSWrapper;
+import cn.hutool.v7.db.transaction.TransactionLevel;
+import cn.hutool.v7.log.LogUtil;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/DbException.java b/hutool-db/src/main/java/cn/hutool/v7/db/DbException.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/DbException.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/DbException.java
index f24b5a68b..dfd5fd622 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/DbException.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/DbException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * 数据库异常
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/DefaultConnectionHolder.java b/hutool-db/src/main/java/cn/hutool/v7/db/DefaultConnectionHolder.java
similarity index 98%
rename from hutool-db/src/main/java/org/dromara/hutool/db/DefaultConnectionHolder.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/DefaultConnectionHolder.java
index 3f2d185a6..6905b2ccd 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/DefaultConnectionHolder.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/DefaultConnectionHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/DialectRunner.java b/hutool-db/src/main/java/cn/hutool/v7/db/DialectRunner.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/DialectRunner.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/DialectRunner.java
index 788ed0695..8634c9257 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/DialectRunner.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/DialectRunner.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-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.regex.PatternPool;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.Dialect;
-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.*;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.regex.PatternPool;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.Dialect;
+import cn.hutool.v7.db.handler.NumberHandler;
+import cn.hutool.v7.db.handler.PageResultHandler;
+import cn.hutool.v7.db.handler.RsHandler;
+import cn.hutool.v7.db.sql.*;
 
 import java.io.Serializable;
 import java.sql.Connection;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/Entity.java b/hutool-db/src/main/java/cn/hutool/v7/db/Entity.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/Entity.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/Entity.java
index 1b1ffaadd..d8bf8398f 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/Entity.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/Entity.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.collection.iter.ArrayIter;
-import org.dromara.hutool.core.collection.set.SetUtil;
-import org.dromara.hutool.core.func.SerSupplier;
-import org.dromara.hutool.core.map.Dict;
-import org.dromara.hutool.core.reflect.method.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.Condition;
-import org.dromara.hutool.db.sql.SqlUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.iter.ArrayIter;
+import cn.hutool.v7.core.collection.set.SetUtil;
+import cn.hutool.v7.core.func.SerSupplier;
+import cn.hutool.v7.core.map.Dict;
+import cn.hutool.v7.core.reflect.method.MethodUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.db.sql.Condition;
+import cn.hutool.v7.db.sql.SqlUtil;
 
 import java.nio.charset.Charset;
 import java.sql.Blob;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/Page.java b/hutool-db/src/main/java/cn/hutool/v7/db/Page.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/Page.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/Page.java
index 6ca4ae51d..234c66a39 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/Page.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/Page.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.lang.range.Segment;
-import org.dromara.hutool.core.lang.page.PageInfo;
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.db.sql.Order;
+import cn.hutool.v7.core.lang.range.Segment;
+import cn.hutool.v7.core.lang.page.PageInfo;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.db.sql.Order;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/PageResult.java b/hutool-db/src/main/java/cn/hutool/v7/db/PageResult.java
similarity index 97%
rename from hutool-db/src/main/java/org/dromara/hutool/db/PageResult.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/PageResult.java
index d8480a56f..f669a46a2 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/PageResult.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/PageResult.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.lang.page.PageInfo;
+import cn.hutool.v7.core.lang.page.PageInfo;
 
 import java.util.ArrayList;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/Session.java b/hutool-db/src/main/java/cn/hutool/v7/db/Session.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/Session.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/Session.java
index 68777e89a..57c149487 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/Session.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/Session.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.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 cn.hutool.v7.core.func.SerConsumer;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.dialect.Dialect;
+import cn.hutool.v7.db.dialect.DialectFactory;
+import cn.hutool.v7.db.ds.DSUtil;
+import cn.hutool.v7.log.Log;
 
 import javax.sql.DataSource;
 import java.io.Closeable;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ThreadLocalConnection.java b/hutool-db/src/main/java/cn/hutool/v7/db/ThreadLocalConnection.java
similarity index 97%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ThreadLocalConnection.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ThreadLocalConnection.java
index b360712d7..3fe5d72c7 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ThreadLocalConnection.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ThreadLocalConnection.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.io.IoUtil;
+import cn.hutool.v7.core.io.IoUtil;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/config/ConfigParser.java b/hutool-db/src/main/java/cn/hutool/v7/db/config/ConfigParser.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/config/ConfigParser.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/config/ConfigParser.java
index b5526db0b..00eb702a5 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/config/ConfigParser.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/config/ConfigParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.config;
+package cn.hutool.v7.db.config;
 
 /**
  * 数据库配置解析接口，通过实现此接口，可完成不同类型的数据源解析为数据库配置
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/config/ConnectionConfig.java b/hutool-db/src/main/java/cn/hutool/v7/db/config/ConnectionConfig.java
similarity index 98%
rename from hutool-db/src/main/java/org/dromara/hutool/db/config/ConnectionConfig.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/config/ConnectionConfig.java
index 9c3f95492..4463f0d8a 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/config/ConnectionConfig.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/config/ConnectionConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.config;
+package cn.hutool.v7.db.config;
 
 import java.util.Properties;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/config/DSKeys.java b/hutool-db/src/main/java/cn/hutool/v7/db/config/DSKeys.java
similarity index 97%
rename from hutool-db/src/main/java/org/dromara/hutool/db/config/DSKeys.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/config/DSKeys.java
index 6665197a2..ef8b2b5d0 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/config/DSKeys.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/config/DSKeys.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.config;
+package cn.hutool.v7.db.config;
 
 /**
  * 数据源配置的字段名
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/config/DbConfig.java b/hutool-db/src/main/java/cn/hutool/v7/db/config/DbConfig.java
similarity index 92%
rename from hutool-db/src/main/java/org/dromara/hutool/db/config/DbConfig.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/config/DbConfig.java
index 75ddade49..bc8111498 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/config/DbConfig.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/config/DbConfig.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.config;
+package cn.hutool.v7.db.config;
 
-import org.dromara.hutool.db.dialect.Dialect;
-import org.dromara.hutool.db.driver.DriverUtil;
-import org.dromara.hutool.db.ds.DSFactory;
-import org.dromara.hutool.db.sql.filter.SqlFilter;
-import org.dromara.hutool.db.sql.filter.SqlFilterChain;
+import cn.hutool.v7.db.dialect.Dialect;
+import cn.hutool.v7.db.driver.DriverUtil;
+import cn.hutool.v7.db.ds.DSFactory;
+import cn.hutool.v7.db.sql.filter.SqlFilter;
+import cn.hutool.v7.db.sql.filter.SqlFilterChain;
 
 /**
  * 数据库配置，包括：
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/config/SettingConfigParser.java b/hutool-db/src/main/java/cn/hutool/v7/db/config/SettingConfigParser.java
similarity index 90%
rename from hutool-db/src/main/java/org/dromara/hutool/db/config/SettingConfigParser.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/config/SettingConfigParser.java
index 1d8ea4940..f0d05e97d 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/config/SettingConfigParser.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/config/SettingConfigParser.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.config;
+package cn.hutool.v7.db.config;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.io.resource.NoResourceException;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.driver.DriverUtil;
-import org.dromara.hutool.db.sql.SqlLog;
-import org.dromara.hutool.db.sql.filter.SqlLogFilter;
-import org.dromara.hutool.log.level.Level;
-import org.dromara.hutool.setting.Setting;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.io.resource.NoResourceException;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.driver.DriverUtil;
+import cn.hutool.v7.db.sql.SqlLog;
+import cn.hutool.v7.db.sql.filter.SqlLogFilter;
+import cn.hutool.v7.log.level.Level;
+import cn.hutool.v7.setting.Setting;
 
 import java.util.Set;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/config/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/config/package-info.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/config/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/config/package-info.java
index ffb140953..04562cb89 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/config/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/config/package-info.java
@@ -23,4 +23,4 @@
  *     
    • 自定义Bean
      • 
  * 
  */
-package org.dromara.hutool.db.config;
+package cn.hutool.v7.db.config;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/Dialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/Dialect.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/Dialect.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/Dialect.java
index c321146ac..44fc746d0 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/Dialect.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/Dialect.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect;
+package cn.hutool.v7.db.dialect;
 
-import org.dromara.hutool.db.DbException;
-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.QuoteWrapper;
-import org.dromara.hutool.db.sql.SqlBuilder;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.Page;
+import cn.hutool.v7.db.sql.Order;
+import cn.hutool.v7.db.sql.Query;
+import cn.hutool.v7.db.sql.QuoteWrapper;
+import cn.hutool.v7.db.sql.SqlBuilder;
 
 import java.io.Serializable;
 import java.sql.Connection;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/DialectFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/DialectFactory.java
similarity index 91%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/DialectFactory.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/DialectFactory.java
index 74ff6d3f7..3f34ca001 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/DialectFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/DialectFactory.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect;
+package cn.hutool.v7.db.dialect;
 
-import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.impl.*;
-import org.dromara.hutool.db.driver.DriverNames;
-import org.dromara.hutool.db.ds.DSWrapper;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.impl.*;
+import cn.hutool.v7.db.driver.DriverNames;
+import cn.hutool.v7.db.ds.DSWrapper;
+import cn.hutool.v7.log.LogUtil;
 
 import javax.sql.DataSource;
 import java.util.Map;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/DialectName.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/DialectName.java
similarity index 93%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/DialectName.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/DialectName.java
index 4eb0ec6a2..2b79e85ab 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/DialectName.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/DialectName.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect;
+package cn.hutool.v7.db.dialect;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * 方言名
      
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/AnsiSqlDialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/AnsiSqlDialect.java
similarity index 89%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/AnsiSqlDialect.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/AnsiSqlDialect.java
index 2bdcce474..53381fe42 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/AnsiSqlDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/AnsiSqlDialect.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect.impl;
+package cn.hutool.v7.db.dialect.impl;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.Page;
-import org.dromara.hutool.db.sql.StatementUtil;
-import org.dromara.hutool.db.config.DbConfig;
-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.QuoteWrapper;
-import org.dromara.hutool.db.sql.SqlBuilder;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.Page;
+import cn.hutool.v7.db.sql.StatementUtil;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.Dialect;
+import cn.hutool.v7.db.dialect.DialectName;
+import cn.hutool.v7.db.sql.Condition;
+import cn.hutool.v7.db.sql.Query;
+import cn.hutool.v7.db.sql.QuoteWrapper;
+import cn.hutool.v7.db.sql.SqlBuilder;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/DmDialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/DmDialect.java
similarity index 91%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/DmDialect.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/DmDialect.java
index 0b50dc63a..354c2185e 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/DmDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/DmDialect.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect.impl;
+package cn.hutool.v7.db.dialect.impl;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.DialectName;
-import org.dromara.hutool.db.sql.SqlBuilder;
-import org.dromara.hutool.db.sql.StatementUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.DialectName;
+import cn.hutool.v7.db.sql.SqlBuilder;
+import cn.hutool.v7.db.sql.StatementUtil;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/H2Dialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/H2Dialect.java
similarity index 86%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/H2Dialect.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/H2Dialect.java
index 880f551c1..e65298908 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/H2Dialect.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/H2Dialect.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect.impl;
+package cn.hutool.v7.db.dialect.impl;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.Page;
-import org.dromara.hutool.db.sql.StatementUtil;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.DialectName;
-import org.dromara.hutool.db.sql.SqlBuilder;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.Page;
+import cn.hutool.v7.db.sql.StatementUtil;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.DialectName;
+import cn.hutool.v7.db.sql.SqlBuilder;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/HanaDialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/HanaDialect.java
similarity index 88%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/HanaDialect.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/HanaDialect.java
index e4a4ee4bb..f5130ac75 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/HanaDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/HanaDialect.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect.impl;
+package cn.hutool.v7.db.dialect.impl;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.DialectName;
-import org.dromara.hutool.db.sql.QuoteWrapper;
-import org.dromara.hutool.db.sql.SqlBuilder;
-import org.dromara.hutool.db.sql.StatementUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.DialectName;
+import cn.hutool.v7.db.sql.QuoteWrapper;
+import cn.hutool.v7.db.sql.SqlBuilder;
+import cn.hutool.v7.db.sql.StatementUtil;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/MysqlDialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/MysqlDialect.java
similarity index 88%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/MysqlDialect.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/MysqlDialect.java
index 8b9c06785..e2632428a 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/MysqlDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/MysqlDialect.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect.impl;
+package cn.hutool.v7.db.dialect.impl;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.Page;
-import org.dromara.hutool.db.sql.StatementUtil;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.DialectName;
-import org.dromara.hutool.db.sql.QuoteWrapper;
-import org.dromara.hutool.db.sql.SqlBuilder;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.Page;
+import cn.hutool.v7.db.sql.StatementUtil;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.DialectName;
+import cn.hutool.v7.db.sql.QuoteWrapper;
+import cn.hutool.v7.db.sql.SqlBuilder;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/OracleDialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/OracleDialect.java
similarity index 89%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/OracleDialect.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/OracleDialect.java
index 5aa2987ba..fd40ca0db 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/OracleDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/OracleDialect.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect.impl;
+package cn.hutool.v7.db.dialect.impl;
 
-import org.dromara.hutool.core.text.StrPool;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.Page;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.DialectName;
-import org.dromara.hutool.db.sql.SqlBuilder;
+import cn.hutool.v7.core.text.StrPool;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.Page;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.DialectName;
+import cn.hutool.v7.db.sql.SqlBuilder;
 
 /**
  * Oracle 方言
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/PhoenixDialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PhoenixDialect.java
similarity index 87%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/PhoenixDialect.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PhoenixDialect.java
index d7bc13943..20c1e9e75 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/PhoenixDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PhoenixDialect.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect.impl;
+package cn.hutool.v7.db.dialect.impl;
 
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.DialectName;
-import org.dromara.hutool.db.sql.Query;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.DialectName;
+import cn.hutool.v7.db.sql.Query;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/PostgresqlDialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PostgresqlDialect.java
similarity index 84%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/PostgresqlDialect.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PostgresqlDialect.java
index fd68b185e..5a0cc1bcc 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/PostgresqlDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PostgresqlDialect.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect.impl;
+package cn.hutool.v7.db.dialect.impl;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.sql.StatementUtil;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.DialectName;
-import org.dromara.hutool.db.sql.QuoteWrapper;
-import org.dromara.hutool.db.sql.SqlBuilder;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.sql.StatementUtil;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.DialectName;
+import cn.hutool.v7.db.sql.QuoteWrapper;
+import cn.hutool.v7.db.sql.SqlBuilder;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2005Dialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2005Dialect.java
similarity index 87%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2005Dialect.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2005Dialect.java
index ccb77f368..67b30a405 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2005Dialect.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2005Dialect.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect.impl;
+package cn.hutool.v7.db.dialect.impl;
 
-import org.dromara.hutool.core.text.StrPool;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.Page;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.DialectName;
-import org.dromara.hutool.db.sql.QuoteWrapper;
-import org.dromara.hutool.db.sql.SqlBuilder;
+import cn.hutool.v7.core.text.StrPool;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.Page;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.DialectName;
+import cn.hutool.v7.db.sql.QuoteWrapper;
+import cn.hutool.v7.db.sql.SqlBuilder;
 
 /**
  * SQLServer2005-2008方言实现
      
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2012Dialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2012Dialect.java
similarity index 83%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2012Dialect.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2012Dialect.java
index dc12e918b..7dc6154a5 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2012Dialect.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2012Dialect.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect.impl;
+package cn.hutool.v7.db.dialect.impl;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.Page;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.DialectName;
-import org.dromara.hutool.db.sql.SqlBuilder;
-import org.dromara.hutool.db.sql.QuoteWrapper;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.Page;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.DialectName;
+import cn.hutool.v7.db.sql.SqlBuilder;
+import cn.hutool.v7.db.sql.QuoteWrapper;
 
 /**
  * SQLServer2012 方言
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/Sqlite3Dialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/Sqlite3Dialect.java
similarity index 84%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/Sqlite3Dialect.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/Sqlite3Dialect.java
index dbb432677..3d5348065 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/Sqlite3Dialect.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/Sqlite3Dialect.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.dialect.impl;
+package cn.hutool.v7.db.dialect.impl;
 
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.dialect.DialectName;
-import org.dromara.hutool.db.sql.QuoteWrapper;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.dialect.DialectName;
+import cn.hutool.v7.db.sql.QuoteWrapper;
 
 /**
  * SqlLite3方言
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/package-info.java
index 7119de5b9..ab167e7fd 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.dialect.impl;
+package cn.hutool.v7.db.dialect.impl;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/dialect/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/dialect/package-info.java
index 2f41024c1..cd449fc26 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.dialect;
+package cn.hutool.v7.db.dialect;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/driver/DriverIdentifier.java b/hutool-db/src/main/java/cn/hutool/v7/db/driver/DriverIdentifier.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/driver/DriverIdentifier.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/driver/DriverIdentifier.java
index f136fb417..b61759c88 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/driver/DriverIdentifier.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/driver/DriverIdentifier.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.driver;
+package cn.hutool.v7.db.driver;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.driver.matcher.Db2DriverMatcher;
-import org.dromara.hutool.db.driver.matcher.DriverMatcher;
-import org.dromara.hutool.db.driver.matcher.MysqlDriverMatcher;
-import org.dromara.hutool.db.driver.matcher.StartsWithDriverMatcher;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.driver.matcher.Db2DriverMatcher;
+import cn.hutool.v7.db.driver.matcher.DriverMatcher;
+import cn.hutool.v7.db.driver.matcher.MysqlDriverMatcher;
+import cn.hutool.v7.db.driver.matcher.StartsWithDriverMatcher;
 
 import java.util.List;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/driver/DriverNames.java b/hutool-db/src/main/java/cn/hutool/v7/db/driver/DriverNames.java
similarity index 99%
rename from hutool-db/src/main/java/org/dromara/hutool/db/driver/DriverNames.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/driver/DriverNames.java
index 2144e6c47..e6b27ff5a 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/driver/DriverNames.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/driver/DriverNames.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.driver;
+package cn.hutool.v7.db.driver;
 
 /**
  * 常用数据库驱动名
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/driver/DriverUtil.java b/hutool-db/src/main/java/cn/hutool/v7/db/driver/DriverUtil.java
similarity index 90%
rename from hutool-db/src/main/java/org/dromara/hutool/db/driver/DriverUtil.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/driver/DriverUtil.java
index 60ed46d63..337a393a2 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/driver/DriverUtil.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/driver/DriverUtil.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.driver;
+package cn.hutool.v7.db.driver;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.reflect.ClassUtil;
-import org.dromara.hutool.core.reflect.ConstructorUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.ds.DSWrapper;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.reflect.ClassUtil;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.ds.DSWrapper;
 
 import javax.sql.DataSource;
 import java.sql.*;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/Db2DriverMatcher.java b/hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/Db2DriverMatcher.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/Db2DriverMatcher.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/Db2DriverMatcher.java
index d6238ccad..f3432cd80 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/Db2DriverMatcher.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/Db2DriverMatcher.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.driver.matcher;
+package cn.hutool.v7.db.driver.matcher;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * db2驱动匹配器，来自Druid的JdbcUtils
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/DriverMatcher.java b/hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/DriverMatcher.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/DriverMatcher.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/DriverMatcher.java
index e9ed4fe8a..5beb31f12 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/DriverMatcher.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/DriverMatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.driver.matcher;
+package cn.hutool.v7.db.driver.matcher;
 
 import java.util.function.Predicate;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/MysqlDriverMatcher.java b/hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/MysqlDriverMatcher.java
similarity index 93%
rename from hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/MysqlDriverMatcher.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/MysqlDriverMatcher.java
index f0eb4975e..d20893932 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/MysqlDriverMatcher.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/MysqlDriverMatcher.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.driver.matcher;
+package cn.hutool.v7.db.driver.matcher;
 
-import org.dromara.hutool.core.classloader.ClassLoaderUtil;
+import cn.hutool.v7.core.classloader.ClassLoaderUtil;
 
 /**
  * Mysql匹配器
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/StartsWithDriverMatcher.java b/hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/StartsWithDriverMatcher.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/StartsWithDriverMatcher.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/StartsWithDriverMatcher.java
index 0d53241fa..3a24f1ff0 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/StartsWithDriverMatcher.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/StartsWithDriverMatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.driver.matcher;
+package cn.hutool.v7.db.driver.matcher;
 
 /**
  * 判断jdbc url的起始字符串匹配对应的驱动类名
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/package-info.java
similarity index 93%
rename from hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/package-info.java
index 26308bee7..688f8539e 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/driver/matcher/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/driver/matcher/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.db.driver.matcher;
+package cn.hutool.v7.db.driver.matcher;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/driver/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/driver/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/driver/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/driver/package-info.java
index 8632cadc5..96c1eb41e 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/driver/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/driver/package-info.java
@@ -17,4 +17,4 @@
 /**
  * 驱动和驱动类名称相关封装
  */
-package org.dromara.hutool.db.driver;
+package cn.hutool.v7.db.driver;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/AbstractDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/AbstractDSFactory.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/AbstractDSFactory.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/AbstractDSFactory.java
index ee2771391..1d3452dae 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/AbstractDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/AbstractDSFactory.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds;
+package cn.hutool.v7.db.ds;
 
-import org.dromara.hutool.core.lang.Assert;
+import cn.hutool.v7.core.lang.Assert;
 
 import javax.sql.DataSource;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/DSFactory.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/DSFactory.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/DSFactory.java
index 009146eaa..f9c70f0da 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/DSFactory.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds;
+package cn.hutool.v7.db.ds;
 
-import org.dromara.hutool.db.config.ConnectionConfig;
+import cn.hutool.v7.db.config.ConnectionConfig;
 
 import javax.sql.DataSource;
 import java.io.Serializable;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSPool.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/DSPool.java
similarity index 90%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/DSPool.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/DSPool.java
index 3927d709c..6806ceafa 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSPool.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/DSPool.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds;
+package cn.hutool.v7.db.ds;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.lang.Singleton;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.config.ConfigParser;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.config.SettingConfigParser;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Singleton;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.config.ConfigParser;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.config.SettingConfigParser;
+import cn.hutool.v7.log.LogUtil;
 
 import java.io.Closeable;
 import java.util.Collection;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSUtil.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/DSUtil.java
similarity index 93%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/DSUtil.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/DSUtil.java
index 46bf8018a..fe46ca836 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSUtil.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/DSUtil.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds;
+package cn.hutool.v7.db.ds;
 
-import org.dromara.hutool.core.spi.SpiUtil;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.spi.SpiUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.log.LogUtil;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSWrapper.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/DSWrapper.java
similarity index 93%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/DSWrapper.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/DSWrapper.java
index 260e30212..d94cb31cf 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSWrapper.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/DSWrapper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds;
+package cn.hutool.v7.db.ds;
 
-import org.dromara.hutool.core.exception.CloneException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-import org.dromara.hutool.db.config.DbConfig;
+import cn.hutool.v7.core.exception.CloneException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.db.config.DbConfig;
 
 import javax.sql.DataSource;
 import java.io.Closeable;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/bee/BeeDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/bee/BeeDSFactory.java
similarity index 86%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/bee/BeeDSFactory.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/bee/BeeDSFactory.java
index 937236222..b80b0c663 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/bee/BeeDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/bee/BeeDSFactory.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.bee;
+package cn.hutool.v7.db.ds.bee;
 
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.db.config.ConnectionConfig;
-import org.dromara.hutool.db.ds.AbstractDSFactory;
-import org.dromara.hutool.setting.props.Props;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.db.config.ConnectionConfig;
+import cn.hutool.v7.db.ds.AbstractDSFactory;
+import cn.hutool.v7.setting.props.Props;
 import org.stone.beecp.BeeDataSource;
 import org.stone.beecp.BeeDataSourceConfig;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/bee/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/bee/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/bee/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/bee/package-info.java
index 2f090f5cb..7441ef703 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/bee/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/bee/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.ds.bee;
+package cn.hutool.v7.db.ds.bee;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/c3p0/C3p0DSFactory.java
similarity index 85%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/c3p0/C3p0DSFactory.java
index 08731a824..2407e5921 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/c3p0/C3p0DSFactory.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.c3p0;
+package cn.hutool.v7.db.ds.c3p0;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.config.ConnectionConfig;
-import org.dromara.hutool.db.ds.AbstractDSFactory;
-import org.dromara.hutool.setting.props.Props;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.config.ConnectionConfig;
+import cn.hutool.v7.db.ds.AbstractDSFactory;
+import cn.hutool.v7.setting.props.Props;
 
 import javax.sql.DataSource;
 import java.beans.PropertyVetoException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/c3p0/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/c3p0/package-info.java
index 458684925..acef94d37 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/c3p0/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.ds.c3p0;
+package cn.hutool.v7.db.ds.c3p0;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/dbcp/DbcpDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/dbcp/DbcpDSFactory.java
similarity index 87%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/dbcp/DbcpDSFactory.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/dbcp/DbcpDSFactory.java
index 1b0b50a49..c30b6476d 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/dbcp/DbcpDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/dbcp/DbcpDSFactory.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.dbcp;
+package cn.hutool.v7.db.ds.dbcp;
 
 import org.apache.commons.dbcp2.BasicDataSource;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.db.config.ConnectionConfig;
-import org.dromara.hutool.db.ds.AbstractDSFactory;
-import org.dromara.hutool.setting.props.Props;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.db.config.ConnectionConfig;
+import cn.hutool.v7.db.ds.AbstractDSFactory;
+import cn.hutool.v7.setting.props.Props;
 
 import javax.sql.DataSource;
 import java.util.Properties;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/dbcp/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/dbcp/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/dbcp/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/dbcp/package-info.java
index 35ae72b06..53cb1e73c 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/dbcp/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/dbcp/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.ds.dbcp;
+package cn.hutool.v7.db.ds.dbcp;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/druid/DruidDSFactory.java
similarity index 93%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/druid/DruidDSFactory.java
index e6afd0a2d..b021561b1 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/druid/DruidDSFactory.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.druid;
+package cn.hutool.v7.db.ds.druid;
 
 import com.alibaba.druid.pool.DruidDataSource;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.config.ConnectionConfig;
-import org.dromara.hutool.db.ds.AbstractDSFactory;
-import org.dromara.hutool.setting.props.Props;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.config.ConnectionConfig;
+import cn.hutool.v7.db.ds.AbstractDSFactory;
+import cn.hutool.v7.setting.props.Props;
 
 import javax.sql.DataSource;
 import java.util.Properties;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/druid/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/druid/package-info.java
index df6363048..85c605b1e 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/druid/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.ds.druid;
+package cn.hutool.v7.db.ds.druid;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/hikari/HikariDSFactory.java
similarity index 89%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/hikari/HikariDSFactory.java
index 0a7768782..46f52b692 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/hikari/HikariDSFactory.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.hikari;
+package cn.hutool.v7.db.ds.hikari;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.db.config.ConnectionConfig;
-import org.dromara.hutool.db.ds.AbstractDSFactory;
-import org.dromara.hutool.setting.props.Props;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.db.config.ConnectionConfig;
+import cn.hutool.v7.db.ds.AbstractDSFactory;
+import cn.hutool.v7.setting.props.Props;
 
 import javax.sql.DataSource;
 import java.util.Properties;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/hikari/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/hikari/package-info.java
index 9780f2ce9..6f40b1100 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/hikari/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.ds.hikari;
+package cn.hutool.v7.db.ds.hikari;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/jndi/JndiDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/jndi/JndiDSFactory.java
similarity index 83%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/jndi/JndiDSFactory.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/jndi/JndiDSFactory.java
index 00b326579..12c0d0436 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/jndi/JndiDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/jndi/JndiDSFactory.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.jndi;
+package cn.hutool.v7.db.ds.jndi;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.config.ConnectionConfig;
-import org.dromara.hutool.db.ds.DSFactory;
-import org.dromara.hutool.db.ds.DSUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.config.ConnectionConfig;
+import cn.hutool.v7.db.ds.DSFactory;
+import cn.hutool.v7.db.ds.DSUtil;
 
 import javax.sql.DataSource;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/jndi/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/jndi/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/jndi/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/jndi/package-info.java
index 2a053d0e6..bf4489f6c 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/jndi/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/jndi/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.ds.jndi;
+package cn.hutool.v7.db.ds.jndi;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/package-info.java
similarity index 88%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/package-info.java
index e3ed2ae05..e49732f63 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/package-info.java
@@ -16,9 +16,9 @@
 
 /**
  * 数据源封装，对各类数据库连接池的封装
      
- * 数据库连接池使用工厂方法模式，当有新增连接池时，实现{@link org.dromara.hutool.db.ds.DSFactory}即可。
+ * 数据库连接池使用工厂方法模式，当有新增连接池时，实现{@link cn.hutool.v7.db.ds.DSFactory}即可。
  *
  * @author Looly
  *
  */
-package org.dromara.hutool.db.ds;
+package cn.hutool.v7.db.ds;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/ConnectionWrapper.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/ConnectionWrapper.java
similarity index 98%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/ConnectionWrapper.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/ConnectionWrapper.java
index bb1f5b64d..fceb4ab36 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/ConnectionWrapper.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/ConnectionWrapper.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.pooled;
+package cn.hutool.v7.db.ds.pooled;
 
-import org.dromara.hutool.core.lang.wrapper.Wrapper;
+import cn.hutool.v7.core.lang.wrapper.Wrapper;
 
 import java.sql.Array;
 import java.sql.Blob;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledConnection.java
similarity index 88%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledConnection.java
index c0a54e392..ccefc9666 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledConnection.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.pooled;
+package cn.hutool.v7.db.ds.pooled;
 
-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.db.DbException;
-import org.dromara.hutool.db.config.ConnectionConfig;
-import org.dromara.hutool.setting.props.Props;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.config.ConnectionConfig;
+import cn.hutool.v7.setting.props.Props;
 
 import java.sql.DriverManager;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDSFactory.java
similarity index 88%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledDSFactory.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDSFactory.java
index e8c5365bf..d82b3b919 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDSFactory.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.pooled;
+package cn.hutool.v7.db.ds.pooled;
 
-import org.dromara.hutool.db.config.ConnectionConfig;
-import org.dromara.hutool.db.ds.DSFactory;
+import cn.hutool.v7.db.config.ConnectionConfig;
+import cn.hutool.v7.db.ds.DSFactory;
 
 import javax.sql.DataSource;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledDataSource.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDataSource.java
similarity index 85%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledDataSource.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDataSource.java
index d3287ef03..bcaf2b427 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledDataSource.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDataSource.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.pooled;
+package cn.hutool.v7.db.ds.pooled;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.pool.ObjectFactory;
-import org.dromara.hutool.core.pool.ObjectPool;
-import org.dromara.hutool.core.pool.partition.PartitionObjectPool;
-import org.dromara.hutool.core.pool.partition.PartitionPoolConfig;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.config.ConnectionConfig;
-import org.dromara.hutool.db.driver.DriverUtil;
-import org.dromara.hutool.db.ds.simple.AbstractDataSource;
-import org.dromara.hutool.log.LogUtil;
-import org.dromara.hutool.setting.props.Props;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.pool.ObjectFactory;
+import cn.hutool.v7.core.pool.ObjectPool;
+import cn.hutool.v7.core.pool.partition.PartitionObjectPool;
+import cn.hutool.v7.core.pool.partition.PartitionPoolConfig;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.config.ConnectionConfig;
+import cn.hutool.v7.db.driver.DriverUtil;
+import cn.hutool.v7.db.ds.simple.AbstractDataSource;
+import cn.hutool.v7.log.LogUtil;
+import cn.hutool.v7.setting.props.Props;
 
 import java.sql.Connection;
 import java.sql.Driver;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/package-info.java
index b23a343b1..483380fb1 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.ds.pooled;
+package cn.hutool.v7.db.ds.pooled;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/AbstractDataSource.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/AbstractDataSource.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/AbstractDataSource.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/AbstractDataSource.java
index 8a6b2ba57..e02852440 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/AbstractDataSource.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/AbstractDataSource.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.simple;
+package cn.hutool.v7.db.ds.simple;
 
-import org.dromara.hutool.core.exception.CloneException;
+import cn.hutool.v7.core.exception.CloneException;
 
 import javax.sql.DataSource;
 import java.io.Closeable;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/SimpleDSFactory.java
similarity index 88%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDSFactory.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/SimpleDSFactory.java
index 959c7879e..607c96c15 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/SimpleDSFactory.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.simple;
+package cn.hutool.v7.db.ds.simple;
 
-import org.dromara.hutool.db.config.ConnectionConfig;
-import org.dromara.hutool.db.ds.DSFactory;
+import cn.hutool.v7.db.config.ConnectionConfig;
+import cn.hutool.v7.db.ds.DSFactory;
 
 import javax.sql.DataSource;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/SimpleDataSource.java
similarity index 91%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/SimpleDataSource.java
index d9d9c1272..322b6e1f3 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/SimpleDataSource.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.simple;
+package cn.hutool.v7.db.ds.simple;
 
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.db.config.ConnectionConfig;
-import org.dromara.hutool.setting.props.Props;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.db.config.ConnectionConfig;
+import cn.hutool.v7.setting.props.Props;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/package-info.java
index b043ba6b1..d543ff28e 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.ds.simple;
+package cn.hutool.v7.db.ds.simple;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/tomcat/TomcatDSFactory.java
similarity index 87%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/tomcat/TomcatDSFactory.java
index 7e2ec28f3..396d1cfe4 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/tomcat/TomcatDSFactory.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds.tomcat;
+package cn.hutool.v7.db.ds.tomcat;
 
 import org.apache.tomcat.jdbc.pool.DataSource;
 import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.db.config.ConnectionConfig;
-import org.dromara.hutool.db.ds.AbstractDSFactory;
-import org.dromara.hutool.setting.props.Props;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.db.config.ConnectionConfig;
+import cn.hutool.v7.db.ds.AbstractDSFactory;
+import cn.hutool.v7.setting.props.Props;
 
 import java.util.Properties;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/tomcat/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/ds/tomcat/package-info.java
index ac92ed56d..137f1f874 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/tomcat/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.ds.tomcat;
+package cn.hutool.v7.db.ds.tomcat;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/BeanHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanHandler.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/BeanHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanHandler.java
index 3bbb46d32..7ccd3490f 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/BeanHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanHandler.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler;
+package cn.hutool.v7.db.handler;
 
-import org.dromara.hutool.db.handler.row.BeanRowHandler;
+import cn.hutool.v7.db.handler.row.BeanRowHandler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/BeanListHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanListHandler.java
similarity index 97%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/BeanListHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanListHandler.java
index fb7cc812f..b907084c1 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/BeanListHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanListHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler;
+package cn.hutool.v7.db.handler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityHandler.java
similarity index 92%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityHandler.java
index 9a4f98e96..aeb4cfd1c 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityHandler.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler;
+package cn.hutool.v7.db.handler;
 
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.handler.row.EntityRowHandler;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.handler.row.EntityRowHandler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityListHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityListHandler.java
similarity index 91%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityListHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityListHandler.java
index 78a362f7a..b19331ddb 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityListHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityListHandler.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler;
+package cn.hutool.v7.db.handler;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.handler.row.EntityRowHandler;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.handler.row.EntityRowHandler;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntitySetHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntitySetHandler.java
similarity index 93%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/EntitySetHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/EntitySetHandler.java
index 626015fa1..da8b9e012 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/EntitySetHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntitySetHandler.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler;
+package cn.hutool.v7.db.handler;
 
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.handler.row.EntityRowHandler;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.handler.row.EntityRowHandler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/NumberHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/NumberHandler.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/NumberHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/NumberHandler.java
index 21c491b7f..89f029606 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/NumberHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/NumberHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler;
+package cn.hutool.v7.db.handler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/PageResultHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/PageResultHandler.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/PageResultHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/PageResultHandler.java
index 138cd2d40..bdc07bf94 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/PageResultHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/PageResultHandler.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler;
+package cn.hutool.v7.db.handler;
 
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.PageResult;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.PageResult;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/ResultSetUtil.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/ResultSetUtil.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/ResultSetUtil.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/ResultSetUtil.java
index ef0bc70d5..4091bd3df 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/ResultSetUtil.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/ResultSetUtil.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler;
+package cn.hutool.v7.db.handler;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.handler.row.*;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.handler.row.*;
 
 import java.lang.reflect.Type;
 import java.sql.ResultSet;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/RsHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/RsHandler.java
similarity index 97%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/RsHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/RsHandler.java
index dd24bbd16..47cdae5e1 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/RsHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/RsHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler;
+package cn.hutool.v7.db.handler;
 
 import java.io.Serializable;
 import java.sql.ResultSet;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/StringHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/StringHandler.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/StringHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/StringHandler.java
index 76f45301a..86fe4930b 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/StringHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/StringHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler;
+package cn.hutool.v7.db.handler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/ValueListHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/ValueListHandler.java
similarity index 93%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/ValueListHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/ValueListHandler.java
index 731420942..6d993cf7e 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/ValueListHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/ValueListHandler.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler;
+package cn.hutool.v7.db.handler;
 
-import org.dromara.hutool.db.handler.row.ListRowHandler;
+import cn.hutool.v7.db.handler.row.ListRowHandler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/package-info.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/package-info.java
index 0d8124993..54167b867 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.handler;
+package cn.hutool.v7.db.handler;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/AbsRowHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/AbsRowHandler.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/row/AbsRowHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/row/AbsRowHandler.java
index 3263b79d4..39598acb9 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/AbsRowHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/AbsRowHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler.row;
+package cn.hutool.v7.db.handler.row;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/ArrayRowHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/ArrayRowHandler.java
similarity index 91%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/row/ArrayRowHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/row/ArrayRowHandler.java
index 090f61215..6623a6835 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/ArrayRowHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/ArrayRowHandler.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler.row;
+package cn.hutool.v7.db.handler.row;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.db.handler.ResultSetUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.db.handler.ResultSetUtil;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/BeanRowHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/BeanRowHandler.java
similarity index 85%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/row/BeanRowHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/row/BeanRowHandler.java
index cf845d018..7b807e2c5 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/BeanRowHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/BeanRowHandler.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler.row;
+package cn.hutool.v7.db.handler.row;
 
-import org.dromara.hutool.core.bean.BeanUtil;
-import org.dromara.hutool.core.bean.PropDesc;
-import org.dromara.hutool.core.reflect.ConstructorUtil;
-import org.dromara.hutool.core.reflect.Invoker;
-import org.dromara.hutool.core.reflect.method.MethodInvoker;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.handler.ResultSetUtil;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.bean.PropDesc;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.reflect.Invoker;
+import cn.hutool.v7.core.reflect.method.MethodInvoker;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.handler.ResultSetUtil;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/EntityRowHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/EntityRowHandler.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/row/EntityRowHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/row/EntityRowHandler.java
index d1ff28488..250716936 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/EntityRowHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/EntityRowHandler.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler.row;
+package cn.hutool.v7.db.handler.row;
 
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.handler.ResultSetUtil;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.handler.ResultSetUtil;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/ListRowHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/ListRowHandler.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/row/ListRowHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/row/ListRowHandler.java
index 6da8b1186..fb55c47d1 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/ListRowHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/ListRowHandler.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler.row;
+package cn.hutool.v7.db.handler.row;
 
-import org.dromara.hutool.db.handler.ResultSetUtil;
+import cn.hutool.v7.db.handler.ResultSetUtil;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/RowHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/RowHandler.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/row/RowHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/row/RowHandler.java
index a1c614275..522556a50 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/RowHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/RowHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler.row;
+package cn.hutool.v7.db.handler.row;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/StringRowHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/StringRowHandler.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/row/StringRowHandler.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/row/StringRowHandler.java
index 058ae9970..65d725224 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/StringRowHandler.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/StringRowHandler.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.handler.row;
+package cn.hutool.v7.db.handler.row;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/handler/row/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/handler/row/package-info.java
index 6972b348e..ba008415e 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/row/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.db.handler.row;
+package cn.hutool.v7.db.handler.row;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/meta/Column.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/Column.java
similarity index 97%
rename from hutool-db/src/main/java/org/dromara/hutool/db/meta/Column.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/meta/Column.java
index 63a5717c3..874e14bfd 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/meta/Column.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/Column.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.meta;
+package cn.hutool.v7.db.meta;
 
-import org.dromara.hutool.core.util.BooleanUtil;
-import org.dromara.hutool.core.regex.ReUtil;
-import org.dromara.hutool.db.DbException;
+import cn.hutool.v7.core.util.BooleanUtil;
+import cn.hutool.v7.core.regex.ReUtil;
+import cn.hutool.v7.db.DbException;
 
 import java.io.Serializable;
 import java.sql.ResultSet;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/meta/ColumnIndex.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/ColumnIndex.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/meta/ColumnIndex.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/meta/ColumnIndex.java
index 7ec44ee52..8020f25bb 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/meta/ColumnIndex.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/ColumnIndex.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.meta;
+package cn.hutool.v7.db.meta;
 
-import org.dromara.hutool.db.DbException;
+import cn.hutool.v7.db.DbException;
 
 import java.io.Serializable;
 import java.sql.ResultSet;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/meta/ColumnType.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/ColumnType.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/meta/ColumnType.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/meta/ColumnType.java
index cb2a03baf..a5601dc80 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/meta/ColumnType.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/ColumnType.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.meta;
+package cn.hutool.v7.db.meta;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * 数据库字段类型
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/meta/DatabaseMetaDataWrapper.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/DatabaseMetaDataWrapper.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/meta/DatabaseMetaDataWrapper.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/meta/DatabaseMetaDataWrapper.java
index a1a10ee3e..6fe238e35 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/meta/DatabaseMetaDataWrapper.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/DatabaseMetaDataWrapper.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.meta;
+package cn.hutool.v7.db.meta;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.db.DbException;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.db.DbException;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/meta/IndexInfo.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/IndexInfo.java
similarity index 98%
rename from hutool-db/src/main/java/org/dromara/hutool/db/meta/IndexInfo.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/meta/IndexInfo.java
index ccb117a44..9b3fcbd66 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/meta/IndexInfo.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/IndexInfo.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.meta;
+package cn.hutool.v7.db.meta;
 
 
-import org.dromara.hutool.core.util.ObjUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/meta/JdbcType.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/JdbcType.java
similarity index 99%
rename from hutool-db/src/main/java/org/dromara/hutool/db/meta/JdbcType.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/meta/JdbcType.java
index 456e2863d..9cb779368 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/meta/JdbcType.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/JdbcType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.meta;
+package cn.hutool.v7.db.meta;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/meta/MetaUtil.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/MetaUtil.java
similarity index 98%
rename from hutool-db/src/main/java/org/dromara/hutool/db/meta/MetaUtil.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/meta/MetaUtil.java
index 0bc404825..18d78074b 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/meta/MetaUtil.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/MetaUtil.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.meta;
+package cn.hutool.v7.db.meta;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.Entity;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.Entity;
 
 import javax.sql.DataSource;
 import java.sql.*;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/meta/ResultColumn.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/ResultColumn.java
similarity index 98%
rename from hutool-db/src/main/java/org/dromara/hutool/db/meta/ResultColumn.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/meta/ResultColumn.java
index ee78abb52..655ae06d5 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/meta/ResultColumn.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/ResultColumn.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.meta;
+package cn.hutool.v7.db.meta;
 
-import org.dromara.hutool.db.DbException;
+import cn.hutool.v7.db.DbException;
 
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/meta/Table.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/Table.java
similarity index 99%
rename from hutool-db/src/main/java/org/dromara/hutool/db/meta/Table.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/meta/Table.java
index e0648c02c..501f2ab16 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/meta/Table.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/Table.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.meta;
+package cn.hutool.v7.db.meta;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/meta/TableType.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/TableType.java
similarity index 97%
rename from hutool-db/src/main/java/org/dromara/hutool/db/meta/TableType.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/meta/TableType.java
index c285283e6..4b45e33f4 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/meta/TableType.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/TableType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.meta;
+package cn.hutool.v7.db.meta;
 
 /**
  * 元信息中表的类型
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/meta/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/package-info.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/meta/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/meta/package-info.java
index 18e711661..00ca670e0 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/meta/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.meta;
+package cn.hutool.v7.db.meta;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/package-info.java
similarity index 97%
rename from hutool-db/src/main/java/org/dromara/hutool/db/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/package-info.java
index f99edea22..7fa24c2aa 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/package-info.java
@@ -34,4 +34,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/BoundSql.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/BoundSql.java
similarity index 98%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/BoundSql.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/BoundSql.java
index 7dca30b3e..dcfcebd04 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/BoundSql.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/BoundSql.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/Condition.java
similarity index 97%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/Condition.java
index ccfdb9bf1..cddb59c16 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/Condition.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.exception.CloneException;
-import org.dromara.hutool.core.math.NumberUtil;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.text.split.SplitUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.exception.CloneException;
+import cn.hutool.v7.core.math.NumberUtil;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionBuilder.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionBuilder.java
similarity index 92%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionBuilder.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionBuilder.java
index e64c59bab..63e82cb5c 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionBuilder.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionBuilder.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-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.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.lang.builder.Builder;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionGroup.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionGroup.java
similarity index 93%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionGroup.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionGroup.java
index c1e2ff102..0e03ed6af 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/ConditionGroup.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionGroup.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.util.List;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Direction.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/Direction.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/Direction.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/Direction.java
index b21494bf3..fa8c227a9 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Direction.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/Direction.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * 排序方式（升序或者降序）
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/LogicalOperator.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/LogicalOperator.java
similarity index 93%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/LogicalOperator.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/LogicalOperator.java
index d0f0015d8..2614c73bb 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/LogicalOperator.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/LogicalOperator.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * 逻辑运算符
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/NamedSql.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/NamedSql.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/NamedSql.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/NamedSql.java
index d6f93823c..b4c55c29c 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/NamedSql.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/NamedSql.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Order.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/Order.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/Order.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/Order.java
index 11c401c29..1d1dbc2d5 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Order.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/Order.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Query.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/Query.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/Query.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/Query.java
index ab7e9fdf9..2dedc75c9 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Query.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/Query.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.Page;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.Page;
 
 import java.util.Collection;
 import java.util.Set;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/QueryBuilder.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/QueryBuilder.java
similarity index 98%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/QueryBuilder.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/QueryBuilder.java
index 45ec6e6f5..6c650cad5 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/QueryBuilder.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/QueryBuilder.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.lang.builder.Builder;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.lang.builder.Builder;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/QuoteWrapper.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/QuoteWrapper.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/QuoteWrapper.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/QuoteWrapper.java
index 97fc44c13..3ad510e34 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/QuoteWrapper.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/QuoteWrapper.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-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.db.Entity;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.db.Entity;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlBuilder.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlBuilder.java
similarity index 97%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlBuilder.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlBuilder.java
index 41540ec68..be219c58a 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlBuilder.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlBuilder.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-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.DbException;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.dialect.DialectName;
-import org.dromara.hutool.db.dialect.impl.OracleDialect;
+import cn.hutool.v7.core.lang.builder.Builder;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.dialect.DialectName;
+import cn.hutool.v7.db.dialect.impl.OracleDialect;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlExecutor.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlExecutor.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlExecutor.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlExecutor.java
index 56151d88b..84f60cef2 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlExecutor.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlExecutor.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.collection.iter.ArrayIter;
-import org.dromara.hutool.core.func.SerFunction;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.handler.RsHandler;
+import cn.hutool.v7.core.collection.iter.ArrayIter;
+import cn.hutool.v7.core.func.SerFunction;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.handler.RsHandler;
 
 import java.sql.*;
 import java.util.Map;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlFormatter.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlFormatter.java
similarity index 99%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlFormatter.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlFormatter.java
index 07bac9c74..ed6f9fe51 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlFormatter.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlFormatter.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.util.HashSet;
 import java.util.LinkedList;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlLog.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlLog.java
similarity index 96%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlLog.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlLog.java
index d73626027..a5e3a63b5 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlLog.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlLog.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.log.Log;
-import org.dromara.hutool.log.level.Level;
+import cn.hutool.v7.log.Log;
+import cn.hutool.v7.log.level.Level;
 
 /**
  * SQL在日志中打印配置
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlUtil.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlUtil.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlUtil.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlUtil.java
index 3fc66ce23..809cdfb56 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlUtil.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/SqlUtil.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-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.DbException;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.sql.Condition.LikeType;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.sql.Condition.LikeType;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementBuilder.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/StatementBuilder.java
similarity index 91%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementBuilder.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/StatementBuilder.java
index 880ac7247..8e0078d70 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementBuilder.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/StatementBuilder.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.collection.iter.ArrayIter;
-import org.dromara.hutool.core.convert.ConvertUtil;
-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.text.StrUtil;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.Entity;
-import org.dromara.hutool.db.sql.filter.SqlFilter;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.collection.iter.ArrayIter;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.builder.Builder;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.sql.filter.SqlFilter;
 
 import java.sql.*;
 import java.util.HashMap;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementUtil.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/StatementUtil.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementUtil.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/StatementUtil.java
index 02bf08712..16ede23e4 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementUtil.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/StatementUtil.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.collection.iter.ArrayIter;
-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.stream.StreamUtil;
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.handler.ResultSetUtil;
-import org.dromara.hutool.db.handler.RsHandler;
+import cn.hutool.v7.core.collection.iter.ArrayIter;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.Opt;
+import cn.hutool.v7.core.stream.StreamUtil;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.handler.ResultSetUtil;
+import cn.hutool.v7.db.handler.RsHandler;
 
 import java.sql.*;
 import java.util.List;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementWrapper.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/StatementWrapper.java
similarity index 98%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementWrapper.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/StatementWrapper.java
index bb71e112f..010b3847a 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/StatementWrapper.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/StatementWrapper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.collection.iter.ArrayIter;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-import org.dromara.hutool.core.lang.Assert;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.collection.iter.ArrayIter;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.core.lang.Assert;
 
 import java.io.InputStream;
 import java.io.Reader;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/filter/SqlFilter.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/filter/SqlFilter.java
similarity index 93%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/filter/SqlFilter.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/filter/SqlFilter.java
index 8cc9c490f..73aa0541b 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/filter/SqlFilter.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/filter/SqlFilter.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql.filter;
+package cn.hutool.v7.db.sql.filter;
 
-import org.dromara.hutool.db.sql.BoundSql;
+import cn.hutool.v7.db.sql.BoundSql;
 
 import java.sql.Connection;
 import java.util.List;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/filter/SqlFilterChain.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/filter/SqlFilterChain.java
similarity index 91%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/filter/SqlFilterChain.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/filter/SqlFilterChain.java
index 365e854c5..618338ca4 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/filter/SqlFilterChain.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/filter/SqlFilterChain.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql.filter;
+package cn.hutool.v7.db.sql.filter;
 
-import org.dromara.hutool.core.lang.Chain;
-import org.dromara.hutool.db.sql.BoundSql;
+import cn.hutool.v7.core.lang.Chain;
+import cn.hutool.v7.db.sql.BoundSql;
 
 import java.sql.Connection;
 import java.util.Iterator;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/filter/SqlLogFilter.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/filter/SqlLogFilter.java
similarity index 89%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/filter/SqlLogFilter.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/filter/SqlLogFilter.java
index 453977df2..fe7be9a22 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/filter/SqlLogFilter.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/filter/SqlLogFilter.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql.filter;
+package cn.hutool.v7.db.sql.filter;
 
-import org.dromara.hutool.db.sql.BoundSql;
-import org.dromara.hutool.db.sql.SqlLog;
+import cn.hutool.v7.db.sql.BoundSql;
+import cn.hutool.v7.db.sql.SqlLog;
 
 import java.sql.Connection;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/filter/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/filter/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/filter/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/filter/package-info.java
index cb86250da..d163c0555 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/filter/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/filter/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.db.sql.filter;
+package cn.hutool.v7.db.sql.filter;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/package-info.java
similarity index 95%
rename from hutool-db/src/main/java/org/dromara/hutool/db/sql/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/sql/package-info.java
index e3a9f60e6..e68c1fa4c 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/transaction/TransactionLevel.java b/hutool-db/src/main/java/cn/hutool/v7/db/transaction/TransactionLevel.java
similarity index 98%
rename from hutool-db/src/main/java/org/dromara/hutool/db/transaction/TransactionLevel.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/transaction/TransactionLevel.java
index e97d32008..eec2cb46e 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/transaction/TransactionLevel.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/transaction/TransactionLevel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.transaction;
+package cn.hutool.v7.db.transaction;
 
 import java.sql.Connection;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/transaction/package-info.java b/hutool-db/src/main/java/cn/hutool/v7/db/transaction/package-info.java
similarity index 94%
rename from hutool-db/src/main/java/org/dromara/hutool/db/transaction/package-info.java
rename to hutool-db/src/main/java/cn/hutool/v7/db/transaction/package-info.java
index d49b78251..6835fa261 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/transaction/package-info.java
+++ b/hutool-db/src/main/java/cn/hutool/v7/db/transaction/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.db.transaction;
+package cn.hutool.v7.db.transaction;
diff --git a/hutool-db/src/main/resources/META-INF/services/cn.hutool.v7.db.ds.DSFactory b/hutool-db/src/main/resources/META-INF/services/cn.hutool.v7.db.ds.DSFactory
new file mode 100644
index 000000000..32aff8305
--- /dev/null
+++ b/hutool-db/src/main/resources/META-INF/services/cn.hutool.v7.db.ds.DSFactory
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2013-2025 Hutool Team and hutool.cn
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+cn.hutool.v7.db.ds.hikari.HikariDSFactory
+cn.hutool.v7.db.ds.druid.DruidDSFactory
+cn.hutool.v7.db.ds.tomcat.TomcatDSFactory
+cn.hutool.v7.db.ds.bee.BeeDSFactory
+cn.hutool.v7.db.ds.dbcp.DbcpDSFactory
+cn.hutool.v7.db.ds.c3p0.C3p0DSFactory
+cn.hutool.v7.db.ds.pooled.PooledDSFactory
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/CRUDTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/CRUDTest.java
similarity index 94%
rename from hutool-db/src/test/java/org/dromara/hutool/db/CRUDTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/CRUDTest.java
index d00279b05..fdcd2ae3d 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/CRUDTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/CRUDTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-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 cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.db.handler.EntityListHandler;
+import cn.hutool.v7.db.pojo.User;
+import cn.hutool.v7.db.sql.Condition;
+import cn.hutool.v7.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/org/dromara/hutool/db/ConcurentTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/ConcurentTest.java
similarity index 84%
rename from hutool-db/src/test/java/org/dromara/hutool/db/ConcurentTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/ConcurentTest.java
index f460f5cea..5f6643e6f 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/ConcurentTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/ConcurentTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-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 cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.thread.ThreadUtil;
+import cn.hutool.v7.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/org/dromara/hutool/db/DbTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/DbTest.java
similarity index 96%
rename from hutool-db/src/test/java/org/dromara/hutool/db/DbTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/DbTest.java
index 35aea56d2..1773465f9 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/DbTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/DbTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.db.handler.EntityListHandler;
-import org.dromara.hutool.db.sql.Condition;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.db.handler.EntityListHandler;
+import cn.hutool.v7.db.sql.Condition;
+import cn.hutool.v7.log.LogUtil;
 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/org/dromara/hutool/db/DerbyTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/DerbyTest.java
similarity index 98%
rename from hutool-db/src/test/java/org/dromara/hutool/db/DerbyTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/DerbyTest.java
index 1dc22745c..47ed2e2aa 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/DerbyTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/DerbyTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/DmTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/DmTest.java
similarity index 97%
rename from hutool-db/src/test/java/org/dromara/hutool/db/DmTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/DmTest.java
index a91f50006..d9a4c6902 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/DmTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/DmTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/EntityTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/EntityTest.java
similarity index 96%
rename from hutool-db/src/test/java/org/dromara/hutool/db/EntityTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/EntityTest.java
index 5f8dd14e5..480f9759e 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/EntityTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/EntityTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.db.pojo.User;
+import cn.hutool.v7.db.pojo.User;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/FindBeanTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/FindBeanTest.java
similarity index 96%
rename from hutool-db/src/test/java/org/dromara/hutool/db/FindBeanTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/FindBeanTest.java
index 21de4782d..b759496aa 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/FindBeanTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/FindBeanTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.db.pojo.User;
+import cn.hutool.v7.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/org/dromara/hutool/db/H2Test.java b/hutool-db/src/test/java/cn/hutool/v7/db/H2Test.java
similarity index 94%
rename from hutool-db/src/test/java/org/dromara/hutool/db/H2Test.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/H2Test.java
index 9a5b22c13..98d87b540 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/H2Test.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/H2Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.map.CaseInsensitiveMap;
-import org.dromara.hutool.core.map.MapUtil;
+import cn.hutool.v7.core.map.CaseInsensitiveMap;
+import cn.hutool.v7.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/org/dromara/hutool/db/HanaTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/HanaTest.java
similarity index 97%
rename from hutool-db/src/test/java/org/dromara/hutool/db/HanaTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/HanaTest.java
index 7000cbeca..718bfbb45 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/HanaTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/HanaTest.java
@@ -1,6 +1,6 @@
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.lang.Console;
+import cn.hutool.v7.core.lang.Console;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/HsqldbTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/HsqldbTest.java
similarity index 98%
rename from hutool-db/src/test/java/org/dromara/hutool/db/HsqldbTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/HsqldbTest.java
index e08dd373a..6baee0933 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/HsqldbTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/HsqldbTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/Issue3654Test.java b/hutool-db/src/test/java/cn/hutool/v7/db/Issue3654Test.java
similarity index 92%
rename from hutool-db/src/test/java/org/dromara/hutool/db/Issue3654Test.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/Issue3654Test.java
index 936ddacfe..f70b15cf5 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/Issue3654Test.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/Issue3654Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.db.config.DbConfig;
+import cn.hutool.v7.db.config.DbConfig;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/IssueI73770Test.java b/hutool-db/src/test/java/cn/hutool/v7/db/IssueI73770Test.java
similarity index 98%
rename from hutool-db/src/test/java/org/dromara/hutool/db/IssueI73770Test.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/IssueI73770Test.java
index 64d8e2dc2..29922c32b 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/IssueI73770Test.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/IssueI73770Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/IssueI7GUKOTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/IssueI7GUKOTest.java
similarity index 93%
rename from hutool-db/src/test/java/org/dromara/hutool/db/IssueI7GUKOTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/IssueI7GUKOTest.java
index 84d299290..9ebfd7d74 100755
--- a/hutool-db/src/test/java/org/dromara/hutool/db/IssueI7GUKOTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/IssueI7GUKOTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.CollUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/IssueI8UTGPTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/IssueI8UTGPTest.java
similarity index 91%
rename from hutool-db/src/test/java/org/dromara/hutool/db/IssueI8UTGPTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/IssueI8UTGPTest.java
index c996bb719..d406f3d17 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/IssueI8UTGPTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/IssueI8UTGPTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.config.SettingConfigParser;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.config.SettingConfigParser;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/IssueI9B98CTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/IssueI9B98CTest.java
similarity index 86%
rename from hutool-db/src/test/java/org/dromara/hutool/db/IssueI9B98CTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/IssueI9B98CTest.java
index f7254fd4a..72269a0d3 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/IssueI9B98CTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/IssueI9B98CTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.config.SettingConfigParser;
-import org.dromara.hutool.setting.Setting;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.config.SettingConfigParser;
+import cn.hutool.v7.setting.Setting;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/IssueI9BANETest.java b/hutool-db/src/test/java/cn/hutool/v7/db/IssueI9BANETest.java
similarity index 81%
rename from hutool-db/src/test/java/org/dromara/hutool/db/IssueI9BANETest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/IssueI9BANETest.java
index 9ef34bc72..96f79060a 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/IssueI9BANETest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/IssueI9BANETest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.db.ds.DSUtil;
-import org.dromara.hutool.db.ds.DSWrapper;
-import org.dromara.hutool.db.meta.MetaUtil;
-import org.dromara.hutool.db.meta.Table;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.db.ds.DSUtil;
+import cn.hutool.v7.db.ds.DSWrapper;
+import cn.hutool.v7.db.meta.MetaUtil;
+import cn.hutool.v7.db.meta.Table;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/MySQLTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/MySQLTest.java
similarity index 97%
rename from hutool-db/src/test/java/org/dromara/hutool/db/MySQLTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/MySQLTest.java
index 3a12de8fd..e8861f7f2 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/MySQLTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/MySQLTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.lang.Console;
+import cn.hutool.v7.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/org/dromara/hutool/db/NamedSqlTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/NamedSqlTest.java
similarity index 97%
rename from hutool-db/src/test/java/org/dromara/hutool/db/NamedSqlTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/NamedSqlTest.java
index 5bc0d35d8..580198d8b 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/NamedSqlTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/NamedSqlTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.db.sql.NamedSql;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.db.sql.NamedSql;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/OceanBaseTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/OceanBaseTest.java
similarity index 92%
rename from hutool-db/src/test/java/org/dromara/hutool/db/OceanBaseTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/OceanBaseTest.java
index 886b1d4cc..e57a6ac01 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/OceanBaseTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/OceanBaseTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.lang.Console;
+import cn.hutool.v7.core.lang.Console;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/OracleTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/OracleTest.java
similarity index 91%
rename from hutool-db/src/test/java/org/dromara/hutool/db/OracleTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/OracleTest.java
index 1cd71e85a..e7db4b5b0 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/OracleTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/OracleTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-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 cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.db.sql.Query;
+import cn.hutool.v7.db.sql.SqlBuilder;
+import cn.hutool.v7.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/org/dromara/hutool/db/PageResultTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/PageResultTest.java
similarity index 96%
rename from hutool-db/src/test/java/org/dromara/hutool/db/PageResultTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/PageResultTest.java
index 68607233c..e4ff8f5b9 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/PageResultTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/PageResultTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/PageTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/PageTest.java
similarity index 93%
rename from hutool-db/src/test/java/org/dromara/hutool/db/PageTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/PageTest.java
index bb0bd8fca..da80e5092 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/PageTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/PageTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.db.sql.Order;
+import cn.hutool.v7.db.sql.Order;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/PicTransferTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/PicTransferTest.java
similarity index 88%
rename from hutool-db/src/test/java/org/dromara/hutool/db/PicTransferTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/PicTransferTest.java
index 122570c92..c881f7a1e 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/PicTransferTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/PicTransferTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.text.StrUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/PostgreTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/PostgreTest.java
similarity index 96%
rename from hutool-db/src/test/java/org/dromara/hutool/db/PostgreTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/PostgreTest.java
index 92f0e43c8..ec8cc5260 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/PostgreTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/PostgreTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.lang.Console;
+import cn.hutool.v7.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/org/dromara/hutool/db/QuoteWrapperTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/QuoteWrapperTest.java
similarity index 95%
rename from hutool-db/src/test/java/org/dromara/hutool/db/QuoteWrapperTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/QuoteWrapperTest.java
index b4af59835..711479d7e 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/QuoteWrapperTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/QuoteWrapperTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.db.sql.QuoteWrapper;
+import cn.hutool.v7.db.sql.QuoteWrapper;
 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/org/dromara/hutool/db/SessionTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/SessionTest.java
similarity index 97%
rename from hutool-db/src/test/java/org/dromara/hutool/db/SessionTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/SessionTest.java
index cd55ad2aa..df9e36740 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/SessionTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/SessionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/SqlServerTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/SqlServerTest.java
similarity index 94%
rename from hutool-db/src/test/java/org/dromara/hutool/db/SqlServerTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/SqlServerTest.java
index 0641aa675..ed2185d57 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/SqlServerTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/SqlServerTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
-import org.dromara.hutool.core.lang.Console;
+import cn.hutool.v7.core.lang.Console;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/UpdateTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/UpdateTest.java
similarity index 97%
rename from hutool-db/src/test/java/org/dromara/hutool/db/UpdateTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/UpdateTest.java
index 40a75f92f..40530b3a6 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/UpdateTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/UpdateTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db;
+package cn.hutool.v7.db;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/driver/DriverUtilTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/driver/DriverUtilTest.java
similarity index 97%
rename from hutool-db/src/test/java/org/dromara/hutool/db/driver/DriverUtilTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/driver/DriverUtilTest.java
index f93a413cf..f91f7ca71 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/driver/DriverUtilTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/driver/DriverUtilTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.driver;
+package cn.hutool.v7.db.driver;
 
-import org.dromara.hutool.core.util.RandomUtil;
+import cn.hutool.v7.core.util.RandomUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/ds/DataSourceWrapperTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/ds/DataSourceWrapperTest.java
similarity index 89%
rename from hutool-db/src/test/java/org/dromara/hutool/db/ds/DataSourceWrapperTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/ds/DataSourceWrapperTest.java
index e1d1bfb4f..6adf59fc2 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/ds/DataSourceWrapperTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/ds/DataSourceWrapperTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds;
+package cn.hutool.v7.db.ds;
 
-import org.dromara.hutool.db.config.DbConfig;
-import org.dromara.hutool.db.ds.simple.SimpleDataSource;
+import cn.hutool.v7.db.config.DbConfig;
+import cn.hutool.v7.db.ds.simple.SimpleDataSource;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/ds/DsTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/ds/DsTest.java
similarity index 86%
rename from hutool-db/src/test/java/org/dromara/hutool/db/ds/DsTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/ds/DsTest.java
index ac1f21803..4dfb058f0 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/ds/DsTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/ds/DsTest.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds;
+package cn.hutool.v7.db.ds;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.db.Db;
-import org.dromara.hutool.db.Entity;
-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 cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.db.Db;
+import cn.hutool.v7.db.Entity;
+import cn.hutool.v7.db.ds.bee.BeeDSFactory;
+import cn.hutool.v7.db.ds.c3p0.C3p0DSFactory;
+import cn.hutool.v7.db.ds.dbcp.DbcpDSFactory;
+import cn.hutool.v7.db.ds.druid.DruidDSFactory;
+import cn.hutool.v7.db.ds.hikari.HikariDSFactory;
+import cn.hutool.v7.db.ds.pooled.PooledDSFactory;
+import cn.hutool.v7.db.ds.tomcat.TomcatDSFactory;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/ds/PooledDataSourceTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/ds/PooledDataSourceTest.java
similarity index 76%
rename from hutool-db/src/test/java/org/dromara/hutool/db/ds/PooledDataSourceTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/ds/PooledDataSourceTest.java
index a753435ee..aa9da6fc1 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/ds/PooledDataSourceTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/ds/PooledDataSourceTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.ds;
+package cn.hutool.v7.db.ds;
 
-import org.dromara.hutool.db.DbException;
-import org.dromara.hutool.db.config.SettingConfigParser;
-import org.dromara.hutool.db.ds.pooled.PooledDSFactory;
-import org.dromara.hutool.setting.Setting;
+import cn.hutool.v7.db.DbException;
+import cn.hutool.v7.db.config.SettingConfigParser;
+import cn.hutool.v7.db.ds.pooled.PooledDSFactory;
+import cn.hutool.v7.setting.Setting;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -33,7 +33,7 @@ public class PooledDataSourceTest {
 			new PooledDSFactory());
 
 		final DSWrapper test = dsPool.getDataSource("test");
-		Assertions.assertEquals("org.dromara.hutool.db.ds.pooled.PooledDataSource", test.getRaw().getClass().getName());
+		Assertions.assertEquals("cn.hutool.v7.db.ds.pooled.PooledDataSource", test.getRaw().getClass().getName());
 		for (int i = 0; i < 1000; i++) {
 			try {
 				test.getConnection().close();
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/meta/MetaUtilTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/meta/MetaUtilTest.java
similarity index 88%
rename from hutool-db/src/test/java/org/dromara/hutool/db/meta/MetaUtilTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/meta/MetaUtilTest.java
index 508d4c81c..742f64c32 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/meta/MetaUtilTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/meta/MetaUtilTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.meta;
+package cn.hutool.v7.db.meta;
 
-import org.dromara.hutool.core.collection.set.SetUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.text.split.SplitUtil;
-import org.dromara.hutool.db.ds.DSUtil;
+import cn.hutool.v7.core.collection.set.SetUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.db.ds.DSUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/pojo/User.java b/hutool-db/src/test/java/cn/hutool/v7/db/pojo/User.java
similarity index 96%
rename from hutool-db/src/test/java/org/dromara/hutool/db/pojo/User.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/pojo/User.java
index 98d81d2e4..adefdfa31 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/pojo/User.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/pojo/User.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.pojo;
+package cn.hutool.v7.db.pojo;
 
 import lombok.Data;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/pojo/package-info.java b/hutool-db/src/test/java/cn/hutool/v7/db/pojo/package-info.java
similarity index 94%
rename from hutool-db/src/test/java/org/dromara/hutool/db/pojo/package-info.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/pojo/package-info.java
index 0390dde23..3aec4bbca 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/pojo/package-info.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/pojo/package-info.java
@@ -17,4 +17,4 @@
 /**
  * 测试pojo
  */
-package org.dromara.hutool.db.pojo;
+package cn.hutool.v7.db.pojo;
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionBuilderTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/sql/ConditionBuilderTest.java
similarity index 97%
rename from hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionBuilderTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/sql/ConditionBuilderTest.java
index f4446413e..567fefb5d 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionBuilderTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/sql/ConditionBuilderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionGroupTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/sql/ConditionGroupTest.java
similarity index 94%
rename from hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionGroupTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/sql/ConditionGroupTest.java
index 6068547de..ecf951211 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionGroupTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/sql/ConditionGroupTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.collection.ListUtil;
+import cn.hutool.v7.core.collection.ListUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/sql/ConditionTest.java
similarity index 98%
rename from hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/sql/ConditionTest.java
index 07565eb7e..ce4050657 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/sql/ConditionTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/sql/ConditionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/sql/IssueIBCDL2Test.java b/hutool-db/src/test/java/cn/hutool/v7/db/sql/IssueIBCDL2Test.java
similarity index 86%
rename from hutool-db/src/test/java/org/dromara/hutool/db/sql/IssueIBCDL2Test.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/sql/IssueIBCDL2Test.java
index 64440c53f..fedf6ef0e 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/sql/IssueIBCDL2Test.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/sql/IssueIBCDL2Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.db.Db;
-import org.dromara.hutool.db.Entity;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.db.Db;
+import cn.hutool.v7.db.Entity;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/sql/SqlBuilderTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/sql/SqlBuilderTest.java
similarity index 98%
rename from hutool-db/src/test/java/org/dromara/hutool/db/sql/SqlBuilderTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/sql/SqlBuilderTest.java
index eade67ab0..00dbbc43d 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/sql/SqlBuilderTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/sql/SqlBuilderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/sql/SqlFormatterTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/sql/SqlFormatterTest.java
similarity index 97%
rename from hutool-db/src/test/java/org/dromara/hutool/db/sql/SqlFormatterTest.java
rename to hutool-db/src/test/java/cn/hutool/v7/db/sql/SqlFormatterTest.java
index 5533ea599..0e707dce0 100644
--- a/hutool-db/src/test/java/org/dromara/hutool/db/sql/SqlFormatterTest.java
+++ b/hutool-db/src/test/java/cn/hutool/v7/db/sql/SqlFormatterTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.db.sql;
+package cn.hutool.v7.db.sql;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index 8ac8e2549..811b4e6fc 100755
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -23,9 +23,9 @@
 	jar
 
 	
-		org.dromara.hutool
+		cn.hutool.v7
 		hutool-parent
-		6.0.0-M22
+		7.0.0.M1
 	
 
 	hutool-extra
@@ -33,7 +33,7 @@
 	Hutool 扩展工具类（提供其它类库的封装）
 
 	
-		org.dromara.hutool.extra
+		cn.hutool.v7.extra
 		
 		2.4.1
 		3.19.0.RELEASE
@@ -64,17 +64,17 @@
 
 	
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-core
 			${project.parent.version}
 		
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-swing
 			${project.parent.version}
 		
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-setting
 			${project.parent.version}
 		
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/Aspect.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/Aspect.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/Aspect.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/Aspect.java
index 5dad68017..09e9d4a63 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/Aspect.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/Aspect.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop;
+package cn.hutool.v7.extra.aop;
 
 import java.lang.reflect.Method;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/ProxyUtil.java
similarity index 87%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/ProxyUtil.java
index 387cc277e..1c5ac1d49 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/ProxyUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop;
+package cn.hutool.v7.extra.aop;
 
-import org.dromara.hutool.core.reflect.JdkProxyUtil;
-import org.dromara.hutool.extra.aop.engine.ProxyEngine;
-import org.dromara.hutool.extra.aop.engine.ProxyEngineFactory;
+import cn.hutool.v7.core.reflect.JdkProxyUtil;
+import cn.hutool.v7.extra.aop.engine.ProxyEngine;
+import cn.hutool.v7.extra.aop.engine.ProxyEngineFactory;
 
 /**
  * 代理工具类
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/SimpleInterceptor.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/SimpleInterceptor.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/SimpleInterceptor.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/SimpleInterceptor.java
index 57063a138..25f7b4b69 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/SimpleInterceptor.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/SimpleInterceptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop;
+package cn.hutool.v7.extra.aop;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/SimpleAspect.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/SimpleAspect.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/SimpleAspect.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/SimpleAspect.java
index 06b267354..6799e8fc9 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/SimpleAspect.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/SimpleAspect.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop.aspects;
+package cn.hutool.v7.extra.aop.aspects;
 
-import org.dromara.hutool.extra.aop.Aspect;
+import cn.hutool.v7.extra.aop.Aspect;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/TimeIntervalAspect.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/TimeIntervalAspect.java
similarity index 90%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/TimeIntervalAspect.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/TimeIntervalAspect.java
index 98055cd77..dc6c3b3a4 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/TimeIntervalAspect.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/TimeIntervalAspect.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop.aspects;
+package cn.hutool.v7.extra.aop.aspects;
 
-import org.dromara.hutool.core.date.StopWatch;
-import org.dromara.hutool.core.lang.Console;
+import cn.hutool.v7.core.date.StopWatch;
+import cn.hutool.v7.core.lang.Console;
 
 import java.lang.reflect.Method;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/package-info.java
index 7fdf8296c..0c48326c2 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.aop.aspects;
+package cn.hutool.v7.extra.aop.aspects;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/ProxyEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/ProxyEngine.java
similarity index 89%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/ProxyEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/ProxyEngine.java
index 604df37be..0139e92c3 100755
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/ProxyEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/ProxyEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop.engine;
+package cn.hutool.v7.extra.aop.engine;
 
-import org.dromara.hutool.core.reflect.ConstructorUtil;
-import org.dromara.hutool.extra.aop.Aspect;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.extra.aop.Aspect;
 
 /**
  * 动态代理引擎接口
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/ProxyEngineFactory.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/ProxyEngineFactory.java
similarity index 85%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/ProxyEngineFactory.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/ProxyEngineFactory.java
index f59eeec8d..f3438507e 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/ProxyEngineFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/ProxyEngineFactory.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop.engine;
+package cn.hutool.v7.extra.aop.engine;
 
-import org.dromara.hutool.core.lang.Singleton;
-import org.dromara.hutool.core.spi.SpiUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.lang.Singleton;
+import cn.hutool.v7.core.spi.SpiUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.LogUtil;
 
 /**
  * 代理引擎简单工厂
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/JdkInterceptor.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/JdkInterceptor.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/JdkInterceptor.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/JdkInterceptor.java
index 2725ddb66..3398de587 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/JdkInterceptor.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/JdkInterceptor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop.engine.jdk;
+package cn.hutool.v7.extra.aop.engine.jdk;
 
-import org.dromara.hutool.core.reflect.ModifierUtil;
-import org.dromara.hutool.core.reflect.ReflectUtil;
-import org.dromara.hutool.extra.aop.Aspect;
-import org.dromara.hutool.extra.aop.SimpleInterceptor;
+import cn.hutool.v7.core.reflect.ModifierUtil;
+import cn.hutool.v7.core.reflect.ReflectUtil;
+import cn.hutool.v7.extra.aop.Aspect;
+import cn.hutool.v7.extra.aop.SimpleInterceptor;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/JdkProxyEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/JdkProxyEngine.java
similarity index 83%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/JdkProxyEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/JdkProxyEngine.java
index a30a72c21..8a3117bd0 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/JdkProxyEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/JdkProxyEngine.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop.engine.jdk;
+package cn.hutool.v7.extra.aop.engine.jdk;
 
-import org.dromara.hutool.extra.aop.Aspect;
-import org.dromara.hutool.extra.aop.ProxyUtil;
-import org.dromara.hutool.extra.aop.engine.ProxyEngine;
+import cn.hutool.v7.extra.aop.Aspect;
+import cn.hutool.v7.extra.aop.ProxyUtil;
+import cn.hutool.v7.extra.aop.engine.ProxyEngine;
 
 /**
  * JDK实现的切面代理
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/package-info.java
index 3d21476cb..d694d1757 100755
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.aop.engine.jdk;
+package cn.hutool.v7.extra.aop.engine.jdk;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/package-info.java
index 12b65bfc9..f44aade09 100755
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.aop.engine;
+package cn.hutool.v7.extra.aop.engine;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/SpringCglibInterceptor.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/SpringCglibInterceptor.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/SpringCglibInterceptor.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/SpringCglibInterceptor.java
index 6c397d5d4..68f15c33d 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/SpringCglibInterceptor.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/SpringCglibInterceptor.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop.engine.spring;
+package cn.hutool.v7.extra.aop.engine.spring;
 
-import org.dromara.hutool.extra.aop.Aspect;
-import org.dromara.hutool.extra.aop.SimpleInterceptor;
+import cn.hutool.v7.extra.aop.Aspect;
+import cn.hutool.v7.extra.aop.SimpleInterceptor;
 import org.springframework.cglib.proxy.MethodInterceptor;
 import org.springframework.cglib.proxy.MethodProxy;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/SpringCglibProxyEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/SpringCglibProxyEngine.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/SpringCglibProxyEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/SpringCglibProxyEngine.java
index 4ba25c4f7..c11535217 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/SpringCglibProxyEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/SpringCglibProxyEngine.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop.engine.spring;
+package cn.hutool.v7.extra.aop.engine.spring;
 
-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.extra.aop.Aspect;
-import org.dromara.hutool.extra.aop.engine.ProxyEngine;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.reflect.ClassUtil;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.extra.aop.Aspect;
+import cn.hutool.v7.extra.aop.engine.ProxyEngine;
 import org.springframework.cglib.proxy.Enhancer;
 
 import java.lang.reflect.Constructor;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/package-info.java
index adfe89da4..8dd7aae3a 100755
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.aop.engine.spring;
+package cn.hutool.v7.extra.aop.engine.spring;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/package-info.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/aop/package-info.java
index 9a47a70be..01f0f15b6 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/package-info.java
@@ -29,4 +29,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.aop;
+package cn.hutool.v7.extra.aop;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/CompressException.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/compress/CompressException.java
index 6c9128213..8a1ebcebd 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/CompressException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.compress;
+package cn.hutool.v7.extra.compress;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * 压缩解压异常语言异常
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/CompressUtil.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/compress/CompressUtil.java
index f11ac6be9..8987b7165 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/CompressUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.compress;
+package cn.hutool.v7.extra.compress;
 
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
 import org.apache.commons.compress.archivers.StreamingNotSupportedException;
@@ -22,14 +22,14 @@ import org.apache.commons.compress.compressors.CompressorException;
 import org.apache.commons.compress.compressors.CompressorInputStream;
 import org.apache.commons.compress.compressors.CompressorOutputStream;
 import org.apache.commons.compress.compressors.CompressorStreamFactory;
-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 cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.compress.archiver.Archiver;
+import cn.hutool.v7.extra.compress.archiver.SevenZArchiver;
+import cn.hutool.v7.extra.compress.archiver.StreamArchiver;
+import cn.hutool.v7.extra.compress.extractor.Extractor;
+import cn.hutool.v7.extra.compress.extractor.SevenZExtractor;
+import cn.hutool.v7.extra.compress.extractor.StreamExtractor;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/Archiver.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/archiver/Archiver.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/Archiver.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/compress/archiver/Archiver.java
index d7bcd10a1..5f23d6ff3 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/Archiver.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/archiver/Archiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.compress.archiver;
+package cn.hutool.v7.extra.compress.archiver;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/SevenZArchiver.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/archiver/SevenZArchiver.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/SevenZArchiver.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/compress/archiver/SevenZArchiver.java
index c1703f75b..c2fbcee74 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/SevenZArchiver.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/archiver/SevenZArchiver.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.compress.archiver;
+package cn.hutool.v7.extra.compress.archiver;
 
-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 cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.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/org/dromara/hutool/extra/compress/archiver/StreamArchiver.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/archiver/StreamArchiver.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/StreamArchiver.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/compress/archiver/StreamArchiver.java
index 350dc77b2..856100c4e 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/StreamArchiver.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/archiver/StreamArchiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.compress.archiver;
+package cn.hutool.v7.extra.compress.archiver;
 
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveException;
@@ -23,12 +23,12 @@ import org.apache.commons.compress.archivers.ArchiveStreamFactory;
 import org.apache.commons.compress.archivers.ar.ArArchiveOutputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
-import org.dromara.hutool.core.array.ArrayUtil;
-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 org.dromara.hutool.extra.compress.CompressException;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.compress.CompressException;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/archiver/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/compress/archiver/package-info.java
index 4b7858cb1..f726c39a1 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/archiver/package-info.java
@@ -24,4 +24,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.compress.archiver;
+package cn.hutool.v7.extra.compress.archiver;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/Extractor.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/Extractor.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/Extractor.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/Extractor.java
index 375f018b1..d94292be8 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/Extractor.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/Extractor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.compress.extractor;
+package cn.hutool.v7.extra.compress.extractor;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 import org.apache.commons.compress.archivers.ArchiveEntry;
 
 import java.io.Closeable;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/Seven7EntryInputStream.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/Seven7EntryInputStream.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/Seven7EntryInputStream.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/Seven7EntryInputStream.java
index 3a03c24c8..ef03ed981 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/Seven7EntryInputStream.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/Seven7EntryInputStream.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.compress.extractor;
+package cn.hutool.v7.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/org/dromara/hutool/extra/compress/extractor/SevenZExtractor.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/SevenZExtractor.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/SevenZExtractor.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/SevenZExtractor.java
index 3b15e0d29..96a5e4545 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/SevenZExtractor.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/SevenZExtractor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.compress.extractor;
+package cn.hutool.v7.extra.compress.extractor;
 
-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 cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.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/org/dromara/hutool/extra/compress/extractor/StreamExtractor.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/StreamExtractor.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/StreamExtractor.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/StreamExtractor.java
index af261609a..4134389fe 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/StreamExtractor.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/StreamExtractor.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.compress.extractor;
+package cn.hutool.v7.extra.compress.extractor;
 
-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 cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.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/org/dromara/hutool/extra/compress/extractor/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/package-info.java
index ca8d6cb5d..5a508bc77 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/extractor/package-info.java
@@ -24,4 +24,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.compress.extractor;
+package cn.hutool.v7.extra.compress.extractor;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/package-info.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/compress/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/compress/package-info.java
index cff05aa44..6b994a3ba 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/package-info.java
@@ -26,4 +26,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.compress;
+package cn.hutool.v7.extra.compress;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/emoji/EmojiUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/emoji/EmojiUtil.java
similarity index 99%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/emoji/EmojiUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/emoji/EmojiUtil.java
index 96c7aec08..ecab0beb0 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/emoji/EmojiUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/emoji/EmojiUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.emoji;
+package cn.hutool.v7.extra.emoji;
 
 import com.vdurmont.emoji.Emoji;
 import com.vdurmont.emoji.EmojiManager;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/emoji/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/emoji/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/emoji/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/emoji/package-info.java
index 2acb1b527..59cd4d34f 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/emoji/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/emoji/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.emoji;
+package cn.hutool.v7.extra.emoji;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/AbstractFtp.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/AbstractFtp.java
index 8b8733af0..70c75bcd8 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/AbstractFtp.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ftp;
+package cn.hutool.v7.extra.ftp;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.io.file.FileNameUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.io.file.FileNameUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.io.File;
 import java.util.List;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/CommonsFtp.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/CommonsFtp.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/CommonsFtp.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/CommonsFtp.java
index fa5f79277..2ac044a1e 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/CommonsFtp.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/CommonsFtp.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ftp;
+package cn.hutool.v7.extra.ftp;
 
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPClientConfig;
 import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.net.ftp.FTPReply;
-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.io.IORuntimeException;
-import org.dromara.hutool.core.io.file.FileNameUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.ssh.Connector;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.file.FileNameUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.ssh.Connector;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/Ftp.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/Ftp.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/Ftp.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/Ftp.java
index 7d27de863..ff0f9e337 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/Ftp.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/Ftp.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ftp;
+package cn.hutool.v7.extra.ftp;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpConfig.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpConfig.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpConfig.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpConfig.java
index 4233889ae..84b265094 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpConfig.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpConfig.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ftp;
+package cn.hutool.v7.extra.ftp;
 
-import org.dromara.hutool.extra.ssh.Connector;
+import cn.hutool.v7.extra.ssh.Connector;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpException.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpException.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpException.java
index abf69b059..8af33670b 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpException.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ftp;
+package cn.hutool.v7.extra.ftp;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * Ftp异常
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpMode.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpMode.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpMode.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpMode.java
index 7e5e4e6c6..02f88ecbe 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpMode.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpMode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ftp;
+package cn.hutool.v7.extra.ftp;
 
 /**
  * FTP连接模式
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/SimpleFtpServer.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/SimpleFtpServer.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/SimpleFtpServer.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/SimpleFtpServer.java
index a82995bbf..255e4f0f8 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/SimpleFtpServer.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/SimpleFtpServer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ftp;
+package cn.hutool.v7.extra.ftp;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.net.NetUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.net.NetUtil;
 import org.apache.ftpserver.ConnectionConfig;
 import org.apache.ftpserver.FtpServerFactory;
 import org.apache.ftpserver.ftplet.Authority;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/package-info.java
index 3e6a73470..21e370b5f 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.ftp;
+package cn.hutool.v7.extra.ftp;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/GlobalMailAccount.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/GlobalMailAccount.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mail/GlobalMailAccount.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mail/GlobalMailAccount.java
index 1373638b0..ab8f5f08c 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/GlobalMailAccount.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/GlobalMailAccount.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mail;
+package cn.hutool.v7.extra.mail;
 
-import org.dromara.hutool.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IORuntimeException;
 
 import java.nio.charset.Charset;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/InternalMailUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/InternalMailUtil.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mail/InternalMailUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mail/InternalMailUtil.java
index 424bb6867..28a293236 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/InternalMailUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/InternalMailUtil.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mail;
+package cn.hutool.v7.extra.mail;
 
-import org.dromara.hutool.core.array.ArrayUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
 
 import jakarta.mail.internet.AddressException;
 import jakarta.mail.internet.InternetAddress;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/Mail.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/Mail.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mail/Mail.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mail/Mail.java
index c95c350c8..c83cdfcc6 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/Mail.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/Mail.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mail;
+package cn.hutool.v7.extra.mail;
 
-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 cn.hutool.v7.core.lang.builder.Builder;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 
 import jakarta.activation.DataHandler;
 import jakarta.activation.DataSource;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailAccount.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailAccount.java
index 64d5a679a..afd654043 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailAccount.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mail;
+package cn.hutool.v7.extra.mail;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.lang.Assert;
-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 cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.setting.Setting;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailException.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailException.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailException.java
index 6cabd764e..a5ef76d71 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailException.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mail;
+package cn.hutool.v7.extra.mail;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * 邮件异常
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailUtil.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailUtil.java
index 65dc13d3f..902476208 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailUtil.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mail;
+package cn.hutool.v7.extra.mail;
 
 import jakarta.mail.Authenticator;
 import jakarta.mail.PasswordAuthentication;
 import jakarta.mail.Session;
-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.StrUtil;
-import org.dromara.hutool.core.text.split.SplitUtil;
-import org.dromara.hutool.core.text.CharUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.core.text.CharUtil;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mail/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mail/package-info.java
index 969096ee3..87cc67693 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.mail;
+package cn.hutool.v7.extra.mail;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/HostInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/HostInfo.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/HostInfo.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/HostInfo.java
index 12702114c..24ef9549c 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/HostInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/HostInfo.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.net.NetUtil;
+import cn.hutool.v7.core.net.NetUtil;
 
 import java.io.Serializable;
 import java.net.InetAddress;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaInfo.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaInfo.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaInfo.java
index a91727218..3b9404250 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaInfo.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.regex.ReUtil;
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.util.SystemUtil;
+import cn.hutool.v7.core.regex.ReUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.util.SystemUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaRuntimeInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaRuntimeInfo.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaRuntimeInfo.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaRuntimeInfo.java
index c1067d16e..f3648a134 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaRuntimeInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaRuntimeInfo.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.text.split.SplitUtil;
-import org.dromara.hutool.core.util.SystemUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.core.util.SystemUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaSpecInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaSpecInfo.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaSpecInfo.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaSpecInfo.java
index 3392806b0..0186d15db 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JavaSpecInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaSpecInfo.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.util.SystemUtil;
+import cn.hutool.v7.core.util.SystemUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JvmInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmInfo.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/JvmInfo.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmInfo.java
index 77bb05694..ac5ca6685 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JvmInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmInfo.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.util.SystemUtil;
+import cn.hutool.v7.core.util.SystemUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JvmSpecInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmSpecInfo.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/JvmSpecInfo.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmSpecInfo.java
index 0da9eba61..51e970eb8 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/JvmSpecInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmSpecInfo.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.util.SystemUtil;
+import cn.hutool.v7.core.util.SystemUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/ManagementException.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementException.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/ManagementException.java
index 50080dcaf..748761046 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementException.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/ManagementException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * FtpException异常
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/ManagementUtil.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/ManagementUtil.java
index 3b4883b3c..cd209e091 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/ManagementUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.lang.Singleton;
-import org.dromara.hutool.core.util.ObjUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.lang.Singleton;
+import cn.hutool.v7.core.util.ObjUtil;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/OsInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/OsInfo.java
similarity index 99%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/OsInfo.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/OsInfo.java
index 9c9a9451c..788271e50 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/OsInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/OsInfo.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.util.SystemUtil;
+import cn.hutool.v7.core.util.SystemUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/RuntimeInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/RuntimeInfo.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/RuntimeInfo.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/RuntimeInfo.java
index 252c16f16..fab2b55ec 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/RuntimeInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/RuntimeInfo.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/SystemPropsKeys.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/SystemPropsKeys.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/SystemPropsKeys.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/SystemPropsKeys.java
index a4b0b7b2c..704e28fcd 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/SystemPropsKeys.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/SystemPropsKeys.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
 /**
  * 系统属性名称常量池
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/UserInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/UserInfo.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/UserInfo.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/UserInfo.java
index cf2f1e79d..d554ac839 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/UserInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/UserInfo.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.SystemUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.SystemUtil;
 
 import java.io.File;
 import java.io.Serializable;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/CpuInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/oshi/CpuInfo.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/CpuInfo.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/oshi/CpuInfo.java
index 308a5d75b..5c8367e47 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/CpuInfo.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/oshi/CpuInfo.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management.oshi;
+package cn.hutool.v7.extra.management.oshi;
 
-import org.dromara.hutool.core.math.NumberUtil;
+import cn.hutool.v7.core.math.NumberUtil;
 import oshi.hardware.CentralProcessor;
 
 import java.text.DecimalFormat;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/CpuTicks.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/oshi/CpuTicks.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/CpuTicks.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/oshi/CpuTicks.java
index 7ea8abcfa..45a22b1f0 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/CpuTicks.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/oshi/CpuTicks.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management.oshi;
+package cn.hutool.v7.extra.management.oshi;
 
 import oshi.hardware.CentralProcessor;
 import oshi.util.Util;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/OshiUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/oshi/OshiUtil.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/OshiUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/oshi/OshiUtil.java
index 918dbdcac..235f98b9c 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/OshiUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/oshi/OshiUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management.oshi;
+package cn.hutool.v7.extra.management.oshi;
 
 import oshi.SystemInfo;
 import oshi.hardware.CentralProcessor;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/oshi/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/oshi/package-info.java
index b1ddd6b6c..ddebfb8d7 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/oshi/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/oshi/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  * @since 4.6.4
  */
-package org.dromara.hutool.extra.management.oshi;
+package cn.hutool.v7.extra.management.oshi;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/management/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/management/package-info.java
index 605939266..b0bfe99d1 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/Consumer.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/Consumer.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/Consumer.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/Consumer.java
index 0a07eef86..0e424d84b 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/Consumer.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/Consumer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq;
+package cn.hutool.v7.extra.mq;
 
-import org.dromara.hutool.core.thread.ThreadUtil;
+import cn.hutool.v7.core.thread.ThreadUtil;
 
 import java.io.Closeable;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/MQConfig.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/MQConfig.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/MQConfig.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/MQConfig.java
index 9179dc7c8..bfc938c40 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/MQConfig.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/MQConfig.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq;
+package cn.hutool.v7.extra.mq;
 
-import org.dromara.hutool.extra.mq.engine.MQEngine;
+import cn.hutool.v7.extra.mq.engine.MQEngine;
 
 import java.io.Serializable;
 import java.util.Properties;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/MQException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/MQException.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/MQException.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/MQException.java
index 8bd4b7961..7b6f1537a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/MQException.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/MQException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq;
+package cn.hutool.v7.extra.mq;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * 消息队列异常
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/Message.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/Message.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/Message.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/Message.java
index 0ee1d32db..5872d15d8 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/Message.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/Message.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq;
+package cn.hutool.v7.extra.mq;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.nio.charset.Charset;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/MessageHandler.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/MessageHandler.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/MessageHandler.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/MessageHandler.java
index 4cc76279c..dbf661c4d 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/MessageHandler.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/MessageHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq;
+package cn.hutool.v7.extra.mq;
 
 /**
  * 消息处理器
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/Producer.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/Producer.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/Producer.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/Producer.java
index a15851727..1023c2b27 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/Producer.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/Producer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq;
+package cn.hutool.v7.extra.mq;
 
 import java.io.Closeable;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/MQEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/MQEngine.java
similarity index 84%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/MQEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/MQEngine.java
index 065a07c99..453806756 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/MQEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/MQEngine.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq.engine;
+package cn.hutool.v7.extra.mq.engine;
 
-import org.dromara.hutool.extra.mq.Consumer;
-import org.dromara.hutool.extra.mq.MQConfig;
-import org.dromara.hutool.extra.mq.Producer;
+import cn.hutool.v7.extra.mq.Consumer;
+import cn.hutool.v7.extra.mq.MQConfig;
+import cn.hutool.v7.extra.mq.Producer;
 
 /**
  * 消息队列引擎接口
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/MQEngineFactory.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/MQEngineFactory.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/MQEngineFactory.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/MQEngineFactory.java
index 2e5940cb6..d25eadaa5 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/MQEngineFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/MQEngineFactory.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq.engine;
+package cn.hutool.v7.extra.mq.engine;
 
-import org.dromara.hutool.core.reflect.ConstructorUtil;
-import org.dromara.hutool.core.spi.SpiUtil;
-import org.dromara.hutool.extra.mq.MQConfig;
-import org.dromara.hutool.extra.mq.MQException;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.spi.SpiUtil;
+import cn.hutool.v7.extra.mq.MQConfig;
+import cn.hutool.v7.extra.mq.MQException;
 
 /**
  * MQ引擎工厂类
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/kafka/KafkaConsumer.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/kafka/KafkaConsumer.java
similarity index 90%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/kafka/KafkaConsumer.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/kafka/KafkaConsumer.java
index 083b95f9b..fdf3ad61b 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/kafka/KafkaConsumer.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/kafka/KafkaConsumer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq.engine.kafka;
+package cn.hutool.v7.extra.mq.engine.kafka;
 
 import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.extra.mq.Consumer;
-import org.dromara.hutool.extra.mq.Message;
-import org.dromara.hutool.extra.mq.MessageHandler;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.extra.mq.Consumer;
+import cn.hutool.v7.extra.mq.Message;
+import cn.hutool.v7.extra.mq.MessageHandler;
 
 import java.io.IOException;
 import java.time.Duration;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/kafka/KafkaEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/kafka/KafkaEngine.java
similarity index 89%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/kafka/KafkaEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/kafka/KafkaEngine.java
index 5cc6fed51..1ee75d1fa 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/kafka/KafkaEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/kafka/KafkaEngine.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq.engine.kafka;
+package cn.hutool.v7.extra.mq.engine.kafka;
 
 import org.apache.kafka.clients.CommonClientConfigs;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.extra.mq.Consumer;
-import org.dromara.hutool.extra.mq.MQConfig;
-import org.dromara.hutool.extra.mq.Producer;
-import org.dromara.hutool.extra.mq.engine.MQEngine;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.extra.mq.Consumer;
+import cn.hutool.v7.extra.mq.MQConfig;
+import cn.hutool.v7.extra.mq.Producer;
+import cn.hutool.v7.extra.mq.engine.MQEngine;
 
 import java.util.Properties;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/kafka/KafkaProducer.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/kafka/KafkaProducer.java
similarity index 89%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/kafka/KafkaProducer.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/kafka/KafkaProducer.java
index 2673214de..ebdea6a98 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/kafka/KafkaProducer.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/kafka/KafkaProducer.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq.engine.kafka;
+package cn.hutool.v7.extra.mq.engine.kafka;
 
 import org.apache.kafka.clients.producer.ProducerRecord;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.extra.mq.Message;
-import org.dromara.hutool.extra.mq.Producer;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.extra.mq.Message;
+import cn.hutool.v7.extra.mq.Producer;
 
 import java.io.IOException;
 import java.util.Properties;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/kafka/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/kafka/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/kafka/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/kafka/package-info.java
index aac5019d2..d1775375a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/kafka/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/kafka/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.extra.mq.engine.kafka;
+package cn.hutool.v7.extra.mq.engine.kafka;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/package-info.java
index 3d4676bf7..c8fe9e63a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.mq.engine;
+package cn.hutool.v7.extra.mq.engine;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rabbitmq/RabbitMQConsumer.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rabbitmq/RabbitMQConsumer.java
similarity index 89%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rabbitmq/RabbitMQConsumer.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rabbitmq/RabbitMQConsumer.java
index fbfcb25f6..aac93fe55 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rabbitmq/RabbitMQConsumer.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rabbitmq/RabbitMQConsumer.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq.engine.rabbitmq;
+package cn.hutool.v7.extra.mq.engine.rabbitmq;
 
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.DeliverCallback;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.extra.mq.Consumer;
-import org.dromara.hutool.extra.mq.MQException;
-import org.dromara.hutool.extra.mq.Message;
-import org.dromara.hutool.extra.mq.MessageHandler;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.extra.mq.Consumer;
+import cn.hutool.v7.extra.mq.MQException;
+import cn.hutool.v7.extra.mq.Message;
+import cn.hutool.v7.extra.mq.MessageHandler;
 
 import java.io.IOException;
 import java.util.Map;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rabbitmq/RabbitMQEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rabbitmq/RabbitMQEngine.java
similarity index 87%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rabbitmq/RabbitMQEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rabbitmq/RabbitMQEngine.java
index 3da99edf3..449878722 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rabbitmq/RabbitMQEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rabbitmq/RabbitMQEngine.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq.engine.rabbitmq;
+package cn.hutool.v7.extra.mq.engine.rabbitmq;
 
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.extra.mq.Consumer;
-import org.dromara.hutool.extra.mq.MQConfig;
-import org.dromara.hutool.extra.mq.MQException;
-import org.dromara.hutool.extra.mq.Producer;
-import org.dromara.hutool.extra.mq.engine.MQEngine;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.extra.mq.Consumer;
+import cn.hutool.v7.extra.mq.MQConfig;
+import cn.hutool.v7.extra.mq.MQException;
+import cn.hutool.v7.extra.mq.Producer;
+import cn.hutool.v7.extra.mq.engine.MQEngine;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rabbitmq/RabbitMQProducer.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rabbitmq/RabbitMQProducer.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rabbitmq/RabbitMQProducer.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rabbitmq/RabbitMQProducer.java
index 2c6ab667a..9bc6fba91 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rabbitmq/RabbitMQProducer.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rabbitmq/RabbitMQProducer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq.engine.rabbitmq;
+package cn.hutool.v7.extra.mq.engine.rabbitmq;
 
 import com.rabbitmq.client.Channel;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.mq.MQException;
-import org.dromara.hutool.extra.mq.Message;
-import org.dromara.hutool.extra.mq.Producer;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.mq.MQException;
+import cn.hutool.v7.extra.mq.Message;
+import cn.hutool.v7.extra.mq.Producer;
 
 import java.io.IOException;
 import java.util.Map;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rabbitmq/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rabbitmq/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rabbitmq/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rabbitmq/package-info.java
index 010d7abdc..932128e54 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rabbitmq/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rabbitmq/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.extra.mq.engine.rabbitmq;
+package cn.hutool.v7.extra.mq.engine.rabbitmq;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rocketmq/RocketMQConsumer.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rocketmq/RocketMQConsumer.java
similarity index 91%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rocketmq/RocketMQConsumer.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rocketmq/RocketMQConsumer.java
index 559c298b9..aec6d6bbc 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rocketmq/RocketMQConsumer.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rocketmq/RocketMQConsumer.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq.engine.rocketmq;
+package cn.hutool.v7.extra.mq.engine.rocketmq;
 
 import org.apache.rocketmq.client.consumer.MQPushConsumer;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
 import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.message.MessageExt;
-import org.dromara.hutool.extra.mq.Consumer;
-import org.dromara.hutool.extra.mq.MQException;
-import org.dromara.hutool.extra.mq.Message;
-import org.dromara.hutool.extra.mq.MessageHandler;
+import cn.hutool.v7.extra.mq.Consumer;
+import cn.hutool.v7.extra.mq.MQException;
+import cn.hutool.v7.extra.mq.Message;
+import cn.hutool.v7.extra.mq.MessageHandler;
 
 import java.io.IOException;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rocketmq/RocketMQEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rocketmq/RocketMQEngine.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rocketmq/RocketMQEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rocketmq/RocketMQEngine.java
index b5be076c2..df7f37f87 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rocketmq/RocketMQEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rocketmq/RocketMQEngine.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq.engine.rocketmq;
+package cn.hutool.v7.extra.mq.engine.rocketmq;
 
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.client.producer.DefaultMQProducer;
 import org.apache.rocketmq.common.MixAll;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.extra.mq.Consumer;
-import org.dromara.hutool.extra.mq.MQConfig;
-import org.dromara.hutool.extra.mq.MQException;
-import org.dromara.hutool.extra.mq.Producer;
-import org.dromara.hutool.extra.mq.engine.MQEngine;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.extra.mq.Consumer;
+import cn.hutool.v7.extra.mq.MQConfig;
+import cn.hutool.v7.extra.mq.MQException;
+import cn.hutool.v7.extra.mq.Producer;
+import cn.hutool.v7.extra.mq.engine.MQEngine;
 
 /**
  * RocketMQ引擎
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rocketmq/RocketMQProducer.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rocketmq/RocketMQProducer.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rocketmq/RocketMQProducer.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rocketmq/RocketMQProducer.java
index decd947c8..825b1112a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rocketmq/RocketMQProducer.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rocketmq/RocketMQProducer.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mq.engine.rocketmq;
+package cn.hutool.v7.extra.mq.engine.rocketmq;
 
 import org.apache.rocketmq.client.producer.MQProducer;
-import org.dromara.hutool.extra.mq.MQException;
-import org.dromara.hutool.extra.mq.Message;
-import org.dromara.hutool.extra.mq.Producer;
+import cn.hutool.v7.extra.mq.MQException;
+import cn.hutool.v7.extra.mq.Message;
+import cn.hutool.v7.extra.mq.Producer;
 
 import java.io.IOException;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rocketmq/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rocketmq/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rocketmq/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rocketmq/package-info.java
index 004cc5991..f65e8e50a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/engine/rocketmq/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/rocketmq/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.mq.engine.rocketmq;
+package cn.hutool.v7.extra.mq.engine.rocketmq;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/package-info.java
similarity index 67%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/mq/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/mq/package-info.java
index d96ca8bec..dccb0d821 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mq/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/package-info.java
@@ -19,12 +19,12 @@
  * 通过定义统一接口，统一消息中间件的调用，实现消息队列的解耦。
  * 组件包括：
  * 
        
- *     
      • {@link org.dromara.hutool.extra.mq.Producer}: 消息生产者，业务的发起方，负责生产消息
        • 
- *     
      • {@link org.dromara.hutool.extra.mq.Consumer}: 消息消费者，业务的处理方
        • 
- *     
      • {@link org.dromara.hutool.extra.mq.Message}: 消息体，根据不同通信协议定义的固定格式进行编码的数据包
        • 
+ *     
      • {@link cn.hutool.v7.extra.mq.Producer}: 消息生产者，业务的发起方，负责生产消息
        • 
+ *     
      • {@link cn.hutool.v7.extra.mq.Consumer}: 消息消费者，业务的处理方
        • 
+ *     
      • {@link cn.hutool.v7.extra.mq.Message}: 消息体，根据不同通信协议定义的固定格式进行编码的数据包
        • 
  * 
      
  *
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.extra.mq;
+package cn.hutool.v7.extra.mq;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/package-info.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/package-info.java
index c2c21e11f..1839f2e30 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/package-info.java
@@ -20,4 +20,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra;
+package cn.hutool.v7.extra;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/PinyinException.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinException.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/PinyinException.java
index 0a2f44066..3bcec3a1b 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinException.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/PinyinException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin;
+package cn.hutool.v7.extra.pinyin;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * 拼音异常
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/PinyinUtil.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/PinyinUtil.java
index 38edf50c3..fb4cb46b0 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/PinyinUtil.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin;
+package cn.hutool.v7.extra.pinyin;
 
-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.extra.pinyin.engine.PinyinEngine;
-import org.dromara.hutool.extra.pinyin.engine.PinyinEngineFactory;
+import cn.hutool.v7.core.regex.PatternPool;
+import cn.hutool.v7.core.regex.ReUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.pinyin.engine.PinyinEngine;
+import cn.hutool.v7.extra.pinyin.engine.PinyinEngineFactory;
 
 /**
  * 拼音工具类，用于快速获取拼音
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/PinyinEngine.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/PinyinEngine.java
index d88059afb..dd4ec7e5c 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/PinyinEngine.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin.engine;
+package cn.hutool.v7.extra.pinyin.engine;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.text.split.SplitUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
 
 import java.util.List;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinEngineFactory.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/PinyinEngineFactory.java
similarity index 89%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinEngineFactory.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/PinyinEngineFactory.java
index 78885cddd..c5f00a8ca 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinEngineFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/PinyinEngineFactory.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin.engine;
+package cn.hutool.v7.extra.pinyin.engine;
 
-import org.dromara.hutool.core.lang.Singleton;
-import org.dromara.hutool.core.spi.ServiceLoader;
-import org.dromara.hutool.core.spi.SpiUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.pinyin.PinyinException;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.lang.Singleton;
+import cn.hutool.v7.core.spi.ServiceLoader;
+import cn.hutool.v7.core.spi.SpiUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.pinyin.PinyinException;
+import cn.hutool.v7.log.LogUtil;
 
 /**
  * 简单拼音引擎工厂，用于根据用户引入的拼音库jar，自动创建对应的拼音引擎对象
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
similarity index 91%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
index dfe62648e..53e7df4f0 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/bopomofo4j/Bopomofo4jEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin.engine.bopomofo4j;
+package cn.hutool.v7.extra.pinyin.engine.bopomofo4j;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.pinyin.engine.PinyinEngine;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.pinyin.engine.PinyinEngine;
 import com.rnkrsoft.bopomofo4j.Bopomofo4j;
 import com.rnkrsoft.bopomofo4j.ToneType;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/bopomofo4j/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/bopomofo4j/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/bopomofo4j/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/bopomofo4j/package-info.java
index 1ed0fbf26..70f431de3 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/bopomofo4j/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/bopomofo4j/package-info.java
@@ -33,4 +33,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.pinyin.engine.bopomofo4j;
+package cn.hutool.v7.extra.pinyin.engine.bopomofo4j;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/houbb/HoubbEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/houbb/HoubbEngine.java
similarity index 91%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/houbb/HoubbEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/houbb/HoubbEngine.java
index 930319a67..684db11a8 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/houbb/HoubbEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/houbb/HoubbEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin.engine.houbb;
+package cn.hutool.v7.extra.pinyin.engine.houbb;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.extra.pinyin.engine.PinyinEngine;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.extra.pinyin.engine.PinyinEngine;
 import com.github.houbb.pinyin.constant.enums.PinyinStyleEnum;
 import com.github.houbb.pinyin.util.PinyinHelper;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/houbb/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/houbb/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/houbb/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/houbb/package-info.java
index 7766c1ab3..0294f84de 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/houbb/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/houbb/package-info.java
@@ -33,4 +33,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.pinyin.engine.houbb;
+package cn.hutool.v7.extra.pinyin.engine.houbb;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/jpinyin/JPinyinEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/jpinyin/JPinyinEngine.java
similarity index 87%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/jpinyin/JPinyinEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/jpinyin/JPinyinEngine.java
index 2e727187b..58ae53fbd 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/jpinyin/JPinyinEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/jpinyin/JPinyinEngine.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin.engine.jpinyin;
+package cn.hutool.v7.extra.pinyin.engine.jpinyin;
 
 import com.github.stuxuhai.jpinyin.PinyinException;
 import com.github.stuxuhai.jpinyin.PinyinFormat;
 import com.github.stuxuhai.jpinyin.PinyinHelper;
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.extra.pinyin.engine.PinyinEngine;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.extra.pinyin.engine.PinyinEngine;
 
 /**
  * 封装了Jpinyin的引擎。
@@ -63,7 +63,7 @@ public class JPinyinEngine implements PinyinEngine {
 		try {
 			return PinyinHelper.convertToPinyinString(str, separator, tone ? PinyinFormat.WITH_TONE_MARK : PinyinFormat.WITHOUT_TONE);
 		} catch (final PinyinException e) {
-			throw new org.dromara.hutool.extra.pinyin.PinyinException(e);
+			throw new cn.hutool.v7.extra.pinyin.PinyinException(e);
 		}
 	}
 }
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/jpinyin/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/jpinyin/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/jpinyin/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/jpinyin/package-info.java
index 99b4040cc..8950fefde 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/jpinyin/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/jpinyin/package-info.java
@@ -33,4 +33,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.pinyin.engine.jpinyin;
+package cn.hutool.v7.extra.pinyin.engine.jpinyin;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/package-info.java
index 323b3182a..a24af21e9 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.pinyin.engine;
+package cn.hutool.v7.extra.pinyin.engine;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
index dcc9c883b..f4e7c1bce 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/pinyin4j/Pinyin4jEngine.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin.engine.pinyin4j;
+package cn.hutool.v7.extra.pinyin.engine.pinyin4j;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.extra.pinyin.engine.PinyinEngine;
-import org.dromara.hutool.extra.pinyin.PinyinException;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.extra.pinyin.engine.PinyinEngine;
+import cn.hutool.v7.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/org/dromara/hutool/extra/pinyin/engine/pinyin4j/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/pinyin4j/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/pinyin4j/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/pinyin4j/package-info.java
index b2353ff5f..38b141068 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/pinyin4j/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/pinyin4j/package-info.java
@@ -33,4 +33,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.pinyin.engine.pinyin4j;
+package cn.hutool.v7.extra.pinyin.engine.pinyin4j;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java
similarity index 91%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java
index 63b15ef2a..ddd93d8a1 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin.engine.tinypinyin;
+package cn.hutool.v7.extra.pinyin.engine.tinypinyin;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.pinyin.engine.PinyinEngine;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.pinyin.engine.PinyinEngine;
 import com.github.promeg.pinyinhelper.Pinyin;
 
 /**
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/tinypinyin/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/tinypinyin/package-info.java
index f82974bcb..92b52e30e 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/engine/tinypinyin/package-info.java
@@ -35,4 +35,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.pinyin.engine.tinypinyin;
+package cn.hutool.v7.extra.pinyin.engine.tinypinyin;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/package-info.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/package-info.java
index d497d1063..d0803859b 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/package-info.java
@@ -24,4 +24,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.pinyin;
+package cn.hutool.v7.extra.pinyin;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/SpringUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/SpringUtil.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/spring/SpringUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/spring/SpringUtil.java
index f024344ce..fb940d624 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/SpringUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/SpringUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.spring;
+package cn.hutool.v7.extra.spring;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.exception.HutoolException;
-import org.dromara.hutool.core.reflect.TypeReference;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.exception.HutoolException;
+import cn.hutool.v7.core.reflect.TypeReference;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultSingletonBeanRegistry;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/BeanCopierCache.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/cglib/BeanCopierCache.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/BeanCopierCache.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/spring/cglib/BeanCopierCache.java
index bf7552a5e..d3bafc8c1 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/BeanCopierCache.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/cglib/BeanCopierCache.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.spring.cglib;
+package cn.hutool.v7.extra.spring.cglib;
 
-import org.dromara.hutool.core.map.reference.WeakConcurrentMap;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.map.reference.WeakConcurrentMap;
+import cn.hutool.v7.core.text.StrUtil;
 import org.springframework.cglib.beans.BeanCopier;
 import org.springframework.cglib.core.Converter;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/CglibUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/cglib/CglibUtil.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/CglibUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/spring/cglib/CglibUtil.java
index d7ae83c5b..b75f80f73 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/CglibUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/cglib/CglibUtil.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.spring.cglib;
+package cn.hutool.v7.extra.spring.cglib;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
 import org.springframework.cglib.beans.BeanCopier;
 import org.springframework.cglib.beans.BeanMap;
 import org.springframework.cglib.core.Converter;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/cglib/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/spring/cglib/package-info.java
index 12975ff00..b2af07a23 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/cglib/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.spring.cglib;
+package cn.hutool.v7.extra.spring.cglib;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/spring/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/spring/package-info.java
index 29f9ffc3a..cb8d29734 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.spring;
+package cn.hutool.v7.extra.spring;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Connector.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/Connector.java
similarity index 99%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Connector.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/Connector.java
index 3699f33a2..4721c5972 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Connector.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/Connector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh;
+package cn.hutool.v7.extra.ssh;
 
 /**
  * 连接者对象，提供一些连接的基本信息，包括：
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Session.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/Session.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Session.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/Session.java
index 8d917989e..737893790 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Session.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/Session.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh;
+package cn.hutool.v7.extra.ssh;
 
-import org.dromara.hutool.core.lang.wrapper.Wrapper;
-import org.dromara.hutool.core.io.IORuntimeException;
+import cn.hutool.v7.core.lang.wrapper.Wrapper;
+import cn.hutool.v7.core.io.IORuntimeException;
 
 import java.io.Closeable;
 import java.net.InetSocketAddress;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/SshException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/SshException.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/SshException.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/SshException.java
index 186a2c963..0d45cb507 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/SshException.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/SshException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh;
+package cn.hutool.v7.extra.ssh;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * SSH异常
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/ganymed/GanymedSession.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/ganymed/GanymedSession.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/ganymed/GanymedSession.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/ganymed/GanymedSession.java
index 7c4d6680c..65d9b120a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/ganymed/GanymedSession.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/ganymed/GanymedSession.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh.engine.ganymed;
+package cn.hutool.v7.extra.ssh.engine.ganymed;
 
 import ch.ethz.ssh2.Connection;
 import ch.ethz.ssh2.LocalPortForwarder;
 import ch.ethz.ssh2.StreamGobbler;
-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.util.CharsetUtil;
-import org.dromara.hutool.extra.ssh.Connector;
-import org.dromara.hutool.extra.ssh.Session;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.extra.ssh.Connector;
+import cn.hutool.v7.extra.ssh.Session;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/ganymed/GanymedUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/ganymed/GanymedUtil.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/ganymed/GanymedUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/ganymed/GanymedUtil.java
index 81e82cdbb..f2457ee36 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/ganymed/GanymedUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/ganymed/GanymedUtil.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh.engine.ganymed;
+package cn.hutool.v7.extra.ssh.engine.ganymed;
 
 import ch.ethz.ssh2.Connection;
 import ch.ethz.ssh2.Session;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.extra.ssh.Connector;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.extra.ssh.Connector;
 
 import java.io.IOException;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/ganymed/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/ganymed/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/ganymed/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/ganymed/package-info.java
index ac480c533..b8ebe26f0 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/ganymed/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/ganymed/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.ssh.engine.ganymed;
+package cn.hutool.v7.extra.ssh.engine.ganymed;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/ChannelType.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/ChannelType.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/ChannelType.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/ChannelType.java
index aa08fa1f5..a316a4a8f 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/ChannelType.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/ChannelType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh.engine.jsch;
+package cn.hutool.v7.extra.ssh.engine.jsch;
 
 /**
  * Jsch支持的Channel类型
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/JschSession.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/JschSession.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/JschSession.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/JschSession.java
index 81ea3fd12..47c81528e 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/JschSession.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/JschSession.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh.engine.jsch;
+package cn.hutool.v7.extra.ssh.engine.jsch;
 
 import com.jcraft.jsch.Channel;
 import com.jcraft.jsch.ChannelExec;
 import com.jcraft.jsch.ChannelShell;
 import com.jcraft.jsch.JSchException;
-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 org.dromara.hutool.extra.ssh.Connector;
-import org.dromara.hutool.extra.ssh.Session;
-import org.dromara.hutool.extra.ssh.SshException;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.extra.ssh.Connector;
+import cn.hutool.v7.extra.ssh.Session;
+import cn.hutool.v7.extra.ssh.SshException;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/JschSftp.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/JschSftp.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/JschSftp.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/JschSftp.java
index 27addc2ee..3d598fd8c 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/JschSftp.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/JschSftp.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh.engine.jsch;
+package cn.hutool.v7.extra.ssh.engine.jsch;
 
 import com.jcraft.jsch.*;
-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 cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.ftp.AbstractFtp;
+import cn.hutool.v7.extra.ftp.FtpConfig;
+import cn.hutool.v7.extra.ftp.FtpException;
 import com.jcraft.jsch.ChannelSftp.LsEntry;
 import com.jcraft.jsch.ChannelSftp.LsEntrySelector;
-import org.dromara.hutool.extra.ssh.Connector;
-import org.dromara.hutool.extra.ssh.SshException;
+import cn.hutool.v7.extra.ssh.Connector;
+import cn.hutool.v7.extra.ssh.SshException;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/JschUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/JschUtil.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/JschUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/JschUtil.java
index b986fbea1..e3c22f39f 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/JschUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/JschUtil.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh.engine.jsch;
+package cn.hutool.v7.extra.ssh.engine.jsch;
 
 import com.jcraft.jsch.Channel;
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
-import org.dromara.hutool.extra.ssh.Connector;
-import org.dromara.hutool.extra.ssh.SshException;
+import cn.hutool.v7.extra.ssh.Connector;
+import cn.hutool.v7.extra.ssh.SshException;
 
 /**
  * Jsch工具类
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/package-info.java
index 1acc6344a..492ed560e 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/jsch/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/jsch/package-info.java
@@ -19,4 +19,4 @@
  *
  *  @author Looly
  */
-package org.dromara.hutool.extra.ssh.engine.jsch;
+package cn.hutool.v7.extra.ssh.engine.jsch;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/mina/MinaSession.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/mina/MinaSession.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/mina/MinaSession.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/mina/MinaSession.java
index c9c77f0ca..00037e15e 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/mina/MinaSession.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/mina/MinaSession.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh.engine.mina;
+package cn.hutool.v7.extra.ssh.engine.mina;
 
 import org.apache.sshd.client.SshClient;
 import org.apache.sshd.client.channel.ChannelShell;
 import org.apache.sshd.client.session.ClientSession;
 import org.apache.sshd.common.util.net.SshdSocketAddress;
 import org.apache.sshd.server.forward.AcceptAllForwardingFilter;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.extra.ssh.Connector;
-import org.dromara.hutool.extra.ssh.Session;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.extra.ssh.Connector;
+import cn.hutool.v7.extra.ssh.Session;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/mina/MinaUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/mina/MinaUtil.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/mina/MinaUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/mina/MinaUtil.java
index e5b15ba7d..d4e22fb2f 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/mina/MinaUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/mina/MinaUtil.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh.engine.mina;
+package cn.hutool.v7.extra.ssh.engine.mina;
 
 import org.apache.sshd.client.SshClient;
 import org.apache.sshd.client.session.ClientSession;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.extra.ssh.Connector;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.extra.ssh.Connector;
 
 import java.io.IOException;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/mina/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/mina/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/mina/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/mina/package-info.java
index 757dd97b4..12ed58739 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/mina/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/mina/package-info.java
@@ -19,4 +19,4 @@
  *
  *  @author Looly
  */
-package org.dromara.hutool.extra.ssh.engine.mina;
+package cn.hutool.v7.extra.ssh.engine.mina;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/package-info.java
index 46eb51baa..eace9ce7b 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/package-info.java
@@ -17,4 +17,4 @@
 /**
  *  SSH 引擎封装
  */
-package org.dromara.hutool.extra.ssh.engine;
+package cn.hutool.v7.extra.ssh.engine;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/SshjSession.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/sshj/SshjSession.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/SshjSession.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/sshj/SshjSession.java
index 61ea98f24..e9b7632c5 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/SshjSession.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/sshj/SshjSession.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh.engine.sshj;
+package cn.hutool.v7.extra.ssh.engine.sshj;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.connection.channel.direct.Parameters;
 import net.schmizz.sshj.connection.channel.forwarded.RemotePortForwarder;
 import net.schmizz.sshj.connection.channel.forwarded.SocketForwardingConnectListener;
-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.StrUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.extra.ssh.Connector;
-import org.dromara.hutool.extra.ssh.Session;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.extra.ssh.Connector;
+import cn.hutool.v7.extra.ssh.Session;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/SshjSftp.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/sshj/SshjSftp.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/SshjSftp.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/sshj/SshjSftp.java
index f7482ca89..9e86f3742 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/SshjSftp.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/sshj/SshjSftp.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh.engine.sshj;
+package cn.hutool.v7.extra.ssh.engine.sshj;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.connection.channel.direct.Session;
@@ -22,14 +22,14 @@ import net.schmizz.sshj.sftp.RemoteFile;
 import net.schmizz.sshj.sftp.RemoteResourceInfo;
 import net.schmizz.sshj.sftp.SFTPClient;
 import net.schmizz.sshj.xfer.FileSystemFile;
-import org.dromara.hutool.core.collection.CollUtil;
-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.extra.ftp.AbstractFtp;
-import org.dromara.hutool.extra.ftp.FtpConfig;
-import org.dromara.hutool.extra.ftp.FtpException;
-import org.dromara.hutool.extra.ssh.Connector;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.ftp.AbstractFtp;
+import cn.hutool.v7.extra.ftp.FtpConfig;
+import cn.hutool.v7.extra.ftp.FtpException;
+import cn.hutool.v7.extra.ssh.Connector;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/SshjUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/sshj/SshjUtil.java
similarity index 90%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/SshjUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/sshj/SshjUtil.java
index edf98f074..35e0bd6ff 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/SshjUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/sshj/SshjUtil.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh.engine.sshj;
+package cn.hutool.v7.extra.ssh.engine.sshj;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.transport.verification.PromiscuousVerifier;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.extra.ssh.Connector;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.extra.ssh.Connector;
 
 import java.io.IOException;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/sshj/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/sshj/package-info.java
index a84c608a5..0dec89f74 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/engine/sshj/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/engine/sshj/package-info.java
@@ -19,4 +19,4 @@
  *
  *  @author Looly
  */
-package org.dromara.hutool.extra.ssh.engine.sshj;
+package cn.hutool.v7.extra.ssh.engine.sshj;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/package-info.java
index 268bbe36e..595a9e904 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.ssh;
+package cn.hutool.v7.extra.ssh;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/Template.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/Template.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/Template.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/Template.java
index b073661a7..3011d1bb2 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/Template.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/Template.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template;
+package cn.hutool.v7.extra.template;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.IoUtil;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateConfig.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateConfig.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateConfig.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateConfig.java
index dd76b58ab..bbea53e69 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateConfig.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateConfig.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template;
+package cn.hutool.v7.extra.template;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
 import java.util.Objects;
 
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
 
 /**
  * 模板配置
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateException.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateException.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateException.java
index 35ac74efa..7231a375c 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateException.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template;
+package cn.hutool.v7.extra.template;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * 模板异常
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateUtil.java
similarity index 90%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateUtil.java
index 58f3b95fe..28c44ebf8 100755
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateUtil.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template;
+package cn.hutool.v7.extra.template;
 
-import org.dromara.hutool.extra.template.engine.TemplateEngine;
-import org.dromara.hutool.extra.template.engine.TemplateEngineFactory;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.extra.template.engine.TemplateEngineFactory;
 
 import java.io.Writer;
 import java.util.Map;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/TemplateEngine.java
similarity index 84%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/TemplateEngine.java
index d54d566dc..446f6e11a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/TemplateEngine.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine;
+package cn.hutool.v7.extra.template.engine;
 
-import org.dromara.hutool.core.lang.wrapper.Wrapper;
-import org.dromara.hutool.extra.template.Template;
-import org.dromara.hutool.extra.template.TemplateConfig;
+import cn.hutool.v7.core.lang.wrapper.Wrapper;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateConfig;
 
 /**
  * 引擎接口，通过实现此接口从而使用对应的模板引擎
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngineFactory.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/TemplateEngineFactory.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngineFactory.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/TemplateEngineFactory.java
index f22c46faf..a6d35128d 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngineFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/TemplateEngineFactory.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine;
+package cn.hutool.v7.extra.template.engine;
 
-import org.dromara.hutool.core.lang.Singleton;
-import org.dromara.hutool.core.reflect.ConstructorUtil;
-import org.dromara.hutool.core.spi.SpiUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.template.TemplateConfig;
-import org.dromara.hutool.extra.template.TemplateException;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.lang.Singleton;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.spi.SpiUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.template.TemplateConfig;
+import cn.hutool.v7.extra.template.TemplateException;
+import cn.hutool.v7.log.LogUtil;
 
 /**
  * 简单模板引擎工厂，用于根据用户引入的模板引擎jar，自动创建对应的模板引擎对象
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/BeetlEngine.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/BeetlEngine.java
index a34c8e46c..8582a15e6 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/BeetlEngine.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.beetl;
+package cn.hutool.v7.extra.template.engine.beetl;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.extra.template.Template;
-import org.dromara.hutool.extra.template.TemplateConfig;
-import org.dromara.hutool.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateConfig;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
 import org.beetl.core.Configuration;
 import org.beetl.core.GroupTemplate;
 import org.beetl.core.ResourceLoader;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/BeetlTemplate.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlTemplate.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/BeetlTemplate.java
index e3ccde879..1d2299ab6 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/BeetlTemplate.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.beetl;
+package cn.hutool.v7.extra.template.engine.beetl;
 
-import org.dromara.hutool.extra.template.Template;
+import cn.hutool.v7.extra.template.Template;
 
 import java.io.OutputStream;
 import java.io.Serializable;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/package-info.java
index 4ed150c47..e8e38d776 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.template.engine.beetl;
+package cn.hutool.v7.extra.template.engine.beetl;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/EnjoyEngine.java
similarity index 87%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/EnjoyEngine.java
index 070868de3..a39de6904 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/EnjoyEngine.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.enjoy;
+package cn.hutool.v7.extra.template.engine.enjoy;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.data.id.IdUtil;
-import org.dromara.hutool.core.lang.Assert;
-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.engine.TemplateEngine;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.data.id.IdUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateConfig;
+import cn.hutool.v7.extra.template.TemplateConfig.ResourceMode;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
 import com.jfinal.template.source.FileSourceFactory;
 
 import java.io.File;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/EnjoyTemplate.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyTemplate.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/EnjoyTemplate.java
index 303b00e51..2f34d44f2 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/EnjoyTemplate.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.enjoy;
+package cn.hutool.v7.extra.template.engine.enjoy;
 
-import org.dromara.hutool.extra.template.Template;
+import cn.hutool.v7.extra.template.Template;
 
 import java.io.OutputStream;
 import java.io.Serializable;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/package-info.java
index a0e2622e7..57207eb6b 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.template.engine.enjoy;
+package cn.hutool.v7.extra.template.engine.enjoy;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/freemarker/FreemarkerEngine.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/freemarker/FreemarkerEngine.java
index f115cf7f8..e64185906 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/freemarker/FreemarkerEngine.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.freemarker;
+package cn.hutool.v7.extra.template.engine.freemarker;
 
-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.core.lang.Assert;
-import org.dromara.hutool.extra.template.Template;
-import org.dromara.hutool.extra.template.TemplateConfig;
-import org.dromara.hutool.extra.template.engine.TemplateEngine;
-import org.dromara.hutool.extra.template.TemplateException;
+import cn.hutool.v7.core.classloader.ClassLoaderUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateConfig;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.extra.template.TemplateException;
 import freemarker.cache.ClassTemplateLoader;
 import freemarker.cache.FileTemplateLoader;
 import freemarker.template.Configuration;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/freemarker/FreemarkerTemplate.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/freemarker/FreemarkerTemplate.java
index f59c4635b..6ebace1b0 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/freemarker/FreemarkerTemplate.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.freemarker;
+package cn.hutool.v7.extra.template.engine.freemarker;
 
-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 cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateException;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/SimpleStringTemplateLoader.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/freemarker/SimpleStringTemplateLoader.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/SimpleStringTemplateLoader.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/freemarker/SimpleStringTemplateLoader.java
index 31fd24456..6913de037 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/SimpleStringTemplateLoader.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/freemarker/SimpleStringTemplateLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.freemarker;
+package cn.hutool.v7.extra.template.engine.freemarker;
 
 import freemarker.cache.TemplateLoader;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/freemarker/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/freemarker/package-info.java
index 2133d5b70..3af868469 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/freemarker/package-info.java
@@ -20,4 +20,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.template.engine.freemarker;
+package cn.hutool.v7.extra.template.engine.freemarker;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/JetbrickEngine.java
similarity index 89%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/JetbrickEngine.java
index 1f117513b..cc0d54e35 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/JetbrickEngine.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.jetbrick;
+package cn.hutool.v7.extra.template.engine.jetbrick;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.extra.template.Template;
-import org.dromara.hutool.extra.template.TemplateConfig;
-import org.dromara.hutool.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateConfig;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
 import jetbrick.template.JetEngine;
 
 import java.util.Properties;
@@ -127,7 +127,7 @@ public class JetbrickEngine implements TemplateEngine {
 				props.setProperty("$loader.root", config.getPath());
 				break;
 			case STRING:
-				props.setProperty("$loader", "org.dromara.hutool.extra.template.engine.jetbrick.loader.StringResourceLoader");
+				props.setProperty("$loader", "cn.hutool.v7.extra.template.engine.jetbrick.loader.StringResourceLoader");
 				props.setProperty("$loader.charset", config.getCharsetStr());
 				break;
 			default:
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/JetbrickTemplate.java
similarity index 90%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/JetbrickTemplate.java
index 19b5ecf4f..1d49a7adc 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/JetbrickTemplate.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.jetbrick;
+package cn.hutool.v7.extra.template.engine.jetbrick;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.extra.template.Template;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.extra.template.Template;
 import jetbrick.template.JetTemplate;
 
 import java.io.OutputStream;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/loader/StringResourceLoader.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/loader/StringResourceLoader.java
index da19d4df0..acc294e6b 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/loader/StringResourceLoader.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/loader/StringResourceLoader.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.jetbrick.loader;
+package cn.hutool.v7.extra.template.engine.jetbrick.loader;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.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/org/dromara/hutool/extra/template/engine/jetbrick/loader/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/loader/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/loader/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/loader/package-info.java
index da54c6974..364d6ce45 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/loader/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/loader/package-info.java
@@ -20,4 +20,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.template.engine.jetbrick.loader;
+package cn.hutool.v7.extra.template.engine.jetbrick.loader;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/package-info.java
index 35ff6b88e..08406d64f 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.template.engine.jetbrick;
+package cn.hutool.v7.extra.template.engine.jetbrick;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jte/JteEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/JteEngine.java
similarity index 90%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jte/JteEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/JteEngine.java
index f9a96dd9a..ed7c74198 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jte/JteEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/JteEngine.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.jte;
+package cn.hutool.v7.extra.template.engine.jte;
 
 import gg.jte.CodeResolver;
 import gg.jte.ContentType;
 import gg.jte.resolve.DirectoryCodeResolver;
 import gg.jte.resolve.ResourceCodeResolver;
-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.extra.template.Template;
-import org.dromara.hutool.extra.template.TemplateConfig;
-import org.dromara.hutool.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateConfig;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
 
 import java.nio.file.Paths;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jte/JteTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/JteTemplate.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jte/JteTemplate.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/JteTemplate.java
index eb6937865..70e4dc7d5 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jte/JteTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/JteTemplate.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.jte;
+package cn.hutool.v7.extra.template.engine.jte;
 
 import gg.jte.TemplateEngine;
 import gg.jte.output.WriterOutput;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.extra.template.Template;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.extra.template.Template;
 
 import java.io.*;
 import java.nio.charset.Charset;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jte/SimpleStringCodeResolver.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/SimpleStringCodeResolver.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jte/SimpleStringCodeResolver.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/SimpleStringCodeResolver.java
index 3f8963310..aef403efa 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jte/SimpleStringCodeResolver.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/SimpleStringCodeResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.jte;
+package cn.hutool.v7.extra.template.engine.jte;
 
 import gg.jte.CodeResolver;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jte/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jte/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/package-info.java
index ddc23f7a7..80705b56d 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jte/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/package-info.java
@@ -20,4 +20,4 @@
  *
  * @author dy
  */
-package org.dromara.hutool.extra.template.engine.jte;
+package cn.hutool.v7.extra.template.engine.jte;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/package-info.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/package-info.java
index 8bfff533b..bfb842ebe 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.template.engine;
+package cn.hutool.v7.extra.template.engine;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplate.java
similarity index 90%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplate.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplate.java
index 4132ee95e..b7a34fdcc 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplate.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.pebble;
+package cn.hutool.v7.extra.template.engine.pebble;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.extra.template.Template;
-import org.dromara.hutool.extra.template.TemplateException;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateException;
 
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplateEngine.java
similarity index 87%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplateEngine.java
index 751a1811b..cf6c157d4 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplateEngine.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.pebble;
+package cn.hutool.v7.extra.template.engine.pebble;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Assert;
-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.engine.TemplateEngine;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateConfig;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
 import io.pebbletemplates.pebble.PebbleEngine;
 import io.pebbletemplates.pebble.loader.*;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/package-info.java
index 39b73d6bb..fa6d930b5 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author zooooooooy
  */
-package org.dromara.hutool.extra.template.engine.pebble;
+package cn.hutool.v7.extra.template.engine.pebble;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/RythmEngine.java
similarity index 90%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/RythmEngine.java
index 017c9b958..dc4120008 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/RythmEngine.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.rythm;
+package cn.hutool.v7.extra.template.engine.rythm;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.extra.template.Template;
-import org.dromara.hutool.extra.template.TemplateConfig;
-import org.dromara.hutool.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateConfig;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
 
 import java.util.Properties;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/RythmTemplate.java
similarity index 89%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmTemplate.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/RythmTemplate.java
index a6ce55b3a..724f8a65d 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/RythmTemplate.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.rythm;
+package cn.hutool.v7.extra.template.engine.rythm;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.extra.template.Template;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.extra.template.Template;
 
 import java.io.OutputStream;
 import java.io.Serializable;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/package-info.java
index f32b91d87..c9b77cb86 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.template.engine.rythm;
+package cn.hutool.v7.extra.template.engine.rythm;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/ThymeleafEngine.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/ThymeleafEngine.java
index 87140d146..cf7396ed7 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/ThymeleafEngine.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.thymeleaf;
+package cn.hutool.v7.extra.template.engine.thymeleaf;
 
-import org.dromara.hutool.core.lang.Assert;
+import cn.hutool.v7.core.lang.Assert;
 import org.thymeleaf.templatemode.TemplateMode;
 import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver;
 import org.thymeleaf.templateresolver.DefaultTemplateResolver;
@@ -24,11 +24,11 @@ import org.thymeleaf.templateresolver.FileTemplateResolver;
 import org.thymeleaf.templateresolver.ITemplateResolver;
 import org.thymeleaf.templateresolver.StringTemplateResolver;
 
-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.engine.TemplateEngine;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateConfig;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
 
 /**
  * Thymeleaf模板引擎实现
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/ThymeleafTemplate.java
similarity index 87%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/ThymeleafTemplate.java
index 41050ed64..d2e5990ec 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/ThymeleafTemplate.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.thymeleaf;
+package cn.hutool.v7.extra.template.engine.thymeleaf;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-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 cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.extra.template.Template;
 import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.context.Context;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/package-info.java
index c77bfe341..fbe59c25f 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.template.engine.thymeleaf;
+package cn.hutool.v7.extra.template.engine.thymeleaf;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/SimpleStringResourceLoader.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/SimpleStringResourceLoader.java
index 182f6b12a..08319769a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/SimpleStringResourceLoader.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/SimpleStringResourceLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.velocity;
+package cn.hutool.v7.extra.template.engine.velocity;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -25,8 +25,8 @@ import org.apache.velocity.runtime.resource.Resource;
 import org.apache.velocity.runtime.resource.loader.ResourceLoader;
 import org.apache.velocity.util.ExtProperties;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 
 /**
  * {@link ResourceLoader} 的字符串实现形式
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/VelocityEngine.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/VelocityEngine.java
index 98e22b3ac..12e0f6f5a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/VelocityEngine.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.velocity;
+package cn.hutool.v7.extra.template.engine.velocity;
 
-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.extra.template.Template;
-import org.dromara.hutool.extra.template.TemplateConfig;
-import org.dromara.hutool.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateConfig;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
 import org.apache.velocity.app.Velocity;
 
 /**
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/VelocityTemplate.java
similarity index 87%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityTemplate.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/VelocityTemplate.java
index e7ce78568..4860a8723 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/VelocityTemplate.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.velocity;
+package cn.hutool.v7.extra.template.engine.velocity;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-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 cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.extra.template.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/package-info.java
index e97fb426c..52002b5ee 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/package-info.java
@@ -20,4 +20,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.extra.template.engine.velocity;
+package cn.hutool.v7.extra.template.engine.velocity;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/WitEngine.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/WitEngine.java
index ae1c63d1d..b876f17de 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/WitEngine.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.wit;
+package cn.hutool.v7.extra.template.engine.wit;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Assert;
-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.engine.TemplateEngine;
-import org.dromara.hutool.extra.template.TemplateException;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.map.Dict;
+import cn.hutool.v7.extra.template.Template;
+import cn.hutool.v7.extra.template.TemplateConfig;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.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/org/dromara/hutool/extra/template/engine/wit/WitTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/WitTemplate.java
similarity index 87%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitTemplate.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/WitTemplate.java
index b6e00d98e..0e06088b4 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitTemplate.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/WitTemplate.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template.engine.wit;
+package cn.hutool.v7.extra.template.engine.wit;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.reflect.TypeReference;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
 import org.febit.wit.Template;
 
 import java.io.OutputStream;
@@ -30,7 +30,7 @@ import java.util.Map;
  *
  * @author Looly
  */
-public class WitTemplate implements org.dromara.hutool.extra.template.Template, Serializable{
+public class WitTemplate implements cn.hutool.v7.extra.template.Template, Serializable{
 	private static final long serialVersionUID = 1L;
 
 	private final Template rawTemplate;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/package-info.java
index 9ec9cdbe2..b40025154 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.template.engine.wit;
+package cn.hutool.v7.extra.template.engine.wit;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/package-info.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/template/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/template/package-info.java
index 3e7dd7cb7..216cc9a6f 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/package-info.java
@@ -29,4 +29,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.template;
+package cn.hutool.v7.extra.template;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/AbstractResult.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/AbstractResult.java
similarity index 91%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/AbstractResult.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/AbstractResult.java
index 377c67618..d83537097 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/AbstractResult.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/AbstractResult.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer;
+package cn.hutool.v7.extra.tokenizer;
 
-import org.dromara.hutool.core.collection.iter.ComputeIter;
+import cn.hutool.v7.core.collection.iter.ComputeIter;
 
 import java.util.Iterator;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/Result.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/Result.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/Result.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/Result.java
index 5b911aa97..1cbe7d110 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/Result.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/Result.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer;
+package cn.hutool.v7.extra.tokenizer;
 
-import org.dromara.hutool.core.collection.iter.IterableIter;
+import cn.hutool.v7.core.collection.iter.IterableIter;
 
 /**
  * 分词结果接口定义
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/TokenizerException.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerException.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/TokenizerException.java
index 357a950a8..cc01adb68 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerException.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/TokenizerException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer;
+package cn.hutool.v7.extra.tokenizer;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * 分词异常
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/TokenizerUtil.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/TokenizerUtil.java
index dc74758e1..8e693a9fc 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/TokenizerUtil.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer;
+package cn.hutool.v7.extra.tokenizer;
 
-import org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine;
-import org.dromara.hutool.extra.tokenizer.engine.TokenizerEngineFactory;
+import cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine;
+import cn.hutool.v7.extra.tokenizer.engine.TokenizerEngineFactory;
 
 /**
  * 分词工具类
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/Word.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/Word.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/Word.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/Word.java
index 3924c16c9..e26c54cca 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/Word.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/Word.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer;
+package cn.hutool.v7.extra.tokenizer;
 
 import java.io.Serializable;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/TokenizerEngine.java
similarity index 91%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/TokenizerEngine.java
index 05fca5988..99737c83e 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/TokenizerEngine.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine;
+package cn.hutool.v7.extra.tokenizer.engine;
 
-import org.dromara.hutool.extra.tokenizer.Result;
+import cn.hutool.v7.extra.tokenizer.Result;
 
 /**
  * 分词引擎接口定义，用户通过实现此接口完成特定分词引擎的适配
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerEngineFactory.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/TokenizerEngineFactory.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerEngineFactory.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/TokenizerEngineFactory.java
index 7711bbadd..86ffefb47 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerEngineFactory.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/TokenizerEngineFactory.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine;
+package cn.hutool.v7.extra.tokenizer.engine;
 
-import org.dromara.hutool.core.lang.Singleton;
-import org.dromara.hutool.core.spi.ServiceLoader;
-import org.dromara.hutool.core.spi.SpiUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.tokenizer.TokenizerException;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.lang.Singleton;
+import cn.hutool.v7.core.spi.ServiceLoader;
+import cn.hutool.v7.core.spi.SpiUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.tokenizer.TokenizerException;
+import cn.hutool.v7.log.LogUtil;
 
 /**
  * 简单分词引擎工厂，用于根据用户引入的分词引擎jar，自动创建对应的引擎
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisEngine.java
similarity index 83%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisEngine.java
index fb290e38b..af1e87f08 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisEngine.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.analysis;
+package cn.hutool.v7.extra.tokenizer.engine.analysis;
 
 import java.io.IOException;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.tokenizer.Result;
-import org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine;
-import org.dromara.hutool.extra.tokenizer.TokenizerException;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.tokenizer.Result;
+import cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine;
+import cn.hutool.v7.extra.tokenizer.TokenizerException;
 
 /**
  * Lucene-analysis分词抽象封装
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisResult.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisResult.java
similarity index 86%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisResult.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisResult.java
index b54543c51..cfecbd1e8 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisResult.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisResult.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.analysis;
+package cn.hutool.v7.extra.tokenizer.engine.analysis;
 
 import java.io.IOException;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 
-import org.dromara.hutool.extra.tokenizer.AbstractResult;
-import org.dromara.hutool.extra.tokenizer.TokenizerException;
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.AbstractResult;
+import cn.hutool.v7.extra.tokenizer.TokenizerException;
+import cn.hutool.v7.extra.tokenizer.Word;
 
 /**
  * Lucene-analysis分词抽象结果封装
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisWord.java
similarity index 93%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisWord.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisWord.java
index 71f2804ab..646cd9f2a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/AnalysisWord.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/AnalysisWord.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.analysis;
+package cn.hutool.v7.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 org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Word;
 
 /**
  * Lucene-analysis分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/SmartcnEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/SmartcnEngine.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/SmartcnEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/SmartcnEngine.java
index b290f0f7d..6590f3ed4 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/SmartcnEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/SmartcnEngine.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.analysis;
+package cn.hutool.v7.extra.tokenizer.engine.analysis;
 
 import org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/package-info.java
index a88a10310..134cadfb1 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/analysis/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/analysis/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.tokenizer.engine.analysis;
+package cn.hutool.v7.extra.tokenizer.engine.analysis;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjEngine.java
similarity index 85%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjEngine.java
index 78eae4383..504f13b3e 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjEngine.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.ansj;
+package cn.hutool.v7.extra.tokenizer.engine.ansj;
 
 import org.ansj.splitWord.Analysis;
 import org.ansj.splitWord.analysis.ToAnalysis;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.tokenizer.Result;
-import org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.tokenizer.Result;
+import cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine;
 
 /**
  * Ansj分词引擎实现
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjResult.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjResult.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjResult.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjResult.java
index eb65bfaa4..5b1090752 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjResult.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjResult.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.ansj;
+package cn.hutool.v7.extra.tokenizer.engine.ansj;
 
-import org.dromara.hutool.extra.tokenizer.Result;
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Result;
+import cn.hutool.v7.extra.tokenizer.Word;
 import org.ansj.domain.Term;
 
 import java.util.Iterator;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjWord.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjWord.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjWord.java
index ec2a34a47..46964e9c4 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/AnsjWord.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjWord.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.ansj;
+package cn.hutool.v7.extra.tokenizer.engine.ansj;
 
 import org.ansj.domain.Term;
 
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Word;
 
 /**
  * Ansj分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/package-info.java
index 069c4d3a5..0d73e236d 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ansj/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.tokenizer.engine.ansj;
+package cn.hutool.v7.extra.tokenizer.engine.ansj;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPEngine.java
similarity index 85%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPEngine.java
index 2bf1ba0b9..302e69f90 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPEngine.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.hanlp;
+package cn.hutool.v7.extra.tokenizer.engine.hanlp;
 
 import com.hankcs.hanlp.HanLP;
 import com.hankcs.hanlp.seg.Segment;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine;
-import org.dromara.hutool.extra.tokenizer.Result;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine;
+import cn.hutool.v7.extra.tokenizer.Result;
 
 /**
  * HanLP分词引擎实现
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPResult.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPResult.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPResult.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPResult.java
index 0cee062bc..1628e3a45 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPResult.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPResult.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.hanlp;
+package cn.hutool.v7.extra.tokenizer.engine.hanlp;
 
-import org.dromara.hutool.extra.tokenizer.Result;
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Result;
+import cn.hutool.v7.extra.tokenizer.Word;
 import com.hankcs.hanlp.seg.common.Term;
 
 import java.util.Iterator;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPWord.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPWord.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPWord.java
index 609fb6ff4..ba36fec00 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/HanLPWord.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPWord.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.hanlp;
+package cn.hutool.v7.extra.tokenizer.engine.hanlp;
 
 import com.hankcs.hanlp.seg.common.Term;
 
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Word;
 
 /**
  * HanLP分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/package-info.java
index a3b98d43a..037658618 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/hanlp/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.tokenizer.engine.hanlp;
+package cn.hutool.v7.extra.tokenizer.engine.hanlp;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
index 93aa4e6c5..e4d793ebf 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerEngine.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.ikanalyzer;
+package cn.hutool.v7.extra.tokenizer.engine.ikanalyzer;
 
 import org.wltea.analyzer.cfg.Configuration;
 import org.wltea.analyzer.cfg.DefaultConfig;
 import org.wltea.analyzer.core.IKSegmenter;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine;
-import org.dromara.hutool.extra.tokenizer.Result;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine;
+import cn.hutool.v7.extra.tokenizer.Result;
 
 /**
  * IKAnalyzer分词引擎实现
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerResult.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerResult.java
similarity index 85%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerResult.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerResult.java
index e993d9cc4..d14791e2c 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerResult.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerResult.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.ikanalyzer;
+package cn.hutool.v7.extra.tokenizer.engine.ikanalyzer;
 
-import org.dromara.hutool.extra.tokenizer.AbstractResult;
-import org.dromara.hutool.extra.tokenizer.TokenizerException;
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.AbstractResult;
+import cn.hutool.v7.extra.tokenizer.TokenizerException;
+import cn.hutool.v7.extra.tokenizer.Word;
 import org.wltea.analyzer.core.IKSegmenter;
 import org.wltea.analyzer.core.Lexeme;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java
index 119b7ac3b..1ffbe14c4 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.ikanalyzer;
+package cn.hutool.v7.extra.tokenizer.engine.ikanalyzer;
 
 import org.wltea.analyzer.core.Lexeme;
 
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Word;
 
 /**
  * IKAnalyzer分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/package-info.java
index cbb10f40f..bf1cd9322 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/ikanalyzer/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.tokenizer.engine.ikanalyzer;
+package cn.hutool.v7.extra.tokenizer.engine.ikanalyzer;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegEngine.java
similarity index 87%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegEngine.java
index 5e6ec2f60..b1728d7de 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegEngine.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.jcseg;
+package cn.hutool.v7.extra.tokenizer.engine.jcseg;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.tokenizer.Result;
-import org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine;
-import org.dromara.hutool.extra.tokenizer.TokenizerException;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.tokenizer.Result;
+import cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine;
+import cn.hutool.v7.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/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegResult.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegResult.java
similarity index 85%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegResult.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegResult.java
index d0e1b546e..ca255159b 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegResult.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegResult.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.jcseg;
+package cn.hutool.v7.extra.tokenizer.engine.jcseg;
 
-import org.dromara.hutool.extra.tokenizer.AbstractResult;
-import org.dromara.hutool.extra.tokenizer.TokenizerException;
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.AbstractResult;
+import cn.hutool.v7.extra.tokenizer.TokenizerException;
+import cn.hutool.v7.extra.tokenizer.Word;
 import org.lionsoul.jcseg.ISegment;
 import org.lionsoul.jcseg.IWord;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegWord.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegWord.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegWord.java
index e5f4c6316..09563ff7a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/JcsegWord.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegWord.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.jcseg;
+package cn.hutool.v7.extra.tokenizer.engine.jcseg;
 
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Word;
 import org.lionsoul.jcseg.IWord;
 
 /**
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/package-info.java
index db7813240..9a8064201 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jcseg/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.tokenizer.engine.jcseg;
+package cn.hutool.v7.extra.tokenizer.engine.jcseg;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaEngine.java
similarity index 86%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaEngine.java
index eca727453..0d5900f32 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaEngine.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.jieba;
+package cn.hutool.v7.extra.tokenizer.engine.jieba;
 
 import com.huaban.analysis.jieba.JiebaSegmenter;
 import com.huaban.analysis.jieba.JiebaSegmenter.SegMode;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine;
-import org.dromara.hutool.extra.tokenizer.Result;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine;
+import cn.hutool.v7.extra.tokenizer.Result;
 
 /**
  * Jieba分词引擎实现
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaResult.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaResult.java
similarity index 89%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaResult.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaResult.java
index 06c395666..1ca1c6283 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaResult.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaResult.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.jieba;
+package cn.hutool.v7.extra.tokenizer.engine.jieba;
 
-import org.dromara.hutool.extra.tokenizer.Result;
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Result;
+import cn.hutool.v7.extra.tokenizer.Word;
 import com.huaban.analysis.jieba.SegToken;
 
 import java.util.Iterator;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaWord.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaWord.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaWord.java
index a7ff8cb25..0c400d104 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/JiebaWord.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaWord.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.jieba;
+package cn.hutool.v7.extra.tokenizer.engine.jieba;
 
 import com.huaban.analysis.jieba.SegToken;
 
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Word;
 
 /**
  * Jieba分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/package-info.java
index 17d019760..225a53c24 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/jieba/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.tokenizer.engine.jieba;
+package cn.hutool.v7.extra.tokenizer.engine.jieba;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegEngine.java
similarity index 86%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegEngine.java
index f4d3448ae..71d7e0dd1 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegEngine.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.mmseg;
+package cn.hutool.v7.extra.tokenizer.engine.mmseg;
 
 import com.chenlb.mmseg4j.Seg;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.tokenizer.Result;
-import org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.tokenizer.Result;
+import cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine;
 import com.chenlb.mmseg4j.ComplexSeg;
 import com.chenlb.mmseg4j.Dictionary;
 import com.chenlb.mmseg4j.MMSeg;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegResult.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegResult.java
similarity index 84%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegResult.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegResult.java
index 8f1873448..340d209f8 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegResult.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegResult.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.mmseg;
+package cn.hutool.v7.extra.tokenizer.engine.mmseg;
 
-import org.dromara.hutool.extra.tokenizer.AbstractResult;
-import org.dromara.hutool.extra.tokenizer.TokenizerException;
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.AbstractResult;
+import cn.hutool.v7.extra.tokenizer.TokenizerException;
+import cn.hutool.v7.extra.tokenizer.Word;
 import com.chenlb.mmseg4j.MMSeg;
 
 import java.io.IOException;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegWord.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegWord.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegWord.java
index 58f4f835d..2e3b14999 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/MmsegWord.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegWord.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.mmseg;
+package cn.hutool.v7.extra.tokenizer.engine.mmseg;
 
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Word;
 
 /**
  * mmseg分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/package-info.java
index 1b278bb0f..6ed02b98f 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mmseg/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.tokenizer.engine.mmseg;
+package cn.hutool.v7.extra.tokenizer.engine.mmseg;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpEngine.java
similarity index 87%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpEngine.java
index 9e94e535b..487fdfe59 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpEngine.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.mynlp;
+package cn.hutool.v7.extra.tokenizer.engine.mynlp;
 
 import com.mayabot.nlp.Mynlp;
 import com.mayabot.nlp.segment.Lexer;
 import com.mayabot.nlp.segment.Sentence;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.tokenizer.Result;
-import org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.tokenizer.Result;
+import cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine;
 
 /**
  * MYNLP 中文NLP工具包分词实现
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpResult.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpResult.java
similarity index 89%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpResult.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpResult.java
index d5e064601..858ba2884 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpResult.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpResult.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.mynlp;
+package cn.hutool.v7.extra.tokenizer.engine.mynlp;
 
-import org.dromara.hutool.extra.tokenizer.Result;
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Result;
+import cn.hutool.v7.extra.tokenizer.Word;
 import com.mayabot.nlp.segment.Sentence;
 import com.mayabot.nlp.segment.WordTerm;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpWord.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpWord.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpWord.java
index b15e4506d..a0e298e17 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/MynlpWord.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpWord.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.mynlp;
+package cn.hutool.v7.extra.tokenizer.engine.mynlp;
 
 import com.mayabot.nlp.segment.WordTerm;
 
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Word;
 
 /**
  * mmseg分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/package-info.java
index 38702a894..ffc1425b5 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/mynlp/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  * @since 4.6.5
  */
-package org.dromara.hutool.extra.tokenizer.engine.mynlp;
+package cn.hutool.v7.extra.tokenizer.engine.mynlp;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/package-info.java
index c83efb78d..84100790b 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.tokenizer.engine;
+package cn.hutool.v7.extra.tokenizer.engine;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordEngine.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordEngine.java
similarity index 88%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordEngine.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordEngine.java
index 9310a17c4..6d9b9e46d 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordEngine.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.word;
+package cn.hutool.v7.extra.tokenizer.engine.word;
 
 import org.apdplat.word.segmentation.Segmentation;
 import org.apdplat.word.segmentation.SegmentationAlgorithm;
 import org.apdplat.word.segmentation.SegmentationFactory;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.tokenizer.Result;
-import org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.tokenizer.Result;
+import cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine;
 
 /**
  * Word分词引擎实现
      
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordResult.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordResult.java
similarity index 89%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordResult.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordResult.java
index bf00753b9..857b9e474 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordResult.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordResult.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.word;
+package cn.hutool.v7.extra.tokenizer.engine.word;
 
-import org.dromara.hutool.extra.tokenizer.Result;
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Result;
+import cn.hutool.v7.extra.tokenizer.Word;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordWord.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordWord.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordWord.java
index 6eed19cdb..02c639abe 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/WordWord.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordWord.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer.engine.word;
+package cn.hutool.v7.extra.tokenizer.engine.word;
 
-import org.dromara.hutool.extra.tokenizer.Word;
+import cn.hutool.v7.extra.tokenizer.Word;
 
 /**
  * Word分词中的一个单词包装
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/package-info.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/package-info.java
index da1e5fcae..a1e25f976 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/word/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.tokenizer.engine.word;
+package cn.hutool.v7.extra.tokenizer.engine.word;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/package-info.java
index ca3a01f50..6d830b399 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.tokenizer;
+package cn.hutool.v7.extra.tokenizer;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/validation/BeanValidationResult.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/validation/BeanValidationResult.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/validation/BeanValidationResult.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/validation/BeanValidationResult.java
index fa063e6a9..49e08cb75 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/validation/BeanValidationResult.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/validation/BeanValidationResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.validation;
+package cn.hutool.v7.extra.validation;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/validation/ValidationUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/validation/ValidationUtil.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/validation/ValidationUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/validation/ValidationUtil.java
index 2e6021f22..01a44cbd7 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/validation/ValidationUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/validation/ValidationUtil.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.validation;
+package cn.hutool.v7.extra.validation;
 
 import jakarta.validation.*;
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.text.StrPool;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.text.StrPool;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.util.Set;
 
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/validation/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/validation/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/validation/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/validation/package-info.java
index 838fa14a7..f4fd20a79 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/validation/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/validation/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author chengqiang
  */
-package org.dromara.hutool.extra.validation;
+package cn.hutool.v7.extra.validation;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/xml/JAXBUtil.java
similarity index 92%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/xml/JAXBUtil.java
index 27705f2cd..1458fbaff 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/xml/JAXBUtil.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.xml;
+package cn.hutool.v7.extra.xml;
 
-import org.dromara.hutool.core.exception.HutoolException;
-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.xml.XmlUtil;
+import cn.hutool.v7.core.exception.HutoolException;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.xml.XmlUtil;
 
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.Marshaller;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/package-info.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/xml/package-info.java
similarity index 95%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/xml/package-info.java
rename to hutool-extra/src/main/java/cn/hutool/v7/extra/xml/package-info.java
index 128f4d235..5238728d3 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/xml/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.extra.xml;
+package cn.hutool.v7.extra.xml;
diff --git a/hutool-core/src/test/resources/META-INF/services/org.dromara.hutool.core.spi.ListServiceLoaderTest$TestSPI1 b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.aop.engine.ProxyEngine
similarity index 82%
rename from hutool-core/src/test/resources/META-INF/services/org.dromara.hutool.core.spi.ListServiceLoaderTest$TestSPI1
rename to hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.aop.engine.ProxyEngine
index 87d3558e9..4de277c2c 100644
--- a/hutool-core/src/test/resources/META-INF/services/org.dromara.hutool.core.spi.ListServiceLoaderTest$TestSPI1
+++ b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.aop.engine.ProxyEngine
@@ -14,5 +14,5 @@
 # limitations under the License.
 #
 
-org.dromara.hutool.core.spi.ListServiceLoaderTest$TestService2
-org.dromara.hutool.core.spi.ListServiceLoaderTest$TestService1
+cn.hutool.v7.core.spi.ListServiceLoaderTest$TestService2
+cn.hutool.v7.core.spi.ListServiceLoaderTest$TestService1
diff --git a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.mq.engine.MQEngine b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.mq.engine.MQEngine
similarity index 77%
rename from hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.mq.engine.MQEngine
rename to hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.mq.engine.MQEngine
index 8c3533b3e..367693b8f 100644
--- a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.mq.engine.MQEngine
+++ b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.mq.engine.MQEngine
@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 
-org.dromara.hutool.extra.mq.engine.kafka.KafkaEngine
-org.dromara.hutool.extra.mq.engine.rabbitmq.RabbitMQEngine
-org.dromara.hutool.extra.mq.engine.activemq.ActiveMQ5Engine
+cn.hutool.v7.extra.mq.engine.kafka.KafkaEngine
+cn.hutool.v7.extra.mq.engine.rabbitmq.RabbitMQEngine
+cn.hutool.v7.extra.mq.engine.activemq.ActiveMQ5Engine
diff --git a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.pinyin.engine.PinyinEngine b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.pinyin.engine.PinyinEngine
new file mode 100644
index 000000000..77d561439
--- /dev/null
+++ b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.pinyin.engine.PinyinEngine
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2013-2025 Hutool Team and hutool.cn
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+cn.hutool.v7.extra.pinyin.engine.tinypinyin.TinyPinyinEngine
+cn.hutool.v7.extra.pinyin.engine.jpinyin.JPinyinEngine
+cn.hutool.v7.extra.pinyin.engine.pinyin4j.Pinyin4jEngine
+cn.hutool.v7.extra.pinyin.engine.bopomofo4j.Bopomofo4jEngine
+cn.hutool.v7.extra.pinyin.engine.houbb.HoubbEngine
diff --git a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.template.engine.TemplateEngine b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.template.engine.TemplateEngine
new file mode 100644
index 000000000..de544b5c4
--- /dev/null
+++ b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.template.engine.TemplateEngine
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2013-2025 Hutool Team and hutool.cn
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+cn.hutool.v7.extra.tokenizer.engine.ansj.AnsjEngine
+cn.hutool.v7.extra.tokenizer.engine.hanlp.HanLPEngine
+cn.hutool.v7.extra.tokenizer.engine.ikanalyzer.IKAnalyzerEngine
+cn.hutool.v7.extra.tokenizer.engine.jcseg.JcsegEngine
+cn.hutool.v7.extra.tokenizer.engine.jieba.JiebaEngine
+cn.hutool.v7.extra.tokenizer.engine.mmseg.MmsegEngine
+cn.hutool.v7.extra.tokenizer.engine.word.WordEngine
+cn.hutool.v7.extra.tokenizer.engine.analysis.SmartcnEngine
+cn.hutool.v7.extra.tokenizer.engine.mynlp.MynlpEngine
diff --git a/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine
new file mode 100644
index 000000000..32aff8305
--- /dev/null
+++ b/hutool-extra/src/main/resources/META-INF/services/cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2013-2025 Hutool Team and hutool.cn
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+cn.hutool.v7.db.ds.hikari.HikariDSFactory
+cn.hutool.v7.db.ds.druid.DruidDSFactory
+cn.hutool.v7.db.ds.tomcat.TomcatDSFactory
+cn.hutool.v7.db.ds.bee.BeeDSFactory
+cn.hutool.v7.db.ds.dbcp.DbcpDSFactory
+cn.hutool.v7.db.ds.c3p0.C3p0DSFactory
+cn.hutool.v7.db.ds.pooled.PooledDSFactory
diff --git a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.pinyin.engine.PinyinEngine b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.pinyin.engine.PinyinEngine
deleted file mode 100644
index fe1b37ab4..000000000
--- a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.pinyin.engine.PinyinEngine
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (c) 2013-2025 Hutool Team and hutool.cn
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-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.houbb.HoubbEngine
diff --git a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.template.engine.TemplateEngine b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.template.engine.TemplateEngine
deleted file mode 100644
index e881683a3..000000000
--- a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.template.engine.TemplateEngine
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2013-2025 Hutool Team and hutool.cn
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# 实现：org.dromara.hutool.extra.template.engine.TemplateEngine
-
-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.engine.TokenizerEngine b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine
deleted file mode 100644
index 83b12b466..000000000
--- a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (c) 2013-2025 Hutool Team and hutool.cn
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-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 f8cea5f00..fba885656 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 @@
 # Initializers
 org.springframework.context.ApplicationContextInitializer=\
-org.dromara.hutool.extra.spring.SpringUtil
+cn.hutool.v7.extra.spring.SpringUtil
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/aop/AopTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/aop/AopTest.java
similarity index 93%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/aop/AopTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/aop/AopTest.java
index 9d479363f..ecf65742a 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/aop/AopTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/aop/AopTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop;
+package cn.hutool.v7.extra.aop;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.extra.aop.aspects.TimeIntervalAspect;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.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/org/dromara/hutool/extra/aop/IssueI74EX7Test.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/aop/IssueI74EX7Test.java
similarity index 85%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/aop/IssueI74EX7Test.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/aop/IssueI74EX7Test.java
index 8aa148fda..3e4ce8bb6 100755
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/aop/IssueI74EX7Test.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/aop/IssueI74EX7Test.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop;
+package cn.hutool.v7.extra.aop;
 
 import lombok.Setter;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.extra.aop.aspects.SimpleAspect;
-import org.dromara.hutool.extra.aop.engine.ProxyEngine;
-import org.dromara.hutool.extra.aop.engine.jdk.JdkProxyEngine;
-import org.dromara.hutool.extra.aop.engine.spring.SpringCglibProxyEngine;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.extra.aop.aspects.SimpleAspect;
+import cn.hutool.v7.extra.aop.engine.ProxyEngine;
+import cn.hutool.v7.extra.aop.engine.jdk.JdkProxyEngine;
+import cn.hutool.v7.extra.aop.engine.spring.SpringCglibProxyEngine;
 import org.junit.jupiter.api.Test;
 
 public class IssueI74EX7Test {
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/aop/IssueIBF20ZTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/aop/IssueIBF20ZTest.java
similarity index 86%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/aop/IssueIBF20ZTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/aop/IssueIBF20ZTest.java
index 65dc78f62..fdeba9a1c 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/aop/IssueIBF20ZTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/aop/IssueIBF20ZTest.java
@@ -1,8 +1,8 @@
-package org.dromara.hutool.extra.aop;
+package cn.hutool.v7.extra.aop;
 
-import org.dromara.hutool.core.thread.ThreadUtil;
-import org.dromara.hutool.extra.aop.engine.ProxyEngine;
-import org.dromara.hutool.extra.aop.engine.ProxyEngineFactory;
+import cn.hutool.v7.core.thread.ThreadUtil;
+import cn.hutool.v7.extra.aop.engine.ProxyEngine;
+import cn.hutool.v7.extra.aop.engine.ProxyEngineFactory;
 import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/aop/ProxyBeanTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/aop/ProxyBeanTest.java
similarity index 91%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/aop/ProxyBeanTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/aop/ProxyBeanTest.java
index 985318275..91f2e1966 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/aop/ProxyBeanTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/aop/ProxyBeanTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.aop;
+package cn.hutool.v7.extra.aop;
 
-import org.dromara.hutool.core.bean.BeanUtil;
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.exception.HutoolException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/compress/ArchiverTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/compress/ArchiverTest.java
similarity index 90%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/compress/ArchiverTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/compress/ArchiverTest.java
index 8441e1185..79e747f95 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/compress/ArchiverTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/compress/ArchiverTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.compress;
+package cn.hutool.v7.extra.compress;
 
-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 cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.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/org/dromara/hutool/extra/compress/ExtractorTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/compress/ExtractorTest.java
similarity index 88%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/compress/ExtractorTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/compress/ExtractorTest.java
index 2934496ee..1d0587ac2 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/compress/ExtractorTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/compress/ExtractorTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.compress;
+package cn.hutool.v7.extra.compress;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.extra.compress.extractor.Extractor;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.extra.compress.extractor.Extractor;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/compress/IssueI71K5VTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/compress/IssueI71K5VTest.java
similarity index 88%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/compress/IssueI71K5VTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/compress/IssueI71K5VTest.java
index 27fdc9b59..5b2f84aa2 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/compress/IssueI71K5VTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/compress/IssueI71K5VTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.compress;
+package cn.hutool.v7.extra.compress;
 
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/emoji/EmojiUtilTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/emoji/EmojiUtilTest.java
similarity index 97%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/emoji/EmojiUtilTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/emoji/EmojiUtilTest.java
index 2806fd5f4..29e9b5e42 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/emoji/EmojiUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/emoji/EmojiUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.emoji;
+package cn.hutool.v7.extra.emoji;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/ftp/FtpTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/ftp/FtpTest.java
similarity index 94%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/ftp/FtpTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/ftp/FtpTest.java
index 91a9e426f..15c4342d6 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/ftp/FtpTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/ftp/FtpTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ftp;
+package cn.hutool.v7.extra.ftp;
 
 import org.apache.commons.net.ftp.FTPSClient;
-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.extra.ssh.engine.jsch.JschSftp;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.ssh.engine.jsch.JschSftp;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/ftp/SimpleFtpServerTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/ftp/SimpleFtpServerTest.java
similarity index 95%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/ftp/SimpleFtpServerTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/ftp/SimpleFtpServerTest.java
index b8e212007..64a03c884 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/ftp/SimpleFtpServerTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/ftp/SimpleFtpServerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ftp;
+package cn.hutool.v7.extra.ftp;
 
 public class SimpleFtpServerTest {
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/mail/MailAccountTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/mail/MailAccountTest.java
similarity index 98%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/mail/MailAccountTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/mail/MailAccountTest.java
index 727f05b05..632c90b04 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/mail/MailAccountTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/mail/MailAccountTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mail;
+package cn.hutool.v7.extra.mail;
 
 import org.eclipse.angus.mail.util.MailSSLSocketFactory;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/mail/MailTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/mail/MailTest.java
similarity index 97%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/mail/MailTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/mail/MailTest.java
index b3787a149..2455b8c47 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/mail/MailTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/mail/MailTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mail;
+package cn.hutool.v7.extra.mail;
 
-import org.dromara.hutool.core.io.file.FileUtil;
+import cn.hutool.v7.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/org/dromara/hutool/extra/mail/Oauth2Test.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/mail/Oauth2Test.java
similarity index 97%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/mail/Oauth2Test.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/mail/Oauth2Test.java
index ae7bd39e6..91b2be372 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/mail/Oauth2Test.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/mail/Oauth2Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.mail;
+package cn.hutool.v7.extra.mail;
 
 import jakarta.mail.*;
 import jakarta.mail.internet.InternetAddress;
 import jakarta.mail.internet.MimeMessage;
-import org.dromara.hutool.core.lang.Console;
+import cn.hutool.v7.core.lang.Console;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/management/JavaInfoTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/management/JavaInfoTest.java
similarity index 95%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/management/JavaInfoTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/management/JavaInfoTest.java
index 14d9ecea7..dcb3b44d5 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/management/JavaInfoTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/management/JavaInfoTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/management/ManagementUtilTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/management/ManagementUtilTest.java
similarity index 95%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/management/ManagementUtilTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/management/ManagementUtilTest.java
index 278629e9c..f7c619703 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/management/ManagementUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/management/ManagementUtilTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.util.SystemUtil;
+import cn.hutool.v7.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/org/dromara/hutool/extra/management/OshiPrintTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/management/OshiPrintTest.java
similarity index 84%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/management/OshiPrintTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/management/OshiPrintTest.java
index 26e929f74..6f94485a6 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/management/OshiPrintTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/management/OshiPrintTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.extra.management.oshi.OshiUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.extra.management.oshi.OshiUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/management/OshiTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/management/OshiTest.java
similarity index 88%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/management/OshiTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/management/OshiTest.java
index a54285a72..025ff6b5d 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/management/OshiTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/management/OshiTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.management;
+package cn.hutool.v7.extra.management;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.extra.management.oshi.CpuInfo;
-import org.dromara.hutool.extra.management.oshi.OshiUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.extra.management.oshi.CpuInfo;
+import cn.hutool.v7.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/org/dromara/hutool/extra/pinyin/Bopomofo4jTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/Bopomofo4jTest.java
similarity index 91%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/Bopomofo4jTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/Bopomofo4jTest.java
index 793adb53b..29d49d763 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/Bopomofo4jTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/Bopomofo4jTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin;
+package cn.hutool.v7.extra.pinyin;
 
-import org.dromara.hutool.extra.pinyin.engine.PinyinEngine;
+import cn.hutool.v7.extra.pinyin.engine.PinyinEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/HoubbPinyinTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/HoubbPinyinTest.java
similarity index 91%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/HoubbPinyinTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/HoubbPinyinTest.java
index 9e77dd30c..c20c375fc 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/HoubbPinyinTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/HoubbPinyinTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin;
+package cn.hutool.v7.extra.pinyin;
 
-import org.dromara.hutool.extra.pinyin.engine.PinyinEngine;
+import cn.hutool.v7.extra.pinyin.engine.PinyinEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/JpinyinTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/JpinyinTest.java
similarity index 91%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/JpinyinTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/JpinyinTest.java
index cc7052adf..7fe5820fd 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/JpinyinTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/JpinyinTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin;
+package cn.hutool.v7.extra.pinyin;
 
-import org.dromara.hutool.extra.pinyin.engine.PinyinEngine;
+import cn.hutool.v7.extra.pinyin.engine.PinyinEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/Pinyin4jTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/Pinyin4jTest.java
similarity index 91%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/Pinyin4jTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/Pinyin4jTest.java
index 0961ceea2..ce6652ec6 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/Pinyin4jTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/Pinyin4jTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin;
+package cn.hutool.v7.extra.pinyin;
 
-import org.dromara.hutool.extra.pinyin.engine.PinyinEngine;
+import cn.hutool.v7.extra.pinyin.engine.PinyinEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/PinyinUtilTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/PinyinUtilTest.java
similarity index 96%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/PinyinUtilTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/PinyinUtilTest.java
index b529dd777..4de4c59d7 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/PinyinUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/PinyinUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin;
+package cn.hutool.v7.extra.pinyin;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/TinyPinyinTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/TinyPinyinTest.java
similarity index 91%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/TinyPinyinTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/TinyPinyinTest.java
index 73f922653..aba068855 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/pinyin/TinyPinyinTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/pinyin/TinyPinyinTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.pinyin;
+package cn.hutool.v7.extra.pinyin;
 
-import org.dromara.hutool.extra.pinyin.engine.PinyinEngine;
+import cn.hutool.v7.extra.pinyin.engine.PinyinEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilTest.java
similarity index 96%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilTest.java
index 50182cc75..ed7e34649 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.spring;
+package cn.hutool.v7.extra.spring;
 
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.reflect.TypeReference;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -38,7 +38,7 @@ import java.util.Map;
 @SpringBootTest(classes = {SpringUtil.class, SpringUtilTest.Demo2.class})
 // @ActiveProfiles("dev") // SpringUtil.getActiveProfile()效果与下面方式一致
 @TestPropertySource(properties = {"spring.profiles.active=dev"})
-//@Import(spring.org.dromara.hutool.extra.SpringUtil.class)
+//@Import(spring.cn.hutool.v7.extra.SpringUtil.class)
 public class SpringUtilTest {
 
 	/**
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilWithAutoConfigTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilWithAutoConfigTest.java
similarity index 94%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilWithAutoConfigTest.java
index 95fbc4b82..0e6ec28e1 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilWithAutoConfigTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.spring;
+package cn.hutool.v7.extra.spring;
 
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.reflect.TypeReference;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/cglib/CglibUtilTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/cglib/CglibUtilTest.java
similarity index 95%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/spring/cglib/CglibUtilTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/spring/cglib/CglibUtilTest.java
index 7508d0d70..3e4cd411c 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/cglib/CglibUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/cglib/CglibUtilTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.spring.cglib;
+package cn.hutool.v7.extra.spring.cglib;
 
 import lombok.Data;
-import org.dromara.hutool.core.convert.ConvertUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/ssh/JschTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/ssh/JschTest.java
similarity index 91%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/ssh/JschTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/ssh/JschTest.java
index fd0dcfa6c..6aad41beb 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/ssh/JschTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/ssh/JschTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh;
+package cn.hutool.v7.extra.ssh;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.extra.ssh.engine.jsch.JschSession;
-import org.dromara.hutool.extra.ssh.engine.jsch.JschSftp;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.extra.ssh.engine.jsch.JschSession;
+import cn.hutool.v7.extra.ssh.engine.jsch.JschSftp;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/ssh/SftpTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/ssh/SftpTest.java
similarity index 95%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/ssh/SftpTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/ssh/SftpTest.java
index 5fa63c576..83d2cfb14 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/ssh/SftpTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/ssh/SftpTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.ssh;
+package cn.hutool.v7.extra.ssh;
 
-import org.dromara.hutool.extra.ssh.engine.sshj.SshjSftp;
+import cn.hutool.v7.extra.ssh.engine.sshj.SshjSftp;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/template/JetbrickTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/template/JetbrickTest.java
similarity index 83%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/template/JetbrickTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/template/JetbrickTest.java
index 3e0fba890..721ffd822 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/template/JetbrickTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/template/JetbrickTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template;
+package cn.hutool.v7.extra.template;
 
-import org.dromara.hutool.core.map.Dict;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.extra.template.engine.TemplateEngine;
-import org.dromara.hutool.extra.template.engine.TemplateEngineFactory;
-import org.dromara.hutool.extra.template.engine.jetbrick.JetbrickEngine;
+import cn.hutool.v7.core.map.Dict;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.extra.template.engine.TemplateEngineFactory;
+import cn.hutool.v7.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/org/dromara/hutool/extra/template/TemplateFactoryTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/template/TemplateFactoryTest.java
similarity index 90%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/template/TemplateFactoryTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/template/TemplateFactoryTest.java
index 2d68c24eb..c17db126f 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/template/TemplateFactoryTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/template/TemplateFactoryTest.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template;
+package cn.hutool.v7.extra.template;
 
-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.TemplateEngine;
-import org.dromara.hutool.extra.template.engine.TemplateEngineFactory;
-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.jte.JteEngine;
-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 cn.hutool.v7.core.map.Dict;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.extra.template.TemplateConfig.ResourceMode;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.extra.template.engine.TemplateEngineFactory;
+import cn.hutool.v7.extra.template.engine.beetl.BeetlEngine;
+import cn.hutool.v7.extra.template.engine.enjoy.EnjoyEngine;
+import cn.hutool.v7.extra.template.engine.freemarker.FreemarkerEngine;
+import cn.hutool.v7.extra.template.engine.jte.JteEngine;
+import cn.hutool.v7.extra.template.engine.pebble.PebbleTemplateEngine;
+import cn.hutool.v7.extra.template.engine.rythm.RythmEngine;
+import cn.hutool.v7.extra.template.engine.thymeleaf.ThymeleafEngine;
+import cn.hutool.v7.extra.template.engine.velocity.VelocityEngine;
+import cn.hutool.v7.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/org/dromara/hutool/extra/template/ThymeleafTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/template/ThymeleafTest.java
similarity index 92%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/template/ThymeleafTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/template/ThymeleafTest.java
index edd8953ae..81220c67f 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/template/ThymeleafTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/template/ThymeleafTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template;
+package cn.hutool.v7.extra.template;
 
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.map.Dict;
-import org.dromara.hutool.extra.template.engine.TemplateEngine;
-import org.dromara.hutool.extra.template.engine.TemplateEngineFactory;
-import org.dromara.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.map.Dict;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.extra.template.engine.TemplateEngineFactory;
+import cn.hutool.v7.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/org/dromara/hutool/extra/template/VelocityTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/template/VelocityTest.java
similarity index 78%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/template/VelocityTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/template/VelocityTest.java
index 9fc150f1c..ca46b0575 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/template/VelocityTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/template/VelocityTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.template;
+package cn.hutool.v7.extra.template;
 
-import org.dromara.hutool.core.map.Dict;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.extra.template.engine.TemplateEngine;
-import org.dromara.hutool.extra.template.engine.TemplateEngineFactory;
-import org.dromara.hutool.extra.template.engine.velocity.VelocityEngine;
+import cn.hutool.v7.core.map.Dict;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.extra.template.engine.TemplateEngine;
+import cn.hutool.v7.extra.template.engine.TemplateEngineFactory;
+import cn.hutool.v7.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/org/dromara/hutool/extra/tokenizer/TokenizerUtilTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/tokenizer/TokenizerUtilTest.java
similarity index 95%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/tokenizer/TokenizerUtilTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/tokenizer/TokenizerUtilTest.java
index fa6af44cb..954b8f2b0 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/tokenizer/TokenizerUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/tokenizer/TokenizerUtilTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.tokenizer;
+package cn.hutool.v7.extra.tokenizer;
 
-import org.dromara.hutool.core.collection.iter.IterUtil;
-import org.dromara.hutool.extra.tokenizer.engine.TokenizerEngine;
+import cn.hutool.v7.core.collection.iter.IterUtil;
+import cn.hutool.v7.extra.tokenizer.engine.TokenizerEngine;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/validation/BeanValidatorUtilTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/validation/BeanValidatorUtilTest.java
similarity index 97%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/validation/BeanValidatorUtilTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/validation/BeanValidatorUtilTest.java
index 468873c99..e9298ed8c 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/validation/BeanValidatorUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/validation/BeanValidatorUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.validation;
+package cn.hutool.v7.extra.validation;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/xml/JAXBUtilTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/xml/JAXBUtilTest.java
similarity index 98%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/xml/JAXBUtilTest.java
rename to hutool-extra/src/test/java/cn/hutool/v7/extra/xml/JAXBUtilTest.java
index ab55b6c7f..a43a4265e 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/xml/JAXBUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/xml/JAXBUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.extra.xml;
+package cn.hutool.v7.extra.xml;
 
 import jakarta.xml.bind.annotation.*;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml
index c354d5582..412f473cb 100755
--- a/hutool-http/pom.xml
+++ b/hutool-http/pom.xml
@@ -23,9 +23,9 @@
 	jar
 
 	
-		org.dromara.hutool
+		cn.hutool.v7
 		hutool-parent
-		6.0.0-M22
+		7.0.0.M1
 	
 
 	hutool-http
@@ -33,7 +33,7 @@
 	Hutool Http客户端
 
 	
-		org.dromara.hutool.http
+		cn.hutool.v7.http
 		5.4.1
 		4.5.14
 		4.12.0
@@ -48,17 +48,17 @@
 
 	
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-core
 			${project.parent.version}
 		
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-log
 			${project.parent.version}
 		
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-crypto
 			${project.parent.version}
 			test
@@ -140,7 +140,7 @@
 		
 		
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-json
 			${project.parent.version}
 			test
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/GlobalCompressStreamRegister.java b/hutool-http/src/main/java/cn/hutool/v7/http/GlobalCompressStreamRegister.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/GlobalCompressStreamRegister.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/GlobalCompressStreamRegister.java
index 23b520fba..807899399 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/GlobalCompressStreamRegister.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/GlobalCompressStreamRegister.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.compress.InflaterInputStream;
-import org.dromara.hutool.core.map.CaseInsensitiveMap;
-import org.dromara.hutool.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.compress.InflaterInputStream;
+import cn.hutool.v7.core.map.CaseInsensitiveMap;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
 
 import java.io.InputStream;
 import java.util.Map;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/GlobalHeaders.java b/hutool-http/src/main/java/cn/hutool/v7/http/GlobalHeaders.java
similarity index 96%
rename from hutool-http/src/main/java/org/dromara/hutool/http/GlobalHeaders.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/GlobalHeaders.java
index 02c53727a..bac243f2c 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/GlobalHeaders.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/GlobalHeaders.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-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.HeaderName;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.meta.HeaderName;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/HttpException.java b/hutool-http/src/main/java/cn/hutool/v7/http/HttpException.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/HttpException.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/HttpException.java
index cb8567211..96d88dd59 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/HttpException.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/HttpException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * HTTP异常
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/HttpGlobalConfig.java b/hutool-http/src/main/java/cn/hutool/v7/http/HttpGlobalConfig.java
similarity index 98%
rename from hutool-http/src/main/java/org/dromara/hutool/http/HttpGlobalConfig.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/HttpGlobalConfig.java
index 32982b601..da2a180da 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/HttpGlobalConfig.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/HttpGlobalConfig.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.util.RandomUtil;
+import cn.hutool.v7.core.util.RandomUtil;
 
 import java.io.Serializable;
 import java.net.HttpURLConnection;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/HttpUrlUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/HttpUrlUtil.java
similarity index 90%
rename from hutool-http/src/main/java/org/dromara/hutool/http/HttpUrlUtil.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/HttpUrlUtil.java
index 57d96d230..50a1b171b 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/HttpUrlUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/HttpUrlUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.net.url.UrlBuilder;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.text.split.SplitUtil;
+import cn.hutool.v7.core.net.url.UrlBuilder;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
 
 import java.util.List;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/HttpUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/HttpUtil.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/HttpUtil.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/HttpUtil.java
index aba0d86b4..06e6d9d65 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/HttpUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/HttpUtil.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.map.CaseInsensitiveMap;
-import org.dromara.hutool.core.map.MapUtil;
-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.ClientEngine;
-import org.dromara.hutool.http.client.engine.ClientEngineFactory;
-import org.dromara.hutool.http.meta.Method;
-import org.dromara.hutool.http.server.engine.sun.SimpleServer;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.map.CaseInsensitiveMap;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.net.url.UrlQueryUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.client.ClientConfig;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.client.engine.ClientEngine;
+import cn.hutool.v7.http.client.engine.ClientEngineFactory;
+import cn.hutool.v7.http.meta.Method;
+import cn.hutool.v7.http.server.engine.sun.SimpleServer;
 
 import java.nio.charset.Charset;
 import java.util.Collection;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/auth/HttpAuthUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/auth/HttpAuthUtil.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/auth/HttpAuthUtil.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/auth/HttpAuthUtil.java
index 5c1201da4..30b9b0ade 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/auth/HttpAuthUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/auth/HttpAuthUtil.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.auth;
+package cn.hutool.v7.http.auth;
 
-import org.dromara.hutool.core.codec.binary.Base64;
+import cn.hutool.v7.core.codec.binary.Base64;
 
 import java.net.PasswordAuthentication;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/auth/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/auth/package-info.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/auth/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/auth/package-info.java
index 859be066b..22e22bded 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/auth/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/auth/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.http.auth;
+package cn.hutool.v7.http.auth;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/ApacheHttpClientConfig.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/ApacheHttpClientConfig.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/ApacheHttpClientConfig.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/ApacheHttpClientConfig.java
index 061c2d5fc..1de0d3d83 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/ApacheHttpClientConfig.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/ApacheHttpClientConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
 /**
  * 针对HttpClient5和HttpClient4的配置
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/ClientConfig.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/ClientConfig.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/ClientConfig.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/ClientConfig.java
index 5e21fe6db..1fd6e5eae 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/ClientConfig.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/ClientConfig.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.http.HttpGlobalConfig;
-import org.dromara.hutool.http.proxy.ProxyInfo;
-import org.dromara.hutool.http.ssl.SSLInfo;
+import cn.hutool.v7.http.HttpGlobalConfig;
+import cn.hutool.v7.http.proxy.ProxyInfo;
+import cn.hutool.v7.http.ssl.SSLInfo;
 
 /**
  * Http客户端配置
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/HeaderOperation.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/HeaderOperation.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/HeaderOperation.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/HeaderOperation.java
index 316e2c242..a4f2abcb5 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/HeaderOperation.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/HeaderOperation.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-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.convert.ConvertUtil;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.auth.HttpAuthUtil;
-import org.dromara.hutool.http.meta.HeaderName;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.auth.HttpAuthUtil;
+import cn.hutool.v7.http.meta.HeaderName;
 
 import java.net.HttpCookie;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/HttpDownloader.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/HttpDownloader.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/HttpDownloader.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/HttpDownloader.java
index 00e0a25a9..77a09b365 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/HttpDownloader.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/HttpDownloader.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.StreamProgress;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.client.body.ResponseBody;
-import org.dromara.hutool.http.client.engine.ClientEngine;
-import org.dromara.hutool.http.client.engine.ClientEngineFactory;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.StreamProgress;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.client.body.ResponseBody;
+import cn.hutool.v7.http.client.engine.ClientEngine;
+import cn.hutool.v7.http.client.engine.ClientEngineFactory;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/Request.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/Request.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/Request.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/Request.java
index 5f0dead24..a09ea422f 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/Request.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/Request.java
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.io.resource.Resource;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.map.multi.ListValueMap;
-import org.dromara.hutool.core.net.url.UrlBuilder;
-import org.dromara.hutool.core.net.url.UrlQuery;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.http.GlobalHeaders;
-import org.dromara.hutool.http.HttpGlobalConfig;
-import org.dromara.hutool.http.HttpUrlUtil;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.client.body.*;
-import org.dromara.hutool.http.client.engine.ClientEngine;
-import org.dromara.hutool.http.client.engine.ClientEngineFactory;
-import org.dromara.hutool.http.meta.HeaderName;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.resource.Resource;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.map.multi.ListValueMap;
+import cn.hutool.v7.core.net.url.UrlBuilder;
+import cn.hutool.v7.core.net.url.UrlQuery;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.http.GlobalHeaders;
+import cn.hutool.v7.http.HttpGlobalConfig;
+import cn.hutool.v7.http.HttpUrlUtil;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.client.body.*;
+import cn.hutool.v7.http.client.engine.ClientEngine;
+import cn.hutool.v7.http.client.engine.ClientEngineFactory;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.meta.Method;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/RequestContext.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/RequestContext.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/RequestContext.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/RequestContext.java
index b862f7cd1..2c6b1038b 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/RequestContext.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/RequestContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
 /**
  * 请求上下文，用于在多次请求时保存状态信息
      
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/Response.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/Response.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/Response.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/Response.java
index 8e2334f7e..f0923e23a 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/Response.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/Response.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-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.HeaderName;
-import org.dromara.hutool.http.meta.HttpHeaderUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.client.body.ResponseBody;
+import cn.hutool.v7.http.meta.ContentTypeUtil;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.meta.HttpHeaderUtil;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/BytesBody.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/BytesBody.java
similarity index 88%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/body/BytesBody.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/body/BytesBody.java
index de2b957be..3ca0715f1 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/BytesBody.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/BytesBody.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.body;
+package cn.hutool.v7.http.client.body;
 
-import org.dromara.hutool.core.io.resource.BytesResource;
-import org.dromara.hutool.core.io.resource.HttpResource;
+import cn.hutool.v7.core.io.resource.BytesResource;
+import cn.hutool.v7.core.io.resource.HttpResource;
 
 /**
  * bytes类型的Http request body，主要发送编码后的表单数据或rest body（如JSON或XML）
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/FormBody.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/FormBody.java
similarity index 87%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/body/FormBody.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/body/FormBody.java
index 270d5b3f8..9d92b8c16 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/FormBody.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/FormBody.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.body;
+package cn.hutool.v7.http.client.body;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.convert.ConvertUtil;
-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 cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.io.resource.FileResource;
+import cn.hutool.v7.core.io.resource.MultiFileResource;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.map.TableMap;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 
 import java.io.File;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/HttpBody.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/HttpBody.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/body/HttpBody.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/body/HttpBody.java
index 11f7239e0..44f9edd23 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/HttpBody.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/HttpBody.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.body;
+package cn.hutool.v7.http.client.body;
 
-import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartBody.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/MultipartBody.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartBody.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/body/MultipartBody.java
index 8bd8bdd29..f1c093d28 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartBody.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/MultipartBody.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.body;
+package cn.hutool.v7.http.client.body;
 
-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 cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.http.meta.ContentType;
+import cn.hutool.v7.http.HttpGlobalConfig;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartOutputStream.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/MultipartOutputStream.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartOutputStream.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/body/MultipartOutputStream.java
index 7b07b5239..1e38e1377 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartOutputStream.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/MultipartOutputStream.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.body;
+package cn.hutool.v7.http.client.body;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-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.io.resource.*;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.http.HttpGlobalConfig;
-import org.dromara.hutool.http.meta.ContentType;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.resource.*;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.HttpGlobalConfig;
+import cn.hutool.v7.http.meta.ContentType;
 
 import java.io.*;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResourceBody.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/ResourceBody.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResourceBody.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/body/ResourceBody.java
index b9f623e76..2c83a3326 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResourceBody.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/ResourceBody.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.body;
+package cn.hutool.v7.http.client.body;
 
-import org.dromara.hutool.core.io.resource.HttpResource;
-import org.dromara.hutool.core.io.resource.Resource;
+import cn.hutool.v7.core.io.resource.HttpResource;
+import cn.hutool.v7.core.io.resource.Resource;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResponseBody.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/ResponseBody.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResponseBody.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/body/ResponseBody.java
index e7db8c828..821235149 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResponseBody.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/ResponseBody.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.body;
+package cn.hutool.v7.http.client.body;
 
-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.file.FileUtil;
-import org.dromara.hutool.core.io.stream.SyncInputStream;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.HttpGlobalConfig;
-import org.dromara.hutool.http.client.Response;
-import org.dromara.hutool.http.html.HtmlUtil;
-import org.dromara.hutool.http.meta.HeaderName;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.StreamProgress;
+import cn.hutool.v7.core.io.file.FileNameUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.stream.SyncInputStream;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.HttpGlobalConfig;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.html.HtmlUtil;
+import cn.hutool.v7.http.meta.HeaderName;
 
 import java.io.*;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/StringBody.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/StringBody.java
similarity index 86%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/body/StringBody.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/body/StringBody.java
index 86b4828c4..523a0fdbc 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/StringBody.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/StringBody.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.body;
+package cn.hutool.v7.http.client.body;
 
-import org.dromara.hutool.core.io.resource.HttpResource;
-import org.dromara.hutool.core.io.resource.StringResource;
-import org.dromara.hutool.http.meta.ContentTypeUtil;
+import cn.hutool.v7.core.io.resource.HttpResource;
+import cn.hutool.v7.core.io.resource.StringResource;
+import cn.hutool.v7.http.meta.ContentTypeUtil;
 
 import java.nio.charset.Charset;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/UrlEncodedFormBody.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/UrlEncodedFormBody.java
similarity index 90%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/body/UrlEncodedFormBody.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/body/UrlEncodedFormBody.java
index 47beeebdd..aba674e40 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/UrlEncodedFormBody.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/UrlEncodedFormBody.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.body;
+package cn.hutool.v7.http.client.body;
 
-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 cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.net.url.UrlQuery;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.http.meta.ContentType;
 
 import java.io.OutputStream;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/body/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/body/package-info.java
index a81b313af..074ad95ac 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/body/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.http.client.body;
+package cn.hutool.v7.http.client.body;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/CookieSpi.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/CookieSpi.java
similarity index 98%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/CookieSpi.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/CookieSpi.java
index 5675f4b0c..e6800ba4b 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/CookieSpi.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/CookieSpi.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.cookie;
+package cn.hutool.v7.http.client.cookie;
 
 import java.time.Instant;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/CookieStoreSpi.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/CookieStoreSpi.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/CookieStoreSpi.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/CookieStoreSpi.java
index 071686a40..c14e8428c 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/CookieStoreSpi.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/CookieStoreSpi.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.cookie;
+package cn.hutool.v7.http.client.cookie;
 
 import java.net.URI;
 import java.util.List;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/InMemoryCookieStore.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/InMemoryCookieStore.java
similarity index 96%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/InMemoryCookieStore.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/InMemoryCookieStore.java
index 0aa3bd0ce..c566b9125 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/InMemoryCookieStore.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/InMemoryCookieStore.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.cookie;
+package cn.hutool.v7.http.client.cookie;
 
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.log.Log;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/ThreadLocalCookieStore.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/ThreadLocalCookieStore.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/ThreadLocalCookieStore.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/ThreadLocalCookieStore.java
index 6415e55af..cb7ed1d8b 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/ThreadLocalCookieStore.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/ThreadLocalCookieStore.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.cookie;
+package cn.hutool.v7.http.client.cookie;
 
 import java.net.URI;
 import java.util.List;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/package-info.java
index 49536bc0d..2cf4d47cd 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/cookie/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.http.client.cookie;
+package cn.hutool.v7.http.client.cookie;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/AbstractClientEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/AbstractClientEngine.java
similarity index 90%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/AbstractClientEngine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/AbstractClientEngine.java
index 7a57761bb..1154fa999 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/AbstractClientEngine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/AbstractClientEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine;
+package cn.hutool.v7.http.client.engine;
 
-import org.dromara.hutool.http.client.ClientConfig;
-import org.dromara.hutool.http.client.cookie.CookieStoreSpi;
+import cn.hutool.v7.http.client.ClientConfig;
+import cn.hutool.v7.http.client.cookie.CookieStoreSpi;
 
 /**
  * 客户端引擎抽象类，用于保存配置和定义初始化，并提供：
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/ClientEngine.java
similarity index 81%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/ClientEngine.java
index 72d6f7426..179f7ea3d 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/ClientEngine.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine;
+package cn.hutool.v7.http.client.engine;
 
-import org.dromara.hutool.http.client.ApacheHttpClientConfig;
-import org.dromara.hutool.http.client.ClientConfig;
-import org.dromara.hutool.http.client.Request;
-import org.dromara.hutool.http.client.Response;
+import cn.hutool.v7.http.client.engine.okhttp.OkHttpClientConfig;
+import cn.hutool.v7.http.client.ApacheHttpClientConfig;
+import cn.hutool.v7.http.client.ClientConfig;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
 
 import java.io.Closeable;
 
@@ -37,7 +38,7 @@ public interface ClientEngine extends Closeable {
 	 *
 	 * 
        
 	 *     
      • HttpClient4和HttpClient5使用{@link ApacheHttpClientConfig}
        • 
-	 *     
      • OkHttp使用{@link org.dromara.hutool.http.client.engine.okhttp.OkHttpClientConfig}
        • 
+	 *     
      • OkHttp使用{@link OkHttpClientConfig}
        • 
 	 * 
      
 	 * 
      
 	 * 如果混用这些配置，则个性配置不生效
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngineFactory.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/ClientEngineFactory.java
similarity index 84%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngineFactory.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/ClientEngineFactory.java
index 9f1ce55e6..c4da8f150 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngineFactory.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/ClientEngineFactory.java
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine;
+package cn.hutool.v7.http.client.engine;
 
-import org.dromara.hutool.core.lang.Singleton;
-import org.dromara.hutool.core.spi.ServiceLoader;
-import org.dromara.hutool.core.spi.SpiUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.client.ApacheHttpClientConfig;
-import org.dromara.hutool.http.client.ClientConfig;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.lang.Singleton;
+import cn.hutool.v7.core.spi.ServiceLoader;
+import cn.hutool.v7.core.spi.SpiUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.client.engine.okhttp.OkHttpClientConfig;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.client.ApacheHttpClientConfig;
+import cn.hutool.v7.http.client.ClientConfig;
+import cn.hutool.v7.log.LogUtil;
 
 /**
  * Http客户端引擎工厂类
@@ -49,7 +50,7 @@ public class ClientEngineFactory {
 	 *
 	 * 
        
 	 *     
      • HttpClient4和HttpClient5使用{@link ApacheHttpClientConfig}
        • 
-	 *     
      • OkHttp使用{@link org.dromara.hutool.http.client.engine.okhttp.OkHttpClientConfig}
        • 
+	 *     
      • OkHttp使用{@link OkHttpClientConfig}
        • 
 	 * 
      
 	 * 
      
 	 * 如果混用这些配置，则个性配置不生效
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/EngineRequestBuilder.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/EngineRequestBuilder.java
similarity index 90%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/EngineRequestBuilder.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/EngineRequestBuilder.java
index 081ad2cf7..eb89e8171 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/EngineRequestBuilder.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/EngineRequestBuilder.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine;
+package cn.hutool.v7.http.client.engine;
 
-import org.dromara.hutool.http.client.Request;
+import cn.hutool.v7.http.client.Request;
 
 /**
  * 引擎的请求对象构建器
      
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/ConnectionSocketFactoryRegistryBuilder.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/ConnectionSocketFactoryRegistryBuilder.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/ConnectionSocketFactoryRegistryBuilder.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/ConnectionSocketFactoryRegistryBuilder.java
index 32bf44708..8a44224a0 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/ConnectionSocketFactoryRegistryBuilder.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/ConnectionSocketFactoryRegistryBuilder.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient4;
+package cn.hutool.v7.http.client.engine.httpclient4;
 
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.dromara.hutool.core.lang.builder.Builder;
-import org.dromara.hutool.http.ssl.SSLInfo;
+import cn.hutool.v7.core.lang.builder.Builder;
+import cn.hutool.v7.http.ssl.SSLInfo;
 
 /**
  * HttpClient4连接工厂注册器构建器
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4BodyEntity.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4BodyEntity.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4BodyEntity.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4BodyEntity.java
index 040b49447..06f623077 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4BodyEntity.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4BodyEntity.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient4;
+package cn.hutool.v7.http.client.engine.httpclient4;
 
 import org.apache.http.entity.AbstractHttpEntity;
-import org.dromara.hutool.http.client.body.BytesBody;
-import org.dromara.hutool.http.client.body.HttpBody;
+import cn.hutool.v7.http.client.body.BytesBody;
+import cn.hutool.v7.http.client.body.HttpBody;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Cookie.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Cookie.java
similarity index 89%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Cookie.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Cookie.java
index 0eef43a97..c17623f85 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Cookie.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Cookie.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient4;
+package cn.hutool.v7.http.client.engine.httpclient4;
 
 import org.apache.http.cookie.Cookie;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-import org.dromara.hutool.http.client.cookie.CookieSpi;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.http.client.cookie.CookieSpi;
 
 import java.time.Instant;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4CookieStore.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4CookieStore.java
similarity index 87%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4CookieStore.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4CookieStore.java
index 22ddef0f9..57cedcbc5 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4CookieStore.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4CookieStore.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient4;
+package cn.hutool.v7.http.client.engine.httpclient4;
 
 import org.apache.http.client.CookieStore;
 import org.apache.http.cookie.Cookie;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.client.cookie.CookieSpi;
-import org.dromara.hutool.http.client.cookie.CookieStoreSpi;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.client.cookie.CookieSpi;
+import cn.hutool.v7.http.client.cookie.CookieStoreSpi;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Engine.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Engine.java
index 9d95aeabe..2a0341cb7 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Engine.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient4;
+package cn.hutool.v7.http.client.engine.httpclient4;
 
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
@@ -30,18 +30,18 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.impl.conn.SystemDefaultRoutePlanner;
 import org.apache.http.message.BasicHeader;
-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.http.GlobalHeaders;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.client.ApacheHttpClientConfig;
-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.cookie.InMemoryCookieStore;
-import org.dromara.hutool.http.client.engine.AbstractClientEngine;
-import org.dromara.hutool.http.proxy.ProxyInfo;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.GlobalHeaders;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.client.ApacheHttpClientConfig;
+import cn.hutool.v7.http.client.ClientConfig;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.client.cookie.InMemoryCookieStore;
+import cn.hutool.v7.http.client.engine.AbstractClientEngine;
+import cn.hutool.v7.http.proxy.ProxyInfo;
 
 import java.io.IOException;
 import java.net.PasswordAuthentication;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Response.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Response.java
similarity index 86%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Response.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Response.java
index d0d53e7fe..bd7432ad1 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Response.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Response.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient4;
+package cn.hutool.v7.http.client.engine.httpclient4;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
@@ -22,16 +22,16 @@ import org.apache.http.HttpResponse;
 import org.apache.http.ParseException;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.util.EntityUtils;
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-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.Request;
-import org.dromara.hutool.http.client.Response;
-import org.dromara.hutool.http.client.body.ResponseBody;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.client.body.ResponseBody;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpUriRequestBuilder.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpUriRequestBuilder.java
similarity index 86%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpUriRequestBuilder.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpUriRequestBuilder.java
index 391ad563d..09fafd5cb 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpUriRequestBuilder.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpUriRequestBuilder.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient4;
+package cn.hutool.v7.http.client.engine.httpclient4;
 
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.methods.RequestBuilder;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.net.url.UrlBuilder;
-import org.dromara.hutool.http.client.Request;
-import org.dromara.hutool.http.client.body.HttpBody;
-import org.dromara.hutool.http.client.engine.EngineRequestBuilder;
-import org.dromara.hutool.http.meta.HeaderName;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.net.url.UrlBuilder;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.body.HttpBody;
+import cn.hutool.v7.http.client.engine.EngineRequestBuilder;
+import cn.hutool.v7.http.meta.HeaderName;
 
 /**
  * HttpClient4请求构建器
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/package-info.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/package-info.java
index 77b15fc72..281b8eae1 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/package-info.java
@@ -20,4 +20,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.http.client.engine.httpclient4;
+package cn.hutool.v7.http.client.engine.httpclient4;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/ClassicHttpRequestBuilder.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/ClassicHttpRequestBuilder.java
similarity index 88%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/ClassicHttpRequestBuilder.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/ClassicHttpRequestBuilder.java
index 7c709455f..4e5172ca4 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/ClassicHttpRequestBuilder.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/ClassicHttpRequestBuilder.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient5;
+package cn.hutool.v7.http.client.engine.httpclient5;
 
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.message.BasicHeader;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.net.url.UrlBuilder;
-import org.dromara.hutool.http.client.Request;
-import org.dromara.hutool.http.client.body.HttpBody;
-import org.dromara.hutool.http.client.engine.EngineRequestBuilder;
-import org.dromara.hutool.http.meta.HeaderName;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.net.url.UrlBuilder;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.body.HttpBody;
+import cn.hutool.v7.http.client.engine.EngineRequestBuilder;
+import cn.hutool.v7.http.meta.HeaderName;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5BodyEntity.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5BodyEntity.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5BodyEntity.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5BodyEntity.java
index 595eb4218..d4a239a0e 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5BodyEntity.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5BodyEntity.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient5;
+package cn.hutool.v7.http.client.engine.httpclient5;
 
 import org.apache.hc.core5.http.io.entity.AbstractHttpEntity;
-import org.dromara.hutool.http.client.body.BytesBody;
-import org.dromara.hutool.http.client.body.HttpBody;
+import cn.hutool.v7.http.client.body.BytesBody;
+import cn.hutool.v7.http.client.body.HttpBody;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Cookie.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Cookie.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Cookie.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Cookie.java
index c8ea26783..6d15c0a84 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Cookie.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Cookie.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient5;
+package cn.hutool.v7.http.client.engine.httpclient5;
 
 import org.apache.hc.client5.http.cookie.Cookie;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-import org.dromara.hutool.http.client.cookie.CookieSpi;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.http.client.cookie.CookieSpi;
 
 import java.time.Instant;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5CookieStore.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5CookieStore.java
similarity index 89%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5CookieStore.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5CookieStore.java
index f46d60af8..ac86e60dd 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5CookieStore.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5CookieStore.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient5;
+package cn.hutool.v7.http.client.engine.httpclient5;
 
 import org.apache.hc.client5.http.cookie.Cookie;
 import org.apache.hc.client5.http.cookie.CookieStore;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.client.cookie.CookieSpi;
-import org.dromara.hutool.http.client.cookie.CookieStoreSpi;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.client.cookie.CookieSpi;
+import cn.hutool.v7.http.client.cookie.CookieStoreSpi;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Engine.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Engine.java
index 61d987a2f..0101cc2cb 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Engine.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient5;
+package cn.hutool.v7.http.client.engine.httpclient5;
 
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
@@ -31,19 +31,19 @@ import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.message.BasicHeader;
-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.http.GlobalHeaders;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.client.ApacheHttpClientConfig;
-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.cookie.InMemoryCookieStore;
-import org.dromara.hutool.http.client.engine.AbstractClientEngine;
-import org.dromara.hutool.http.proxy.ProxyInfo;
-import org.dromara.hutool.http.ssl.SSLInfo;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.GlobalHeaders;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.client.ApacheHttpClientConfig;
+import cn.hutool.v7.http.client.ClientConfig;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.client.cookie.InMemoryCookieStore;
+import cn.hutool.v7.http.client.engine.AbstractClientEngine;
+import cn.hutool.v7.http.proxy.ProxyInfo;
+import cn.hutool.v7.http.ssl.SSLInfo;
 
 import java.io.IOException;
 import java.net.PasswordAuthentication;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Response.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Response.java
similarity index 87%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Response.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Response.java
index e3ca99e4d..c81979495 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Response.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Response.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient5;
+package cn.hutool.v7.http.client.engine.httpclient5;
 
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.core5.http.ClassicHttpResponse;
@@ -22,16 +22,16 @@ import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.ParseException;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-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.Request;
-import org.dromara.hutool.http.client.Response;
-import org.dromara.hutool.http.client.body.ResponseBody;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.client.body.ResponseBody;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/TlsSocketStrategyBuilder.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/TlsSocketStrategyBuilder.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/TlsSocketStrategyBuilder.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/TlsSocketStrategyBuilder.java
index 37a33153d..a3bb6ad10 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/TlsSocketStrategyBuilder.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/TlsSocketStrategyBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.httpclient5;
+package cn.hutool.v7.http.client.engine.httpclient5;
 
 import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
 import org.apache.hc.client5.http.ssl.HostnameVerificationPolicy;
@@ -22,8 +22,8 @@ import org.apache.hc.client5.http.ssl.HttpsSupport;
 import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
 import org.apache.hc.core5.reactor.ssl.SSLBufferMode;
 import org.apache.hc.core5.ssl.SSLContexts;
-import org.dromara.hutool.core.lang.builder.Builder;
-import org.dromara.hutool.core.util.ObjUtil;
+import cn.hutool.v7.core.lang.builder.Builder;
+import cn.hutool.v7.core.util.ObjUtil;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/package-info.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/package-info.java
index f5fdf6a5b..431ec8565 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/package-info.java
@@ -20,4 +20,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.http.client.engine.httpclient5;
+package cn.hutool.v7.http.client.engine.httpclient5;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/HttpUrlConnectionUtil.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/HttpUrlConnectionUtil.java
index 697c083ca..5a04d6aea 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/HttpUrlConnectionUtil.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.jdk;
+package cn.hutool.v7.http.client.engine.jdk;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-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.util.SystemUtil;
-import org.dromara.hutool.http.HttpException;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.reflect.FieldUtil;
+import cn.hutool.v7.core.reflect.ModifierUtil;
+import cn.hutool.v7.core.util.SystemUtil;
+import cn.hutool.v7.http.HttpException;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkClientEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkClientEngine.java
similarity index 86%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkClientEngine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkClientEngine.java
index 0a67ae928..f51298ceb 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkClientEngine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkClientEngine.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.jdk;
+package cn.hutool.v7.http.client.engine.jdk;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.client.Request;
-import org.dromara.hutool.http.client.RequestContext;
-import org.dromara.hutool.http.client.body.HttpBody;
-import org.dromara.hutool.http.client.cookie.InMemoryCookieStore;
-import org.dromara.hutool.http.client.engine.AbstractClientEngine;
-import org.dromara.hutool.http.meta.HeaderName;
-import org.dromara.hutool.http.meta.HttpStatus;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.RequestContext;
+import cn.hutool.v7.http.client.body.HttpBody;
+import cn.hutool.v7.http.client.cookie.InMemoryCookieStore;
+import cn.hutool.v7.http.client.engine.AbstractClientEngine;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.meta.HttpStatus;
+import cn.hutool.v7.http.meta.Method;
 
 import java.io.IOException;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkCookie.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkCookie.java
similarity index 90%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkCookie.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkCookie.java
index 6fe5958e3..ac73ce0c4 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkCookie.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkCookie.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.jdk;
+package cn.hutool.v7.http.client.engine.jdk;
 
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-import org.dromara.hutool.core.reflect.method.MethodUtil;
-import org.dromara.hutool.http.client.cookie.CookieSpi;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.core.reflect.method.MethodUtil;
+import cn.hutool.v7.http.client.cookie.CookieSpi;
 
 import java.net.HttpCookie;
 import java.time.Instant;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkCookieManager.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkCookieManager.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkCookieManager.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkCookieManager.java
index 962a16cc9..a8871816d 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkCookieManager.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkCookieManager.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.jdk;
+package cn.hutool.v7.http.client.engine.jdk;
 
-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.cookie.CookieStoreSpi;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.net.url.UrlUtil;
+import cn.hutool.v7.http.client.cookie.CookieStoreSpi;
 
 import java.io.IOException;
 import java.net.CookieManager;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkCookieStore.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkCookieStore.java
similarity index 90%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkCookieStore.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkCookieStore.java
index 8dffaa74c..727f1d2fb 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkCookieStore.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkCookieStore.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.jdk;
+package cn.hutool.v7.http.client.engine.jdk;
 
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-import org.dromara.hutool.http.client.cookie.CookieSpi;
-import org.dromara.hutool.http.client.cookie.CookieStoreSpi;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.http.client.cookie.CookieSpi;
+import cn.hutool.v7.http.client.cookie.CookieStoreSpi;
 
 import java.net.CookieStore;
 import java.net.HttpCookie;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpConnection.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpConnection.java
similarity index 96%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpConnection.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpConnection.java
index 4b4b5999e..42ec335ef 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpConnection.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpConnection.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.jdk;
+package cn.hutool.v7.http.client.engine.jdk;
 
-import org.dromara.hutool.core.lang.Opt;
-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.http.HttpException;
-import org.dromara.hutool.http.client.HeaderOperation;
-import org.dromara.hutool.http.meta.Method;
-import org.dromara.hutool.http.ssl.SSLInfo;
+import cn.hutool.v7.core.lang.Opt;
+import cn.hutool.v7.core.net.url.UrlUtil;
+import cn.hutool.v7.core.reflect.FieldUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.client.HeaderOperation;
+import cn.hutool.v7.http.meta.Method;
+import cn.hutool.v7.http.ssl.SSLInfo;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.Closeable;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpInputStream.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpInputStream.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpInputStream.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpInputStream.java
index 5f9480b6b..51c81e5f1 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpInputStream.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpInputStream.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.jdk;
+package cn.hutool.v7.http.client.engine.jdk;
 
-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 cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.GlobalCompressStreamRegister;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.meta.HttpStatus;
 
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpResponse.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpResponse.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpResponse.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpResponse.java
index ebb48e54b..79d35f031 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpResponse.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.jdk;
+package cn.hutool.v7.http.client.engine.jdk;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.stream.EmptyInputStream;
-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.Request;
-import org.dromara.hutool.http.client.Response;
-import org.dromara.hutool.http.client.body.ResponseBody;
-import org.dromara.hutool.http.meta.HeaderName;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.stream.EmptyInputStream;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.client.body.ResponseBody;
+import cn.hutool.v7.http.meta.HeaderName;
 
 import java.io.Closeable;
 import java.io.FileNotFoundException;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkRequestBuilder.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkRequestBuilder.java
similarity index 87%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkRequestBuilder.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkRequestBuilder.java
index bc3c37398..219cb2833 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkRequestBuilder.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkRequestBuilder.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.jdk;
+package cn.hutool.v7.http.client.engine.jdk;
 
-import org.dromara.hutool.core.net.url.UrlUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.http.client.ClientConfig;
-import org.dromara.hutool.http.client.Request;
-import org.dromara.hutool.http.client.engine.EngineRequestBuilder;
-import org.dromara.hutool.http.meta.HeaderName;
-import org.dromara.hutool.http.proxy.ProxyInfo;
+import cn.hutool.v7.core.net.url.UrlUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.client.ClientConfig;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.engine.EngineRequestBuilder;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.proxy.ProxyInfo;
 
 import java.net.Proxy;
 import java.net.URL;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/package-info.java
index fa0b2dc96..b9826444d 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.http.client.engine.jdk;
+package cn.hutool.v7.http.client.engine.jdk;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/BasicProxyAuthenticator.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/BasicProxyAuthenticator.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/BasicProxyAuthenticator.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/BasicProxyAuthenticator.java
index feb5735de..eb2d0ff4f 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/BasicProxyAuthenticator.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/BasicProxyAuthenticator.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.okhttp;
+package cn.hutool.v7.http.client.engine.okhttp;
 
 import okhttp3.*;
-import org.dromara.hutool.http.meta.HeaderName;
+import cn.hutool.v7.http.meta.HeaderName;
 
 import java.net.PasswordAuthentication;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/CookieJarImpl.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/CookieJarImpl.java
similarity index 89%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/CookieJarImpl.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/CookieJarImpl.java
index 3aa7afe30..8f78d7a88 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/CookieJarImpl.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/CookieJarImpl.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.okhttp;
+package cn.hutool.v7.http.client.engine.okhttp;
 
 import okhttp3.Cookie;
 import okhttp3.CookieJar;
 import okhttp3.HttpUrl;
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.http.client.cookie.CookieSpi;
-import org.dromara.hutool.http.client.cookie.CookieStoreSpi;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.http.client.cookie.CookieSpi;
+import cn.hutool.v7.http.client.cookie.CookieStoreSpi;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkCookie.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkCookie.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkCookie.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkCookie.java
index a8cc81b62..c55501258 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkCookie.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkCookie.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.okhttp;
+package cn.hutool.v7.http.client.engine.okhttp;
 
 import okhttp3.Cookie;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
-import org.dromara.hutool.http.client.cookie.CookieSpi;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.http.client.cookie.CookieSpi;
 
 import java.time.Instant;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpClientConfig.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpClientConfig.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpClientConfig.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpClientConfig.java
index 43fe60789..0267fe79f 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpClientConfig.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpClientConfig.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.okhttp;
+package cn.hutool.v7.http.client.engine.okhttp;
 
-import org.dromara.hutool.http.client.ClientConfig;
+import cn.hutool.v7.http.client.ClientConfig;
 
 /**
  * OkHttpClient 配置
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpEngine.java
similarity index 87%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpEngine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpEngine.java
index 914cfd5db..6638b1047 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpEngine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpEngine.java
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.okhttp;
+package cn.hutool.v7.http.client.engine.okhttp;
 
 import okhttp3.ConnectionPool;
 import okhttp3.OkHttpClient;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.client.ClientConfig;
-import org.dromara.hutool.http.client.Request;
-import org.dromara.hutool.http.client.RequestContext;
-import org.dromara.hutool.http.client.Response;
-import org.dromara.hutool.http.client.cookie.InMemoryCookieStore;
-import org.dromara.hutool.http.client.engine.AbstractClientEngine;
-import org.dromara.hutool.http.meta.HeaderName;
-import org.dromara.hutool.http.meta.HttpStatus;
-import org.dromara.hutool.http.meta.Method;
-import org.dromara.hutool.http.proxy.ProxyInfo;
-import org.dromara.hutool.http.ssl.SSLInfo;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.client.ClientConfig;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.RequestContext;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.client.cookie.InMemoryCookieStore;
+import cn.hutool.v7.http.client.engine.AbstractClientEngine;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.meta.HttpStatus;
+import cn.hutool.v7.http.meta.Method;
+import cn.hutool.v7.http.proxy.ProxyInfo;
+import cn.hutool.v7.http.ssl.SSLInfo;
 
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.X509TrustManager;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpRequestBody.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpRequestBody.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpRequestBody.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpRequestBody.java
index eecd864e7..86de7fd56 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpRequestBody.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpRequestBody.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.okhttp;
+package cn.hutool.v7.http.client.engine.okhttp;
 
-import org.dromara.hutool.http.client.body.HttpBody;
+import cn.hutool.v7.http.client.body.HttpBody;
 import okhttp3.MediaType;
 import okio.BufferedSink;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpRequestBuilder.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpRequestBuilder.java
similarity index 88%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpRequestBuilder.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpRequestBuilder.java
index 9a2ce0309..320d1860c 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpRequestBuilder.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpRequestBuilder.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.okhttp;
+package cn.hutool.v7.http.client.engine.okhttp;
 
 import okhttp3.internal.http.HttpMethod;
-import org.dromara.hutool.http.client.Request;
-import org.dromara.hutool.http.client.body.HttpBody;
-import org.dromara.hutool.http.client.engine.EngineRequestBuilder;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.body.HttpBody;
+import cn.hutool.v7.http.client.engine.EngineRequestBuilder;
 
 /**
  * OkHttp请求构建器
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpResponse.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpResponse.java
similarity index 82%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpResponse.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpResponse.java
index 620586b5c..7e974cb82 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/OkHttpResponse.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.engine.okhttp;
+package cn.hutool.v7.http.client.engine.okhttp;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.stream.EmptyInputStream;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.http.GlobalCompressStreamRegister;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.client.Request;
-import org.dromara.hutool.http.client.Response;
-import org.dromara.hutool.http.client.body.ResponseBody;
-import org.dromara.hutool.http.meta.HeaderName;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.stream.EmptyInputStream;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.GlobalCompressStreamRegister;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.client.body.ResponseBody;
+import cn.hutool.v7.http.meta.HeaderName;
 
 import java.io.InputStream;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/package-info.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/package-info.java
index b4087124a..86349755a 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/okhttp/package-info.java
@@ -18,4 +18,4 @@
  * OKHttp3封装
      
  * 文档见：https://square.github.io/okhttp/
  */
-package org.dromara.hutool.http.client.engine.okhttp;
+package cn.hutool.v7.http.client.engine.okhttp;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/engine/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/engine/package-info.java
index 2852f4118..37cb9364a 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.http.client.engine;
+package cn.hutool.v7.http.client.engine;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/package-info.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/client/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/client/package-info.java
index 83b064f9d..88f76f0a1 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/package-info.java
@@ -28,4 +28,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlFilter.java b/hutool-http/src/main/java/cn/hutool/v7/http/html/HtmlFilter.java
similarity index 98%
rename from hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlFilter.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/html/HtmlFilter.java
index 977d90827..295a08571 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlFilter.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/html/HtmlFilter.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.html;
+package cn.hutool.v7.http.html;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap;
-import org.dromara.hutool.core.text.CharUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
+import cn.hutool.v7.core.text.CharUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/html/HtmlUtil.java
similarity index 96%
rename from hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/html/HtmlUtil.java
index 6cffc6e67..71bf84c2c 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/html/HtmlUtil.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.html;
+package cn.hutool.v7.http.html;
 
-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.xml.XmlUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.regex.ReUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.escape.EscapeUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.xml.XmlUtil;
 
 import java.io.InputStream;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/html/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/html/package-info.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/html/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/html/package-info.java
index 767dd089a..cf52b53ef 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/html/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/html/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.http.html;
+package cn.hutool.v7.http.html;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/meta/ContentType.java b/hutool-http/src/main/java/cn/hutool/v7/http/meta/ContentType.java
similarity index 98%
rename from hutool-http/src/main/java/org/dromara/hutool/http/meta/ContentType.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/meta/ContentType.java
index f4ad889a3..3a7f91da0 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/meta/ContentType.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/meta/ContentType.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.meta;
+package cn.hutool.v7.http.meta;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.nio.charset.Charset;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/meta/ContentTypeUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/meta/ContentTypeUtil.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/meta/ContentTypeUtil.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/meta/ContentTypeUtil.java
index c8ee104e9..da9c7f2cd 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/meta/ContentTypeUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/meta/ContentTypeUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.meta;
+package cn.hutool.v7.http.meta;
 
-import org.dromara.hutool.core.regex.ReUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.regex.ReUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 
 import java.nio.charset.Charset;
 import java.util.regex.Pattern;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/meta/HeaderName.java b/hutool-http/src/main/java/cn/hutool/v7/http/meta/HeaderName.java
similarity index 99%
rename from hutool-http/src/main/java/org/dromara/hutool/http/meta/HeaderName.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/meta/HeaderName.java
index 1da398683..cd13157a3 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/meta/HeaderName.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/meta/HeaderName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.meta;
+package cn.hutool.v7.http.meta;
 
 /**
  * Http头名称枚举
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/meta/HttpHeaderUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/meta/HttpHeaderUtil.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/meta/HttpHeaderUtil.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/meta/HttpHeaderUtil.java
index 2f055b9d3..bc7ba109b 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/meta/HttpHeaderUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/meta/HttpHeaderUtil.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.meta;
+package cn.hutool.v7.http.meta;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.map.CaseInsensitiveMap;
-import org.dromara.hutool.core.net.url.UrlDecoder;
-import org.dromara.hutool.core.net.url.UrlEncoder;
-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.CharsetUtil;
-import org.dromara.hutool.core.util.ObjUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.map.CaseInsensitiveMap;
+import cn.hutool.v7.core.net.url.UrlDecoder;
+import cn.hutool.v7.core.net.url.UrlEncoder;
+import cn.hutool.v7.core.regex.ReUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/meta/HttpStatus.java b/hutool-http/src/main/java/cn/hutool/v7/http/meta/HttpStatus.java
similarity index 99%
rename from hutool-http/src/main/java/org/dromara/hutool/http/meta/HttpStatus.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/meta/HttpStatus.java
index 990f37b3a..aa5fdb6bf 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/meta/HttpStatus.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/meta/HttpStatus.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.meta;
+package cn.hutool.v7.http.meta;
 
 /**
  * HTTP状态码
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/meta/Method.java b/hutool-http/src/main/java/cn/hutool/v7/http/meta/Method.java
similarity index 96%
rename from hutool-http/src/main/java/org/dromara/hutool/http/meta/Method.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/meta/Method.java
index 479d8e9fb..924af51ca 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/meta/Method.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/meta/Method.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.meta;
+package cn.hutool.v7.http.meta;
 
 /**
  * Http方法枚举
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/meta/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/meta/package-info.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/meta/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/meta/package-info.java
index 3d1b191e0..19a86b278 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/meta/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/meta/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.http.meta;
+package cn.hutool.v7.http.meta;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/multipart/MultipartFormData.java b/hutool-http/src/main/java/cn/hutool/v7/http/multipart/MultipartFormData.java
similarity index 96%
rename from hutool-http/src/main/java/org/dromara/hutool/http/multipart/MultipartFormData.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/multipart/MultipartFormData.java
index b921cc07a..a5bba2880 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/multipart/MultipartFormData.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/multipart/MultipartFormData.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.multipart;
+package cn.hutool.v7.http.multipart;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.map.multi.ListValueMap;
-import org.dromara.hutool.core.map.multi.MultiValueMap;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.map.multi.ListValueMap;
+import cn.hutool.v7.core.map.multi.MultiValueMap;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/multipart/MultipartRequestInputStream.java b/hutool-http/src/main/java/cn/hutool/v7/http/multipart/MultipartRequestInputStream.java
similarity index 98%
rename from hutool-http/src/main/java/org/dromara/hutool/http/multipart/MultipartRequestInputStream.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/multipart/MultipartRequestInputStream.java
index 7b4488ba6..cbc4e8e43 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/multipart/MultipartRequestInputStream.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/multipart/MultipartRequestInputStream.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.multipart;
+package cn.hutool.v7.http.multipart;
 
-import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
+import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadFile.java b/hutool-http/src/main/java/cn/hutool/v7/http/multipart/UploadFile.java
similarity index 96%
rename from hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadFile.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/multipart/UploadFile.java
index 1af03dbf6..18da5e74d 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadFile.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/multipart/UploadFile.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.multipart;
+package cn.hutool.v7.http.multipart;
 
-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.FileUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileNameUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.io.*;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadFileHeader.java b/hutool-http/src/main/java/cn/hutool/v7/http/multipart/UploadFileHeader.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadFileHeader.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/multipart/UploadFileHeader.java
index 1e88fded9..7885b71ec 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadFileHeader.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/multipart/UploadFileHeader.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.multipart;
+package cn.hutool.v7.http.multipart;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * 上传的文件的头部信息
      
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadSetting.java b/hutool-http/src/main/java/cn/hutool/v7/http/multipart/UploadSetting.java
similarity index 98%
rename from hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadSetting.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/multipart/UploadSetting.java
index 62f0700fb..a41797b0c 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadSetting.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/multipart/UploadSetting.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.multipart;
+package cn.hutool.v7.http.multipart;
 
 /**
  * 上传文件设定文件
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/multipart/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/multipart/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/multipart/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/multipart/package-info.java
index f3b41ffa0..d997efbb9 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/multipart/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/multipart/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.http.multipart;
+package cn.hutool.v7.http.multipart;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/package-info.java
similarity index 96%
rename from hutool-http/src/main/java/org/dromara/hutool/http/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/package-info.java
index 11f126c05..176d09b0e 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/proxy/ProxyInfo.java b/hutool-http/src/main/java/cn/hutool/v7/http/proxy/ProxyInfo.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/proxy/ProxyInfo.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/proxy/ProxyInfo.java
index 123a071b7..170059ee0 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/proxy/ProxyInfo.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/proxy/ProxyInfo.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.proxy;
+package cn.hutool.v7.http.proxy;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.http.HttpException;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.http.HttpException;
 
 import java.io.IOException;
 import java.net.*;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/proxy/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/proxy/package-info.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/proxy/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/proxy/package-info.java
index 714a9aa2a..589ca6b25 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/proxy/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/proxy/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.http.proxy;
+package cn.hutool.v7.http.proxy;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/ServerConfig.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/ServerConfig.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/ServerConfig.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/ServerConfig.java
index 501952d4e..57867cc0c 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/ServerConfig.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/ServerConfig.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server;
+package cn.hutool.v7.http.server;
 
-import org.dromara.hutool.core.net.ssl.SSLContextUtil;
+import cn.hutool.v7.core.net.ssl.SSLContextUtil;
 
 import javax.net.ssl.SSLContext;
 import java.security.KeyStore;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/AbstractServerEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/AbstractServerEngine.java
similarity index 89%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/AbstractServerEngine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/AbstractServerEngine.java
index 8ccaca04c..4bd98f8ee 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/AbstractServerEngine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/AbstractServerEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine;
+package cn.hutool.v7.http.server.engine;
 
-import org.dromara.hutool.http.server.ServerConfig;
-import org.dromara.hutool.http.server.handler.HttpHandler;
+import cn.hutool.v7.http.server.ServerConfig;
+import cn.hutool.v7.http.server.handler.HttpHandler;
 
 /**
  * 服务端引擎抽象类，实现重置引擎功能
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/ServerEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/ServerEngine.java
similarity index 89%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/ServerEngine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/ServerEngine.java
index efcdda4a9..b64a7b574 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/ServerEngine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/ServerEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine;
+package cn.hutool.v7.http.server.engine;
 
-import org.dromara.hutool.http.server.ServerConfig;
-import org.dromara.hutool.http.server.handler.HttpHandler;
+import cn.hutool.v7.http.server.ServerConfig;
+import cn.hutool.v7.http.server.handler.HttpHandler;
 
 /**
  * HTTP服务器引擎，执行流程为：
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/ServerEngineFactory.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/ServerEngineFactory.java
similarity index 88%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/ServerEngineFactory.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/ServerEngineFactory.java
index 9a7625fb6..c8fbe34a3 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/ServerEngineFactory.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/ServerEngineFactory.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine;
+package cn.hutool.v7.http.server.engine;
 
-import org.dromara.hutool.core.lang.Singleton;
-import org.dromara.hutool.core.spi.ServiceLoader;
-import org.dromara.hutool.core.spi.SpiUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.server.ServerConfig;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.lang.Singleton;
+import cn.hutool.v7.core.spi.ServiceLoader;
+import cn.hutool.v7.core.spi.SpiUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.server.ServerConfig;
+import cn.hutool.v7.log.LogUtil;
 
 /**
  * Http服务器引擎工厂类
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/jetty/Jetty9Handler.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/jetty/Jetty9Handler.java
similarity index 84%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/jetty/Jetty9Handler.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/jetty/Jetty9Handler.java
index 6f519e87f..0ddec3c01 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/jetty/Jetty9Handler.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/jetty/Jetty9Handler.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.jetty;
+package cn.hutool.v7.http.server.engine.jetty;
 
-import org.dromara.hutool.http.server.handler.HttpHandler;
-import org.dromara.hutool.http.server.servlet.JavaxServletRequest;
-import org.dromara.hutool.http.server.servlet.JavaxServletResponse;
+import cn.hutool.v7.http.server.handler.HttpHandler;
+import cn.hutool.v7.http.server.servlet.JavaxServletRequest;
+import cn.hutool.v7.http.server.servlet.JavaxServletResponse;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/jetty/JettyEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/jetty/JettyEngine.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/jetty/JettyEngine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/jetty/JettyEngine.java
index 64fca3fb7..ad9037eb7 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/jetty/JettyEngine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/jetty/JettyEngine.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.jetty;
+package cn.hutool.v7.http.server.engine.jetty;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.server.ServerConfig;
-import org.dromara.hutool.http.server.engine.AbstractServerEngine;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.server.ServerConfig;
+import cn.hutool.v7.http.server.engine.AbstractServerEngine;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.server.*;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/jetty/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/jetty/package-info.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/jetty/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/jetty/package-info.java
index cbc819455..f914d7d2b 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/jetty/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/jetty/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.http.server.engine.jetty;
+package cn.hutool.v7.http.server.engine.jetty;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/package-info.java
index 26b5b9cbc..02314468d 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.http.server.engine;
+package cn.hutool.v7.http.server.engine;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/smart/SmartHttpRequest.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpRequest.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/smart/SmartHttpRequest.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpRequest.java
index 09c579afb..ba6ea370a 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/smart/SmartHttpRequest.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpRequest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.smart;
+package cn.hutool.v7.http.server.engine.smart;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.http.server.handler.ServerRequest;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.http.server.handler.ServerRequest;
 import org.smartboot.http.server.HttpRequest;
 
 import java.io.IOException;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/smart/SmartHttpResponse.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpResponse.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/smart/SmartHttpResponse.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpResponse.java
index 094799eca..1a7617017 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/smart/SmartHttpResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpResponse.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.smart;
+package cn.hutool.v7.http.server.engine.smart;
 
-import org.dromara.hutool.http.server.handler.ServerResponse;
+import cn.hutool.v7.http.server.handler.ServerResponse;
 import org.smartboot.http.common.enums.HttpStatus;
 import org.smartboot.http.server.HttpResponse;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/smart/SmartHttpServerEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpServerEngine.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/smart/SmartHttpServerEngine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpServerEngine.java
index d8a1bf86e..85ad6cc46 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/smart/SmartHttpServerEngine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpServerEngine.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.smart;
+package cn.hutool.v7.http.server.engine.smart;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.server.ServerConfig;
-import org.dromara.hutool.http.server.engine.AbstractServerEngine;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.server.ServerConfig;
+import cn.hutool.v7.http.server.engine.AbstractServerEngine;
 import org.smartboot.http.server.*;
 import org.smartboot.http.server.impl.Request;
 import org.smartboot.socket.extension.plugins.SslPlugin;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/smart/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/smart/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/package-info.java
index a5dfa12ac..ea85b625d 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/smart/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.http.server.engine.smart;
+package cn.hutool.v7.http.server.engine.smart;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/HttpExchangeWrapper.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/HttpExchangeWrapper.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/HttpExchangeWrapper.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/HttpExchangeWrapper.java
index 5c2c10f02..93d4594d2 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/HttpExchangeWrapper.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/HttpExchangeWrapper.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.sun;
+package cn.hutool.v7.http.server.engine.sun;
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpContext;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpPrincipal;
-import org.dromara.hutool.core.lang.wrapper.Wrapper;
+import cn.hutool.v7.core.lang.wrapper.Wrapper;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SimpleServer.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SimpleServer.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SimpleServer.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SimpleServer.java
index 0fe9de311..e8c367280 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SimpleServer.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SimpleServer.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.sun;
+package cn.hutool.v7.http.server.engine.sun;
 
 import com.sun.net.httpserver.*;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.http.server.ServerConfig;
-import org.dromara.hutool.http.server.engine.sun.filter.HttpFilter;
-import org.dromara.hutool.http.server.engine.sun.filter.SimpleFilter;
-import org.dromara.hutool.http.server.handler.RootHandler;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.server.ServerConfig;
+import cn.hutool.v7.http.server.engine.sun.filter.HttpFilter;
+import cn.hutool.v7.http.server.engine.sun.filter.SimpleFilter;
+import cn.hutool.v7.http.server.handler.RootHandler;
 
 import javax.net.ssl.SSLContext;
 import java.io.File;
@@ -165,7 +165,7 @@ public class SimpleServer {
 	 * @return this
 	 * @since 6.0.0
 	 */
-	public SimpleServer addAction(final String path, final org.dromara.hutool.http.server.handler.HttpHandler action) {
+	public SimpleServer addAction(final String path, final cn.hutool.v7.http.server.handler.HttpHandler action) {
 		return addHandler(path, exchange -> {
 			final HttpExchangeWrapper exchangeWrapper = new HttpExchangeWrapper(exchange);
 			action.handle(exchangeWrapper.getRequest(), exchangeWrapper.getResponse());
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SunHttpServerEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunHttpServerEngine.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SunHttpServerEngine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunHttpServerEngine.java
index 6c4920986..d37abf701 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SunHttpServerEngine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunHttpServerEngine.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.sun;
+package cn.hutool.v7.http.server.engine.sun;
 
 import com.sun.net.httpserver.*;
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.thread.ExecutorBuilder;
-import org.dromara.hutool.http.server.ServerConfig;
-import org.dromara.hutool.http.server.engine.AbstractServerEngine;
-import org.dromara.hutool.http.server.engine.sun.filter.HttpFilter;
-import org.dromara.hutool.http.server.engine.sun.filter.SimpleFilter;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.thread.ExecutorBuilder;
+import cn.hutool.v7.http.server.ServerConfig;
+import cn.hutool.v7.http.server.engine.AbstractServerEngine;
+import cn.hutool.v7.http.server.engine.sun.filter.HttpFilter;
+import cn.hutool.v7.http.server.engine.sun.filter.SimpleFilter;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SunServerExchangeBase.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerExchangeBase.java
similarity index 96%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SunServerExchangeBase.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerExchangeBase.java
index 1ab4a1629..8a6661906 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SunServerExchangeBase.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerExchangeBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.sun;
+package cn.hutool.v7.http.server.engine.sun;
 
 import com.sun.net.httpserver.HttpContext;
 import com.sun.net.httpserver.HttpExchange;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SunServerRequest.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerRequest.java
similarity index 87%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SunServerRequest.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerRequest.java
index 3d8e64726..39b871f94 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SunServerRequest.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerRequest.java
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.sun;
+package cn.hutool.v7.http.server.engine.sun;
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.stream.LimitedInputStream;
-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.url.UrlQueryUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.http.meta.ContentTypeUtil;
-import org.dromara.hutool.http.meta.HeaderName;
-import org.dromara.hutool.http.multipart.MultipartFormData;
-import org.dromara.hutool.http.multipart.UploadSetting;
-import org.dromara.hutool.http.server.handler.ServerRequest;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.stream.LimitedInputStream;
+import cn.hutool.v7.core.map.CaseInsensitiveMap;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.map.multi.ListValueMap;
+import cn.hutool.v7.core.net.NetUtil;
+import cn.hutool.v7.core.net.url.UrlQueryUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.meta.ContentTypeUtil;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.multipart.MultipartFormData;
+import cn.hutool.v7.http.multipart.UploadSetting;
+import cn.hutool.v7.http.server.handler.ServerRequest;
 
 import java.io.InputStream;
 import java.net.HttpCookie;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SunServerResponse.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerResponse.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SunServerResponse.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerResponse.java
index 291126273..2e5d614ef 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/SunServerResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/SunServerResponse.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.sun;
+package cn.hutool.v7.http.server.engine.sun;
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.http.meta.ContentType;
-import org.dromara.hutool.http.meta.HttpStatus;
-import org.dromara.hutool.http.server.handler.ServerResponse;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.http.meta.ContentType;
+import cn.hutool.v7.http.meta.HttpStatus;
+import cn.hutool.v7.http.server.handler.ServerResponse;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/DefaultExceptionFilter.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/DefaultExceptionFilter.java
similarity index 82%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/DefaultExceptionFilter.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/DefaultExceptionFilter.java
index 6eda908ed..ef8c099e6 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/DefaultExceptionFilter.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/DefaultExceptionFilter.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.sun.filter;
+package cn.hutool.v7.http.server.engine.sun.filter;
 
-import org.dromara.hutool.core.exception.ExceptionUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.http.server.engine.sun.SunServerRequest;
-import org.dromara.hutool.http.server.engine.sun.SunServerResponse;
+import cn.hutool.v7.core.exception.ExceptionUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.server.engine.sun.SunServerRequest;
+import cn.hutool.v7.http.server.engine.sun.SunServerResponse;
 
 /**
  * 默认异常处理拦截器
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/ExceptionFilter.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/ExceptionFilter.java
similarity index 86%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/ExceptionFilter.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/ExceptionFilter.java
index 0b5c00575..381f8f541 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/ExceptionFilter.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/ExceptionFilter.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.sun.filter;
+package cn.hutool.v7.http.server.engine.sun.filter;
 
 import com.sun.net.httpserver.Filter;
-import org.dromara.hutool.http.server.engine.sun.SunServerRequest;
-import org.dromara.hutool.http.server.engine.sun.SunServerResponse;
+import cn.hutool.v7.http.server.engine.sun.SunServerRequest;
+import cn.hutool.v7.http.server.engine.sun.SunServerResponse;
 
 /**
  * 异常处理过滤器
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/HttpFilter.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/HttpFilter.java
similarity index 86%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/HttpFilter.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/HttpFilter.java
index d5b4dff86..3de1a9178 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/HttpFilter.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/HttpFilter.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.sun.filter;
+package cn.hutool.v7.http.server.engine.sun.filter;
 
 import com.sun.net.httpserver.Filter;
-import org.dromara.hutool.http.server.engine.sun.SunServerRequest;
-import org.dromara.hutool.http.server.engine.sun.SunServerResponse;
+import cn.hutool.v7.http.server.engine.sun.SunServerRequest;
+import cn.hutool.v7.http.server.engine.sun.SunServerResponse;
 
 import java.io.IOException;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/SimpleFilter.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/SimpleFilter.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/SimpleFilter.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/SimpleFilter.java
index 7a9d47eac..229ff3752 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/SimpleFilter.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/SimpleFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.sun.filter;
+package cn.hutool.v7.http.server.engine.sun.filter;
 
 import com.sun.net.httpserver.Filter;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/package-info.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/package-info.java
index 18070d3f7..ef0e131d2 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/filter/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/filter/package-info.java
@@ -17,4 +17,4 @@
 /**
  * {@link com.sun.net.httpserver.Filter} 实现包装
  */
-package org.dromara.hutool.http.server.engine.sun.filter;
+package cn.hutool.v7.http.server.engine.sun.filter;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/package-info.java
index 4c3d46325..b0da7974c 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/sun/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/sun/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.http.server.engine.sun;
+package cn.hutool.v7.http.server.engine.sun;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/JSSESSLContext.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/JSSESSLContext.java
similarity index 98%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/JSSESSLContext.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/JSSESSLContext.java
index 4a6c42fa7..05ed68b77 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/JSSESSLContext.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/JSSESSLContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.tomcat;
+package cn.hutool.v7.http.server.engine.tomcat;
 
 import org.apache.tomcat.util.net.SSLContext;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/TomcatEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/TomcatEngine.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/TomcatEngine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/TomcatEngine.java
index 6e662cc3f..67d9b5af0 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/TomcatEngine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/TomcatEngine.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.tomcat;
+package cn.hutool.v7.http.server.engine.tomcat;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
@@ -26,11 +26,11 @@ import org.apache.catalina.valves.ValveBase;
 import org.apache.coyote.http11.Http11NioProtocol;
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.SSLHostConfigCertificate;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.http.HttpException;
-import org.dromara.hutool.http.server.ServerConfig;
-import org.dromara.hutool.http.server.engine.AbstractServerEngine;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.http.HttpException;
+import cn.hutool.v7.http.server.ServerConfig;
+import cn.hutool.v7.http.server.engine.AbstractServerEngine;
 
 import javax.net.ssl.SSLContext;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/TomcatRequest.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/TomcatRequest.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/TomcatRequest.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/TomcatRequest.java
index 8aedb05f1..d7fa9655f 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/TomcatRequest.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/TomcatRequest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.tomcat;
+package cn.hutool.v7.http.server.engine.tomcat;
 
 import org.apache.catalina.connector.Request;
-import org.dromara.hutool.http.server.handler.ServerRequest;
+import cn.hutool.v7.http.server.handler.ServerRequest;
 
 import java.io.InputStream;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/TomcatResponse.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/TomcatResponse.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/TomcatResponse.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/TomcatResponse.java
index 7863a6dc8..882a6ed49 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/TomcatResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/TomcatResponse.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.tomcat;
+package cn.hutool.v7.http.server.engine.tomcat;
 
 import org.apache.catalina.connector.Response;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.http.server.handler.ServerResponse;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.http.server.handler.ServerResponse;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/package-info.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/package-info.java
index 31bbc324f..a1e11e7ab 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/tomcat/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/tomcat/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.http.server.engine.tomcat;
+package cn.hutool.v7.http.server.engine.tomcat;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/UndertowEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowEngine.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/UndertowEngine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowEngine.java
index 7f2704aa8..02fc32f15 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/UndertowEngine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowEngine.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.undertow;
+package cn.hutool.v7.http.server.engine.undertow;
 
 import io.undertow.Undertow;
 import io.undertow.UndertowOptions;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.http.server.ServerConfig;
-import org.dromara.hutool.http.server.engine.AbstractServerEngine;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.http.server.ServerConfig;
+import cn.hutool.v7.http.server.engine.AbstractServerEngine;
 
 import javax.net.ssl.SSLContext;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/UndertowExchangeBase.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowExchangeBase.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/UndertowExchangeBase.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowExchangeBase.java
index baa7db31e..c214e1e3c 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/UndertowExchangeBase.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowExchangeBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.undertow;
+package cn.hutool.v7.http.server.engine.undertow;
 
 import io.undertow.server.HttpServerExchange;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/UndertowRequest.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowRequest.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/UndertowRequest.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowRequest.java
index 292f9af5b..3973f5092 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/UndertowRequest.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowRequest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.undertow;
+package cn.hutool.v7.http.server.engine.undertow;
 
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.HeaderMap;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.http.server.handler.ServerRequest;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.http.server.handler.ServerRequest;
 
 import java.io.InputStream;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/UndertowResponse.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowResponse.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/UndertowResponse.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowResponse.java
index d5d6e8b0a..eeeeabfcc 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/UndertowResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowResponse.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine.undertow;
+package cn.hutool.v7.http.server.engine.undertow;
 
 import io.undertow.io.Sender;
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.HttpString;
-import org.dromara.hutool.http.server.handler.ServerResponse;
+import cn.hutool.v7.http.server.handler.ServerResponse;
 
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/package-info.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/package-info.java
index 8a9d78a0e..60d6a8dea 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/engine/undertow/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.http.server.engine.undertow;
+package cn.hutool.v7.http.server.engine.undertow;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/HttpHandler.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/HttpHandler.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/handler/HttpHandler.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/handler/HttpHandler.java
index 08f5789c5..475fb2884 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/HttpHandler.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/HttpHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.handler;
+package cn.hutool.v7.http.server.handler;
 
 /**
  * HTTP请求处理器
      
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/PathTrie.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/PathTrie.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/handler/PathTrie.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/handler/PathTrie.java
index 38969bef2..c6f6983b0 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/PathTrie.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/PathTrie.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.handler;
+package cn.hutool.v7.http.server.handler;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.text.split.SplitUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/RootHandler.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/RootHandler.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/handler/RootHandler.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/handler/RootHandler.java
index a6c13f641..ea1f00844 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/RootHandler.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/RootHandler.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.handler;
+package cn.hutool.v7.http.server.handler;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.http.meta.HttpStatus;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.http.meta.HttpStatus;
 
 import java.io.File;
 import java.util.List;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/RouteHttpHandler.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/RouteHttpHandler.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/handler/RouteHttpHandler.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/handler/RouteHttpHandler.java
index 6752c2feb..fe8d248ca 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/RouteHttpHandler.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/RouteHttpHandler.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.handler;
+package cn.hutool.v7.http.server.handler;
 
-import org.dromara.hutool.core.lang.Assert;
+import cn.hutool.v7.core.lang.Assert;
 
 /**
  * 路由处理器
      
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/ServerRequest.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/ServerRequest.java
similarity index 90%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/handler/ServerRequest.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/handler/ServerRequest.java
index fd4a582ba..c6fff5939 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/ServerRequest.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/ServerRequest.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.handler;
+package cn.hutool.v7.http.server.handler;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.map.multi.ListValueMap;
-import org.dromara.hutool.core.net.url.UrlQueryUtil;
-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.meta.ContentTypeUtil;
-import org.dromara.hutool.http.meta.HeaderName;
-import org.dromara.hutool.http.meta.Method;
-import org.dromara.hutool.http.multipart.MultipartFormData;
-import org.dromara.hutool.http.multipart.UploadSetting;
-import org.dromara.hutool.http.useragent.UserAgent;
-import org.dromara.hutool.http.useragent.UserAgentUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.map.multi.ListValueMap;
+import cn.hutool.v7.core.net.url.UrlQueryUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.meta.ContentTypeUtil;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.meta.Method;
+import cn.hutool.v7.http.multipart.MultipartFormData;
+import cn.hutool.v7.http.multipart.UploadSetting;
+import cn.hutool.v7.http.useragent.UserAgent;
+import cn.hutool.v7.http.useragent.UserAgentUtil;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/ServerResponse.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/ServerResponse.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/handler/ServerResponse.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/handler/ServerResponse.java
index f8cab2ee2..0e857ad19 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/ServerResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/ServerResponse.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.handler;
+package cn.hutool.v7.http.server.handler;
 
-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.CharsetUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.http.meta.ContentType;
-import org.dromara.hutool.http.meta.HeaderName;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.net.url.UrlEncoder;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.meta.ContentType;
+import cn.hutool.v7.http.meta.HeaderName;
 
 import java.io.*;
 import java.nio.charset.Charset;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/handler/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/handler/package-info.java
index 80f6e8001..0654da98a 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/handler/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/handler/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.http.server.handler;
+package cn.hutool.v7.http.server.handler;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/package-info.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/package-info.java
index 7485b793c..73e67c76a 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.http.server;
+package cn.hutool.v7.http.server;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletRequest.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/JavaxServletRequest.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletRequest.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/JavaxServletRequest.java
index 1955f3b24..c5b0ca45b 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletRequest.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/JavaxServletRequest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.servlet;
+package cn.hutool.v7.http.server.servlet;
 
-import org.dromara.hutool.http.server.handler.ServerRequest;
+import cn.hutool.v7.http.server.handler.ServerRequest;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletResponse.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/JavaxServletResponse.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletResponse.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/JavaxServletResponse.java
index 72bbf3296..47be90b5f 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/JavaxServletResponse.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.servlet;
+package cn.hutool.v7.http.server.servlet;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.http.server.handler.ServerResponse;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.http.server.handler.ServerResponse;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/JavaxServletUtil.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletUtil.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/JavaxServletUtil.java
index 82f0bb49b..15c22ba52 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/JavaxServletUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.servlet;
+package cn.hutool.v7.http.server.servlet;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.ServletRequest;
@@ -22,27 +22,27 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-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.exception.HutoolException;
-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.map.CaseInsensitiveMap;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.net.NetUtil;
-import org.dromara.hutool.http.multipart.MultipartFormData;
-import org.dromara.hutool.http.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.util.CharsetUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.bean.copier.CopyOptions;
+import cn.hutool.v7.core.bean.copier.ValueProvider;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.collection.iter.ArrayIter;
+import cn.hutool.v7.core.exception.HutoolException;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.map.CaseInsensitiveMap;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.net.NetUtil;
+import cn.hutool.v7.http.multipart.MultipartFormData;
+import cn.hutool.v7.http.multipart.UploadSetting;
+import cn.hutool.v7.core.net.url.UrlEncoder;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.meta.Method;
 
 import java.io.*;
 import java.lang.reflect.Type;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletRequest.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletRequest.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletRequest.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletRequest.java
index aba62cc7e..5bb2b0195 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletRequest.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletRequest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.servlet;
+package cn.hutool.v7.http.server.servlet;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.dromara.hutool.http.server.handler.ServerRequest;
+import cn.hutool.v7.http.server.handler.ServerRequest;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletResponse.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletResponse.java
similarity index 92%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletResponse.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletResponse.java
index bbd8a5c6a..83aa480fe 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletResponse.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.servlet;
+package cn.hutool.v7.http.server.servlet;
 
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletResponse;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.http.server.handler.ServerResponse;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.http.server.handler.ServerResponse;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletUtil.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletUtil.java
index 680065918..47da9b393 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletUtil.java
@@ -14,35 +14,35 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.servlet;
+package cn.hutool.v7.http.server.servlet;
 
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.dromara.hutool.core.array.ArrayUtil;
-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.exception.HutoolException;
-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.map.CaseInsensitiveMap;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.net.NetUtil;
-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.http.meta.HeaderName;
-import org.dromara.hutool.http.meta.HttpHeaderUtil;
-import org.dromara.hutool.http.meta.Method;
-import org.dromara.hutool.http.multipart.MultipartFormData;
-import org.dromara.hutool.http.multipart.UploadSetting;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.bean.copier.CopyOptions;
+import cn.hutool.v7.core.bean.copier.ValueProvider;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.collection.iter.ArrayIter;
+import cn.hutool.v7.core.exception.HutoolException;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.map.CaseInsensitiveMap;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.net.NetUtil;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.meta.HttpHeaderUtil;
+import cn.hutool.v7.http.meta.Method;
+import cn.hutool.v7.http.multipart.MultipartFormData;
+import cn.hutool.v7.http.multipart.UploadSetting;
 
 import java.io.*;
 import java.lang.reflect.Type;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/package-info.java
index 54e1faf39..3669b3b0d 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.http.server.servlet;
+package cn.hutool.v7.http.server.servlet;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/ssl/CustomProtocolsSSLFactory.java b/hutool-http/src/main/java/cn/hutool/v7/http/ssl/CustomProtocolsSSLFactory.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/ssl/CustomProtocolsSSLFactory.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/ssl/CustomProtocolsSSLFactory.java
index d2a01c995..e4c3e4970 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/ssl/CustomProtocolsSSLFactory.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/ssl/CustomProtocolsSSLFactory.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.ssl;
+package cn.hutool.v7.http.ssl;
 
-import org.dromara.hutool.core.array.ArrayUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
 
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/ssl/SSLInfo.java b/hutool-http/src/main/java/cn/hutool/v7/http/ssl/SSLInfo.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/ssl/SSLInfo.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/ssl/SSLInfo.java
index 1e3d26b2c..89359f001 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/ssl/SSLInfo.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/ssl/SSLInfo.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.ssl;
+package cn.hutool.v7.http.ssl;
 
-import org.dromara.hutool.core.net.ssl.SSLProtocols;
-import org.dromara.hutool.core.net.ssl.SSLContextUtil;
-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 cn.hutool.v7.core.net.ssl.SSLProtocols;
+import cn.hutool.v7.core.net.ssl.SSLContextUtil;
+import cn.hutool.v7.core.net.ssl.SSLContextBuilder;
+import cn.hutool.v7.core.net.ssl.TrustAnyHostnameVerifier;
+import cn.hutool.v7.core.net.ssl.TrustAnyTrustManager;
+import cn.hutool.v7.core.text.StrUtil;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/ssl/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/ssl/package-info.java
similarity index 94%
rename from hutool-http/src/main/java/org/dromara/hutool/http/ssl/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/ssl/package-info.java
index 7ab411809..08915e5bb 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/ssl/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/ssl/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.http.ssl;
+package cn.hutool.v7.http.ssl;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/Browser.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/Browser.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/useragent/Browser.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/useragent/Browser.java
index e5777f611..cb94c0d94 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/Browser.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/Browser.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.regex.ReUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.regex.ReUtil;
 
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/BrowserEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/BrowserEngine.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/useragent/BrowserEngine.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/useragent/BrowserEngine.java
index d4befb32b..d7567d6c9 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/BrowserEngine.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/BrowserEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.regex.ReUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.regex.ReUtil;
 
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/OS.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/OS.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/useragent/OS.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/useragent/OS.java
index ce9f623d6..139d8c759 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/OS.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/OS.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.regex.ReUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.regex.ReUtil;
 
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/Platform.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/Platform.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/useragent/Platform.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/useragent/Platform.java
index 7752ac470..7368ebd5a 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/Platform.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/Platform.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
 
-import org.dromara.hutool.core.collection.ListUtil;
+import cn.hutool.v7.core.collection.ListUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgent.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgent.java
similarity index 98%
rename from hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgent.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgent.java
index cb2005a7c..0930bf4be 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgent.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgent.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
 
 import java.io.Serializable;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentInfo.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentInfo.java
similarity index 96%
rename from hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentInfo.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentInfo.java
index 0c237f3a0..bdfadbd12 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentInfo.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentInfo.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
 
-import org.dromara.hutool.core.regex.ReUtil;
+import cn.hutool.v7.core.regex.ReUtil;
 
 import java.io.Serializable;
 import java.util.regex.Pattern;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentParser.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentParser.java
similarity index 97%
rename from hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentParser.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentParser.java
index b8625767f..a9664be51 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentParser.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentParser.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * User-Agent解析器
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentUtil.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentUtil.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentUtil.java
index 3483cebc3..409b81318 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/UserAgentUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
 
 /**
  * User-Agent工具类
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/useragent/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/useragent/package-info.java
index 69b3edc10..3ecdccae1 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/useragent/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapClient.java b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapClient.java
similarity index 96%
rename from hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapClient.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapClient.java
index ab5b6beed..76fbd4b07 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapClient.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapClient.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.webservice;
+package cn.hutool.v7.http.webservice;
 
 import jakarta.xml.soap.*;
-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.text.split.SplitUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.http.client.HeaderOperation;
-import org.dromara.hutool.http.client.Request;
-import org.dromara.hutool.http.client.Response;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.http.client.HeaderOperation;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.meta.Method;
 
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapProtocol.java b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapProtocol.java
similarity index 96%
rename from hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapProtocol.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapProtocol.java
index a5fec12d9..64b59a98b 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapProtocol.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapProtocol.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.webservice;
+package cn.hutool.v7.http.webservice;
 
 import jakarta.xml.soap.SOAPConstants;
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapResponse.java b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapResponse.java
similarity index 91%
rename from hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapResponse.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapResponse.java
index 74df9f15c..5fdf6fb02 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapResponse.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.webservice;
+package cn.hutool.v7.http.webservice;
 
 import jakarta.xml.soap.*;
-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.xml.XmlUtil;
-import org.dromara.hutool.http.client.Response;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.xml.XmlUtil;
+import cn.hutool.v7.http.client.Response;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapRuntimeException.java b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapRuntimeException.java
similarity index 95%
rename from hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapRuntimeException.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapRuntimeException.java
index 6b348c859..32427f7d2 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapRuntimeException.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapRuntimeException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.webservice;
+package cn.hutool.v7.http.webservice;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * SOAP异常
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapUtil.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapUtil.java
index 56251146d..c95875b78 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.webservice;
+package cn.hutool.v7.http.webservice;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -24,9 +24,9 @@ import java.nio.charset.Charset;
 import jakarta.xml.soap.SOAPException;
 import jakarta.xml.soap.SOAPMessage;
 
-import org.dromara.hutool.core.exception.HutoolException;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.core.xml.XmlUtil;
+import cn.hutool.v7.core.exception.HutoolException;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.xml.XmlUtil;
 
 /**
  * SOAP相关工具类
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/package-info.java b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/package-info.java
similarity index 93%
rename from hutool-http/src/main/java/org/dromara/hutool/http/webservice/package-info.java
rename to hutool-http/src/main/java/cn/hutool/v7/http/webservice/package-info.java
index 1c5c941e4..764139cbc 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/package-info.java
+++ b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.http.webservice;
+package cn.hutool.v7.http.webservice;
diff --git a/hutool-http/src/main/resources/META-INF/services/org.dromara.hutool.http.client.engine.ClientEngine b/hutool-http/src/main/resources/META-INF/services/cn.hutool.v7.http.client.engine.ClientEngine
similarity index 70%
rename from hutool-http/src/main/resources/META-INF/services/org.dromara.hutool.http.client.engine.ClientEngine
rename to hutool-http/src/main/resources/META-INF/services/cn.hutool.v7.http.client.engine.ClientEngine
index 257fac7fc..bd1b8b2b4 100644
--- a/hutool-http/src/main/resources/META-INF/services/org.dromara.hutool.http.client.engine.ClientEngine
+++ b/hutool-http/src/main/resources/META-INF/services/cn.hutool.v7.http.client.engine.ClientEngine
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-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
+cn.hutool.v7.http.client.engine.httpclient5.HttpClient5Engine
+cn.hutool.v7.http.client.engine.httpclient4.HttpClient4Engine
+cn.hutool.v7.http.client.engine.okhttp.OkHttpEngine
+cn.hutool.v7.http.client.engine.jdk.JdkClientEngine
diff --git a/hutool-http/src/main/resources/META-INF/services/cn.hutool.v7.http.server.engine.ServerEngine b/hutool-http/src/main/resources/META-INF/services/cn.hutool.v7.http.server.engine.ServerEngine
new file mode 100644
index 000000000..d0484025e
--- /dev/null
+++ b/hutool-http/src/main/resources/META-INF/services/cn.hutool.v7.http.server.engine.ServerEngine
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2013-2025 Hutool Team and hutool.cn
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+cn.hutool.v7.http.server.engine.undertow.UndertowEngine
+cn.hutool.v7.http.server.engine.tomcat.TomcatEngine
+cn.hutool.v7.http.server.engine.jetty.JettyEngine
+cn.hutool.v7.http.server.engine.smart.SmartHttpServerEngine
+cn.hutool.v7.http.server.engine.sun.SunHttpServerEngine
diff --git a/hutool-http/src/main/resources/META-INF/services/org.dromara.hutool.http.server.engine.ServerEngine b/hutool-http/src/main/resources/META-INF/services/org.dromara.hutool.http.server.engine.ServerEngine
deleted file mode 100644
index e64789d36..000000000
--- a/hutool-http/src/main/resources/META-INF/services/org.dromara.hutool.http.server.engine.ServerEngine
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (c) 2013-2025 Hutool Team and hutool.cn
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.dromara.hutool.http.server.engine.undertow.UndertowEngine
-org.dromara.hutool.http.server.engine.tomcat.TomcatEngine
-org.dromara.hutool.http.server.engine.jetty.JettyEngine
-org.dromara.hutool.http.server.engine.smart.SmartHttpServerEngine
-org.dromara.hutool.http.server.engine.sun.SunHttpServerEngine
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/HttpUtilTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/HttpUtilTest.java
similarity index 96%
rename from hutool-http/src/test/java/org/dromara/hutool/http/HttpUtilTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/HttpUtilTest.java
index e9de7b798..7668e0472 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/HttpUtilTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/HttpUtilTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.map.Dict;
-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.HeaderName;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.map.Dict;
+import cn.hutool.v7.core.regex.ReUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.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/org/dromara/hutool/http/HttpsTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/HttpsTest.java
similarity index 89%
rename from hutool-http/src/test/java/org/dromara/hutool/http/HttpsTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/HttpsTest.java
index eeb907f03..6e1d16605 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/HttpsTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/HttpsTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.thread.ThreadUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.thread.ThreadUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/Issue2531Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/Issue2531Test.java
similarity index 88%
rename from hutool-http/src/test/java/org/dromara/hutool/http/Issue2531Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/Issue2531Test.java
index be1973822..7b5408d97 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/Issue2531Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/Issue2531Test.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-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 cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.net.url.UrlBuilder;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.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/org/dromara/hutool/http/Issue2901Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/Issue2901Test.java
similarity index 70%
rename from hutool-http/src/test/java/org/dromara/hutool/http/Issue2901Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/Issue2901Test.java
index c044d34b0..97f79e41e 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/Issue2901Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/Issue2901Test.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-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 cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.resource.FileResource;
+import cn.hutool.v7.core.io.resource.HttpResource;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.client.body.ResourceBody;
+import cn.hutool.v7.http.meta.ContentType;
+import cn.hutool.v7.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/Issue3536Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/Issue3536Test.java
similarity index 89%
rename from hutool-http/src/test/java/org/dromara/hutool/http/Issue3536Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/Issue3536Test.java
index b31a1053d..a6bb1d58b 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/Issue3536Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/Issue3536Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.net.url.UrlQuery;
-import org.dromara.hutool.core.net.url.UrlQueryUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.net.url.UrlQuery;
+import cn.hutool.v7.core.net.url.UrlQueryUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5TFPUTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/IssueI5TFPUTest.java
similarity index 91%
rename from hutool-http/src/test/java/org/dromara/hutool/http/IssueI5TFPUTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/IssueI5TFPUTest.java
index 5f3cd874e..e6d81bc51 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5TFPUTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/IssueI5TFPUTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.net.url.UrlBuilder;
+import cn.hutool.v7.core.net.url.UrlBuilder;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5TPSYTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/IssueI5TPSYTest.java
similarity index 83%
rename from hutool-http/src/test/java/org/dromara/hutool/http/IssueI5TPSYTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/IssueI5TPSYTest.java
index 6a1144c14..751792814 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5TPSYTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/IssueI5TPSYTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-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.HeaderName;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.meta.HeaderName;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5WAV4Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/IssueI5WAV4Test.java
similarity index 90%
rename from hutool-http/src/test/java/org/dromara/hutool/http/IssueI5WAV4Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/IssueI5WAV4Test.java
index 71aa74d11..070f5ec35 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5WAV4Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/IssueI5WAV4Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.http.client.Request;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5XBCFTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/IssueI5XBCFTest.java
similarity index 83%
rename from hutool-http/src/test/java/org/dromara/hutool/http/IssueI5XBCFTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/IssueI5XBCFTest.java
index f0d87c120..6d75cc396 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/IssueI5XBCFTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/IssueI5XBCFTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-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.HeaderName;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.meta.HeaderName;
 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/org/dromara/hutool/http/IssueI78PB1Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/IssueI78PB1Test.java
similarity index 97%
rename from hutool-http/src/test/java/org/dromara/hutool/http/IssueI78PB1Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/IssueI78PB1Test.java
index 579da4a47..1a02956f9 100755
--- a/hutool-http/src/test/java/org/dromara/hutool/http/IssueI78PB1Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/IssueI78PB1Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
 import org.apache.hc.core5.net.URIBuilder;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/IssueI85C9STest.java b/hutool-http/src/test/java/cn/hutool/v7/http/IssueI85C9STest.java
similarity index 79%
rename from hutool-http/src/test/java/org/dromara/hutool/http/IssueI85C9STest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/IssueI85C9STest.java
index 7c355767f..2583fa30d 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/IssueI85C9STest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/IssueI85C9STest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.map.MapBuilder;
-import org.dromara.hutool.http.client.Request;
-import org.dromara.hutool.http.client.Response;
-import org.dromara.hutool.http.client.engine.ClientEngine;
-import org.dromara.hutool.http.client.engine.httpclient5.HttpClient5Engine;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.map.MapBuilder;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.client.engine.ClientEngine;
+import cn.hutool.v7.http.client.engine.httpclient5.HttpClient5Engine;
+import cn.hutool.v7.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/org/dromara/hutool/http/IssueIA80XITest.java b/hutool-http/src/test/java/cn/hutool/v7/http/IssueIA80XITest.java
similarity index 89%
rename from hutool-http/src/test/java/org/dromara/hutool/http/IssueIA80XITest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/IssueIA80XITest.java
index ce7d46b6d..b11017818 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/IssueIA80XITest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/IssueIA80XITest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.net.url.UrlBuilder;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.http.client.Request;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.net.url.UrlBuilder;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.http.client.Request;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/IssueIAFKWPTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/IssueIAFKWPTest.java
similarity index 86%
rename from hutool-http/src/test/java/org/dromara/hutool/http/IssueIAFKWPTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/IssueIAFKWPTest.java
index c091ce0db..9de765b56 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/IssueIAFKWPTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/IssueIAFKWPTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.net.url.UrlQuery;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.net.url.UrlQuery;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/IssueIBQIYQTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/IssueIBQIYQTest.java
similarity index 91%
rename from hutool-http/src/test/java/org/dromara/hutool/http/IssueIBQIYQTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/IssueIBQIYQTest.java
index c9f32c0cb..bb8f54405 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/IssueIBQIYQTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/IssueIBQIYQTest.java
@@ -1,6 +1,6 @@
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-import org.dromara.hutool.core.net.url.UrlQueryUtil;
+import cn.hutool.v7.core.net.url.UrlQueryUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/RequestTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/RequestTest.java
similarity index 93%
rename from hutool-http/src/test/java/org/dromara/hutool/http/RequestTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/RequestTest.java
index 4e3bd2a9f..92063d7e6 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/RequestTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/RequestTest.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-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.HeaderName;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.date.StopWatch;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.net.url.UrlBuilder;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.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/org/dromara/hutool/http/UploadTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/UploadTest.java
similarity index 85%
rename from hutool-http/src/test/java/org/dromara/hutool/http/UploadTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/UploadTest.java
index 5c4d6fe40..022282f40 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/UploadTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/UploadTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http;
+package cn.hutool.v7.http;
 
-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.HeaderName;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.resource.MultiFileResource;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.http.client.Request;
+import cn.hutool.v7.http.client.Response;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/ClientEngineFactoryTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/ClientEngineFactoryTest.java
similarity index 84%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/ClientEngineFactoryTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/ClientEngineFactoryTest.java
index bc8e75fd4..c0888996a 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/ClientEngineFactoryTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/ClientEngineFactoryTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.http.client.engine.ClientEngine;
-import org.dromara.hutool.http.client.engine.ClientEngineFactory;
+import cn.hutool.v7.http.client.engine.ClientEngine;
+import cn.hutool.v7.http.client.engine.ClientEngineFactory;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/DownloadTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/DownloadTest.java
similarity index 95%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/DownloadTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/DownloadTest.java
index 2f7265eeb..c74435ee2 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/DownloadTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/DownloadTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-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.map.MapUtil;
-import org.dromara.hutool.http.HttpGlobalConfig;
-import org.dromara.hutool.http.client.engine.ClientEngineFactory;
+import cn.hutool.v7.core.io.StreamProgress;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.http.HttpGlobalConfig;
+import cn.hutool.v7.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/org/dromara/hutool/http/client/HttpClient4EngineTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/HttpClient4EngineTest.java
similarity index 82%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/HttpClient4EngineTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/HttpClient4EngineTest.java
index df1498926..e47dd2683 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpClient4EngineTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/HttpClient4EngineTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.client.engine.ClientEngine;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.client.engine.ClientEngine;
+import cn.hutool.v7.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpClient5EngineTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/HttpClient5EngineTest.java
similarity index 82%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/HttpClient5EngineTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/HttpClient5EngineTest.java
index 15446b507..922e0cbbb 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpClient5EngineTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/HttpClient5EngineTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.client.engine.ClientEngine;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.client.engine.ClientEngine;
+import cn.hutool.v7.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpUrlConnectionUtilTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/HttpUrlConnectionUtilTest.java
similarity index 87%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/HttpUrlConnectionUtilTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/HttpUrlConnectionUtilTest.java
index 5150e0433..09e0e4344 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpUrlConnectionUtilTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/HttpUrlConnectionUtilTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.http.client.engine.jdk.HttpUrlConnectionUtil;
+import cn.hutool.v7.http.client.engine.jdk.HttpUrlConnectionUtil;
 import org.junit.jupiter.api.Test;
 
 public class HttpUrlConnectionUtilTest {
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpbinTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/HttpbinTest.java
similarity index 94%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/HttpbinTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/HttpbinTest.java
index 92944c417..a1367988a 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/HttpbinTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/HttpbinTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
 /**
  *
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/Issue3240Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/Issue3240Test.java
similarity index 84%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/Issue3240Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/Issue3240Test.java
index 0d61d6351..f31d70970 100755
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/Issue3240Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/Issue3240Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.client.engine.ClientEngine;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.client.engine.ClientEngine;
+import cn.hutool.v7.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/Issue3658Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/Issue3658Test.java
similarity index 90%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/Issue3658Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/Issue3658Test.java
index 0724e1334..0a77be624 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/Issue3658Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/Issue3658Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.http.meta.HeaderName;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.http.meta.HeaderName;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/Issue3765Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/Issue3765Test.java
similarity index 83%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/Issue3765Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/Issue3765Test.java
index 320c36ca1..afbdc80a4 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/Issue3765Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/Issue3765Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.client.engine.ClientEngine;
-import org.dromara.hutool.http.client.engine.ClientEngineFactory;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.client.engine.ClientEngine;
+import cn.hutool.v7.http.client.engine.ClientEngineFactory;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/Issue444Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/Issue444Test.java
similarity index 85%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/Issue444Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/Issue444Test.java
index 4fbea6e0f..5ce741e73 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/Issue444Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/Issue444Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.client.engine.jdk.JdkClientEngine;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.client.engine.jdk.JdkClientEngine;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueI7ZRJUTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/IssueI7ZRJUTest.java
similarity index 83%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/IssueI7ZRJUTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/IssueI7ZRJUTest.java
index a2b9abe3a..b184f0aa2 100755
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueI7ZRJUTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/IssueI7ZRJUTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.client.engine.jdk.JdkClientEngine;
-import org.dromara.hutool.http.ssl.SSLInfo;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.client.engine.jdk.JdkClientEngine;
+import cn.hutool.v7.http.ssl.SSLInfo;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueI8WU4MTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/IssueI8WU4MTest.java
similarity index 84%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/IssueI8WU4MTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/IssueI8WU4MTest.java
index 1bf419456..5a69ea5da 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueI8WU4MTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/IssueI8WU4MTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.http.HttpGlobalConfig;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.client.engine.okhttp.OkHttpEngine;
-import org.dromara.hutool.http.meta.HeaderName;
+import cn.hutool.v7.http.HttpGlobalConfig;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.client.engine.okhttp.OkHttpEngine;
+import cn.hutool.v7.http.meta.HeaderName;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIANZ38Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/IssueIANZ38Test.java
similarity index 89%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIANZ38Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/IssueIANZ38Test.java
index d68c54155..49e3b610b 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIANZ38Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/IssueIANZ38Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.client.engine.ClientEngineFactory;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.client.engine.ClientEngineFactory;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIAOPR9Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/IssueIAOPR9Test.java
similarity index 89%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIAOPR9Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/IssueIAOPR9Test.java
index 2dc3e9697..0dd92d270 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIAOPR9Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/IssueIAOPR9Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.http.HttpUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.http.HttpUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIB1QHQTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/IssueIB1QHQTest.java
similarity index 83%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIB1QHQTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/IssueIB1QHQTest.java
index 2656d4de2..2c8d07ddb 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIB1QHQTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/IssueIB1QHQTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.client.engine.ClientEngineFactory;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.client.engine.ClientEngineFactory;
+import cn.hutool.v7.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIBC5N8Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/IssueIBC5N8Test.java
similarity index 83%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIBC5N8Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/IssueIBC5N8Test.java
index 4cd4f20af..64808d271 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/IssueIBC5N8Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/IssueIBC5N8Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.HttpGlobalConfig;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.client.engine.ClientEngine;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.HttpGlobalConfig;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.client.engine.ClientEngine;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/JdkClientEngineTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/JdkClientEngineTest.java
similarity index 86%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/JdkClientEngineTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/JdkClientEngineTest.java
index 5194de4c0..e0ccb342d 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/JdkClientEngineTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/JdkClientEngineTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.client.engine.ClientEngine;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.client.engine.ClientEngine;
+import cn.hutool.v7.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/OkHttpEngineTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/OkHttpEngineTest.java
similarity index 80%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/OkHttpEngineTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/OkHttpEngineTest.java
index 425f0165c..79a5ee3b3 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/OkHttpEngineTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/OkHttpEngineTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.client.engine.ClientEngine;
-import org.dromara.hutool.http.client.engine.okhttp.OkHttpEngine;
-import org.dromara.hutool.http.meta.Method;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.client.engine.ClientEngine;
+import cn.hutool.v7.http.client.engine.okhttp.OkHttpEngine;
+import cn.hutool.v7.http.meta.Method;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/RestTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/RestTest.java
similarity index 89%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/RestTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/RestTest.java
index dd01ef615..19d9bfc7d 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/RestTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/RestTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.meta.HeaderName;
-import org.dromara.hutool.http.meta.Method;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.meta.Method;
+import cn.hutool.v7.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/org/dromara/hutool/http/client/XiaohonshuTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/XiaohonshuTest.java
similarity index 86%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/XiaohonshuTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/XiaohonshuTest.java
index 38d4581ea..51ba737ed 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/XiaohonshuTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/XiaohonshuTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client;
+package cn.hutool.v7.http.client;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.client.engine.okhttp.OkHttpEngine;
-import org.dromara.hutool.http.meta.HeaderName;
-import org.dromara.hutool.http.meta.Method;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.client.engine.okhttp.OkHttpEngine;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.meta.Method;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/client/body/MultipartBodyTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/client/body/MultipartBodyTest.java
similarity index 85%
rename from hutool-http/src/test/java/org/dromara/hutool/http/client/body/MultipartBodyTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/client/body/MultipartBodyTest.java
index b1ed88aa9..bcf0e4533 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/client/body/MultipartBodyTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/client/body/MultipartBodyTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.client.body;
+package cn.hutool.v7.http.client.body;
 
-import org.dromara.hutool.core.io.resource.HttpResource;
-import org.dromara.hutool.core.io.resource.StringResource;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.io.resource.HttpResource;
+import cn.hutool.v7.core.io.resource.StringResource;
+import cn.hutool.v7.core.util.CharsetUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/html/HTMLFilterTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/html/HTMLFilterTest.java
similarity index 96%
rename from hutool-http/src/test/java/org/dromara/hutool/http/html/HTMLFilterTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/html/HTMLFilterTest.java
index 705422a3a..c7682b808 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/html/HTMLFilterTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/html/HTMLFilterTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.html;
+package cn.hutool.v7.http.html;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/html/HtmlUtilTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/html/HtmlUtilTest.java
similarity index 98%
rename from hutool-http/src/test/java/org/dromara/hutool/http/html/HtmlUtilTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/html/HtmlUtilTest.java
index c0978a56e..060e0f832 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/html/HtmlUtilTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/html/HtmlUtilTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.html;
+package cn.hutool.v7.http.html;
 
-import org.dromara.hutool.core.regex.ReUtil;
-import org.dromara.hutool.http.meta.ContentTypeUtil;
+import cn.hutool.v7.core.regex.ReUtil;
+import cn.hutool.v7.http.meta.ContentTypeUtil;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/html/IssueI8YV0KTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/html/IssueI8YV0KTest.java
similarity index 97%
rename from hutool-http/src/test/java/org/dromara/hutool/http/html/IssueI8YV0KTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/html/IssueI8YV0KTest.java
index 80a056058..f7778fa4e 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/html/IssueI8YV0KTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/html/IssueI8YV0KTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.html;
+package cn.hutool.v7.http.html;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/meta/ContentTypeTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/meta/ContentTypeTest.java
similarity index 93%
rename from hutool-http/src/test/java/org/dromara/hutool/http/meta/ContentTypeTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/meta/ContentTypeTest.java
index 014ff16df..7c8ef9703 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/meta/ContentTypeTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/meta/ContentTypeTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.meta;
+package cn.hutool.v7.http.meta;
 
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/meta/HttpHeaderUtilTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/meta/HttpHeaderUtilTest.java
similarity index 97%
rename from hutool-http/src/test/java/org/dromara/hutool/http/meta/HttpHeaderUtilTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/meta/HttpHeaderUtilTest.java
index c41601a8d..9b9463d51 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/meta/HttpHeaderUtilTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/meta/HttpHeaderUtilTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.meta;
+package cn.hutool.v7.http.meta;
 
-import org.dromara.hutool.core.collection.ListUtil;
+import cn.hutool.v7.core.collection.ListUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/BlankServerTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/BlankServerTest.java
similarity index 86%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/BlankServerTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/BlankServerTest.java
index cae281a65..d5bf7381b 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/BlankServerTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/BlankServerTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server;
+package cn.hutool.v7.http.server;
 
-import org.dromara.hutool.http.meta.ContentType;
-import org.dromara.hutool.http.HttpUtil;
+import cn.hutool.v7.http.meta.ContentType;
+import cn.hutool.v7.http.HttpUtil;
 
 public class BlankServerTest {
 	public static void main(final String[] args) {
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/DocServerTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/DocServerTest.java
similarity index 91%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/DocServerTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/DocServerTest.java
index 57c612c20..a9d6f8602 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/DocServerTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/DocServerTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server;
+package cn.hutool.v7.http.server;
 
-import org.dromara.hutool.http.HttpUtil;
+import cn.hutool.v7.http.HttpUtil;
 
 public class DocServerTest {
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/ExceptionServerTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/ExceptionServerTest.java
similarity index 80%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/ExceptionServerTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/ExceptionServerTest.java
index 408ea0fd6..ac2da7ccb 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/ExceptionServerTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/ExceptionServerTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server;
+package cn.hutool.v7.http.server;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.server.engine.sun.filter.DefaultExceptionFilter;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.server.engine.sun.filter.DefaultExceptionFilter;
 
 public class ExceptionServerTest {
 	public static void main(final String[] args) {
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/Issue3343Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/Issue3343Test.java
similarity index 77%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/Issue3343Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/Issue3343Test.java
index 098fdccc0..8c11987fd 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/Issue3343Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/Issue3343Test.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server;
+package cn.hutool.v7.http.server;
 
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.map.multi.ListValueMap;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.server.engine.sun.SimpleServer;
-import org.dromara.hutool.http.server.handler.ServerRequest;
-import org.dromara.hutool.http.server.handler.ServerResponse;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.map.multi.ListValueMap;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.server.engine.sun.SimpleServer;
+import cn.hutool.v7.http.server.handler.ServerRequest;
+import cn.hutool.v7.http.server.handler.ServerResponse;
 
 /**
  * http://localhost:8888/?name=hutool
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/Issue3723Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/Issue3723Test.java
similarity index 82%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/Issue3723Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/Issue3723Test.java
index f1a0db4ac..858883455 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/Issue3723Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/Issue3723Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server;
+package cn.hutool.v7.http.server;
 
-import org.dromara.hutool.core.data.id.IdUtil;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.meta.ContentType;
-import org.dromara.hutool.http.server.engine.sun.SimpleServer;
+import cn.hutool.v7.core.data.id.IdUtil;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.meta.ContentType;
+import cn.hutool.v7.http.server.engine.sun.SimpleServer;
 
 public class Issue3723Test {
 	public static void main(final String[] args) {
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/IssueI6Q30XTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/IssueI6Q30XTest.java
similarity index 77%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/IssueI6Q30XTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/IssueI6Q30XTest.java
index 46fe0329d..68e519fee 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/IssueI6Q30XTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/IssueI6Q30XTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server;
+package cn.hutool.v7.http.server;
 
-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.http.HttpUtil;
-import org.dromara.hutool.http.multipart.MultipartFormData;
-import org.dromara.hutool.http.server.engine.sun.SimpleServer;
-import org.dromara.hutool.http.server.engine.sun.SunServerRequest;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.date.StopWatch;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.multipart.MultipartFormData;
+import cn.hutool.v7.http.server.engine.sun.SimpleServer;
+import cn.hutool.v7.http.server.engine.sun.SunServerRequest;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/RedirectServerTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/RedirectServerTest.java
similarity index 88%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/RedirectServerTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/RedirectServerTest.java
index adff58aef..6c6c2eeee 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/RedirectServerTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/RedirectServerTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server;
+package cn.hutool.v7.http.server;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.http.HttpUtil;
-import org.dromara.hutool.http.meta.HeaderName;
-import org.dromara.hutool.http.meta.HttpStatus;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.meta.HttpStatus;
 
 public class RedirectServerTest {
 	public static void main(final String[] args) {
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/SimpleServerTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/SimpleServerTest.java
similarity index 86%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/SimpleServerTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/SimpleServerTest.java
index 36fd5666e..ce607a5b8 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/SimpleServerTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/SimpleServerTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server;
+package cn.hutool.v7.http.server;
 
-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.http.HttpUtil;
-import org.dromara.hutool.http.meta.ContentType;
-import org.dromara.hutool.http.meta.HeaderName;
-import org.dromara.hutool.http.multipart.UploadFile;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.http.HttpUtil;
+import cn.hutool.v7.http.meta.ContentType;
+import cn.hutool.v7.http.meta.HeaderName;
+import cn.hutool.v7.http.multipart.UploadFile;
+import cn.hutool.v7.json.JSONUtil;
 
 import java.net.HttpCookie;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/engine/JettyTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/engine/JettyTest.java
similarity index 81%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/engine/JettyTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/engine/JettyTest.java
index 199407d93..9950d048f 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/engine/JettyTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/engine/JettyTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine;
+package cn.hutool.v7.http.server.engine;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.net.ssl.SSLContextUtil;
-import org.dromara.hutool.crypto.KeyStoreUtil;
-import org.dromara.hutool.http.server.ServerConfig;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.net.ssl.SSLContextUtil;
+import cn.hutool.v7.crypto.KeyStoreUtil;
+import cn.hutool.v7.http.server.ServerConfig;
 
 import javax.net.ssl.SSLContext;
 import java.security.KeyStore;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/engine/SmartHttpServerTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/engine/SmartHttpServerTest.java
similarity index 81%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/engine/SmartHttpServerTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/engine/SmartHttpServerTest.java
index 02ea6aef7..70fe97168 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/engine/SmartHttpServerTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/engine/SmartHttpServerTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine;
+package cn.hutool.v7.http.server.engine;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.net.ssl.SSLContextUtil;
-import org.dromara.hutool.crypto.KeyStoreUtil;
-import org.dromara.hutool.http.server.ServerConfig;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.net.ssl.SSLContextUtil;
+import cn.hutool.v7.crypto.KeyStoreUtil;
+import cn.hutool.v7.http.server.ServerConfig;
 
 import javax.net.ssl.SSLContext;
 import java.security.KeyStore;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/engine/SunServerTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/engine/SunServerTest.java
similarity index 81%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/engine/SunServerTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/engine/SunServerTest.java
index b4f25cf2c..07cbddda7 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/engine/SunServerTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/engine/SunServerTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine;
+package cn.hutool.v7.http.server.engine;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.net.ssl.SSLContextUtil;
-import org.dromara.hutool.crypto.KeyStoreUtil;
-import org.dromara.hutool.http.server.ServerConfig;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.net.ssl.SSLContextUtil;
+import cn.hutool.v7.crypto.KeyStoreUtil;
+import cn.hutool.v7.http.server.ServerConfig;
 
 import javax.net.ssl.SSLContext;
 import java.security.KeyStore;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/engine/TomcatTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/engine/TomcatTest.java
similarity index 81%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/engine/TomcatTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/engine/TomcatTest.java
index d97c9835c..4266eabe9 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/engine/TomcatTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/engine/TomcatTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine;
+package cn.hutool.v7.http.server.engine;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.net.ssl.SSLContextUtil;
-import org.dromara.hutool.crypto.KeyStoreUtil;
-import org.dromara.hutool.http.server.ServerConfig;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.net.ssl.SSLContextUtil;
+import cn.hutool.v7.crypto.KeyStoreUtil;
+import cn.hutool.v7.http.server.ServerConfig;
 
 import javax.net.ssl.SSLContext;
 import java.security.KeyStore;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/engine/UndertowTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/engine/UndertowTest.java
similarity index 80%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/engine/UndertowTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/engine/UndertowTest.java
index 93bc47d96..6365711f2 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/engine/UndertowTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/engine/UndertowTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.engine;
+package cn.hutool.v7.http.server.engine;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.net.ssl.SSLContextUtil;
-import org.dromara.hutool.crypto.KeyStoreUtil;
-import org.dromara.hutool.http.server.ServerConfig;
-import org.dromara.hutool.http.server.handler.RouteHttpHandler;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.net.ssl.SSLContextUtil;
+import cn.hutool.v7.crypto.KeyStoreUtil;
+import cn.hutool.v7.http.server.ServerConfig;
+import cn.hutool.v7.http.server.handler.RouteHttpHandler;
 
 import javax.net.ssl.SSLContext;
 import java.security.KeyStore;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/handler/PathTrieTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/handler/PathTrieTest.java
similarity index 94%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/handler/PathTrieTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/handler/PathTrieTest.java
index 297a258e8..07e947b4d 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/handler/PathTrieTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/handler/PathTrieTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.handler;
+package cn.hutool.v7.http.server.handler;
 
-import org.dromara.hutool.core.lang.Console;
+import cn.hutool.v7.core.lang.Console;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/servlet/ServletUtilTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/server/servlet/ServletUtilTest.java
similarity index 96%
rename from hutool-http/src/test/java/org/dromara/hutool/http/server/servlet/ServletUtilTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/server/servlet/ServletUtilTest.java
index 1667ee91d..a74ea2335 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/server/servlet/ServletUtilTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/server/servlet/ServletUtilTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.server.servlet;
+package cn.hutool.v7.http.server.servlet;
 
 import jakarta.servlet.http.HttpServletResponse;
-import org.dromara.hutool.core.util.ByteUtil;
+import cn.hutool.v7.core.util.ByteUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/useragent/Issue3813Test.java b/hutool-http/src/test/java/cn/hutool/v7/http/useragent/Issue3813Test.java
similarity index 96%
rename from hutool-http/src/test/java/org/dromara/hutool/http/useragent/Issue3813Test.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/useragent/Issue3813Test.java
index da8e32976..01d0b8967 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/useragent/Issue3813Test.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/useragent/Issue3813Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/useragent/IssueI8X5XQTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/useragent/IssueI8X5XQTest.java
similarity index 97%
rename from hutool-http/src/test/java/org/dromara/hutool/http/useragent/IssueI8X5XQTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/useragent/IssueI8X5XQTest.java
index 6be4cc8fa..04011bdc4 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/useragent/IssueI8X5XQTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/useragent/IssueI8X5XQTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/useragent/IssueIB3SJFTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/useragent/IssueIB3SJFTest.java
similarity index 96%
rename from hutool-http/src/test/java/org/dromara/hutool/http/useragent/IssueIB3SJFTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/useragent/IssueIB3SJFTest.java
index b1f43e2fa..b821e65d3 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/useragent/IssueIB3SJFTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/useragent/IssueIB3SJFTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/useragent/UserAgentUtilTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/useragent/UserAgentUtilTest.java
similarity index 99%
rename from hutool-http/src/test/java/org/dromara/hutool/http/useragent/UserAgentUtilTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/useragent/UserAgentUtilTest.java
index bffeb5654..00d553f11 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/useragent/UserAgentUtilTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/useragent/UserAgentUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.useragent;
+package cn.hutool.v7.http.useragent;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/webservice/SoapClientTest.java b/hutool-http/src/test/java/cn/hutool/v7/http/webservice/SoapClientTest.java
similarity index 91%
rename from hutool-http/src/test/java/org/dromara/hutool/http/webservice/SoapClientTest.java
rename to hutool-http/src/test/java/cn/hutool/v7/http/webservice/SoapClientTest.java
index 4002ef8cb..ea2d2972b 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/webservice/SoapClientTest.java
+++ b/hutool-http/src/test/java/cn/hutool/v7/http/webservice/SoapClientTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.http.webservice;
+package cn.hutool.v7.http.webservice;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.util.CharsetUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-jmh/pom.xml b/hutool-jmh/pom.xml
index f5029a486..fce080b3a 100644
--- a/hutool-jmh/pom.xml
+++ b/hutool-jmh/pom.xml
@@ -23,9 +23,9 @@
 	jar
 
 	
-		org.dromara.hutool
+		cn.hutool.v7
 		hutool-parent
-		6.0.0-M18
+		7.0.0.M1
 	
 
 	hutool-jmh
@@ -33,7 +33,7 @@
 	Hutool 性能测试
 
 	
-		org.dromara.hutool.jmh
+		cn.hutool.v7.jmh
 		
 		true
 		1.37
@@ -41,7 +41,7 @@
 
 	
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-bom
 			${project.parent.version}
 			pom
diff --git a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/core/CharBufferJmh.java b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/core/CharBufferJmh.java
similarity index 94%
rename from hutool-jmh/src/test/java/org/dromara/hutool/jmh/core/CharBufferJmh.java
rename to hutool-jmh/src/test/java/cn/hutool/v7/jmh/core/CharBufferJmh.java
index 82f5ced2b..c6539628a 100644
--- a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/core/CharBufferJmh.java
+++ b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/core/CharBufferJmh.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.jmh.core;
+package cn.hutool.v7.jmh.core;
 
-import org.dromara.hutool.core.io.buffer.FastCharBuffer;
+import cn.hutool.v7.core.io.buffer.FastCharBuffer;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.concurrent.TimeUnit;
diff --git a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/core/package-info.java b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/core/package-info.java
similarity index 94%
rename from hutool-jmh/src/test/java/org/dromara/hutool/jmh/core/package-info.java
rename to hutool-jmh/src/test/java/cn/hutool/v7/jmh/core/package-info.java
index 55570bb40..cfd61ce78 100644
--- a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/core/package-info.java
+++ b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/core/package-info.java
@@ -17,4 +17,4 @@
 /**
  * 核心包性能测试
  */
-package org.dromara.hutool.jmh.core;
+package cn.hutool.v7.jmh.core;
diff --git a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/BeanToJsonStrJmh.java b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/BeanToJsonStrJmh.java
similarity index 94%
rename from hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/BeanToJsonStrJmh.java
rename to hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/BeanToJsonStrJmh.java
index aaeeea5a4..74565d6e7 100644
--- a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/BeanToJsonStrJmh.java
+++ b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/BeanToJsonStrJmh.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.jmh.json;
+package cn.hutool.v7.jmh.json;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.dromara.hutool.json.engine.JSONEngine;
-import org.dromara.hutool.json.engine.JSONEngineFactory;
+import cn.hutool.v7.json.engine.JSONEngine;
+import cn.hutool.v7.json.engine.JSONEngineFactory;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.Date;
diff --git a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/FromJsonStringStrJmh.java b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/FromJsonStringStrJmh.java
similarity index 90%
rename from hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/FromJsonStringStrJmh.java
rename to hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/FromJsonStringStrJmh.java
index 538df32f5..d96a394f0 100644
--- a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/FromJsonStringStrJmh.java
+++ b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/FromJsonStringStrJmh.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.jmh.json;
+package cn.hutool.v7.jmh.json;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.gson.JsonElement;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONUtil;
-import org.dromara.hutool.json.engine.JSONEngine;
-import org.dromara.hutool.json.engine.JSONEngineFactory;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONUtil;
+import cn.hutool.v7.json.engine.JSONEngine;
+import cn.hutool.v7.json.engine.JSONEngineFactory;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.concurrent.TimeUnit;
diff --git a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/JSONJmhData.java b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/JSONJmhData.java
similarity index 97%
rename from hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/JSONJmhData.java
rename to hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/JSONJmhData.java
index e29882fd8..e4f062157 100644
--- a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/JSONJmhData.java
+++ b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/JSONJmhData.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.jmh.json;
+package cn.hutool.v7.jmh.json;
 
 import lombok.Data;
 
diff --git a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/JsonAddJmh.java b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/JsonAddJmh.java
similarity index 93%
rename from hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/JsonAddJmh.java
rename to hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/JsonAddJmh.java
index d943e2a34..217d1f1e4 100644
--- a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/JsonAddJmh.java
+++ b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/JsonAddJmh.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.jmh.json;
+package cn.hutool.v7.jmh.json;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.google.gson.JsonArray;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.json.JSONArray;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.json.JSONArray;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.ArrayList;
diff --git a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/JsonPutJmh.java b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/JsonPutJmh.java
similarity index 94%
rename from hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/JsonPutJmh.java
rename to hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/JsonPutJmh.java
index bc095f287..5648f7018 100644
--- a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/JsonPutJmh.java
+++ b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/JsonPutJmh.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.jmh.json;
+package cn.hutool.v7.jmh.json;
 
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.gson.JsonObject;
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.json.JSONObject;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.HashMap;
diff --git a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/JsonToStringJmh.java b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/JsonToStringJmh.java
similarity index 94%
rename from hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/JsonToStringJmh.java
rename to hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/JsonToStringJmh.java
index 976ff5375..c8cf4b344 100644
--- a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/JsonToStringJmh.java
+++ b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/JsonToStringJmh.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.jmh.json;
+package cn.hutool.v7.jmh.json;
 
 import com.alibaba.fastjson2.JSON;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.openjdk.jmh.annotations.*;
 
diff --git a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/ParseTreeJmh.java b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/ParseTreeJmh.java
similarity index 94%
rename from hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/ParseTreeJmh.java
rename to hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/ParseTreeJmh.java
index 4e5ccf70f..b1416a79f 100644
--- a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/ParseTreeJmh.java
+++ b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/ParseTreeJmh.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.jmh.json;
+package cn.hutool.v7.jmh.json;
 
 import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -22,8 +22,8 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.concurrent.TimeUnit;
diff --git a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/package-info.java b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/package-info.java
similarity index 94%
rename from hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/package-info.java
rename to hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/package-info.java
index 8a60003d6..83b6f8522 100644
--- a/hutool-jmh/src/test/java/org/dromara/hutool/jmh/json/package-info.java
+++ b/hutool-jmh/src/test/java/cn/hutool/v7/jmh/json/package-info.java
@@ -17,4 +17,4 @@
 /**
  * JSON性能测试
  */
-package org.dromara.hutool.jmh.json;
+package cn.hutool.v7.jmh.json;
diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml
index 63703e5bb..318ea4449 100755
--- a/hutool-json/pom.xml
+++ b/hutool-json/pom.xml
@@ -23,9 +23,9 @@
 	jar
 
 	
-		org.dromara.hutool
+		cn.hutool.v7
 		hutool-parent
-		6.0.0-M22
+		7.0.0.M1
 	
 
 	hutool-json
@@ -33,19 +33,19 @@
 	Hutool JSON封装
 
 	
-		org.dromara.hutool.json
+		cn.hutool.v7.json
 		
 		0.12.6
 	
 
 	
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-core
 			${project.parent.version}
 		
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-crypto
 			${project.parent.version}
 			true
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSON.java b/hutool-json/src/main/java/cn/hutool/v7/json/JSON.java
similarity index 97%
rename from hutool-json/src/main/java/org/dromara/hutool/json/JSON.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/JSON.java
index 0a52437db..12aeade50 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/JSON.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/JSON.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.bean.path.BeanPath;
-import org.dromara.hutool.core.lang.mutable.MutableEntry;
-import org.dromara.hutool.json.writer.JSONWriter;
+import cn.hutool.v7.core.bean.path.BeanPath;
+import cn.hutool.v7.core.lang.mutable.MutableEntry;
+import cn.hutool.v7.json.writer.JSONWriter;
 
 import java.io.Serializable;
 import java.lang.reflect.Type;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java b/hutool-json/src/main/java/cn/hutool/v7/json/JSONArray.java
similarity index 95%
rename from hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/JSONArray.java
index 972125eee..b5e3fe821 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/JSONArray.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.collection.ListWrapper;
-import org.dromara.hutool.core.lang.Validator;
-import org.dromara.hutool.core.lang.mutable.MutableEntry;
-import org.dromara.hutool.json.serializer.impl.ArrayTypeAdapter;
-import org.dromara.hutool.json.serializer.impl.IterTypeAdapter;
-import org.dromara.hutool.json.writer.JSONWriter;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.ListWrapper;
+import cn.hutool.v7.core.lang.Validator;
+import cn.hutool.v7.core.lang.mutable.MutableEntry;
+import cn.hutool.v7.json.serializer.impl.ArrayTypeAdapter;
+import cn.hutool.v7.json.serializer.impl.IterTypeAdapter;
+import cn.hutool.v7.json.writer.JSONWriter;
 
 import java.util.*;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONConfig.java b/hutool-json/src/main/java/cn/hutool/v7/json/JSONConfig.java
similarity index 98%
rename from hutool-json/src/main/java/org/dromara/hutool/json/JSONConfig.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/JSONConfig.java
index dc85d5951..70ab1338d 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONConfig.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/JSONConfig.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.comparator.CompareUtil;
-import org.dromara.hutool.json.writer.NumberWriteMode;
+import cn.hutool.v7.core.comparator.CompareUtil;
+import cn.hutool.v7.json.writer.NumberWriteMode;
 
 import java.io.Serializable;
 import java.util.Comparator;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java b/hutool-json/src/main/java/cn/hutool/v7/json/JSONException.java
similarity index 95%
rename from hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/JSONException.java
index 57229e128..fc0a755a6 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/JSONException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * JSON异常
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONFactory.java b/hutool-json/src/main/java/cn/hutool/v7/json/JSONFactory.java
similarity index 91%
rename from hutool-json/src/main/java/org/dromara/hutool/json/JSONFactory.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/JSONFactory.java
index d16e67477..3cfae4f6c 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONFactory.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/JSONFactory.java
@@ -14,21 +14,22 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.bean.path.BeanPath;
-import org.dromara.hutool.core.lang.loader.LazyFunLoader;
-import org.dromara.hutool.core.lang.loader.Loader;
-import org.dromara.hutool.core.lang.mutable.MutableEntry;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.reader.JSONParser;
-import org.dromara.hutool.json.reader.JSONTokener;
-import org.dromara.hutool.json.serializer.JSONMapper;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
-import org.dromara.hutool.json.serializer.TypeAdapter;
-import org.dromara.hutool.json.support.JSONNodeBeanFactory;
-import org.dromara.hutool.json.writer.JSONWriter;
+import cn.hutool.v7.core.bean.path.BeanPath;
+import cn.hutool.v7.core.lang.loader.LazyFunLoader;
+import cn.hutool.v7.core.lang.loader.Loader;
+import cn.hutool.v7.core.lang.mutable.MutableEntry;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.reader.JSONParser;
+import cn.hutool.v7.json.reader.JSONTokener;
+import cn.hutool.v7.json.serializer.JSONMapper;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.json.serializer.TypeAdapter;
+import cn.hutool.v7.json.support.JSONNodeBeanFactory;
+import cn.hutool.v7.json.writer.JSONWriter;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;
@@ -336,7 +337,7 @@ public class JSONFactory {
 	 * 将JSON转换为指定类型的Bean对象
 	 *
 	 * @param json JSON
-	 * @param type Bean类型，泛型对象使用{@link org.dromara.hutool.core.reflect.TypeReference}
+	 * @param type Bean类型，泛型对象使用{@link TypeReference}
 	 * @param   泛型类型
 	 * @return Bean对象
 	 */
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java b/hutool-json/src/main/java/cn/hutool/v7/json/JSONGetter.java
similarity index 95%
rename from hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/JSONGetter.java
index dcd9d94d4..2b7627095 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/JSONGetter.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.lang.getter.TypeGetter;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.support.InternalJSONUtil;
+import cn.hutool.v7.core.lang.getter.TypeGetter;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.support.InternalJSONUtil;
 
 import java.lang.reflect.Type;
 import java.util.List;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java b/hutool-json/src/main/java/cn/hutool/v7/json/JSONObject.java
similarity index 94%
rename from hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/JSONObject.java
index 71a4c1b6f..9fc5f39b2 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/JSONObject.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.func.LambdaInfo;
-import org.dromara.hutool.core.func.LambdaUtil;
-import org.dromara.hutool.core.func.SerFunction;
-import org.dromara.hutool.core.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.reflect.TypeUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.support.InternalJSONUtil;
-import org.dromara.hutool.json.writer.JSONWriter;
+import cn.hutool.v7.core.func.LambdaInfo;
+import cn.hutool.v7.core.func.LambdaUtil;
+import cn.hutool.v7.core.func.SerFunction;
+import cn.hutool.v7.core.func.SerSupplier;
+import cn.hutool.v7.core.lang.mutable.MutableEntry;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.map.MapWrapper;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.support.InternalJSONUtil;
+import cn.hutool.v7.json.writer.JSONWriter;
 
 import java.util.Arrays;
 import java.util.Map;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONPrimitive.java b/hutool-json/src/main/java/cn/hutool/v7/json/JSONPrimitive.java
similarity index 95%
rename from hutool-json/src/main/java/org/dromara/hutool/json/JSONPrimitive.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/JSONPrimitive.java
index 8979aae8a..77f371db0 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONPrimitive.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/JSONPrimitive.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.wrapper.Wrapper;
-import org.dromara.hutool.core.reflect.ClassUtil;
-import org.dromara.hutool.json.writer.JSONWriter;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.wrapper.Wrapper;
+import cn.hutool.v7.core.reflect.ClassUtil;
+import cn.hutool.v7.json.writer.JSONWriter;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java b/hutool-json/src/main/java/cn/hutool/v7/json/JSONUtil.java
similarity index 96%
rename from hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/JSONUtil.java
index 2718c313e..e9c60d8b4 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/JSONUtil.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.mutable.MutableEntry;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
-import org.dromara.hutool.json.serializer.TypeAdapter;
-import org.dromara.hutool.json.serializer.TypeAdapterManager;
-import org.dromara.hutool.json.support.JSONStrFormatter;
-import org.dromara.hutool.json.xml.JSONXMLUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.mutable.MutableEntry;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.json.serializer.TypeAdapter;
+import cn.hutool.v7.json.serializer.TypeAdapterManager;
+import cn.hutool.v7.json.support.JSONStrFormatter;
+import cn.hutool.v7.json.xml.JSONXMLUtil;
 
 import java.io.File;
 import java.lang.reflect.Type;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/AbstractJSONEngine.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/AbstractJSONEngine.java
similarity index 97%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/AbstractJSONEngine.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/AbstractJSONEngine.java
index d4237763e..220c3649b 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/AbstractJSONEngine.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/AbstractJSONEngine.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
 /**
  * JSONEngine抽象类，用于保存配置和定义初始化，并提供：
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/HutoolJSONEngine.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/HutoolJSONEngine.java
similarity index 89%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/HutoolJSONEngine.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/HutoolJSONEngine.java
index b25c15a92..7b8130bc9 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/HutoolJSONEngine.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/HutoolJSONEngine.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
-import org.dromara.hutool.core.io.stream.UTF8OutputStreamWriter;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONFactory;
+import cn.hutool.v7.core.io.stream.UTF8OutputStreamWriter;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONFactory;
 
 import java.io.OutputStream;
 import java.io.Reader;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngine.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngine.java
similarity index 94%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngine.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngine.java
index 54da28677..c297884f4 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngine.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
-import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream;
+import cn.hutool.v7.core.util.CharsetUtil;
 
 import java.io.*;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngineConfig.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngineConfig.java
similarity index 98%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngineConfig.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngineConfig.java
index bb2e21037..47cb5ea41 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngineConfig.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngineConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
 import java.io.Serializable;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngineFactory.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngineFactory.java
similarity index 91%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngineFactory.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngineFactory.java
index 2e057b40e..8fb030d7f 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/JSONEngineFactory.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngineFactory.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
-import org.dromara.hutool.core.lang.Singleton;
-import org.dromara.hutool.core.spi.ServiceLoader;
-import org.dromara.hutool.core.spi.SpiUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.json.JSONException;
+import cn.hutool.v7.core.lang.Singleton;
+import cn.hutool.v7.core.spi.ServiceLoader;
+import cn.hutool.v7.core.spi.SpiUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.json.JSONException;
 
 /**
  * JSON引擎工厂
      
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/fastjson/FastJSON2Engine.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/fastjson/FastJSON2Engine.java
similarity index 91%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/fastjson/FastJSON2Engine.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/fastjson/FastJSON2Engine.java
index 6224e331e..703268359 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/fastjson/FastJSON2Engine.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/fastjson/FastJSON2Engine.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.fastjson;
+package cn.hutool.v7.json.engine.fastjson;
 
 import com.alibaba.fastjson2.JSONFactory;
 import com.alibaba.fastjson2.JSONReader;
 import com.alibaba.fastjson2.JSONWriter;
 import com.alibaba.fastjson2.reader.ObjectReader;
 import com.alibaba.fastjson2.writer.ObjectWriter;
-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.lang.Assert;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.engine.AbstractJSONEngine;
-import org.dromara.hutool.json.engine.JSONEngineConfig;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.engine.AbstractJSONEngine;
+import cn.hutool.v7.json.engine.JSONEngineConfig;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/fastjson/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/fastjson/package-info.java
similarity index 93%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/fastjson/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/fastjson/package-info.java
index 0e5437210..534d98b96 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/fastjson/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/fastjson/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.json.engine.fastjson;
+package cn.hutool.v7.json.engine.fastjson;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/DateGsonTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/DateGsonTypeAdapter.java
similarity index 93%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/DateGsonTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/DateGsonTypeAdapter.java
index 9f63052b9..327a86ab6 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/DateGsonTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/DateGsonTypeAdapter.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.gson;
+package cn.hutool.v7.json.engine.gson;
 
 import com.google.gson.*;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.lang.reflect.Type;
 import java.util.Date;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/GsonEngine.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/GsonEngine.java
similarity index 89%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/GsonEngine.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/GsonEngine.java
index 8c76af320..2f31f9e6d 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/GsonEngine.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/GsonEngine.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.gson;
+package cn.hutool.v7.json.engine.gson;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.dromara.hutool.core.io.stream.UTF8OutputStreamWriter;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.wrapper.Wrapper;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.JSONException;
-import org.dromara.hutool.json.engine.AbstractJSONEngine;
-import org.dromara.hutool.json.engine.JSONEngineConfig;
+import cn.hutool.v7.core.io.stream.UTF8OutputStreamWriter;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.wrapper.Wrapper;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSONException;
+import cn.hutool.v7.json.engine.AbstractJSONEngine;
+import cn.hutool.v7.json.engine.JSONEngineConfig;
 
 import java.io.OutputStream;
 import java.io.Reader;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/GsonTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/GsonTypeAdapter.java
similarity index 95%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/GsonTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/GsonTypeAdapter.java
index 9de34d3f1..b511a8dbb 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/GsonTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/GsonTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.gson;
+package cn.hutool.v7.json.engine.gson;
 
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonSerializer;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/TemporalGsonTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/TemporalGsonTypeAdapter.java
similarity index 90%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/TemporalGsonTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/TemporalGsonTypeAdapter.java
index 45ce49312..840b293ac 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/TemporalGsonTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/TemporalGsonTypeAdapter.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.gson;
+package cn.hutool.v7.json.engine.gson;
 
 import com.google.gson.*;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.date.TimeUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.date.TimeUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.lang.reflect.Type;
 import java.time.temporal.TemporalAccessor;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/TimeZoneGsonTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/TimeZoneGsonTypeAdapter.java
similarity index 96%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/TimeZoneGsonTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/TimeZoneGsonTypeAdapter.java
index aae918b4f..8e3a07819 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/TimeZoneGsonTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/TimeZoneGsonTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.gson;
+package cn.hutool.v7.json.engine.gson;
 
 import com.google.gson.*;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/package-info.java
similarity index 94%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/package-info.java
index 4dec7767e..493874ab1 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/gson/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/gson/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.json.engine.gson;
+package cn.hutool.v7.json.engine.gson;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/HutoolJSONSerializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/HutoolJSONSerializer.java
similarity index 87%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/HutoolJSONSerializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/HutoolJSONSerializer.java
index 45e0b9198..21c1a02ad 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/HutoolJSONSerializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/HutoolJSONSerializer.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.jackson;
+package cn.hutool.v7.json.engine.jackson;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONPrimitive;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONPrimitive;
 
 import java.io.IOException;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/HutoolModule.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/HutoolModule.java
similarity index 95%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/HutoolModule.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/HutoolModule.java
index c8b6a5e98..48863dca2 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/HutoolModule.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/HutoolModule.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.jackson;
+package cn.hutool.v7.json.engine.jackson;
 
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/JacksonEngine.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonEngine.java
similarity index 89%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/JacksonEngine.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonEngine.java
index c561f098d..d2795a8ee 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/JacksonEngine.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonEngine.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.jackson;
+package cn.hutool.v7.json.engine.jackson;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonParser;
@@ -23,16 +23,16 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.wrapper.Wrapper;
-import org.dromara.hutool.core.reflect.ConstructorUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.JSONException;
-import org.dromara.hutool.json.engine.AbstractJSONEngine;
-import org.dromara.hutool.json.engine.JSONEngineConfig;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.wrapper.Wrapper;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSONException;
+import cn.hutool.v7.json.engine.AbstractJSONEngine;
+import cn.hutool.v7.json.engine.JSONEngineConfig;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/JacksonTemporalDeserializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonTemporalDeserializer.java
similarity index 90%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/JacksonTemporalDeserializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonTemporalDeserializer.java
index 2d8993484..d48924ab1 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/JacksonTemporalDeserializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonTemporalDeserializer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.jackson;
+package cn.hutool.v7.json.engine.jackson;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.date.TimeUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.date.TimeUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.io.IOException;
 import java.time.temporal.TemporalAccessor;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/JacksonTemporalSerializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonTemporalSerializer.java
similarity index 92%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/JacksonTemporalSerializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonTemporalSerializer.java
index 99ee6b197..92bcfb7da 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/JacksonTemporalSerializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonTemporalSerializer.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.jackson;
+package cn.hutool.v7.json.engine.jackson;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import org.dromara.hutool.core.date.TimeUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.date.TimeUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.io.IOException;
 import java.time.temporal.TemporalAccessor;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/package-info.java
similarity index 93%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/package-info.java
index 6e9bac9bc..1e2cd5358 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/jackson/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.json.engine.jackson;
+package cn.hutool.v7.json.engine.jackson;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/DateMoshiAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/DateMoshiAdapter.java
similarity index 91%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/DateMoshiAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/DateMoshiAdapter.java
index 5c655584e..869e61276 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/DateMoshiAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/DateMoshiAdapter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.moshi;
+package cn.hutool.v7.json.engine.moshi;
 
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.JsonReader;
 import com.squareup.moshi.JsonWriter;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.io.IOException;
 import java.util.Date;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/MoshiEngine.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/MoshiEngine.java
similarity index 89%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/MoshiEngine.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/MoshiEngine.java
index dd5b05c69..f6928689c 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/MoshiEngine.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/MoshiEngine.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.moshi;
+package cn.hutool.v7.json.engine.moshi;
 
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
 import okio.BufferedSink;
 import okio.BufferedSource;
 import okio.Okio;
-import org.dromara.hutool.core.io.stream.ReaderInputStream;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.wrapper.Wrapper;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.JSONException;
-import org.dromara.hutool.json.engine.AbstractJSONEngine;
-import org.dromara.hutool.json.engine.JSONEngineConfig;
+import cn.hutool.v7.core.io.stream.ReaderInputStream;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.wrapper.Wrapper;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSONException;
+import cn.hutool.v7.json.engine.AbstractJSONEngine;
+import cn.hutool.v7.json.engine.JSONEngineConfig;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/TemporalMoshiAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/TemporalMoshiAdapter.java
similarity index 91%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/TemporalMoshiAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/TemporalMoshiAdapter.java
index 7ceb65785..18b2b138a 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/TemporalMoshiAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/TemporalMoshiAdapter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.moshi;
+package cn.hutool.v7.json.engine.moshi;
 
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.JsonReader;
 import com.squareup.moshi.JsonWriter;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.date.TimeUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.date.TimeUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.io.IOException;
 import java.time.temporal.TemporalAccessor;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/TimeZoneMoshiAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/TimeZoneMoshiAdapter.java
similarity index 95%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/TimeZoneMoshiAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/TimeZoneMoshiAdapter.java
index 13aee06f4..95f0d141c 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/TimeZoneMoshiAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/TimeZoneMoshiAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine.moshi;
+package cn.hutool.v7.json.engine.moshi;
 
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.JsonReader;
 import com.squareup.moshi.JsonWriter;
 import com.squareup.moshi.Moshi;
-import org.dromara.hutool.core.reflect.TypeUtil;
+import cn.hutool.v7.core.reflect.TypeUtil;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/package-info.java
similarity index 93%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/package-info.java
index 01bf3ed77..0d16946ff 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/moshi/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/moshi/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.json.engine.moshi;
+package cn.hutool.v7.json.engine.moshi;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/engine/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/package-info.java
similarity index 85%
rename from hutool-json/src/main/java/org/dromara/hutool/json/engine/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/engine/package-info.java
index 7ad3e15fa..b1e2d7fa4 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/engine/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/package-info.java
@@ -16,10 +16,10 @@
 
 /**
  * JSON SPI 实现
      
- * 通过实现{@link org.dromara.hutool.json.engine.JSONEngine} 以使用不同的JSON库完成：
+ * 通过实现{@link cn.hutool.v7.json.engine.JSONEngine} 以使用不同的JSON库完成：
  * 
        
  *     
      • JSON序列化，即Java Bean（POJO）对象转为JSON字符串
        • 
  *     
      • JSON反序列化，即JSON字符串转为Java Bean（POJO）对象
        • 
  * 
      
  */
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/Claims.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/Claims.java
similarity index 87%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/Claims.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/Claims.java
index 10a5cb9a2..7909e9049 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/Claims.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/Claims.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
-import org.dromara.hutool.core.codec.binary.Base64;
-import org.dromara.hutool.core.date.format.DateFormatManager;
-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 cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.date.format.DateFormatManager;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWT.java
similarity index 93%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWT.java
index e4d7c1b53..73eea3a97 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWT.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
-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.exception.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 cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.exception.ValidateException;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.jwt.signers.AlgorithmUtil;
+import cn.hutool.v7.json.jwt.signers.JWTSigner;
+import cn.hutool.v7.json.jwt.signers.JWTSignerUtil;
+import cn.hutool.v7.json.jwt.signers.NoneJWTSigner;
 
 import java.lang.reflect.Type;
 import java.nio.charset.Charset;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTException.java
similarity index 95%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTException.java
index 28d98a3f1..15ba54f67 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * JWT异常
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTHeader.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTHeader.java
similarity index 98%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTHeader.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTHeader.java
index 92e1d6746..cf0ab5d88 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTHeader.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTHeader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
 import java.util.Map;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTPayload.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTPayload.java
similarity index 97%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTPayload.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTPayload.java
index e559304eb..90a148621 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTPayload.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTPayload.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
 import java.util.Map;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTUtil.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTUtil.java
similarity index 95%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTUtil.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTUtil.java
index a67db0451..08687e92b 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTUtil.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.json.jwt.signers.JWTSigner;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.json.jwt.signers.JWTSigner;
 
 import java.util.Map;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTValidator.java
similarity index 96%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTValidator.java
index a3720637f..dbcc52c3b 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTValidator.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.exception.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 cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.exception.ValidateException;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.json.jwt.signers.JWTSigner;
+import cn.hutool.v7.json.jwt.signers.NoneJWTSigner;
 
 import java.util.Date;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/RegisteredPayload.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/RegisteredPayload.java
similarity index 98%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/RegisteredPayload.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/RegisteredPayload.java
index cd8ae71e4..b9845f8b2 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/RegisteredPayload.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/RegisteredPayload.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
 import java.util.Date;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/package-info.java
similarity index 95%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/package-info.java
index b04bc178e..15ed5eb49 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/package-info.java
@@ -20,4 +20,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AlgorithmUtil.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/AlgorithmUtil.java
similarity index 92%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AlgorithmUtil.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/AlgorithmUtil.java
index acd3db502..698a111d6 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AlgorithmUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/AlgorithmUtil.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt.signers;
+package cn.hutool.v7.json.jwt.signers;
 
-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.mac.HmacAlgorithm;
+import cn.hutool.v7.core.map.BiMap;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.crypto.asymmetric.SignAlgorithm;
+import cn.hutool.v7.crypto.digest.mac.HmacAlgorithm;
 
 import java.util.HashMap;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AsymmetricJWTSigner.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/AsymmetricJWTSigner.java
similarity index 90%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AsymmetricJWTSigner.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/AsymmetricJWTSigner.java
index 776efb266..61a3607db 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/AsymmetricJWTSigner.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/AsymmetricJWTSigner.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt.signers;
+package cn.hutool.v7.json.jwt.signers;
 
-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 cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.crypto.asymmetric.Sign;
 
 import java.nio.charset.Charset;
 import java.security.Key;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/EllipticCurveJWTSigner.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/EllipticCurveJWTSigner.java
similarity index 98%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/EllipticCurveJWTSigner.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/EllipticCurveJWTSigner.java
index cbbce8e4c..068763cce 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/EllipticCurveJWTSigner.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/EllipticCurveJWTSigner.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt.signers;
+package cn.hutool.v7.json.jwt.signers;
 
-import org.dromara.hutool.json.jwt.JWTException;
+import cn.hutool.v7.json.jwt.JWTException;
 
 import java.security.Key;
 import java.security.KeyPair;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/HMacJWTSigner.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/HMacJWTSigner.java
similarity index 89%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/HMacJWTSigner.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/HMacJWTSigner.java
index fe9ee5f91..d41e13529 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/HMacJWTSigner.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/HMacJWTSigner.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt.signers;
+package cn.hutool.v7.json.jwt.signers;
 
-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.mac.HMac;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.crypto.digest.mac.HMac;
 
 import java.nio.charset.Charset;
 import java.security.Key;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSigner.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/JWTSigner.java
similarity index 97%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSigner.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/JWTSigner.java
index 30f473fd6..eb4a1f81f 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSigner.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/JWTSigner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt.signers;
+package cn.hutool.v7.json.jwt.signers;
 
 /**
  * JWT签名接口封装，通过实现此接口，完成不同算法的签名功能
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSignerUtil.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/JWTSignerUtil.java
similarity index 98%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSignerUtil.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/JWTSignerUtil.java
index 97fbe6cde..311815875 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/JWTSignerUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/JWTSignerUtil.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt.signers;
+package cn.hutool.v7.json.jwt.signers;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.regex.ReUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.regex.ReUtil;
 
 import java.security.Key;
 import java.security.KeyPair;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/NoneJWTSigner.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/NoneJWTSigner.java
similarity index 92%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/NoneJWTSigner.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/NoneJWTSigner.java
index 6e7c19f91..1139e94ee 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/NoneJWTSigner.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/NoneJWTSigner.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt.signers;
+package cn.hutool.v7.json.jwt.signers;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * 无需签名的JWT签名器
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/package-info.java
similarity index 93%
rename from hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/package-info.java
index e78f0db95..0751e06c8 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/signers/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/signers/package-info.java
@@ -17,4 +17,4 @@
 /**
  * JWT签名封装
  */
-package org.dromara.hutool.json.jwt.signers;
+package cn.hutool.v7.json.jwt.signers;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/package-info.java
similarity index 98%
rename from hutool-json/src/main/java/org/dromara/hutool/json/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/package-info.java
index 0e9d3876e..2ed44b73d 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/package-info.java
@@ -45,4 +45,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/reader/JSONParser.java b/hutool-json/src/main/java/cn/hutool/v7/json/reader/JSONParser.java
similarity index 97%
rename from hutool-json/src/main/java/org/dromara/hutool/json/reader/JSONParser.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/reader/JSONParser.java
index f98ececb6..6258c8f17 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/reader/JSONParser.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/reader/JSONParser.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.reader;
+package cn.hutool.v7.json.reader;
 
-import org.dromara.hutool.core.lang.mutable.MutableEntry;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.json.*;
-import org.dromara.hutool.json.support.InternalJSONUtil;
+import cn.hutool.v7.core.lang.mutable.MutableEntry;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.json.*;
+import cn.hutool.v7.json.support.InternalJSONUtil;
 
 import java.util.function.Predicate;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/reader/JSONTokener.java b/hutool-json/src/main/java/cn/hutool/v7/json/reader/JSONTokener.java
similarity index 97%
rename from hutool-json/src/main/java/org/dromara/hutool/json/reader/JSONTokener.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/reader/JSONTokener.java
index a1ab1ff1f..9de355dfc 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/reader/JSONTokener.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/reader/JSONTokener.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.reader;
+package cn.hutool.v7.json.reader;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.ReaderWrapper;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.math.NumberUtil;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.json.JSONException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.ReaderWrapper;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.math.NumberUtil;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.json.JSONException;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/reader/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/reader/package-info.java
similarity index 89%
rename from hutool-json/src/main/java/org/dromara/hutool/json/reader/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/reader/package-info.java
index fc34b5e72..a82a9c3c8 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/reader/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/reader/package-info.java
@@ -15,8 +15,8 @@
  */
 
 /**
- * JSON读取和解析，主要解析字符串、流等JSON字符串为{@link org.dromara.hutool.json.JSON}。
+ * JSON读取和解析，主要解析字符串、流等JSON字符串为{@link cn.hutool.v7.json.JSON}。
  *
  * @author Looly
  */
-package org.dromara.hutool.json.reader;
+package cn.hutool.v7.json.reader;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONContext.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONContext.java
similarity index 96%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONContext.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONContext.java
index d4de8618d..2d429a572 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONContext.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONContext.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer;
+package cn.hutool.v7.json.serializer;
 
-import org.dromara.hutool.json.*;
+import cn.hutool.v7.json.*;
 
 /**
  * JSON序列化上下文，用于获取当前JSON对象，以便在序列化过程中获取配置信息
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONDeserializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONDeserializer.java
similarity index 94%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONDeserializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONDeserializer.java
index 1a5315d9b..a41e32f0a 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONDeserializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONDeserializer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer;
+package cn.hutool.v7.json.serializer;
 
-import org.dromara.hutool.json.JSON;
+import cn.hutool.v7.json.JSON;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONMapper.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONMapper.java
similarity index 95%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONMapper.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONMapper.java
index 67a0d9bef..30991f683 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONMapper.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONMapper.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer;
+package cn.hutool.v7.json.serializer;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.Opt;
-import org.dromara.hutool.core.lang.loader.LazyFunLoader;
-import org.dromara.hutool.core.lang.loader.Loader;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.*;
-import org.dromara.hutool.json.serializer.impl.CharSequenceTypeAdapter;
-import org.dromara.hutool.json.serializer.impl.DefaultDeserializer;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.Opt;
+import cn.hutool.v7.core.lang.loader.LazyFunLoader;
+import cn.hutool.v7.core.lang.loader.Loader;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.*;
+import cn.hutool.v7.json.serializer.impl.CharSequenceTypeAdapter;
+import cn.hutool.v7.json.serializer.impl.DefaultDeserializer;
 
 import java.io.Serializable;
 import java.lang.reflect.Type;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONSerializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONSerializer.java
similarity index 80%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONSerializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONSerializer.java
index 1449ff655..149ba9ab9 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/JSONSerializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/JSONSerializer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer;
+package cn.hutool.v7.json.serializer;
 
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONObject;
 
 /**
  * 序列化接口，通过实现此接口，实现自定义的对象转换为JSON的操作
      
@@ -32,8 +32,8 @@ public interface JSONSerializer extends TypeAdapter{
 	/**
 	 * 序列化实现，通过实现此方法，将指定类型的对象转换为{@link JSON}对象,可以：
 	 * 
        
-	 *     
      • 如果为原始类型，可以转为{@link org.dromara.hutool.json.JSONPrimitive}
        • 
-	 *     
      • 如果是集合或数组类，可以转为{@link org.dromara.hutool.json.JSONArray}
        • 
+	 *     
      • 如果为原始类型，可以转为{@link cn.hutool.v7.json.JSONPrimitive}
        • 
+	 *     
      • 如果是集合或数组类，可以转为{@link cn.hutool.v7.json.JSONArray}
        • 
 	 *     
      • 如果是Bean或键值对类型，可以转为{@link JSONObject}
        • 
 	 * 
      
 	 *
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/MatcherJSONDeserializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/MatcherJSONDeserializer.java
similarity index 93%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/MatcherJSONDeserializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/MatcherJSONDeserializer.java
index 986fab3ce..8d8c98af5 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/MatcherJSONDeserializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/MatcherJSONDeserializer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer;
+package cn.hutool.v7.json.serializer;
 
-import org.dromara.hutool.json.JSON;
+import cn.hutool.v7.json.JSON;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/MatcherJSONSerializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/MatcherJSONSerializer.java
similarity index 96%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/MatcherJSONSerializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/MatcherJSONSerializer.java
index 2fa4cc2e9..f74eac142 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/MatcherJSONSerializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/MatcherJSONSerializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer;
+package cn.hutool.v7.json.serializer;
 
 /**
  * 匹配JSON序列化器，用于判断是否匹配，匹配则执行序列化
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/SimpleJSONContext.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/SimpleJSONContext.java
similarity index 90%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/SimpleJSONContext.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/SimpleJSONContext.java
index 2989ef326..4898476ca 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/SimpleJSONContext.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/SimpleJSONContext.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer;
+package cn.hutool.v7.json.serializer;
 
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONFactory;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONFactory;
 
 /**
  * 简单的JSON上下文，用于在JSON序列化时提供配置项
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/TypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/TypeAdapter.java
similarity index 94%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/TypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/TypeAdapter.java
index 4d7f88dea..81b4fcfd7 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/TypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/TypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer;
+package cn.hutool.v7.json.serializer;
 
 /**
  * JSON类型适配器，实现此接口即同时实现对象的序列化和反序列化
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/TypeAdapterManager.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/TypeAdapterManager.java
similarity index 94%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/TypeAdapterManager.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/TypeAdapterManager.java
index 8ba635ea9..12a4ccfa2 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/TypeAdapterManager.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/TypeAdapterManager.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer;
+package cn.hutool.v7.json.serializer;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.loader.LazyFunLoader;
-import org.dromara.hutool.core.lang.loader.Loader;
-import org.dromara.hutool.core.lang.tuple.Pair;
-import org.dromara.hutool.core.lang.tuple.Triple;
-import org.dromara.hutool.core.lang.tuple.Tuple;
-import org.dromara.hutool.core.reflect.ConstructorUtil;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONException;
-import org.dromara.hutool.json.serializer.impl.*;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.loader.LazyFunLoader;
+import cn.hutool.v7.core.lang.loader.Loader;
+import cn.hutool.v7.core.lang.tuple.Pair;
+import cn.hutool.v7.core.lang.tuple.Triple;
+import cn.hutool.v7.core.lang.tuple.Tuple;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONException;
+import cn.hutool.v7.json.serializer.impl.*;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ArrayTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ArrayTypeAdapter.java
similarity index 86%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ArrayTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ArrayTypeAdapter.java
index 172a02d1c..51f633a2b 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ArrayTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ArrayTypeAdapter.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.collection.iter.ArrayIter;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.reader.JSONTokener;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.collection.iter.ArrayIter;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.reader.JSONTokener;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/BeanTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/BeanTypeAdapter.java
similarity index 74%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/BeanTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/BeanTypeAdapter.java
index 9bccc4c7b..e0454ff4e 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/BeanTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/BeanTypeAdapter.java
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.bean.BeanDesc;
-import org.dromara.hutool.core.bean.BeanUtil;
-import org.dromara.hutool.core.bean.copier.ValueProviderToBeanCopier;
-import org.dromara.hutool.core.lang.copier.Copier;
-import org.dromara.hutool.core.reflect.ConstructorUtil;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.support.InternalJSONUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
-import org.dromara.hutool.json.support.BeanToJSONCopier;
-import org.dromara.hutool.json.support.JSONObjectValueProvider;
+import cn.hutool.v7.core.bean.BeanDesc;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.bean.copier.ValueProviderToBeanCopier;
+import cn.hutool.v7.core.lang.copier.Copier;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.support.InternalJSONUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.json.support.BeanToJSONCopier;
+import cn.hutool.v7.json.support.JSONObjectValueProvider;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/CalendarTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/CalendarTypeAdapter.java
similarity index 77%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/CalendarTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/CalendarTypeAdapter.java
index 43fd94940..9c235f982 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/CalendarTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/CalendarTypeAdapter.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.convert.impl.CalendarConverter;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONPrimitive;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.core.convert.impl.CalendarConverter;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONPrimitive;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 import java.lang.reflect.Type;
 import java.util.Calendar;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/CharSequenceTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/CharSequenceTypeAdapter.java
similarity index 82%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/CharSequenceTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/CharSequenceTypeAdapter.java
index 9936882e3..c6a1b78f2 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/CharSequenceTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/CharSequenceTypeAdapter.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONPrimitive;
-import org.dromara.hutool.json.reader.JSONTokener;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
-import org.dromara.hutool.json.xml.JSONXMLParser;
-import org.dromara.hutool.json.xml.ParseConfig;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONPrimitive;
+import cn.hutool.v7.json.reader.JSONTokener;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.json.xml.JSONXMLParser;
+import cn.hutool.v7.json.xml.ParseConfig;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ClassTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ClassTypeAdapter.java
similarity index 83%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ClassTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ClassTypeAdapter.java
index c754e3107..bf6bfcc5e 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ClassTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ClassTypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.reflect.ClassUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.JSONDeserializer;
-import org.dromara.hutool.json.serializer.JSONSerializer;
+import cn.hutool.v7.core.reflect.ClassUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.JSONDeserializer;
+import cn.hutool.v7.json.serializer.JSONSerializer;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/DateTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/DateTypeAdapter.java
similarity index 77%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/DateTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/DateTypeAdapter.java
index 0ee29b2a2..95d573f75 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/DateTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/DateTypeAdapter.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.convert.impl.DateConverter;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.date.format.DateFormatManager;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONPrimitive;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.core.convert.impl.DateConverter;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.date.format.DateFormatManager;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONPrimitive;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 import java.lang.reflect.Type;
 import java.util.Date;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/DefaultDeserializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/DefaultDeserializer.java
similarity index 90%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/DefaultDeserializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/DefaultDeserializer.java
index ec374e5cd..18dea9ccf 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/DefaultDeserializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/DefaultDeserializer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.json.*;
-import org.dromara.hutool.json.serializer.JSONDeserializer;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.json.*;
+import cn.hutool.v7.json.serializer.JSONDeserializer;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/EntryTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/EntryTypeAdapter.java
similarity index 83%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/EntryTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/EntryTypeAdapter.java
index 0504d7d32..a098aa26c 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/EntryTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/EntryTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.convert.CompositeConverter;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.reflect.ConstructorUtil;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.core.convert.CompositeConverter;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 import java.lang.reflect.Type;
 import java.util.Map;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/EnumTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/EnumTypeAdapter.java
similarity index 78%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/EnumTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/EnumTypeAdapter.java
index 669a9b135..10cd5bca4 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/EnumTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/EnumTypeAdapter.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.core.util.EnumUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONPrimitive;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.core.util.EnumUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONPrimitive;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/IterTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/IterTypeAdapter.java
similarity index 88%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/IterTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/IterTypeAdapter.java
index e62561a8e..9d75a82f5 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/IterTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/IterTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.map.MapWrapper;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.map.MapWrapper;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 import java.lang.reflect.Type;
 import java.util.Collection;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/JSONPrimitiveDeserializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/JSONPrimitiveDeserializer.java
similarity index 79%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/JSONPrimitiveDeserializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/JSONPrimitiveDeserializer.java
index 8e99f75a3..6326b5faa 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/JSONPrimitiveDeserializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/JSONPrimitiveDeserializer.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONPrimitive;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONPrimitive;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/KBeanDeserializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/KBeanDeserializer.java
similarity index 78%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/KBeanDeserializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/KBeanDeserializer.java
index fd2b988d9..204764b6c 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/KBeanDeserializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/KBeanDeserializer.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.core.reflect.kotlin.KClassUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONGetter;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.support.JSONObjectValueProvider;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.core.reflect.kotlin.KClassUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONGetter;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.support.JSONObjectValueProvider;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/MapTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/MapTypeAdapter.java
similarity index 84%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/MapTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/MapTypeAdapter.java
index b133825fb..00e69e8f4 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/MapTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/MapTypeAdapter.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 import java.lang.reflect.Type;
 import java.util.Iterator;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/PairDeserializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/PairDeserializer.java
similarity index 81%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/PairDeserializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/PairDeserializer.java
index ad965dc5b..252218bee 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/PairDeserializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/PairDeserializer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.lang.tuple.Pair;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.serializer.JSONDeserializer;
+import cn.hutool.v7.core.lang.tuple.Pair;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.serializer.JSONDeserializer;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/RecordDeserializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/RecordDeserializer.java
similarity index 79%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/RecordDeserializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/RecordDeserializer.java
index 77bce4073..eb490a384 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/RecordDeserializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/RecordDeserializer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.bean.RecordUtil;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.support.JSONObjectValueProvider;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.core.bean.RecordUtil;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.support.JSONObjectValueProvider;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ResourceBundleSerializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ResourceBundleSerializer.java
similarity index 82%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ResourceBundleSerializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ResourceBundleSerializer.java
index 1f7dea2b5..246b4ffcb 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ResourceBundleSerializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ResourceBundleSerializer.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.text.split.SplitUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 import java.util.Enumeration;
 import java.util.ResourceBundle;
@@ -71,7 +71,7 @@ public class ResourceBundleSerializer implements MatcherJSONSerializer
-	 * 用于识别类似于：org.dromara.hutool.json这类用点隔开的键
      
+	 * 用于识别类似于：cn.hutool.v7.json这类用点隔开的键
      
 	 * 注意：不允许重复键
 	 *
 	 * @param jsonObject JSONObject
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ResourceSerializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ResourceSerializer.java
similarity index 78%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ResourceSerializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ResourceSerializer.java
index f2b2c6a1b..9c503d81d 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ResourceSerializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ResourceSerializer.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.io.resource.Resource;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONFactory;
-import org.dromara.hutool.json.reader.JSONParser;
-import org.dromara.hutool.json.reader.JSONTokener;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.core.io.resource.Resource;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONFactory;
+import cn.hutool.v7.json.reader.JSONParser;
+import cn.hutool.v7.json.reader.JSONTokener;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 /**
  * {@link Resource}序列化器
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TemporalTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TemporalTypeAdapter.java
similarity index 91%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TemporalTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TemporalTypeAdapter.java
index fad45dbbe..3e30211fa 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TemporalTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TemporalTypeAdapter.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.convert.impl.TemporalAccessorConverter;
-import org.dromara.hutool.core.date.TimeUtil;
-import org.dromara.hutool.core.date.format.DateFormatManager;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.Opt;
-import org.dromara.hutool.core.math.NumberUtil;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.*;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.core.convert.impl.TemporalAccessorConverter;
+import cn.hutool.v7.core.date.TimeUtil;
+import cn.hutool.v7.core.date.format.DateFormatManager;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.Opt;
+import cn.hutool.v7.core.math.NumberUtil;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.*;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 import java.lang.reflect.Type;
 import java.time.*;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ThrowableTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ThrowableTypeAdapter.java
similarity index 77%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ThrowableTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ThrowableTypeAdapter.java
index c5d009a42..23c6753ed 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/ThrowableTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/ThrowableTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-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.util.ObjUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONPrimitive;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONPrimitive;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TimeZoneTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TimeZoneTypeAdapter.java
similarity index 80%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TimeZoneTypeAdapter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TimeZoneTypeAdapter.java
index 91f06aa59..f874e9305 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TimeZoneTypeAdapter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TimeZoneTypeAdapter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONPrimitive;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONDeserializer;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONPrimitive;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONDeserializer;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 import java.lang.reflect.Type;
 import java.util.TimeZone;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TokenerSerializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TokenerSerializer.java
similarity index 85%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TokenerSerializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TokenerSerializer.java
index d57ab29ff..11e5a11b4 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TokenerSerializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TokenerSerializer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONFactory;
-import org.dromara.hutool.json.reader.JSONParser;
-import org.dromara.hutool.json.reader.JSONTokener;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.MatcherJSONSerializer;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONFactory;
+import cn.hutool.v7.json.reader.JSONParser;
+import cn.hutool.v7.json.reader.JSONTokener;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.MatcherJSONSerializer;
 
 import java.io.InputStream;
 import java.io.Reader;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TripleDeserializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TripleDeserializer.java
similarity index 82%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TripleDeserializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TripleDeserializer.java
index 3062a501e..e5d0cfe16 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TripleDeserializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TripleDeserializer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.lang.tuple.Triple;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.serializer.JSONDeserializer;
+import cn.hutool.v7.core.lang.tuple.Triple;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.core.reflect.TypeUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.serializer.JSONDeserializer;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TupleDeserializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TupleDeserializer.java
similarity index 84%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TupleDeserializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TupleDeserializer.java
index a57ece6b1..ab2363aea 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/TupleDeserializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TupleDeserializer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
 
-import org.dromara.hutool.core.lang.tuple.Tuple;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.serializer.JSONDeserializer;
+import cn.hutool.v7.core.lang.tuple.Tuple;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.serializer.JSONDeserializer;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/package-info.java
similarity index 93%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/package-info.java
index 18413d78c..360c50560 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/impl/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.json.serializer.impl;
+package cn.hutool.v7.json.serializer.impl;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/package-info.java
similarity index 97%
rename from hutool-json/src/main/java/org/dromara/hutool/json/serializer/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/serializer/package-info.java
index 97855e80f..f2c431af0 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serializer/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/package-info.java
@@ -39,4 +39,4 @@
  * TypeAdapterManager用于管理定义的序列化和反序列化器
  *
  */
-package org.dromara.hutool.json.serializer;
+package cn.hutool.v7.json.serializer;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/support/BeanToJSONCopier.java b/hutool-json/src/main/java/cn/hutool/v7/json/support/BeanToJSONCopier.java
similarity index 86%
rename from hutool-json/src/main/java/org/dromara/hutool/json/support/BeanToJSONCopier.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/support/BeanToJSONCopier.java
index 107ce2adf..661344e75 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/support/BeanToJSONCopier.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/support/BeanToJSONCopier.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.support;
+package cn.hutool.v7.json.support;
 
-import org.dromara.hutool.core.bean.BeanUtil;
-import org.dromara.hutool.core.bean.PropDesc;
-import org.dromara.hutool.core.lang.copier.Copier;
-import org.dromara.hutool.core.lang.mutable.MutableEntry;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONFactory;
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.bean.PropDesc;
+import cn.hutool.v7.core.lang.copier.Copier;
+import cn.hutool.v7.core.lang.mutable.MutableEntry;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONFactory;
+import cn.hutool.v7.json.JSONObject;
 
 import java.util.Map;
 import java.util.function.Predicate;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/support/InternalJSONUtil.java b/hutool-json/src/main/java/cn/hutool/v7/json/support/InternalJSONUtil.java
similarity index 92%
rename from hutool-json/src/main/java/org/dromara/hutool/json/support/InternalJSONUtil.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/support/InternalJSONUtil.java
index fefda2470..38f92e4f4 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/support/InternalJSONUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/support/InternalJSONUtil.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.support;
+package cn.hutool.v7.json.support;
 
-import org.dromara.hutool.core.bean.copier.CopyOptions;
-import org.dromara.hutool.core.codec.binary.HexUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.map.CaseInsensitiveLinkedMap;
-import org.dromara.hutool.core.map.CaseInsensitiveTreeMap;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONFactory;
-import org.dromara.hutool.json.serializer.JSONMapper;
+import cn.hutool.v7.core.bean.copier.CopyOptions;
+import cn.hutool.v7.core.codec.binary.HexUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.map.CaseInsensitiveLinkedMap;
+import cn.hutool.v7.core.map.CaseInsensitiveTreeMap;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONFactory;
+import cn.hutool.v7.json.serializer.JSONMapper;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/support/JSONFormatStyle.java b/hutool-json/src/main/java/cn/hutool/v7/json/support/JSONFormatStyle.java
similarity index 94%
rename from hutool-json/src/main/java/org/dromara/hutool/json/support/JSONFormatStyle.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/support/JSONFormatStyle.java
index d3d7cc3b0..cad7762a9 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/support/JSONFormatStyle.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/support/JSONFormatStyle.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.support;
+package cn.hutool.v7.json.support;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * JSON格式化风格，用于格式化JSON字符串
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/support/JSONNodeBeanFactory.java b/hutool-json/src/main/java/cn/hutool/v7/json/support/JSONNodeBeanFactory.java
similarity index 91%
rename from hutool-json/src/main/java/org/dromara/hutool/json/support/JSONNodeBeanFactory.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/support/JSONNodeBeanFactory.java
index be369bc17..b538dfecd 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/support/JSONNodeBeanFactory.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/support/JSONNodeBeanFactory.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.support;
+package cn.hutool.v7.json.support;
 
-import org.dromara.hutool.core.bean.path.BeanPath;
-import org.dromara.hutool.core.bean.path.NodeBeanFactory;
-import org.dromara.hutool.core.bean.path.node.*;
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.json.*;
+import cn.hutool.v7.core.bean.path.BeanPath;
+import cn.hutool.v7.core.bean.path.NodeBeanFactory;
+import cn.hutool.v7.core.bean.path.node.*;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.json.*;
 
 /**
  * JSON节点Bean创建器
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/support/JSONObjectValueProvider.java b/hutool-json/src/main/java/cn/hutool/v7/json/support/JSONObjectValueProvider.java
similarity index 87%
rename from hutool-json/src/main/java/org/dromara/hutool/json/support/JSONObjectValueProvider.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/support/JSONObjectValueProvider.java
index 2df340c83..9821115ca 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/support/JSONObjectValueProvider.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/support/JSONObjectValueProvider.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.support;
+package cn.hutool.v7.json.support;
 
-import org.dromara.hutool.core.bean.copier.ValueProvider;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.core.bean.copier.ValueProvider;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONObject;
 
 import java.lang.reflect.Type;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/support/JSONStrFormatter.java b/hutool-json/src/main/java/cn/hutool/v7/json/support/JSONStrFormatter.java
similarity index 97%
rename from hutool-json/src/main/java/org/dromara/hutool/json/support/JSONStrFormatter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/support/JSONStrFormatter.java
index c60215f6d..1d34ac9e9 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/support/JSONStrFormatter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/support/JSONStrFormatter.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.support;
+package cn.hutool.v7.json.support;
 
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * JSON字符串格式化工具，用于简单格式化JSON字符串
      
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/support/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/support/package-info.java
similarity index 94%
rename from hutool-json/src/main/java/org/dromara/hutool/json/support/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/support/package-info.java
index 0f1dc8b4b..27957212c 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/support/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/support/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.json.support;
+package cn.hutool.v7.json.support;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java b/hutool-json/src/main/java/cn/hutool/v7/json/writer/JSONWriter.java
similarity index 94%
rename from hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/writer/JSONWriter.java
index ca87101b2..0b9d62f9f 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/writer/JSONWriter.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.writer;
+package cn.hutool.v7.json.writer;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.lang.mutable.MutableEntry;
-import org.dromara.hutool.core.math.NumberUtil;
-import org.dromara.hutool.core.regex.ReUtil;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONException;
-import org.dromara.hutool.json.support.InternalJSONUtil;
-import org.dromara.hutool.json.support.JSONFormatStyle;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.lang.mutable.MutableEntry;
+import cn.hutool.v7.core.math.NumberUtil;
+import cn.hutool.v7.core.regex.ReUtil;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONException;
+import cn.hutool.v7.json.support.InternalJSONUtil;
+import cn.hutool.v7.json.support.JSONFormatStyle;
 
 import java.io.Closeable;
 import java.io.Flushable;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/NumberWriteMode.java b/hutool-json/src/main/java/cn/hutool/v7/json/writer/NumberWriteMode.java
similarity index 96%
rename from hutool-json/src/main/java/org/dromara/hutool/json/writer/NumberWriteMode.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/writer/NumberWriteMode.java
index 2af52b6a7..20fc0ec4d 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/NumberWriteMode.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/writer/NumberWriteMode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.writer;
+package cn.hutool.v7.json.writer;
 
 /**
  * Long写出模式
      
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/writer/package-info.java
similarity index 94%
rename from hutool-json/src/main/java/org/dromara/hutool/json/writer/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/writer/package-info.java
index 44e7fd700..a54d24870 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/writer/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.json.writer;
+package cn.hutool.v7.json.writer;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java b/hutool-json/src/main/java/cn/hutool/v7/json/xml/JSONXMLParser.java
similarity index 94%
rename from hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/xml/JSONXMLParser.java
index 8c14ac9c2..3ab5aff01 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/xml/JSONXMLParser.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.xml;
+package cn.hutool.v7.json.xml;
 
-import org.dromara.hutool.core.lang.mutable.MutableEntry;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.xml.XmlConstants;
-import org.dromara.hutool.json.support.InternalJSONUtil;
-import org.dromara.hutool.json.JSONException;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.lang.mutable.MutableEntry;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.xml.XmlConstants;
+import cn.hutool.v7.json.support.InternalJSONUtil;
+import cn.hutool.v7.json.JSONException;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 
 import java.util.function.Predicate;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java b/hutool-json/src/main/java/cn/hutool/v7/json/xml/JSONXMLSerializer.java
similarity index 91%
rename from hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/xml/JSONXMLSerializer.java
index c128b52ac..47eb87109 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLSerializer.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/xml/JSONXMLSerializer.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.xml;
+package cn.hutool.v7.json.xml;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.text.escape.EscapeUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONException;
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.escape.EscapeUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONException;
+import cn.hutool.v7.json.JSONObject;
 
 /**
  * JSON转XML字符串工具
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java b/hutool-json/src/main/java/cn/hutool/v7/json/xml/JSONXMLUtil.java
similarity index 96%
rename from hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/xml/JSONXMLUtil.java
index ea9153ae1..ab69389f6 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLUtil.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/xml/JSONXMLUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.xml;
+package cn.hutool.v7.json.xml;
 
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONException;
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONException;
+import cn.hutool.v7.json.JSONObject;
 
 /**
  * 提供静态方法在XML和JSONObject之间转换
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/ParseConfig.java b/hutool-json/src/main/java/cn/hutool/v7/json/xml/ParseConfig.java
similarity index 98%
rename from hutool-json/src/main/java/org/dromara/hutool/json/xml/ParseConfig.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/xml/ParseConfig.java
index bf60a79e8..797993d26 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/ParseConfig.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/xml/ParseConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.xml;
+package cn.hutool.v7.json.xml;
 
 import java.io.Serializable;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java b/hutool-json/src/main/java/cn/hutool/v7/json/xml/XMLTokener.java
similarity index 97%
rename from hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/xml/XMLTokener.java
index 2c7ba26ed..18dc953be 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/xml/XMLTokener.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.xml;
+package cn.hutool.v7.json.xml;
 
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.xml.XmlConstants;
-import org.dromara.hutool.json.JSONException;
-import org.dromara.hutool.json.reader.JSONTokener;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.xml.XmlConstants;
+import cn.hutool.v7.json.JSONException;
+import cn.hutool.v7.json.reader.JSONTokener;
 
 /**
  * XML分析器，继承自JSONTokener，提供XML的语法分析
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/package-info.java b/hutool-json/src/main/java/cn/hutool/v7/json/xml/package-info.java
similarity index 95%
rename from hutool-json/src/main/java/org/dromara/hutool/json/xml/package-info.java
rename to hutool-json/src/main/java/cn/hutool/v7/json/xml/package-info.java
index 7f99875be..92a367776 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/package-info.java
+++ b/hutool-json/src/main/java/cn/hutool/v7/json/xml/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.json.xml;
+package cn.hutool.v7.json.xml;
diff --git a/hutool-json/src/main/resources/META-INF/services/cn.hutool.v7.json.engine.JSONEngine b/hutool-json/src/main/resources/META-INF/services/cn.hutool.v7.json.engine.JSONEngine
new file mode 100644
index 000000000..1c7aaa1a9
--- /dev/null
+++ b/hutool-json/src/main/resources/META-INF/services/cn.hutool.v7.json.engine.JSONEngine
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2013-2025 Hutool Team and hutool.cn
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+cn.hutool.v7.json.engine.jackson.JacksonEngine
+cn.hutool.v7.json.engine.gson.GsonEngine
+cn.hutool.v7.json.engine.fastjson.FastJSON2Engine
+cn.hutool.v7.json.engine.moshi.MoshiEngine
+cn.hutool.v7.json.engine.HutoolJSONEngine
diff --git a/hutool-json/src/main/resources/META-INF/services/org.dromara.hutool.json.engine.JSONEngine b/hutool-json/src/main/resources/META-INF/services/org.dromara.hutool.json.engine.JSONEngine
deleted file mode 100644
index 22f6e2823..000000000
--- a/hutool-json/src/main/resources/META-INF/services/org.dromara.hutool.json.engine.JSONEngine
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (c) 2013-2025 Hutool Team and hutool.cn
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.dromara.hutool.json.engine.jackson.JacksonEngine
-org.dromara.hutool.json.engine.gson.GsonEngine
-org.dromara.hutool.json.engine.fastjson.FastJSON2Engine
-org.dromara.hutool.json.engine.moshi.MoshiEngine
-org.dromara.hutool.json.engine.HutoolJSONEngine
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONArrayTest.java
similarity index 96%
rename from hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/JSONArrayTest.java
index b89839ac4..554a99b63 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONArrayTest.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
 import lombok.Data;
-import org.dromara.hutool.core.collection.ListUtil;
-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 cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.map.Dict;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.json.test.bean.Exam;
+import cn.hutool.v7.json.test.bean.JsonNode;
+import cn.hutool.v7.json.test.bean.KeyBean;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONConvertTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONConvertTest.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/JSONConvertTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/JSONConvertTest.java
index dc02ccf1a..975344f43 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONConvertTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONConvertTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-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 cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.json.test.bean.ExamInfoDict;
+import cn.hutool.v7.json.test.bean.PerfectEvaluationProductResVo;
+import cn.hutool.v7.json.test.bean.UserInfoDict;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONDeserializerTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONDeserializerTest.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/JSONDeserializerTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/JSONDeserializerTest.java
index 06f20d7f5..5f9a38c30 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONDeserializerTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONDeserializerTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
 import lombok.Data;
-import org.dromara.hutool.json.serializer.JSONDeserializer;
+import cn.hutool.v7.json.serializer.JSONDeserializer;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONFactoryTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONFactoryTest.java
similarity index 97%
rename from hutool-json/src/test/java/org/dromara/hutool/json/JSONFactoryTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/JSONFactoryTest.java
index 77566774b..42587888c 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONFactoryTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONFactoryTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONNullTest.java
similarity index 98%
rename from hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/JSONNullTest.java
index f37563bbc..89e9ca545 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONNullTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONObjectTest.java
similarity index 97%
rename from hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/JSONObjectTest.java
index 80f0c345c..68c535234 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONObjectTest.java
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
+import cn.hutool.v7.json.test.bean.*;
 import lombok.Data;
-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.DateFormatPool;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.date.format.DateFormatManager;
-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.*;
-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 cn.hutool.v7.core.annotation.Alias;
+import cn.hutool.v7.core.annotation.PropIgnore;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.date.DateFormatPool;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.date.format.DateFormatManager;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.test.bean.report.CaseReport;
+import cn.hutool.v7.json.test.bean.report.StepReport;
+import cn.hutool.v7.json.test.bean.report.SuiteReport;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONPathTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONPathTest.java
similarity index 97%
rename from hutool-json/src/test/java/org/dromara/hutool/json/JSONPathTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/JSONPathTest.java
index cbd7b6c56..1f71d9626 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONPathTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONPathTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONStrFormatterTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONStrFormatterTest.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/JSONStrFormatterTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/JSONStrFormatterTest.java
index ca031435e..5f246c5ef 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONStrFormatterTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONStrFormatterTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.json.support.JSONStrFormatter;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.json.support.JSONStrFormatter;
 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/org/dromara/hutool/json/JSONTokenerTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONTokenerTest.java
similarity index 90%
rename from hutool-json/src/test/java/org/dromara/hutool/json/JSONTokenerTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/JSONTokenerTest.java
index 050c546f2..231421cc2 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONTokenerTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONTokenerTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.json.reader.JSONTokener;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.json.reader.JSONTokener;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONUtilTest.java
similarity index 96%
rename from hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/JSONUtilTest.java
index 249f1171e..bb1cce032 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONUtilTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
 import lombok.Data;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.date.DateTime;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.map.MapUtil;
-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 cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.date.DateTime;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.json.test.bean.Price;
+import cn.hutool.v7.json.test.bean.UserA;
+import cn.hutool.v7.json.test.bean.UserC;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONWriterTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONWriterTest.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/JSONWriterTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/JSONWriterTest.java
index 765074366..908471456 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONWriterTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONWriterTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.date.DateUtil;
+import cn.hutool.v7.core.date.DateUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/ParseBeanWithListTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/ParseBeanWithListTest.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/ParseBeanWithListTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/ParseBeanWithListTest.java
index 44c09e02e..66a3d2b57 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/ParseBeanWithListTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/ParseBeanWithListTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
-import org.dromara.hutool.core.collection.ListUtil;
+import cn.hutool.v7.core.collection.ListUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/TransientTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/TransientTest.java
similarity index 98%
rename from hutool-json/src/test/java/org/dromara/hutool/json/TransientTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/TransientTest.java
index aaab8e06f..d0e207979 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/TransientTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/TransientTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json;
+package cn.hutool.v7.json;
 
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/engine/BeanWithDate.java b/hutool-json/src/test/java/cn/hutool/v7/json/engine/BeanWithDate.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/engine/BeanWithDate.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/engine/BeanWithDate.java
index 00f6bd9f2..aeac2c501 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/engine/BeanWithDate.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/engine/BeanWithDate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/engine/BeanWithLocalDate.java b/hutool-json/src/test/java/cn/hutool/v7/json/engine/BeanWithLocalDate.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/engine/BeanWithLocalDate.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/engine/BeanWithLocalDate.java
index 432bf5f4e..09439fd15 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/engine/BeanWithLocalDate.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/engine/BeanWithLocalDate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/engine/BeanWithLocalDateTime.java b/hutool-json/src/test/java/cn/hutool/v7/json/engine/BeanWithLocalDateTime.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/engine/BeanWithLocalDateTime.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/engine/BeanWithLocalDateTime.java
index 3d59738d2..f1f0d88c9 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/engine/BeanWithLocalDateTime.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/engine/BeanWithLocalDateTime.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/engine/FastJSONTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/engine/FastJSONTest.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/engine/FastJSONTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/engine/FastJSONTest.java
index b1e0c8296..5d62fbd7d 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/engine/FastJSONTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/engine/FastJSONTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONWriter;
 import com.alibaba.fastjson2.writer.ObjectWriter;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.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-json/src/test/java/org/dromara/hutool/json/engine/GsonTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/engine/GsonTest.java
similarity index 90%
rename from hutool-json/src/test/java/org/dromara/hutool/json/engine/GsonTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/engine/GsonTest.java
index c8c4d7590..b1ac21698 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/engine/GsonTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/engine/GsonTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.date.DateTime;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.date.TimeUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.date.DateTime;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.date.TimeUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/engine/HutoolJSONTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/engine/HutoolJSONTest.java
similarity index 96%
rename from hutool-json/src/test/java/org/dromara/hutool/json/engine/HutoolJSONTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/engine/HutoolJSONTest.java
index b3816509e..e2225a124 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/engine/HutoolJSONTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/engine/HutoolJSONTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/engine/JSONEngineFactoryTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/engine/JSONEngineFactoryTest.java
similarity index 87%
rename from hutool-json/src/test/java/org/dromara/hutool/json/engine/JSONEngineFactoryTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/engine/JSONEngineFactoryTest.java
index aaa41efd8..04c65b19f 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/engine/JSONEngineFactoryTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/engine/JSONEngineFactoryTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
-import org.dromara.hutool.json.engine.fastjson.FastJSON2Engine;
-import org.dromara.hutool.json.engine.gson.GsonEngine;
-import org.dromara.hutool.json.engine.jackson.JacksonEngine;
+import cn.hutool.v7.json.engine.fastjson.FastJSON2Engine;
+import cn.hutool.v7.json.engine.gson.GsonEngine;
+import cn.hutool.v7.json.engine.jackson.JacksonEngine;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/engine/JSONEngineTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/engine/JSONEngineTest.java
similarity index 96%
rename from hutool-json/src/test/java/org/dromara/hutool/json/engine/JSONEngineTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/engine/JSONEngineTest.java
index c0e7163b9..15b819f73 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/engine/JSONEngineTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/engine/JSONEngineTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-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.text.StrUtil;
+import cn.hutool.v7.core.date.DateTime;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.date.TimeUtil;
+import cn.hutool.v7.core.text.StrUtil;
 import org.junit.jupiter.api.Test;
 
 import java.io.StringReader;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/engine/JacksonTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/engine/JacksonTest.java
similarity index 91%
rename from hutool-json/src/test/java/org/dromara/hutool/json/engine/JacksonTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/engine/JacksonTest.java
index deeac5402..c94afe4d5 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/engine/JacksonTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/engine/JacksonTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/engine/MoshiTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/engine/MoshiTest.java
similarity index 87%
rename from hutool-json/src/test/java/org/dromara/hutool/json/engine/MoshiTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/engine/MoshiTest.java
index 06bd1a553..2174f9348 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/engine/MoshiTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/engine/MoshiTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.engine;
+package cn.hutool.v7.json.engine;
 
-import org.dromara.hutool.core.date.DateTime;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.date.TimeUtil;
+import cn.hutool.v7.core.date.DateTime;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.date.TimeUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue1075Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1075Test.java
similarity index 92%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue1075Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1075Test.java
index ecedb592d..194ee732f 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue1075Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1075Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue1101Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1101Test.java
similarity index 92%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue1101Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1101Test.java
index e458525f2..539ca4871 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue1101Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1101Test.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.bean.BeanUtil;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue1200Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1200Test.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue1200Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1200Test.java
index 1ace79a55..6a91ae769 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue1200Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1200Test.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue1399Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1399Test.java
similarity index 92%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue1399Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1399Test.java
index 12a2fbbb1..e2b77ed8b 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue1399Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1399Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2090Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2090Test.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2090Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2090Test.java
index 90fed4fa9..a155195ef 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2090Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2090Test.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONPrimitive;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONPrimitive;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2131Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2131Test.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2131Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2131Test.java
index a9898a461..64794480e 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2131Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2131Test.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2223Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2223Test.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2223Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2223Test.java
index 998988af9..7a18f6d3b 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2223Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2223Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2377Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2377Test.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2377Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2377Test.java
index 7754111d0..bdf3df00a 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2377Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2377Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2447Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2447Test.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2447Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2447Test.java
index a38f2f988..4a8a5feef 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2447Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2447Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2507Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2507Test.java
similarity index 91%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2507Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2507Test.java
index 08053299c..ae546ac4b 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2507Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2507Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2555Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2555Test.java
similarity index 84%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2555Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2555Test.java
index d9c3ba197..dfeff211f 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2555Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2555Test.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.JSONDeserializer;
-import org.dromara.hutool.json.serializer.JSONSerializer;
-import org.dromara.hutool.json.serializer.TypeAdapterManager;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.JSONDeserializer;
+import cn.hutool.v7.json.serializer.JSONSerializer;
+import cn.hutool.v7.json.serializer.TypeAdapterManager;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2564Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2564Test.java
similarity index 91%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2564Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2564Test.java
index c2a5dcc42..ef4a1bb46 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2564Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2564Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2572Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2572Test.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2572Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2572Test.java
index 3615667d3..334400957 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2572Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2572Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONObject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2746Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2746Test.java
similarity index 87%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2746Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2746Test.java
index f20fc8830..5b2e05606 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2746Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2746Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.json.JSONException;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.json.JSONException;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2749Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2749Test.java
similarity index 92%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2749Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2749Test.java
index eb0b47e86..8484f10e7 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2749Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2749Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 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/org/dromara/hutool/json/issues/Issue2801Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2801Test.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2801Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2801Test.java
index 80deb74a1..5e0696d85 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2801Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2801Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONObject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2924Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2924Test.java
similarity index 92%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2924Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2924Test.java
index c52986ee1..70492f637 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2924Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2924Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2953Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2953Test.java
similarity index 85%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2953Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2953Test.java
index 2a2dd1e37..a9bfd229a 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue2953Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue2953Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3051Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3051Test.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3051Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3051Test.java
index 20da9171f..a65c3e96f 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3051Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3051Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3058Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3058Test.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3058Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3058Test.java
index ee048aba8..89f6c8317 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3058Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3058Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3086Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3086Test.java
similarity index 85%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3086Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3086Test.java
index ee9de53e1..9b7df798c 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3086Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3086Test.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONUtil;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.JSONSerializer;
-import org.dromara.hutool.json.serializer.TypeAdapterManager;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONUtil;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.JSONSerializer;
+import cn.hutool.v7.json.serializer.TypeAdapterManager;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3139Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3139Test.java
similarity index 86%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3139Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3139Test.java
index 0ee5fd256..25c4b7860 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3139Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3139Test.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
-import org.dromara.hutool.json.serializer.JSONDeserializer;
-import org.dromara.hutool.json.serializer.TypeAdapterManager;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
+import cn.hutool.v7.json.serializer.JSONDeserializer;
+import cn.hutool.v7.json.serializer.TypeAdapterManager;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3193Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3193Test.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3193Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3193Test.java
index 55e341f6a..3e065cc14 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3193Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3193Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3274Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3274Test.java
similarity index 89%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3274Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3274Test.java
index cd3cc8a99..601ed2854 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3274Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3274Test.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
 import lombok.Getter;
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3289Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3289Test.java
similarity index 87%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3289Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3289Test.java
index 490031d6f..8d940207d 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3289Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3289Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONException;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONException;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3504Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3504Test.java
similarity index 79%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3504Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3504Test.java
index 07cf04722..08e3bc4eb 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3504Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3504Test.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.reflect.ClassUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.json.JSONPrimitive;
-import org.dromara.hutool.json.JSONUtil;
-import org.dromara.hutool.json.serializer.JSONContext;
-import org.dromara.hutool.json.serializer.JSONDeserializer;
-import org.dromara.hutool.json.serializer.JSONSerializer;
-import org.dromara.hutool.json.serializer.TypeAdapterManager;
+import cn.hutool.v7.core.reflect.ClassUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.json.JSONPrimitive;
+import cn.hutool.v7.json.JSONUtil;
+import cn.hutool.v7.json.serializer.JSONContext;
+import cn.hutool.v7.json.serializer.JSONDeserializer;
+import cn.hutool.v7.json.serializer.JSONSerializer;
+import cn.hutool.v7.json.serializer.TypeAdapterManager;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3506Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3506Test.java
similarity index 82%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3506Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3506Test.java
index 66bd03b47..54582f6f9 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3506Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3506Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONFactory;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.serializer.impl.ClassTypeAdapter;
+import cn.hutool.v7.json.JSONFactory;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.serializer.impl.ClassTypeAdapter;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -34,7 +34,7 @@ public class Issue3506Test {
 		languages.setLanguageType(Java.class);
 
 		final String hutoolJSONString = factory.parseObj(languages).toString();
-		Assertions.assertEquals("{\"languageType\":\"org.dromara.hutool.json.issues.Issue3506Test$Java\"}", hutoolJSONString);
+		Assertions.assertEquals("{\"languageType\":\"cn.hutool.v7.json.issues.Issue3506Test$Java\"}", hutoolJSONString);
 
 		final JSONObject jsonObject = factory.parseObj(hutoolJSONString);
 		final Languages bean = jsonObject.toBean(Languages.class);
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3588Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3588Test.java
similarity index 92%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3588Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3588Test.java
index b2e594cb3..ec17fd2fd 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3588Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3588Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3619Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3619Test.java
similarity index 89%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3619Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3619Test.java
index c4ec56f32..22f78861e 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3619Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3619Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3649Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3649Test.java
similarity index 91%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3649Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3649Test.java
index d340db8de..c769445c0 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3649Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3649Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3681Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3681Test.java
similarity index 90%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3681Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3681Test.java
index 5a9b72467..311ace172 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3681Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3681Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.lang.Opt;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.lang.Opt;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3795Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3795Test.java
similarity index 85%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3795Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3795Test.java
index fc67a3e7e..cd43fc521 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3795Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3795Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSONException;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONException;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3873Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3873Test.java
similarity index 76%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3873Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3873Test.java
index e1662d5f6..6e0fc72b8 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue3873Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3873Test.java
@@ -1,10 +1,10 @@
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue488Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue488Test.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue488Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue488Test.java
index 9c15a96d8..99a8598f9 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue488Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue488Test.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-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 cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue644Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue644Test.java
similarity index 90%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue644Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue644Test.java
index 741e99dad..5c27a839a 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue644Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue644Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.date.TimeUtil;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.date.TimeUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue677Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue677Test.java
similarity index 91%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue677Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue677Test.java
index ba8e0b02e..63a699747 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue677Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue677Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue867Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue867Test.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue867Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue867Test.java
index 2650969a9..53a8677e6 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issue867Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue867Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.annotation.Alias;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.annotation.Alias;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI1AU86Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1AU86Test.java
similarity index 91%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI1AU86Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1AU86Test.java
index 28a333405..abe86dd93 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI1AU86Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1AU86Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI1F8M2Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1F8M2Test.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI1F8M2Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1F8M2Test.java
index 28cc70698..b62f4aa56 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI1F8M2Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1F8M2Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI1H2VNTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1H2VNTest.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI1H2VNTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1H2VNTest.java
index bc2da1609..fae170cee 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI1H2VNTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1H2VNTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI3BS4STest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI3BS4STest.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI3BS4STest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI3BS4STest.java
index 7e778bf7c..ca0c5a519 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI3BS4STest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI3BS4STest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI3EGJPTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI3EGJPTest.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI3EGJPTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI3EGJPTest.java
index 79e72982c..be844f0fd 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI3EGJPTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI3EGJPTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.json.JSONObject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI49VZBTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI49VZBTest.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI49VZBTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI49VZBTest.java
index ffa14e994..ef104076f 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI49VZBTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI49VZBTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI4RBZ4Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI4RBZ4Test.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI4RBZ4Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI4RBZ4Test.java
index 7634e1b1d..044decbf7 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI4RBZ4Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI4RBZ4Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI4XFMWTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI4XFMWTest.java
similarity index 92%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI4XFMWTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI4XFMWTest.java
index c33b456f4..67b5ed25d 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI4XFMWTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI4XFMWTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.annotation.Alias;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.annotation.Alias;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI50EGGTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI50EGGTest.java
similarity index 90%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI50EGGTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI50EGGTest.java
index 661323944..ace8cbcda 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI50EGGTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI50EGGTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI59LW4Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI59LW4Test.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI59LW4Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI59LW4Test.java
index 9ff386dbc..cdbc75368 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI59LW4Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI59LW4Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI5DHK2Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI5DHK2Test.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI5DHK2Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI5DHK2Test.java
index b89543cc1..36fff0581 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI5DHK2Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI5DHK2Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI5OMSCTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI5OMSCTest.java
similarity index 84%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI5OMSCTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI5OMSCTest.java
index 8a94ff948..c7297c856 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI5OMSCTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI5OMSCTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI676ITTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI676ITTest.java
similarity index 78%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI676ITTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI676ITTest.java
index b878f2b9b..5884ea195 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI676ITTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI676ITTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.core.xml.XPathUtil;
-import org.dromara.hutool.core.xml.XmlUtil;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
-import org.dromara.hutool.json.xml.JSONXMLSerializer;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.xml.XPathUtil;
+import cn.hutool.v7.core.xml.XmlUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
+import cn.hutool.v7.json.xml.JSONXMLSerializer;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI6H0XFTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI6H0XFTest.java
similarity index 92%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI6H0XFTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI6H0XFTest.java
index 2316be287..1ea2e6a88 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI6H0XFTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI6H0XFTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI6LBZATest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI6LBZATest.java
similarity index 91%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI6LBZATest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI6LBZATest.java
index f16b8ecda..f03bc8262 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI6LBZATest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI6LBZATest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONPrimitive;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONPrimitive;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI6SZYBTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI6SZYBTest.java
similarity index 91%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI6SZYBTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI6SZYBTest.java
index f31e49fd0..634f973b5 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI6SZYBTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI6SZYBTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.lang.mutable.MutableEntry;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.lang.mutable.MutableEntry;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI6YN2ATest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI6YN2ATest.java
similarity index 89%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI6YN2ATest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI6YN2ATest.java
index 9cd260f41..fe00dcb9e 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI6YN2ATest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI6YN2ATest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI71BE6Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI71BE6Test.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI71BE6Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI71BE6Test.java
index 363e3c430..db8e7c360 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI71BE6Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI71BE6Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI76CSUTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI76CSUTest.java
similarity index 89%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI76CSUTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI76CSUTest.java
index 62c86e662..ea0ed3fd3 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI76CSUTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI76CSUTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7CW27Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7CW27Test.java
similarity index 91%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7CW27Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7CW27Test.java
index 61d35fdae..3805319a0 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7CW27Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7CW27Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7FQ29Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7FQ29Test.java
similarity index 85%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7FQ29Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7FQ29Test.java
index f5fd57505..fa98f63c8 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7FQ29Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7FQ29Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSONUtil;
-import org.dromara.hutool.json.serializer.JSONDeserializer;
-import org.dromara.hutool.json.serializer.TypeAdapterManager;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONUtil;
+import cn.hutool.v7.json.serializer.JSONDeserializer;
+import cn.hutool.v7.json.serializer.TypeAdapterManager;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7GPGXTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7GPGXTest.java
similarity index 85%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7GPGXTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7GPGXTest.java
index e6654fb3a..784e4efc4 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7GPGXTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7GPGXTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.lang.tuple.Pair;
-import org.dromara.hutool.core.lang.tuple.Triple;
-import org.dromara.hutool.core.lang.tuple.Tuple;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.lang.tuple.Pair;
+import cn.hutool.v7.core.lang.tuple.Triple;
+import cn.hutool.v7.core.lang.tuple.Tuple;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7M2GZTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7M2GZTest.java
similarity index 89%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7M2GZTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7M2GZTest.java
index ed2721075..4bf5bc4dc 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7M2GZTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7M2GZTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONUtil;
-import org.dromara.hutool.json.serializer.JSONDeserializer;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONUtil;
+import cn.hutool.v7.json.serializer.JSONDeserializer;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7VM64Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7VM64Test.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7VM64Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7VM64Test.java
index 78663ea0d..723f48d63 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI7VM64Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI7VM64Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.json.JSONObject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI81QZ2Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI81QZ2Test.java
similarity index 91%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI81QZ2Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI81QZ2Test.java
index e0b450353..d7c73f206 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI81QZ2Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI81QZ2Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI82AM8Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI82AM8Test.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI82AM8Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI82AM8Test.java
index 8a3a335a3..a7bc254fa 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI82AM8Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI82AM8Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI84V6ITest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI84V6ITest.java
similarity index 92%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI84V6ITest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI84V6ITest.java
index ea6dbc753..5c18c934c 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI84V6ITest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI84V6ITest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI8NMP7Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI8NMP7Test.java
similarity index 90%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI8NMP7Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI8NMP7Test.java
index 0b7560d9a..fdf1938a1 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI8NMP7Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI8NMP7Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
 import lombok.ToString;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI8PC9FTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI8PC9FTest.java
similarity index 90%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI8PC9FTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI8PC9FTest.java
index 4561de96e..3aaea3665 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI8PC9FTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI8PC9FTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI90ADXTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI90ADXTest.java
similarity index 89%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI90ADXTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI90ADXTest.java
index 9ec9a647e..8efbf5689 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI90ADXTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI90ADXTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Getter;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI9DX5HTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI9DX5HTest.java
similarity index 84%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI9DX5HTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI9DX5HTest.java
index 8058f4f09..51676f9cc 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI9DX5HTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI9DX5HTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONFactory;
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONFactory;
+import cn.hutool.v7.json.JSONObject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI9HQQETest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI9HQQETest.java
similarity index 89%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI9HQQETest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI9HQQETest.java
index 1c64ba93f..2b5176197 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueI9HQQETest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI9HQQETest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIALQ0NTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIALQ0NTest.java
similarity index 84%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIALQ0NTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIALQ0NTest.java
index 5072c981c..6d3565ae7 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIALQ0NTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIALQ0NTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONUtil;
-import org.dromara.hutool.json.writer.NumberWriteMode;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
+import cn.hutool.v7.json.writer.NumberWriteMode;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAOPI9Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIAOPI9Test.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAOPI9Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIAOPI9Test.java
index f98390143..21f2b2afc 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAOPI9Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIAOPI9Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAP4GMTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIAP4GMTest.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAP4GMTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIAP4GMTest.java
index 33a73ac6c..59fbc7edd 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAP4GMTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIAP4GMTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAW0ITTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIAW0ITTest.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAW0ITTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIAW0ITTest.java
index f63b4fe51..a398fa147 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAW0ITTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIAW0ITTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAWE3HTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIAWE3HTest.java
similarity index 87%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAWE3HTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIAWE3HTest.java
index 349046425..612e98a63 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAWE3HTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIAWE3HTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIB9MH0Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIB9MH0Test.java
similarity index 86%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIB9MH0Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIB9MH0Test.java
index 6b9075d1d..4db06eb6d 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIB9MH0Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIB9MH0Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONUtil;
-import org.dromara.hutool.json.serializer.JSONSerializer;
-import org.dromara.hutool.json.serializer.TypeAdapterManager;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONUtil;
+import cn.hutool.v7.json.serializer.JSONSerializer;
+import cn.hutool.v7.json.serializer.TypeAdapterManager;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIBKE5JTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIBKE5JTest.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIBKE5JTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIBKE5JTest.java
index 43df7f434..6cf40293b 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIBKE5JTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueIBKE5JTest.java
@@ -1,8 +1,8 @@
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issues1881Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issues1881Test.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Issues1881Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Issues1881Test.java
index 2ce6040d8..7939d78ec 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Issues1881Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issues1881Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssuesI44E4HTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssuesI44E4HTest.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssuesI44E4HTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssuesI44E4HTest.java
index b319ec06c..9d97829ab 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssuesI44E4HTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssuesI44E4HTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
-import org.dromara.hutool.json.serializer.JSONDeserializer;
-import org.dromara.hutool.json.serializer.TypeAdapterManager;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
+import cn.hutool.v7.json.serializer.JSONDeserializer;
+import cn.hutool.v7.json.serializer.TypeAdapterManager;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssuesI4V14NTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssuesI4V14NTest.java
similarity index 85%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/IssuesI4V14NTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/IssuesI4V14NTest.java
index b39662bd9..e5e5f6b46 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssuesI4V14NTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssuesI4V14NTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Test;
 
 import java.util.Map;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Pr192Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Pr192Test.java
similarity index 96%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Pr192Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Pr192Test.java
index cb83163e4..843a76512 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Pr192Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Pr192Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Pr3067Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Pr3067Test.java
similarity index 90%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Pr3067Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Pr3067Test.java
index 0c099a862..49e6e89d7 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Pr3067Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Pr3067Test.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
 import lombok.Data;
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.core.reflect.TypeReference;
-import org.dromara.hutool.json.JSONArray;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONArray;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Pr3507Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Pr3507Test.java
similarity index 79%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/Pr3507Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/Pr3507Test.java
index 6d3ee5ed0..6b06e9b86 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/Pr3507Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Pr3507Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
 
-import org.dromara.hutool.json.JSONFactory;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.serializer.JSONSerializer;
+import cn.hutool.v7.json.JSONFactory;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.serializer.JSONSerializer;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -30,6 +30,6 @@ public class Pr3507Test {
 		factory.register(Class.class, (JSONSerializer>) (bean, context) -> context.getOrCreatePrimitive(bean.getName()));
 
 		final JSONObject set = factory.ofObj().putValue("name", Pr3507Test.class);
-		Assertions.assertEquals("{\"name\":\"org.dromara.hutool.json.issues.Pr3507Test\"}", set.toString());
+		Assertions.assertEquals("{\"name\":\"cn.hutool.v7.json.issues.Pr3507Test\"}", set.toString());
 	}
 }
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/issueI5WDP0/ERPProduct.kt b/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueI5WDP0/ERPProduct.kt
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/issueI5WDP0/ERPProduct.kt
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/issueI5WDP0/ERPProduct.kt
index 641602545..3c85196e2 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/issueI5WDP0/ERPProduct.kt
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueI5WDP0/ERPProduct.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues.issueI5WDP0
+package cn.hutool.v7.json.issues.issueI5WDP0
 
 data class ERPProduct(
 	var code:String,
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/issueI5WDP0/JsonToBeanTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueI5WDP0/JsonToBeanTest.java
similarity index 91%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/issueI5WDP0/JsonToBeanTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/issueI5WDP0/JsonToBeanTest.java
index 1f59c03b2..f15bac418 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/issueI5WDP0/JsonToBeanTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueI5WDP0/JsonToBeanTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues.issueI5WDP0;
+package cn.hutool.v7.json.issues.issueI5WDP0;
 
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/issueIVMD5/BaseResult.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/BaseResult.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/issueIVMD5/BaseResult.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/BaseResult.java
index 29dd834c7..ba4da0d0a 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/issueIVMD5/BaseResult.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/BaseResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues.issueIVMD5;
+package cn.hutool.v7.json.issues.issueIVMD5;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/issueIVMD5/IssueIVMD5Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/IssueIVMD5Test.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/issueIVMD5/IssueIVMD5Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/IssueIVMD5Test.java
index c5bfd61f3..8a9815b16 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/issueIVMD5/IssueIVMD5Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/IssueIVMD5Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues.issueIVMD5;
+package cn.hutool.v7.json.issues.issueIVMD5;
 
-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 cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/issueIVMD5/StudentInfo.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/StudentInfo.java
similarity index 96%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/issueIVMD5/StudentInfo.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/StudentInfo.java
index cc18d739d..b7db59b9f 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/issueIVMD5/StudentInfo.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/StudentInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.issues.issueIVMD5;
+package cn.hutool.v7.json.issues.issueIVMD5;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/package-info.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/package-info.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/issues/package-info.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/issues/package-info.java
index fcd16185a..0dfd4ba14 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/issues/package-info.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/package-info.java
@@ -17,4 +17,4 @@
 /**
  * issue解决相关测试
  */
-package org.dromara.hutool.json.issues;
+package cn.hutool.v7.json.issues;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/Issue3205Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/Issue3205Test.java
similarity index 82%
rename from hutool-json/src/test/java/org/dromara/hutool/json/jwt/Issue3205Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/jwt/Issue3205Test.java
index c03ca937a..5b4349365 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/Issue3205Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/Issue3205Test.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
 import io.jsonwebtoken.Jwts;
-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 cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.json.jwt.signers.AlgorithmUtil;
+import cn.hutool.v7.json.jwt.signers.JWTSigner;
+import cn.hutool.v7.json.jwt.signers.JWTSignerUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/Issue3732Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/Issue3732Test.java
similarity index 90%
rename from hutool-json/src/test/java/org/dromara/hutool/json/jwt/Issue3732Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/jwt/Issue3732Test.java
index 91d8a53fd..70a914931 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/Issue3732Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/Issue3732Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
-import org.dromara.hutool.json.jwt.signers.JWTSigner;
-import org.dromara.hutool.json.jwt.signers.JWTSignerUtil;
+import cn.hutool.v7.json.jwt.signers.JWTSigner;
+import cn.hutool.v7.json.jwt.signers.JWTSignerUtil;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI5QRUOTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/IssueI5QRUOTest.java
similarity index 97%
rename from hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI5QRUOTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/jwt/IssueI5QRUOTest.java
index 3202b4469..4029beb54 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI5QRUOTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/IssueI5QRUOTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI6IS5BTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/IssueI6IS5BTest.java
similarity index 89%
rename from hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI6IS5BTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/jwt/IssueI6IS5BTest.java
index 37f802e38..281571809 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI6IS5BTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/IssueI6IS5BTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
 import lombok.Data;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.date.TimeUtil;
-import org.dromara.hutool.core.date.format.DateFormatManager;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.date.TimeUtil;
+import cn.hutool.v7.core.date.format.DateFormatManager;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI76TRQTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/IssueI76TRQTest.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI76TRQTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/jwt/IssueI76TRQTest.java
index 0375aa990..00da21cab 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI76TRQTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/IssueI76TRQTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI7IZIMTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/IssueI7IZIMTest.java
similarity index 96%
rename from hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI7IZIMTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/jwt/IssueI7IZIMTest.java
index bac5849bf..de59a83c3 100755
--- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/IssueI7IZIMTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/IssueI7IZIMTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTSignerTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTSignerTest.java
similarity index 96%
rename from hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTSignerTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTSignerTest.java
index 2a14f0c19..160d98009 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTSignerTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTSignerTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
-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 cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.crypto.KeyUtil;
+import cn.hutool.v7.json.jwt.signers.AlgorithmUtil;
+import cn.hutool.v7.json.jwt.signers.JWTSigner;
+import cn.hutool.v7.json.jwt.signers.JWTSignerUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTTest.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTTest.java
index d9c8b6512..a412a6f37 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
 import lombok.Data;
-import org.dromara.hutool.core.date.DateFormatPool;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.reflect.TypeReference;
-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 cn.hutool.v7.core.date.DateFormatPool;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.reflect.TypeReference;
+import cn.hutool.v7.core.util.ByteUtil;
+import cn.hutool.v7.json.jwt.signers.AlgorithmUtil;
+import cn.hutool.v7.json.jwt.signers.JWTSigner;
+import cn.hutool.v7.json.jwt.signers.JWTSignerUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTUtilTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTUtilTest.java
similarity index 98%
rename from hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTUtilTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTUtilTest.java
index 905d3f6c8..fe43ac035 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTUtilTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTValidatorTest.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTValidatorTest.java
index 246dd1cf0..2f66c4ce0 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTValidatorTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.jwt;
+package cn.hutool.v7.json.jwt;
 
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.exception.ValidateException;
-import org.dromara.hutool.json.jwt.signers.JWTSignerUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.exception.ValidateException;
+import cn.hutool.v7.json.jwt.signers.JWTSignerUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/reader/Issue3808Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/reader/Issue3808Test.java
similarity index 84%
rename from hutool-json/src/test/java/org/dromara/hutool/json/reader/Issue3808Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/reader/Issue3808Test.java
index 6bc8b3111..17d3a16a2 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/reader/Issue3808Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/reader/Issue3808Test.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.reader;
+package cn.hutool.v7.json.reader;
 
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.json.JSON;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.json.JSON;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/reader/JSONParserTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/reader/JSONParserTest.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/reader/JSONParserTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/reader/JSONParserTest.java
index 5a5139662..122bbbcd7 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/reader/JSONParserTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/reader/JSONParserTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.reader;
+package cn.hutool.v7.json.reader;
 
-import org.dromara.hutool.json.*;
+import cn.hutool.v7.json.*;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/serializer/CustomSerializeTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/serializer/CustomSerializeTest.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/serializer/CustomSerializeTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/serializer/CustomSerializeTest.java
index 718e0ce83..03510701a 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/serializer/CustomSerializeTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/serializer/CustomSerializeTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer;
+package cn.hutool.v7.json.serializer;
 
 import lombok.ToString;
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/serializer/JSONMapperTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/serializer/JSONMapperTest.java
similarity index 85%
rename from hutool-json/src/test/java/org/dromara/hutool/json/serializer/JSONMapperTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/serializer/JSONMapperTest.java
index fc8a186b5..545aedb6e 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/serializer/JSONMapperTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/serializer/JSONMapperTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.serializer;
+package cn.hutool.v7.json.serializer;
 
-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.json.JSONFactory;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.date.StopWatch;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.json.JSONFactory;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ADT.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ADT.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ADT.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ADT.java
index 2cad1d27c..9b3914fd3 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ADT.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ADT.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Data.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/Data.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Data.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/Data.java
index 75a01f862..bad110db0 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Data.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/Data.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 @lombok.Data
 public class Data {
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Exam.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/Exam.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Exam.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/Exam.java
index 49f2013a6..1de70865c 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Exam.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/Exam.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ExamInfoDict.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ExamInfoDict.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ExamInfoDict.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ExamInfoDict.java
index 58e9a89ca..3deff5852 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ExamInfoDict.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ExamInfoDict.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JSONBean.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/JSONBean.java
similarity index 89%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JSONBean.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/JSONBean.java
index b51cf5f25..b8c54e1c6 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JSONBean.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/JSONBean.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.json.JSONObject;
 
 @Data
 public class JSONBean {
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JsonNode.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/JsonNode.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JsonNode.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/JsonNode.java
index e9aad033c..c3fb3dd83 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/JsonNode.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/JsonNode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/KeyBean.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/KeyBean.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/KeyBean.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/KeyBean.java
index cf66fd2d4..03a5c091f 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/KeyBean.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/KeyBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/PerfectEvaluationProductResVo.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/PerfectEvaluationProductResVo.java
similarity index 99%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/PerfectEvaluationProductResVo.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/PerfectEvaluationProductResVo.java
index 38c4194ba..c38cb0419 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/PerfectEvaluationProductResVo.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/PerfectEvaluationProductResVo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Price.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/Price.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Price.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/Price.java
index 6c117864e..2efac667b 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Price.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/Price.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ProductResBase.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ProductResBase.java
similarity index 96%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ProductResBase.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ProductResBase.java
index 820e9bcf0..b9e4033d1 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ProductResBase.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ProductResBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultDto.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ResultDto.java
similarity index 98%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultDto.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ResultDto.java
index 1602ed395..9cb05926f 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/ResultDto.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ResultDto.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Seq.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/Seq.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Seq.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/Seq.java
index 87e2312ef..a5f0e2fc1 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/Seq.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/Seq.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthResponse.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthResponse.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthResponse.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthResponse.java
index c7d43fbef..8045d41a1 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthResponse.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthResponse.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp.java
index 94fe7263c..7c8932173 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp2.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp2.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp2.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp2.java
index 0a917fdf3..85cbd71a8 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/TokenAuthWarp2.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp2.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 public class TokenAuthWarp2 extends TokenAuthWarp {
 	private static final long serialVersionUID = 1L;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UUMap.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UUMap.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UUMap.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UUMap.java
index 7f46da758..c50f0b6b0 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UUMap.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UUMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserA.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserA.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserA.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserA.java
index 3dcd47822..094b598d8 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserA.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserA.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserB.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserB.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserB.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserB.java
index 2f8ca19ab..13571635b 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserB.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserB.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserC.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserC.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserC.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserC.java
index d46eba050..dbfc73de4 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserC.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserC.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoDict.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoDict.java
similarity index 96%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoDict.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoDict.java
index d37c9b12e..af83eabac 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoDict.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoDict.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoRedundCount.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoRedundCount.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoRedundCount.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoRedundCount.java
index e86919e47..e8f13323e 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserInfoRedundCount.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoRedundCount.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserWithMap.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserWithMap.java
similarity index 94%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserWithMap.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserWithMap.java
index ddb4b8cb0..81e0aa249 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/UserWithMap.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserWithMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean;
+package cn.hutool.v7.json.test.bean;
 
 import lombok.Data;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/CaseReport.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/report/CaseReport.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/CaseReport.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/report/CaseReport.java
index 8c63fcae8..1ba53d315 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/CaseReport.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/report/CaseReport.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean.report;
+package cn.hutool.v7.json.test.bean.report;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/StepReport.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/report/StepReport.java
similarity index 97%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/StepReport.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/report/StepReport.java
index cb8859b54..40cf32e89 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/StepReport.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/report/StepReport.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean.report;
+package cn.hutool.v7.json.test.bean.report;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * 测试步骤报告
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/SuiteReport.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/report/SuiteReport.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/SuiteReport.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/test/bean/report/SuiteReport.java
index 209d16b2e..aef15b0c0 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/test/bean/report/SuiteReport.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/report/SuiteReport.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.test.bean.report;
+package cn.hutool.v7.json.test.bean.report;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/writer/Issue3541Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/writer/Issue3541Test.java
similarity index 95%
rename from hutool-json/src/test/java/org/dromara/hutool/json/writer/Issue3541Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/writer/Issue3541Test.java
index d61d84a36..d8755dc54 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/writer/Issue3541Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/writer/Issue3541Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.writer;
+package cn.hutool.v7.json.writer;
 
 import lombok.Data;
-import org.dromara.hutool.json.JSONConfig;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONConfig;
+import cn.hutool.v7.json.JSONUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/xml/Issue2748Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/xml/Issue2748Test.java
similarity index 88%
rename from hutool-json/src/test/java/org/dromara/hutool/json/xml/Issue2748Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/xml/Issue2748Test.java
index efe78db62..475181ed1 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/xml/Issue2748Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/xml/Issue2748Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.xml;
+package cn.hutool.v7.json.xml;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.json.JSONException;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.json.JSONException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/xml/Issue3560Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/xml/Issue3560Test.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/xml/Issue3560Test.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/xml/Issue3560Test.java
index f68e01382..522f7014a 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/xml/Issue3560Test.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/xml/Issue3560Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.xml;
+package cn.hutool.v7.json.xml;
 
-import org.dromara.hutool.json.JSONObject;
+import cn.hutool.v7.json.JSONObject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/xml/XMLTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/xml/XMLTest.java
similarity index 93%
rename from hutool-json/src/test/java/org/dromara/hutool/json/xml/XMLTest.java
rename to hutool-json/src/test/java/cn/hutool/v7/json/xml/XMLTest.java
index 2aa8f8c82..0324ba721 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/xml/XMLTest.java
+++ b/hutool-json/src/test/java/cn/hutool/v7/json/xml/XMLTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.json.xml;
+package cn.hutool.v7.json.xml;
 
-import org.dromara.hutool.json.JSONObject;
-import org.dromara.hutool.json.JSONUtil;
+import cn.hutool.v7.json.JSONObject;
+import cn.hutool.v7.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 3328c723b..6b82f8e62 100755
--- a/hutool-log/pom.xml
+++ b/hutool-log/pom.xml
@@ -23,9 +23,9 @@
 	jar
 
 	
-		org.dromara.hutool
+		cn.hutool.v7
 		hutool-parent
-		6.0.0-M22
+		7.0.0.M1
 	
 
 	hutool-log
@@ -33,7 +33,7 @@
 	Hutool 日志封装
 
 	
-		org.dromara.hutool.log
+		cn.hutool.v7.log
 		
 		2.0.9
 		1.5.12
@@ -49,7 +49,7 @@
 
 	
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-core
 			${project.parent.version}
 		
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/AbsLogEngine.java b/hutool-log/src/main/java/cn/hutool/v7/log/AbsLogEngine.java
similarity index 95%
rename from hutool-log/src/main/java/org/dromara/hutool/log/AbsLogEngine.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/AbsLogEngine.java
index 7b429eef4..0868d8279 100755
--- a/hutool-log/src/main/java/org/dromara/hutool/log/AbsLogEngine.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/AbsLogEngine.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log;
+package cn.hutool.v7.log;
 
-import org.dromara.hutool.log.engine.LogEngine;
+import cn.hutool.v7.log.engine.LogEngine;
 
 /**
  * 抽象日期引擎
      
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/AbstractLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/AbstractLog.java
similarity index 96%
rename from hutool-log/src/main/java/org/dromara/hutool/log/AbstractLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/AbstractLog.java
index 40f5facb4..19050733e 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/AbstractLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/AbstractLog.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log;
+package cn.hutool.v7.log;
 
-import org.dromara.hutool.core.exception.ExceptionUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.level.Level;
+import cn.hutool.v7.core.exception.ExceptionUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.level.Level;
 
 import java.io.Serializable;
 
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/Log.java b/hutool-log/src/main/java/cn/hutool/v7/log/Log.java
similarity index 86%
rename from hutool-log/src/main/java/org/dromara/hutool/log/Log.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/Log.java
index d7dbd04db..2398a3e7d 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/Log.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/Log.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log;
+package cn.hutool.v7.log;
 
-import org.dromara.hutool.core.lang.caller.CallerUtil;
-import org.dromara.hutool.log.level.DebugLog;
-import org.dromara.hutool.log.level.ErrorLog;
-import org.dromara.hutool.log.level.InfoLog;
-import org.dromara.hutool.log.level.Level;
-import org.dromara.hutool.log.level.TraceLog;
-import org.dromara.hutool.log.level.WarnLog;
+import cn.hutool.v7.core.lang.caller.CallerUtil;
+import cn.hutool.v7.log.level.DebugLog;
+import cn.hutool.v7.log.level.ErrorLog;
+import cn.hutool.v7.log.level.InfoLog;
+import cn.hutool.v7.log.level.Level;
+import cn.hutool.v7.log.level.TraceLog;
+import cn.hutool.v7.log.level.WarnLog;
 
 /**
  * 日志统一接口
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/LogFactory.java b/hutool-log/src/main/java/cn/hutool/v7/log/LogFactory.java
similarity index 92%
rename from hutool-log/src/main/java/org/dromara/hutool/log/LogFactory.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/LogFactory.java
index 198031d18..50de1a264 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/LogFactory.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/LogFactory.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log;
+package cn.hutool.v7.log;
 
-import org.dromara.hutool.log.engine.LogEngineFactory;
+import cn.hutool.v7.log.engine.LogEngineFactory;
 
 /**
  * 日志简单工厂类，提供带有缓存的日志对象创建
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/LogUtil.java b/hutool-log/src/main/java/cn/hutool/v7/log/LogUtil.java
similarity index 97%
rename from hutool-log/src/main/java/org/dromara/hutool/log/LogUtil.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/LogUtil.java
index 2142f6f41..0e252c705 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/LogUtil.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/LogUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log;
+package cn.hutool.v7.log;
 
-import org.dromara.hutool.core.lang.caller.CallerUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.level.Level;
+import cn.hutool.v7.core.lang.caller.CallerUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.level.Level;
 
 /**
  * 静态日志类，用于在不引入日志对象的情况下打印日志
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/LogEngine.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/LogEngine.java
similarity index 93%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/LogEngine.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/LogEngine.java
index 7b0261001..a89b19950 100755
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/LogEngine.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/LogEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine;
+package cn.hutool.v7.log.engine;
 
-import org.dromara.hutool.core.lang.Singleton;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.core.lang.Singleton;
+import cn.hutool.v7.log.Log;
 
 /**
  * 日期引擎接口
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/LogEngineFactory.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/LogEngineFactory.java
similarity index 85%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/LogEngineFactory.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/LogEngineFactory.java
index 82483bf09..ee78c67a9 100755
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/LogEngineFactory.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/LogEngineFactory.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine;
+package cn.hutool.v7.log.engine;
 
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.core.lang.Singleton;
-import org.dromara.hutool.core.reflect.ConstructorUtil;
-import org.dromara.hutool.core.spi.SpiUtil;
-import org.dromara.hutool.log.LogFactory;
-import org.dromara.hutool.log.engine.commons.ApacheCommonsLogEngine;
-import org.dromara.hutool.log.engine.console.ConsoleLogEngine;
-import org.dromara.hutool.log.engine.jdk.JdkLogEngine;
-import org.dromara.hutool.log.engine.log4j.Log4jLogEngine;
-import org.dromara.hutool.log.engine.log4j2.Log4j2LogEngine;
-import org.dromara.hutool.log.engine.slf4j.Slf4jLogEngine;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.lang.Singleton;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.spi.SpiUtil;
+import cn.hutool.v7.log.LogFactory;
+import cn.hutool.v7.log.engine.commons.ApacheCommonsLogEngine;
+import cn.hutool.v7.log.engine.console.ConsoleLogEngine;
+import cn.hutool.v7.log.engine.jdk.JdkLogEngine;
+import cn.hutool.v7.log.engine.log4j.Log4jLogEngine;
+import cn.hutool.v7.log.engine.log4j2.Log4j2LogEngine;
+import cn.hutool.v7.log.engine.slf4j.Slf4jLogEngine;
 
 import java.net.URL;
 
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLog.java
similarity index 96%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLog.java
index bb715a5ad..535a0f51c 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLog.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.commons;
+package cn.hutool.v7.log.engine.commons;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.AbstractLog;
-import org.dromara.hutool.log.level.Level;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.AbstractLog;
+import cn.hutool.v7.log.level.Level;
 
 /**
  * Apache Commons Logging
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog4JLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLog4JLog.java
similarity index 93%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog4JLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLog4JLog.java
index 11e322c3d..a1b43a3e6 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog4JLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLog4JLog.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.commons;
+package cn.hutool.v7.log.engine.commons;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.impl.Log4JLogger;
 
-import org.dromara.hutool.log.engine.log4j.Log4jLog;
+import cn.hutool.v7.log.engine.log4j.Log4jLog;
 
 /**
  * Apache Commons Logging for Log4j
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLogEngine.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLogEngine.java
similarity index 92%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLogEngine.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLogEngine.java
index d6291152d..8b54316a7 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLogEngine.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLogEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.commons;
+package cn.hutool.v7.log.engine.commons;
 
-import org.dromara.hutool.log.AbsLogEngine;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.log.AbsLogEngine;
+import cn.hutool.v7.log.Log;
 
 /**
  *  Apache Commons Logging
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/package-info.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/package-info.java
similarity index 93%
rename from hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/package-info.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/package-info.java
index 2f66be441..8ec6a4f16 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/lock/package-info.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/package-info.java
@@ -15,9 +15,9 @@
  */
 
 /**
- * 锁的实现
+ * Apache-Commons-Logging日志库的实现封装
  *
  * @author Looly
  *
  */
-package org.dromara.hutool.core.thread.lock;
+package cn.hutool.v7.log.engine.commons;
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleColorLog.java
similarity index 88%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleColorLog.java
index 25fc3bc97..06f3cb055 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleColorLog.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.console;
+package cn.hutool.v7.log.engine.console;
 
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.lang.ansi.Ansi4BitColor;
-import org.dromara.hutool.core.lang.ansi.AnsiEncoder;
-import org.dromara.hutool.core.reflect.ClassUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.level.Level;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.lang.ansi.Ansi4BitColor;
+import cn.hutool.v7.core.lang.ansi.AnsiEncoder;
+import cn.hutool.v7.core.reflect.ClassUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.level.Level;
 
 import java.util.function.Function;
 
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLogEngine.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleColorLogEngine.java
similarity index 89%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLogEngine.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleColorLogEngine.java
index 49c42200c..6c3ac5692 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLogEngine.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleColorLogEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.console;
+package cn.hutool.v7.log.engine.console;
 
-import org.dromara.hutool.log.AbsLogEngine;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.log.AbsLogEngine;
+import cn.hutool.v7.log.Log;
 
 /**
  * 利用System.out.println()打印彩色日志
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleLog.java
similarity index 92%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleLog.java
index 6d56148df..1e36dc2a0 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleLog.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.console;
+package cn.hutool.v7.log.engine.console;
 
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.map.Dict;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.AbstractLog;
-import org.dromara.hutool.log.level.Level;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.map.Dict;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.AbstractLog;
+import cn.hutool.v7.log.level.Level;
 
 /**
  * 利用System.out.println()打印日志
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLogEngine.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleLogEngine.java
similarity index 88%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLogEngine.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleLogEngine.java
index a5d874479..e72ca3313 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLogEngine.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleLogEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.console;
+package cn.hutool.v7.log.engine.console;
 
-import org.dromara.hutool.log.AbsLogEngine;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.log.AbsLogEngine;
+import cn.hutool.v7.log.Log;
 
 /**
  * 利用System.out.println()打印日志
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/package-info.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/package-info.java
similarity index 93%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/console/package-info.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/console/package-info.java
index 92643d422..cc412ce02 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/package-info.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.log.engine.console;
+package cn.hutool.v7.log.engine.console;
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/JbossLog.java
similarity index 95%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/JbossLog.java
index ab543ea94..da4583f98 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/JbossLog.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.jboss;
+package cn.hutool.v7.log.engine.jboss;
 
 import org.jboss.logging.Logger;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.AbstractLog;
-import org.dromara.hutool.log.level.Level;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.AbstractLog;
+import cn.hutool.v7.log.level.Level;
 
 /**
  * Jboss-Logging log.
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLogEngine.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/JbossLogEngine.java
similarity index 89%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLogEngine.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/JbossLogEngine.java
index 2e7965436..a1dbae8b5 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLogEngine.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/JbossLogEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.jboss;
+package cn.hutool.v7.log.engine.jboss;
 
-import org.dromara.hutool.log.AbsLogEngine;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.log.AbsLogEngine;
+import cn.hutool.v7.log.Log;
 
 /**
  * Jboss-Logging log.
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/package-info.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/package-info.java
similarity index 93%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/package-info.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/package-info.java
index 4c639060f..6a9bb2a0f 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/package-info.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.log.engine.jboss;
+package cn.hutool.v7.log.engine.jboss;
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jdk/JdkLog.java
similarity index 94%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/jdk/JdkLog.java
index 000e260a0..e028dcd38 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jdk/JdkLog.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.jdk;
+package cn.hutool.v7.log.engine.jdk;
 
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.AbstractLog;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.AbstractLog;
 
 /**
  * java.util.logging log.
@@ -109,7 +109,7 @@ public class JdkLog extends AbstractLog {
 
 	// ------------------------------------------------------------------------- Log
 	@Override
-	public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
+	public void log(final String fqcn, final cn.hutool.v7.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
 		final Level jdkLevel;
 		switch (level) {
 			case TRACE:
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLogEngine.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jdk/JdkLogEngine.java
similarity index 88%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLogEngine.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/jdk/JdkLogEngine.java
index 21f2cc216..5f1f911aa 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLogEngine.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jdk/JdkLogEngine.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.jdk;
+package cn.hutool.v7.log.engine.jdk;
 
 import java.io.InputStream;
 import java.util.logging.LogManager;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.log.AbsLogEngine;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.log.AbsLogEngine;
+import cn.hutool.v7.log.Log;
 
 /**
  * JDK日志工厂类
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/package-info.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jdk/package-info.java
similarity index 94%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/package-info.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/jdk/package-info.java
index 18249dce9..b9a83a209 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/package-info.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jdk/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.log.engine.jdk;
+package cn.hutool.v7.log.engine.jdk;
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j/Log4jLog.java
similarity index 84%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j/Log4jLog.java
index 78d82cb0b..e813cae3c 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j/Log4jLog.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.log4j;
+package cn.hutool.v7.log.engine.log4j;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.AbstractLog;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.AbstractLog;
 
 /**
  * Apache Log4J log.
      
@@ -74,7 +74,7 @@ public class Log4jLog extends AbstractLog {
 
 	@Override
 	public void trace(final String fqcn, final Throwable t, final String format, final Object... arguments) {
-		log(fqcn, org.dromara.hutool.log.level.Level.TRACE, t, format, arguments);
+		log(fqcn, cn.hutool.v7.log.level.Level.TRACE, t, format, arguments);
 	}
 
 	// ------------------------------------------------------------------------- Debug
@@ -85,7 +85,7 @@ public class Log4jLog extends AbstractLog {
 
 	@Override
 	public void debug(final String fqcn, final Throwable t, final String format, final Object... arguments) {
-		log(fqcn, org.dromara.hutool.log.level.Level.DEBUG, t, format, arguments);
+		log(fqcn, cn.hutool.v7.log.level.Level.DEBUG, t, format, arguments);
 	}
 	// ------------------------------------------------------------------------- Info
 	@Override
@@ -95,7 +95,7 @@ public class Log4jLog extends AbstractLog {
 
 	@Override
 	public void info(final String fqcn, final Throwable t, final String format, final Object... arguments) {
-		log(fqcn, org.dromara.hutool.log.level.Level.INFO, t, format, arguments);
+		log(fqcn, cn.hutool.v7.log.level.Level.INFO, t, format, arguments);
 	}
 
 	// ------------------------------------------------------------------------- Warn
@@ -106,7 +106,7 @@ public class Log4jLog extends AbstractLog {
 
 	@Override
 	public void warn(final String fqcn, final Throwable t, final String format, final Object... arguments) {
-		log(fqcn, org.dromara.hutool.log.level.Level.WARN, t, format, arguments);
+		log(fqcn, cn.hutool.v7.log.level.Level.WARN, t, format, arguments);
 	}
 
 	// ------------------------------------------------------------------------- Error
@@ -117,12 +117,12 @@ public class Log4jLog extends AbstractLog {
 
 	@Override
 	public void error(final String fqcn, final Throwable t, final String format, final Object... arguments) {
-		log(fqcn, org.dromara.hutool.log.level.Level.ERROR, t, format, arguments);
+		log(fqcn, cn.hutool.v7.log.level.Level.ERROR, t, format, arguments);
 	}
 
 	// ------------------------------------------------------------------------- Log
 	@Override
-	public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
+	public void log(final String fqcn, final cn.hutool.v7.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
 		final Level log4jLevel;
 		switch (level) {
 			case TRACE:
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLogEngine.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j/Log4jLogEngine.java
similarity index 89%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLogEngine.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j/Log4jLogEngine.java
index 6b29229d7..b64b3a2e8 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLogEngine.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j/Log4jLogEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.log4j;
+package cn.hutool.v7.log.engine.log4j;
 
-import org.dromara.hutool.log.AbsLogEngine;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.log.AbsLogEngine;
+import cn.hutool.v7.log.Log;
 
 /**
  * Apache Log4J log.
      
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/package-info.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j/package-info.java
similarity index 93%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/package-info.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j/package-info.java
index aa23bfb75..e7757ae8f 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/package-info.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.log.engine.log4j;
+package cn.hutool.v7.log.engine.log4j;
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2Log.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2Log.java
similarity index 94%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2Log.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2Log.java
index bb0065346..2cf162821 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2Log.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2Log.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.log4j2;
+package cn.hutool.v7.log.engine.log4j2;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.spi.AbstractLogger;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.AbstractLog;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.AbstractLog;
 
 /**
  * Apache Log4J 2 log.
      
@@ -124,7 +124,7 @@ public class Log4j2Log extends AbstractLog {
 
 	// ------------------------------------------------------------------------- Log
 	@Override
-	public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
+	public void log(final String fqcn, final cn.hutool.v7.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
 		final Level log4j2Level;
 		switch (level) {
 			case TRACE:
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2LogEngine.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2LogEngine.java
similarity index 89%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2LogEngine.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2LogEngine.java
index 687f9f3b6..31c78c934 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2LogEngine.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2LogEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.log4j2;
+package cn.hutool.v7.log.engine.log4j2;
 
-import org.dromara.hutool.log.AbsLogEngine;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.log.AbsLogEngine;
+import cn.hutool.v7.log.Log;
 
 /**
  * Apache Log4J 2 log.
      
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/package-info.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/package-info.java
similarity index 93%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/package-info.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/package-info.java
index 38312db77..a084edff4 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/package-info.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.log.engine.log4j2;
+package cn.hutool.v7.log.engine.log4j2;
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/package-info.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/package-info.java
similarity index 94%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/package-info.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/package-info.java
index d6baa19a1..7569e311a 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/package-info.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.log.engine;
+package cn.hutool.v7.log.engine;
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLog.java
similarity index 97%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLog.java
index 0717fb1ed..b80848171 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLog.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.slf4j;
+package cn.hutool.v7.log.engine.slf4j;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.spi.LocationAwareLogger;
 
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.AbstractLog;
-import org.dromara.hutool.log.level.Level;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.AbstractLog;
+import cn.hutool.v7.log.level.Level;
 
 /**
  * SLF4J log.
      
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLogEngine.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLogEngine.java
similarity index 94%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLogEngine.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLogEngine.java
index 8b91d3902..95730db49 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLogEngine.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLogEngine.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.slf4j;
+package cn.hutool.v7.log.engine.slf4j;
 
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 
-import org.dromara.hutool.log.AbsLogEngine;
+import cn.hutool.v7.log.AbsLogEngine;
 import org.slf4j.LoggerFactory;
 import org.slf4j.helpers.NOPLoggerFactory;
 
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.log.Log;
 
 /**
  * SLF4J log.
      
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/package-info.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/package-info.java
similarity index 93%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/package-info.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/package-info.java
index 7d47885c6..7d3484be9 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/package-info.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.log.engine.slf4j;
+package cn.hutool.v7.log.engine.slf4j;
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog.java
similarity index 91%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog.java
index 25b63c674..10c11b7c9 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.tinylog;
+package cn.hutool.v7.log.engine.tinylog;
 
-import org.dromara.hutool.log.AbstractLog;
+import cn.hutool.v7.log.AbstractLog;
 import org.pmw.tinylog.Level;
 import org.pmw.tinylog.LogEntryForwarder;
 import org.pmw.tinylog.Logger;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * tinylog log.
      
@@ -122,12 +122,12 @@ public class TinyLog extends AbstractLog {
 
 	// ------------------------------------------------------------------------- Log
 	@Override
-	public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
+	public void log(final String fqcn, final cn.hutool.v7.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
 		logIfEnabled(fqcn, toTinyLevel(level), t, format, arguments);
 	}
 
 	@Override
-	public boolean isEnabled(final org.dromara.hutool.log.level.Level level) {
+	public boolean isEnabled(final cn.hutool.v7.log.level.Level level) {
 		return this.level <= toTinyLevel(level).ordinal();
 	}
 
@@ -155,7 +155,7 @@ public class TinyLog extends AbstractLog {
 	 * @return Tinylog的Level
 	 * @since 4.0.3
 	 */
-	private Level toTinyLevel(final org.dromara.hutool.log.level.Level level) {
+	private Level toTinyLevel(final cn.hutool.v7.log.level.Level level) {
 		final Level tinyLevel;
 		switch (level) {
 			case TRACE:
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog2.java
similarity index 92%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog2.java
index 2fd912b9f..c7bd13c33 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog2.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.tinylog;
+package cn.hutool.v7.log.engine.tinylog;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.AbstractLog;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.AbstractLog;
 import org.tinylog.Level;
 import org.tinylog.configuration.Configuration;
 import org.tinylog.format.AdvancedMessageFormatter;
@@ -130,12 +130,12 @@ public class TinyLog2 extends AbstractLog {
 
 	// ------------------------------------------------------------------------- Log
 	@Override
-	public void log(final String fqcn, final org.dromara.hutool.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
+	public void log(final String fqcn, final cn.hutool.v7.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
 		logIfEnabled(fqcn, toTinyLevel(level), t, format, arguments);
 	}
 
 	@Override
-	public boolean isEnabled(final org.dromara.hutool.log.level.Level level) {
+	public boolean isEnabled(final cn.hutool.v7.log.level.Level level) {
 		return this.level <= toTinyLevel(level).ordinal();
 	}
 
@@ -164,7 +164,7 @@ public class TinyLog2 extends AbstractLog {
 	 * @return Tinylog的Level
 	 * @since 4.0.3
 	 */
-	private Level toTinyLevel(final org.dromara.hutool.log.level.Level level) {
+	private Level toTinyLevel(final cn.hutool.v7.log.level.Level level) {
 		final Level tinyLevel;
 		switch (level) {
 			case TRACE:
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2Engine.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog2Engine.java
similarity index 89%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2Engine.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog2Engine.java
index 9ef9e91bd..97ea80f79 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2Engine.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog2Engine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.tinylog;
+package cn.hutool.v7.log.engine.tinylog;
 
-import org.dromara.hutool.log.AbsLogEngine;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.log.AbsLogEngine;
+import cn.hutool.v7.log.Log;
 
 /**
  * TinyLog2 log.
      
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLogEngine.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLogEngine.java
similarity index 89%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLogEngine.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLogEngine.java
index cfaf444e1..00048fc64 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLogEngine.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLogEngine.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.engine.tinylog;
+package cn.hutool.v7.log.engine.tinylog;
 
-import org.dromara.hutool.log.AbsLogEngine;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.log.AbsLogEngine;
+import cn.hutool.v7.log.Log;
 
 /**
  * TinyLog log.
      
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/package-info.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/package-info.java
similarity index 94%
rename from hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/package-info.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/package-info.java
index 39bd89c44..be387b24b 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/package-info.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/package-info.java
@@ -20,4 +20,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.log.engine.tinylog;
+package cn.hutool.v7.log.engine.tinylog;
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/level/DebugLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/level/DebugLog.java
similarity index 97%
rename from hutool-log/src/main/java/org/dromara/hutool/log/level/DebugLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/level/DebugLog.java
index 14c4b6038..22fc70559 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/level/DebugLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/level/DebugLog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.level;
+package cn.hutool.v7.log.level;
 
 /**
  * DEBUG级别日志接口
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/level/ErrorLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/level/ErrorLog.java
similarity index 97%
rename from hutool-log/src/main/java/org/dromara/hutool/log/level/ErrorLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/level/ErrorLog.java
index 8c76b7548..429987a6d 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/level/ErrorLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/level/ErrorLog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.level;
+package cn.hutool.v7.log.level;
 
 /**
  * ERROR级别日志接口
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/level/InfoLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/level/InfoLog.java
similarity index 97%
rename from hutool-log/src/main/java/org/dromara/hutool/log/level/InfoLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/level/InfoLog.java
index 80c723802..574393c70 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/level/InfoLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/level/InfoLog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.level;
+package cn.hutool.v7.log.level;
 
 /**
  * INFO级别日志接口
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/level/Level.java b/hutool-log/src/main/java/cn/hutool/v7/log/level/Level.java
similarity index 96%
rename from hutool-log/src/main/java/org/dromara/hutool/log/level/Level.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/level/Level.java
index 73492474f..52ac6878a 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/level/Level.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/level/Level.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.level;
+package cn.hutool.v7.log.level;
 
 /**
  * 日志等级
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/level/TraceLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/level/TraceLog.java
similarity index 97%
rename from hutool-log/src/main/java/org/dromara/hutool/log/level/TraceLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/level/TraceLog.java
index 7e2908206..60c6deae6 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/level/TraceLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/level/TraceLog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.level;
+package cn.hutool.v7.log.level;
 
 /**
  * TRACE级别日志接口
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/level/WarnLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/level/WarnLog.java
similarity index 97%
rename from hutool-log/src/main/java/org/dromara/hutool/log/level/WarnLog.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/level/WarnLog.java
index dec51b2f7..be415c533 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/level/WarnLog.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/level/WarnLog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log.level;
+package cn.hutool.v7.log.level;
 
 /**
  * WARN级别日志接口
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/level/package-info.java b/hutool-log/src/main/java/cn/hutool/v7/log/level/package-info.java
similarity index 94%
rename from hutool-log/src/main/java/org/dromara/hutool/log/level/package-info.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/level/package-info.java
index 1def4bb9c..2353fccea 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/level/package-info.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/level/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.log.level;
+package cn.hutool.v7.log.level;
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/package-info.java b/hutool-log/src/main/java/cn/hutool/v7/log/package-info.java
similarity index 96%
rename from hutool-log/src/main/java/org/dromara/hutool/log/package-info.java
rename to hutool-log/src/main/java/cn/hutool/v7/log/package-info.java
index 6165db803..a0f6e6a8e 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/package-info.java
+++ b/hutool-log/src/main/java/cn/hutool/v7/log/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.log;
+package cn.hutool.v7.log;
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/package-info.java
deleted file mode 100644
index b3fe48ae6..000000000
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2013-2025 Hutool Team and hutool.cn
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Apache-Commons-Logging日志库的实现封装
- *
- * @author Looly
- *
- */
-package org.dromara.hutool.log.engine.commons;
diff --git a/hutool-db/src/main/resources/META-INF/services/org.dromara.hutool.db.ds.DSFactory b/hutool-log/src/main/resources/META-INF/services/cn.hutool.v7.log.engine.LogEngine
similarity index 64%
rename from hutool-db/src/main/resources/META-INF/services/org.dromara.hutool.db.ds.DSFactory
rename to hutool-log/src/main/resources/META-INF/services/cn.hutool.v7.log.engine.LogEngine
index 51eb57276..4da845de2 100644
--- a/hutool-db/src/main/resources/META-INF/services/org.dromara.hutool.db.ds.DSFactory
+++ b/hutool-log/src/main/resources/META-INF/services/cn.hutool.v7.log.engine.LogEngine
@@ -14,10 +14,10 @@
 # limitations under the License.
 #
 
-org.dromara.hutool.db.ds.hikari.HikariDSFactory
-org.dromara.hutool.db.ds.druid.DruidDSFactory
-org.dromara.hutool.db.ds.tomcat.TomcatDSFactory
-org.dromara.hutool.db.ds.bee.BeeDSFactory
-org.dromara.hutool.db.ds.dbcp.DbcpDSFactory
-org.dromara.hutool.db.ds.c3p0.C3p0DSFactory
-org.dromara.hutool.db.ds.pooled.PooledDSFactory
+cn.hutool.v7.log.engine.slf4j.Slf4jLogEngine
+cn.hutool.v7.log.engine.log4j2.Log4j2LogEngine
+cn.hutool.v7.log.engine.log4j.Log4jLogEngine
+cn.hutool.v7.log.engine.commons.ApacheCommonsLogEngine
+cn.hutool.v7.log.engine.tinylog.TinyLog2Engine
+cn.hutool.v7.log.engine.tinylog.TinyLogEngine
+cn.hutool.v7.log.engine.jboss.JbossLogEngine
diff --git a/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.engine.LogEngine b/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.engine.LogEngine
deleted file mode 100644
index 6f80dc10a..000000000
--- a/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.engine.LogEngine
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2013-2025 Hutool Team and hutool.cn
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.dromara.hutool.log.engine.slf4j.Slf4jLogEngine
-org.dromara.hutool.log.engine.log4j2.Log4j2LogEngine
-org.dromara.hutool.log.engine.log4j.Log4jLogEngine
-org.dromara.hutool.log.engine.commons.ApacheCommonsLogEngine
-org.dromara.hutool.log.engine.tinylog.TinyLog2Engine
-org.dromara.hutool.log.engine.tinylog.TinyLogEngine
-org.dromara.hutool.log.engine.jboss.JbossLogEngine
diff --git a/hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java b/hutool-log/src/test/java/cn/hutool/v7/log/CustomLogTest.java
similarity index 84%
rename from hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java
rename to hutool-log/src/test/java/cn/hutool/v7/log/CustomLogTest.java
index bdfa3c5ae..11b9eb183 100644
--- a/hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java
+++ b/hutool-log/src/test/java/cn/hutool/v7/log/CustomLogTest.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log;
+package cn.hutool.v7.log;
 
-import org.dromara.hutool.log.engine.LogEngine;
-import org.dromara.hutool.log.engine.LogEngineFactory;
-import org.dromara.hutool.log.engine.commons.ApacheCommonsLogEngine;
-import org.dromara.hutool.log.engine.console.ConsoleLogEngine;
-import org.dromara.hutool.log.engine.jboss.JbossLogEngine;
-import org.dromara.hutool.log.engine.jdk.JdkLogEngine;
-import org.dromara.hutool.log.engine.log4j.Log4jLogEngine;
-import org.dromara.hutool.log.engine.log4j2.Log4j2LogEngine;
-import org.dromara.hutool.log.engine.slf4j.Slf4jLogEngine;
-import org.dromara.hutool.log.engine.tinylog.TinyLog2Engine;
-import org.dromara.hutool.log.engine.tinylog.TinyLogEngine;
+import cn.hutool.v7.log.engine.LogEngine;
+import cn.hutool.v7.log.engine.LogEngineFactory;
+import cn.hutool.v7.log.engine.commons.ApacheCommonsLogEngine;
+import cn.hutool.v7.log.engine.console.ConsoleLogEngine;
+import cn.hutool.v7.log.engine.jboss.JbossLogEngine;
+import cn.hutool.v7.log.engine.jdk.JdkLogEngine;
+import cn.hutool.v7.log.engine.log4j.Log4jLogEngine;
+import cn.hutool.v7.log.engine.log4j2.Log4j2LogEngine;
+import cn.hutool.v7.log.engine.slf4j.Slf4jLogEngine;
+import cn.hutool.v7.log.engine.tinylog.TinyLog2Engine;
+import cn.hutool.v7.log.engine.tinylog.TinyLogEngine;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/hutool-log/src/test/java/org/dromara/hutool/log/LogTest.java b/hutool-log/src/test/java/cn/hutool/v7/log/LogTest.java
similarity index 95%
rename from hutool-log/src/test/java/org/dromara/hutool/log/LogTest.java
rename to hutool-log/src/test/java/cn/hutool/v7/log/LogTest.java
index 5c1c7d6ab..b5018e253 100644
--- a/hutool-log/src/test/java/org/dromara/hutool/log/LogTest.java
+++ b/hutool-log/src/test/java/cn/hutool/v7/log/LogTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log;
+package cn.hutool.v7.log;
 
-import org.dromara.hutool.log.level.Level;
+import cn.hutool.v7.log.level.Level;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-log/src/test/java/org/dromara/hutool/log/LogUtilTest.java b/hutool-log/src/test/java/cn/hutool/v7/log/LogUtilTest.java
similarity index 83%
rename from hutool-log/src/test/java/org/dromara/hutool/log/LogUtilTest.java
rename to hutool-log/src/test/java/cn/hutool/v7/log/LogUtilTest.java
index 81cdeea2a..31fc36fb6 100644
--- a/hutool-log/src/test/java/org/dromara/hutool/log/LogUtilTest.java
+++ b/hutool-log/src/test/java/cn/hutool/v7/log/LogUtilTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log;
+package cn.hutool.v7.log;
 
-import org.dromara.hutool.log.engine.LogEngineFactory;
-import org.dromara.hutool.log.engine.console.ConsoleColorLogEngine;
-import org.dromara.hutool.log.engine.console.ConsoleLogEngine;
-import org.dromara.hutool.log.engine.log4j2.Log4j2LogEngine;
+import cn.hutool.v7.log.engine.LogEngineFactory;
+import cn.hutool.v7.log.engine.console.ConsoleColorLogEngine;
+import cn.hutool.v7.log.engine.console.ConsoleLogEngine;
+import cn.hutool.v7.log.engine.log4j2.Log4j2LogEngine;
 import org.junit.jupiter.api.Test;
 
 public class LogUtilTest {
diff --git a/hutool-log/src/test/java/org/dromara/hutool/log/StaticLogTest.java b/hutool-log/src/test/java/cn/hutool/v7/log/StaticLogTest.java
similarity index 96%
rename from hutool-log/src/test/java/org/dromara/hutool/log/StaticLogTest.java
rename to hutool-log/src/test/java/cn/hutool/v7/log/StaticLogTest.java
index 95cf0e13b..6052a06ac 100644
--- a/hutool-log/src/test/java/org/dromara/hutool/log/StaticLogTest.java
+++ b/hutool-log/src/test/java/cn/hutool/v7/log/StaticLogTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.log;
+package cn.hutool.v7.log;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml
index f18b4313e..2084b6960 100755
--- a/hutool-poi/pom.xml
+++ b/hutool-poi/pom.xml
@@ -23,9 +23,9 @@
 	jar
 
 	
-		org.dromara.hutool
+		cn.hutool.v7
 		hutool-parent
-		6.0.0-M22
+		7.0.0.M1
 	
 
 	hutool-poi
@@ -33,7 +33,7 @@
 	Hutool POI工具类（对Office文档、OFD等操作）
 
 	
-		org.dromara.hutool.poi
+		cn.hutool.v7.poi
 		
 		5.3.0
 		2.20.0
@@ -41,7 +41,7 @@
 
 	
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-core
 			${project.parent.version}
 		
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/GlobalPoiConfig.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/GlobalPoiConfig.java
similarity index 98%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/GlobalPoiConfig.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/GlobalPoiConfig.java
index a3929ada8..547910295 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/GlobalPoiConfig.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/GlobalPoiConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi;
+package cn.hutool.v7.poi;
 
 import org.apache.poi.openxml4j.util.ZipSecureFile;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/POIException.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/POIException.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/POIException.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/POIException.java
index 0e1b80061..d6c40bd5a 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/POIException.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/POIException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi;
+package cn.hutool.v7.poi;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * POI异常
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/PoiChecker.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/PoiChecker.java
similarity index 88%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/PoiChecker.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/PoiChecker.java
index 66d606262..f851411f4 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/PoiChecker.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/PoiChecker.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi;
+package cn.hutool.v7.poi;
 
-import org.dromara.hutool.core.exception.DependencyException;
-import org.dromara.hutool.core.classloader.ClassLoaderUtil;
+import cn.hutool.v7.core.exception.DependencyException;
+import cn.hutool.v7.core.classloader.ClassLoaderUtil;
 
 /**
  * POI引入检查器
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvBaseReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvBaseReader.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvBaseReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvBaseReader.java
index 22216bbe9..e38c8368c 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvBaseReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvBaseReader.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.func.SerConsumer;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.file.PathUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.core.util.ObjUtil;
+import cn.hutool.v7.core.func.SerConsumer;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.PathUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 
 import java.io.File;
 import java.io.Reader;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvConfig.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvConfig.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvConfig.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvConfig.java
index eeaded830..6a40f6fea 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvConfig.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvConfig.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.text.CharUtil;
+import cn.hutool.v7.core.text.CharUtil;
 
 import java.io.Serializable;
 import java.util.LinkedHashMap;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvData.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvData.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvData.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvData.java
index 04c0b0f71..a7a8c2bd6 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvData.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvData.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.collection.ListUtil;
+import cn.hutool.v7.core.collection.ListUtil;
 
 import java.io.Serializable;
 import java.util.Iterator;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvParser.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvParser.java
index 4a77ee91c..eeb80f087 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvParser.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.collection.iter.ComputeIter;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrTrimer;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
+import cn.hutool.v7.core.collection.iter.ComputeIter;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrTrimer;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReadConfig.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvReadConfig.java
similarity index 99%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReadConfig.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvReadConfig.java
index 0aa8173b8..1acbf644a 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReadConfig.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvReadConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
 import java.io.Serializable;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvReader.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvReader.java
index afcf98549..7bf9dac33 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvReader.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-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.func.SerConsumer;
-import org.dromara.hutool.core.io.file.PathUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.func.SerConsumer;
+import cn.hutool.v7.core.io.file.PathUtil;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvRow.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvRow.java
similarity index 94%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvRow.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvRow.java
index f1e2eb3d7..417e8df9f 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvRow.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvRow.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.bean.BeanUtil;
-import org.dromara.hutool.core.bean.copier.CopyOptions;
-import org.dromara.hutool.core.collection.ListWrapper;
-import org.dromara.hutool.core.lang.Assert;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.bean.copier.CopyOptions;
+import cn.hutool.v7.core.collection.ListWrapper;
+import cn.hutool.v7.core.lang.Assert;
 
 import java.util.*;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvTokener.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvTokener.java
similarity index 91%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvTokener.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvTokener.java
index 8b471b79f..81e7c8fa1 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvTokener.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvTokener.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvUtil.java
similarity index 99%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvUtil.java
index 9a1898862..a1a3bac29 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
 import java.io.File;
 import java.io.Reader;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriteConfig.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriteConfig.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriteConfig.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriteConfig.java
index 8bffca17c..582d1e9f1 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriteConfig.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriteConfig.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.text.CharUtil;
+import cn.hutool.v7.core.text.CharUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriter.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriter.java
index 6c3b1c3c8..366247222 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriter.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-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.ConvertUtil;
-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.text.CharUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.core.util.ObjUtil;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.iter.ArrayIter;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 
 import java.io.*;
 import java.nio.charset.Charset;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/package-info.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/csv/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/csv/package-info.java
index 93ab89a95..b71a59e13 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/package-info.java
@@ -21,4 +21,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelBase.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelBase.java
similarity index 98%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelBase.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelBase.java
index 211de3844..affa49d2f 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelBase.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
 import org.apache.poi.common.usermodel.HyperlinkType;
 import org.apache.poi.ss.usermodel.*;
@@ -22,10 +22,10 @@ import org.apache.poi.ss.util.CellReference;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.poi.excel.cell.CellUtil;
-import org.dromara.hutool.poi.excel.style.StyleUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.poi.excel.cell.CellUtil;
+import cn.hutool.v7.poi.excel.style.StyleUtil;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelConfig.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelConfig.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelConfig.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelConfig.java
index e4362f1a4..f1e5a10f1 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelConfig.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelConfig.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.poi.excel.cell.editors.CellEditor;
-import org.dromara.hutool.poi.excel.cell.CellReferenceUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.poi.excel.cell.editors.CellEditor;
+import cn.hutool.v7.poi.excel.cell.CellReferenceUtil;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelDateUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelDateUtil.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelDateUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelDateUtil.java
index 1c9f42419..94e31c2d3 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelDateUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelDateUtil.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.text.StrUtil;
 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/org/dromara/hutool/poi/excel/ExcelExtractorUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelExtractorUtil.java
similarity index 98%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelExtractorUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelExtractorUtil.java
index 3aa117d95..4005d6aa9 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelExtractorUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelExtractorUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.extractor.ExcelExtractor;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelFileUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelFileUtil.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelFileUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelFileUtil.java
index 0f93e80c4..81c320928 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelFileUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelFileUtil.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
-import org.dromara.hutool.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IORuntimeException;
 import org.apache.poi.poifs.filesystem.FileMagic;
 
 import java.io.File;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelUtil.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelUtil.java
index 401eb49ea..e833c3176 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelUtil.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
-import org.dromara.hutool.core.exception.DependencyException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.poi.PoiChecker;
-import org.dromara.hutool.poi.excel.reader.ExcelReader;
-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 org.dromara.hutool.poi.excel.writer.BigExcelWriter;
-import org.dromara.hutool.poi.excel.writer.ExcelWriter;
+import cn.hutool.v7.core.exception.DependencyException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.poi.PoiChecker;
+import cn.hutool.v7.poi.excel.reader.ExcelReader;
+import cn.hutool.v7.poi.excel.sax.ExcelSaxReader;
+import cn.hutool.v7.poi.excel.sax.ExcelSaxUtil;
+import cn.hutool.v7.poi.excel.sax.handler.RowHandler;
+import cn.hutool.v7.poi.excel.writer.BigExcelWriter;
+import cn.hutool.v7.poi.excel.writer.ExcelWriter;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/RowGroup.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/RowGroup.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/RowGroup.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/RowGroup.java
index 8a0f7c4b9..cb3b0dfcf 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/RowGroup.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/RowGroup.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
 import org.apache.poi.ss.usermodel.CellStyle;
-import org.dromara.hutool.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.CollUtil;
 
 import java.io.Serializable;
 import java.util.LinkedList;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/RowUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/RowUtil.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/RowUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/RowUtil.java
index e4d188fa4..d48153e8b 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/RowUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/RowUtil.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.poi.excel.cell.editors.CellEditor;
-import org.dromara.hutool.poi.excel.cell.CellUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.poi.excel.cell.editors.CellEditor;
+import cn.hutool.v7.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;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeUtil;
-import org.dromara.hutool.poi.excel.style.StyleSet;
+import cn.hutool.v7.poi.excel.style.StyleSet;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/SheetUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/SheetUtil.java
similarity index 98%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/SheetUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/SheetUtil.java
index ce8bc6cf6..52bd36c81 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/SheetUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/SheetUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
 import org.apache.poi.ss.usermodel.IgnoredErrorType;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -24,7 +24,7 @@ import org.apache.poi.ss.util.cellwalk.CellHandler;
 import org.apache.poi.ss.util.cellwalk.CellWalk;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.dromara.hutool.core.reflect.FieldUtil;
+import cn.hutool.v7.core.reflect.FieldUtil;
 
 /**
  * {@link Sheet}相关工具类
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/SimpleClientAnchor.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/SimpleClientAnchor.java
similarity index 99%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/SimpleClientAnchor.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/SimpleClientAnchor.java
index 9a91a4a3a..fb63792ed 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/SimpleClientAnchor.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/SimpleClientAnchor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
 import org.apache.poi.ss.usermodel.ClientAnchor;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/WorkbookUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/WorkbookUtil.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/WorkbookUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/WorkbookUtil.java
index f1c5ccdd2..257e13bae 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/WorkbookUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/WorkbookUtil.java
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-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 org.dromara.hutool.poi.POIException;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.poi.POIException;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellRangeUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/CellRangeUtil.java
similarity index 99%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellRangeUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/CellRangeUtil.java
index 27df97c6f..2cb1faca8 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellRangeUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/CellRangeUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell;
+package cn.hutool.v7.poi.excel.cell;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Sheet;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellReferenceUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/CellReferenceUtil.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellReferenceUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/CellReferenceUtil.java
index 3e0754a6e..6798827e6 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellReferenceUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/CellReferenceUtil.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell;
+package cn.hutool.v7.poi.excel.cell;
 
 import org.apache.poi.ss.util.CellReference;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * 单元格位置{@link CellReference}工具类，提供包括行号转行名称、列号转列名称等功能。
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/CellUtil.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/CellUtil.java
index 04f98b952..4ca2b51e0 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/CellUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/CellUtil.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell;
+package cn.hutool.v7.poi.excel.cell;
 
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellReference;
-import org.dromara.hutool.poi.excel.RowUtil;
-import org.dromara.hutool.poi.excel.SheetUtil;
-import org.dromara.hutool.poi.excel.cell.editors.CellEditor;
-import org.dromara.hutool.poi.excel.cell.editors.TrimEditor;
-import org.dromara.hutool.poi.excel.cell.setters.CellSetter;
-import org.dromara.hutool.poi.excel.cell.setters.CellSetterFactory;
-import org.dromara.hutool.poi.excel.cell.values.CompositeCellValue;
-import org.dromara.hutool.poi.excel.style.StyleSet;
-import org.dromara.hutool.poi.excel.style.StyleUtil;
+import cn.hutool.v7.poi.excel.RowUtil;
+import cn.hutool.v7.poi.excel.SheetUtil;
+import cn.hutool.v7.poi.excel.cell.editors.CellEditor;
+import cn.hutool.v7.poi.excel.cell.editors.TrimEditor;
+import cn.hutool.v7.poi.excel.cell.setters.CellSetter;
+import cn.hutool.v7.poi.excel.cell.setters.CellSetterFactory;
+import cn.hutool.v7.poi.excel.cell.values.CompositeCellValue;
+import cn.hutool.v7.poi.excel.style.StyleSet;
+import cn.hutool.v7.poi.excel.style.StyleUtil;
 
 /**
  * Excel表格中单元格工具类
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/MergedCell.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/MergedCell.java
similarity index 98%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/MergedCell.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/MergedCell.java
index 9f5e80e5a..92a6ede0c 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/MergedCell.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/MergedCell.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell;
+package cn.hutool.v7.poi.excel.cell;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/NullCell.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/NullCell.java
similarity index 99%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/NullCell.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/NullCell.java
index ee932d745..9f0ea80cf 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/NullCell.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/NullCell.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell;
+package cn.hutool.v7.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/org/dromara/hutool/poi/excel/cell/VirtualCell.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/VirtualCell.java
similarity index 98%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/VirtualCell.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/VirtualCell.java
index 9e4e5a433..1bb5687de 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/VirtualCell.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/VirtualCell.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell;
+package cn.hutool.v7.poi.excel.cell;
 
 import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.dromara.hutool.poi.excel.cell.values.FormulaCellValue;
+import cn.hutool.v7.poi.excel.cell.values.FormulaCellValue;
 
 import java.time.LocalDateTime;
 import java.util.Calendar;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/CellEditor.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/editors/CellEditor.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/CellEditor.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/editors/CellEditor.java
index 6f24efa50..0dac7574b 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/CellEditor.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/editors/CellEditor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.editors;
+package cn.hutool.v7.poi.excel.cell.editors;
 
 import org.apache.poi.ss.usermodel.Cell;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/NumericToIntEditor.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/editors/NumericToIntEditor.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/NumericToIntEditor.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/editors/NumericToIntEditor.java
index cbd67a4c7..d66606749 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/NumericToIntEditor.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/editors/NumericToIntEditor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.editors;
+package cn.hutool.v7.poi.excel.cell.editors;
 
 import org.apache.poi.ss.usermodel.Cell;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/TrimEditor.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/editors/TrimEditor.java
similarity index 90%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/TrimEditor.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/editors/TrimEditor.java
index 29ea5fe47..b27f7c287 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/TrimEditor.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/editors/TrimEditor.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.editors;
+package cn.hutool.v7.poi.excel.cell.editors;
 
 import org.apache.poi.ss.usermodel.Cell;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * 去除String类型的单元格值两边的空格
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/editors/package-info.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/editors/package-info.java
index 50d661511..ff24d8a0f 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/editors/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/editors/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.poi.excel.cell.editors;
+package cn.hutool.v7.poi.excel.cell.editors;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/package-info.java
similarity index 94%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/package-info.java
index 9269a5f3a..4b45760a9 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/package-info.java
@@ -19,4 +19,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.poi.excel.cell;
+package cn.hutool.v7.poi.excel.cell;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/BooleanCellSetter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/BooleanCellSetter.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/BooleanCellSetter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/BooleanCellSetter.java
index b2a17a7ba..760acd4e8 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/BooleanCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/BooleanCellSetter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
 import org.apache.poi.ss.usermodel.Cell;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CalendarCellSetter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/CalendarCellSetter.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CalendarCellSetter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/CalendarCellSetter.java
index 6f4024ec2..a43fd5b37 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CalendarCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/CalendarCellSetter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
 import org.apache.poi.ss.usermodel.Cell;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CellSetter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/CellSetter.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CellSetter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/CellSetter.java
index c9ebed630..2f9b75ee5 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/CellSetter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
 import org.apache.poi.ss.usermodel.Cell;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CellSetterFactory.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/CellSetterFactory.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CellSetterFactory.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/CellSetterFactory.java
index e8e86c48a..6426adcdb 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CellSetterFactory.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/CellSetterFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
 import org.apache.poi.ss.usermodel.Hyperlink;
 import org.apache.poi.ss.usermodel.RichTextString;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CharSequenceCellSetter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/CharSequenceCellSetter.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CharSequenceCellSetter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/CharSequenceCellSetter.java
index 8a1b75695..75e091c9b 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/CharSequenceCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/CharSequenceCellSetter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
 import org.apache.poi.ss.usermodel.Cell;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/DateCellSetter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/DateCellSetter.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/DateCellSetter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/DateCellSetter.java
index b928bf843..6b6e44517 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/DateCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/DateCellSetter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
 import org.apache.poi.ss.usermodel.Cell;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/EscapeStrCellSetter.java
similarity index 92%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/EscapeStrCellSetter.java
index 638cdb38c..2ce8ff3a9 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/EscapeStrCellSetter.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
-import org.dromara.hutool.core.regex.ReUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.regex.ReUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.util.regex.Pattern;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/HyperlinkCellSetter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/HyperlinkCellSetter.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/HyperlinkCellSetter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/HyperlinkCellSetter.java
index 25ed53dd0..65ccba54d 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/HyperlinkCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/HyperlinkCellSetter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Hyperlink;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/NullCellSetter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/NullCellSetter.java
similarity index 91%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/NullCellSetter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/NullCellSetter.java
index b504d3083..a161642f8 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/NullCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/NullCellSetter.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 import org.apache.poi.ss.usermodel.Cell;
 
 /**
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/NumberCellSetter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/NumberCellSetter.java
similarity index 92%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/NumberCellSetter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/NumberCellSetter.java
index 62f0c9a65..0acefac43 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/NumberCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/NumberCellSetter.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
-import org.dromara.hutool.core.math.NumberUtil;
+import cn.hutool.v7.core.math.NumberUtil;
 import org.apache.poi.ss.usermodel.Cell;
 
 /**
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/PicCellSetter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/PicCellSetter.java
similarity index 84%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/PicCellSetter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/PicCellSetter.java
index ca330e077..40be3ede8 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/PicCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/PicCellSetter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
 import org.apache.poi.ss.usermodel.*;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.poi.excel.shape.ExcelPicType;
-import org.dromara.hutool.poi.excel.shape.ExcelPicUtil;
-import org.dromara.hutool.poi.excel.SimpleClientAnchor;
-import org.dromara.hutool.poi.excel.writer.ExcelDrawingUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.poi.excel.shape.ExcelPicType;
+import cn.hutool.v7.poi.excel.shape.ExcelPicUtil;
+import cn.hutool.v7.poi.excel.SimpleClientAnchor;
+import cn.hutool.v7.poi.excel.writer.ExcelDrawingUtil;
 
 import java.io.File;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/RichTextCellSetter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/RichTextCellSetter.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/RichTextCellSetter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/RichTextCellSetter.java
index b1b3dfc13..eedbcafee 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/RichTextCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/RichTextCellSetter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.RichTextString;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/TemporalAccessorCellSetter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/TemporalAccessorCellSetter.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/TemporalAccessorCellSetter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/TemporalAccessorCellSetter.java
index fe53589a5..ad6b83185 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/TemporalAccessorCellSetter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/TemporalAccessorCellSetter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
 
 import org.apache.poi.ss.usermodel.Cell;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/package-info.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/package-info.java
index ebbcef5a9..7cd19d166 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/setters/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.poi.excel.cell.setters;
+package cn.hutool.v7.poi.excel.cell.setters;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/CellValue.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/CellValue.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/CellValue.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/CellValue.java
index b14c3d5dd..a2b8491d7 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/CellValue.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/CellValue.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.values;
+package cn.hutool.v7.poi.excel.cell.values;
 
 /**
  * 抽象的单元格值接口，用于判断不同类型的单元格值
      
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/CompositeCellValue.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/CompositeCellValue.java
similarity index 92%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/CompositeCellValue.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/CompositeCellValue.java
index 30445f608..fac5feeb8 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/CompositeCellValue.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/CompositeCellValue.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.values;
+package cn.hutool.v7.poi.excel.cell.values;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.poi.excel.cell.editors.CellEditor;
-import org.dromara.hutool.poi.excel.cell.CellUtil;
-import org.dromara.hutool.poi.excel.cell.NullCell;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.poi.excel.cell.editors.CellEditor;
+import cn.hutool.v7.poi.excel.cell.CellUtil;
+import cn.hutool.v7.poi.excel.cell.NullCell;
 
 /**
  * 复合单元格值，用于根据单元格类型读取不同的值
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/ErrorCellValue.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/ErrorCellValue.java
similarity index 92%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/ErrorCellValue.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/ErrorCellValue.java
index 28342c79a..ade696902 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/ErrorCellValue.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/ErrorCellValue.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.values;
+package cn.hutool.v7.poi.excel.cell.values;
 
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.text.StrUtil;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.FormulaError;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/FormulaCellValue.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/FormulaCellValue.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/FormulaCellValue.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/FormulaCellValue.java
index 46f82f9e8..1bd8432ec 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/FormulaCellValue.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/FormulaCellValue.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.values;
+package cn.hutool.v7.poi.excel.cell.values;
 
 import org.apache.poi.ss.usermodel.CellType;
-import org.dromara.hutool.poi.excel.cell.setters.CellSetter;
+import cn.hutool.v7.poi.excel.cell.setters.CellSetter;
 import org.apache.poi.ss.usermodel.Cell;
 
 /**
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/NumericCellValue.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/NumericCellValue.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/NumericCellValue.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/NumericCellValue.java
index 8bc7b2ef9..760417844 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/NumericCellValue.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/NumericCellValue.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.cell.values;
+package cn.hutool.v7.poi.excel.cell.values;
 
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.poi.excel.ExcelDateUtil;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.poi.excel.ExcelDateUtil;
 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/org/dromara/hutool/poi/excel/cell/values/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/package-info.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/package-info.java
index ebe343c42..5214cf191 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/values/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/cell/values/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.poi.excel.cell.values;
+package cn.hutool.v7.poi.excel.cell.values;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/package-info.java
similarity index 94%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/package-info.java
index 846e02714..d1ae91eff 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ExcelReadConfig.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/ExcelReadConfig.java
similarity index 92%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ExcelReadConfig.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/ExcelReadConfig.java
index a5bcf7c00..9bcb53e8b 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ExcelReadConfig.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/ExcelReadConfig.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
-import org.dromara.hutool.poi.excel.ExcelConfig;
+import cn.hutool.v7.poi.excel.ExcelConfig;
 
 /**
  * Excel读取配置
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ExcelReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/ExcelReader.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ExcelReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/ExcelReader.java
index 4244c0d56..63c0cd3b3 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ExcelReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/ExcelReader.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
 import org.apache.poi.ss.extractor.ExcelExtractor;
 import org.apache.poi.ss.usermodel.*;
-import org.dromara.hutool.core.func.SerBiConsumer;
-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.poi.excel.*;
-import org.dromara.hutool.poi.excel.cell.CellUtil;
-import org.dromara.hutool.poi.excel.reader.sheet.*;
-import org.dromara.hutool.poi.excel.shape.ExcelPicUtil;
-import org.dromara.hutool.poi.excel.writer.ExcelWriter;
+import cn.hutool.v7.core.func.SerBiConsumer;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.poi.excel.*;
+import cn.hutool.v7.poi.excel.cell.CellUtil;
+import cn.hutool.v7.poi.excel.reader.sheet.*;
+import cn.hutool.v7.poi.excel.shape.ExcelPicUtil;
+import cn.hutool.v7.poi.excel.writer.ExcelWriter;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/package-info.java
similarity index 94%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/package-info.java
index 45f1cc748..27c5f9897 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/AbstractSheetReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/AbstractSheetReader.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/AbstractSheetReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/AbstractSheetReader.java
index a1174f022..5538f93fc 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/AbstractSheetReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/AbstractSheetReader.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader.sheet;
+package cn.hutool.v7.poi.excel.reader.sheet;
 
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.dromara.hutool.poi.excel.reader.ExcelReadConfig;
+import cn.hutool.v7.poi.excel.reader.ExcelReadConfig;
 
 /**
  * 抽象{@link Sheet}数据读取实现
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/BeanSheetReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/BeanSheetReader.java
similarity index 91%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/BeanSheetReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/BeanSheetReader.java
index d0eecc5f9..4b436f946 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/BeanSheetReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/BeanSheetReader.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader.sheet;
+package cn.hutool.v7.poi.excel.reader.sheet;
 
 import org.apache.poi.ss.usermodel.Sheet;
-import org.dromara.hutool.core.bean.BeanUtil;
-import org.dromara.hutool.core.bean.copier.CopyOptions;
-import org.dromara.hutool.poi.excel.reader.ExcelReadConfig;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.bean.copier.CopyOptions;
+import cn.hutool.v7.poi.excel.reader.ExcelReadConfig;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/ColumnSheetReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/ColumnSheetReader.java
similarity index 92%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/ColumnSheetReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/ColumnSheetReader.java
index 11a952f58..73d6c9645 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/ColumnSheetReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/ColumnSheetReader.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader.sheet;
+package cn.hutool.v7.poi.excel.reader.sheet;
 
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.dromara.hutool.poi.excel.cell.editors.CellEditor;
-import org.dromara.hutool.poi.excel.cell.CellUtil;
+import cn.hutool.v7.poi.excel.cell.editors.CellEditor;
+import cn.hutool.v7.poi.excel.cell.CellUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/ListSheetReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/ListSheetReader.java
similarity index 91%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/ListSheetReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/ListSheetReader.java
index ea0ed67fd..1595c9e7b 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/ListSheetReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/ListSheetReader.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader.sheet;
+package cn.hutool.v7.poi.excel.reader.sheet;
 
-import org.dromara.hutool.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.CollUtil;
 import org.apache.poi.ss.usermodel.Sheet;
-import org.dromara.hutool.poi.excel.RowUtil;
-import org.dromara.hutool.poi.excel.cell.editors.CellEditor;
+import cn.hutool.v7.poi.excel.RowUtil;
+import cn.hutool.v7.poi.excel.cell.editors.CellEditor;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/MapSheetReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/MapSheetReader.java
similarity index 91%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/MapSheetReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/MapSheetReader.java
index f32b8817e..6a7163eb3 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/MapSheetReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/MapSheetReader.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader.sheet;
+package cn.hutool.v7.poi.excel.reader.sheet;
 
-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 cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.iter.IterUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.text.StrUtil;
 import org.apache.poi.ss.usermodel.Sheet;
-import org.dromara.hutool.poi.excel.RowUtil;
+import cn.hutool.v7.poi.excel.RowUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/SheetReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/SheetReader.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/SheetReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/SheetReader.java
index 03e87855d..0aa26f018 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/SheetReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/SheetReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader.sheet;
+package cn.hutool.v7.poi.excel.reader.sheet;
 
 import org.apache.poi.ss.usermodel.Sheet;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/WalkSheetReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/WalkSheetReader.java
similarity index 91%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/WalkSheetReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/WalkSheetReader.java
index 39d233614..d778f4a41 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/WalkSheetReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/WalkSheetReader.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader.sheet;
+package cn.hutool.v7.poi.excel.reader.sheet;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
-import org.dromara.hutool.core.func.SerBiConsumer;
-import org.dromara.hutool.poi.excel.cell.editors.CellEditor;
-import org.dromara.hutool.poi.excel.cell.CellUtil;
+import cn.hutool.v7.core.func.SerBiConsumer;
+import cn.hutool.v7.poi.excel.cell.editors.CellEditor;
+import cn.hutool.v7.poi.excel.cell.CellUtil;
 
 /**
  * 读取Excel的Sheet，使用Consumer方式处理单元格
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/package-info.java
similarity index 92%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/package-info.java
index a2f4e8c96..82526676c 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/sheet/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/reader/sheet/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.poi.excel.reader.sheet;
+package cn.hutool.v7.poi.excel.reader.sheet;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/AttributeName.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/AttributeName.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/AttributeName.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/AttributeName.java
index 4346e650e..98f21b141 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/AttributeName.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/AttributeName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax;
+package cn.hutool.v7.poi.excel.sax;
 
 import org.xml.sax.Attributes;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/CellDataType.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/CellDataType.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/CellDataType.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/CellDataType.java
index 707954195..2036883e0 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/CellDataType.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/CellDataType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax;
+package cn.hutool.v7.poi.excel.sax;
 
 /**
  * 单元格数据类型枚举
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ElementName.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/ElementName.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ElementName.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/ElementName.java
index 3af520763..97715007e 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ElementName.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/ElementName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax;
+package cn.hutool.v7.poi.excel.sax;
 
 /**
  * 标签名枚举
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/Excel03SaxReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/Excel03SaxReader.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/Excel03SaxReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/Excel03SaxReader.java
index 66e3da2d9..d561f6de2 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/Excel03SaxReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/Excel03SaxReader.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax;
+package cn.hutool.v7.poi.excel.sax;
 
-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.POIException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.poi.excel.sax.handler.RowHandler;
+import cn.hutool.v7.poi.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/org/dromara/hutool/poi/excel/sax/Excel07SaxReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/Excel07SaxReader.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/Excel07SaxReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/Excel07SaxReader.java
index 38c3fd5c1..aa09a3b64 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/Excel07SaxReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/Excel07SaxReader.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax;
+package cn.hutool.v7.poi.excel.sax;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.reflect.method.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.POIException;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.reflect.method.MethodUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.poi.excel.sax.handler.RowHandler;
+import cn.hutool.v7.poi.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/org/dromara/hutool/poi/excel/sax/ExcelSaxReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/ExcelSaxReader.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/ExcelSaxReader.java
index 19938c2c9..49b94c262 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/ExcelSaxReader.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax;
+package cn.hutool.v7.poi.excel.sax;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.poi.POIException;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.poi.POIException;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/ExcelSaxUtil.java
similarity index 94%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/ExcelSaxUtil.java
index 0e41e6a4e..ae08bb879 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/ExcelSaxUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax;
+package cn.hutool.v7.poi.excel.sax;
 
 import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener;
 import org.apache.poi.hssf.record.CellValueRecordInterface;
@@ -22,17 +22,17 @@ import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.util.XMLHelper;
 import org.apache.poi.xssf.model.SharedStrings;
 import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.dromara.hutool.core.date.DateTime;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.exception.DependencyException;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.math.NumberUtil;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.poi.POIException;
-import org.dromara.hutool.poi.excel.ExcelDateUtil;
-import org.dromara.hutool.poi.excel.sax.handler.RowHandler;
+import cn.hutool.v7.core.date.DateTime;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.exception.DependencyException;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.math.NumberUtil;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.poi.POIException;
+import cn.hutool.v7.poi.excel.ExcelDateUtil;
+import cn.hutool.v7.poi.excel.sax.handler.RowHandler;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetDataSaxHandler.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/SheetDataSaxHandler.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetDataSaxHandler.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/SheetDataSaxHandler.java
index 998ca829f..4f8ad234b 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetDataSaxHandler.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/SheetDataSaxHandler.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax;
+package cn.hutool.v7.poi.excel.sax;
 
 import org.apache.poi.ss.usermodel.BuiltinFormats;
 import org.apache.poi.xssf.model.SharedStrings;
 import org.apache.poi.xssf.model.StylesTable;
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-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 cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.poi.excel.cell.values.FormulaCellValue;
+import cn.hutool.v7.poi.excel.sax.handler.RowHandler;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetRidReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/SheetRidReader.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetRidReader.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/SheetRidReader.java
index 23c34927e..95e4a31c8 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetRidReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/SheetRidReader.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax;
+package cn.hutool.v7.poi.excel.sax;
 
-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.POIException;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.poi.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/org/dromara/hutool/poi/excel/sax/StopReadException.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/StopReadException.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/StopReadException.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/StopReadException.java
index 1123913b7..5e16ce671 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/StopReadException.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/StopReadException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax;
+package cn.hutool.v7.poi.excel.sax;
 
-import org.dromara.hutool.poi.POIException;
+import cn.hutool.v7.poi.POIException;
 
 /**
  * 读取结束异常，用于标记读取结束
      
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/AbstractRowHandler.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/AbstractRowHandler.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/AbstractRowHandler.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/AbstractRowHandler.java
index 1d7722dd4..56684f236 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/AbstractRowHandler.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/AbstractRowHandler.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax.handler;
+package cn.hutool.v7.poi.excel.sax.handler;
 
-import org.dromara.hutool.core.lang.Assert;
+import cn.hutool.v7.core.lang.Assert;
 
 import java.util.List;
 import java.util.function.Function;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/BeanRowHandler.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/BeanRowHandler.java
similarity index 86%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/BeanRowHandler.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/BeanRowHandler.java
index 63184740a..fe57679d3 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/BeanRowHandler.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/BeanRowHandler.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax.handler;
+package cn.hutool.v7.poi.excel.sax.handler;
 
-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.ConvertUtil;
-import org.dromara.hutool.core.lang.Assert;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.collection.iter.IterUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.lang.Assert;
 
 import java.util.List;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/MapRowHandler.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/MapRowHandler.java
similarity index 89%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/MapRowHandler.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/MapRowHandler.java
index dce648dac..9cbc03530 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/MapRowHandler.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/MapRowHandler.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax.handler;
+package cn.hutool.v7.poi.excel.sax.handler;
 
-import org.dromara.hutool.core.collection.iter.IterUtil;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.convert.ConvertUtil;
+import cn.hutool.v7.core.collection.iter.IterUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
 
 import java.util.List;
 import java.util.Map;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/RowHandler.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/RowHandler.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/RowHandler.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/RowHandler.java
index eb8a546bd..04eee292f 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/RowHandler.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/RowHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.sax.handler;
+package cn.hutool.v7.poi.excel.sax.handler;
 
 import org.apache.poi.ss.usermodel.CellStyle;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/package-info.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/package-info.java
index e002f8e6b..e126cc294 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/handler/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/handler/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.poi.excel.sax.handler;
+package cn.hutool.v7.poi.excel.sax.handler;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/package-info.java
similarity index 94%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/package-info.java
index 22c1022e2..bdf68c7a0 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.poi.excel.sax;
+package cn.hutool.v7.poi.excel.sax;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/shape/ExcelPicType.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/shape/ExcelPicType.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/shape/ExcelPicType.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/shape/ExcelPicType.java
index f03add168..ca169b853 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/shape/ExcelPicType.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/shape/ExcelPicType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.shape;
+package cn.hutool.v7.poi.excel.shape;
 
 import org.apache.poi.ss.usermodel.Workbook;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/shape/ExcelPicUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/shape/ExcelPicUtil.java
similarity index 90%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/shape/ExcelPicUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/shape/ExcelPicUtil.java
index d7ec603a9..7c5f24869 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/shape/ExcelPicUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/shape/ExcelPicUtil.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.shape;
+package cn.hutool.v7.poi.excel.shape;
 
 import org.apache.poi.ss.usermodel.*;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.io.file.FileTypeUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.stream.StreamUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.file.FileTypeUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.stream.StreamUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.io.File;
 import java.util.List;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/shape/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/shape/package-info.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/shape/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/shape/package-info.java
index c9b0fd74d..b4e98d6a2 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/shape/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/shape/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Excel中绘图相关操作
  */
-package org.dromara.hutool.poi.excel.shape;
+package cn.hutool.v7.poi.excel.shape;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/Align.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/Align.java
similarity index 94%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/Align.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/Align.java
index aaf905523..ad3e85c8f 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/Align.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/Align.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.style;
+package cn.hutool.v7.poi.excel.style;
 
 /**
  * 对齐方式枚举
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/CellBorderStyle.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/CellBorderStyle.java
similarity index 98%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/CellBorderStyle.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/CellBorderStyle.java
index aeda222e9..b3e0db3b2 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/CellBorderStyle.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/CellBorderStyle.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.style;
+package cn.hutool.v7.poi.excel.style;
 
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.dromara.hutool.core.util.ObjUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/DefaultStyleSet.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/DefaultStyleSet.java
similarity index 99%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/DefaultStyleSet.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/DefaultStyleSet.java
index 8fd263e9d..1f155b6c3 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/DefaultStyleSet.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/DefaultStyleSet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.style;
+package cn.hutool.v7.poi.excel.style;
 
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/LineStyle.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/LineStyle.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/LineStyle.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/LineStyle.java
index 095376c6f..d2f2ae327 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/LineStyle.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/LineStyle.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.style;
+package cn.hutool.v7.poi.excel.style;
 
 import org.apache.poi.hssf.usermodel.HSSFShape;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/ShapeConfig.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/ShapeConfig.java
similarity index 98%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/ShapeConfig.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/ShapeConfig.java
index 59b2a3741..be90ee558 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/ShapeConfig.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/ShapeConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.style;
+package cn.hutool.v7.poi.excel.style;
 
 import org.apache.poi.sl.usermodel.ShapeType;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/StyleSet.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/StyleSet.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/StyleSet.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/StyleSet.java
index b32201687..0d95c7c45 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/StyleSet.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/StyleSet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.style;
+package cn.hutool.v7.poi.excel.style;
 
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.util.CellReference;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/StyleUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/StyleUtil.java
similarity index 98%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/StyleUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/StyleUtil.java
index 45eb590fe..3ddecb7f7 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/StyleUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/StyleUtil.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.style;
+package cn.hutool.v7.poi.excel.style;
 
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.RegionUtil;
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 
 /**
  * Excel样式工具类
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/package-info.java
similarity index 94%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/package-info.java
index 7d2e9f5b9..6982785e7 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/style/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.poi.excel.style;
+package cn.hutool.v7.poi.excel.style;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/BigExcelWriter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/BigExcelWriter.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/BigExcelWriter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/BigExcelWriter.java
index 0e237f67b..59aaaa128 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/BigExcelWriter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/BigExcelWriter.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.dromara.hutool.poi.excel.SheetUtil;
-import org.dromara.hutool.poi.excel.WorkbookUtil;
+import cn.hutool.v7.poi.excel.SheetUtil;
+import cn.hutool.v7.poi.excel.WorkbookUtil;
 
 import java.io.File;
 import java.io.OutputStream;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/DataValidationUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/DataValidationUtil.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/DataValidationUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/DataValidationUtil.java
index fccb0d571..92cfd68c3 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/DataValidationUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/DataValidationUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import org.apache.poi.ss.usermodel.DataValidation;
 import org.apache.poi.ss.usermodel.DataValidationConstraint;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/ExcelDrawingUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/ExcelDrawingUtil.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/ExcelDrawingUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/ExcelDrawingUtil.java
index dff319ec0..d4945ae17 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/ExcelDrawingUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/ExcelDrawingUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
 import org.apache.poi.hssf.usermodel.HSSFPatriarch;
@@ -23,9 +23,9 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
 import org.apache.poi.xssf.usermodel.XSSFDrawing;
 import org.apache.poi.xssf.usermodel.XSSFSimpleShape;
-import org.dromara.hutool.poi.excel.shape.ExcelPicType;
-import org.dromara.hutool.poi.excel.SimpleClientAnchor;
-import org.dromara.hutool.poi.excel.style.ShapeConfig;
+import cn.hutool.v7.poi.excel.shape.ExcelPicType;
+import cn.hutool.v7.poi.excel.SimpleClientAnchor;
+import cn.hutool.v7.poi.excel.style.ShapeConfig;
 
 import java.awt.Color;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/ExcelWriteConfig.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/ExcelWriteConfig.java
similarity index 91%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/ExcelWriteConfig.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/ExcelWriteConfig.java
index c1bd15f25..d392ec9da 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/ExcelWriteConfig.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/ExcelWriteConfig.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
-import org.dromara.hutool.core.comparator.IndexedComparator;
-import org.dromara.hutool.core.map.MapUtil;
-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.text.StrUtil;
-import org.dromara.hutool.poi.excel.ExcelConfig;
+import cn.hutool.v7.core.comparator.IndexedComparator;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.map.TableMap;
+import cn.hutool.v7.core.map.multi.RowKeyTable;
+import cn.hutool.v7.core.map.multi.Table;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.poi.excel.ExcelConfig;
 
 import java.util.Comparator;
 import java.util.LinkedHashMap;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/ExcelWriter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/ExcelWriter.java
similarity index 98%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/ExcelWriter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/ExcelWriter.java
index 1d10be19b..a4c68190d 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/ExcelWriter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/ExcelWriter.java
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.ss.util.CellReference;
-import org.dromara.hutool.core.bean.BeanUtil;
-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.poi.POIException;
-import org.dromara.hutool.poi.excel.*;
-import org.dromara.hutool.poi.excel.cell.CellRangeUtil;
-import org.dromara.hutool.poi.excel.cell.CellUtil;
-import org.dromara.hutool.poi.excel.shape.ExcelPicType;
-import org.dromara.hutool.poi.excel.shape.ExcelPicUtil;
-import org.dromara.hutool.poi.excel.style.*;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.poi.POIException;
+import cn.hutool.v7.poi.excel.*;
+import cn.hutool.v7.poi.excel.cell.CellRangeUtil;
+import cn.hutool.v7.poi.excel.cell.CellUtil;
+import cn.hutool.v7.poi.excel.shape.ExcelPicType;
+import cn.hutool.v7.poi.excel.shape.ExcelPicUtil;
+import cn.hutool.v7.poi.excel.style.*;
 
 import java.awt.Color;
 import java.io.File;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/SheetDataWriter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/SheetDataWriter.java
similarity index 94%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/SheetDataWriter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/SheetDataWriter.java
index 97b007010..73cedcbb6 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/SheetDataWriter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/SheetDataWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import org.apache.poi.common.usermodel.Hyperlink;
 import org.apache.poi.ss.usermodel.Cell;
@@ -23,18 +23,18 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellReference;
-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.map.MapUtil;
-import org.dromara.hutool.core.map.multi.Table;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.poi.excel.RowGroup;
-import org.dromara.hutool.poi.excel.RowUtil;
-import org.dromara.hutool.poi.excel.cell.CellRangeUtil;
-import org.dromara.hutool.poi.excel.cell.CellUtil;
-import org.dromara.hutool.poi.excel.cell.editors.CellEditor;
-import org.dromara.hutool.poi.excel.style.StyleSet;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.map.multi.Table;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.poi.excel.RowGroup;
+import cn.hutool.v7.poi.excel.RowUtil;
+import cn.hutool.v7.poi.excel.cell.CellRangeUtil;
+import cn.hutool.v7.poi.excel.cell.CellUtil;
+import cn.hutool.v7.poi.excel.cell.editors.CellEditor;
+import cn.hutool.v7.poi.excel.style.StyleSet;
 
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/SheetTemplateWriter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/SheetTemplateWriter.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/SheetTemplateWriter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/SheetTemplateWriter.java
index 4a12fe212..7608d008a 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/SheetTemplateWriter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/SheetTemplateWriter.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import org.apache.poi.ss.usermodel.Sheet;
-import org.dromara.hutool.core.map.BeanMap;
+import cn.hutool.v7.core.map.BeanMap;
 
 import java.util.Map;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/TemplateContext.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/TemplateContext.java
similarity index 92%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/TemplateContext.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/TemplateContext.java
index c3b1903de..8c889e4a6 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/TemplateContext.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/TemplateContext.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Sheet;
-import org.dromara.hutool.core.bean.BeanUtil;
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.regex.ReUtil;
-import org.dromara.hutool.core.text.StrPool;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.poi.excel.SheetUtil;
-import org.dromara.hutool.poi.excel.cell.CellUtil;
-import org.dromara.hutool.poi.excel.cell.VirtualCell;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.regex.ReUtil;
+import cn.hutool.v7.core.text.StrPool;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.poi.excel.SheetUtil;
+import cn.hutool.v7.poi.excel.cell.CellUtil;
+import cn.hutool.v7.poi.excel.cell.VirtualCell;
 
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/package-info.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/package-info.java
index bb3d655a1..0ecdb3164 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/writer/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/DocConverterUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/ofd/DocConverterUtil.java
similarity index 98%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/DocConverterUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/ofd/DocConverterUtil.java
index d62ad6102..f5cac7170 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/DocConverterUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/ofd/DocConverterUtil.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.ofd;
+package cn.hutool.v7.poi.ofd;
 
-import org.dromara.hutool.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IORuntimeException;
 import org.ofdrw.converter.export.*;
 import org.ofdrw.converter.ofdconverter.DocConverter;
 import org.ofdrw.converter.ofdconverter.ImageConverter;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/OfdWriter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/ofd/OfdWriter.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/OfdWriter.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/ofd/OfdWriter.java
index 02d5652a6..8ae1630ac 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/OfdWriter.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/ofd/OfdWriter.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.ofd;
+package cn.hutool.v7.poi.ofd;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.file.PathUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.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/org/dromara/hutool/poi/ofd/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/ofd/package-info.java
similarity index 95%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/ofd/package-info.java
index b7fbbc386..aa5250590 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/ofd/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/ofd/package-info.java
@@ -19,4 +19,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.poi.ofd;
+package cn.hutool.v7.poi.ofd;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/package-info.java
similarity index 97%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/package-info.java
index b66fc13dc..3c4110a7b 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/package-info.java
@@ -33,4 +33,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.poi;
+package cn.hutool.v7.poi;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/word/DocUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/word/DocUtil.java
similarity index 88%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/word/DocUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/word/DocUtil.java
index e99585c72..ca4e253b2 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/word/DocUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/word/DocUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.word;
+package cn.hutool.v7.poi.word;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.poi.POIException;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.poi.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/org/dromara/hutool/poi/word/PictureTypeUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/word/PictureTypeUtil.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/word/PictureTypeUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/word/PictureTypeUtil.java
index cdd467d4f..df7ad677e 100755
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/word/PictureTypeUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/word/PictureTypeUtil.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.word;
+package cn.hutool.v7.poi.word;
 
 import org.apache.poi.common.usermodel.PictureType;
-import org.dromara.hutool.core.io.file.FileNameUtil;
+import cn.hutool.v7.core.io.file.FileNameUtil;
 
 /**
  * 图片类型工具类
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/word/TableUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/word/TableUtil.java
similarity index 93%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/word/TableUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/word/TableUtil.java
index 4abb4f7d0..d90e5c365 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/word/TableUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/word/TableUtil.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.word;
+package cn.hutool.v7.poi.word;
 
-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.ConvertUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.map.MapUtil;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.collection.iter.IterUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.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/org/dromara/hutool/poi/word/Word07Writer.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/word/Word07Writer.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/word/Word07Writer.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/word/Word07Writer.java
index 329d20f57..4aabf7cfd 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/word/Word07Writer.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/word/Word07Writer.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.word;
+package cn.hutool.v7.poi.word;
 
 import org.apache.poi.common.usermodel.PictureType;
-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.array.ArrayUtil;
-import org.dromara.hutool.poi.POIException;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.poi.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/org/dromara/hutool/poi/word/WordUtil.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/word/WordUtil.java
similarity index 96%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/word/WordUtil.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/word/WordUtil.java
index 9fa7668f6..f07198dd3 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/word/WordUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/word/WordUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.word;
+package cn.hutool.v7.poi.word;
 
 import java.io.File;
 
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/word/package-info.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/word/package-info.java
similarity index 94%
rename from hutool-poi/src/main/java/org/dromara/hutool/poi/word/package-info.java
rename to hutool-poi/src/main/java/cn/hutool/v7/poi/word/package-info.java
index e47275199..7496b39b5 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/word/package-info.java
+++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/word/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.poi.word;
+package cn.hutool.v7.poi.word;
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvParserTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/CsvParserTest.java
similarity index 96%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvParserTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/csv/CsvParserTest.java
index 6af6c8320..a21d77698 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvParserTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/CsvParserTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.text.StrUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvReaderTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/CsvReaderTest.java
similarity index 96%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvReaderTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/csv/CsvReaderTest.java
index d5fb303fa..b3c328813 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvReaderTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/CsvReaderTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-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 cn.hutool.v7.core.annotation.Alias;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.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/org/dromara/hutool/poi/csv/CsvUtilTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/CsvUtilTest.java
similarity index 96%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvUtilTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/csv/CsvUtilTest.java
index 5da3ac5c7..40c1630e1 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/CsvUtilTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-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 cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.util.CharsetUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvWriterTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/CsvWriterTest.java
similarity index 93%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvWriterTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/csv/CsvWriterTest.java
index a40b7098d..8b319a3e8 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/CsvWriterTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/CsvWriterTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.util.CharsetUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Issue2783Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/Issue2783Test.java
similarity index 86%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Issue2783Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/csv/Issue2783Test.java
index aea0b0226..2b87a610f 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Issue2783Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/Issue2783Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.func.SerConsumer;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.func.SerConsumer;
+import cn.hutool.v7.core.util.CharsetUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Issue3088Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/Issue3088Test.java
similarity index 88%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Issue3088Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/csv/Issue3088Test.java
index 380d44afa..caaf63e7b 100755
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Issue3088Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/Issue3088Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Console;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Issue3705Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/Issue3705Test.java
similarity index 97%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Issue3705Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/csv/Issue3705Test.java
index 56ee1c501..48619ae1b 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Issue3705Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/Issue3705Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/IssueI75K5GTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/IssueI75K5GTest.java
similarity index 88%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/csv/IssueI75K5GTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/csv/IssueI75K5GTest.java
index 98ad33031..fc96d7ca1 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/IssueI75K5GTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/IssueI75K5GTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.util.CharsetUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/IssueI91VF1Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/IssueI91VF1Test.java
similarity index 91%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/csv/IssueI91VF1Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/csv/IssueI91VF1Test.java
index a73847f68..31cc3caf3 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/IssueI91VF1Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/IssueI91VF1Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
 import lombok.Data;
-import org.dromara.hutool.core.annotation.Alias;
-import org.dromara.hutool.core.io.file.FileUtil;
+import cn.hutool.v7.core.annotation.Alias;
+import cn.hutool.v7.core.io.file.FileUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/IssueIA8WE0Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/IssueIA8WE0Test.java
similarity index 94%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/csv/IssueIA8WE0Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/csv/IssueIA8WE0Test.java
index 1b5dc4b82..49a868c2f 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/IssueIA8WE0Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/IssueIA8WE0Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
-import org.dromara.hutool.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Pr1244Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/Pr1244Test.java
similarity index 98%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Pr1244Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/csv/Pr1244Test.java
index c3d745bb0..bde120f7d 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/csv/Pr1244Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/csv/Pr1244Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.csv;
+package cn.hutool.v7.poi.csv;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/CellUtilTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/CellUtilTest.java
similarity index 91%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/CellUtilTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/CellUtilTest.java
index 6ea4b29c5..a3bd0a1a7 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/CellUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/CellUtilTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
-import org.dromara.hutool.core.lang.Console;
+import cn.hutool.v7.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/org/dromara/hutool/poi/excel/ExcelFileUtilTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/ExcelFileUtilTest.java
similarity index 90%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelFileUtilTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/ExcelFileUtilTest.java
index 6ffee6cc4..450cd3d8e 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelFileUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/ExcelFileUtilTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.IoUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelUtilTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/ExcelUtilTest.java
similarity index 93%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelUtilTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/ExcelUtilTest.java
index 4e7d87d01..f7f5b3eae 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/ExcelUtilTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
 import org.apache.poi.ss.util.CellReference;
-import org.dromara.hutool.poi.excel.cell.CellReferenceUtil;
-import org.dromara.hutool.poi.excel.reader.ExcelReader;
-import org.dromara.hutool.poi.excel.writer.ExcelWriter;
+import cn.hutool.v7.poi.excel.cell.CellReferenceUtil;
+import cn.hutool.v7.poi.excel.reader.ExcelReader;
+import cn.hutool.v7.poi.excel.writer.ExcelWriter;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/NumericCellValueTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/NumericCellValueTest.java
similarity index 86%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/NumericCellValueTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/NumericCellValueTest.java
index 1f7d5edd7..816b18141 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/NumericCellValueTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/NumericCellValueTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
 import org.apache.poi.ss.usermodel.Cell;
-import org.dromara.hutool.poi.excel.cell.values.NumericCellValue;
-import org.dromara.hutool.poi.excel.reader.ExcelReader;
-import org.dromara.hutool.poi.excel.writer.ExcelWriter;
+import cn.hutool.v7.poi.excel.cell.values.NumericCellValue;
+import cn.hutool.v7.poi.excel.reader.ExcelReader;
+import cn.hutool.v7.poi.excel.writer.ExcelWriter;
 import org.junit.jupiter.api.Test;
 
 import java.util.Date;
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/OrderExcel.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/OrderExcel.java
similarity index 95%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/OrderExcel.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/OrderExcel.java
index 1f6006fb8..4c2c341d9 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/OrderExcel.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/OrderExcel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
 import lombok.Data;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/TestBean.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/TestBean.java
similarity index 95%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/TestBean.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/TestBean.java
index 0d9e41d68..ba1adcbea 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/TestBean.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/TestBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
 import lombok.Data;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/WorkbookUtilTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/WorkbookUtilTest.java
similarity index 96%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/WorkbookUtilTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/WorkbookUtilTest.java
index a4aa07137..f6a19fa98 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/WorkbookUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/WorkbookUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel;
+package cn.hutool.v7.poi.excel;
 
 import org.apache.poi.ss.usermodel.Workbook;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/CellEditorTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/CellEditorTest.java
similarity index 92%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/CellEditorTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/CellEditorTest.java
index 7c2ca08ad..ab6ee26ba 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/CellEditorTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/CellEditorTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
-import org.dromara.hutool.poi.excel.ExcelUtil;
-import org.dromara.hutool.poi.excel.cell.editors.CellEditor;
+import cn.hutool.v7.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.cell.editors.CellEditor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.poi.ss.usermodel.Cell;
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/ExcelReadTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/ExcelReadTest.java
similarity index 96%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/ExcelReadTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/ExcelReadTest.java
index 8074deffe..6d3d3aaea 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/ExcelReadTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/ExcelReadTest.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.func.SerBiConsumer;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.util.ObjUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.func.SerBiConsumer;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 import lombok.Data;
 import org.apache.poi.ss.usermodel.Cell;
-import org.dromara.hutool.poi.excel.ExcelConfig;
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.ExcelConfig;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/ExcelSaxReadTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/ExcelSaxReadTest.java
similarity index 91%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/ExcelSaxReadTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/ExcelSaxReadTest.java
index fc5d026bf..294367705 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/ExcelSaxReadTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/ExcelSaxReadTest.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
-import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.convert.ConvertUtil;
-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.ExcelUtil;
-import org.dromara.hutool.poi.excel.cell.values.FormulaCellValue;
-import org.dromara.hutool.poi.excel.sax.Excel03SaxReader;
-import org.dromara.hutool.poi.excel.sax.StopReadException;
-import org.dromara.hutool.poi.excel.sax.handler.RowHandler;
-import org.dromara.hutool.poi.POIException;
+import cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.cell.values.FormulaCellValue;
+import cn.hutool.v7.poi.excel.sax.Excel03SaxReader;
+import cn.hutool.v7.poi.excel.sax.StopReadException;
+import cn.hutool.v7.poi.excel.sax.handler.RowHandler;
+import cn.hutool.v7.poi.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/org/dromara/hutool/poi/excel/reader/Issue1729Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/Issue1729Test.java
similarity index 94%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue1729Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/Issue1729Test.java
index eb963b867..401b4bb53 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue1729Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/Issue1729Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
 import lombok.Data;
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3118Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/Issue3118Test.java
similarity index 88%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3118Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/Issue3118Test.java
index 7e1c3362c..96a0bdb4e 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3118Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/Issue3118Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3120Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/Issue3120Test.java
similarity index 92%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3120Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/Issue3120Test.java
index 8b87b82b2..35f137736 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3120Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/Issue3120Test.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3481Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/Issue3481Test.java
similarity index 88%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3481Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/Issue3481Test.java
index 012dfa93c..4f5e69191 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3481Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/Issue3481Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
-import org.dromara.hutool.poi.excel.ExcelUtil;
-import org.dromara.hutool.poi.excel.writer.ExcelWriter;
+import cn.hutool.v7.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.writer.ExcelWriter;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI53OSTTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI53OSTTest.java
similarity index 90%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI53OSTTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI53OSTTest.java
index d06ad3a87..06b122090 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI53OSTTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI53OSTTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5Q1TWTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI5Q1TWTest.java
similarity index 91%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5Q1TWTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI5Q1TWTest.java
index bd3156177..64cf1113d 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5Q1TWTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI5Q1TWTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5U1JATest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI5U1JATest.java
similarity index 90%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5U1JATest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI5U1JATest.java
index 84e6e7a6f..e5524289e 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5U1JATest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI5U1JATest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8PT9ZTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI8PT9ZTest.java
similarity index 87%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8PT9ZTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI8PT9ZTest.java
index 3425adb5d..59e941fd1 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8PT9ZTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI8PT9ZTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
 import lombok.Data;
-import org.dromara.hutool.core.annotation.Alias;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.core.annotation.Alias;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8ZIQCTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI8ZIQCTest.java
similarity index 90%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8ZIQCTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI8ZIQCTest.java
index 13800d146..64d629508 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8ZIQCTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueI8ZIQCTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueIB0EJ9Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueIB0EJ9Test.java
similarity index 83%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueIB0EJ9Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueIB0EJ9Test.java
index 47b22ea66..1f81e0f9d 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueIB0EJ9Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/IssueIB0EJ9Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.reader;
+package cn.hutool.v7.poi.excel.reader;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/shape/ExcelPicUtilTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/shape/ExcelPicUtilTest.java
similarity index 87%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/shape/ExcelPicUtilTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/shape/ExcelPicUtilTest.java
index ae3609d56..d2a077b8d 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/shape/ExcelPicUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/shape/ExcelPicUtilTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.shape;
+package cn.hutool.v7.poi.excel.shape;
 
 import org.apache.poi.ss.usermodel.Picture;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.poi.excel.WorkbookUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.poi.excel.WorkbookUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/BigExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/BigExcelWriteTest.java
similarity index 94%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/BigExcelWriteTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/BigExcelWriteTest.java
index 0c875e809..855b456a3 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/BigExcelWriteTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/BigExcelWriteTest.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.ss.util.CellRangeAddress;
-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.ExcelUtil;
-import org.dromara.hutool.poi.excel.TestBean;
-import org.dromara.hutool.poi.excel.style.DefaultStyleSet;
-import org.dromara.hutool.poi.excel.style.StyleUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.TestBean;
+import cn.hutool.v7.poi.excel.style.DefaultStyleSet;
+import cn.hutool.v7.poi.excel.style.StyleUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/ExcelWriteBeanTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/ExcelWriteBeanTest.java
similarity index 92%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/ExcelWriteBeanTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/ExcelWriteBeanTest.java
index af2826054..7a0e3b9b8 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/ExcelWriteBeanTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/ExcelWriteBeanTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import lombok.Getter;
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/ExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/ExcelWriteTest.java
similarity index 97%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/ExcelWriteTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/ExcelWriteTest.java
index ca1f5811e..d4dcb964a 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/ExcelWriteTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/ExcelWriteTest.java
@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import org.apache.poi.common.usermodel.HyperlinkType;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.data.id.IdUtil;
-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.map.MapUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.poi.excel.ExcelUtil;
-import org.dromara.hutool.poi.excel.OrderExcel;
-import org.dromara.hutool.poi.excel.TestBean;
-import org.dromara.hutool.poi.excel.cell.setters.EscapeStrCellSetter;
-import org.dromara.hutool.poi.excel.reader.ExcelReader;
-import org.dromara.hutool.poi.excel.style.DefaultStyleSet;
-import org.dromara.hutool.poi.excel.style.StyleUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.data.id.IdUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.OrderExcel;
+import cn.hutool.v7.poi.excel.TestBean;
+import cn.hutool.v7.poi.excel.cell.setters.EscapeStrCellSetter;
+import cn.hutool.v7.poi.excel.reader.ExcelReader;
+import cn.hutool.v7.poi.excel.style.DefaultStyleSet;
+import cn.hutool.v7.poi.excel.style.StyleUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/Issue2221Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/Issue2221Test.java
similarity index 92%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/Issue2221Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/Issue2221Test.java
index 90b778385..3a77e2f80 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/Issue2221Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/Issue2221Test.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.poi.excel.ExcelUtil;
-import org.dromara.hutool.poi.excel.style.DefaultStyleSet;
-import org.dromara.hutool.poi.excel.style.StyleUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.style.DefaultStyleSet;
+import cn.hutool.v7.poi.excel.style.StyleUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/Issue2307Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/Issue2307Test.java
similarity index 89%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/Issue2307Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/Issue2307Test.java
index 71d14665f..0d3620a65 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/Issue2307Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/Issue2307Test.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
-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.poi.excel.ExcelUtil;
-import org.dromara.hutool.poi.excel.style.DefaultStyleSet;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.style.DefaultStyleSet;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/IssueI66Z6BTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/IssueI66Z6BTest.java
similarity index 91%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/IssueI66Z6BTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/IssueI66Z6BTest.java
index 658712edb..d54218dc6 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/IssueI66Z6BTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/IssueI66Z6BTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/IssueI6MBS5Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/IssueI6MBS5Test.java
similarity index 89%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/IssueI6MBS5Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/IssueI6MBS5Test.java
index 5e1515911..410a8028e 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/IssueI6MBS5Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/IssueI6MBS5Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.poi.excel.ExcelUtil;
-import org.dromara.hutool.poi.excel.WorkbookUtil;
-import org.dromara.hutool.poi.excel.cell.CellUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.WorkbookUtil;
+import cn.hutool.v7.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/org/dromara/hutool/poi/excel/writer/Pr3807Test.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/Pr3807Test.java
similarity index 95%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/Pr3807Test.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/Pr3807Test.java
index 744ebb9e4..3eaef0510 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/Pr3807Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/Pr3807Test.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
-import org.dromara.hutool.core.comparator.IndexedComparator;
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.core.comparator.IndexedComparator;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/RowGroupTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/RowGroupTest.java
similarity index 95%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/RowGroupTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/RowGroupTest.java
index c794dae75..777d49d1c 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/RowGroupTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/RowGroupTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import org.apache.poi.ss.usermodel.*;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.poi.excel.ExcelUtil;
-import org.dromara.hutool.poi.excel.RowGroup;
-import org.dromara.hutool.poi.excel.style.StyleUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.RowGroup;
+import cn.hutool.v7.poi.excel.style.StyleUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/TemplateContextTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/TemplateContextTest.java
similarity index 91%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/TemplateContextTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/TemplateContextTest.java
index 21212d7e0..428857a9c 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/TemplateContextTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/TemplateContextTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/TemplateWriterTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/TemplateWriterTest.java
similarity index 94%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/TemplateWriterTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/TemplateWriterTest.java
index 256b6a1d8..afb133507 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/TemplateWriterTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/TemplateWriterTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Test;
 
 import java.util.Map;
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/WriteCommentTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/WriteCommentTest.java
similarity index 87%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/WriteCommentTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/WriteCommentTest.java
index 420ab90b6..13074b26f 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/WriteCommentTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/WriteCommentTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
-import org.dromara.hutool.poi.excel.ExcelUtil;
-import org.dromara.hutool.poi.excel.SimpleClientAnchor;
+import cn.hutool.v7.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.SimpleClientAnchor;
 import org.junit.jupiter.api.Test;
 
 public class WriteCommentTest {
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/WriteImgTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/WriteImgTest.java
similarity index 84%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/WriteImgTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/WriteImgTest.java
index 81a1fe7db..ed66eaeff 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/WriteImgTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/WriteImgTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.poi.excel.ExcelUtil;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.poi.excel.ExcelUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/WriteLineShapeTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/WriteLineShapeTest.java
similarity index 85%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/WriteLineShapeTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/WriteLineShapeTest.java
index c72189777..6794f5bf2 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/WriteLineShapeTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/WriteLineShapeTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.excel.writer;
+package cn.hutool.v7.poi.excel.writer;
 
-import org.dromara.hutool.poi.excel.ExcelUtil;
-import org.dromara.hutool.poi.excel.SimpleClientAnchor;
-import org.dromara.hutool.poi.excel.style.LineStyle;
+import cn.hutool.v7.poi.excel.ExcelUtil;
+import cn.hutool.v7.poi.excel.SimpleClientAnchor;
+import cn.hutool.v7.poi.excel.style.LineStyle;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/ofd/OfdWriterTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/ofd/OfdWriterTest.java
similarity index 91%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/ofd/OfdWriterTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/ofd/OfdWriterTest.java
index 9c9434f87..a074c6e05 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/ofd/OfdWriterTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/ofd/OfdWriterTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.ofd;
+package cn.hutool.v7.poi.ofd;
 
-import org.dromara.hutool.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-poi/src/test/java/org/dromara/hutool/poi/word/WordWriterTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/word/WordWriterTest.java
similarity index 94%
rename from hutool-poi/src/test/java/org/dromara/hutool/poi/word/WordWriterTest.java
rename to hutool-poi/src/test/java/cn/hutool/v7/poi/word/WordWriterTest.java
index 9c1a7c655..d7085a88e 100644
--- a/hutool-poi/src/test/java/org/dromara/hutool/poi/word/WordWriterTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/word/WordWriterTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.poi.word;
+package cn.hutool.v7.poi.word;
 
-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 cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.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 15603f0d8..3d06c0fe7 100755
--- a/hutool-setting/pom.xml
+++ b/hutool-setting/pom.xml
@@ -23,9 +23,9 @@
 	jar
 
 	
-		org.dromara.hutool
+		cn.hutool.v7
 		hutool-parent
-		6.0.0-M22
+		7.0.0.M1
 	
 
 	hutool-setting
@@ -33,18 +33,18 @@
 	Hutool 配置文件增强
 
 	
-		org.dromara.hutool.setting
+		cn.hutool.v7.setting
 		2.3
 	
 
 	
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-core
 			${project.parent.version}
 		
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-log
 			${project.parent.version}
 		
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/AbsSetting.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/AbsSetting.java
similarity index 89%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/AbsSetting.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/AbsSetting.java
index d6166fb72..dd099f430 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/AbsSetting.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/AbsSetting.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
 
-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.func.LambdaInfo;
-import org.dromara.hutool.core.func.LambdaUtil;
-import org.dromara.hutool.core.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 cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.bean.copier.CopyOptions;
+import cn.hutool.v7.core.bean.copier.ValueProvider;
+import cn.hutool.v7.core.func.LambdaInfo;
+import cn.hutool.v7.core.func.LambdaUtil;
+import cn.hutool.v7.core.func.SerFunction;
+import cn.hutool.v7.core.lang.getter.GroupedTypeGetter;
+import cn.hutool.v7.core.lang.getter.TypeGetter;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 
 import java.io.Serializable;
 import java.lang.reflect.Type;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/GroupedMap.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedMap.java
similarity index 98%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/GroupedMap.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedMap.java
index d16e32b50..1a6d0101e 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/GroupedMap.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedMap.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
 
-import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/GroupedSet.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedSet.java
similarity index 96%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/GroupedSet.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedSet.java
index e9bf82ea8..e6e53bcba 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/GroupedSet.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedSet.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
 
-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 cn.hutool.v7.core.collection.CollUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.net.url.UrlUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/Setting.java
similarity index 95%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/Setting.java
index c70b346ee..534710145 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/Setting.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
 
-import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.func.LambdaUtil;
-import org.dromara.hutool.core.func.SerSupplier;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.io.resource.Resource;
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.core.io.watch.WatchMonitor;
-import org.dromara.hutool.core.io.watch.WatchUtil;
-import org.dromara.hutool.core.io.watch.watchers.SimpleWatcher;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.log.LogUtil;
-import org.dromara.hutool.setting.props.Props;
+import cn.hutool.v7.core.collection.ListUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.func.LambdaUtil;
+import cn.hutool.v7.core.func.SerSupplier;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.resource.Resource;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.io.watch.WatchMonitor;
+import cn.hutool.v7.core.io.watch.WatchUtil;
+import cn.hutool.v7.core.io.watch.watchers.SimpleWatcher;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.log.LogUtil;
+import cn.hutool.v7.setting.props.Props;
 
 import java.io.File;
 import java.net.URL;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/SettingException.java
similarity index 95%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/SettingException.java
index 415461616..cd85171e9 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/SettingException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * 设置异常
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/SettingLoader.java
similarity index 93%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/SettingLoader.java
index 41e31b825..c6c7e6ad6 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/SettingLoader.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.io.LineReader;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.io.resource.NoResourceException;
-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.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.text.split.SplitUtil;
-import org.dromara.hutool.core.util.SystemUtil;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.LineReader;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.resource.NoResourceException;
+import cn.hutool.v7.core.io.resource.Resource;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.regex.ReUtil;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.core.util.SystemUtil;
+import cn.hutool.v7.log.Log;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingUtil.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/SettingUtil.java
similarity index 88%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/SettingUtil.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/SettingUtil.java
index 39076a662..565ae37ed 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingUtil.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/SettingUtil.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
 
-import org.dromara.hutool.core.io.file.FileNameUtil;
-import org.dromara.hutool.core.io.resource.NoResourceException;
-import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.io.file.FileNameUtil;
+import cn.hutool.v7.core.io.resource.NoResourceException;
+import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.util.Map;
 
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/package-info.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/package-info.java
similarity index 95%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/package-info.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/package-info.java
index 5a19667d2..708868efd 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/package-info.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/GlobalProfile.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/profile/GlobalProfile.java
similarity index 91%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/profile/GlobalProfile.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/profile/GlobalProfile.java
index 64e6da4b6..4beb77d47 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/GlobalProfile.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/profile/GlobalProfile.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.profile;
+package cn.hutool.v7.setting.profile;
 
-import org.dromara.hutool.core.lang.Singleton;
-import org.dromara.hutool.setting.Setting;
+import cn.hutool.v7.core.lang.Singleton;
+import cn.hutool.v7.setting.Setting;
 
 /**
  * 全局的Profile配置中心
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/Profile.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/profile/Profile.java
similarity index 94%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/profile/Profile.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/profile/Profile.java
index ae964e525..3d0ceba3d 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/Profile.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/profile/Profile.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.profile;
+package cn.hutool.v7.setting.profile;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.setting.Setting;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.setting.Setting;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/package-info.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/profile/package-info.java
similarity index 94%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/profile/package-info.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/profile/package-info.java
index a5af405a8..214c6fa1a 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/package-info.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/profile/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.setting.profile;
+package cn.hutool.v7.setting.profile;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/props/Props.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/props/Props.java
similarity index 91%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/props/Props.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/props/Props.java
index 71bc3fee9..ec1a59e7c 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/props/Props.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/props/Props.java
@@ -14,29 +14,29 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.props;
+package cn.hutool.v7.setting.props;
 
-import org.dromara.hutool.core.bean.BeanUtil;
-import org.dromara.hutool.core.func.LambdaInfo;
-import org.dromara.hutool.core.func.LambdaUtil;
-import org.dromara.hutool.core.func.SerFunction;
-import org.dromara.hutool.core.func.SerSupplier;
-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.io.resource.Resource;
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.core.io.watch.WatchMonitor;
-import org.dromara.hutool.core.io.watch.WatchUtil;
-import org.dromara.hutool.core.io.watch.watchers.SimpleWatcher;
-import org.dromara.hutool.core.lang.Assert;
-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.LogUtil;
+import cn.hutool.v7.core.bean.BeanUtil;
+import cn.hutool.v7.core.func.LambdaInfo;
+import cn.hutool.v7.core.func.LambdaUtil;
+import cn.hutool.v7.core.func.SerFunction;
+import cn.hutool.v7.core.func.SerSupplier;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.resource.Resource;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.io.watch.WatchMonitor;
+import cn.hutool.v7.core.io.watch.WatchUtil;
+import cn.hutool.v7.core.io.watch.watchers.SimpleWatcher;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.getter.TypeGetter;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.reflect.ConstructorUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.log.LogUtil;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/props/PropsUtil.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/props/PropsUtil.java
similarity index 88%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/props/PropsUtil.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/props/PropsUtil.java
index bb77e4f9e..5ddd862d3 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/props/PropsUtil.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/props/PropsUtil.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.props;
+package cn.hutool.v7.setting.props;
 
-import org.dromara.hutool.core.io.file.FileNameUtil;
-import org.dromara.hutool.core.io.resource.NoResourceException;
-import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.io.file.FileNameUtil;
+import cn.hutool.v7.core.io.resource.NoResourceException;
+import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.util.Map;
 
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/props/package-info.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/props/package-info.java
similarity index 94%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/props/package-info.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/props/package-info.java
index 5204f3bcf..9fa09d912 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/props/package-info.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/props/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.setting.props;
+package cn.hutool.v7.setting.props;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/Toml.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/toml/Toml.java
similarity index 94%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/toml/Toml.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/toml/Toml.java
index 748893edd..fcc1d3d8e 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/Toml.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/toml/Toml.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.toml;
+package cn.hutool.v7.setting.toml;
 
-import org.dromara.hutool.core.io.resource.Resource;
+import cn.hutool.v7.core.io.resource.Resource;
 
 import java.io.Writer;
 import java.time.format.DateTimeFormatter;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/toml/TomlReader.java
similarity index 99%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/toml/TomlReader.java
index c765b626e..686c0334e 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/toml/TomlReader.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.toml;
+package cn.hutool.v7.setting.toml;
 
-import org.dromara.hutool.setting.SettingException;
+import cn.hutool.v7.setting.SettingException;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/toml/TomlWriter.java
similarity index 97%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/toml/TomlWriter.java
index adbb5e498..9f23209d7 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/toml/TomlWriter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.toml;
+package cn.hutool.v7.setting.toml;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.setting.SettingException;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.setting.SettingException;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/package-info.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/toml/package-info.java
similarity index 95%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/toml/package-info.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/toml/package-info.java
index 91e4799df..af99679af 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/package-info.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/toml/package-info.java
@@ -26,4 +26,4 @@
  *
  * @author Looly
  */
-package org.dromara.hutool.setting.toml;
+package cn.hutool.v7.setting.toml;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/yaml/YamlUtil.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/yaml/YamlUtil.java
similarity index 94%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/yaml/YamlUtil.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/yaml/YamlUtil.java
index 29cca04a7..2173713cf 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/yaml/YamlUtil.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/yaml/YamlUtil.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.yaml;
+package cn.hutool.v7.setting.yaml;
 
-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 cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.map.Dict;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/yaml/package-info.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/yaml/package-info.java
similarity index 94%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/yaml/package-info.java
rename to hutool-setting/src/main/java/cn/hutool/v7/setting/yaml/package-info.java
index 3421afda1..5ab59f093 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/yaml/package-info.java
+++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/yaml/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.setting.yaml;
+package cn.hutool.v7.setting.yaml;
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/IssueI7EWGOTest.java b/hutool-setting/src/test/java/cn/hutool/v7/setting/IssueI7EWGOTest.java
similarity index 96%
rename from hutool-setting/src/test/java/org/dromara/hutool/setting/IssueI7EWGOTest.java
rename to hutool-setting/src/test/java/cn/hutool/v7/setting/IssueI7EWGOTest.java
index 907dbf09b..d1296e10c 100755
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/IssueI7EWGOTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/v7/setting/IssueI7EWGOTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/IssueI7G34ETest.java b/hutool-setting/src/test/java/cn/hutool/v7/setting/IssueI7G34ETest.java
similarity index 96%
rename from hutool-setting/src/test/java/org/dromara/hutool/setting/IssueI7G34ETest.java
rename to hutool-setting/src/test/java/cn/hutool/v7/setting/IssueI7G34ETest.java
index f48f6f9c6..64349e613 100755
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/IssueI7G34ETest.java
+++ b/hutool-setting/src/test/java/cn/hutool/v7/setting/IssueI7G34ETest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/IssueIB1I8PTest.java b/hutool-setting/src/test/java/cn/hutool/v7/setting/IssueIB1I8PTest.java
similarity index 88%
rename from hutool-setting/src/test/java/org/dromara/hutool/setting/IssueIB1I8PTest.java
rename to hutool-setting/src/test/java/cn/hutool/v7/setting/IssueIB1I8PTest.java
index 37500a78d..af88ac80d 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/IssueIB1I8PTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/v7/setting/IssueIB1I8PTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
 
-import org.dromara.hutool.core.io.resource.ResourceUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/SettingTest.java b/hutool-setting/src/test/java/cn/hutool/v7/setting/SettingTest.java
similarity index 96%
rename from hutool-setting/src/test/java/org/dromara/hutool/setting/SettingTest.java
rename to hutool-setting/src/test/java/cn/hutool/v7/setting/SettingTest.java
index 96f70c4b8..eedd1c9cd 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/SettingTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/v7/setting/SettingTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
 
-import org.dromara.hutool.core.lang.Console;
+import cn.hutool.v7.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/org/dromara/hutool/setting/SettingUtilTest.java b/hutool-setting/src/test/java/cn/hutool/v7/setting/SettingUtilTest.java
similarity index 97%
rename from hutool-setting/src/test/java/org/dromara/hutool/setting/SettingUtilTest.java
rename to hutool-setting/src/test/java/cn/hutool/v7/setting/SettingUtilTest.java
index 74e28709b..81018270d 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/SettingUtilTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/v7/setting/SettingUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting;
+package cn.hutool.v7.setting;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsTest.java b/hutool-setting/src/test/java/cn/hutool/v7/setting/props/PropsTest.java
similarity index 98%
rename from hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsTest.java
rename to hutool-setting/src/test/java/cn/hutool/v7/setting/props/PropsTest.java
index 0b9a22888..d0f6861d2 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/v7/setting/props/PropsTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.props;
+package cn.hutool.v7.setting.props;
 
 import lombok.Data;
-import org.dromara.hutool.core.date.DateUtil;
+import cn.hutool.v7.core.date.DateUtil;
 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/org/dromara/hutool/setting/props/PropsUtilTest.java b/hutool-setting/src/test/java/cn/hutool/v7/setting/props/PropsUtilTest.java
similarity index 92%
rename from hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsUtilTest.java
rename to hutool-setting/src/test/java/cn/hutool/v7/setting/props/PropsUtilTest.java
index 8586dda52..e36b648e6 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsUtilTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/v7/setting/props/PropsUtilTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.props;
+package cn.hutool.v7.setting.props;
 
-import org.dromara.hutool.setting.props.PropsUtil;
+import cn.hutool.v7.setting.props.PropsUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/toml/Issue3008Test.java b/hutool-setting/src/test/java/cn/hutool/v7/setting/toml/Issue3008Test.java
similarity index 86%
rename from hutool-setting/src/test/java/org/dromara/hutool/setting/toml/Issue3008Test.java
rename to hutool-setting/src/test/java/cn/hutool/v7/setting/toml/Issue3008Test.java
index 762dfe643..3b52b6b6a 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/toml/Issue3008Test.java
+++ b/hutool-setting/src/test/java/cn/hutool/v7/setting/toml/Issue3008Test.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.toml;
+package cn.hutool.v7.setting.toml;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.setting.props.Props;
-import org.dromara.hutool.setting.props.PropsUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.setting.props.Props;
+import cn.hutool.v7.setting.props.PropsUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/toml/TomlTest.java b/hutool-setting/src/test/java/cn/hutool/v7/setting/toml/TomlTest.java
similarity index 90%
rename from hutool-setting/src/test/java/org/dromara/hutool/setting/toml/TomlTest.java
rename to hutool-setting/src/test/java/cn/hutool/v7/setting/toml/TomlTest.java
index 01757091a..01acc455c 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/toml/TomlTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/v7/setting/toml/TomlTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.toml;
+package cn.hutool.v7.setting.toml;
 
-import org.dromara.hutool.core.io.resource.ResourceUtil;
+import cn.hutool.v7.core.io.resource.ResourceUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/yaml/YamlUtilTest.java b/hutool-setting/src/test/java/cn/hutool/v7/setting/yaml/YamlUtilTest.java
similarity index 88%
rename from hutool-setting/src/test/java/org/dromara/hutool/setting/yaml/YamlUtilTest.java
rename to hutool-setting/src/test/java/cn/hutool/v7/setting/yaml/YamlUtilTest.java
index 29d9a2c87..2c992739f 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/yaml/YamlUtilTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/v7/setting/yaml/YamlUtilTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.setting.yaml;
+package cn.hutool.v7.setting.yaml;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.map.Dict;
-import org.dromara.hutool.core.util.CharsetUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.map.Dict;
+import cn.hutool.v7.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-setting/src/test/resources/example/example.set b/hutool-setting/src/test/resources/example/example.set
index f95ce98ea..6dc15b693 100644
--- a/hutool-setting/src/test/resources/example/example.set
+++ b/hutool-setting/src/test/resources/example/example.set
@@ -1,6 +1,6 @@
 # -------------------------------------------------------------
 # ----- GroupedSet File with UTF8-----
-# @see org.dromara.hutool.setting.GroupedSet
+# @see cn.hutool.v7.setting.GroupedSet
 # -------------------------------------------------------------
 
 无分组值1
diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml
index 99cdd4d49..403ea80c5 100755
--- a/hutool-socket/pom.xml
+++ b/hutool-socket/pom.xml
@@ -23,9 +23,9 @@
 	jar
 
 	
-		org.dromara.hutool
+		cn.hutool.v7
 		hutool-parent
-		6.0.0-M22
+		7.0.0.M1
 	
 
 	hutool-socket
@@ -33,17 +33,17 @@
 	Hutool套接字，包括BIO、NIO、AIO封装
 
 	
-		org.dromara.hutool.socket
+		cn.hutool.v7.socket
 	
 
 	
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-core
 			${project.parent.version}
 		
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-log
 			${project.parent.version}
 		
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/ChannelUtil.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/ChannelUtil.java
similarity index 91%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/ChannelUtil.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/ChannelUtil.java
index 0528088d6..fc06c3738 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/ChannelUtil.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/ChannelUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket;
+package cn.hutool.v7.socket;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.thread.ThreadFactoryBuilder;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.thread.ThreadFactoryBuilder;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketConfig.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketConfig.java
similarity index 96%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/SocketConfig.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/SocketConfig.java
index deff93c86..bb57b41df 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketConfig.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketConfig.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket;
+package cn.hutool.v7.socket;
 
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.core.util.RuntimeUtil;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.util.RuntimeUtil;
 
 import java.io.Serializable;
 
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketRuntimeException.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketRuntimeException.java
similarity index 95%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/SocketRuntimeException.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/SocketRuntimeException.java
index 7f26e9052..22cdf4eb6 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketRuntimeException.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketRuntimeException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket;
+package cn.hutool.v7.socket;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * Socket异常
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketUtil.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketUtil.java
similarity index 97%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/SocketUtil.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/SocketUtil.java
index 34424c88d..48fc4a197 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketUtil.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketUtil.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket;
+package cn.hutool.v7.socket;
 
-import org.dromara.hutool.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IORuntimeException;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AcceptHandler.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/AcceptHandler.java
similarity index 94%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AcceptHandler.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/aio/AcceptHandler.java
index aa2b1bfb2..2efa0115d 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AcceptHandler.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/AcceptHandler.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.aio;
+package cn.hutool.v7.socket.aio;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.AsynchronousSocketChannel;
 import java.nio.channels.CompletionHandler;
 
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.log.LogUtil;
 
 /**
  * 接入完成回调，单例使用
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioClient.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/AioClient.java
similarity index 96%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioClient.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/aio/AioClient.java
index b6330000c..7d31669c6 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioClient.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/AioClient.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.aio;
+package cn.hutool.v7.socket.aio;
 
-import org.dromara.hutool.socket.ChannelUtil;
-import org.dromara.hutool.socket.SocketConfig;
+import cn.hutool.v7.socket.ChannelUtil;
+import cn.hutool.v7.socket.SocketConfig;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioServer.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/AioServer.java
similarity index 93%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioServer.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/aio/AioServer.java
index b2219568f..acda8e6a5 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioServer.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/AioServer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.aio;
+package cn.hutool.v7.socket.aio;
 
-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.socket.SocketConfig;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.thread.ThreadFactoryBuilder;
+import cn.hutool.v7.core.thread.ThreadUtil;
+import cn.hutool.v7.log.Log;
+import cn.hutool.v7.socket.SocketConfig;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioSession.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/AioSession.java
similarity index 95%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioSession.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/aio/AioSession.java
index d08e6477b..7535174ba 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioSession.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/AioSession.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.aio;
+package cn.hutool.v7.socket.aio;
 
-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 cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.socket.SocketConfig;
+import cn.hutool.v7.socket.SocketUtil;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/IoAction.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/IoAction.java
similarity index 97%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/aio/IoAction.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/aio/IoAction.java
index 757cfaf9b..c7b5de562 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/IoAction.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/IoAction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.aio;
+package cn.hutool.v7.socket.aio;
 
 /**
  * Socket流处理接口
      
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/ReadHandler.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/ReadHandler.java
similarity index 91%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/aio/ReadHandler.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/aio/ReadHandler.java
index 22fb3093a..5b413930d 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/ReadHandler.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/ReadHandler.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.aio;
+package cn.hutool.v7.socket.aio;
 
 import java.nio.channels.CompletionHandler;
 
-import org.dromara.hutool.socket.SocketRuntimeException;
+import cn.hutool.v7.socket.SocketRuntimeException;
 
 /**
  * 数据读取完成回调，调用Session中相应方法处理消息，单例使用
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/SimpleIoAction.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/SimpleIoAction.java
similarity index 92%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/aio/SimpleIoAction.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/aio/SimpleIoAction.java
index be57d845a..1948c13d9 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/SimpleIoAction.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/SimpleIoAction.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.aio;
+package cn.hutool.v7.socket.aio;
 
 import java.nio.ByteBuffer;
 
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.log.LogUtil;
 
 /**
  * 简易IO信息处理类
      
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/package-info.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/package-info.java
similarity index 94%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/aio/package-info.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/aio/package-info.java
index 679852484..8883a9dd2 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/package-info.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/aio/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.socket.aio;
+package cn.hutool.v7.socket.aio;
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/AcceptHandler.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/AcceptHandler.java
similarity index 92%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/nio/AcceptHandler.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/nio/AcceptHandler.java
index a066833e8..ce4a0736f 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/AcceptHandler.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/AcceptHandler.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.nio;
+package cn.hutool.v7.socket.nio;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.log.LogUtil;
 
 import java.io.IOException;
 import java.nio.channels.CompletionHandler;
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/ChannelHandler.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/ChannelHandler.java
similarity index 96%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/nio/ChannelHandler.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/nio/ChannelHandler.java
index f63ed52e5..bc2aef369 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/ChannelHandler.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/ChannelHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.nio;
+package cn.hutool.v7.socket.nio;
 
 import java.nio.channels.SocketChannel;
 
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/ChannelUtil.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/ChannelUtil.java
similarity index 93%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/nio/ChannelUtil.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/nio/ChannelUtil.java
index 6769dca16..8a75a000b 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/ChannelUtil.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/ChannelUtil.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.nio;
+package cn.hutool.v7.socket.nio;
 
-import org.dromara.hutool.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IORuntimeException;
 
 import java.io.IOException;
 import java.nio.channels.SelectableChannel;
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioClient.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/NioClient.java
similarity index 93%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioClient.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/nio/NioClient.java
index 4fc0b187c..c8a43e1ae 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioClient.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/NioClient.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.nio;
+package cn.hutool.v7.socket.nio;
 
-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 cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.thread.ThreadUtil;
+import cn.hutool.v7.log.Log;
+import cn.hutool.v7.socket.SocketRuntimeException;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioServer.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/NioServer.java
similarity index 95%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioServer.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/nio/NioServer.java
index 33e57bdb1..6c7b6c010 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioServer.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/NioServer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.nio;
+package cn.hutool.v7.socket.nio;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.IoUtil;
-import org.dromara.hutool.log.Log;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.log.Log;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/Operation.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/Operation.java
similarity index 97%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/nio/Operation.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/nio/Operation.java
index 558fa6abf..6437133a7 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/Operation.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/Operation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.nio;
+package cn.hutool.v7.socket.nio;
 
 import java.nio.channels.SelectionKey;
 
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/package-info.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/package-info.java
similarity index 94%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/nio/package-info.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/nio/package-info.java
index c30daf4bb..fafe5d7cd 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/package-info.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/nio/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.socket.nio;
+package cn.hutool.v7.socket.nio;
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/package-info.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/package-info.java
similarity index 95%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/package-info.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/package-info.java
index 017e23261..a1b366c6f 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/package-info.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.socket;
+package cn.hutool.v7.socket;
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/MsgDecoder.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/MsgDecoder.java
similarity index 92%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/MsgDecoder.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/MsgDecoder.java
index e09727ef5..b77f760c7 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/MsgDecoder.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/MsgDecoder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.protocol;
+package cn.hutool.v7.socket.protocol;
 
 import java.nio.ByteBuffer;
 
-import org.dromara.hutool.socket.aio.AioSession;
+import cn.hutool.v7.socket.aio.AioSession;
 
 /**
  * 消息解码器
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/MsgEncoder.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/MsgEncoder.java
similarity index 91%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/MsgEncoder.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/MsgEncoder.java
index 2e13695eb..ca960be04 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/MsgEncoder.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/MsgEncoder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.protocol;
+package cn.hutool.v7.socket.protocol;
 
 import java.nio.ByteBuffer;
 
-import org.dromara.hutool.socket.aio.AioSession;
+import cn.hutool.v7.socket.aio.AioSession;
 
 /**
  * 消息编码器
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/Protocol.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/Protocol.java
similarity index 95%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/Protocol.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/Protocol.java
index 483f14d0c..c263fe2bf 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/Protocol.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/Protocol.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.protocol;
+package cn.hutool.v7.socket.protocol;
 
 /**
  * 协议接口
      
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/package-info.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/package-info.java
similarity index 93%
rename from hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/package-info.java
rename to hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/package-info.java
index 85b95387b..06870340a 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/protocol/package-info.java
+++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.socket.protocol;
+package cn.hutool.v7.socket.protocol;
diff --git a/hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioClientTest.java b/hutool-socket/src/test/java/cn/hutool/v7/socket/aio/AioClientTest.java
similarity index 87%
rename from hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioClientTest.java
rename to hutool-socket/src/test/java/cn/hutool/v7/socket/aio/AioClientTest.java
index 732ffdd88..9f79e5a6d 100644
--- a/hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioClientTest.java
+++ b/hutool-socket/src/test/java/cn/hutool/v7/socket/aio/AioClientTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.aio;
+package cn.hutool.v7.socket.aio;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.thread.ThreadUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.thread.ThreadUtil;
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
diff --git a/hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioServerTest.java b/hutool-socket/src/test/java/cn/hutool/v7/socket/aio/AioServerTest.java
similarity index 86%
rename from hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioServerTest.java
rename to hutool-socket/src/test/java/cn/hutool/v7/socket/aio/AioServerTest.java
index 6556009c3..a928d2405 100644
--- a/hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioServerTest.java
+++ b/hutool-socket/src/test/java/cn/hutool/v7/socket/aio/AioServerTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.aio;
+package cn.hutool.v7.socket.aio;
 
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.io.buffer.BufferUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.log.LogUtil;
+import cn.hutool.v7.core.date.DateUtil;
+import cn.hutool.v7.core.io.buffer.BufferUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.log.LogUtil;
 
 import java.nio.ByteBuffer;
 
diff --git a/hutool-socket/src/test/java/org/dromara/hutool/socket/nio/NioClientTest.java b/hutool-socket/src/test/java/cn/hutool/v7/socket/nio/NioClientTest.java
similarity index 92%
rename from hutool-socket/src/test/java/org/dromara/hutool/socket/nio/NioClientTest.java
rename to hutool-socket/src/test/java/cn/hutool/v7/socket/nio/NioClientTest.java
index fc5955a89..943659fe3 100644
--- a/hutool-socket/src/test/java/org/dromara/hutool/socket/nio/NioClientTest.java
+++ b/hutool-socket/src/test/java/cn/hutool/v7/socket/nio/NioClientTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.nio;
+package cn.hutool.v7.socket.nio;
 
-import org.dromara.hutool.core.io.buffer.BufferUtil;
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.io.buffer.BufferUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.text.StrUtil;
 import lombok.SneakyThrows;
 
 import java.nio.ByteBuffer;
diff --git a/hutool-socket/src/test/java/org/dromara/hutool/socket/nio/NioServerTest.java b/hutool-socket/src/test/java/cn/hutool/v7/socket/nio/NioServerTest.java
similarity index 87%
rename from hutool-socket/src/test/java/org/dromara/hutool/socket/nio/NioServerTest.java
rename to hutool-socket/src/test/java/cn/hutool/v7/socket/nio/NioServerTest.java
index 7beec87c9..5a646e361 100644
--- a/hutool-socket/src/test/java/org/dromara/hutool/socket/nio/NioServerTest.java
+++ b/hutool-socket/src/test/java/cn/hutool/v7/socket/nio/NioServerTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.socket.nio;
+package cn.hutool.v7.socket.nio;
 
-import org.dromara.hutool.core.io.buffer.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 cn.hutool.v7.core.io.buffer.BufferUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.text.StrUtil;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/hutool-swing/pom.xml b/hutool-swing/pom.xml
index 4d299a396..ede285b78 100755
--- a/hutool-swing/pom.xml
+++ b/hutool-swing/pom.xml
@@ -23,9 +23,9 @@
 	jar
 
 	
-		org.dromara.hutool
+		cn.hutool.v7
 		hutool-parent
-		6.0.0-M22
+		7.0.0.M1
 	
 
 	hutool-swing
@@ -33,7 +33,7 @@
 	Hutool swing桌面和图片多媒体相关封装
 
 	
-		org.dromara.hutool.swing
+		cn.hutool.v7.swing
 		1.4
 		2.19.0
 		3.5.3
@@ -41,7 +41,7 @@
 
 	
 		
-			org.dromara.hutool
+			cn.hutool.v7
 			hutool-core
 			${project.parent.version}
 		
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/DesktopUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/DesktopUtil.java
similarity index 95%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/DesktopUtil.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/DesktopUtil.java
index 152dd4739..ddc2b50fe 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/DesktopUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/DesktopUtil.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing;
+package cn.hutool.v7.swing;
 
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.net.url.UrlUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.net.url.UrlUtil;
 
 import java.awt.Desktop;
 import java.io.File;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/FontUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/FontUtil.java
similarity index 96%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/FontUtil.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/FontUtil.java
index cdc1e3e28..dfcd08837 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/FontUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/FontUtil.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing;
+package cn.hutool.v7.swing;
 
-import org.dromara.hutool.core.exception.ExceptionUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
+import cn.hutool.v7.core.exception.ExceptionUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
 
 import java.awt.*;
 import java.awt.font.FontRenderContext;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/RobotUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/RobotUtil.java
similarity index 96%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/RobotUtil.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/RobotUtil.java
index 7aafea18b..7bac1aedf 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/RobotUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/RobotUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing;
+package cn.hutool.v7.swing;
 
-import org.dromara.hutool.core.exception.HutoolException;
-import org.dromara.hutool.swing.clipboard.ClipboardUtil;
-import org.dromara.hutool.swing.img.ImgUtil;
+import cn.hutool.v7.core.exception.HutoolException;
+import cn.hutool.v7.swing.clipboard.ClipboardUtil;
+import cn.hutool.v7.swing.img.ImgUtil;
 
 import java.awt.AWTException;
 import java.awt.Rectangle;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/ScreenUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/ScreenUtil.java
similarity index 98%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/ScreenUtil.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/ScreenUtil.java
index c37169000..220af37ee 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/ScreenUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/ScreenUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing;
+package cn.hutool.v7.swing;
 
 import java.awt.Dimension;
 import java.awt.Rectangle;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/AbstractCaptcha.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/AbstractCaptcha.java
similarity index 93%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/AbstractCaptcha.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/AbstractCaptcha.java
index b6f146067..a4d544e33 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/AbstractCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/AbstractCaptcha.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha;
+package cn.hutool.v7.swing.captcha;
 
-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 cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.net.url.UrlUtil;
+import cn.hutool.v7.swing.captcha.generator.CodeGenerator;
+import cn.hutool.v7.swing.captcha.generator.RandomGenerator;
+import cn.hutool.v7.swing.img.ImgUtil;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/CaptchaUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/CaptchaUtil.java
similarity index 99%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/CaptchaUtil.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/CaptchaUtil.java
index f2e0c3c26..0aa35e7e3 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/CaptchaUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/CaptchaUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha;
+package cn.hutool.v7.swing.captcha;
 
 /**
  * 图形验证码工具
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/CircleCaptcha.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/CircleCaptcha.java
similarity index 92%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/CircleCaptcha.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/CircleCaptcha.java
index 33b9360ef..1da19d5a2 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/CircleCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/CircleCaptcha.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha;
+package cn.hutool.v7.swing.captcha;
 
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.swing.captcha.generator.CodeGenerator;
-import org.dromara.hutool.swing.captcha.generator.RandomGenerator;
-import org.dromara.hutool.swing.img.GraphicsUtil;
-import org.dromara.hutool.swing.img.color.ColorUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.swing.captcha.generator.CodeGenerator;
+import cn.hutool.v7.swing.captcha.generator.RandomGenerator;
+import cn.hutool.v7.swing.img.GraphicsUtil;
+import cn.hutool.v7.swing.img.color.ColorUtil;
 
 import java.awt.Graphics2D;
 import java.awt.Image;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/GifCaptcha.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/GifCaptcha.java
similarity index 96%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/GifCaptcha.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/GifCaptcha.java
index 9bfa9735b..9521e1abb 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/GifCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/GifCaptcha.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha;
+package cn.hutool.v7.swing.captcha;
 
 
 import com.madgag.gif.fmsware.AnimatedGifEncoder;
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.swing.captcha.generator.CodeGenerator;
-import org.dromara.hutool.swing.captcha.generator.RandomGenerator;
-import org.dromara.hutool.swing.img.GraphicsUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.swing.captcha.generator.CodeGenerator;
+import cn.hutool.v7.swing.captcha.generator.RandomGenerator;
+import cn.hutool.v7.swing.img.GraphicsUtil;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/ICaptcha.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/ICaptcha.java
similarity index 96%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/ICaptcha.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/ICaptcha.java
index 35d2b451d..b381cc701 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/ICaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/ICaptcha.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha;
+package cn.hutool.v7.swing.captcha;
 
 import java.io.OutputStream;
 import java.io.Serializable;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/LineCaptcha.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/LineCaptcha.java
similarity index 92%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/LineCaptcha.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/LineCaptcha.java
index a5cacd281..5a3f8d546 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/LineCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/LineCaptcha.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha;
+package cn.hutool.v7.swing.captcha;
 
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.swing.captcha.generator.CodeGenerator;
-import org.dromara.hutool.swing.captcha.generator.RandomGenerator;
-import org.dromara.hutool.swing.img.GraphicsUtil;
-import org.dromara.hutool.swing.img.color.ColorUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.swing.captcha.generator.CodeGenerator;
+import cn.hutool.v7.swing.captcha.generator.RandomGenerator;
+import cn.hutool.v7.swing.img.GraphicsUtil;
+import cn.hutool.v7.swing.img.color.ColorUtil;
 
 import java.awt.Graphics;
 import java.awt.Graphics2D;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/ShearCaptcha.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/ShearCaptcha.java
similarity index 94%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/ShearCaptcha.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/ShearCaptcha.java
index 8526d371f..64f36e581 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/ShearCaptcha.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/ShearCaptcha.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha;
+package cn.hutool.v7.swing.captcha;
 
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.swing.captcha.generator.CodeGenerator;
-import org.dromara.hutool.swing.captcha.generator.RandomGenerator;
-import org.dromara.hutool.swing.img.color.ColorUtil;
-import org.dromara.hutool.swing.img.GraphicsUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.swing.captcha.generator.CodeGenerator;
+import cn.hutool.v7.swing.captcha.generator.RandomGenerator;
+import cn.hutool.v7.swing.img.color.ColorUtil;
+import cn.hutool.v7.swing.img.GraphicsUtil;
 
 import java.awt.Color;
 import java.awt.Graphics;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/AbstractGenerator.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/AbstractGenerator.java
similarity index 94%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/AbstractGenerator.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/AbstractGenerator.java
index 1ce86d966..68d55d8d1 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/AbstractGenerator.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/AbstractGenerator.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha.generator;
+package cn.hutool.v7.swing.captcha.generator;
 
-import org.dromara.hutool.core.util.RandomUtil;
+import cn.hutool.v7.core.util.RandomUtil;
 
 /**
  * 随机字符验证码生成器
      
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/CodeGenerator.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/CodeGenerator.java
similarity index 95%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/CodeGenerator.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/CodeGenerator.java
index a01d487e4..a55b5fa51 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/CodeGenerator.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/CodeGenerator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha.generator;
+package cn.hutool.v7.swing.captcha.generator;
 
 import java.io.Serializable;
 
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/MathGenerator.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/MathGenerator.java
similarity index 90%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/MathGenerator.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/MathGenerator.java
index d9ea74581..452723af3 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/MathGenerator.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/MathGenerator.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha.generator;
+package cn.hutool.v7.swing.captcha.generator;
 
-import org.dromara.hutool.core.math.Calculator;
-import org.dromara.hutool.core.text.CharUtil;
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.math.Calculator;
+import cn.hutool.v7.core.text.CharUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * 数字计算验证码生成器
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/RandomGenerator.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/RandomGenerator.java
similarity index 91%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/RandomGenerator.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/RandomGenerator.java
index 4e56c47fb..728a5b41b 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/RandomGenerator.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/RandomGenerator.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha.generator;
+package cn.hutool.v7.swing.captcha.generator;
 
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.core.text.StrUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.core.text.StrUtil;
 
 /**
  * 随机字符验证码生成器
      
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/package-info.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/package-info.java
similarity index 92%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/package-info.java
index c371a0ff3..ef836d7de 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/generator/package-info.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 4.1.2
  */
-package org.dromara.hutool.swing.captcha.generator;
+package cn.hutool.v7.swing.captcha.generator;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/package-info.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/package-info.java
similarity index 94%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/package-info.java
index 3926c46b3..02059af1c 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/captcha/package-info.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.swing.captcha;
+package cn.hutool.v7.swing.captcha;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardListener.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ClipboardListener.java
similarity index 96%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardListener.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ClipboardListener.java
index e0b665616..10e27e823 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardListener.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ClipboardListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.clipboard;
+package cn.hutool.v7.swing.clipboard;
 
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.Transferable;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardMonitor.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ClipboardMonitor.java
similarity index 97%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardMonitor.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ClipboardMonitor.java
index d718ffb29..9b0b3da07 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardMonitor.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ClipboardMonitor.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.clipboard;
+package cn.hutool.v7.swing.clipboard;
 
-import org.dromara.hutool.core.thread.ThreadUtil;
-import org.dromara.hutool.core.util.ObjUtil;
+import cn.hutool.v7.core.thread.ThreadUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.ClipboardOwner;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ClipboardUtil.java
similarity index 98%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardUtil.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ClipboardUtil.java
index 036b048cb..61929ece9 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ClipboardUtil.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.clipboard;
+package cn.hutool.v7.swing.clipboard;
 
-import org.dromara.hutool.core.exception.ExceptionUtil;
+import cn.hutool.v7.core.exception.ExceptionUtil;
 
 import java.awt.Image;
 import java.awt.Toolkit;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ImageSelection.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ImageSelection.java
similarity index 97%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ImageSelection.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ImageSelection.java
index 337139b0d..e8a3a8ad9 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ImageSelection.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ImageSelection.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.clipboard;
+package cn.hutool.v7.swing.clipboard;
 
 import java.awt.Image;
 import java.awt.datatransfer.DataFlavor;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/StrClipboardListener.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/StrClipboardListener.java
similarity index 97%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/StrClipboardListener.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/StrClipboardListener.java
index e241c368f..f1ca00306 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/StrClipboardListener.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/StrClipboardListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.clipboard;
+package cn.hutool.v7.swing.clipboard;
 
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/package-info.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/package-info.java
similarity index 94%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/package-info.java
index e091e7568..6f80c951d 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/package-info.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.swing.clipboard;
+package cn.hutool.v7.swing.clipboard;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/BackgroundRemoval.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/BackgroundRemoval.java
similarity index 97%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/BackgroundRemoval.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/BackgroundRemoval.java
index 61e60d55c..27f2936c6 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/BackgroundRemoval.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/BackgroundRemoval.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.io.file.FileTypeUtil;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.swing.img.color.ColorUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.file.FileTypeUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.swing.img.color.ColorUtil;
 
 import javax.imageio.ImageIO;
 import javax.swing.ImageIcon;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/DisplayText.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/DisplayText.java
similarity index 99%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/DisplayText.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/DisplayText.java
index 0a83629e6..e55a89cf2 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/DisplayText.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/DisplayText.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/GraphicsUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/GraphicsUtil.java
similarity index 97%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/GraphicsUtil.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/GraphicsUtil.java
index ce0302505..1a73c585f 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/GraphicsUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/GraphicsUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.swing.FontUtil;
-import org.dromara.hutool.swing.img.color.ColorUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.swing.FontUtil;
+import cn.hutool.v7.swing.img.color.ColorUtil;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/Img.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/Img.java
similarity index 98%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/Img.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/Img.java
index a4332a633..aa4c7aef3 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/Img.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/Img.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
-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 org.dromara.hutool.swing.FontUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileNameUtil;
+import cn.hutool.v7.core.io.resource.Resource;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.math.NumberUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.swing.FontUtil;
 
 import javax.imageio.ImageIO;
 import javax.imageio.stream.ImageInputStream;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgMetaUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/ImgMetaUtil.java
similarity index 94%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgMetaUtil.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/ImgMetaUtil.java
index e990605a5..4043dfadf 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgMetaUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/ImgMetaUtil.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
-import org.dromara.hutool.core.exception.HutoolException;
-import org.dromara.hutool.core.io.IORuntimeException;
+import cn.hutool.v7.core.exception.HutoolException;
+import cn.hutool.v7.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/org/dromara/hutool/swing/img/ImgUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/ImgUtil.java
similarity index 99%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgUtil.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/ImgUtil.java
index 9aa92d36c..9b0b86b51 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/ImgUtil.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
-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.io.file.FileNameUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.io.resource.Resource;
-import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.tuple.Pair;
-import org.dromara.hutool.core.math.NumberUtil;
-import org.dromara.hutool.core.net.url.UrlUtil;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.swing.FontUtil;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileNameUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.resource.Resource;
+import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.tuple.Pair;
+import cn.hutool.v7.core.math.NumberUtil;
+import cn.hutool.v7.core.net.url.UrlUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.swing.FontUtil;
 
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgWriter.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/ImgWriter.java
similarity index 96%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgWriter.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/ImgWriter.java
index 4ee91d624..7133c1004 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgWriter.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/ImgWriter.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
-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 cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.lang.Assert;
 
 import javax.imageio.IIOImage;
 import javax.imageio.ImageTypeSpecifier;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/RenderingHintsBuilder.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/RenderingHintsBuilder.java
similarity index 99%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/RenderingHintsBuilder.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/RenderingHintsBuilder.java
index dcf13a684..dce067a62 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/RenderingHintsBuilder.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/RenderingHintsBuilder.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
-import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.lang.builder.Builder;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.builder.Builder;
 
 import java.awt.RenderingHints;
 import java.util.HashMap;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ScaleType.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/ScaleType.java
similarity index 97%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/ScaleType.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/ScaleType.java
index af1b27fc6..eee9031c1 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ScaleType.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/ScaleType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
 import java.awt.Image;
 
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/Ansi4bitMapping.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/Ansi4bitMapping.java
similarity index 95%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/Ansi4bitMapping.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/Ansi4bitMapping.java
index 93fbe7975..d0d28d242 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/Ansi4bitMapping.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/Ansi4bitMapping.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img.color;
+package cn.hutool.v7.swing.img.color;
 
-import org.dromara.hutool.core.lang.ansi.Ansi4BitColor;
+import cn.hutool.v7.core.lang.ansi.Ansi4BitColor;
 
 import java.util.LinkedHashMap;
 
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/Ansi8bitMapping.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/Ansi8bitMapping.java
similarity index 97%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/Ansi8bitMapping.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/Ansi8bitMapping.java
index 87db59375..206a871db 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/Ansi8bitMapping.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/Ansi8bitMapping.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img.color;
+package cn.hutool.v7.swing.img.color;
 
-import org.dromara.hutool.core.lang.ansi.Ansi8BitColor;
+import cn.hutool.v7.core.lang.ansi.Ansi8BitColor;
 
 import java.util.LinkedHashMap;
 
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/AnsiLabMapping.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/AnsiLabMapping.java
similarity index 94%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/AnsiLabMapping.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/AnsiLabMapping.java
index 30ea4650e..7b81c7539 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/AnsiLabMapping.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/AnsiLabMapping.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img.color;
+package cn.hutool.v7.swing.img.color;
 
-import org.dromara.hutool.core.lang.ansi.AnsiElement;
+import cn.hutool.v7.core.lang.ansi.AnsiElement;
 
 import java.awt.Color;
 import java.util.Map;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/ColorUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/ColorUtil.java
similarity index 95%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/ColorUtil.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/ColorUtil.java
index 68c70dfc2..283265e12 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/ColorUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/ColorUtil.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img.color;
+package cn.hutool.v7.swing.img.color;
 
-import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.convert.ConvertUtil;
-import org.dromara.hutool.core.lang.Assert;
-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.util.RandomUtil;
+import cn.hutool.v7.core.array.ArrayUtil;
+import cn.hutool.v7.core.convert.ConvertUtil;
+import cn.hutool.v7.core.lang.Assert;
+import cn.hutool.v7.core.lang.ansi.Ansi4BitColor;
+import cn.hutool.v7.core.lang.ansi.Ansi8BitColor;
+import cn.hutool.v7.core.lang.ansi.AnsiElement;
+import cn.hutool.v7.core.map.MapUtil;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.text.split.SplitUtil;
+import cn.hutool.v7.core.util.RandomUtil;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/LabColor.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/LabColor.java
similarity index 97%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/LabColor.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/LabColor.java
index 47d3641fc..1a4fa2299 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/LabColor.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/LabColor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img.color;
+package cn.hutool.v7.swing.img.color;
 
-import org.dromara.hutool.core.lang.Assert;
+import cn.hutool.v7.core.lang.Assert;
 
 import java.awt.Color;
 import java.awt.color.ColorSpace;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/package-info.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/package-info.java
similarity index 93%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/package-info.java
index 1ff89a567..3af2b556b 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/package-info.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/color/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.swing.img.color;
+package cn.hutool.v7.swing.img.color;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/package-info.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/package-info.java
similarity index 94%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/img/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/img/package-info.java
index 776195ae8..7561c9a92 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/package-info.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/package-info.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/package-info.java
similarity index 95%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/package-info.java
index afb058674..e24fdccd0 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/package-info.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.swing;
+package cn.hutool.v7.swing;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/BufferedImageLuminanceSource.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/BufferedImageLuminanceSource.java
similarity index 98%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/BufferedImageLuminanceSource.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/BufferedImageLuminanceSource.java
index 090e00c59..7503cb2e9 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/BufferedImageLuminanceSource.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/BufferedImageLuminanceSource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode;
+package cn.hutool.v7.swing.qrcode;
 
 import com.google.zxing.LuminanceSource;
 
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrCodeException.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrCodeException.java
similarity index 95%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrCodeException.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrCodeException.java
index fabe55f6a..0a842b409 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrCodeException.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrCodeException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode;
+package cn.hutool.v7.swing.qrcode;
 
-import org.dromara.hutool.core.exception.HutoolException;
+import cn.hutool.v7.core.exception.HutoolException;
 
 /**
  * Qrcode异常
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrCodeUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrCodeUtil.java
similarity index 95%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrCodeUtil.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrCodeUtil.java
index 0dcb07325..b9cfd6bfa 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrCodeUtil.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrCodeUtil.java
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode;
+package cn.hutool.v7.swing.qrcode;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.DecodeHintType;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.common.GlobalHistogramBinarizer;
 import com.google.zxing.common.HybridBinarizer;
-import org.dromara.hutool.core.codec.binary.Base64;
-import org.dromara.hutool.core.io.file.FileNameUtil;
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.net.url.UrlUtil;
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.swing.img.ImgUtil;
-import org.dromara.hutool.swing.qrcode.render.AsciiArtRender;
-import org.dromara.hutool.swing.qrcode.render.BitMatrixRender;
-import org.dromara.hutool.swing.qrcode.render.ImageRender;
-import org.dromara.hutool.swing.qrcode.render.SVGRender;
+import cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.io.file.FileNameUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.net.url.UrlUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.swing.img.ImgUtil;
+import cn.hutool.v7.swing.qrcode.render.AsciiArtRender;
+import cn.hutool.v7.swing.qrcode.render.BitMatrixRender;
+import cn.hutool.v7.swing.qrcode.render.ImageRender;
+import cn.hutool.v7.swing.qrcode.render.SVGRender;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrConfig.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrConfig.java
similarity index 98%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrConfig.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrConfig.java
index 4d67d5592..8034e8e36 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrConfig.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrConfig.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode;
+package cn.hutool.v7.swing.qrcode;
 
-import org.dromara.hutool.core.io.file.FileUtil;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.swing.img.ImgUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.swing.img.ImgUtil;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
 import com.google.zxing.datamatrix.encoder.SymbolShapeHint;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrDecoder.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrDecoder.java
similarity index 95%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrDecoder.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrDecoder.java
index 6726da364..951a54c43 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrDecoder.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrDecoder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode;
+package cn.hutool.v7.swing.qrcode;
 
-import org.dromara.hutool.core.codec.Decoder;
-import org.dromara.hutool.core.util.CharsetUtil;
-import org.dromara.hutool.swing.img.ImgUtil;
+import cn.hutool.v7.core.codec.Decoder;
+import cn.hutool.v7.core.util.CharsetUtil;
+import cn.hutool.v7.swing.img.ImgUtil;
 import com.google.zxing.Binarizer;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.DecodeHintType;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrEncoder.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrEncoder.java
similarity index 90%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrEncoder.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrEncoder.java
index 0df1187e8..6cb479a89 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrEncoder.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrEncoder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode;
+package cn.hutool.v7.swing.qrcode;
 
-import org.dromara.hutool.core.codec.Encoder;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
+import cn.hutool.v7.core.codec.Encoder;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.core.util.ObjUtil;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/package-info.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/package-info.java
similarity index 94%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/package-info.java
index 94c8bdaed..b49592b56 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/package-info.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  *
  */
-package org.dromara.hutool.swing.qrcode;
+package cn.hutool.v7.swing.qrcode;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/AsciiArtRender.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/AsciiArtRender.java
similarity index 88%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/AsciiArtRender.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/AsciiArtRender.java
index e75573fd2..b7183aa38 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/AsciiArtRender.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/AsciiArtRender.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode.render;
+package cn.hutool.v7.swing.qrcode.render;
 
 import com.google.zxing.common.BitMatrix;
-import org.dromara.hutool.core.io.IORuntimeException;
-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 org.dromara.hutool.swing.qrcode.QrConfig;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.lang.ansi.AnsiElement;
+import cn.hutool.v7.core.lang.ansi.AnsiEncoder;
+import cn.hutool.v7.swing.img.color.ColorUtil;
+import cn.hutool.v7.swing.qrcode.QrConfig;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/BitMatrixRender.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/BitMatrixRender.java
similarity index 95%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/BitMatrixRender.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/BitMatrixRender.java
index efaa0fc9a..eeb8a7650 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/BitMatrixRender.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/BitMatrixRender.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode.render;
+package cn.hutool.v7.swing.qrcode.render;
 
 import com.google.zxing.common.BitMatrix;
 
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/ImageRender.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/ImageRender.java
similarity index 94%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/ImageRender.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/ImageRender.java
index f64788ff4..da4060c34 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/ImageRender.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/ImageRender.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode.render;
+package cn.hutool.v7.swing.qrcode.render;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.common.BitMatrix;
-import org.dromara.hutool.swing.img.Img;
-import org.dromara.hutool.swing.img.ImgUtil;
-import org.dromara.hutool.swing.qrcode.QrConfig;
+import cn.hutool.v7.swing.img.Img;
+import cn.hutool.v7.swing.img.ImgUtil;
+import cn.hutool.v7.swing.qrcode.QrConfig;
 
 import java.awt.Image;
 import java.awt.Rectangle;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/SVGRender.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/SVGRender.java
similarity index 93%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/SVGRender.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/SVGRender.java
index 41cdcea75..4871d18e3 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/SVGRender.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/SVGRender.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode.render;
+package cn.hutool.v7.swing.qrcode.render;
 
 import com.google.zxing.common.BitMatrix;
-import org.dromara.hutool.core.io.IORuntimeException;
-import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.swing.img.ImgUtil;
-import org.dromara.hutool.swing.img.color.ColorUtil;
-import org.dromara.hutool.swing.qrcode.QrConfig;
+import cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.swing.img.ImgUtil;
+import cn.hutool.v7.swing.img.color.ColorUtil;
+import cn.hutool.v7.swing.qrcode.QrConfig;
 
 import java.awt.Color;
 import java.awt.Image;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/package-info.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/package-info.java
similarity index 93%
rename from hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/package-info.java
rename to hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/package-info.java
index 6da56e8e2..6f0be1df1 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/render/package-info.java
+++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/render/package-info.java
@@ -20,4 +20,4 @@
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.swing.qrcode.render;
+package cn.hutool.v7.swing.qrcode.render;
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/ClipboardMonitorTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/ClipboardMonitorTest.java
similarity index 89%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/ClipboardMonitorTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/ClipboardMonitorTest.java
index 61fa50caa..5dd082bc9 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/ClipboardMonitorTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/ClipboardMonitorTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing;
+package cn.hutool.v7.swing;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.swing.clipboard.ClipboardUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.swing.clipboard.ClipboardUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/ClipboardUtilTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/ClipboardUtilTest.java
similarity index 92%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/ClipboardUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/ClipboardUtilTest.java
index 95d479937..4bb61d09d 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/ClipboardUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/ClipboardUtilTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing;
+package cn.hutool.v7.swing;
 
-import org.dromara.hutool.swing.clipboard.ClipboardUtil;
+import cn.hutool.v7.swing.clipboard.ClipboardUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/DesktopUtilTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/DesktopUtilTest.java
similarity index 96%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/DesktopUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/DesktopUtilTest.java
index 88627b09e..9756828b4 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/DesktopUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/DesktopUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing;
+package cn.hutool.v7.swing;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/FlatLafTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/FlatLafTest.java
similarity index 96%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/FlatLafTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/FlatLafTest.java
index d35f3a0cc..c21386b1d 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/FlatLafTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/FlatLafTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing;
+package cn.hutool.v7.swing;
 
 import com.formdev.flatlaf.FlatDarculaLaf;
 
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/RobotUtilTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/RobotUtilTest.java
similarity index 90%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/RobotUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/RobotUtilTest.java
index 481b2f90c..49515cd1b 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/RobotUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/RobotUtilTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing;
+package cn.hutool.v7.swing;
 
-import org.dromara.hutool.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/CaptchaTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/CaptchaTest.java
similarity index 96%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/CaptchaTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/CaptchaTest.java
index fd5012cea..b717e7671 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/CaptchaTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/CaptchaTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha;
+package cn.hutool.v7.swing.captcha;
 
-import org.dromara.hutool.core.lang.Console;
-import org.dromara.hutool.swing.captcha.generator.MathGenerator;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.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/org/dromara/hutool/swing/captcha/CaptchaUtilTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/CaptchaUtilTest.java
similarity index 92%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/CaptchaUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/CaptchaUtilTest.java
index d0bdd1c65..49b64edcb 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/CaptchaUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/CaptchaUtilTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha;
+package cn.hutool.v7.swing.captcha;
 
-import org.dromara.hutool.core.util.ObjUtil;
-import org.dromara.hutool.core.util.RandomUtil;
-import org.dromara.hutool.swing.img.GraphicsUtil;
-import org.dromara.hutool.swing.img.color.ColorUtil;
+import cn.hutool.v7.core.util.ObjUtil;
+import cn.hutool.v7.core.util.RandomUtil;
+import cn.hutool.v7.swing.img.GraphicsUtil;
+import cn.hutool.v7.swing.img.color.ColorUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/GeneratorTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/GeneratorTest.java
similarity index 89%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/GeneratorTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/GeneratorTest.java
index 3c07dfeb4..c1f4f44e0 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/captcha/GeneratorTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/GeneratorTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.captcha;
+package cn.hutool.v7.swing.captcha;
 
-import org.dromara.hutool.swing.captcha.generator.MathGenerator;
+import cn.hutool.v7.swing.captcha.generator.MathGenerator;
 import org.junit.jupiter.api.Test;
 
 public class GeneratorTest {
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/img/ColorUtilTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/img/ColorUtilTest.java
similarity index 92%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/img/ColorUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/img/ColorUtilTest.java
index 90ea1ebf9..01b8dfbee 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/img/ColorUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/img/ColorUtilTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
-import org.dromara.hutool.swing.img.color.ColorUtil;
+import cn.hutool.v7.swing.img.color.ColorUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/img/FontUtilTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/img/FontUtilTest.java
similarity index 91%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/img/FontUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/img/FontUtilTest.java
index 654b4cbea..10d27a48d 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/img/FontUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/img/FontUtilTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
-import org.dromara.hutool.swing.FontUtil;
+import cn.hutool.v7.swing.FontUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/img/ImgTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/img/ImgTest.java
similarity index 94%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/img/ImgTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/img/ImgTest.java
index 270cef695..ad74e761b 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/img/ImgTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/img/ImgTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
-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 cn.hutool.v7.core.io.file.FileTypeUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.net.url.UrlUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/img/ImgUtilTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/img/ImgUtilTest.java
similarity index 96%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/img/ImgUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/img/ImgUtilTest.java
index 901d1c96c..52139ae97 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/img/ImgUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/img/ImgUtilTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
-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 cn.hutool.v7.core.io.IORuntimeException;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.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/hutool-swing/src/test/java/org/dromara/hutool/swing/img/IssueI8L8UATest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/img/IssueI8L8UATest.java
similarity index 90%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/img/IssueI8L8UATest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/img/IssueI8L8UATest.java
index 20e968cb4..6cb82759a 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/img/IssueI8L8UATest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/img/IssueI8L8UATest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.img;
+package cn.hutool.v7.swing.img;
 
-import org.dromara.hutool.core.io.file.FileUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/Discussions3030Test.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/qrcode/Discussions3030Test.java
similarity index 90%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/Discussions3030Test.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/qrcode/Discussions3030Test.java
index 7ed469660..8d38db17d 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/Discussions3030Test.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/qrcode/Discussions3030Test.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode;
+package cn.hutool.v7.swing.qrcode;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.dromara.hutool.core.io.file.FileUtil.file;
+import static cn.hutool.v7.core.io.file.FileUtil.file;
 
 public class Discussions3030Test {
 	@Test
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/Issue3146Test.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/qrcode/Issue3146Test.java
similarity index 96%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/Issue3146Test.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/qrcode/Issue3146Test.java
index cd0f3803f..fdd4ff519 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/Issue3146Test.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/qrcode/Issue3146Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode;
+package cn.hutool.v7.swing.qrcode;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/IssuesI76SZBTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/qrcode/IssuesI76SZBTest.java
similarity index 96%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/IssuesI76SZBTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/qrcode/IssuesI76SZBTest.java
index f0b0f2802..d6c40619f 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/IssuesI76SZBTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/qrcode/IssuesI76SZBTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode;
+package cn.hutool.v7.swing.qrcode;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/QrCodeUtilTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/qrcode/QrCodeUtilTest.java
similarity index 94%
rename from hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/QrCodeUtilTest.java
rename to hutool-swing/src/test/java/cn/hutool/v7/swing/qrcode/QrCodeUtilTest.java
index bb18c3fd5..fbc41e54f 100644
--- a/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/QrCodeUtilTest.java
+++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/qrcode/QrCodeUtilTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hutool.swing.qrcode;
+package cn.hutool.v7.swing.qrcode;
 
-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 cn.hutool.v7.core.codec.binary.Base64;
+import cn.hutool.v7.core.io.IoUtil;
+import cn.hutool.v7.core.io.file.FileUtil;
+import cn.hutool.v7.core.lang.Console;
+import cn.hutool.v7.core.text.StrUtil;
+import cn.hutool.v7.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.sh b/hutool.sh
old mode 100755
new mode 100644
diff --git a/pom.xml b/pom.xml
index 10122fcd9..dac8d4617 100755
--- a/pom.xml
+++ b/pom.xml
@@ -22,9 +22,9 @@
 
 	pom
 
-	org.dromara.hutool
+	cn.hutool.v7
 	hutool-parent
-	6.0.0-M22
+	7.0.0.M1
 	hutool
 	
 		Hutool是一个功能丰富且易用的Java工具库，通过诸多实用工具类的使用，旨在帮助开发者快速、便捷地完成各类开发任务。这些封装的工具涵盖了字符串、数字、集合、编码、日期、文件、IO、加密、数据库JDBC、JSON、HTTP客户端等一系列操作，可以满足各种不同的开发需求。
@@ -52,10 +52,10 @@
 	
 		utf-8
 		utf-8
-		org.dromara.hutool
+		cn.hutool.v7
 
 		
-		8
+		17
 		5.11.3
 		1.18.36
 		2.0.20