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++;