From cd813578c7ce74e10cf88bcb2d3aa04b0ea67a86 Mon Sep 17 00:00:00 2001
From: Jason <551186306@qq.com>
Date: Tue, 1 Nov 2022 15:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=97=B6=E5=8F=AF=E4=BB=A5=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E5=BA=A7=E6=9C=BA=E5=8F=B7=EF=BC=88=E4=B8=8D=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=BC=81=E4=B8=9A=E4=BA=BA=E5=91=98=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/common/util/superSearch/ConstantUtils.java  | 4 ++++
 .../com/jero/modules/system/controller/LoginController.java   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/superSearch/ConstantUtils.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/superSearch/ConstantUtils.java
index 48189c74..783c38cd 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/superSearch/ConstantUtils.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/superSearch/ConstantUtils.java
@@ -40,4 +40,8 @@ public class ConstantUtils {
     public static final String ZUOJI = "^0\\d{2,3}-?\\d{7,8}$";
 //    public static final String ZUOJI = "^\\d{3}-\\d{7,8}|\\d{4}-\\d{7,8}$";
 
+    //满足手机号或者座机号其中之一
+    public static final String TEL_PHONE_ZUOJI = "(^[1][3,4,5,6,7,8,9][0-9]{9}$)|(^0\\d{2,3}-?\\d{7,8}$)";
+
+
 }
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
index 9834dfc1..2c8d1ae4 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
@@ -126,6 +126,7 @@ public class LoginController {
             return result;
         }
 
+
         // 若用户名有效，则查询该账号的登陆失败次数是否符合等保要求
         int retryCount = 0;
         if (redisUtil.get(RETRY_LOGIN_PREFIX + username) != null) {
@@ -138,6 +139,7 @@ public class LoginController {
         //2. 校验用户名或密码是否正确
         String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
         String syspassword = sysUser.getPassword();
+        log.info("{}用户解密后的密码:{}",username,PasswordUtil.decrypt(username, syspassword, sysUser.getSalt()));
         if (!syspassword.equals(userpassword)) {
             // 重试登录次数加一
             retryCount++;