diff --git a/README-EN.md b/README-EN.md index 080efea6a..7202ca640 100755 --- a/README-EN.md +++ b/README-EN.md @@ -150,18 +150,18 @@ We provide the T-Shirt and Sweater with Hutool Logo, please visit the shop： cn.hutool hutool-all - 5.8.30 + 5.8.31 ``` ### 🍐Gradle ``` -implementation 'cn.hutool:hutool-all:5.8.30' +implementation 'cn.hutool:hutool-all:5.8.31' ``` ## 📥Download -- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.30/) +- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.31/) > 🔔️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 ff77c7adf..7e34579eb 100755 --- a/README.md +++ b/README.md @@ -143,20 +143,20 @@ Hutool = Hu + tool，是原公司项目底层代码剥离后的开源库，“Hu cn.hutool hutool-all - 5.8.30 + 5.8.31 ``` ### 🍐Gradle ``` -implementation 'cn.hutool:hutool-all:5.8.30' +implementation 'cn.hutool:hutool-all:5.8.31' ``` ### 📥下载jar 点击以下链接，下载`hutool-all-X.X.X.jar`即可： -- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.30/) +- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.31/) > 🔔️注意 > Hutool 5.x支持JDK8+，对Android平台没有测试，不能保证所有工具类或工具方法可用。 diff --git a/bin/version.txt b/bin/version.txt index 3b54b1af8..e338ac884 100755 --- a/bin/version.txt +++ b/bin/version.txt @@ -1 +1 @@ -5.8.30 +5.8.31 diff --git a/docs/js/version.js b/docs/js/version.js index f1640fc55..8119b11fd 100755 --- a/docs/js/version.js +++ b/docs/js/version.js @@ -1 +1 @@ -var version = '5.8.30' \ No newline at end of file +var version = '5.8.31' \ No newline at end of file diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index 7098c26de..72b3e7c1c 100755 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-all diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml index e96cd6eff..67c132f84 100755 --- a/hutool-aop/pom.xml +++ b/hutool-aop/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-aop diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml index 4f3a613d2..ed90d6921 100755 --- a/hutool-bloomFilter/pom.xml +++ b/hutool-bloomFilter/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-bloomFilter diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index 6c11e5fd4..5cbef9e55 100755 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-bom diff --git a/hutool-cache/pom.xml b/hutool-cache/pom.xml index 5533630e0..171720e51 100755 --- a/hutool-cache/pom.xml +++ b/hutool-cache/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-cache diff --git a/hutool-captcha/pom.xml b/hutool-captcha/pom.xml index 02021bd35..cc75156c3 100755 --- a/hutool-captcha/pom.xml +++ b/hutool-captcha/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-captcha diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index 666da82a5..c36f11793 100755 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-core 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 index bde09e37b..410076919 100755 --- a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java @@ -3,7 +3,6 @@ package cn.hutool.core.util; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Console; import cn.hutool.core.lang.PatternPool; -import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -11,6 +10,8 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; +import static org.junit.jupiter.api.Assertions.*; + public class ReUtilTest { final String content = "ZZZaaabbbccc中文1234"; @@ -228,4 +229,19 @@ public class ReUtilTest { boolean match = ReUtil.isMatch(regex, content); assertTrue(match); } + + @Test + void getEmailAddressTest() { + String mail = "姓名"; + String s = ReUtil.get(PatternPool.EMAIL, mail, 0); + assertEquals("a.b@Hutool.cn", s); + + mail = "姓名 "; + s = ReUtil.get(PatternPool.EMAIL, mail, 0); + assertEquals("a.b@Hutool.cn", s); + + mail = "a.b@Hutool.cn"; + s = ReUtil.get(PatternPool.EMAIL, mail, 0); + assertEquals("a.b@Hutool.cn", s); + } } diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index 49d4a318d..72bb36dc4 100755 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-cron diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml index cb5b990e1..b81c241f1 100755 --- a/hutool-crypto/pom.xml +++ b/hutool-crypto/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-crypto diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index f8c6ff9b6..4a86d8437 100755 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-db diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml index 60e470daa..c3a63b70e 100755 --- a/hutool-dfa/pom.xml +++ b/hutool-dfa/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-dfa diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index 4c055c7d7..0d9928909 100755 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-extra diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/JakartaMailUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/JakartaMailUtil.java index d41cce22a..9d7a2261a 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/mail/JakartaMailUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/JakartaMailUtil.java @@ -387,7 +387,7 @@ public class JakartaMailUtil { */ private static String send(MailAccount mailAccount, boolean useGlobalSession, Collection tos, Collection ccs, Collection bccs, String subject, String content, Map imageMap, boolean isHtml, File... files) { - final Mail mail = Mail.create(mailAccount).setUseGlobalSession(useGlobalSession); + final JakartaMail mail = JakartaMail.create(mailAccount).setUseGlobalSession(useGlobalSession); // 可选抄送人 if (CollUtil.isNotEmpty(ccs)) { diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java index d8564750c..a2ff5909e 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java @@ -1,7 +1,9 @@ package cn.hutool.extra.mail; +import cn.hutool.core.lang.PatternPool; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.setting.Setting; @@ -629,7 +631,7 @@ public class MailAccount implements Serializable { */ public MailAccount defaultIfEmpty() { // 去掉发件人的姓名部分 - final String fromAddress = InternalMailUtil.parseFirstAddress(this.from, this.charset).getAddress(); + final String fromAddress = ReUtil.get(PatternPool.EMAIL, this.from, 0); if (StrUtil.isBlank(this.host)) { // 如果SMTP地址为空，默认使用smtp.<发件人邮箱后缀> diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index fc87bb62e..ec733a886 100755 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-http diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index 4ca278ed0..c0028f087 100755 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-json diff --git a/hutool-jwt/pom.xml b/hutool-jwt/pom.xml index 6f8e7e38f..fd7834a82 100755 --- a/hutool-jwt/pom.xml +++ b/hutool-jwt/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-jwt diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index b2d060ada..8d175c789 100755 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-log diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index a5d58f7cc..f06fe0597 100755 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-poi diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml index c4baffa31..d691ac35c 100755 --- a/hutool-script/pom.xml +++ b/hutool-script/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-script diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml index 22973a5d4..d94aa84ba 100755 --- a/hutool-setting/pom.xml +++ b/hutool-setting/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-setting diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index d7b727575..3d0d7a394 100755 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-socket diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml index da988988f..39da8b737 100755 --- a/hutool-system/pom.xml +++ b/hutool-system/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool-system diff --git a/pom.xml b/pom.xml index 0fb3008a8..9bb9de778 100755 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 5.8.30 + 5.8.31 hutool Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。 https://github.com/dromara/hutool