diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dae44b11..66de28caa 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,11 @@ ------------------------------------------------------------------------------------------------------------- -# 5.8.13.M1 (2023-02-24) +# 5.8.13.M1 (2023-02-28) ### 🐣新特性 +* 【core 】 PhoneUtil.isTel400800支持400-XXX-XXXX格式(issue#2929@Github) + ### 🐞Bug修复 * 【db 】 修复识别JDBC驱动时重复问题(pr#940@Gitee) * 【core 】 修复法定年龄计算的BUG(pr#935@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 8834cdc6c..ed8a73ef3 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 @@ -85,7 +85,7 @@ public interface RegexPool { * * @see 800 */ - String TEL_400_800 = "0\\d{2,3}[\\- ]?[1-9]\\d{6,7}|[48]00[\\- ]?[1-9]\\d{6}"; + String TEL_400_800 = "0\\d{2,3}[\\- ]?[1-9]\\d{6,7}|[48]00[\\- ]?[1-9]\\d{2}[\\- ]?\\d{4}"; /** * 18位身份证号码 */ diff --git a/hutool-core/src/test/java/cn/hutool/core/util/PhoneUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/PhoneUtilTest.java index cdb6ed44a..fde5a3ad3 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/PhoneUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/PhoneUtilTest.java @@ -96,4 +96,13 @@ public class PhoneUtilTest { Assert.assertEquals("7654321", PhoneUtil.subTelAfter("0755-7654321")); Assert.assertEquals("7654321", PhoneUtil.subTelAfter("07557654321")); } + + @Test + public void isTel400800Test() { + boolean tel400800 = PhoneUtil.isTel400800("400-860-8608");//800-830-3811 + Assert.assertTrue(tel400800); + + tel400800 = PhoneUtil.isTel400800("400-8608608");//800-830-3811 + Assert.assertTrue(tel400800); + } }