From 2a602d0bd481691cb06e026188eb42236385039c Mon Sep 17 00:00:00 2001 From: Looly Date: Sat, 14 Jun 2025 18:40:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D`TEL=5F400=5F800`=E6=AD=A3?= =?UTF-8?q?=E5=88=99=E8=A7=84=E5=88=99=E5=A4=AA=E7=AA=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=88issue#3967@Github=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- .../src/main/java/cn/hutool/core/lang/PatternPool.java | 2 -- hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5de2a1426..d3f79ebe0 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ # 🚀Changelog ------------------------------------------------------------------------------------------------------------- -# 5.8.39(2025-06-09) +# 5.8.39(2025-06-14) ### 🐣新特性 * 【ai 】 增加SSE流式返回函数参数callback，增加超时时间配置，豆包、grok新增文生图接口，豆包生成视频支持使用model,新增HutoolAI平台 @@ -19,6 +19,7 @@ * 【poi 】 修复`ExcelPicUtil`中可能的空指针异常 * 【core 】 修复`LunarFestival`中重复节日问题（issue#ICC8X3@Gitee） * 【core 】 修复`ThreadUtil`中中断异常处理丢失中断信息的问题，解决ConcurrencyTester资源未释放的问题（pr#1358@Gitee） +* 【core 】 修复`TEL_400_800`正则规则太窄问题（issue#3967@Github） ------------------------------------------------------------------------------------------------------------- # 5.8.38(2025-05-13) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java b/hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java index 14c0af6d2..a4c6cbda3 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java @@ -91,8 +91,6 @@ public class PatternPool { public final static Pattern TEL = Pattern.compile(RegexPool.TEL); /** * 座机号码+400+800电话 - * - * @see 800 */ public final static Pattern TEL_400_800 = Pattern.compile(RegexPool.TEL_400_800); /** 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 5ef773f01..e209b8a16 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 @@ -87,10 +87,8 @@ public interface RegexPool { String TEL = "(010|02\\d|0[3-9]\\d{2})-?(\\d{6,8})"; /** * 座机号码+400+800电话 - * - * @see 800 */ - String TEL_400_800 = "0\\d{2,3}[\\- ]?[1-9]\\d{6,7}|[48]00[\\- ]?[1-9]\\d{2}[\\- ]?\\d{4}"; + String TEL_400_800 = "0\\d{2,3}[\\- ]?[0-9]\\d{6,7}|[48]00[\\- ]?[0-9]\\d{2}[\\- ]?\\d{4}"; /** * 18位身份证号码 */