7.0.0.M1

hutool-extra/pom.xml

@@ -23,9 +23,9 @@
 	<packaging>jar</packaging>
 
 	<parent>
-		<groupId>org.dromara.hutool</groupId>
+		<groupId>cn.hutool.v7</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>6.0.0-M22</version>
+		<version>7.0.0.M1</version>
 	</parent>
 
 	<artifactId>hutool-extra</artifactId>
@@ -33,7 +33,7 @@
 	<description>Hutool 扩展工具类（提供其它类库的封装）</description>
 
 	<properties>
-		<Automatic-Module-Name>org.dromara.hutool.extra</Automatic-Module-Name>
+		<Automatic-Module-Name>cn.hutool.v7.extra</Automatic-Module-Name>
 		<!-- versions -->
 		<velocity.version>2.4.1</velocity.version>
 		<beetl.version>3.19.0.RELEASE</beetl.version>
@@ -64,17 +64,17 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.dromara.hutool</groupId>
+			<groupId>cn.hutool.v7</groupId>
 			<artifactId>hutool-core</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.dromara.hutool</groupId>
+			<groupId>cn.hutool.v7</groupId>
 			<artifactId>hutool-swing</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.dromara.hutool</groupId>
+			<groupId>cn.hutool.v7</groupId>
 			<artifactId>hutool-setting</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

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;
 

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;
 
 /**
  * 代理工具类

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;
 

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;

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;
 

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;

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;
 
 /**
  * 动态代理引擎接口

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;
 
 /**
  * 代理引擎简单工厂<br>

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;

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实现的切面代理

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;

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;

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;
 

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;

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;

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;

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;
 
 /**
  * 压缩解压异常语言异常

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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异常

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连接模式

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;

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;

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;
 

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;

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;

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;

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;
 
 /**
  * 邮件异常

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;

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;

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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异常

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;

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;
 

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;
 

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;
 
 /**
  * 系统属性名称常量池

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;

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;

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;

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;

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;

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;

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;
 

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;

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;
 
 /**
  * 消息队列异常

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;
 

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;
 
 /**
  * 消息处理器

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;
 

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;
 
 /**
  * 消息队列引擎接口

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引擎工厂类

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;
 

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引擎

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;
 

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;

hutool-extra/src/main/java/cn/hutool/v7/extra/mq/package-info.java

@@ -19,12 +19,12 @@
  * 通过定义统一接口，统一消息中间件的调用，实现消息队列的解耦。
  * 组件包括：
  * <ul>
- *     <li>{@link org.dromara.hutool.extra.mq.Producer}: 消息生产者，业务的发起方，负责生产消息</li>
- *     <li>{@link org.dromara.hutool.extra.mq.Consumer}: 消息消费者，业务的处理方</li>
- *     <li>{@link org.dromara.hutool.extra.mq.Message}: 消息体，根据不同通信协议定义的固定格式进行编码的数据包</li>
+ *     <li>{@link cn.hutool.v7.extra.mq.Producer}: 消息生产者，业务的发起方，负责生产消息</li>
+ *     <li>{@link cn.hutool.v7.extra.mq.Consumer}: 消息消费者，业务的处理方</li>
+ *     <li>{@link cn.hutool.v7.extra.mq.Message}: 消息体，根据不同通信协议定义的固定格式进行编码的数据包</li>
  * </ul>
  *
  * @author Looly
  * @since 6.0.0
  */
-package org.dromara.hutool.extra.mq;
+package cn.hutool.v7.extra.mq;

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;

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;
 
 /**
  * 拼音异常

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;
 
 /**
  * 拼音工具类，用于快速获取拼音

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;
 

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，自动创建对应的拼音引擎对象<br>

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;
 

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;

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;
 

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;

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);
 		}
 	}
 }

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;

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;

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;

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;

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;
 
 /**