From 2c86a8bd60deed0dd0e044bad6fb83f75d19a332 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 26 十月 2025 15:05:50 +0800
Subject: [PATCH] Merge branch 'feature-task'
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index fe16427..38aaec2 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -55,7 +55,7 @@
/**
* 鐧诲綍楠岃瘉
*
- * @param username 鐢ㄦ埛鍚�
+ * @param username 鐢ㄦ埛鍚嶆垨鎵嬫満鍙�
* @param password 瀵嗙爜
* @param code 楠岃瘉鐮�
* @param uuid 鍞竴鏍囪瘑
@@ -131,7 +131,7 @@
/**
* 鐧诲綍鍓嶇疆鏍￠獙
- * @param username 鐢ㄦ埛鍚�
+ * @param username 鐢ㄦ埛鍚嶆垨鎵嬫満鍙�
* @param password 鐢ㄦ埛瀵嗙爜
*/
public void loginPreCheck(String username, String password)
@@ -149,13 +149,21 @@
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
throw new UserPasswordNotMatchException();
}
- // 鐢ㄦ埛鍚嶄笉鍦ㄦ寚瀹氳寖鍥村唴 閿欒
- if (username.length() < UserConstants.USERNAME_MIN_LENGTH
- || username.length() > UserConstants.USERNAME_MAX_LENGTH)
+ // 鍒ゆ柇鏄惁涓烘墜鏈哄彿鐧诲綍
+ boolean isPhoneLogin = username.matches("^1[3-9]\\d{9}$");
+
+ // 濡傛灉涓嶆槸鎵嬫満鍙风櫥褰曪紝妫�鏌ョ敤鎴峰悕闀垮害
+ if (!isPhoneLogin)
{
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
- throw new UserPasswordNotMatchException();
+ // 鐢ㄦ埛鍚嶄笉鍦ㄦ寚瀹氳寖鍥村唴 閿欒
+ if (username.length() < UserConstants.USERNAME_MIN_LENGTH
+ || username.length() > UserConstants.USERNAME_MAX_LENGTH)
+ {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
+ throw new UserPasswordNotMatchException();
+ }
}
+
// IP榛戝悕鍗曟牎楠�
String blackStr = configService.selectConfigByKey("sys.login.blackIPList");
if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr()))
--
Gitblit v1.9.1