From a54447507a3af4347e6b5981eb9da21d5ca03898 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期二, 03 十一月 2026 13:27:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide_wrzs' into dev_tide_wrzs
---
src/main/java/com/ruoyi/framework/security/service/SysLoginService.java | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 222 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java b/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
index 3261d3b..8b3e83a 100644
--- a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
@@ -1,21 +1,30 @@
package com.ruoyi.framework.security.service;
import javax.annotation.Resource;
+
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.enums.UserStatus;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.exception.user.BlackListException;
import com.ruoyi.common.exception.user.CaptchaException;
import com.ruoyi.common.exception.user.CaptchaExpireException;
+import com.ruoyi.common.exception.user.UserNotExistsException;
import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.framework.manager.AsyncManager;
@@ -27,6 +36,10 @@
import com.ruoyi.project.system.service.ISysConfigService;
import com.ruoyi.project.system.service.ISysUserService;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* 鐧诲綍鏍￠獙鏂规硶
*
@@ -35,8 +48,13 @@
@Component
public class SysLoginService
{
+ private static final Logger log = LoggerFactory.getLogger(SysLoginService.class);
+
@Autowired
private TokenService tokenService;
+
+ @Autowired
+ private UserDetailsServiceImpl userDetailsService;
@Resource
private AuthenticationManager authenticationManager;
@@ -46,7 +64,7 @@
@Autowired
private ISysUserService userService;
-
+
@Autowired
private ISysConfigService configService;
@@ -61,12 +79,10 @@
*/
public String login(String username, String password, String code, String uuid)
{
- boolean captchaEnabled = configService.selectCaptchaEnabled();
- // 楠岃瘉鐮佸紑鍏�
- if (captchaEnabled)
- {
- validateCaptcha(username, code, uuid);
- }
+ // 楠岃瘉鐮佹牎楠�
+// validateCaptcha(username, code, uuid);
+ // 鐧诲綍鍓嶇疆鏍￠獙
+ loginPreCheck(username, password);
// 鐢ㄦ埛楠岃瘉
Authentication authentication = null;
try
@@ -89,6 +105,10 @@
throw new ServiceException(e.getMessage());
}
}
+ finally
+ {
+ AuthenticationContextHolder.clearContext();
+ }
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
recordLoginInfo(loginUser.getUserId());
@@ -106,18 +126,58 @@
*/
public void validateCaptcha(String username, String code, String uuid)
{
- String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
- String captcha = redisCache.getCacheObject(verifyKey);
- redisCache.deleteObject(verifyKey);
- if (captcha == null)
+ boolean captchaEnabled = configService.selectCaptchaEnabled();
+ if (captchaEnabled)
{
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
- throw new CaptchaExpireException();
+ String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
+ String captcha = redisCache.getCacheObject(verifyKey);
+ if (captcha == null)
+ {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
+ throw new CaptchaExpireException();
+ }
+ redisCache.deleteObject(verifyKey);
+ if (!code.equalsIgnoreCase(captcha))
+ {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
+ throw new CaptchaException();
+ }
}
- if (!code.equalsIgnoreCase(captcha))
+ }
+
+ /**
+ * 鐧诲綍鍓嶇疆鏍￠獙
+ * @param username 鐢ㄦ埛鍚�
+ * @param password 鐢ㄦ埛瀵嗙爜
+ */
+ public void loginPreCheck(String username, String password)
+ {
+ // 鐢ㄦ埛鍚嶆垨瀵嗙爜涓虹┖ 閿欒
+ if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))
{
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
- throw new CaptchaException();
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null")));
+ throw new UserNotExistsException();
+ }
+ // 瀵嗙爜濡傛灉涓嶅湪鎸囧畾鑼冨洿鍐� 閿欒
+ if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
+ || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
+ {
+ 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()))
+ {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("login.blocked")));
+ throw new BlackListException();
}
}
@@ -130,8 +190,152 @@
{
SysUser sysUser = new SysUser();
sysUser.setUserId(userId);
- sysUser.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
+ sysUser.setLoginIp(IpUtils.getIpAddr());
sysUser.setLoginDate(DateUtils.getNowDate());
userService.updateUserProfile(sysUser);
}
+
+ public Long loginCheck(String username, String password){
+ loginPreCheck(username, password);
+ // 鐢ㄦ埛楠岃瘉
+ Authentication authentication = null;
+ try
+ {
+ UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
+ AuthenticationContextHolder.setContext(authenticationToken);
+ // 璇ユ柟娉曚細鍘昏皟鐢║serDetailsServiceImpl.loadUserByUsername
+ authentication = authenticationManager.authenticate(authenticationToken);
+ }
+ catch (Exception e)
+ {
+ if (e instanceof BadCredentialsException)
+ {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
+ throw new UserPasswordNotMatchException();
+ }
+ else
+ {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
+ throw new ServiceException(e.getMessage());
+ }
+ }
+ finally
+ {
+ AuthenticationContextHolder.clearContext();
+ }
+ LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+ return loginUser.getUserId();
+ }
+
+ @Autowired
+ private SysUserMapper sysUserMapper;
+
+ /**
+ * 鐧诲綍楠岃瘉
+ *
+ * @param username 鐢ㄦ埛鍚�
+ * @param password 瀵嗙爜
+ * @param factoryId 鍏徃ID
+ * @return 缁撴灉
+ */
+ public String loginCheckFactory(String username, String password, Long factoryId)
+ {
+ // 鐧诲綍鍓嶇疆鏍￠獙
+ loginPreCheck(username, password);
+ // 鐢ㄦ埛楠岃瘉
+ Authentication authentication = null;
+ try
+ {
+ UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
+ // 鎵╁睍缁嗚妭锛氬皢 companyId 鏀惧叆 details锛堝彲閫夋柟寮忥級
+ // 浣跨敤 Map 瀛樺偍棰濆淇℃伅
+ Map<String, Object> details = new HashMap<>();
+ details.put("factoryId", factoryId);
+ authenticationToken.setDetails(details);
+ SecurityContextHolder.getContext().setAuthentication(authenticationToken);
+ AuthenticationContextHolder.setContext(authenticationToken);
+ // 璇ユ柟娉曚細鍘昏皟鐢║serDetailsServiceImpl.loadUserByUsername
+ authentication = authenticationManager.authenticate(authenticationToken);
+ }
+ catch (Exception e)
+ {
+ if (e instanceof BadCredentialsException)
+ {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
+ throw new UserPasswordNotMatchException();
+ }
+ else
+ {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
+ throw new ServiceException(e.getMessage());
+ }
+ }
+ finally
+ {
+ AuthenticationContextHolder.clearContext();
+ }
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+ LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+ recordLoginInfo(loginUser.getUserId());
+ // 鏇存柊鐢ㄦ埛淇℃伅锛屼慨鏀瑰綋鍓嶉�変腑鍏徃
+ SysUser user = loginUser.getUser();
+ if(factoryId != null){
+ user.setTenantId(factoryId);
+ }else{
+ user.setTenantId(tokenService.getDeptIdsByUserId(user.getUserId())[0]);
+ }
+ sysUserMapper.updateUser(user);
+ // 鐢熸垚token
+ return tokenService.createToken(loginUser);
+ }
+
+ /**
+ * 娴疆闂ㄦ埛 SSO 鍏嶅瘑鐧诲綍
+ * <p>
+ * 鑳屾櫙锛氭氮娼� OSS 閫氳繃 /tide/tideLogin 鎶� code 鎹㈡垚 token锛屽啀鍙栧埌 tenant 淇℃伅鍚庯紝
+ * 鍘熸湰璋冪敤 login(username, password, code, uuid) 鐢� tenantAccount + tenantPassword
+ * 鍋氭湰鍦扮櫥褰曘�備絾 tenantPassword 鏄氮娼郴缁熻鎯呴噷鍗曠嫭閰嶇疆鐨勫�硷紝涓庢湰鍦� sys_user.password
+ * 涓�鏃︿笉涓�鑷达紙娴疆渚ф敼瀵嗙爜銆佹湰鍦伴噸缃瘑鐮併�佽处鍙风敱 applicationOrdering 鍒涘缓鍚庢敼杩囧瘑鐮佺瓑锛夛紝
+ * 灏变細鎶ャ�岀鎴疯处鍙穂xxx]鍦ㄧ郴缁熶腑鐧诲綍澶辫触(鐢ㄦ埛涓嶅瓨鍦�/瀵嗙爜閿欒)銆嶏紝瀵艰嚧闂ㄦ埛鏁存潯鐧诲綍閾捐矾鏂帀銆�
+ * <p>
+ * 閴存潈瀹為檯涓婂湪娴疆渚у凡缁忓畬鎴愶紙鑳芥嬁鍒版湁鏁� token 鍜� userInfo 灏辫鏄庤韩浠藉彲淇★級锛�
+ * 鏈湴鏃犻渶鍐嶆鏍￠獙瀵嗙爜銆傝繖閲岀洿鎺ユ寜鐢ㄦ埛鍚嶅姞杞界敤鎴峰苟绛惧彂鏈郴缁� token銆�
+ * <p>
+ * 浠嶇劧淇濈暀鐨勬牎楠岋細鐢ㄦ埛涓嶅瓨鍦ㄣ�佸凡鍒犻櫎銆佸凡鍋滅敤 鈥斺�� 杩欎笁绉嶆儏鍐垫嫆缁濈櫥褰曘��
+ *
+ * @param username 娴疆杩斿洖鐨勭鎴疯处鍙凤紙tenantAccount锛�
+ * @return 鏈郴缁� token
+ */
+ public String ssoLogin(String username)
+ {
+ SysUser user = userService.selectUserByUserName(username);
+ if (StringUtils.isNull(user))
+ {
+ log.info("SSO 鐧诲綍锛氱敤鎴� {} 涓嶅瓨鍦�.", username);
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL,
+ MessageUtils.message("user.not.exists")));
+ throw new UserNotExistsException();
+ }
+ if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
+ {
+ log.info("SSO 鐧诲綍锛氱敤鎴� {} 宸茶鍒犻櫎.", username);
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL,
+ MessageUtils.message("user.password.delete")));
+ throw new ServiceException(MessageUtils.message("user.password.delete"));
+ }
+ if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
+ {
+ log.info("SSO 鐧诲綍锛氱敤鎴� {} 宸茶鍋滅敤.", username);
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL,
+ MessageUtils.message("user.blocked")));
+ throw new ServiceException(MessageUtils.message("user.blocked"));
+ }
+ // 鍏嶅瘑锛氱洿鎺ユ瀯閫� LoginUser锛堜笉璋冪敤 passwordService.validate锛�
+ LoginUser loginUser = (LoginUser) userDetailsService.createLoginUser(user);
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS,
+ "娴疆闂ㄦ埛 SSO 鐧诲綍"));
+ recordLoginInfo(user.getUserId());
+ return tokenService.createToken(loginUser);
+ }
+
}
--
Gitblit v1.9.3