From c7bfb103d83f0cba84a2b3213f2536abc2408b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E8=88=92=E5=85=8B?= <865830846@qq.com>
Date: Thu, 29 Jul 2021 13:12:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=9B=BA=E8=AF=9D=E5=8F=B7?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=8E=B7=E5=8F=96=E5=8F=B7=E7=A0=81=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=202.=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E5=9B=BA?=
 =?UTF-8?q?=E8=AF=9D=E5=8F=B7=E7=A0=81=E4=B8=AD=E5=8F=B7=E7=A0=81=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/hutool/core/lang/RegexPool.java   |  2 +-
 .../java/cn/hutool/core/util/PhoneUtil.java   | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

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 3a49cec9b..c17678b64 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
@@ -78,7 +78,7 @@ public interface RegexPool {
 	/**
 	 * 座机号码
 	 */
-	String TEL = "(010|02\\d|0[3-9]\\d{2})-?\\d{6,8}";
+	String TEL = "(010|02\\d|0[3-9]\\d{2})-?(\\d{6,8})";
 	/**
 	 * 座机号码+400+800电话
 	 *
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 c0f33264c..fda019702 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
@@ -163,14 +163,26 @@ public class PhoneUtil {
 	}
 
 	/**
-	 * 获取固话号码的区号
+	 * 获取固话号码中的区号
 	 *
-	 * @param value 固话号码
-	 * @return 固话号码的区号
+	 * @param value 完整的固话号码
+	 * @return 固话号码的区号部分
 	 * @since 5.7.6
 	 */
-	public static CharSequence subTelAreaCode(CharSequence value)
+	public static CharSequence subTelBefore(CharSequence value)
 	{
 		return ReUtil.getGroup1(PatternPool.TEL, value);
 	}
+
+	/**
+	 * 获取固话号码中的号码
+	 *
+	 * @param value 完整的固话号码
+	 * @return 固话号码的号码部分
+	 * @since 5.7.6
+	 */
+	public static CharSequence subTelAfter(CharSequence value)
+	{
+		return ReUtil.get(PatternPool.TEL, value, 2);
+	}
 }