From 57dbe239615b3637c755c51dd1d596f8763659a2 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 29 Jul 2021 15:18:46 +0800 Subject: [PATCH] fix tel regex --- CHANGELOG.md | 4 +++- hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java | 3 ++- hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54fe81a2b..96a6ea817 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,12 @@ ------------------------------------------------------------------------------------------------------------- -# 5.7.6 (2021-07-28) +# 5.7.6 (2021-07-29) ### 🐣新特性 * 【core 】 增加LookupFactory和MethodHandleUtil(issue#I42TVY@Gitee) +* 【core 】 改进RegexPool.TEL支持无-号码(pr#387@Gitee) +* 【core 】 PhoneUtil中新增获取固话号码中区号,以及固话号码中号码的方法(pr#387@Gitee) ### 🐞Bug修复 * 【jwt 】 修复JWTUtil中几个方法非static的问题(pr#386@Gitee) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java b/hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java index c17678b64..d21b8523b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java @@ -76,7 +76,8 @@ public interface RegexPool { */ String MOBILE_MO = "(?:0|853|\\+853)?(?:|-)6\\d{7}"; /** - * 座机号码 + * 座机号码
+ * pr#387@Gitee */ String TEL = "(010|02\\d|0[3-9]\\d{2})-?(\\d{6,8})"; /** 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 index fda019702..f8494c748 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java @@ -167,7 +167,7 @@ public class PhoneUtil { * * @param value 完整的固话号码 * @return 固话号码的区号部分 - * @since 5.7.6 + * @since 5.7.7 */ public static CharSequence subTelBefore(CharSequence value) { @@ -179,7 +179,7 @@ public class PhoneUtil { * * @param value 完整的固话号码 * @return 固话号码的号码部分 - * @since 5.7.6 + * @since 5.7.7 */ public static CharSequence subTelAfter(CharSequence value) {