lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-06-28 13:34:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

7.0.0.M1

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
README-EN.md Executable file → Normal file
View File

0
README.md Executable file → Normal file
View File

13
SECURITY.md
View File

@ -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`.

16
bin/push_dev.sh
View File

@ -16,12 +16,12 @@
# limitations under the License. # limitations under the License.
# #
echo -e "\033[32mCheckout to v6-dev\033[0m" echo -e "\033[32mCheckout to v7-dev\033[0m"
git checkout v6-dev git checkout v7-dev
echo -e "\033[32mPush to Github(origin) v6-dev\033[0m" echo -e "\033[32mPush to Github(origin) v7-dev\033[0m"
git push origin v6-dev git push origin v7-dev
echo -e "\033[32mPush to Gitee v6-dev\033[0m" echo -e "\033[32mPush to Gitee v7-dev\033[0m"
git push osc v6-dev git push osc v7-dev
echo -e "\033[32mPush to Gitcode v6-dev\033[0m" echo -e "\033[32mPush to Gitcode v7-dev\033[0m"
git push gitcode v6-dev git push gitcode v7-dev

20
bin/push_master.sh
View File

@ -19,15 +19,15 @@
# show Hutool logo # show Hutool logo
"$(dirname ${BASH_SOURCE[0]})"/logo.sh "$(dirname ${BASH_SOURCE[0]})"/logo.sh
echo -e "\033[32mCheckout to v6-master\033[0m" echo -e "\033[32mCheckout to v7-master\033[0m"
git checkout v6-master git checkout v7-master
echo -e "\033[32mMerge v6-dev branch\033[0m" echo -e "\033[32mMerge v7-dev branch\033[0m"
git merge v6-dev -m 'Prepare release' git merge v7-dev -m 'Prepare release'
echo -e "\033[32mPush to Github(origin) v6-master\033[0m" echo -e "\033[32mPush to Github(origin) v7-master\033[0m"
git push origin v6-master git push origin v7-master
echo -e "\033[32mPush to Gitee v6-master\033[0m" echo -e "\033[32mPush to Gitee v7-master\033[0m"
git push osc v6-master git push osc v7-master
echo -e "\033[32mPush to Gitcode v6-master\033[0m" echo -e "\033[32mPush to Gitcode v7-master\033[0m"
git push gitcode v6-master git push gitcode v7-master

10
bin/sync.sh
View File

@ -19,10 +19,10 @@
# show Hutool logo # show Hutool logo
"$(dirname ${BASH_SOURCE[0]})"/logo.sh "$(dirname ${BASH_SOURCE[0]})"/logo.sh
# 保证当前在v6-dev分支 # 保证当前在v7-dev分支
git checkout v6-dev git checkout v7-dev
# 同时同步Gitee、Github和Gitcode的库 # 同时同步Gitee、Github和Gitcode的库
git pull osc v6-dev git pull osc v7-dev
git pull origin v6-dev git pull origin v7-dev
git pull gitcode v6-dev git pull gitcode v7-dev

2
bin/version.txt
View File

@ -1 +1 @@
6.0.0-M22 7.0.0.M1

2
docs/js/version.js
View File

@ -1 +1 @@
var version = '6.0.0-M22' var version = '7.0.0.M1'

16
hutool-ai/pom.xml
View File

@ -7,9 +7,9 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>
<groupId>org.dromara.hutool</groupId> <groupId>cn.hutool.v7</groupId>
<artifactId>hutool-parent</artifactId> <artifactId>hutool-parent</artifactId>
<version>6.0.0-M22</version> <version>7.0.0.M1</version>
</parent> </parent>
<artifactId>hutool-ai</artifactId> <artifactId>hutool-ai</artifactId>
@ -17,34 +17,34 @@
<description>Hutool AI大模型封装</description> <description>Hutool AI大模型封装</description>
<properties> <properties>
<Automatic-Module-Name>org.dromara.hutool.ai</Automatic-Module-Name> <Automatic-Module-Name>cn.hutool.v7.ai</Automatic-Module-Name>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.dromara.hutool</groupId> <groupId>cn.hutool.v7</groupId>
<artifactId>hutool-core</artifactId> <artifactId>hutool-core</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara.hutool</groupId> <groupId>cn.hutool.v7</groupId>
<artifactId>hutool-http</artifactId> <artifactId>hutool-http</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara.hutool</groupId> <groupId>cn.hutool.v7</groupId>
<artifactId>hutool-log</artifactId> <artifactId>hutool-log</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara.hutool</groupId> <groupId>cn.hutool.v7</groupId>
<artifactId>hutool-json</artifactId> <artifactId>hutool-json</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara.hutool</groupId> <groupId>cn.hutool.v7</groupId>
<artifactId>hutool-swing</artifactId> <artifactId>hutool-swing</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
<scope>test</scope> <scope>test</scope>

4
hutool-ai/src/main/java/org/dromara/hutool/ai/AIException.java → hutool-ai/src/main/java/cn/hutool/v7/ai/AIException.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * 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;
/** /**
* 异常处理类 * 异常处理类

10
hutool-ai/src/main/java/org/dromara/hutool/ai/AIServiceFactory.java → hutool-ai/src/main/java/cn/hutool/v7/ai/AIServiceFactory.java
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai; package cn.hutool.v7.ai;
import org.dromara.hutool.ai.core.AIConfig; import cn.hutool.v7.ai.core.AIConfig;
import org.dromara.hutool.ai.core.AIService; import cn.hutool.v7.ai.core.AIService;
import org.dromara.hutool.ai.core.AIServiceProvider; import cn.hutool.v7.ai.core.AIServiceProvider;
import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap; import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
import java.util.Map; import java.util.Map;
import java.util.ServiceLoader; import java.util.ServiceLoader;

16
hutool-ai/src/main/java/org/dromara/hutool/ai/AIUtil.java → hutool-ai/src/main/java/cn/hutool/v7/ai/AIUtil.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai; package cn.hutool.v7.ai;
import org.dromara.hutool.ai.core.AIConfig; import cn.hutool.v7.ai.core.AIConfig;
import org.dromara.hutool.ai.core.AIService; import cn.hutool.v7.ai.core.AIService;
import org.dromara.hutool.ai.core.Message; import cn.hutool.v7.ai.core.Message;
import org.dromara.hutool.ai.model.deepseek.DeepSeekService; import cn.hutool.v7.ai.model.deepseek.DeepSeekService;
import org.dromara.hutool.ai.model.doubao.DoubaoService; import cn.hutool.v7.ai.model.doubao.DoubaoService;
import org.dromara.hutool.ai.model.grok.GrokService; import cn.hutool.v7.ai.model.grok.GrokService;
import org.dromara.hutool.ai.model.openai.OpenaiService; import cn.hutool.v7.ai.model.openai.OpenaiService;
import java.util.List; import java.util.List;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/ModelName.java → hutool-ai/src/main/java/cn/hutool/v7/ai/ModelName.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai; package cn.hutool.v7.ai;
/** /**
* 模型厂商的名称（不指具体的模型） * 模型厂商的名称（不指具体的模型）

2
hutool-ai/src/main/java/org/dromara/hutool/ai/Models.java → hutool-ai/src/main/java/cn/hutool/v7/ai/Models.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai; package cn.hutool.v7.ai;
/** /**
* 各模型厂商包含的model（指具体的模型） * 各模型厂商包含的model（指具体的模型）

2
hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIConfig.java → hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIConfig.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai.core; package cn.hutool.v7.ai.core;
import java.util.Map; import java.util.Map;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIConfigBuilder.java → hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIConfigBuilder.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai.core; package cn.hutool.v7.ai.core;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;

4
hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIConfigRegistry.java → hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIConfigRegistry.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * 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.Map;
import java.util.ServiceLoader; import java.util.ServiceLoader;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIService.java → hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIService.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai.core; package cn.hutool.v7.ai.core;
import java.util.List; import java.util.List;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/core/AIServiceProvider.java → hutool-ai/src/main/java/cn/hutool/v7/ai/core/AIServiceProvider.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai.core; package cn.hutool.v7.ai.core;
/** /**
* 用于加载AI服务,每一个通过SPI创建的AI服务都要实现此接口 * 用于加载AI服务,每一个通过SPI创建的AI服务都要实现此接口

14
hutool-ai/src/main/java/org/dromara/hutool/ai/core/BaseAIService.java → hutool-ai/src/main/java/cn/hutool/v7/ai/core/BaseAIService.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai.core; package cn.hutool.v7.ai.core;
import org.dromara.hutool.ai.AIException; import cn.hutool.v7.ai.AIException;
import org.dromara.hutool.http.HttpGlobalConfig; import cn.hutool.v7.http.HttpGlobalConfig;
import org.dromara.hutool.http.HttpUtil; import cn.hutool.v7.http.HttpUtil;
import org.dromara.hutool.http.client.Response; import cn.hutool.v7.http.client.Response;
import org.dromara.hutool.http.meta.HeaderName; import cn.hutool.v7.http.meta.HeaderName;
import org.dromara.hutool.http.meta.Method; import cn.hutool.v7.http.meta.Method;
import java.util.Map; import java.util.Map;

4
hutool-ai/src/main/java/org/dromara/hutool/ai/core/BaseConfig.java → hutool-ai/src/main/java/cn/hutool/v7/ai/core/BaseConfig.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * 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.Map;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/core/Message.java → hutool-ai/src/main/java/cn/hutool/v7/ai/core/Message.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai.core; package cn.hutool.v7.ai.core;
/** /**
* 公共Message类 * 公共Message类

2
hutool-ai/src/main/java/org/dromara/hutool/ai/core/package-info.java → hutool-ai/src/main/java/cn/hutool/v7/ai/core/package-info.java
View File

@ -21,4 +21,4 @@
* @since 6.0.0 * @since 6.0.0
*/ */
package org.dromara.hutool.ai.core; package cn.hutool.v7.ai.core;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekCommon.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekCommon.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai.model.deepseek; package cn.hutool.v7.ai.model.deepseek;
/** /**
* deepSeek公共类 * deepSeek公共类

6
hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekConfig.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekConfig.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * 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 cn.hutool.v7.ai.Models;
import org.dromara.hutool.ai.core.BaseConfig; import cn.hutool.v7.ai.core.BaseConfig;
/** /**
* DeepSeek配置类，初始化API接口地址，设置默认的模型 * DeepSeek配置类，初始化API接口地址，设置默认的模型

6
hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekProvider.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekProvider.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * 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 cn.hutool.v7.ai.core.AIConfig;
import org.dromara.hutool.ai.core.AIServiceProvider; import cn.hutool.v7.ai.core.AIServiceProvider;
/** /**
* 创建DeepSeek服务实现类 * 创建DeepSeek服务实现类

4
hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekService.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekService.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * 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支持的扩展接口 * deepSeek支持的扩展接口

12
hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/DeepSeekServiceImpl.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekServiceImpl.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * 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 cn.hutool.v7.ai.core.AIConfig;
import org.dromara.hutool.ai.core.BaseAIService; import cn.hutool.v7.ai.core.BaseAIService;
import org.dromara.hutool.ai.core.Message; import cn.hutool.v7.ai.core.Message;
import org.dromara.hutool.http.client.Response; import cn.hutool.v7.http.client.Response;
import org.dromara.hutool.json.JSONUtil; import cn.hutool.v7.json.JSONUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/model/deepseek/package-info.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/package-info.java
View File

@ -21,4 +21,4 @@
* @since 6.0.0 * @since 6.0.0
*/ */
package org.dromara.hutool.ai.model.deepseek; package cn.hutool.v7.ai.model.deepseek;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoCommon.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoCommon.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai.model.doubao; package cn.hutool.v7.ai.model.doubao;
/** /**
* doubao公共类 * doubao公共类

6
hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoConfig.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoConfig.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * 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 cn.hutool.v7.ai.Models;
import org.dromara.hutool.ai.core.BaseConfig; import cn.hutool.v7.ai.core.BaseConfig;
/** /**
* Doubao配置类，初始化API接口地址，设置默认的模型 * Doubao配置类，初始化API接口地址，设置默认的模型

6
hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoProvider.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoProvider.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * 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 cn.hutool.v7.ai.core.AIConfig;
import org.dromara.hutool.ai.core.AIServiceProvider; import cn.hutool.v7.ai.core.AIServiceProvider;
/** /**
* 创建Doubap服务实现类 * 创建Doubap服务实现类

6
hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoService.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoService.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * 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 cn.hutool.v7.ai.core.AIService;
import org.dromara.hutool.ai.core.Message; import cn.hutool.v7.ai.core.Message;
import java.util.List; import java.util.List;

14
hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/DoubaoServiceImpl.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceImpl.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * 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 cn.hutool.v7.ai.core.AIConfig;
import org.dromara.hutool.ai.core.BaseAIService; import cn.hutool.v7.ai.core.BaseAIService;
import org.dromara.hutool.ai.core.Message; import cn.hutool.v7.ai.core.Message;
import org.dromara.hutool.core.text.StrUtil; import cn.hutool.v7.core.text.StrUtil;
import org.dromara.hutool.http.client.Response; import cn.hutool.v7.http.client.Response;
import org.dromara.hutool.json.JSONUtil; import cn.hutool.v7.json.JSONUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/model/doubao/package-info.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/package-info.java
View File

@ -21,4 +21,4 @@
* @since 6.0.0 * @since 6.0.0
*/ */
package org.dromara.hutool.ai.model.doubao; package cn.hutool.v7.ai.model.doubao;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokCommon.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokCommon.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai.model.grok; package cn.hutool.v7.ai.model.grok;
/** /**
* grok公共类 * grok公共类

6
hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokConfig.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokConfig.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * 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 cn.hutool.v7.ai.Models;
import org.dromara.hutool.ai.core.BaseConfig; import cn.hutool.v7.ai.core.BaseConfig;
/** /**
* Grok配置类，初始化API接口地址，设置默认的模型 * Grok配置类，初始化API接口地址，设置默认的模型

6
hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokProvider.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokProvider.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * 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 cn.hutool.v7.ai.core.AIConfig;
import org.dromara.hutool.ai.core.AIServiceProvider; import cn.hutool.v7.ai.core.AIServiceProvider;
/** /**
* 创建Grok服务实现类 * 创建Grok服务实现类

4
hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokService.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokService.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * 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; import java.util.List;

12
hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/GrokServiceImpl.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokServiceImpl.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * 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 cn.hutool.v7.ai.core.AIConfig;
import org.dromara.hutool.ai.core.BaseAIService; import cn.hutool.v7.ai.core.BaseAIService;
import org.dromara.hutool.ai.core.Message; import cn.hutool.v7.ai.core.Message;
import org.dromara.hutool.http.client.Response; import cn.hutool.v7.http.client.Response;
import org.dromara.hutool.json.JSONUtil; import cn.hutool.v7.json.JSONUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/model/grok/package-info.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/package-info.java
View File

@ -21,4 +21,4 @@
* @since 6.0.0 * @since 6.0.0
*/ */
package org.dromara.hutool.ai.model.grok; package cn.hutool.v7.ai.model.grok;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiCommon.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiCommon.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai.model.openai; package cn.hutool.v7.ai.model.openai;
/** /**
* openai公共类 * openai公共类

6
hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiConfig.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiConfig.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * 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 cn.hutool.v7.ai.Models;
import org.dromara.hutool.ai.core.BaseConfig; import cn.hutool.v7.ai.core.BaseConfig;
/** /**
* openai配置类，初始化API接口地址，设置默认的模型 * openai配置类，初始化API接口地址，设置默认的模型

6
hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiProvider.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiProvider.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * 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 cn.hutool.v7.ai.core.AIConfig;
import org.dromara.hutool.ai.core.AIServiceProvider; import cn.hutool.v7.ai.core.AIServiceProvider;
/** /**
* 创建Openai服务实现类 * 创建Openai服务实现类

6
hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiService.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiService.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * 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 cn.hutool.v7.ai.core.AIService;
import org.dromara.hutool.ai.core.Message; import cn.hutool.v7.ai.core.Message;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.io.InputStream;

14
hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/OpenaiServiceImpl.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/OpenaiServiceImpl.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * 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 cn.hutool.v7.ai.core.AIConfig;
import org.dromara.hutool.ai.core.BaseAIService; import cn.hutool.v7.ai.core.BaseAIService;
import org.dromara.hutool.ai.core.Message; import cn.hutool.v7.ai.core.Message;
import org.dromara.hutool.core.text.StrUtil; import cn.hutool.v7.core.text.StrUtil;
import org.dromara.hutool.http.client.Response; import cn.hutool.v7.http.client.Response;
import org.dromara.hutool.json.JSONUtil; import cn.hutool.v7.json.JSONUtil;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.io.InputStream;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/model/openai/package-info.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/openai/package-info.java
View File

@ -21,4 +21,4 @@
* @since 6.0.0 * @since 6.0.0
*/ */
package org.dromara.hutool.ai.model.openai; package cn.hutool.v7.ai.model.openai;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/model/package-info.java → hutool-ai/src/main/java/cn/hutool/v7/ai/model/package-info.java
View File

@ -21,4 +21,4 @@
* @since 6.0.0 * @since 6.0.0
*/ */
package org.dromara.hutool.ai.model; package cn.hutool.v7.ai.model;

2
hutool-ai/src/main/java/org/dromara/hutool/ai/package-info.java → hutool-ai/src/main/java/cn/hutool/v7/ai/package-info.java
View File

@ -21,4 +21,4 @@
* @since 6.0.0 * @since 6.0.0
*/ */
package org.dromara.hutool.ai; package cn.hutool.v7.ai;

4
hutool-ai/src/main/resources/META-INF/services/cn.hutool.v7.ai.core.AIConfig Normal file
View File

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

4
hutool-ai/src/main/resources/META-INF/services/cn.hutool.v7.ai.core.AIServiceProvider Normal file
View File

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

4
hutool-ai/src/main/resources/META-INF/services/org.dromara.hutool.ai.core.AIConfig
View File

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

4
hutool-ai/src/main/resources/META-INF/services/org.dromara.hutool.ai.core.AIServiceProvider
View File

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

8
hutool-ai/src/test/java/org/dromara/hutool/ai/AIServiceFactoryTest.java → hutool-ai/src/test/java/cn/hutool/v7/ai/AIServiceFactoryTest.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai; package cn.hutool.v7.ai;
import org.dromara.hutool.ai.core.AIConfigBuilder; import cn.hutool.v7.ai.core.AIConfigBuilder;
import org.dromara.hutool.ai.core.AIService; import cn.hutool.v7.ai.core.AIService;
import org.dromara.hutool.ai.model.deepseek.DeepSeekService; import cn.hutool.v7.ai.model.deepseek.DeepSeekService;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;

16
hutool-ai/src/test/java/org/dromara/hutool/ai/AIUtilTest.java → hutool-ai/src/test/java/cn/hutool/v7/ai/AIUtilTest.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.ai; package cn.hutool.v7.ai;
import org.dromara.hutool.ai.core.AIConfigBuilder; import cn.hutool.v7.ai.core.AIConfigBuilder;
import org.dromara.hutool.ai.core.AIService; import cn.hutool.v7.ai.core.AIService;
import org.dromara.hutool.ai.core.Message; import cn.hutool.v7.ai.core.Message;
import org.dromara.hutool.ai.model.deepseek.DeepSeekService; import cn.hutool.v7.ai.model.deepseek.DeepSeekService;
import org.dromara.hutool.ai.model.doubao.DoubaoService; import cn.hutool.v7.ai.model.doubao.DoubaoService;
import org.dromara.hutool.ai.model.grok.GrokService; import cn.hutool.v7.ai.model.grok.GrokService;
import org.dromara.hutool.ai.model.openai.OpenaiService; import cn.hutool.v7.ai.model.openai.OpenaiService;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.ArrayList; import java.util.ArrayList;

10
hutool-ai/src/test/java/org/dromara/hutool/ai/model/deepseek/DeepSeekServiceTest.java → hutool-ai/src/test/java/cn/hutool/v7/ai/model/deepseek/DeepSeekServiceTest.java
View File

@ -14,12 +14,12 @@
* limitations under the License. * 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 cn.hutool.v7.ai.AIServiceFactory;
import org.dromara.hutool.ai.ModelName; import cn.hutool.v7.ai.ModelName;
import org.dromara.hutool.ai.core.AIConfigBuilder; import cn.hutool.v7.ai.core.AIConfigBuilder;
import org.dromara.hutool.ai.core.Message; import cn.hutool.v7.ai.core.Message;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

14
hutool-ai/src/test/java/org/dromara/hutool/ai/model/doubao/DoubaoServiceTest.java → hutool-ai/src/test/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceTest.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * 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 cn.hutool.v7.ai.AIServiceFactory;
import org.dromara.hutool.ai.ModelName; import cn.hutool.v7.ai.ModelName;
import org.dromara.hutool.ai.Models; import cn.hutool.v7.ai.Models;
import org.dromara.hutool.ai.core.AIConfigBuilder; import cn.hutool.v7.ai.core.AIConfigBuilder;
import org.dromara.hutool.ai.core.Message; import cn.hutool.v7.ai.core.Message;
import org.dromara.hutool.swing.img.ImgUtil; import cn.hutool.v7.swing.img.ImgUtil;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

14
hutool-ai/src/test/java/org/dromara/hutool/ai/model/grok/GrokServiceTest.java → hutool-ai/src/test/java/cn/hutool/v7/ai/model/grok/GrokServiceTest.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * 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 cn.hutool.v7.ai.AIServiceFactory;
import org.dromara.hutool.ai.ModelName; import cn.hutool.v7.ai.ModelName;
import org.dromara.hutool.ai.Models; import cn.hutool.v7.ai.Models;
import org.dromara.hutool.ai.core.AIConfigBuilder; import cn.hutool.v7.ai.core.AIConfigBuilder;
import org.dromara.hutool.ai.core.Message; import cn.hutool.v7.ai.core.Message;
import org.dromara.hutool.swing.img.ImgUtil; import cn.hutool.v7.swing.img.ImgUtil;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

14
hutool-ai/src/test/java/org/dromara/hutool/ai/model/openai/OpenaiServiceTest.java → hutool-ai/src/test/java/cn/hutool/v7/ai/model/openai/OpenaiServiceTest.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * 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 cn.hutool.v7.ai.AIServiceFactory;
import org.dromara.hutool.ai.ModelName; import cn.hutool.v7.ai.ModelName;
import org.dromara.hutool.ai.Models; import cn.hutool.v7.ai.Models;
import org.dromara.hutool.ai.core.AIConfigBuilder; import cn.hutool.v7.ai.core.AIConfigBuilder;
import org.dromara.hutool.ai.core.Message; import cn.hutool.v7.ai.core.Message;
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.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

4
hutool-all/pom.xml
View File

@ -23,9 +23,9 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>
<groupId>org.dromara.hutool</groupId> <groupId>cn.hutool.v7</groupId>
<artifactId>hutool-parent</artifactId> <artifactId>hutool-parent</artifactId>
<version>6.0.0-M22</version> <version>7.0.0.M1</version>
</parent> </parent>
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>

10
hutool-all/src/main/java/org/dromara/hutool/Hutool.java → hutool-all/src/main/java/cn/hutool/v7/Hutool.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool; package cn.hutool.v7;
import org.dromara.hutool.core.lang.ConsoleTable; import cn.hutool.v7.core.lang.ConsoleTable;
import org.dromara.hutool.core.reflect.ClassUtil; import cn.hutool.v7.core.reflect.ClassUtil;
import org.dromara.hutool.core.text.StrUtil; import cn.hutool.v7.core.text.StrUtil;
import java.util.Set; import java.util.Set;
@ -60,7 +60,7 @@ public class Hutool {
* @since 5.5.2 * @since 5.5.2
*/ */
public static Set<Class<?>> getAllUtils() { public static Set<Class<?>> getAllUtils() {
return ClassUtil.scanPackage("org.dromara.hutool", return ClassUtil.scanPackage("cn.hutool.v7",
(clazz) -> (!clazz.isInterface()) && StrUtil.endWith(clazz.getSimpleName(), "Util")); (clazz) -> (!clazz.isInterface()) && StrUtil.endWith(clazz.getSimpleName(), "Util"));
} }

2
hutool-all/src/main/java/org/dromara/hutool/package-info.java → hutool-all/src/main/java/cn/hutool/v7/package-info.java
View File

@ -23,4 +23,4 @@
* *
* @author Looly * @author Looly
*/ */
package org.dromara.hutool; package cn.hutool.v7;

4
hutool-bom/pom.xml
View File

@ -23,9 +23,9 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
<groupId>org.dromara.hutool</groupId> <groupId>cn.hutool.v7</groupId>
<artifactId>hutool-parent</artifactId> <artifactId>hutool-parent</artifactId>
<version>6.0.0-M22</version> <version>7.0.0.M1</version>
</parent> </parent>
<artifactId>hutool-bom</artifactId> <artifactId>hutool-bom</artifactId>

6
hutool-core/pom.xml
View File

@ -23,9 +23,9 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>
<groupId>org.dromara.hutool</groupId> <groupId>cn.hutool.v7</groupId>
<artifactId>hutool-parent</artifactId> <artifactId>hutool-parent</artifactId>
<version>6.0.0-M22</version> <version>7.0.0.M1</version>
</parent> </parent>
<artifactId>hutool-core</artifactId> <artifactId>hutool-core</artifactId>
@ -33,7 +33,7 @@
<description>Hutool核心，包括集合、字符串、Bean等工具</description> <description>Hutool核心，包括集合、字符串、Bean等工具</description>
<properties> <properties>
<Automatic-Module-Name>org.dromara.hutool.core</Automatic-Module-Name> <Automatic-Module-Name>cn.hutool.v7.core</Automatic-Module-Name>
</properties> </properties>
</project> </project>

2
hutool-core/src/main/java/org/dromara/hutool/core/annotation/Alias.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/Alias.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.annotation; package cn.hutool.v7.core.annotation;
import java.lang.annotation.*; import java.lang.annotation.*;

14
hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotatedElementUtil.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotatedElementUtil.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * 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 cn.hutool.v7.core.annotation.elements.HierarchicalAnnotatedElements;
import org.dromara.hutool.core.annotation.elements.MetaAnnotatedElement; import cn.hutool.v7.core.annotation.elements.MetaAnnotatedElement;
import org.dromara.hutool.core.annotation.elements.RepeatableMetaAnnotatedElement; import cn.hutool.v7.core.annotation.elements.RepeatableMetaAnnotatedElement;
import org.dromara.hutool.core.array.ArrayUtil; import cn.hutool.v7.core.array.ArrayUtil;
import org.dromara.hutool.core.map.reference.WeakConcurrentMap; import cn.hutool.v7.core.map.reference.WeakConcurrentMap;
import org.dromara.hutool.core.util.ObjUtil; import cn.hutool.v7.core.util.ObjUtil;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.annotation.Inherited; import java.lang.annotation.Inherited;

2
hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMapping.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationMapping.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.annotation; package cn.hutool.v7.core.annotation;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.Method; import java.lang.reflect.Method;

8
hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationMappingProxy.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationMappingProxy.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * 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 cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
import org.dromara.hutool.core.reflect.method.MethodUtil; import cn.hutool.v7.core.reflect.method.MethodUtil;
import org.dromara.hutool.core.text.CharSequenceUtil; import cn.hutool.v7.core.text.CharSequenceUtil;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationHandler;

6
hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationProxy.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationProxy.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * 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 cn.hutool.v7.core.reflect.method.MethodUtil;
import org.dromara.hutool.core.text.StrUtil; import cn.hutool.v7.core.text.StrUtil;
import java.io.Serializable; import java.io.Serializable;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;

28
hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/AnnotationUtil.java
View File

@ -14,21 +14,21 @@
* limitations under the License. * 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.dromara.hutool.core.array.ArrayUtil; import cn.hutool.v7.core.array.ArrayUtil;
import org.dromara.hutool.core.classloader.ClassLoaderUtil; import cn.hutool.v7.core.classloader.ClassLoaderUtil;
import org.dromara.hutool.core.exception.HutoolException; import cn.hutool.v7.core.exception.HutoolException;
import org.dromara.hutool.core.func.LambdaInfo; import cn.hutool.v7.core.func.LambdaInfo;
import org.dromara.hutool.core.func.LambdaUtil; import cn.hutool.v7.core.func.LambdaUtil;
import org.dromara.hutool.core.func.SerFunction; import cn.hutool.v7.core.func.SerFunction;
import org.dromara.hutool.core.map.reference.WeakConcurrentMap; import cn.hutool.v7.core.map.reference.WeakConcurrentMap;
import org.dromara.hutool.core.reflect.FieldUtil; import cn.hutool.v7.core.reflect.FieldUtil;
import org.dromara.hutool.core.reflect.method.MethodUtil; import cn.hutool.v7.core.reflect.method.MethodUtil;
import org.dromara.hutool.core.text.CharSequenceUtil; import cn.hutool.v7.core.text.CharSequenceUtil;
import org.dromara.hutool.core.text.StrUtil; import cn.hutool.v7.core.text.StrUtil;
import org.dromara.hutool.core.util.ObjUtil; import cn.hutool.v7.core.util.ObjUtil;
import java.lang.annotation.*; import java.lang.annotation.*;
import java.lang.reflect.*; import java.lang.reflect.*;

8
hutool-core/src/main/java/org/dromara/hutool/core/annotation/GenericAnnotationMapping.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/GenericAnnotationMapping.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.annotation; package cn.hutool.v7.core.annotation;
import org.dromara.hutool.core.reflect.ClassUtil; import cn.hutool.v7.core.reflect.ClassUtil;
import org.dromara.hutool.core.reflect.method.MethodUtil; import cn.hutool.v7.core.reflect.method.MethodUtil;
import org.dromara.hutool.core.text.CharSequenceUtil; import cn.hutool.v7.core.text.CharSequenceUtil;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.Method; import java.lang.reflect.Method;

2
hutool-core/src/main/java/org/dromara/hutool/core/annotation/PropIgnore.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/PropIgnore.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * 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.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;

2
hutool-core/src/main/java/org/dromara/hutool/core/annotation/ReadableBean.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/ReadableBean.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.annotation; package cn.hutool.v7.core.annotation;
import java.lang.annotation.*; import java.lang.annotation.*;

12
hutool-core/src/main/java/org/dromara/hutool/core/annotation/RepeatableAnnotationCollector.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/RepeatableAnnotationCollector.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.annotation; package cn.hutool.v7.core.annotation;
import org.dromara.hutool.core.array.ArrayUtil; import cn.hutool.v7.core.array.ArrayUtil;
import org.dromara.hutool.core.collection.CollUtil; import cn.hutool.v7.core.collection.CollUtil;
import org.dromara.hutool.core.map.reference.WeakConcurrentMap; import cn.hutool.v7.core.map.reference.WeakConcurrentMap;
import org.dromara.hutool.core.reflect.method.MethodUtil; import cn.hutool.v7.core.reflect.method.MethodUtil;
import org.dromara.hutool.core.text.CharSequenceUtil; import cn.hutool.v7.core.text.CharSequenceUtil;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.annotation.Repeatable; import java.lang.annotation.Repeatable;

18
hutool-core/src/main/java/org/dromara/hutool/core/annotation/ResolvedAnnotationMapping.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/ResolvedAnnotationMapping.java
View File

@ -14,16 +14,16 @@
* limitations under the License. * 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.dromara.hutool.core.collection.CollUtil; import cn.hutool.v7.core.collection.CollUtil;
import org.dromara.hutool.core.lang.Assert; import cn.hutool.v7.core.lang.Assert;
import org.dromara.hutool.core.map.multi.Graph; import cn.hutool.v7.core.map.multi.Graph;
import org.dromara.hutool.core.reflect.ClassUtil; import cn.hutool.v7.core.reflect.ClassUtil;
import org.dromara.hutool.core.reflect.method.MethodUtil; import cn.hutool.v7.core.reflect.method.MethodUtil;
import org.dromara.hutool.core.text.CharSequenceUtil; import cn.hutool.v7.core.text.CharSequenceUtil;
import org.dromara.hutool.core.array.ArrayUtil; import cn.hutool.v7.core.array.ArrayUtil;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.Method; import java.lang.reflect.Method;

2
hutool-core/src/main/java/org/dromara/hutool/core/annotation/WritableBean.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/WritableBean.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.annotation; package cn.hutool.v7.core.annotation;
import java.lang.annotation.*; import java.lang.annotation.*;

10
hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/CombinationAnnotatedElement.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/CombinationAnnotatedElement.java
View File

@ -14,12 +14,12 @@
* limitations under the License. * 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 cn.hutool.v7.core.annotation.AnnotationUtil;
import org.dromara.hutool.core.array.ArrayUtil; import cn.hutool.v7.core.array.ArrayUtil;
import org.dromara.hutool.core.collection.set.SetUtil; import cn.hutool.v7.core.collection.set.SetUtil;
import org.dromara.hutool.core.map.TableMap; import cn.hutool.v7.core.map.TableMap;
import java.io.Serializable; import java.io.Serializable;
import java.lang.annotation.*; import java.lang.annotation.*;

16
hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/HierarchicalAnnotatedElements.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/HierarchicalAnnotatedElements.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * 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 cn.hutool.v7.core.annotation.AnnotationUtil;
import org.dromara.hutool.core.collection.CollUtil; import cn.hutool.v7.core.collection.CollUtil;
import org.dromara.hutool.core.collection.set.SetUtil; import cn.hutool.v7.core.collection.set.SetUtil;
import org.dromara.hutool.core.reflect.ClassUtil; import cn.hutool.v7.core.reflect.ClassUtil;
import org.dromara.hutool.core.reflect.method.MethodUtil; import cn.hutool.v7.core.reflect.method.MethodUtil;
import org.dromara.hutool.core.text.CharSequenceUtil; import cn.hutool.v7.core.text.CharSequenceUtil;
import org.dromara.hutool.core.array.ArrayUtil; import cn.hutool.v7.core.array.ArrayUtil;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement; import java.lang.reflect.AnnotatedElement;

16
hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/MetaAnnotatedElement.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/MetaAnnotatedElement.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * 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 cn.hutool.v7.core.annotation.AnnotationMapping;
import org.dromara.hutool.core.annotation.AnnotationUtil; import cn.hutool.v7.core.annotation.AnnotationUtil;
import org.dromara.hutool.core.annotation.ResolvedAnnotationMapping; import cn.hutool.v7.core.annotation.ResolvedAnnotationMapping;
import org.dromara.hutool.core.stream.EasyStream; import cn.hutool.v7.core.stream.EasyStream;
import org.dromara.hutool.core.text.CharSequenceUtil; import cn.hutool.v7.core.text.CharSequenceUtil;
import org.dromara.hutool.core.array.ArrayUtil; import cn.hutool.v7.core.array.ArrayUtil;
import org.dromara.hutool.core.util.ObjUtil; import cn.hutool.v7.core.util.ObjUtil;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.annotation.Inherited; import java.lang.annotation.Inherited;

14
hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/RepeatableMetaAnnotatedElement.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/RepeatableMetaAnnotatedElement.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * 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 cn.hutool.v7.core.annotation.AnnotationMapping;
import org.dromara.hutool.core.annotation.AnnotationUtil; import cn.hutool.v7.core.annotation.AnnotationUtil;
import org.dromara.hutool.core.annotation.RepeatableAnnotationCollector; import cn.hutool.v7.core.annotation.RepeatableAnnotationCollector;
import org.dromara.hutool.core.collection.CollUtil; import cn.hutool.v7.core.collection.CollUtil;
import org.dromara.hutool.core.text.CharSequenceUtil; import cn.hutool.v7.core.text.CharSequenceUtil;
import org.dromara.hutool.core.array.ArrayUtil; import cn.hutool.v7.core.array.ArrayUtil;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement; import java.lang.reflect.AnnotatedElement;

2
hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/package-info.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/elements/package-info.java
View File

@ -19,4 +19,4 @@
* *
* @author Looly, huangchengxing * @author Looly, huangchengxing
*/ */
package org.dromara.hutool.core.annotation.elements; package cn.hutool.v7.core.annotation.elements;

2
hutool-core/src/main/java/org/dromara/hutool/core/annotation/package-info.java → hutool-core/src/main/java/cn/hutool/v7/core/annotation/package-info.java
View File

@ -26,4 +26,4 @@
* @author Looly * @author Looly
* *
*/ */
package org.dromara.hutool.core.annotation; package cn.hutool.v7.core.annotation;

28
hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java → hutool-core/src/main/java/cn/hutool/v7/core/array/ArrayUtil.java
View File

@ -14,21 +14,21 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.array; package cn.hutool.v7.core.array;
import org.dromara.hutool.core.collection.ListUtil; import cn.hutool.v7.core.collection.ListUtil;
import org.dromara.hutool.core.collection.set.SetUtil; import cn.hutool.v7.core.collection.set.SetUtil;
import org.dromara.hutool.core.collection.set.UniqueKeySet; import cn.hutool.v7.core.collection.set.UniqueKeySet;
import org.dromara.hutool.core.comparator.CompareUtil; import cn.hutool.v7.core.comparator.CompareUtil;
import org.dromara.hutool.core.convert.ConvertUtil; import cn.hutool.v7.core.convert.ConvertUtil;
import org.dromara.hutool.core.exception.ExceptionUtil; import cn.hutool.v7.core.exception.ExceptionUtil;
import org.dromara.hutool.core.exception.HutoolException; import cn.hutool.v7.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert; import cn.hutool.v7.core.lang.Assert;
import org.dromara.hutool.core.map.MapUtil; import cn.hutool.v7.core.map.MapUtil;
import org.dromara.hutool.core.text.StrJoiner; import cn.hutool.v7.core.text.StrJoiner;
import org.dromara.hutool.core.text.StrUtil; import cn.hutool.v7.core.text.StrUtil;
import org.dromara.hutool.core.util.ObjUtil; import cn.hutool.v7.core.util.ObjUtil;
import org.dromara.hutool.core.util.RandomUtil; import cn.hutool.v7.core.util.RandomUtil;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.*; import java.util.*;

16
hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java → hutool-core/src/main/java/cn/hutool/v7/core/array/ArrayWrapper.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * 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 cn.hutool.v7.core.collection.iter.ArrayIter;
import org.dromara.hutool.core.convert.ConvertUtil; import cn.hutool.v7.core.convert.ConvertUtil;
import org.dromara.hutool.core.lang.wrapper.Wrapper; import cn.hutool.v7.core.lang.wrapper.Wrapper;
import org.dromara.hutool.core.lang.Assert; import cn.hutool.v7.core.lang.Assert;
import org.dromara.hutool.core.lang.Validator; import cn.hutool.v7.core.lang.Validator;
import org.dromara.hutool.core.reflect.ClassUtil; import cn.hutool.v7.core.reflect.ClassUtil;
import org.dromara.hutool.core.util.ObjUtil; import cn.hutool.v7.core.util.ObjUtil;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.Arrays; import java.util.Arrays;

10
hutool-core/src/main/java/org/dromara/hutool/core/array/PrimitiveArrayUtil.java → hutool-core/src/main/java/cn/hutool/v7/core/array/PrimitiveArrayUtil.java
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.array; package cn.hutool.v7.core.array;
import org.dromara.hutool.core.lang.Assert; import cn.hutool.v7.core.lang.Assert;
import org.dromara.hutool.core.math.NumberUtil; import cn.hutool.v7.core.math.NumberUtil;
import org.dromara.hutool.core.util.ObjUtil; import cn.hutool.v7.core.util.ObjUtil;
import org.dromara.hutool.core.util.RandomUtil; import cn.hutool.v7.core.util.RandomUtil;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.Arrays; import java.util.Arrays;

2
hutool-core/src/main/java/org/dromara/hutool/core/array/package-info.java → hutool-core/src/main/java/cn/hutool/v7/core/array/package-info.java
View File

@ -19,4 +19,4 @@
* *
* @author Looly * @author Looly
*/ */
package org.dromara.hutool.core.array; package cn.hutool.v7.core.array;

4
hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDesc.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanDesc.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * 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.io.Serializable;
import java.util.Collection; import java.util.Collection;

10
hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDescFactory.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanDescFactory.java
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.bean; package cn.hutool.v7.core.bean;
import org.dromara.hutool.core.array.ArrayUtil; import cn.hutool.v7.core.array.ArrayUtil;
import org.dromara.hutool.core.map.reference.WeakConcurrentMap; import cn.hutool.v7.core.map.reference.WeakConcurrentMap;
import org.dromara.hutool.core.reflect.FieldUtil; import cn.hutool.v7.core.reflect.FieldUtil;
import org.dromara.hutool.core.reflect.JdkProxyUtil; import cn.hutool.v7.core.reflect.JdkProxyUtil;
/** /**
* Bean描述信息工厂类<br> * Bean描述信息工厂类<br>

4
hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanException.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * 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异常 * Bean异常

8
hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanInfoCache.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanInfoCache.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.bean; package cn.hutool.v7.core.bean;
import org.dromara.hutool.core.func.SerSupplier; import cn.hutool.v7.core.func.SerSupplier;
import org.dromara.hutool.core.map.reference.ReferenceConcurrentMap; import cn.hutool.v7.core.map.reference.ReferenceConcurrentMap;
import org.dromara.hutool.core.map.reference.WeakConcurrentMap; import cn.hutool.v7.core.map.reference.WeakConcurrentMap;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;
import java.util.Map; import java.util.Map;

50
hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanUtil.java
View File

@ -14,30 +14,30 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.bean; package cn.hutool.v7.core.bean;
import org.dromara.hutool.core.annotation.AnnotationUtil; import cn.hutool.v7.core.annotation.AnnotationUtil;
import org.dromara.hutool.core.annotation.ReadableBean; import cn.hutool.v7.core.annotation.ReadableBean;
import org.dromara.hutool.core.annotation.WritableBean; import cn.hutool.v7.core.annotation.WritableBean;
import org.dromara.hutool.core.array.ArrayUtil; import cn.hutool.v7.core.array.ArrayUtil;
import org.dromara.hutool.core.bean.copier.BeanCopier; import cn.hutool.v7.core.bean.copier.BeanCopier;
import org.dromara.hutool.core.bean.copier.CopyOptions; import cn.hutool.v7.core.bean.copier.CopyOptions;
import org.dromara.hutool.core.bean.copier.ValueProvider; import cn.hutool.v7.core.bean.copier.ValueProvider;
import org.dromara.hutool.core.bean.path.BeanPath; import cn.hutool.v7.core.bean.path.BeanPath;
import org.dromara.hutool.core.collection.set.SetUtil; import cn.hutool.v7.core.collection.set.SetUtil;
import org.dromara.hutool.core.convert.ConvertUtil; import cn.hutool.v7.core.convert.ConvertUtil;
import org.dromara.hutool.core.convert.impl.RecordConverter; import cn.hutool.v7.core.convert.impl.RecordConverter;
import org.dromara.hutool.core.lang.mutable.MutableEntry; import cn.hutool.v7.core.lang.mutable.MutableEntry;
import org.dromara.hutool.core.map.BeanMap; import cn.hutool.v7.core.map.BeanMap;
import org.dromara.hutool.core.map.CaseInsensitiveMap; import cn.hutool.v7.core.map.CaseInsensitiveMap;
import org.dromara.hutool.core.map.Dict; import cn.hutool.v7.core.map.Dict;
import org.dromara.hutool.core.map.MapUtil; import cn.hutool.v7.core.map.MapUtil;
import org.dromara.hutool.core.reflect.ClassUtil; import cn.hutool.v7.core.reflect.ClassUtil;
import org.dromara.hutool.core.reflect.ConstructorUtil; import cn.hutool.v7.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.reflect.FieldUtil; import cn.hutool.v7.core.reflect.FieldUtil;
import org.dromara.hutool.core.reflect.ModifierUtil; import cn.hutool.v7.core.reflect.ModifierUtil;
import org.dromara.hutool.core.text.StrUtil; import cn.hutool.v7.core.text.StrUtil;
import org.dromara.hutool.core.util.ObjUtil; import cn.hutool.v7.core.util.ObjUtil;
import java.beans.*; import java.beans.*;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -563,8 +563,8 @@ public class BeanUtil {
/** /**
* 给定的Bean的类名是否匹配指定类名字符串<br> * 给定的Bean的类名是否匹配指定类名字符串<br>
* 如果isSimple为{@code true}，则只匹配类名而忽略包名，例如：org.dromara.hutool.TestEntity只匹配TestEntity<br> * 如果isSimple为{@code true}，则只匹配类名而忽略包名，例如：cn.hutool.v7.TestEntity只匹配TestEntity<br>
* 如果isSimple为{@code false}，则匹配包括包名的全类名，例如：org.dromara.hutool.TestEntity匹配org.dromara.hutool.TestEntity * 如果isSimple为{@code false}，则匹配包括包名的全类名，例如：cn.hutool.v7.TestEntity匹配cn.hutool.v7.TestEntity
* *
* @param bean Bean * @param bean Bean
* @param beanClassName Bean的类名 * @param beanClassName Bean的类名

20
hutool-core/src/main/java/org/dromara/hutool/core/bean/DynaBean.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/DynaBean.java
View File

@ -14,17 +14,17 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.bean; package cn.hutool.v7.core.bean;
import org.dromara.hutool.core.array.ArrayUtil; import cn.hutool.v7.core.array.ArrayUtil;
import org.dromara.hutool.core.collection.CollUtil; import cn.hutool.v7.core.collection.CollUtil;
import org.dromara.hutool.core.collection.ListUtil; import cn.hutool.v7.core.collection.ListUtil;
import org.dromara.hutool.core.convert.ConvertUtil; import cn.hutool.v7.core.convert.ConvertUtil;
import org.dromara.hutool.core.exception.CloneException; import cn.hutool.v7.core.exception.CloneException;
import org.dromara.hutool.core.lang.Assert; import cn.hutool.v7.core.lang.Assert;
import org.dromara.hutool.core.reflect.ClassUtil; import cn.hutool.v7.core.reflect.ClassUtil;
import org.dromara.hutool.core.reflect.ConstructorUtil; import cn.hutool.v7.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.reflect.method.MethodUtil; import cn.hutool.v7.core.reflect.method.MethodUtil;
import java.io.Serializable; import java.io.Serializable;
import java.util.Collection; import java.util.Collection;

2
hutool-core/src/main/java/org/dromara/hutool/core/bean/NullWrapperBean.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/NullWrapperBean.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.bean; package cn.hutool.v7.core.bean;
/** /**
* 为了解决反射过程中,需要传递null参数,但是会丢失参数类型而设立的包装类 * 为了解决反射过程中,需要传递null参数,但是会丢失参数类型而设立的包装类

12
hutool-core/src/main/java/org/dromara/hutool/core/bean/PropDesc.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/PropDesc.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.dromara.hutool.core.bean; package cn.hutool.v7.core.bean;
import org.dromara.hutool.core.annotation.AnnotationUtil; import cn.hutool.v7.core.annotation.AnnotationUtil;
import org.dromara.hutool.core.annotation.PropIgnore; import cn.hutool.v7.core.annotation.PropIgnore;
import org.dromara.hutool.core.convert.ConvertUtil; import cn.hutool.v7.core.convert.ConvertUtil;
import org.dromara.hutool.core.reflect.*; import cn.hutool.v7.core.reflect.*;
import org.dromara.hutool.core.reflect.method.MethodInvoker; import cn.hutool.v7.core.reflect.method.MethodInvoker;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;

10
hutool-core/src/main/java/org/dromara/hutool/core/bean/RecordBeanDesc.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/RecordBeanDesc.java
View File

@ -14,12 +14,12 @@
* limitations under the License. * 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 cn.hutool.v7.core.bean.path.AbstractBeanDesc;
import org.dromara.hutool.core.reflect.FieldUtil; import cn.hutool.v7.core.reflect.FieldUtil;
import org.dromara.hutool.core.reflect.ModifierUtil; import cn.hutool.v7.core.reflect.ModifierUtil;
import org.dromara.hutool.core.reflect.method.MethodUtil; import cn.hutool.v7.core.reflect.method.MethodUtil;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;

12
hutool-core/src/main/java/org/dromara/hutool/core/bean/RecordUtil.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/RecordUtil.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * 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 cn.hutool.v7.core.bean.copier.ValueProvider;
import org.dromara.hutool.core.classloader.ClassLoaderUtil; import cn.hutool.v7.core.classloader.ClassLoaderUtil;
import org.dromara.hutool.core.reflect.ConstructorUtil; import cn.hutool.v7.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.reflect.method.MethodUtil; import cn.hutool.v7.core.reflect.method.MethodUtil;
import org.dromara.hutool.core.util.JdkUtil; import cn.hutool.v7.core.util.JdkUtil;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Type; import java.lang.reflect.Type;

12
hutool-core/src/main/java/org/dromara/hutool/core/bean/SimpleBeanDesc.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/SimpleBeanDesc.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * 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 cn.hutool.v7.core.bean.path.AbstractBeanDesc;
import org.dromara.hutool.core.reflect.method.MethodInvoker; import cn.hutool.v7.core.reflect.method.MethodInvoker;
import org.dromara.hutool.core.reflect.method.MethodNameUtil; import cn.hutool.v7.core.reflect.method.MethodNameUtil;
import org.dromara.hutool.core.reflect.method.MethodUtil; import cn.hutool.v7.core.reflect.method.MethodUtil;
import org.dromara.hutool.core.util.BooleanUtil; import cn.hutool.v7.core.util.BooleanUtil;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Map; import java.util.Map;

18
hutool-core/src/main/java/org/dromara/hutool/core/bean/StrictBeanDesc.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/StrictBeanDesc.java
View File

@ -14,16 +14,16 @@
* limitations under the License. * 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 cn.hutool.v7.core.bean.path.AbstractBeanDesc;
import org.dromara.hutool.core.reflect.ClassUtil; import cn.hutool.v7.core.reflect.ClassUtil;
import org.dromara.hutool.core.reflect.FieldUtil; import cn.hutool.v7.core.reflect.FieldUtil;
import org.dromara.hutool.core.reflect.ModifierUtil; import cn.hutool.v7.core.reflect.ModifierUtil;
import org.dromara.hutool.core.reflect.method.MethodNameUtil; import cn.hutool.v7.core.reflect.method.MethodNameUtil;
import org.dromara.hutool.core.reflect.method.MethodUtil; import cn.hutool.v7.core.reflect.method.MethodUtil;
import org.dromara.hutool.core.text.StrUtil; import cn.hutool.v7.core.text.StrUtil;
import org.dromara.hutool.core.util.BooleanUtil; import cn.hutool.v7.core.util.BooleanUtil;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;

12
hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/AbsCopier.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/AbsCopier.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * 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 cn.hutool.v7.core.bean.BeanDesc;
import org.dromara.hutool.core.bean.BeanUtil; import cn.hutool.v7.core.bean.BeanUtil;
import org.dromara.hutool.core.lang.copier.Copier; import cn.hutool.v7.core.lang.copier.Copier;
import org.dromara.hutool.core.reflect.ConstructorUtil; import cn.hutool.v7.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.util.ObjUtil; import cn.hutool.v7.core.util.ObjUtil;
/** /**
* 抽象的对象拷贝封装，提供来源对象、目标对象持有 * 抽象的对象拷贝封装，提供来源对象、目标对象持有

6
hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanCopier.java → hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanCopier.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * 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 cn.hutool.v7.core.lang.Assert;
import org.dromara.hutool.core.lang.copier.Copier; import cn.hutool.v7.core.lang.copier.Copier;
import java.io.Serializable; import java.io.Serializable;
import java.lang.reflect.Type; import java.lang.reflect.Type;

Some files were not shown because too many files have changed in this diff Show More