From 0adf6a5382587c256849d9a4c4a7041178872728 Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 27 Apr 2022 16:16:16 +0800 Subject: [PATCH 01/21] prepare 5.8.0.m5 --- CHANGELOG.md | 8 ++++++++ README-EN.md | 6 +++--- README.md | 6 +++--- bin/version.txt | 2 +- docs/js/version.js | 2 +- hutool-all/pom.xml | 2 +- hutool-aop/pom.xml | 2 +- hutool-bloomFilter/pom.xml | 2 +- hutool-bom/pom.xml | 2 +- hutool-cache/pom.xml | 2 +- hutool-captcha/pom.xml | 2 +- hutool-core/pom.xml | 2 +- hutool-cron/pom.xml | 2 +- hutool-crypto/pom.xml | 2 +- hutool-db/pom.xml | 2 +- hutool-dfa/pom.xml | 2 +- hutool-extra/pom.xml | 2 +- hutool-http/pom.xml | 2 +- hutool-json/pom.xml | 2 +- hutool-jwt/pom.xml | 2 +- hutool-log/pom.xml | 2 +- hutool-poi/pom.xml | 2 +- hutool-script/pom.xml | 2 +- hutool-setting/pom.xml | 2 +- hutool-socket/pom.xml | 2 +- hutool-system/pom.xml | 2 +- pom.xml | 2 +- 27 files changed, 38 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d77228fa..e86e6478d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ ------------------------------------------------------------------------------------------------------------- +# 5.8.0.M5 (2022-04-27) + +### ❌不兼容特性 +### 🐣新特性 +### 🐞Bug修复 + +------------------------------------------------------------------------------------------------------------- + # 5.8.0.M4 (2022-04-27) ### ❌不兼容特性 diff --git a/README-EN.md b/README-EN.md index 939bac4f8..1f79bbb65 100755 --- a/README-EN.md +++ b/README-EN.md @@ -144,18 +144,18 @@ We provide the T-Shirt and Sweater with Hutool Logo, please visit the shop： cn.hutool hutool-all - 5.8.0.M4 + 5.8.0.M5 ``` ### 🍐Gradle ``` -implementation 'cn.hutool:hutool-all:5.8.0.M4' +implementation 'cn.hutool:hutool-all:5.8.0.M5' ``` ## 📥Download -- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.0.M4/) +- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.0.M5/) > 🔔️note: > Hutool 5.x supports JDK8+ and is not tested on Android platforms, and cannot guarantee that all tool classes or tool methods are available. diff --git a/README.md b/README.md index 91c9311af..601bf892d 100755 --- a/README.md +++ b/README.md @@ -144,20 +144,20 @@ Hutool的存在就是为了减少代码搜索成本，避免网络上参差不 cn.hutool hutool-all - 5.8.0.M4 + 5.8.0.M5 ``` ### 🍐Gradle ``` -implementation 'cn.hutool:hutool-all:5.8.0.M4' +implementation 'cn.hutool:hutool-all:5.8.0.M5' ``` ### 📥下载jar 点击以下链接，下载`hutool-all-X.X.X.jar`即可： -- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.0.M4/) +- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.0.M5/) > 🔔️注意 > Hutool 5.x支持JDK8+，对Android平台没有测试，不能保证所有工具类或工具方法可用。 diff --git a/bin/version.txt b/bin/version.txt index b4fb92abd..0185a6be9 100755 --- a/bin/version.txt +++ b/bin/version.txt @@ -1 +1 @@ -5.8.0.M4 +5.8.0.M5 diff --git a/docs/js/version.js b/docs/js/version.js index 2ca0f38dd..2ce39747b 100755 --- a/docs/js/version.js +++ b/docs/js/version.js @@ -1 +1 @@ -var version = '5.8.0.M4' \ No newline at end of file +var version = '5.8.0.M5' \ No newline at end of file diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index 1650512a3..c18a06212 100755 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-all diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml index 7b022cc28..b365e396c 100755 --- a/hutool-aop/pom.xml +++ b/hutool-aop/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-aop diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml index 74d8596e1..d38e38057 100755 --- a/hutool-bloomFilter/pom.xml +++ b/hutool-bloomFilter/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-bloomFilter diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index 9a400e8a6..f332b3d89 100755 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-bom diff --git a/hutool-cache/pom.xml b/hutool-cache/pom.xml index 0bd5e426c..15f9986f7 100755 --- a/hutool-cache/pom.xml +++ b/hutool-cache/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-cache diff --git a/hutool-captcha/pom.xml b/hutool-captcha/pom.xml index c556d45fe..157efcfb4 100755 --- a/hutool-captcha/pom.xml +++ b/hutool-captcha/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-captcha diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index 22d50a2c0..bc6a64195 100755 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-core diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index a909049f1..946cda803 100755 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-cron diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml index 78413bf0d..85466e6af 100755 --- a/hutool-crypto/pom.xml +++ b/hutool-crypto/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-crypto diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index 2cfc0667c..f4927311a 100755 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-db diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml index 0fe550242..05e50a60e 100755 --- a/hutool-dfa/pom.xml +++ b/hutool-dfa/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-dfa diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index 640233309..f5c573c90 100755 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-extra diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index d09e036c8..8ddc534f7 100755 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-http diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index 0e9901c56..0c3b52525 100755 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-json diff --git a/hutool-jwt/pom.xml b/hutool-jwt/pom.xml index a328d47e8..3a4ef4229 100755 --- a/hutool-jwt/pom.xml +++ b/hutool-jwt/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-jwt diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index dc7ea99af..fc5eee676 100755 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-log diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index b4bac8f58..e45c87948 100755 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-poi diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml index 01b0b101a..5dceb2244 100755 --- a/hutool-script/pom.xml +++ b/hutool-script/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-script diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml index 1ef625cb9..1a8a2e7fe 100755 --- a/hutool-setting/pom.xml +++ b/hutool-setting/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-setting diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index d8044efb2..9e0a00aa2 100755 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-socket diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml index 231612c22..2f557d049 100755 --- a/hutool-system/pom.xml +++ b/hutool-system/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool-system diff --git a/pom.xml b/pom.xml index c7126ef60..089982238 100755 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 5.8.0.M4 + 5.8.0.M5 hutool Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。 https://github.com/dromara/hutool From 3329d60fff58e5613a1037432f22dea363e1e60c Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 27 Apr 2022 18:34:57 +0800 Subject: [PATCH 02/21] add test --- .../src/test/java/cn/hutool/core/date/DateUtilTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java index 7874b5cd9..bdabd60d8 100755 --- a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java @@ -276,6 +276,12 @@ public class DateUtilTest { Assert.assertEquals(0, between); } + @Test + public void betweenTest3() { + long between = DateUtil.between(DateUtil.parse("2020-03-31 23:59:59"), DateUtil.parse("2020-04-01 00:00:00"), DateUnit.SECOND); + Assert.assertEquals(1, between); + } + @Test public void formatChineseDateTest() { String formatChineseDate = DateUtil.formatChineseDate(DateUtil.parse("2018-02-24"), true, false); From d874b4282d6fb92a247848ed4f3a7f9144cf89c3 Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 27 Apr 2022 23:26:11 +0800 Subject: [PATCH 03/21] fix #I54TZ9 --- CHANGELOG.md | 3 ++ .../cn/hutool/core/lang/tree/TreeUtil.java | 12 +++-- .../hutool/core/lang/tree/Issue2279Test.java | 49 +++++++++++++++++++ hutool-db/pom.xml | 16 ++++-- .../cn/hutool/db/nosql/redis/RedisDS.java | 31 +++++++----- 5 files changed, 91 insertions(+), 20 deletions(-) create mode 100644 hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java diff --git a/CHANGELOG.md b/CHANGELOG.md index e86e6478d..d957022b2 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,11 @@ # 5.8.0.M5 (2022-04-27) ### ❌不兼容特性 + ### 🐣新特性 + ### 🐞Bug修复 +* 【db 】 修复RedisDS无法设置maxWaitMillis问题（issue#I54TZ9@Gitee） ------------------------------------------------------------------------------------------------------------- diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java index 197394495..705cd1086 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java @@ -38,7 +38,8 @@ public class TreeUtil { } /** - * 构建单root节点树 + * 构建单root节点树
+ * 它会生成一个以指定ID为ID的空的节点，然后逐级增加子节点。 * * @param ID类型 * @param list 源数据集合 @@ -63,7 +64,8 @@ public class TreeUtil { } /** - * 构建单root节点树 + * 构建单root节点树
+ * 它会生成一个以指定ID为ID的空的节点，然后逐级增加子节点。 * * @param 转换的实体 为数据源里的对象类型 * @param ID类型 @@ -107,7 +109,8 @@ public class TreeUtil { } /** - * 构建单root节点树 + * 构建单root节点树
+ * 它会生成一个以指定ID为ID的空的节点，然后逐级增加子节点。 * * @param 转换的实体 为数据源里的对象类型 * @param ID类型 @@ -137,7 +140,8 @@ public class TreeUtil { } /** - * 单点树构建，按照权重排序 + * 单点树构建，按照权重排序
+ * 它会生成一个以指定ID为ID的空的节点，然后逐级增加子节点。 * * @param ID类型 * @param map 源数据Map diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java new file mode 100644 index 000000000..ad4a63004 --- /dev/null +++ b/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java @@ -0,0 +1,49 @@ +package cn.hutool.core.lang.tree; + +import cn.hutool.core.collection.ListUtil; +import lombok.Data; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; + +public class Issue2279Test { + + @Test + public void buildSingleTest() { + List list = ListUtil.of( + // 模拟数据 + new TestTree(1, 0, 1, 1), + new TestTree(2, 1, 2, 2), + new TestTree(3, 1, 3, 3), + new TestTree(4, 2, 4, 4) + ); + + List> stringTree = TreeUtil.build(list, "0", + (object, treeNode) -> { + treeNode.setId(object.getId()); + treeNode.setName(object.getName()); + treeNode.setParentId(object.getPid()); + treeNode.putExtra("extra1",object.getExtra1()); + } + ); + + final Tree result = stringTree.get(0); + Assert.assertEquals(2, result.getChildren().size()); + } + + @Data + static class TestTree { + private String id; + private String pid; + private String name; + private String extra1; + + public TestTree(int id, int pid, int name, int extra1) { + this.id = String.valueOf(id); + this.pid = String.valueOf(pid); + this.name = String.valueOf(name); + this.extra1 = String.valueOf(extra1); + } + } +} diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index f4927311a..19a80bed4 100755 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -94,6 +94,12 @@ org.apache.commons commons-dbcp2 ${dbcp2.version} + + + commons-pool2 + org.apache.commons + + true @@ -108,10 +114,6 @@ jedis ${jedis.version} - - commons-pool2 - org.apache.commons - slf4j-api org.slf4j @@ -174,6 +176,12 @@ clickhouse-jdbc 0.3.2 test + + + gson + com.google.code.gson + + diff --git a/hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java b/hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java index 2236802cc..8145e745b 100644 --- a/hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java +++ b/hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java @@ -13,7 +13,7 @@ import java.io.Serializable; /** * Jedis数据源 - * + * * @author looly * @since 3.2.3 */ @@ -30,7 +30,7 @@ public class RedisDS implements Closeable, Serializable { // --------------------------------------------------------------------------------- Static method start /** * 创建RedisDS，使用默认配置文件，默认分组 - * + * * @return RedisDS */ public static RedisDS create() { @@ -39,7 +39,7 @@ public class RedisDS implements Closeable, Serializable { /** * 创建RedisDS，使用默认配置文件 - * + * * @param group 配置文件中配置分组 * @return RedisDS */ @@ -49,7 +49,7 @@ public class RedisDS implements Closeable, Serializable { /** * 创建RedisDS - * + * * @param setting 配置文件 * @param group 配置文件中配置分组 * @return RedisDS @@ -68,7 +68,7 @@ public class RedisDS implements Closeable, Serializable { /** * 构造，使用默认配置文件 - * + * * @param group 配置文件中配置分组 */ public RedisDS(String group) { @@ -77,7 +77,7 @@ public class RedisDS implements Closeable, Serializable { /** * 构造 - * + * * @param setting 配置文件 * @param group 配置文件中配置分组 */ @@ -88,7 +88,7 @@ public class RedisDS implements Closeable, Serializable { /** * 初始化Jedis客户端 - * + * * @param group Redis服务器信息分组 * @return this */ @@ -105,6 +105,13 @@ public class RedisDS implements Closeable, Serializable { setting.toBean(group, config); } + //issue#I54TZ9 + final Long maxWaitMillis = setting.getLong("maxWaitMillis"); + if(null != maxWaitMillis){ + //noinspection deprecation + config.setMaxWaitMillis(maxWaitMillis); + } + this.pool = new JedisPool(config, // 地址 setting.getStr("host", group, Protocol.DEFAULT_HOST), @@ -130,7 +137,7 @@ public class RedisDS implements Closeable, Serializable { /** * 从资源池中获取{@link Jedis} - * + * * @return {@link Jedis} */ public Jedis getJedis() { @@ -139,7 +146,7 @@ public class RedisDS implements Closeable, Serializable { /** * 从Redis中获取值 - * + * * @param key 键 * @return 值 */ @@ -151,7 +158,7 @@ public class RedisDS implements Closeable, Serializable { /** * 从Redis中获取值 - * + * * @param key 键 * @param value 值 * @return 状态码 @@ -161,10 +168,10 @@ public class RedisDS implements Closeable, Serializable { return jedis.set(key, value); } } - + /** * 从Redis中删除多个值 - * + * * @param keys 需要删除值对应的键列表 * @return 删除个数，0表示无key可删除 */ From 170f01edbafe49165113d55d40e303901f6373da Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 27 Apr 2022 23:44:43 +0800 Subject: [PATCH 04/21] update validation version --- CHANGELOG.md | 1 + hutool-extra/pom.xml | 8 ++++---- .../cn/hutool/extra/validation/ValidationUtil.java | 12 ++++++++---- .../extra/validation/BeanValidatorUtilTest.java | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d957022b2..14c1f65d8 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ # 5.8.0.M5 (2022-04-27) ### ❌不兼容特性 +* 【extra 】 升级jakarta.validation-api到3.x，包名变更导致不能向下兼容 ### 🐣新特性 diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index f5c573c90..4b13a50db 100755 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -361,20 +361,20 @@ jakarta.validation jakarta.validation-api - 2.0.2 + 3.0.1 compile true org.hibernate.validator hibernate-validator - 6.1.6.Final + 7.0.4.Final test org.glassfish - javax.el - 3.0.0 + jakarta.el + 4.0.2 test diff --git a/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java index cb9a4cd1c..ca49fa7f9 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java @@ -2,9 +2,11 @@ package cn.hutool.extra.validation; import cn.hutool.extra.validation.BeanValidationResult.ErrorMessage; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + import java.util.Set; @@ -24,7 +26,9 @@ public class ValidationUtil { private static final Validator validator; static { - validator = Validation.buildDefaultValidatorFactory().getValidator(); + try(ValidatorFactory factory = Validation.buildDefaultValidatorFactory()){ + validator = factory.getValidator(); + } } /** diff --git a/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java index 395f3ad7d..ce2ed7217 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java @@ -3,7 +3,7 @@ package cn.hutool.extra.validation; import org.junit.Assert; import org.junit.Test; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * java bean 校验工具类单元测试 From 2917cb79342a9d2750363151fcbae05c9bbaca15 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 28 Apr 2022 11:42:25 +0800 Subject: [PATCH 05/21] fix code --- hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java | 0 .../src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java | 0 hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java | 0 .../src/main/java/cn/hutool/extra/validation/ValidationUtil.java | 0 .../java/cn/hutool/extra/validation/BeanValidatorUtilTest.java | 0 5 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java mode change 100644 => 100755 hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java mode change 100644 => 100755 hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java b/hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java old mode 100644 new mode 100755 From 89d481da523eaf8553fde9cf67b61713adc3322e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B8=BF=E8=BE=BE?= Date: Thu, 28 Apr 2022 15:58:02 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E5=8D=95=E4=BE=8B?= =?UTF-8?q?=E6=B1=A0=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E7=B1=BB=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E5=92=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E5=AD=98=E5=9C=A8=E7=9A=84?= =?UTF-8?q?=E7=B1=BB=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/hutool/core/lang/Singleton.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java b/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java index a4f210100..ba49e1e99 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java @@ -6,7 +6,11 @@ import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; /** * 单例类
@@ -90,6 +94,30 @@ public final class Singleton { POOL.put(key, obj); } + /** + * 判断某个类的对象是否存在 + * + * @param clazz 类 + * @param params 构造参数 + * @return 是否存在 + */ + public static boolean exists(Class clazz, Object... params){ + if (null != clazz){ + final String key = buildKey(clazz.getName(), params); + return POOL.containsKey(key); + } + return false; + } + + /** + * 获取单例池中存在的所有类 + * + * @return 非重复的类集合 + */ + public static Set> getExistClass(){ + return POOL.values().stream().map(Object::getClass).collect(Collectors.toSet()); + } + /** * 移除指定Singleton对象 * From e02114312679392ce16c26c5ba221d5a1db482cf Mon Sep 17 00:00:00 2001 From: zhongzixiang Date: Thu, 28 Apr 2022 16:21:16 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B0=86bean=E7=9A=84?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=B1=9E=E6=80=A7=E8=BD=AC=E6=8D=A2=E6=88=90?= =?UTF-8?q?map=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/hutool/core/bean/BeanUtil.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java index eabce8de0..7c0d7cb4f 100755 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java @@ -24,11 +24,14 @@ import java.beans.PropertyEditorManager; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.function.Consumer; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -616,6 +619,29 @@ public class BeanUtil { return beanToMap(bean, false, false); } + + /** + * 将bean的部分属性转换成map + * + * @param bean bean + * @param properties 属性值 + * @return Map + */ + public static Map beanToMap(Object bean, String... properties) { + if (ArrayUtil.isEmpty(properties)) { + return Collections.emptyMap(); + } + Set propertiesSet = Arrays.stream(properties).collect(Collectors.toSet()); + // 指明了要复制的属性 所以不忽略null值 + return beanToMap(bean, new HashMap<>(properties.length), false, + property -> { + if (!propertiesSet.contains(property)) { + return null; + } + return property; + }); + } + /** * 对象转Map * From bea723c11b86fbd246de32ab0f83b6e7eb994d57 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 28 Apr 2022 17:00:49 +0800 Subject: [PATCH 08/21] add methods --- CHANGELOG.md | 3 ++- hutool-aop/src/main/java/cn/hutool/aop/ProxyUtil.java | 0 hutool-aop/src/main/java/cn/hutool/aop/aspects/Aspect.java | 0 .../src/main/java/cn/hutool/aop/aspects/SimpleAspect.java | 0 .../main/java/cn/hutool/aop/aspects/TimeIntervalAspect.java | 0 .../src/main/java/cn/hutool/aop/aspects/package-info.java | 0 .../main/java/cn/hutool/aop/interceptor/CglibInterceptor.java | 0 .../main/java/cn/hutool/aop/interceptor/JdkInterceptor.java | 0 .../java/cn/hutool/aop/interceptor/SpringCglibInterceptor.java | 0 .../src/main/java/cn/hutool/aop/interceptor/package-info.java | 0 hutool-aop/src/main/java/cn/hutool/aop/package-info.java | 0 .../src/main/java/cn/hutool/aop/proxy/CglibProxyFactory.java | 0 .../src/main/java/cn/hutool/aop/proxy/JdkProxyFactory.java | 0 hutool-aop/src/main/java/cn/hutool/aop/proxy/ProxyFactory.java | 0 .../main/java/cn/hutool/aop/proxy/SpringCglibProxyFactory.java | 0 hutool-aop/src/main/java/cn/hutool/aop/proxy/package-info.java | 0 .../META-INF/services/cn.hutool.aop.proxy.ProxyFactory | 0 hutool-aop/src/test/java/cn/hutool/aop/test/AopTest.java | 0 .../src/main/java/cn/hutool/bloomfilter/BitMapBloomFilter.java | 0 .../src/main/java/cn/hutool/bloomfilter/BitSetBloomFilter.java | 0 .../src/main/java/cn/hutool/bloomfilter/BloomFilter.java | 0 .../src/main/java/cn/hutool/bloomfilter/BloomFilterUtil.java | 0 .../src/main/java/cn/hutool/bloomfilter/bitMap/BitMap.java | 0 .../src/main/java/cn/hutool/bloomfilter/bitMap/IntMap.java | 0 .../src/main/java/cn/hutool/bloomfilter/bitMap/LongMap.java | 0 .../main/java/cn/hutool/bloomfilter/bitMap/package-info.java | 0 .../main/java/cn/hutool/bloomfilter/filter/AbstractFilter.java | 0 .../main/java/cn/hutool/bloomfilter/filter/DefaultFilter.java | 0 .../src/main/java/cn/hutool/bloomfilter/filter/ELFFilter.java | 0 .../src/main/java/cn/hutool/bloomfilter/filter/FNVFilter.java | 0 .../src/main/java/cn/hutool/bloomfilter/filter/FuncFilter.java | 0 .../src/main/java/cn/hutool/bloomfilter/filter/HfFilter.java | 0 .../src/main/java/cn/hutool/bloomfilter/filter/HfIpFilter.java | 0 .../src/main/java/cn/hutool/bloomfilter/filter/JSFilter.java | 0 .../src/main/java/cn/hutool/bloomfilter/filter/PJWFilter.java | 0 .../src/main/java/cn/hutool/bloomfilter/filter/RSFilter.java | 0 .../src/main/java/cn/hutool/bloomfilter/filter/SDBMFilter.java | 0 .../main/java/cn/hutool/bloomfilter/filter/TianlFilter.java | 0 .../main/java/cn/hutool/bloomfilter/filter/package-info.java | 0 .../src/main/java/cn/hutool/bloomfilter/package-info.java | 0 .../test/java/cn/hutool/bloomfilter/BitMapBloomFilterTest.java | 0 hutool-cache/src/main/java/cn/hutool/cache/Cache.java | 0 hutool-cache/src/main/java/cn/hutool/cache/CacheListener.java | 0 hutool-cache/src/main/java/cn/hutool/cache/CacheUtil.java | 0 .../src/main/java/cn/hutool/cache/GlobalPruneTimer.java | 0 .../src/main/java/cn/hutool/cache/file/AbstractFileCache.java | 0 .../src/main/java/cn/hutool/cache/file/LFUFileCache.java | 0 .../src/main/java/cn/hutool/cache/file/LRUFileCache.java | 0 .../src/main/java/cn/hutool/cache/file/package-info.java | 0 .../src/main/java/cn/hutool/cache/impl/AbstractCache.java | 0 hutool-cache/src/main/java/cn/hutool/cache/impl/CacheObj.java | 0 .../src/main/java/cn/hutool/cache/impl/CacheObjIterator.java | 0 .../main/java/cn/hutool/cache/impl/CacheValuesIterator.java | 0 hutool-cache/src/main/java/cn/hutool/cache/impl/FIFOCache.java | 0 hutool-cache/src/main/java/cn/hutool/cache/impl/LFUCache.java | 0 hutool-cache/src/main/java/cn/hutool/cache/impl/LRUCache.java | 0 hutool-cache/src/main/java/cn/hutool/cache/impl/NoCache.java | 0 .../src/main/java/cn/hutool/cache/impl/ReentrantCache.java | 0 .../src/main/java/cn/hutool/cache/impl/StampedCache.java | 0 .../src/main/java/cn/hutool/cache/impl/TimedCache.java | 0 .../src/main/java/cn/hutool/cache/impl/package-info.java | 0 hutool-cache/src/main/java/cn/hutool/cache/package-info.java | 0 .../src/test/java/cn/hutool/cache/CacheConcurrentTest.java | 0 hutool-cache/src/test/java/cn/hutool/cache/CacheTest.java | 0 hutool-cache/src/test/java/cn/hutool/cache/FileCacheTest.java | 0 hutool-cache/src/test/java/cn/hutool/cache/LRUCacheTest.java | 0 .../src/main/java/cn/hutool/captcha/AbstractCaptcha.java | 0 .../src/main/java/cn/hutool/captcha/CaptchaUtil.java | 0 .../src/main/java/cn/hutool/captcha/CircleCaptcha.java | 0 hutool-captcha/src/main/java/cn/hutool/captcha/GifCaptcha.java | 0 hutool-captcha/src/main/java/cn/hutool/captcha/ICaptcha.java | 0 .../src/main/java/cn/hutool/captcha/LineCaptcha.java | 0 .../src/main/java/cn/hutool/captcha/ShearCaptcha.java | 0 .../java/cn/hutool/captcha/generator/AbstractGenerator.java | 0 .../main/java/cn/hutool/captcha/generator/CodeGenerator.java | 0 .../main/java/cn/hutool/captcha/generator/MathGenerator.java | 0 .../main/java/cn/hutool/captcha/generator/RandomGenerator.java | 0 .../main/java/cn/hutool/captcha/generator/package-info.java | 0 .../src/main/java/cn/hutool/captcha/package-info.java | 0 .../src/test/java/cn/hutool/captcha/CaptchaTest.java | 0 .../src/test/java/cn/hutool/captcha/CaptchaUtilTest.java | 0 .../src/test/java/cn/hutool/captcha/GeneratorTest.java | 0 .../src/main/java/cn/hutool/core/bean/copier/BeanCopier.java | 0 .../src/main/java/cn/hutool/core/bean/copier/CopyOptions.java | 0 hutool-core/src/main/java/cn/hutool/core/codec/Base64.java | 0 .../src/main/java/cn/hutool/core/codec/PercentCodec.java | 0 .../src/main/java/cn/hutool/core/collection/FilterIter.java | 0 .../src/main/java/cn/hutool/core/collection/IterUtil.java | 0 .../src/main/java/cn/hutool/core/collection/ListUtil.java | 0 .../main/java/cn/hutool/core/collection/TransCollection.java | 0 .../java/cn/hutool/core/comparator/BaseFieldComparator.java | 0 hutool-core/src/main/java/cn/hutool/core/convert/Convert.java | 0 .../main/java/cn/hutool/core/convert/ConverterRegistry.java | 0 .../src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java | 0 .../src/main/java/cn/hutool/core/exceptions/CheckedUtil.java | 0 .../src/main/java/cn/hutool/core/img/BackgroundRemoval.java | 0 hutool-core/src/main/java/cn/hutool/core/img/FontUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/img/GraphicsUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/img/Img.java | 0 hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/img/ScaleType.java | 0 .../main/java/cn/hutool/core/img/gif/AnimatedGifEncoder.java | 0 .../src/main/java/cn/hutool/core/img/gif/GifDecoder.java | 0 .../src/main/java/cn/hutool/core/img/gif/LZWEncoder.java | 0 hutool-core/src/main/java/cn/hutool/core/img/gif/NeuQuant.java | 0 .../src/main/java/cn/hutool/core/img/gif/package-info.java | 0 hutool-core/src/main/java/cn/hutool/core/img/package-info.java | 0 hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java | 0 .../java/cn/hutool/core/io/checksum/crc16/CRC16Checksum.java | 0 .../src/main/java/cn/hutool/core/io/file/FileCopier.java | 0 .../src/main/java/cn/hutool/core/io/file/FileNameUtil.java | 0 .../src/main/java/cn/hutool/core/io/resource/ResourceUtil.java | 0 .../src/main/java/cn/hutool/core/io/resource/UrlResource.java | 0 .../src/main/java/cn/hutool/core/io/watch/WatchServer.java | 0 .../src/main/java/cn/hutool/core/lang/ClassScanner.java | 0 .../src/main/java/cn/hutool/core/lang/ConsistentHash.java | 0 hutool-core/src/main/java/cn/hutool/core/lang/Dict.java | 0 hutool-core/src/main/java/cn/hutool/core/lang/Editor.java | 0 hutool-core/src/main/java/cn/hutool/core/lang/Filter.java | 0 hutool-core/src/main/java/cn/hutool/core/lang/Matcher.java | 0 hutool-core/src/main/java/cn/hutool/core/lang/ObjectId.java | 0 .../main/java/cn/hutool/core/lang/ParameterizedTypeImpl.java | 0 hutool-core/src/main/java/cn/hutool/core/lang/Replacer.java | 0 hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java | 2 -- hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java | 0 .../src/main/java/cn/hutool/core/lang/TypeReference.java | 0 hutool-core/src/main/java/cn/hutool/core/lang/UUID.java | 0 hutool-core/src/main/java/cn/hutool/core/lang/Validator.java | 0 .../src/main/java/cn/hutool/core/lang/WeightRandom.java | 0 .../src/main/java/cn/hutool/core/lang/caller/package-info.java | 0 .../main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java | 0 .../src/main/java/cn/hutool/core/lang/copier/package-info.java | 0 .../src/main/java/cn/hutool/core/lang/func/package-info.java | 0 .../java/cn/hutool/core/lang/generator/ObjectIdGenerator.java | 0 .../java/cn/hutool/core/lang/generator/SnowflakeGenerator.java | 0 .../main/java/cn/hutool/core/lang/generator/UUIDGenerator.java | 0 .../main/java/cn/hutool/core/lang/generator/package-info.java | 0 .../src/main/java/cn/hutool/core/lang/hash/package-info.java | 0 hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java | 0 .../src/main/java/cn/hutool/core/lang/intern/Interner.java | 0 .../src/main/java/cn/hutool/core/lang/intern/package-info.java | 0 .../main/java/cn/hutool/core/lang/loader/LazyFunLoader.java | 0 .../src/main/java/cn/hutool/core/lang/loader/package-info.java | 0 .../src/main/java/cn/hutool/core/lang/mutable/Mutable.java | 0 .../main/java/cn/hutool/core/lang/mutable/package-info.java | 0 .../src/main/java/cn/hutool/core/lang/package-info.java | 0 .../main/java/cn/hutool/core/lang/reflect/package-info.java | 0 hutool-core/src/main/java/cn/hutool/core/lang/tree/Node.java | 0 hutool-core/src/main/java/cn/hutool/core/lang/tree/Tree.java | 0 .../src/main/java/cn/hutool/core/lang/tree/TreeBuilder.java | 0 .../src/main/java/cn/hutool/core/lang/tree/TreeNode.java | 0 .../src/main/java/cn/hutool/core/lang/tree/TreeNodeConfig.java | 0 .../src/main/java/cn/hutool/core/lang/tree/package-info.java | 0 .../cn/hutool/core/lang/tree/parser/DefaultNodeParser.java | 0 .../main/java/cn/hutool/core/lang/tree/parser/NodeParser.java | 0 hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java | 0 hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java | 0 .../src/main/java/cn/hutool/core/net/url/UrlBuilder.java | 0 .../src/main/java/cn/hutool/core/swing/DesktopUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/swing/RobotUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/swing/ScreenUtil.java | 0 .../java/cn/hutool/core/swing/clipboard/ClipboardListener.java | 0 .../java/cn/hutool/core/swing/clipboard/ClipboardMonitor.java | 0 .../java/cn/hutool/core/swing/clipboard/ClipboardUtil.java | 0 .../java/cn/hutool/core/swing/clipboard/ImageSelection.java | 0 .../cn/hutool/core/swing/clipboard/StrClipboardListener.java | 0 .../main/java/cn/hutool/core/swing/clipboard/package-info.java | 0 .../src/main/java/cn/hutool/core/swing/package-info.java | 0 hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java | 0 hutool-core/src/main/java/cn/hutool/core/text/UnicodeUtil.java | 0 .../src/main/java/cn/hutool/core/text/csv/CsvBaseReader.java | 0 .../src/main/java/cn/hutool/core/text/csv/CsvConfig.java | 0 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvData.java | 0 .../src/main/java/cn/hutool/core/text/csv/CsvParser.java | 0 .../src/main/java/cn/hutool/core/text/csv/CsvReadConfig.java | 0 .../src/main/java/cn/hutool/core/text/csv/CsvReader.java | 0 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRow.java | 0 .../src/main/java/cn/hutool/core/text/csv/CsvRowHandler.java | 0 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvUtil.java | 0 .../src/main/java/cn/hutool/core/text/csv/CsvWriteConfig.java | 0 .../src/main/java/cn/hutool/core/text/csv/CsvWriter.java | 0 .../src/main/java/cn/hutool/core/text/csv/package-info.java | 0 .../java/cn/hutool/core/text/finder/CharMatcherFinder.java | 0 .../main/java/cn/hutool/core/text/replacer/StrReplacer.java | 0 .../src/main/java/cn/hutool/core/util/CreditCodeUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/util/EscapeUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/util/HashUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/util/HexUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/util/IdUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/util/ReUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java | 0 hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java | 0 .../src/test/java/cn/hutool/core/convert/ConvertTest.java | 0 .../test/java/cn/hutool/core/convert/ConvertToBeanTest.java | 0 .../java/cn/hutool/core/convert/ConvertToCollectionTest.java | 0 .../test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java | 0 hutool-core/src/test/java/cn/hutool/core/img/FontUtilTest.java | 0 hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java | 0 hutool-core/src/test/java/cn/hutool/core/img/ImgUtilTest.java | 0 .../src/test/java/cn/hutool/core/io/WatchMonitorTest.java | 0 .../src/test/java/cn/hutool/core/io/checksum/CrcTest.java | 0 hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java | 0 hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java | 0 .../src/test/java/cn/hutool/core/lang/ObjectIdTest.java | 0 .../src/test/java/cn/hutool/core/lang/SnowflakeTest.java | 0 hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java | 0 .../src/test/java/cn/hutool/core/lang/ValidatorTest.java | 0 .../src/test/java/cn/hutool/core/lang/caller/CallerTest.java | 0 .../test/java/cn/hutool/core/lang/caller/CallerUtilTest.java | 0 .../src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java | 0 .../test/java/cn/hutool/core/lang/tree/TreeBuilderTest.java | 0 .../src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java | 0 .../src/test/java/cn/hutool/core/lang/tree/TreeTest.java | 0 .../src/test/java/cn/hutool/core/math/ArrangementTest.java | 0 hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java | 0 .../test/java/cn/hutool/core/swing/ClipboardMonitorTest.java | 0 .../src/test/java/cn/hutool/core/swing/ClipboardUtilTest.java | 0 .../src/test/java/cn/hutool/core/swing/DesktopUtilTest.java | 0 .../src/test/java/cn/hutool/core/swing/RobotUtilTest.java | 0 .../src/test/java/cn/hutool/core/text/NamingCaseTest.java | 0 .../src/test/java/cn/hutool/core/text/csv/CsvParserTest.java | 0 .../src/test/java/cn/hutool/core/text/csv/CsvReaderTest.java | 0 .../src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java | 0 .../test/java/cn/hutool/core/thread/ConcurrencyTesterTest.java | 0 .../src/test/java/cn/hutool/core/util/EscapeUtilTest.java | 0 .../src/test/java/cn/hutool/core/util/HashUtilTest.java | 0 hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java | 0 hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java | 0 hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java | 0 hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java | 0 hutool-core/src/test/resources/test-compile/a/A.java | 0 hutool-core/src/test/resources/test_bean.csv | 0 hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java | 0 .../src/main/java/cn/hutool/cron/pattern/CronPatternUtil.java | 0 .../main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java | 0 hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java | 0 .../test/java/cn/hutool/cron/demo/AddAndRemoveMainTest.java | 0 hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob.java | 0 hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob2.java | 0 .../src/test/java/cn/hutool/cron/pattern/CronPatternTest.java | 0 hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java | 0 .../java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java | 0 .../src/main/java/cn/hutool/crypto/asymmetric/SM2.java | 0 .../src/main/java/cn/hutool/crypto/asymmetric/Sign.java | 0 .../src/main/java/cn/hutool/crypto/digest/Digester.java | 0 .../src/main/java/cn/hutool/crypto/digest/mac/Mac.java | 0 .../src/main/java/cn/hutool/crypto/symmetric/PBKDF2.java | 0 .../src/main/java/cn/hutool/crypto/symmetric/RC4.java | 0 .../main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java | 0 .../java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java | 0 .../test/java/cn/hutool/crypto/test/asymmetric/RSATest.java | 0 .../test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java | 0 .../src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java | 0 hutool-db/src/main/java/cn/hutool/db/AbstractDb.java | 0 hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java | 0 hutool-db/src/main/java/cn/hutool/db/Entity.java | 0 .../src/main/java/cn/hutool/db/ThreadLocalConnection.java | 0 .../src/main/java/cn/hutool/db/dialect/DialectFactory.java | 0 hutool-db/src/main/java/cn/hutool/db/meta/Column.java | 0 hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java | 0 hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java | 0 hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java | 0 hutool-db/src/test/java/cn/hutool/db/MySQLTest.java | 0 hutool-db/src/test/java/cn/hutool/db/OracleTest.java | 0 hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java | 0 hutool-dfa/src/main/java/cn/hutool/dfa/FoundWord.java | 0 hutool-dfa/src/main/java/cn/hutool/dfa/SensitiveProcessor.java | 0 hutool-dfa/src/main/java/cn/hutool/dfa/SensitiveUtil.java | 0 hutool-dfa/src/main/java/cn/hutool/dfa/StopChar.java | 0 hutool-dfa/src/main/java/cn/hutool/dfa/WordTree.java | 0 hutool-dfa/src/main/java/cn/hutool/dfa/package-info.java | 0 hutool-dfa/src/test/java/cn/hutool/dfa/DfaTest.java | 0 hutool-dfa/src/test/java/cn/hutool/dfa/SensitiveUtilTest.java | 0 .../main/java/cn/hutool/extra/compress/archiver/Archiver.java | 0 .../java/cn/hutool/extra/compress/archiver/SevenZArchiver.java | 0 .../java/cn/hutool/extra/compress/archiver/StreamArchiver.java | 0 .../java/cn/hutool/extra/compress/extractor/Extractor.java | 0 .../cn/hutool/extra/compress/extractor/SevenZExtractor.java | 0 .../cn/hutool/extra/compress/extractor/StreamExtractor.java | 0 .../src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java | 0 .../src/main/java/cn/hutool/extra/qrcode/QrConfig.java | 0 .../src/main/java/cn/hutool/extra/spring/SpringUtil.java | 0 .../src/main/java/cn/hutool/extra/ssh/JschSessionPool.java | 0 .../cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java | 0 .../cn/hutool/extra/template/engine/rythm/RythmTemplate.java | 0 .../extra/template/engine/thymeleaf/ThymeleafTemplate.java | 0 .../extra/template/engine/velocity/VelocityTemplate.java | 0 .../java/cn/hutool/extra/template/engine/wit/WitEngine.java | 0 .../java/cn/hutool/extra/template/engine/wit/WitTemplate.java | 0 .../cn/hutool/extra/tokenizer/engine/TokenizerFactory.java | 0 .../src/test/java/cn/hutool/extra/expression/AviatorTest.java | 0 .../java/cn/hutool/extra/expression/ExpressionUtilTest.java | 0 .../src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java | 0 .../src/test/java/cn/hutool/extra/spring/SpringUtilTest.java | 0 .../cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java | 0 .../src/test/java/cn/hutool/extra/ssh/JschUtilTest.java | 0 .../test/java/cn/hutool/extra/template/TemplateUtilTest.java | 0 .../src/test/java/cn/hutool/extra/template/ThymeleafTest.java | 0 .../src/test/java/cn/hutool/extra/template/VelocityTest.java | 0 hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java | 0 hutool-http/src/main/java/cn/hutool/http/HttpResponse.java | 0 hutool-http/src/main/java/cn/hutool/http/HttpUtil.java | 0 .../main/java/cn/hutool/http/ssl/SSLSocketFactoryBuilder.java | 0 .../src/main/java/cn/hutool/http/useragent/Browser.java | 0 hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java | 0 hutool-http/src/main/java/cn/hutool/http/useragent/OS.java | 0 .../src/main/java/cn/hutool/http/useragent/UserAgentInfo.java | 0 hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java | 0 .../src/test/java/cn/hutool/http/server/BlankServerTest.java | 0 .../src/test/java/cn/hutool/http/server/DocServerTest.java | 0 hutool-json/src/main/java/cn/hutool/json/JSON.java | 0 hutool-json/src/main/java/cn/hutool/json/JSONConfig.java | 0 .../src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java | 0 hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java | 0 hutool-json/src/test/java/cn/hutool/json/Issue488Test.java | 0 .../test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java | 0 hutool-jwt/src/main/java/cn/hutool/jwt/Claims.java | 0 hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java | 0 hutool-jwt/src/main/java/cn/hutool/jwt/JWTException.java | 0 hutool-jwt/src/main/java/cn/hutool/jwt/JWTHeader.java | 0 hutool-jwt/src/main/java/cn/hutool/jwt/JWTPayload.java | 0 hutool-jwt/src/main/java/cn/hutool/jwt/JWTUtil.java | 0 hutool-jwt/src/main/java/cn/hutool/jwt/JWTValidator.java | 0 hutool-jwt/src/main/java/cn/hutool/jwt/RegisteredPayload.java | 0 hutool-jwt/src/main/java/cn/hutool/jwt/package-info.java | 0 .../src/main/java/cn/hutool/jwt/signers/AlgorithmUtil.java | 0 .../main/java/cn/hutool/jwt/signers/AsymmetricJWTSigner.java | 0 .../src/main/java/cn/hutool/jwt/signers/HMacJWTSigner.java | 0 hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSigner.java | 0 .../src/main/java/cn/hutool/jwt/signers/JWTSignerUtil.java | 0 .../src/main/java/cn/hutool/jwt/signers/NoneJWTSigner.java | 0 .../src/main/java/cn/hutool/jwt/signers/package-info.java | 0 hutool-jwt/src/test/java/cn/hutool/jwt/JWTSignerTest.java | 0 hutool-jwt/src/test/java/cn/hutool/jwt/JWTTest.java | 0 hutool-jwt/src/test/java/cn/hutool/jwt/JWTUtilTest.java | 0 hutool-jwt/src/test/java/cn/hutool/jwt/JWTValidatorTest.java | 0 hutool-log/src/main/java/cn/hutool/log/Log.java | 0 hutool-log/src/main/java/cn/hutool/log/StaticLog.java | 0 .../src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java | 0 hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java | 0 .../cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java | 0 hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java | 0 hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java | 0 .../src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java | 0 .../main/java/cn/hutool/script/FullSupportScriptEngine.java | 0 .../src/main/java/cn/hutool/script/JavaScriptEngine.java | 0 .../src/main/java/cn/hutool/script/ScriptRuntimeException.java | 0 hutool-script/src/main/java/cn/hutool/script/package-info.java | 0 .../src/test/java/cn/hutool/script/test/NashornDeepTest.java | 0 .../src/test/java/cn/hutool/script/test/ScriptUtilTest.java | 0 hutool-script/src/test/resources/filter1.js | 0 .../src/main/java/cn/hutool/setting/SettingLoader.java | 0 .../src/main/java/cn/hutool/setting/profile/GlobalProfile.java | 0 .../src/main/java/cn/hutool/setting/profile/Profile.java | 0 .../src/main/java/cn/hutool/setting/yaml/YamlUtil.java | 0 .../src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java | 0 .../src/test/java/cn/hutool/socket/aio/AioClientTest.java | 0 .../src/test/java/cn/hutool/socket/aio/AioServerTest.java | 0 .../src/test/java/cn/hutool/socket/nio/NioClientTest.java | 0 .../src/test/java/cn/hutool/socket/nio/NioServerTest.java | 0 hutool-system/src/main/java/cn/hutool/system/HostInfo.java | 0 hutool-system/src/main/java/cn/hutool/system/JavaInfo.java | 0 .../src/main/java/cn/hutool/system/JavaRuntimeInfo.java | 0 hutool-system/src/main/java/cn/hutool/system/JavaSpecInfo.java | 0 hutool-system/src/main/java/cn/hutool/system/JvmInfo.java | 0 hutool-system/src/main/java/cn/hutool/system/JvmSpecInfo.java | 0 hutool-system/src/main/java/cn/hutool/system/OsInfo.java | 0 hutool-system/src/main/java/cn/hutool/system/RuntimeInfo.java | 0 .../src/main/java/cn/hutool/system/SystemPropsKeys.java | 0 hutool-system/src/main/java/cn/hutool/system/SystemUtil.java | 0 hutool-system/src/main/java/cn/hutool/system/UserInfo.java | 0 hutool-system/src/main/java/cn/hutool/system/oshi/CpuInfo.java | 0 .../src/main/java/cn/hutool/system/oshi/CpuTicks.java | 0 .../src/main/java/cn/hutool/system/oshi/OshiUtil.java | 0 .../src/main/java/cn/hutool/system/oshi/package-info.java | 0 hutool-system/src/main/java/cn/hutool/system/package-info.java | 0 .../src/test/java/cn/hutool/system/OshiPrintTest.java | 0 hutool-system/src/test/java/cn/hutool/system/OshiTest.java | 0 .../src/test/java/cn/hutool/system/SystemUtilTest.java | 0 386 files changed, 2 insertions(+), 3 deletions(-) mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/ProxyUtil.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/aspects/Aspect.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/aspects/SimpleAspect.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/aspects/TimeIntervalAspect.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/aspects/package-info.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/interceptor/CglibInterceptor.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/interceptor/JdkInterceptor.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/interceptor/SpringCglibInterceptor.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/interceptor/package-info.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/package-info.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/proxy/CglibProxyFactory.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/proxy/JdkProxyFactory.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/proxy/ProxyFactory.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/proxy/SpringCglibProxyFactory.java mode change 100644 => 100755 hutool-aop/src/main/java/cn/hutool/aop/proxy/package-info.java mode change 100644 => 100755 hutool-aop/src/main/resources/META-INF/services/cn.hutool.aop.proxy.ProxyFactory mode change 100644 => 100755 hutool-aop/src/test/java/cn/hutool/aop/test/AopTest.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BitMapBloomFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BitSetBloomFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BloomFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BloomFilterUtil.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/BitMap.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/IntMap.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/LongMap.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/package-info.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/AbstractFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/DefaultFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/ELFFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/FNVFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/FuncFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/HfFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/HfIpFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/JSFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/PJWFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/RSFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/SDBMFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/TianlFilter.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/package-info.java mode change 100644 => 100755 hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/package-info.java mode change 100644 => 100755 hutool-bloomFilter/src/test/java/cn/hutool/bloomfilter/BitMapBloomFilterTest.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/Cache.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/CacheListener.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/CacheUtil.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/GlobalPruneTimer.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/file/AbstractFileCache.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/file/LFUFileCache.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/file/LRUFileCache.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/file/package-info.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/impl/AbstractCache.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/impl/CacheObj.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/impl/CacheObjIterator.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/impl/CacheValuesIterator.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/impl/FIFOCache.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/impl/LFUCache.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/impl/LRUCache.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/impl/NoCache.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/impl/ReentrantCache.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/impl/StampedCache.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/impl/TimedCache.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/impl/package-info.java mode change 100644 => 100755 hutool-cache/src/main/java/cn/hutool/cache/package-info.java mode change 100644 => 100755 hutool-cache/src/test/java/cn/hutool/cache/CacheConcurrentTest.java mode change 100644 => 100755 hutool-cache/src/test/java/cn/hutool/cache/CacheTest.java mode change 100644 => 100755 hutool-cache/src/test/java/cn/hutool/cache/FileCacheTest.java mode change 100644 => 100755 hutool-cache/src/test/java/cn/hutool/cache/LRUCacheTest.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/AbstractCaptcha.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/CaptchaUtil.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/CircleCaptcha.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/GifCaptcha.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/ICaptcha.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/LineCaptcha.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/ShearCaptcha.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/generator/AbstractGenerator.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/generator/CodeGenerator.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/generator/MathGenerator.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/generator/RandomGenerator.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/generator/package-info.java mode change 100644 => 100755 hutool-captcha/src/main/java/cn/hutool/captcha/package-info.java mode change 100644 => 100755 hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java mode change 100644 => 100755 hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaUtilTest.java mode change 100644 => 100755 hutool-captcha/src/test/java/cn/hutool/captcha/GeneratorTest.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/codec/Base64.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/comparator/BaseFieldComparator.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/convert/Convert.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/exceptions/CheckedUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/img/BackgroundRemoval.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/img/FontUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/img/GraphicsUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/img/Img.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/img/ScaleType.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/img/gif/AnimatedGifEncoder.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/img/gif/GifDecoder.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/img/gif/LZWEncoder.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/img/gif/NeuQuant.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/img/gif/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/img/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Checksum.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/io/file/FileCopier.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/io/resource/UrlResource.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/ConsistentHash.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/Dict.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/Editor.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/Filter.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/Matcher.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/ObjectId.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/ParameterizedTypeImpl.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/Replacer.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/TypeReference.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/UUID.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/Validator.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectIdGenerator.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/generator/SnowflakeGenerator.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/generator/UUIDGenerator.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/hash/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/intern/Interner.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/intern/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyFunLoader.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/mutable/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/reflect/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/tree/Node.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/tree/Tree.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeBuilder.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeNode.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeNodeConfig.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/tree/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/tree/parser/DefaultNodeParser.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/lang/tree/parser/NodeParser.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/swing/DesktopUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/swing/RobotUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/swing/ScreenUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardListener.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardMonitor.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ImageSelection.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/swing/clipboard/StrClipboardListener.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/swing/clipboard/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/swing/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/UnicodeUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvBaseReader.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvConfig.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvData.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvParser.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvReadConfig.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvReader.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRow.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRowHandler.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriteConfig.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/csv/package-info.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/finder/CharMatcherFinder.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/text/replacer/StrReplacer.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/EscapeUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/HashUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/HexUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/IdUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/ReUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java mode change 100644 => 100755 hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/img/FontUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/img/ImgUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeBuilderTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/swing/ClipboardMonitorTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/swing/ClipboardUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/swing/DesktopUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/swing/RobotUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/text/csv/CsvParserTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/text/csv/CsvReaderTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/thread/ConcurrencyTesterTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/util/EscapeUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java mode change 100644 => 100755 hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java mode change 100644 => 100755 hutool-core/src/test/resources/test-compile/a/A.java mode change 100644 => 100755 hutool-core/src/test/resources/test_bean.csv mode change 100644 => 100755 hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java mode change 100644 => 100755 hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternUtil.java mode change 100644 => 100755 hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java mode change 100644 => 100755 hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java mode change 100644 => 100755 hutool-cron/src/test/java/cn/hutool/cron/demo/AddAndRemoveMainTest.java mode change 100644 => 100755 hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob.java mode change 100644 => 100755 hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob2.java mode change 100644 => 100755 hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternTest.java mode change 100644 => 100755 hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java mode change 100644 => 100755 hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java mode change 100644 => 100755 hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SM2.java mode change 100644 => 100755 hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java mode change 100644 => 100755 hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java mode change 100644 => 100755 hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java mode change 100644 => 100755 hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/PBKDF2.java mode change 100644 => 100755 hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java mode change 100644 => 100755 hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java mode change 100644 => 100755 hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java mode change 100644 => 100755 hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java mode change 100644 => 100755 hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java mode change 100644 => 100755 hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java mode change 100644 => 100755 hutool-db/src/main/java/cn/hutool/db/AbstractDb.java mode change 100644 => 100755 hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java mode change 100644 => 100755 hutool-db/src/main/java/cn/hutool/db/Entity.java mode change 100644 => 100755 hutool-db/src/main/java/cn/hutool/db/ThreadLocalConnection.java mode change 100644 => 100755 hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java mode change 100644 => 100755 hutool-db/src/main/java/cn/hutool/db/meta/Column.java mode change 100644 => 100755 hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java mode change 100644 => 100755 hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java mode change 100644 => 100755 hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java mode change 100644 => 100755 hutool-db/src/test/java/cn/hutool/db/MySQLTest.java mode change 100644 => 100755 hutool-db/src/test/java/cn/hutool/db/OracleTest.java mode change 100644 => 100755 hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java mode change 100644 => 100755 hutool-dfa/src/main/java/cn/hutool/dfa/FoundWord.java mode change 100644 => 100755 hutool-dfa/src/main/java/cn/hutool/dfa/SensitiveProcessor.java mode change 100644 => 100755 hutool-dfa/src/main/java/cn/hutool/dfa/SensitiveUtil.java mode change 100644 => 100755 hutool-dfa/src/main/java/cn/hutool/dfa/StopChar.java mode change 100644 => 100755 hutool-dfa/src/main/java/cn/hutool/dfa/WordTree.java mode change 100644 => 100755 hutool-dfa/src/main/java/cn/hutool/dfa/package-info.java mode change 100644 => 100755 hutool-dfa/src/test/java/cn/hutool/dfa/DfaTest.java mode change 100644 => 100755 hutool-dfa/src/test/java/cn/hutool/dfa/SensitiveUtilTest.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Extractor.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java mode change 100644 => 100755 hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java mode change 100644 => 100755 hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java mode change 100644 => 100755 hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java mode change 100644 => 100755 hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java mode change 100644 => 100755 hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java mode change 100644 => 100755 hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java mode change 100644 => 100755 hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java mode change 100644 => 100755 hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java mode change 100644 => 100755 hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java mode change 100644 => 100755 hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java mode change 100644 => 100755 hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java mode change 100644 => 100755 hutool-http/src/main/java/cn/hutool/http/HttpResponse.java mode change 100644 => 100755 hutool-http/src/main/java/cn/hutool/http/HttpUtil.java mode change 100644 => 100755 hutool-http/src/main/java/cn/hutool/http/ssl/SSLSocketFactoryBuilder.java mode change 100644 => 100755 hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java mode change 100644 => 100755 hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java mode change 100644 => 100755 hutool-http/src/main/java/cn/hutool/http/useragent/OS.java mode change 100644 => 100755 hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentInfo.java mode change 100644 => 100755 hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java mode change 100644 => 100755 hutool-http/src/test/java/cn/hutool/http/server/BlankServerTest.java mode change 100644 => 100755 hutool-http/src/test/java/cn/hutool/http/server/DocServerTest.java mode change 100644 => 100755 hutool-json/src/main/java/cn/hutool/json/JSON.java mode change 100644 => 100755 hutool-json/src/main/java/cn/hutool/json/JSONConfig.java mode change 100644 => 100755 hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java mode change 100644 => 100755 hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java mode change 100644 => 100755 hutool-json/src/test/java/cn/hutool/json/Issue488Test.java mode change 100644 => 100755 hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/Claims.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/JWTException.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/JWTHeader.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/JWTPayload.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/JWTUtil.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/JWTValidator.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/RegisteredPayload.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/package-info.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/signers/AlgorithmUtil.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/signers/AsymmetricJWTSigner.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/signers/HMacJWTSigner.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSigner.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSignerUtil.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/signers/NoneJWTSigner.java mode change 100644 => 100755 hutool-jwt/src/main/java/cn/hutool/jwt/signers/package-info.java mode change 100644 => 100755 hutool-jwt/src/test/java/cn/hutool/jwt/JWTSignerTest.java mode change 100644 => 100755 hutool-jwt/src/test/java/cn/hutool/jwt/JWTTest.java mode change 100644 => 100755 hutool-jwt/src/test/java/cn/hutool/jwt/JWTUtilTest.java mode change 100644 => 100755 hutool-jwt/src/test/java/cn/hutool/jwt/JWTValidatorTest.java mode change 100644 => 100755 hutool-log/src/main/java/cn/hutool/log/Log.java mode change 100644 => 100755 hutool-log/src/main/java/cn/hutool/log/StaticLog.java mode change 100644 => 100755 hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java mode change 100644 => 100755 hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java mode change 100644 => 100755 hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java mode change 100644 => 100755 hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java mode change 100644 => 100755 hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java mode change 100644 => 100755 hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java mode change 100644 => 100755 hutool-script/src/main/java/cn/hutool/script/FullSupportScriptEngine.java mode change 100644 => 100755 hutool-script/src/main/java/cn/hutool/script/JavaScriptEngine.java mode change 100644 => 100755 hutool-script/src/main/java/cn/hutool/script/ScriptRuntimeException.java mode change 100644 => 100755 hutool-script/src/main/java/cn/hutool/script/package-info.java mode change 100644 => 100755 hutool-script/src/test/java/cn/hutool/script/test/NashornDeepTest.java mode change 100644 => 100755 hutool-script/src/test/java/cn/hutool/script/test/ScriptUtilTest.java mode change 100644 => 100755 hutool-script/src/test/resources/filter1.js mode change 100644 => 100755 hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java mode change 100644 => 100755 hutool-setting/src/main/java/cn/hutool/setting/profile/GlobalProfile.java mode change 100644 => 100755 hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java mode change 100644 => 100755 hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java mode change 100644 => 100755 hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java mode change 100644 => 100755 hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java mode change 100644 => 100755 hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java mode change 100644 => 100755 hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java mode change 100644 => 100755 hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/HostInfo.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/JavaInfo.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/JavaRuntimeInfo.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/JavaSpecInfo.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/JvmInfo.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/JvmSpecInfo.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/OsInfo.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/RuntimeInfo.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/SystemPropsKeys.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/SystemUtil.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/UserInfo.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/oshi/CpuInfo.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/oshi/CpuTicks.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/oshi/OshiUtil.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/oshi/package-info.java mode change 100644 => 100755 hutool-system/src/main/java/cn/hutool/system/package-info.java mode change 100644 => 100755 hutool-system/src/test/java/cn/hutool/system/OshiPrintTest.java mode change 100644 => 100755 hutool-system/src/test/java/cn/hutool/system/OshiTest.java mode change 100644 => 100755 hutool-system/src/test/java/cn/hutool/system/SystemUtilTest.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 14c1f65d8..03c12e4f1 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,13 @@ ------------------------------------------------------------------------------------------------------------- -# 5.8.0.M5 (2022-04-27) +# 5.8.0.M5 (2022-04-28) ### ❌不兼容特性 * 【extra 】 升级jakarta.validation-api到3.x，包名变更导致不能向下兼容 ### 🐣新特性 +* 【core 】 Singleton增加部分方法（pr#609@Gitee） ### 🐞Bug修复 * 【db 】 修复RedisDS无法设置maxWaitMillis问题（issue#I54TZ9@Gitee） diff --git a/hutool-aop/src/main/java/cn/hutool/aop/ProxyUtil.java b/hutool-aop/src/main/java/cn/hutool/aop/ProxyUtil.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/aspects/Aspect.java b/hutool-aop/src/main/java/cn/hutool/aop/aspects/Aspect.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/aspects/SimpleAspect.java b/hutool-aop/src/main/java/cn/hutool/aop/aspects/SimpleAspect.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/aspects/TimeIntervalAspect.java b/hutool-aop/src/main/java/cn/hutool/aop/aspects/TimeIntervalAspect.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/aspects/package-info.java b/hutool-aop/src/main/java/cn/hutool/aop/aspects/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/interceptor/CglibInterceptor.java b/hutool-aop/src/main/java/cn/hutool/aop/interceptor/CglibInterceptor.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/interceptor/JdkInterceptor.java b/hutool-aop/src/main/java/cn/hutool/aop/interceptor/JdkInterceptor.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/interceptor/SpringCglibInterceptor.java b/hutool-aop/src/main/java/cn/hutool/aop/interceptor/SpringCglibInterceptor.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/interceptor/package-info.java b/hutool-aop/src/main/java/cn/hutool/aop/interceptor/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/package-info.java b/hutool-aop/src/main/java/cn/hutool/aop/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/proxy/CglibProxyFactory.java b/hutool-aop/src/main/java/cn/hutool/aop/proxy/CglibProxyFactory.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/proxy/JdkProxyFactory.java b/hutool-aop/src/main/java/cn/hutool/aop/proxy/JdkProxyFactory.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/proxy/ProxyFactory.java b/hutool-aop/src/main/java/cn/hutool/aop/proxy/ProxyFactory.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/proxy/SpringCglibProxyFactory.java b/hutool-aop/src/main/java/cn/hutool/aop/proxy/SpringCglibProxyFactory.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/java/cn/hutool/aop/proxy/package-info.java b/hutool-aop/src/main/java/cn/hutool/aop/proxy/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-aop/src/main/resources/META-INF/services/cn.hutool.aop.proxy.ProxyFactory b/hutool-aop/src/main/resources/META-INF/services/cn.hutool.aop.proxy.ProxyFactory old mode 100644 new mode 100755 diff --git a/hutool-aop/src/test/java/cn/hutool/aop/test/AopTest.java b/hutool-aop/src/test/java/cn/hutool/aop/test/AopTest.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BitMapBloomFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BitMapBloomFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BitSetBloomFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BitSetBloomFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BloomFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BloomFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BloomFilterUtil.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BloomFilterUtil.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/BitMap.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/BitMap.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/IntMap.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/IntMap.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/LongMap.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/LongMap.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/package-info.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/bitMap/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/AbstractFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/AbstractFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/DefaultFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/DefaultFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/ELFFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/ELFFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/FNVFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/FNVFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/FuncFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/FuncFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/HfFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/HfFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/HfIpFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/HfIpFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/JSFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/JSFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/PJWFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/PJWFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/RSFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/RSFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/SDBMFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/SDBMFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/TianlFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/TianlFilter.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/package-info.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/filter/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/package-info.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-bloomFilter/src/test/java/cn/hutool/bloomfilter/BitMapBloomFilterTest.java b/hutool-bloomFilter/src/test/java/cn/hutool/bloomfilter/BitMapBloomFilterTest.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/Cache.java b/hutool-cache/src/main/java/cn/hutool/cache/Cache.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/CacheListener.java b/hutool-cache/src/main/java/cn/hutool/cache/CacheListener.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/CacheUtil.java b/hutool-cache/src/main/java/cn/hutool/cache/CacheUtil.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/GlobalPruneTimer.java b/hutool-cache/src/main/java/cn/hutool/cache/GlobalPruneTimer.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/file/AbstractFileCache.java b/hutool-cache/src/main/java/cn/hutool/cache/file/AbstractFileCache.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/file/LFUFileCache.java b/hutool-cache/src/main/java/cn/hutool/cache/file/LFUFileCache.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/file/LRUFileCache.java b/hutool-cache/src/main/java/cn/hutool/cache/file/LRUFileCache.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/file/package-info.java b/hutool-cache/src/main/java/cn/hutool/cache/file/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/AbstractCache.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/AbstractCache.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/CacheObj.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/CacheObj.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/CacheObjIterator.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/CacheObjIterator.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/CacheValuesIterator.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/CacheValuesIterator.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/FIFOCache.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/FIFOCache.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/LFUCache.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/LFUCache.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/LRUCache.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/LRUCache.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/NoCache.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/NoCache.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/ReentrantCache.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/ReentrantCache.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/StampedCache.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/StampedCache.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/TimedCache.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/TimedCache.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/package-info.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/main/java/cn/hutool/cache/package-info.java b/hutool-cache/src/main/java/cn/hutool/cache/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/test/java/cn/hutool/cache/CacheConcurrentTest.java b/hutool-cache/src/test/java/cn/hutool/cache/CacheConcurrentTest.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/test/java/cn/hutool/cache/CacheTest.java b/hutool-cache/src/test/java/cn/hutool/cache/CacheTest.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/test/java/cn/hutool/cache/FileCacheTest.java b/hutool-cache/src/test/java/cn/hutool/cache/FileCacheTest.java old mode 100644 new mode 100755 diff --git a/hutool-cache/src/test/java/cn/hutool/cache/LRUCacheTest.java b/hutool-cache/src/test/java/cn/hutool/cache/LRUCacheTest.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/AbstractCaptcha.java b/hutool-captcha/src/main/java/cn/hutool/captcha/AbstractCaptcha.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/CaptchaUtil.java b/hutool-captcha/src/main/java/cn/hutool/captcha/CaptchaUtil.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/CircleCaptcha.java b/hutool-captcha/src/main/java/cn/hutool/captcha/CircleCaptcha.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/GifCaptcha.java b/hutool-captcha/src/main/java/cn/hutool/captcha/GifCaptcha.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/ICaptcha.java b/hutool-captcha/src/main/java/cn/hutool/captcha/ICaptcha.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/LineCaptcha.java b/hutool-captcha/src/main/java/cn/hutool/captcha/LineCaptcha.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/ShearCaptcha.java b/hutool-captcha/src/main/java/cn/hutool/captcha/ShearCaptcha.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/AbstractGenerator.java b/hutool-captcha/src/main/java/cn/hutool/captcha/generator/AbstractGenerator.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/CodeGenerator.java b/hutool-captcha/src/main/java/cn/hutool/captcha/generator/CodeGenerator.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/MathGenerator.java b/hutool-captcha/src/main/java/cn/hutool/captcha/generator/MathGenerator.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/RandomGenerator.java b/hutool-captcha/src/main/java/cn/hutool/captcha/generator/RandomGenerator.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/generator/package-info.java b/hutool-captcha/src/main/java/cn/hutool/captcha/generator/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/main/java/cn/hutool/captcha/package-info.java b/hutool-captcha/src/main/java/cn/hutool/captcha/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java b/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaUtilTest.java b/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-captcha/src/test/java/cn/hutool/captcha/GeneratorTest.java b/hutool-captcha/src/test/java/cn/hutool/captcha/GeneratorTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java b/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java b/hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java b/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java b/hutool-core/src/main/java/cn/hutool/core/codec/PercentCodec.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java b/hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/BaseFieldComparator.java b/hutool-core/src/main/java/cn/hutool/core/comparator/BaseFieldComparator.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java b/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java b/hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/CheckedUtil.java b/hutool-core/src/main/java/cn/hutool/core/exceptions/CheckedUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/img/BackgroundRemoval.java b/hutool-core/src/main/java/cn/hutool/core/img/BackgroundRemoval.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/img/FontUtil.java b/hutool-core/src/main/java/cn/hutool/core/img/FontUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/img/GraphicsUtil.java b/hutool-core/src/main/java/cn/hutool/core/img/GraphicsUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/img/Img.java b/hutool-core/src/main/java/cn/hutool/core/img/Img.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java b/hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/img/ScaleType.java b/hutool-core/src/main/java/cn/hutool/core/img/ScaleType.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/img/gif/AnimatedGifEncoder.java b/hutool-core/src/main/java/cn/hutool/core/img/gif/AnimatedGifEncoder.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/img/gif/GifDecoder.java b/hutool-core/src/main/java/cn/hutool/core/img/gif/GifDecoder.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/img/gif/LZWEncoder.java b/hutool-core/src/main/java/cn/hutool/core/img/gif/LZWEncoder.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/img/gif/NeuQuant.java b/hutool-core/src/main/java/cn/hutool/core/img/gif/NeuQuant.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/img/gif/package-info.java b/hutool-core/src/main/java/cn/hutool/core/img/gif/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/img/package-info.java b/hutool-core/src/main/java/cn/hutool/core/img/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Checksum.java b/hutool-core/src/main/java/cn/hutool/core/io/checksum/crc16/CRC16Checksum.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileCopier.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileCopier.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/UrlResource.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/UrlResource.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchServer.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java b/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ConsistentHash.java b/hutool-core/src/main/java/cn/hutool/core/lang/ConsistentHash.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java b/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Editor.java b/hutool-core/src/main/java/cn/hutool/core/lang/Editor.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Filter.java b/hutool-core/src/main/java/cn/hutool/core/lang/Filter.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Matcher.java b/hutool-core/src/main/java/cn/hutool/core/lang/Matcher.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ObjectId.java b/hutool-core/src/main/java/cn/hutool/core/lang/ObjectId.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ParameterizedTypeImpl.java b/hutool-core/src/main/java/cn/hutool/core/lang/ParameterizedTypeImpl.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Replacer.java b/hutool-core/src/main/java/cn/hutool/core/lang/Replacer.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java b/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java index ba49e1e99..4a60648ad 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java @@ -6,8 +6,6 @@ import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import java.util.Collection; -import java.util.HashSet; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java b/hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/TypeReference.java b/hutool-core/src/main/java/cn/hutool/core/lang/TypeReference.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/UUID.java b/hutool-core/src/main/java/cn/hutool/core/lang/UUID.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Validator.java b/hutool-core/src/main/java/cn/hutool/core/lang/Validator.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java b/hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java b/hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectIdGenerator.java b/hutool-core/src/main/java/cn/hutool/core/lang/generator/ObjectIdGenerator.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/SnowflakeGenerator.java b/hutool-core/src/main/java/cn/hutool/core/lang/generator/SnowflakeGenerator.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/UUIDGenerator.java b/hutool-core/src/main/java/cn/hutool/core/lang/generator/UUIDGenerator.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/hash/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/hash/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/intern/Interner.java b/hutool-core/src/main/java/cn/hutool/core/lang/intern/Interner.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/intern/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/intern/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyFunLoader.java b/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyFunLoader.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/Node.java b/hutool-core/src/main/java/cn/hutool/core/lang/tree/Node.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/Tree.java b/hutool-core/src/main/java/cn/hutool/core/lang/tree/Tree.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeBuilder.java b/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeBuilder.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeNode.java b/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeNode.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeNodeConfig.java b/hutool-core/src/main/java/cn/hutool/core/lang/tree/TreeNodeConfig.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/tree/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/parser/DefaultNodeParser.java b/hutool-core/src/main/java/cn/hutool/core/lang/tree/parser/DefaultNodeParser.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/parser/NodeParser.java b/hutool-core/src/main/java/cn/hutool/core/lang/tree/parser/NodeParser.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java b/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java b/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java b/hutool-core/src/main/java/cn/hutool/core/net/URLEncoder.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/DesktopUtil.java b/hutool-core/src/main/java/cn/hutool/core/swing/DesktopUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/RobotUtil.java b/hutool-core/src/main/java/cn/hutool/core/swing/RobotUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/ScreenUtil.java b/hutool-core/src/main/java/cn/hutool/core/swing/ScreenUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardListener.java b/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardListener.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardMonitor.java b/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardMonitor.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardUtil.java b/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ImageSelection.java b/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ImageSelection.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/StrClipboardListener.java b/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/StrClipboardListener.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/package-info.java b/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/package-info.java b/hutool-core/src/main/java/cn/hutool/core/swing/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java b/hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/UnicodeUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/UnicodeUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvBaseReader.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvBaseReader.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvConfig.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvConfig.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvData.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvData.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvParser.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvParser.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvReadConfig.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvReadConfig.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvReader.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvReader.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRow.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRow.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRowHandler.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvRowHandler.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriteConfig.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriteConfig.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/package-info.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/finder/CharMatcherFinder.java b/hutool-core/src/main/java/cn/hutool/core/text/finder/CharMatcherFinder.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/text/replacer/StrReplacer.java b/hutool-core/src/main/java/cn/hutool/core/text/replacer/StrReplacer.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/EscapeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/EscapeUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/HashUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/HashUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/HexUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/HexUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/IdUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/IdUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/RandomUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ReUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ReUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/img/FontUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/img/FontUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java b/hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/img/ImgUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/img/ImgUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java b/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java b/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeBuilderTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java b/hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardMonitorTest.java b/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardMonitorTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/swing/DesktopUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/swing/DesktopUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/swing/RobotUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/swing/RobotUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java b/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvParserTest.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvParserTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvReaderTest.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvReaderTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/thread/ConcurrencyTesterTest.java b/hutool-core/src/test/java/cn/hutool/core/thread/ConcurrencyTesterTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/util/EscapeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/EscapeUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/resources/test-compile/a/A.java b/hutool-core/src/test/resources/test-compile/a/A.java old mode 100644 new mode 100755 diff --git a/hutool-core/src/test/resources/test_bean.csv b/hutool-core/src/test/resources/test_bean.csv old mode 100644 new mode 100755 diff --git a/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java b/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java old mode 100644 new mode 100755 diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternUtil.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternUtil.java old mode 100644 new mode 100755 diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PartMatcher.java old mode 100644 new mode 100755 diff --git a/hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java b/hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java old mode 100644 new mode 100755 diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/AddAndRemoveMainTest.java b/hutool-cron/src/test/java/cn/hutool/cron/demo/AddAndRemoveMainTest.java old mode 100644 new mode 100755 diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob.java b/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob.java old mode 100644 new mode 100755 diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob2.java b/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob2.java old mode 100644 new mode 100755 diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternTest.java b/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternTest.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricEncryptor.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SM2.java b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/SM2.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java b/hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/Sign.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/mac/Mac.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/PBKDF2.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/PBKDF2.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricEncryptor.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java old mode 100644 new mode 100755 diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java b/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java b/hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/main/java/cn/hutool/db/Entity.java b/hutool-db/src/main/java/cn/hutool/db/Entity.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/main/java/cn/hutool/db/ThreadLocalConnection.java b/hutool-db/src/main/java/cn/hutool/db/ThreadLocalConnection.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java b/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/Column.java b/hutool-db/src/main/java/cn/hutool/db/meta/Column.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java b/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java b/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java b/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/test/java/cn/hutool/db/OracleTest.java b/hutool-db/src/test/java/cn/hutool/db/OracleTest.java old mode 100644 new mode 100755 diff --git a/hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java b/hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java old mode 100644 new mode 100755 diff --git a/hutool-dfa/src/main/java/cn/hutool/dfa/FoundWord.java b/hutool-dfa/src/main/java/cn/hutool/dfa/FoundWord.java old mode 100644 new mode 100755 diff --git a/hutool-dfa/src/main/java/cn/hutool/dfa/SensitiveProcessor.java b/hutool-dfa/src/main/java/cn/hutool/dfa/SensitiveProcessor.java old mode 100644 new mode 100755 diff --git a/hutool-dfa/src/main/java/cn/hutool/dfa/SensitiveUtil.java b/hutool-dfa/src/main/java/cn/hutool/dfa/SensitiveUtil.java old mode 100644 new mode 100755 diff --git a/hutool-dfa/src/main/java/cn/hutool/dfa/StopChar.java b/hutool-dfa/src/main/java/cn/hutool/dfa/StopChar.java old mode 100644 new mode 100755 diff --git a/hutool-dfa/src/main/java/cn/hutool/dfa/WordTree.java b/hutool-dfa/src/main/java/cn/hutool/dfa/WordTree.java old mode 100644 new mode 100755 diff --git a/hutool-dfa/src/main/java/cn/hutool/dfa/package-info.java b/hutool-dfa/src/main/java/cn/hutool/dfa/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-dfa/src/test/java/cn/hutool/dfa/DfaTest.java b/hutool-dfa/src/test/java/cn/hutool/dfa/DfaTest.java old mode 100644 new mode 100755 diff --git a/hutool-dfa/src/test/java/cn/hutool/dfa/SensitiveUtilTest.java b/hutool-dfa/src/test/java/cn/hutool/dfa/SensitiveUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/Archiver.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/SevenZArchiver.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Extractor.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/Extractor.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/SevenZExtractor.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/extractor/StreamExtractor.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityTemplate.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitTemplate.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java b/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java old mode 100644 new mode 100755 diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java old mode 100644 new mode 100755 diff --git a/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java b/hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java old mode 100644 new mode 100755 diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java b/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java old mode 100644 new mode 100755 diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java b/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java old mode 100644 new mode 100755 diff --git a/hutool-http/src/main/java/cn/hutool/http/ssl/SSLSocketFactoryBuilder.java b/hutool-http/src/main/java/cn/hutool/http/ssl/SSLSocketFactoryBuilder.java old mode 100644 new mode 100755 diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java b/hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java old mode 100644 new mode 100755 diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java b/hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java old mode 100644 new mode 100755 diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java b/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java old mode 100644 new mode 100755 diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentInfo.java b/hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentInfo.java old mode 100644 new mode 100755 diff --git a/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java b/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-http/src/test/java/cn/hutool/http/server/BlankServerTest.java b/hutool-http/src/test/java/cn/hutool/http/server/BlankServerTest.java old mode 100644 new mode 100755 diff --git a/hutool-http/src/test/java/cn/hutool/http/server/DocServerTest.java b/hutool-http/src/test/java/cn/hutool/http/server/DocServerTest.java old mode 100644 new mode 100755 diff --git a/hutool-json/src/main/java/cn/hutool/json/JSON.java b/hutool-json/src/main/java/cn/hutool/json/JSON.java old mode 100644 new mode 100755 diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONConfig.java b/hutool-json/src/main/java/cn/hutool/json/JSONConfig.java old mode 100644 new mode 100755 diff --git a/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java b/hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java old mode 100644 new mode 100755 diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java old mode 100644 new mode 100755 diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java old mode 100644 new mode 100755 diff --git a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java b/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/Claims.java b/hutool-jwt/src/main/java/cn/hutool/jwt/Claims.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java b/hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTException.java b/hutool-jwt/src/main/java/cn/hutool/jwt/JWTException.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTHeader.java b/hutool-jwt/src/main/java/cn/hutool/jwt/JWTHeader.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTPayload.java b/hutool-jwt/src/main/java/cn/hutool/jwt/JWTPayload.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTUtil.java b/hutool-jwt/src/main/java/cn/hutool/jwt/JWTUtil.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWTValidator.java b/hutool-jwt/src/main/java/cn/hutool/jwt/JWTValidator.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/RegisteredPayload.java b/hutool-jwt/src/main/java/cn/hutool/jwt/RegisteredPayload.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/package-info.java b/hutool-jwt/src/main/java/cn/hutool/jwt/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/AlgorithmUtil.java b/hutool-jwt/src/main/java/cn/hutool/jwt/signers/AlgorithmUtil.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/AsymmetricJWTSigner.java b/hutool-jwt/src/main/java/cn/hutool/jwt/signers/AsymmetricJWTSigner.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/HMacJWTSigner.java b/hutool-jwt/src/main/java/cn/hutool/jwt/signers/HMacJWTSigner.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSigner.java b/hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSigner.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSignerUtil.java b/hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSignerUtil.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/NoneJWTSigner.java b/hutool-jwt/src/main/java/cn/hutool/jwt/signers/NoneJWTSigner.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/package-info.java b/hutool-jwt/src/main/java/cn/hutool/jwt/signers/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTSignerTest.java b/hutool-jwt/src/test/java/cn/hutool/jwt/JWTSignerTest.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTTest.java b/hutool-jwt/src/test/java/cn/hutool/jwt/JWTTest.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTUtilTest.java b/hutool-jwt/src/test/java/cn/hutool/jwt/JWTUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTValidatorTest.java b/hutool-jwt/src/test/java/cn/hutool/jwt/JWTValidatorTest.java old mode 100644 new mode 100755 diff --git a/hutool-log/src/main/java/cn/hutool/log/Log.java b/hutool-log/src/main/java/cn/hutool/log/Log.java old mode 100644 new mode 100755 diff --git a/hutool-log/src/main/java/cn/hutool/log/StaticLog.java b/hutool-log/src/main/java/cn/hutool/log/StaticLog.java old mode 100644 new mode 100755 diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java b/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java old mode 100644 new mode 100755 diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java old mode 100644 new mode 100755 diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java old mode 100644 new mode 100755 diff --git a/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java old mode 100644 new mode 100755 diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java old mode 100644 new mode 100755 diff --git a/hutool-script/src/main/java/cn/hutool/script/FullSupportScriptEngine.java b/hutool-script/src/main/java/cn/hutool/script/FullSupportScriptEngine.java old mode 100644 new mode 100755 diff --git a/hutool-script/src/main/java/cn/hutool/script/JavaScriptEngine.java b/hutool-script/src/main/java/cn/hutool/script/JavaScriptEngine.java old mode 100644 new mode 100755 diff --git a/hutool-script/src/main/java/cn/hutool/script/ScriptRuntimeException.java b/hutool-script/src/main/java/cn/hutool/script/ScriptRuntimeException.java old mode 100644 new mode 100755 diff --git a/hutool-script/src/main/java/cn/hutool/script/package-info.java b/hutool-script/src/main/java/cn/hutool/script/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-script/src/test/java/cn/hutool/script/test/NashornDeepTest.java b/hutool-script/src/test/java/cn/hutool/script/test/NashornDeepTest.java old mode 100644 new mode 100755 diff --git a/hutool-script/src/test/java/cn/hutool/script/test/ScriptUtilTest.java b/hutool-script/src/test/java/cn/hutool/script/test/ScriptUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-script/src/test/resources/filter1.js b/hutool-script/src/test/resources/filter1.js old mode 100644 new mode 100755 diff --git a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java b/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java old mode 100644 new mode 100755 diff --git a/hutool-setting/src/main/java/cn/hutool/setting/profile/GlobalProfile.java b/hutool-setting/src/main/java/cn/hutool/setting/profile/GlobalProfile.java old mode 100644 new mode 100755 diff --git a/hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java b/hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java old mode 100644 new mode 100755 diff --git a/hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java b/hutool-setting/src/main/java/cn/hutool/setting/yaml/YamlUtil.java old mode 100644 new mode 100755 diff --git a/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java b/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java old mode 100644 new mode 100755 diff --git a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java b/hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java old mode 100644 new mode 100755 diff --git a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java b/hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java old mode 100644 new mode 100755 diff --git a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java b/hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java old mode 100644 new mode 100755 diff --git a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java b/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/HostInfo.java b/hutool-system/src/main/java/cn/hutool/system/HostInfo.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/JavaInfo.java b/hutool-system/src/main/java/cn/hutool/system/JavaInfo.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/JavaRuntimeInfo.java b/hutool-system/src/main/java/cn/hutool/system/JavaRuntimeInfo.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/JavaSpecInfo.java b/hutool-system/src/main/java/cn/hutool/system/JavaSpecInfo.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/JvmInfo.java b/hutool-system/src/main/java/cn/hutool/system/JvmInfo.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/JvmSpecInfo.java b/hutool-system/src/main/java/cn/hutool/system/JvmSpecInfo.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/OsInfo.java b/hutool-system/src/main/java/cn/hutool/system/OsInfo.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/RuntimeInfo.java b/hutool-system/src/main/java/cn/hutool/system/RuntimeInfo.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/SystemPropsKeys.java b/hutool-system/src/main/java/cn/hutool/system/SystemPropsKeys.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/SystemUtil.java b/hutool-system/src/main/java/cn/hutool/system/SystemUtil.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/UserInfo.java b/hutool-system/src/main/java/cn/hutool/system/UserInfo.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/oshi/CpuInfo.java b/hutool-system/src/main/java/cn/hutool/system/oshi/CpuInfo.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/oshi/CpuTicks.java b/hutool-system/src/main/java/cn/hutool/system/oshi/CpuTicks.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/oshi/OshiUtil.java b/hutool-system/src/main/java/cn/hutool/system/oshi/OshiUtil.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/oshi/package-info.java b/hutool-system/src/main/java/cn/hutool/system/oshi/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/main/java/cn/hutool/system/package-info.java b/hutool-system/src/main/java/cn/hutool/system/package-info.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/test/java/cn/hutool/system/OshiPrintTest.java b/hutool-system/src/test/java/cn/hutool/system/OshiPrintTest.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/test/java/cn/hutool/system/OshiTest.java b/hutool-system/src/test/java/cn/hutool/system/OshiTest.java old mode 100644 new mode 100755 diff --git a/hutool-system/src/test/java/cn/hutool/system/SystemUtilTest.java b/hutool-system/src/test/java/cn/hutool/system/SystemUtilTest.java old mode 100644 new mode 100755 From 2881062f3382f93a9fe6b47e1e732a5589429855 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 28 Apr 2022 17:30:55 +0800 Subject: [PATCH 09/21] add methods --- CHANGELOG.md | 2 ++ .../java/cn/hutool/core/bean/BeanUtil.java | 36 ++++++------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03c12e4f1..a7917c07f 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,11 @@ ### ❌不兼容特性 * 【extra 】 升级jakarta.validation-api到3.x，包名变更导致不能向下兼容 +* 【core 】 BeanUtil删除了beanToMap(Object)方法，因为有可变参数的方法，这个删除可能导致直接升级找不到方法，重新编译项目即可。 ### 🐣新特性 * 【core 】 Singleton增加部分方法（pr#609@Gitee） +* 【core 】 BeanUtil增加beanToMap重载（pr#2292@Github） ### 🐞Bug修复 * 【db 】 修复RedisDS无法设置maxWaitMillis问题（issue#I54TZ9@Gitee） diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java index 7c0d7cb4f..5b8e517c3 100755 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java @@ -24,8 +24,6 @@ import java.beans.PropertyEditorManager; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; @@ -608,38 +606,24 @@ public class BeanUtil { } // --------------------------------------------------------------------------------------------- beanToMap - /** - * 对象转Map，不进行驼峰转下划线，不忽略值为空的字段 - * - * @param bean bean对象 - * @return Map - */ - public static Map beanToMap(Object bean) { - return beanToMap(bean, false, false); - } - - - /** - * 将bean的部分属性转换成map + * 将bean的部分属性转换成map
+ * 可选拷贝哪些属性值，默认是不忽略值为{@code null}的值的。 * * @param bean bean - * @param properties 属性值 + * @param properties 需要拷贝的属性值，{@code null}或空表示拷贝所有值 * @return Map + * @since 5.8.0 */ public static Map beanToMap(Object bean, String... properties) { - if (ArrayUtil.isEmpty(properties)) { - return Collections.emptyMap(); + Editor keyEditor = null; + if(ArrayUtil.isNotEmpty(properties)){ + final Set propertiesSet = CollUtil.set(false, properties); + keyEditor = property -> propertiesSet.contains(property) ? property : null; } - Set propertiesSet = Arrays.stream(properties).collect(Collectors.toSet()); + // 指明了要复制的属性 所以不忽略null值 - return beanToMap(bean, new HashMap<>(properties.length), false, - property -> { - if (!propertiesSet.contains(property)) { - return null; - } - return property; - }); + return beanToMap(bean, new LinkedHashMap<>(properties.length, 1), false, keyEditor); } /** From c9064c2334fd50bbea907b76333e214d44fb3d3d Mon Sep 17 00:00:00 2001 From: Looly Date: Sat, 30 Apr 2022 10:46:17 +0800 Subject: [PATCH 10/21] ad test --- .../test/java/cn/hutool/core/date/DateUtilTest.java | 11 +++++++++++ .../hutool/poi/excel/cell/setters/package-info.java | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/package-info.java diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java index bdabd60d8..3984bf599 100755 --- a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java @@ -1064,6 +1064,17 @@ public class DateUtilTest { Assert.assertFalse(DateUtil.isOverlap(startTime,endTime,realStartTime1,realEndTime1)); } + @Test + public void isOverlapTest2() { + DateTime oneStartTime = DateUtil.parseDate("2021-02-01"); + DateTime oneEndTime = DateUtil.parseDate("2022-06-30"); + + DateTime oneStartTime2 = DateUtil.parseDate("2019-04-05"); + DateTime oneEndTime2 = DateUtil.parseDate("2021-04-05"); + + Assert.assertTrue(DateUtil.isOverlap(oneStartTime, oneEndTime, oneStartTime2, oneEndTime2)); + } + @Test public void isInTest(){ String sourceStr = "2022-04-19 00:00:00"; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/package-info.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/package-info.java new file mode 100644 index 000000000..b0d905b77 --- /dev/null +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/package-info.java @@ -0,0 +1,6 @@ +/** + * Excel中单元格设置相关类，一些{@link cn.hutool.poi.excel.cell.CellSetter}的实现类 + * + * @author looly + */ +package cn.hutool.poi.excel.cell.setters; From 8b98cb3e90ae7d5b5ef57ea0ce555466e0c66bda Mon Sep 17 00:00:00 2001 From: Looly Date: Sat, 30 Apr 2022 11:40:20 +0800 Subject: [PATCH 11/21] add test --- .../test/java/cn/hutool/core/net/RFC3986Test.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java b/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java index 781b78001..e549e9a9f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java +++ b/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java @@ -1,9 +1,13 @@ package cn.hutool.core.net; +import cn.hutool.core.codec.PercentCodec; import cn.hutool.core.util.CharsetUtil; import org.junit.Assert; import org.junit.Test; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + public class RFC3986Test { @Test @@ -26,4 +30,12 @@ public class RFC3986Test { String encode = RFC3986.QUERY_PARAM_VALUE.encode("a=%25", CharsetUtil.CHARSET_UTF_8, '%'); Assert.assertEquals("a=%25", encode); } + + @Test + public void encodeAllTest() throws UnsupportedEncodingException { + String toVerifyText = "行吧行吧 cargo:1.0,\"Deta-ils:[{"; + final String encode = PercentCodec.of(RFC3986.UNRESERVED).setEncodeSpaceAsPlus(true).encode(toVerifyText, CharsetUtil.CHARSET_UTF_8); + final String encodeJdk = URLEncoder.encode(toVerifyText, "UTF-8"); + Assert.assertEquals(encode, encodeJdk); + } } From 2c00b09ce8e02ddd697b2ff39add13691f2ff048 Mon Sep 17 00:00:00 2001 From: Husky <2466896229@qq.com> Date: Sat, 30 Apr 2022 18:32:00 +0800 Subject: [PATCH 12/21] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=B3=A8=E9=87=8A=202=E3=80=81=E5=A2=9E=E5=8A=A0isMer?= =?UTF-8?q?gedRegion=E7=A9=BA=E6=8C=87=E9=92=88=E5=88=A4=E6=96=AD=203?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96CellRangeAddress?= =?UTF-8?q?=E6=96=B9=E6=B3=95=204=E3=80=81=E5=A2=9E=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E6=96=B9=E6=B3=95(=E7=9B=AE=E5=89=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=85=88=E5=90=88=E5=B9=B6=E5=86=8D=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F,=E4=BD=86=E6=98=AF=E6=9C=89=E7=A7=8D?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=BA=E8=AF=A5=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E6=9C=AC=E6=9D=A5=E5=B0=B1=E6=98=AF=E5=90=88=E5=B9=B6=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=A0=BC,=E5=8F=AA=E9=9C=80=E8=A6=81=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=A0=B7=E5=BC=8F)=205=E3=80=81=E6=8F=90=E5=8F=96?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=A0=B9=E6=8D=AEcellStyle=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/hutool/poi/excel/cell/CellUtil.java | 109 +++++++++++++++--- 1 file changed, 90 insertions(+), 19 deletions(-) diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java index f4747bae3..1c7b59405 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java @@ -199,7 +199,7 @@ public class CellUtil { * * @param row Excel表的行 * @param cellIndex 列号 - * @return {@link Row} + * @return {@link Cell} * @since 5.5.0 */ public static Cell getCell(Row row, int cellIndex) { @@ -218,7 +218,7 @@ public class CellUtil { * * @param row Excel表的行 * @param cellIndex 列号 - * @return {@link Row} + * @return {@link Cell} * @since 4.0.2 */ public static Cell getOrCreateCell(Row row, int cellIndex) { @@ -265,18 +265,78 @@ public class CellUtil { * @return 是否是合并单元格 */ public static boolean isMergedRegion(Sheet sheet, int x, int y) { - final int sheetMergeCount = sheet.getNumMergedRegions(); - CellRangeAddress ca; - for (int i = 0; i < sheetMergeCount; i++) { - ca = sheet.getMergedRegion(i); - if (y >= ca.getFirstRow() && y <= ca.getLastRow() - && x >= ca.getFirstColumn() && x <= ca.getLastColumn()) { - return true; + if (sheet != null) { + final int sheetMergeCount = sheet.getNumMergedRegions(); + CellRangeAddress ca; + for (int i = 0; i < sheetMergeCount; i++) { + ca = sheet.getMergedRegion(i); + if (y >= ca.getFirstRow() && y <= ca.getLastRow() + && x >= ca.getFirstColumn() && x <= ca.getLastColumn()) { + return true; + } } } return false; } + /** + * 获取合并单元格{@link CellRangeAddress}，如果不是返回null + * + * @param sheet {@link Sheet} + * @param locationRef 单元格地址标识符，例如A11，B5 + * @return {@link CellRangeAddress} + */ + public static CellRangeAddress getCellRangeAddress(Sheet sheet, String locationRef) { + final CellLocation cellLocation = ExcelUtil.toLocation(locationRef); + return getCellRangeAddress(sheet, cellLocation.getX(), cellLocation.getY()); + } + + /** + * 获取合并单元格{@link CellRangeAddress}，如果不是返回null + * + * @param cell {@link Cell} + * @return {@link CellRangeAddress} + */ + public static CellRangeAddress getCellRangeAddress(Cell cell) { + return getCellRangeAddress(cell.getSheet(), cell.getColumnIndex(), cell.getRowIndex()); + } + + /** + * 获取合并单元格{@link CellRangeAddress}，如果不是返回null + * + * @param sheet {@link Sheet} + * @param x 列号，从0开始 + * @param y 行号，从0开始 + * @return {@link CellRangeAddress} + */ + public static CellRangeAddress getCellRangeAddress(Sheet sheet, int x, int y) { + if (sheet != null) { + final int sheetMergeCount = sheet.getNumMergedRegions(); + CellRangeAddress ca; + for (int i = 0; i < sheetMergeCount; i++) { + ca = sheet.getMergedRegion(i); + if (y >= ca.getFirstRow() && y <= ca.getLastRow() + && x >= ca.getFirstColumn() && x <= ca.getLastColumn()) { + return ca; + } + } + } + return null; + } + + /** + * 设置合并单元格样式，如果不是则不设置 + * + * @param cell {@link Cell} + * @param cellStyle {@link CellStyle} + */ + public static void setMergedRegionStyle(Cell cell, CellStyle cellStyle) { + CellRangeAddress cellRangeAddress = getCellRangeAddress(cell); + if (cellRangeAddress != null) { + setMergeCellStyle(cellStyle, cellRangeAddress, cell.getSheet()); + } + } + /** * 合并单元格，可以根据设置的值来合并行和列 * @@ -310,16 +370,7 @@ public class CellUtil { lastColumn // last column (0-based) ); - if (null != cellStyle) { - RegionUtil.setBorderTop(cellStyle.getBorderTop(), cellRangeAddress, sheet); - RegionUtil.setBorderRight(cellStyle.getBorderRight(), cellRangeAddress, sheet); - RegionUtil.setBorderBottom(cellStyle.getBorderBottom(), cellRangeAddress, sheet); - RegionUtil.setBorderLeft(cellStyle.getBorderLeft(), cellRangeAddress, sheet); - RegionUtil.setTopBorderColor(cellStyle.getTopBorderColor(),cellRangeAddress,sheet); - RegionUtil.setRightBorderColor(cellStyle.getRightBorderColor(),cellRangeAddress,sheet); - RegionUtil.setLeftBorderColor(cellStyle.getLeftBorderColor(),cellRangeAddress,sheet); - RegionUtil.setBottomBorderColor(cellStyle.getBottomBorderColor(),cellRangeAddress,sheet); - } + setMergeCellStyle(cellStyle, cellRangeAddress, sheet); return sheet.addMergedRegion(cellRangeAddress); } @@ -435,5 +486,25 @@ public class CellUtil { } return null; } + + /** + * 根据{@link CellStyle}设置合并单元格边框样式 + * + * @param cellStyle {@link CellStyle} + * @param cellRangeAddress {@link CellRangeAddress} + * @param sheet {@link Sheet} + */ + private static void setMergeCellStyle(CellStyle cellStyle, CellRangeAddress cellRangeAddress, Sheet sheet) { + if (null != cellStyle) { + RegionUtil.setBorderTop(cellStyle.getBorderTop(), cellRangeAddress, sheet); + RegionUtil.setBorderRight(cellStyle.getBorderRight(), cellRangeAddress, sheet); + RegionUtil.setBorderBottom(cellStyle.getBorderBottom(), cellRangeAddress, sheet); + RegionUtil.setBorderLeft(cellStyle.getBorderLeft(), cellRangeAddress, sheet); + RegionUtil.setTopBorderColor(cellStyle.getTopBorderColor(), cellRangeAddress, sheet); + RegionUtil.setRightBorderColor(cellStyle.getRightBorderColor(), cellRangeAddress, sheet); + RegionUtil.setLeftBorderColor(cellStyle.getLeftBorderColor(), cellRangeAddress, sheet); + RegionUtil.setBottomBorderColor(cellStyle.getBottomBorderColor(), cellRangeAddress, sheet); + } + } // -------------------------------------------------------------------------------------------------------------- Private method end } From c3c4c87bea33229e3c6dcce9cbfa8a2322637580 Mon Sep 17 00:00:00 2001 From: mo_chou_555 <7496450+mo_chou_555@user.noreply.gitee.com> Date: Tue, 3 May 2022 12:24:41 +0800 Subject: [PATCH 13/21] test --- Test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Test.txt diff --git a/Test.txt b/Test.txt new file mode 100644 index 000000000..e69de29bb From 50d77194c80a20d0d22c7a6d4510cbca1b08326d Mon Sep 17 00:00:00 2001 From: mo_chou_555 <7496450+mo_chou_555@user.noreply.gitee.com> Date: Tue, 3 May 2022 12:25:58 +0800 Subject: [PATCH 14/21] remove test --- Test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Test.txt diff --git a/Test.txt b/Test.txt deleted file mode 100644 index e69de29bb..000000000 From 2a9eaa6a7fcd9b304eaea4763843c89d072189b2 Mon Sep 17 00:00:00 2001 From: mo_chou_555 <7496450+mo_chou_555@user.noreply.gitee.com> Date: Tue, 3 May 2022 12:31:55 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Assert=E7=9A=84equals?= =?UTF-8?q?=E5=8F=8AnotEquals?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/hutool/core/lang/Assert.java | 94 +++++++++++++++++++ .../java/cn/hutool/core/lang/AssertTest.java | 29 +++++- 2 files changed, 121 insertions(+), 2 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java b/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java index a33b2a4ed..b0b347c02 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java @@ -3,6 +3,7 @@ package cn.hutool.core.lang; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import java.util.Map; @@ -1003,6 +1004,99 @@ public class Assert { return value; } + /** + * 断言两个对象是否不相等,如果两个对象相等 抛出IllegalArgumentException 异常 + * 
+	 *   Assert.notEquals(obj1,obj2);
+	 *
+ * + * @param obj1 对象1 + * @param obj2 对象2 + * @throws IllegalArgumentException obj1 must be not equals obj2 + */ + public static void notEquals(Object obj1, Object obj2) { + notEquals(obj1, obj2, "({}) must be not equals ({})", obj1, obj2); + } + + /** + * 断言两个对象是否不相等,如果两个对象相等 抛出IllegalArgumentException 异常 + * 
+	 *   Assert.notEquals(obj1,obj2,"obj1 must be not equals obj2");
+	 *
+ * + * @param obj1 对象1 + * @param obj2 对象2 + * @param errorMsgTemplate 异常信息模板，类似于"aa{}bb{}cc" + * @param params 异常信息参数，用于替换"{}"占位符 + * @throws IllegalArgumentException obj1 must be not equals obj2 + */ + public static void notEquals(Object obj1, Object obj2, String errorMsgTemplate, Object... params) throws IllegalArgumentException { + notEquals(obj1, obj2, () -> new IllegalArgumentException(StrUtil.format(errorMsgTemplate, params))); + } + + /** + * 断言两个对象是否不相等,如果两个对象相等,抛出指定类型异常,并使用指定的函数获取错误信息返回 + * + * @param obj1 对象1 + * @param obj2 对象2 + * @param errorSupplier 错误抛出异常附带的消息生产接口 + * @param 异常类型 + * @throws X obj1 must be not equals obj2 + */ + public static void notEquals(Object obj1, Object obj2, Supplier errorSupplier) throws X { + if (ObjectUtil.equals(obj1, obj2)) { + throw errorSupplier.get(); + } + } + // ----------------------------------------------------------------------------------------------------------- Check not equals + + /** + * 断言两个对象是否相等,如果两个对象不相等 抛出IllegalArgumentException 异常 + * 
+	 *   Assert.isEquals(obj1,obj2);
+	 *
+ * + * @param obj1 对象1 + * @param obj2 对象2 + * @throws IllegalArgumentException obj1 must be equals obj2 + */ + public static void isEquals(Object obj1, Object obj2) { + isEquals(obj1, obj2, "({}) must be equals ({})", obj1, obj2); + } + + /** + * 断言两个对象是否相等,如果两个对象不相等 抛出IllegalArgumentException 异常 + * 
+	 *   Assert.isEquals(obj1,obj2,"obj1 must be equals obj2");
+	 *
+ * + * @param obj1 对象1 + * @param obj2 对象2 + * @param errorMsgTemplate 异常信息模板，类似于"aa{}bb{}cc" + * @param params 异常信息参数，用于替换"{}"占位符 + * @throws IllegalArgumentException obj1 must be equals obj2 + */ + public static void isEquals(Object obj1, Object obj2, String errorMsgTemplate, Object... params) throws IllegalArgumentException { + isEquals(obj1, obj2, () -> new IllegalArgumentException(StrUtil.format(errorMsgTemplate, params))); + } + + /** + * 断言两个对象是否相等,如果两个对象不相等,抛出指定类型异常,并使用指定的函数获取错误信息返回 + * + * @param obj1 对象1 + * @param obj2 对象2 + * @param errorSupplier 错误抛出异常附带的消息生产接口 + * @param 异常类型 + * @throws X obj1 must be equals obj2 + */ + public static void isEquals(Object obj1, Object obj2, Supplier errorSupplier) throws X { + if (ObjectUtil.notEqual(obj1, obj2)) { + throw errorSupplier.get(); + } + } + + // ----------------------------------------------------------------------------------------------------------- Check is equals + // -------------------------------------------------------------------------------------------------------------------------------------------- Private method start /** diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java index e20ef6e96..be095d835 100755 --- a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java @@ -1,9 +1,10 @@ package cn.hutool.core.lang; +import cn.hutool.core.util.StrUtil; import org.junit.Test; public class AssertTest { - + @Test public void isNullTest(){ String a = null; @@ -33,6 +34,30 @@ public class AssertTest { public void isTrueTest3() { int i = -1; //noinspection ConstantConditions - Assert.isTrue(i > 0, ()-> new IndexOutOfBoundsException("relation message to return")); + Assert.isTrue(i > 0, () -> new IndexOutOfBoundsException("relation message to return")); } + + @Test + public void isEqualsTest() { + //String a="ab"; + //final String b = new String("abc"); + String a = null; + final String b = null; + Assert.isEquals(a, b); + Assert.isEquals(a, b, "{}不等于{}", a, b); + Assert.isEquals(a, b, () -> new RuntimeException(StrUtil.format("{}和{}不相等", a, b))); + } + + @Test + public void notEqualsTest() { + //String c="19"; + //final String d = new String("19"); + String c = null; + final String d = null; + //Assert.notEquals(c,d); + //Assert.notEquals(c,d,"{}等于{}",c,d); + Assert.notEquals(c, d, () -> new RuntimeException(StrUtil.format("{}和{}相等", c, d))); + + } + } From 56b0c907e92a0a54c2318045226a50b5a71644e9 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 5 May 2022 09:20:02 +0800 Subject: [PATCH 16/21] add methods --- CHANGELOG.md | 3 ++- .../src/main/java/cn/hutool/core/lang/Assert.java | 10 +++++----- .../src/test/java/cn/hutool/core/lang/AssertTest.java | 10 +++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7917c07f..0e0fd1c54 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------------------------------------- -# 5.8.0.M5 (2022-04-28) +# 5.8.0.M5 (2022-05-05) ### ❌不兼容特性 * 【extra 】 升级jakarta.validation-api到3.x，包名变更导致不能向下兼容 @@ -12,6 +12,7 @@ ### 🐣新特性 * 【core 】 Singleton增加部分方法（pr#609@Gitee） * 【core 】 BeanUtil增加beanToMap重载（pr#2292@Github） +* 【core 】 Assert增加对应的equals及notEquals方法（pr#612@Gitee） ### 🐞Bug修复 * 【db 】 修复RedisDS无法设置maxWaitMillis问题（issue#I54TZ9@Gitee） diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java b/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java index b0b347c02..ec0b69b27 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Assert.java @@ -1060,8 +1060,8 @@ public class Assert { * @param obj2 对象2 * @throws IllegalArgumentException obj1 must be equals obj2 */ - public static void isEquals(Object obj1, Object obj2) { - isEquals(obj1, obj2, "({}) must be equals ({})", obj1, obj2); + public static void equals(Object obj1, Object obj2) { + equals(obj1, obj2, "({}) must be equals ({})", obj1, obj2); } /** @@ -1076,8 +1076,8 @@ public class Assert { * @param params 异常信息参数，用于替换"{}"占位符 * @throws IllegalArgumentException obj1 must be equals obj2 */ - public static void isEquals(Object obj1, Object obj2, String errorMsgTemplate, Object... params) throws IllegalArgumentException { - isEquals(obj1, obj2, () -> new IllegalArgumentException(StrUtil.format(errorMsgTemplate, params))); + public static void equals(Object obj1, Object obj2, String errorMsgTemplate, Object... params) throws IllegalArgumentException { + equals(obj1, obj2, () -> new IllegalArgumentException(StrUtil.format(errorMsgTemplate, params))); } /** @@ -1089,7 +1089,7 @@ public class Assert { * @param 异常类型 * @throws X obj1 must be equals obj2 */ - public static void isEquals(Object obj1, Object obj2, Supplier errorSupplier) throws X { + public static void equals(Object obj1, Object obj2, Supplier errorSupplier) throws X { if (ObjectUtil.notEqual(obj1, obj2)) { throw errorSupplier.get(); } diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java index be095d835..7ddde8d47 100755 --- a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java @@ -38,14 +38,14 @@ public class AssertTest { } @Test - public void isEqualsTest() { + public void equalsTest() { //String a="ab"; //final String b = new String("abc"); String a = null; final String b = null; - Assert.isEquals(a, b); - Assert.isEquals(a, b, "{}不等于{}", a, b); - Assert.isEquals(a, b, () -> new RuntimeException(StrUtil.format("{}和{}不相等", a, b))); + Assert.equals(a, b); + Assert.equals(a, b, "{}不等于{}", a, b); + Assert.equals(a, b, () -> new RuntimeException(StrUtil.format("{}和{}不相等", a, b))); } @Test @@ -53,7 +53,7 @@ public class AssertTest { //String c="19"; //final String d = new String("19"); String c = null; - final String d = null; + final String d = "null"; //Assert.notEquals(c,d); //Assert.notEquals(c,d,"{}等于{}",c,d); Assert.notEquals(c, d, () -> new RuntimeException(StrUtil.format("{}和{}相等", c, d))); From e05a3b19e0faa3f048eaf217948a8b7be2dd0586 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 5 May 2022 11:16:39 +0800 Subject: [PATCH 17/21] add methods --- CHANGELOG.md | 1 + .../java/cn/hutool/core/util/ObjectUtil.java | 16 ++++++++-------- .../java/cn/hutool/poi/excel/cell/CellUtil.java | 13 ++++++++----- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e0fd1c54..61c13f66d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ * 【core 】 Singleton增加部分方法（pr#609@Gitee） * 【core 】 BeanUtil增加beanToMap重载（pr#2292@Github） * 【core 】 Assert增加对应的equals及notEquals方法（pr#612@Gitee） +* 【core 】 Assert增加对应的equals及notEquals方法（pr#612@Gitee） ### 🐞Bug修复 * 【db 】 修复RedisDS无法设置maxWaitMillis问题（issue#I54TZ9@Gitee） diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java index 8fe082b43..00c3454de 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java @@ -104,7 +104,7 @@ public class ObjectUtil { int count; if (obj instanceof Iterator) { - Iterator iter = (Iterator) obj; + final Iterator iter = (Iterator) obj; count = 0; while (iter.hasNext()) { count++; @@ -113,7 +113,7 @@ public class ObjectUtil { return count; } if (obj instanceof Enumeration) { - Enumeration enumeration = (Enumeration) obj; + final Enumeration enumeration = (Enumeration) obj; count = 0; while (enumeration.hasMoreElements()) { count++; @@ -161,9 +161,9 @@ public class ObjectUtil { } if (obj instanceof Iterator) { - Iterator iter = (Iterator) obj; + final Iterator iter = (Iterator) obj; while (iter.hasNext()) { - Object o = iter.next(); + final Object o = iter.next(); if (equal(o, element)) { return true; } @@ -171,9 +171,9 @@ public class ObjectUtil { return false; } if (obj instanceof Enumeration) { - Enumeration enumeration = (Enumeration) obj; + final Enumeration enumeration = (Enumeration) obj; while (enumeration.hasMoreElements()) { - Object o = enumeration.nextElement(); + final Object o = enumeration.nextElement(); if (equal(o, element)) { return true; } @@ -181,9 +181,9 @@ public class ObjectUtil { return false; } if (obj.getClass().isArray() == true) { - int len = Array.getLength(obj); + final int len = Array.getLength(obj); for (int i = 0; i < len; i++) { - Object o = Array.get(obj, i); + final Object o = Array.get(obj, i); if (equal(o, element)) { return true; } diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java index 1c7b59405..8c4f4d4cf 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java @@ -105,7 +105,7 @@ public class CellUtil { cellType = cell.getCellType(); } - Object value; + final Object value; switch (cellType) { case NUMERIC: value = new NumericCellValue(cell).getValue(); @@ -206,7 +206,7 @@ public class CellUtil { if (null == row) { return null; } - Cell cell = row.getCell(cellIndex); + final Cell cell = row.getCell(cellIndex); if (null == cell) { return new NullCell(row, cellIndex); } @@ -262,7 +262,7 @@ public class CellUtil { * @param sheet {@link Sheet} * @param x 列号，从0开始 * @param y 行号，从0开始 - * @return 是否是合并单元格 + * @return 是否是合并单元格，如果提供的sheet为{@code null}，返回{@code false} */ public static boolean isMergedRegion(Sheet sheet, int x, int y) { if (sheet != null) { @@ -285,6 +285,7 @@ public class CellUtil { * @param sheet {@link Sheet} * @param locationRef 单元格地址标识符，例如A11，B5 * @return {@link CellRangeAddress} + * @since 5.8.0 */ public static CellRangeAddress getCellRangeAddress(Sheet sheet, String locationRef) { final CellLocation cellLocation = ExcelUtil.toLocation(locationRef); @@ -296,6 +297,7 @@ public class CellUtil { * * @param cell {@link Cell} * @return {@link CellRangeAddress} + * @since 5.8.0 */ public static CellRangeAddress getCellRangeAddress(Cell cell) { return getCellRangeAddress(cell.getSheet(), cell.getColumnIndex(), cell.getRowIndex()); @@ -308,6 +310,7 @@ public class CellUtil { * @param x 列号，从0开始 * @param y 行号，从0开始 * @return {@link CellRangeAddress} + * @since 5.8.0 */ public static CellRangeAddress getCellRangeAddress(Sheet sheet, int x, int y) { if (sheet != null) { @@ -331,7 +334,7 @@ public class CellUtil { * @param cellStyle {@link CellStyle} */ public static void setMergedRegionStyle(Cell cell, CellStyle cellStyle) { - CellRangeAddress cellRangeAddress = getCellRangeAddress(cell); + final CellRangeAddress cellRangeAddress = getCellRangeAddress(cell); if (cellRangeAddress != null) { setMergeCellStyle(cellStyle, cellRangeAddress, cell.getSheet()); } @@ -457,7 +460,7 @@ public class CellUtil { anchor.setRow1(cell.getRowIndex()); anchor.setRow2(cell.getRowIndex() + 2); } - Comment comment = drawing.createCellComment(anchor); + final Comment comment = drawing.createCellComment(anchor); comment.setString(factory.createRichTextString(commentText)); comment.setAuthor(StrUtil.nullToEmpty(commentAuthor)); cell.setCellComment(comment); From 34704bd3267e9d3bc10e7e2ed4a5721299726530 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 5 May 2022 11:32:54 +0800 Subject: [PATCH 18/21] add test --- .../main/java/cn/hutool/db/meta/MetaUtil.java | 26 +++++++++---------- .../java/cn/hutool/db/meta/MetaUtilTest.java | 18 ++++++++++--- .../java/cn/hutool/dfa/SensitiveUtil.java | 10 +++---- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java b/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java index bb151db76..f1ecafa83 100755 --- a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java +++ b/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java @@ -82,13 +82,13 @@ public class MetaUtil { conn = ds.getConnection(); // catalog和schema获取失败默认使用null代替 - String catalog = getCatalog(conn); + final String catalog = getCatalog(conn); if (null == schema) { schema = getSchema(conn); } final DatabaseMetaData metaData = conn.getMetaData(); - try (ResultSet rs = metaData.getTables(catalog, schema, tableName, Convert.toStrArray(types))) { + try (final ResultSet rs = metaData.getTables(catalog, schema, tableName, Convert.toStrArray(types))) { if (null != rs) { String table; while (rs.next()) { @@ -116,9 +116,9 @@ public class MetaUtil { */ public static String[] getColumnNames(ResultSet rs) throws DbRuntimeException { try { - ResultSetMetaData rsmd = rs.getMetaData(); - int columnCount = rsmd.getColumnCount(); - String[] labelNames = new String[columnCount]; + final ResultSetMetaData rsmd = rs.getMetaData(); + final int columnCount = rsmd.getColumnCount(); + final String[] labelNames = new String[columnCount]; for (int i = 0; i < labelNames.length; i++) { labelNames[i] = rsmd.getColumnLabel(i + 1); } @@ -137,17 +137,17 @@ public class MetaUtil { * @throws DbRuntimeException SQL执行异常 */ public static String[] getColumnNames(DataSource ds, String tableName) { - List columnNames = new ArrayList<>(); + final List columnNames = new ArrayList<>(); Connection conn = null; try { conn = ds.getConnection(); // catalog和schema获取失败默认使用null代替 - String catalog = getCatalog(conn); - String schema = getSchema(conn); + final String catalog = getCatalog(conn); + final String schema = getSchema(conn); final DatabaseMetaData metaData = conn.getMetaData(); - try (ResultSet rs = metaData.getColumns(catalog, schema, tableName, null)) { + try (final ResultSet rs = metaData.getColumns(catalog, schema, tableName, null)) { if (null != rs) { while (rs.next()) { columnNames.add(rs.getString("COLUMN_NAME")); @@ -225,7 +225,7 @@ public class MetaUtil { final DatabaseMetaData metaData = conn.getMetaData(); // 获得表元数据（表注释） - try (ResultSet rs = metaData.getTables(catalog, schema, tableName, new String[]{TableType.TABLE.value()})) { + try (final ResultSet rs = metaData.getTables(catalog, schema, tableName, new String[]{TableType.TABLE.value()})) { if (null != rs) { if (rs.next()) { table.setComment(rs.getString("REMARKS")); @@ -234,7 +234,7 @@ public class MetaUtil { } // 获得主键 - try (ResultSet rs = metaData.getPrimaryKeys(catalog, schema, tableName)) { + try (final ResultSet rs = metaData.getPrimaryKeys(catalog, schema, tableName)) { if (null != rs) { while (rs.next()) { table.addPk(rs.getString("COLUMN_NAME")); @@ -243,7 +243,7 @@ public class MetaUtil { } // 获得列 - try (ResultSet rs = metaData.getColumns(catalog, schema, tableName, null)) { + try (final ResultSet rs = metaData.getColumns(catalog, schema, tableName, null)) { if (null != rs) { while (rs.next()) { table.setColumn(Column.create(table, rs)); @@ -252,7 +252,7 @@ public class MetaUtil { } // 获得索引信息(since 5.7.23) - try (ResultSet rs = metaData.getIndexInfo(catalog, schema, tableName, false, false)) { + try (final ResultSet rs = metaData.getIndexInfo(catalog, schema, tableName, false, false)) { final Map indexInfoMap = new LinkedHashMap<>(); if (null != rs) { while (rs.next()) { diff --git a/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java b/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java index 0abd88676..d9ece6a58 100644 --- a/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java @@ -2,6 +2,7 @@ package cn.hutool.db.meta; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.db.DbRuntimeException; import cn.hutool.db.ds.DSFactory; import org.junit.Assert; import org.junit.Test; @@ -20,25 +21,34 @@ public class MetaUtilTest { @Test public void getTablesTest() { - List tables = MetaUtil.getTables(ds); + final List tables = MetaUtil.getTables(ds); Assert.assertEquals("user", tables.get(0)); } @Test public void getTableMetaTest() { - Table table = MetaUtil.getTableMeta(ds, "user"); + final Table table = MetaUtil.getTableMeta(ds, "user"); Assert.assertEquals(CollectionUtil.newHashSet("id"), table.getPkNames()); } @Test public void getColumnNamesTest() { - String[] names = MetaUtil.getColumnNames(ds, "user"); + final String[] names = MetaUtil.getColumnNames(ds, "user"); Assert.assertArrayEquals(StrUtil.splitToArray("id,name,age,birthday,gender", ','), names); } @Test public void getTableIndexInfoTest() { - Table table = MetaUtil.getTableMeta(ds, "user_1"); + final Table table = MetaUtil.getTableMeta(ds, "user_1"); + Assert.assertEquals(table.getIndexInfoList().size(), 2); + } + + /** + * 表不存在抛出异常。 + */ + @Test(expected = DbRuntimeException.class) + public void getTableNotExistTest() { + final Table table = MetaUtil.getTableMeta(ds, "user_not_exist"); Assert.assertEquals(table.getIndexInfoList().size(), 2); } } diff --git a/hutool-dfa/src/main/java/cn/hutool/dfa/SensitiveUtil.java b/hutool-dfa/src/main/java/cn/hutool/dfa/SensitiveUtil.java index bcf81a784..ba8507cff 100755 --- a/hutool-dfa/src/main/java/cn/hutool/dfa/SensitiveUtil.java +++ b/hutool-dfa/src/main/java/cn/hutool/dfa/SensitiveUtil.java @@ -194,7 +194,7 @@ public final class SensitiveUtil { * @return 敏感词过滤处理后的bean对象 */ public static T sensitiveFilter(T bean, boolean isGreedMatch, SensitiveProcessor sensitiveProcessor) { - String jsonText = JSONUtil.toJsonStr(bean); + final String jsonText = JSONUtil.toJsonStr(bean); @SuppressWarnings("unchecked") final Class c = (Class) bean.getClass(); return JSONUtil.toBean(sensitiveFilter(jsonText, isGreedMatch, sensitiveProcessor), c); } @@ -224,7 +224,7 @@ public final class SensitiveUtil { } //敏感词过滤场景下，不需要密集匹配 - List foundWordList = getFoundAllSensitive(text, true, isGreedMatch); + final List foundWordList = getFoundAllSensitive(text, true, isGreedMatch); if (CollUtil.isEmpty(foundWordList)) { return text; } @@ -233,10 +233,10 @@ public final class SensitiveUtil { final Map foundWordMap = new HashMap<>(foundWordList.size(), 1); foundWordList.forEach(foundWord -> foundWordMap.put(foundWord.getStartIndex(), foundWord)); - int length = text.length(); - StringBuilder textStringBuilder = new StringBuilder(); + final int length = text.length(); + final StringBuilder textStringBuilder = new StringBuilder(); for (int i = 0; i < length; i++) { - FoundWord fw = foundWordMap.get(i); + final FoundWord fw = foundWordMap.get(i); if (fw != null) { textStringBuilder.append(sensitiveProcessor.process(fw)); i = fw.getEndIndex(); From fc51570e0350de4fd41b345d621bfdf4e345eb7c Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 5 May 2022 11:33:31 +0800 Subject: [PATCH 19/21] fix code --- .../src/main/java/cn/hutool/core/lang/Opt.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java index 139741a3e..eddc1476f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java @@ -41,7 +41,7 @@ import java.util.stream.Stream; /** * 复制jdk16中的Optional，以及自己进行了一点调整和新增，比jdk8中的Optional多了几个实用的函数
- * 详细见：https://gitee.com/dromara/hutool/pulls/426 + * 详细见：https://gitee.com/dromara/hutool/pulls/426 * * @param 包裹里元素的类型 * @author VampireAchao @@ -60,8 +60,7 @@ public class Opt { * @return Opt */ public static Opt empty() { - @SuppressWarnings("unchecked") - Opt t = (Opt) EMPTY; + @SuppressWarnings("unchecked") final Opt t = (Opt) EMPTY; return t; } @@ -322,7 +321,7 @@ public class Opt { return empty(); } else { @SuppressWarnings("unchecked") - Opt r = (Opt) mapper.apply(value); + final Opt r = (Opt) mapper.apply(value); return Objects.requireNonNull(r); } } @@ -400,8 +399,7 @@ public class Opt { if (isPresent()) { return this; } else { - @SuppressWarnings("unchecked") - Opt r = (Opt) supplier.get(); + @SuppressWarnings("unchecked") final Opt r = (Opt) supplier.get(); return Objects.requireNonNull(r); } } @@ -544,7 +542,7 @@ public class Opt { return false; } - Opt other = (Opt) obj; + final Opt other = (Opt) obj; return Objects.equals(value, other.value); } From 81ef04875bb5d59343cfb772128d79c4e2954416 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 5 May 2022 14:01:09 +0800 Subject: [PATCH 20/21] add methods --- CHANGELOG.md | 1 + .../cn/hutool/crypto/digest/DigestUtil.java | 106 ++++++++++++++++++ 2 files changed, 107 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61c13f66d..9275986f4 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ * 【core 】 BeanUtil增加beanToMap重载（pr#2292@Github） * 【core 】 Assert增加对应的equals及notEquals方法（pr#612@Gitee） * 【core 】 Assert增加对应的equals及notEquals方法（pr#612@Gitee） +* 【core 】 DigestUtil增加sha512方法（issue#2298@Github） ### 🐞Bug修复 * 【db 】 修复RedisDS无法设置maxWaitMillis问题（issue#I54TZ9@Gitee） diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java index fc6fd61ce..e6c04e305 100644 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java @@ -487,4 +487,110 @@ public class DigestUtil { public static boolean bcryptCheck(String password, String hashed) { return BCrypt.checkpw(password, hashed); } + + // ------------------------------------------------------------------------------------------- SHA-512 + + /** + * 计算SHA-512摘要值 + * + * @param data 被摘要数据 + * @return SHA-512摘要 + */ + public static byte[] sha512(final byte[] data) { + return new Digester(DigestAlgorithm.SHA512).digest(data); + } + + /** + * 计算SHA-512摘要值 + * + * @param data 被摘要数据 + * @param charset 编码 + * @return SHA-512摘要 + * @since 3.0.8 + */ + public static byte[] sha512(final String data, final String charset) { + return new Digester(DigestAlgorithm.SHA512).digest(data, charset); + } + + /** + * 计算sha512摘要值，使用UTF-8编码 + * + * @param data 被摘要数据 + * @return MD5摘要 + */ + public static byte[] sha512(final String data) { + return sha512(data, CharsetUtil.UTF_8); + } + + /** + * 计算SHA-512摘要值 + * + * @param data 被摘要数据 + * @return SHA-512摘要 + */ + public static byte[] sha512(final InputStream data) { + return new Digester(DigestAlgorithm.SHA512).digest(data); + } + + /** + * 计算SHA-512摘要值 + * + * @param file 被摘要文件 + * @return SHA-512摘要 + */ + public static byte[] sha512(final File file) { + return new Digester(DigestAlgorithm.SHA512).digest(file); + } + + /** + * 计算SHA-1摘要值，并转为16进制字符串 + * + * @param data 被摘要数据 + * @return SHA-512摘要的16进制表示 + */ + public static String sha512Hex(final byte[] data) { + return new Digester(DigestAlgorithm.SHA512).digestHex(data); + } + + /** + * 计算SHA-512摘要值，并转为16进制字符串 + * + * @param data 被摘要数据 + * @param charset 编码 + * @return SHA-512摘要的16进制表示 + */ + public static String sha512Hex(final String data, final String charset) { + return new Digester(DigestAlgorithm.SHA512).digestHex(data, charset); + } + + /** + * 计算SHA-512摘要值，并转为16进制字符串 + * + * @param data 被摘要数据 + * @return SHA-512摘要的16进制表示 + */ + public static String sha512Hex(final String data) { + return sha512Hex(data, CharsetUtil.UTF_8); + } + + /** + * 计算SHA-512摘要值，并转为16进制字符串 + * + * @param data 被摘要数据 + * @return SHA-512摘要的16进制表示 + */ + public static String sha512Hex(final InputStream data) { + return new Digester(DigestAlgorithm.SHA512).digestHex(data); + } + + /** + * 计算SHA-512摘要值，并转为16进制字符串 + * + * @param file 被摘要文件 + * @return SHA-512摘要的16进制表示 + */ + public static String sha512Hex(final File file) { + return new Digester(DigestAlgorithm.SHA512).digestHex(file); + } + } From df235cf6e6768107b65cc09eb1e5a027b8343c38 Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 6 May 2022 13:48:15 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=F0=9F=A7=A8Release=205.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 +- README-EN.md | 6 +++--- README.md | 6 +++--- bin/version.txt | 2 +- docs/js/version.js | 2 +- hutool-all/pom.xml | 2 +- hutool-aop/pom.xml | 2 +- hutool-bloomFilter/pom.xml | 2 +- hutool-bom/pom.xml | 2 +- hutool-cache/pom.xml | 2 +- hutool-captcha/pom.xml | 2 +- hutool-core/pom.xml | 2 +- hutool-cron/pom.xml | 2 +- hutool-crypto/pom.xml | 2 +- hutool-db/pom.xml | 2 +- hutool-dfa/pom.xml | 2 +- hutool-extra/pom.xml | 2 +- hutool-http/pom.xml | 2 +- hutool-json/pom.xml | 2 +- hutool-jwt/pom.xml | 2 +- hutool-log/pom.xml | 2 +- hutool-poi/pom.xml | 2 +- hutool-script/pom.xml | 2 +- hutool-setting/pom.xml | 2 +- hutool-socket/pom.xml | 2 +- hutool-system/pom.xml | 2 +- pom.xml | 2 +- 27 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9275986f4..101e9ebe1 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------------------------------------- -# 5.8.0.M5 (2022-05-05) +# 5.8.0 (2022-05-06) ### ❌不兼容特性 * 【extra 】 升级jakarta.validation-api到3.x，包名变更导致不能向下兼容 diff --git a/README-EN.md b/README-EN.md index 1f79bbb65..a9fb50154 100755 --- a/README-EN.md +++ b/README-EN.md @@ -144,18 +144,18 @@ We provide the T-Shirt and Sweater with Hutool Logo, please visit the shop： cn.hutool hutool-all - 5.8.0.M5 + 5.8.0 ``` ### 🍐Gradle ``` -implementation 'cn.hutool:hutool-all:5.8.0.M5' +implementation 'cn.hutool:hutool-all:5.8.0' ``` ## 📥Download -- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.0.M5/) +- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.0/) > 🔔️note: > Hutool 5.x supports JDK8+ and is not tested on Android platforms, and cannot guarantee that all tool classes or tool methods are available. diff --git a/README.md b/README.md index 601bf892d..f709e87d1 100755 --- a/README.md +++ b/README.md @@ -144,20 +144,20 @@ Hutool的存在就是为了减少代码搜索成本，避免网络上参差不 cn.hutool hutool-all - 5.8.0.M5 + 5.8.0 ``` ### 🍐Gradle ``` -implementation 'cn.hutool:hutool-all:5.8.0.M5' +implementation 'cn.hutool:hutool-all:5.8.0' ``` ### 📥下载jar 点击以下链接，下载`hutool-all-X.X.X.jar`即可： -- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.0.M5/) +- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.0/) > 🔔️注意 > Hutool 5.x支持JDK8+，对Android平台没有测试，不能保证所有工具类或工具方法可用。 diff --git a/bin/version.txt b/bin/version.txt index 0185a6be9..11d9efa3d 100755 --- a/bin/version.txt +++ b/bin/version.txt @@ -1 +1 @@ -5.8.0.M5 +5.8.0 diff --git a/docs/js/version.js b/docs/js/version.js index 2ce39747b..d7dea1709 100755 --- a/docs/js/version.js +++ b/docs/js/version.js @@ -1 +1 @@ -var version = '5.8.0.M5' \ No newline at end of file +var version = '5.8.0' \ No newline at end of file diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index c18a06212..764f45852 100755 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-all diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml index b365e396c..e8241a598 100755 --- a/hutool-aop/pom.xml +++ b/hutool-aop/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-aop diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml index d38e38057..9d097a630 100755 --- a/hutool-bloomFilter/pom.xml +++ b/hutool-bloomFilter/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-bloomFilter diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index f332b3d89..2f52f535c 100755 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-bom diff --git a/hutool-cache/pom.xml b/hutool-cache/pom.xml index 15f9986f7..676db09e3 100755 --- a/hutool-cache/pom.xml +++ b/hutool-cache/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-cache diff --git a/hutool-captcha/pom.xml b/hutool-captcha/pom.xml index 157efcfb4..4bb1c27b4 100755 --- a/hutool-captcha/pom.xml +++ b/hutool-captcha/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-captcha diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index bc6a64195..7a23f3e9f 100755 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-core diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index 946cda803..b2139d0e6 100755 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-cron diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml index 85466e6af..8c967bffb 100755 --- a/hutool-crypto/pom.xml +++ b/hutool-crypto/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-crypto diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index 19a80bed4..6b3188371 100755 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-db diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml index 05e50a60e..bb5c1b43c 100755 --- a/hutool-dfa/pom.xml +++ b/hutool-dfa/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-dfa diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index 4b13a50db..fe6e30d38 100755 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-extra diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index 8ddc534f7..da31f1d78 100755 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-http diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index 0c3b52525..0d0d1152c 100755 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-json diff --git a/hutool-jwt/pom.xml b/hutool-jwt/pom.xml index 3a4ef4229..5b80df24c 100755 --- a/hutool-jwt/pom.xml +++ b/hutool-jwt/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-jwt diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index fc5eee676..36a5fc35d 100755 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-log diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index e45c87948..43bcd8e7c 100755 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-poi diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml index 5dceb2244..ada7ffeaa 100755 --- a/hutool-script/pom.xml +++ b/hutool-script/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-script diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml index 1a8a2e7fe..2a366d0b6 100755 --- a/hutool-setting/pom.xml +++ b/hutool-setting/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-setting diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index 9e0a00aa2..8b74e2c32 100755 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-socket diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml index 2f557d049..2a8c2e164 100755 --- a/hutool-system/pom.xml +++ b/hutool-system/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool-system diff --git a/pom.xml b/pom.xml index 089982238..d874dbd2e 100755 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 5.8.0.M5 + 5.8.0 hutool Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。 https://github.com/dromara/hutool