From b9cd8a34d424a1148d9a9c19b41207ae3548fd39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=93=AE=E5=B7=A9?= Date: Mon, 28 Dec 2020 10:27:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB=20=E5=BA=A7=E6=9C=BA=20=E6=AD=A3=E5=88=99=E8=A1=A8?= =?UTF-8?q?=E8=BE=BE=E5=BC=8F=E7=BB=9F=E4=B8=80=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/hutool/core/lang/PatternPool.java | 5 ++++- .../src/main/java/cn/hutool/core/util/PhoneUtil.java | 7 +------ 2 files changed, 5 insertions(+), 7 deletions(-) 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 f2261059f..044f54420 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java @@ -56,7 +56,10 @@ public class PatternPool { * 移动电话 */ public final static Pattern MOBILE = Pattern.compile("(?:0|86|\\+86)?1[3-9]\\d{9}"); - + /** + * 座机号码 + */ + public final static Pattern TEL = Pattern.compile("0\\d{2,3}-[1-9]\\d{6,7}"); /** * 18位身份证号码 */ 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 402255992..5762eb452 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 @@ -14,11 +14,6 @@ import java.util.regex.Pattern; */ public class PhoneUtil { - /** - * 座机号码 - */ - private static final Pattern TEL = Pattern.compile("0\\d{2,3}-[1-9]\\d{6,7}"); - /** * 验证是否为手机号码（中国） * @@ -38,7 +33,7 @@ public class PhoneUtil { * @since 5.3.11 */ public static boolean isTel(CharSequence value) { - return Validator.isMatchRegex(TEL, value); + return Validator.isMatchRegex(PatternPool.TEL, value); } /**