This commit is contained in:
choweli
2025-04-15 17:02:41 +08:00
parent b0e37e3ef3
commit 22d487624d
2867 changed files with 9839 additions and 10677 deletions

View File

@@ -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;

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.extra.ftp;
package cn.hutool.v7.extra.ftp;
public class SimpleFtpServerTest {

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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 {
/**

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;