From aec0e227479de49213185ff6bb98d4e99b35eb8b Mon Sep 17 00:00:00 2001
From: thiszhc <2029364173@qq.com>
Date: 星期五, 16 六月 2023 20:34:23 +0800
Subject: [PATCH] Merge branch '5.X' of https://gitee.com/dromara/RuoYi-Vue-Plus into JustAuth
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 91 ++++++++++++++++++++++-----------------------
1 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
index 3628b05..479c390 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
@@ -44,6 +44,7 @@
import org.dromara.system.service.ISysPermissionService;
import org.dromara.system.service.ISysTenantService;
import org.dromara.system.service.ISysUserService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -181,27 +182,49 @@
return R.fail("瀵逛笉璧凤紝鎺堟潈淇℃伅楠岃瘉涓嶉�氳繃锛岃閫�鍑洪噸璇曪紒");
}
AuthUser authUserData = authUser.getData();
- // 鏌ヨ绀句氦鐢ㄦ埛淇℃伅锛屽垽鏂槸鍚﹀凡缁忕粦瀹氾紝濡傛灉宸茬粡缁戝畾鍒欑洿鎺ョ櫥褰曪紝鍚﹀垯楠岃瘉鏄惁鐧诲綍锛屾湭鐧诲綍鍒欏厛鐧诲綍鍐嶇粦瀹�
- SocialUserVo user = socialUserService.selectSocialUserByAuthId(source + authUserData.getUuid());
+ String authId = source + authUserData.getUuid();
+
+ SocialUserVo user = socialUserService.selectSocialUserByAuthId(authId);
if (ObjectUtil.isNotNull(user)) {
- checkTenant(user.getTenantId());
- SysUserVo dbUser = loadUserByUsername(user.getTenantId(), user.getUserName());
- LoginHelper.loginByDevice(buildLoginUser(dbUser), DeviceType.SOCIAL);
- recordLogininfor(dbUser.getTenantId(), user.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
- recordLoginInfo(user.getUserId());
+ //鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
+ return loginAndRecord(user.getTenantId(), user.getUserName(), authUserData);
} else {
// 鍒ゆ柇鏄惁宸茬櫥褰�
if (LoginHelper.getUserId() == null) {
return R.fail("鎺堟潈澶辫触锛岃鍏堢櫥褰曞啀缁戝畾");
}
SocialUserBo socialUserBo = new SocialUserBo();
- socialUserService.insertByBo(setAuthUserData(authUserData, socialUserBo));
+ socialUserBo.setUserId(LoginHelper.getUserId());
+ socialUserBo.setAuthId(authUserData.getSource() + authUserData.getUuid());
+ socialUserBo.setSource(authUserData.getSource());
+ socialUserBo.setUserName(authUserData.getUsername());
+ socialUserBo.setNickName(authUserData.getNickname());
+ socialUserBo.setAvatar(authUserData.getAvatar());
+ socialUserBo.setOpenId(authUserData.getUuid());
+ BeanUtils.copyProperties(authUserData, socialUserBo);
+ BeanUtils.copyProperties(authUserData.getToken(), socialUserBo);
+
+ socialUserService.insertByBo(socialUserBo);
SysUserVo lodingData = loadUserByUsername(LoginHelper.getTenantId(), LoginHelper.getUsername());
- checkTenant(lodingData.getTenantId());
- LoginHelper.loginByDevice(buildLoginUser(lodingData), DeviceType.SOCIAL);
- recordLogininfor(lodingData.getTenantId(), socialUserBo.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
- recordLoginInfo(socialUserBo.getUserId());
+ //鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
+ return loginAndRecord(lodingData.getTenantId(), socialUserBo.getUserName(), authUserData);
}
+ }
+
+ /**
+ * 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
+ *
+ * @param tenantId 绉熸埛ID
+ * @param userName 鐢ㄦ埛鍚�
+ * @param authUser 鎺堟潈鐢ㄦ埛淇℃伅
+ * @return 缁熶竴鍝嶅簲瀹炰綋
+ */
+ private R<String> loginAndRecord(String tenantId, String userName, AuthUser authUser) {
+ checkTenant(tenantId);
+ SysUserVo dbUser = loadUserByUsername(tenantId, userName);
+ LoginHelper.loginByDevice(buildLoginUser(dbUser), DeviceType.SOCIAL);
+ recordLogininfor(dbUser.getTenantId(), userName, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
+ recordLoginInfo(dbUser.getUserId());
return R.ok(StpUtil.getTokenValue());
}
@@ -322,7 +345,7 @@
private SysUserVo loadUserByEmail(String tenantId, String email) {
SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
- .select(SysUser::getPhonenumber, SysUser::getStatus)
+ .select(SysUser::getEmail, SysUser::getStatus)
.eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
.eq(SysUser::getEmail, email));
if (ObjectUtil.isNull(user)) {
@@ -391,25 +414,24 @@
String errorKey = GlobalConstants.PWD_ERR_CNT_KEY + username;
String loginFail = Constants.LOGIN_FAIL;
- // 鑾峰彇鐢ㄦ埛鐧诲綍閿欒娆℃暟(鍙嚜瀹氫箟闄愬埗绛栫暐 渚嬪: key + username + ip)
- Integer errorNumber = RedisUtils.getCacheObject(errorKey);
+ // 鑾峰彇鐢ㄦ埛鐧诲綍閿欒娆℃暟锛岄粯璁や负0 (鍙嚜瀹氫箟闄愬埗绛栫暐 渚嬪: key + username + ip)
+ int errorNumber = ObjectUtil.defaultIfNull(RedisUtils.getCacheObject(errorKey), 0);
// 閿佸畾鏃堕棿鍐呯櫥褰� 鍒欒涪鍑�
- if (ObjectUtil.isNotNull(errorNumber) && errorNumber.equals(maxRetryCount)) {
+ if (errorNumber >= maxRetryCount) {
recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
}
if (supplier.get()) {
- // 鏄惁绗竴娆�
- errorNumber = ObjectUtil.isNull(errorNumber) ? 1 : errorNumber + 1;
+ // 閿欒娆℃暟閫掑
+ errorNumber++;
+ RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime));
// 杈惧埌瑙勫畾閿欒娆℃暟 鍒欓攣瀹氱櫥褰�
- if (errorNumber.equals(maxRetryCount)) {
- RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime));
+ if (errorNumber >= maxRetryCount) {
recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
} else {
- // 鏈揪鍒拌瀹氶敊璇鏁� 鍒欓�掑
- RedisUtils.setCacheObject(errorKey, errorNumber);
+ // 鏈揪鍒拌瀹氶敊璇鏁�
recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitCount(), errorNumber));
throw new UserException(loginType.getRetryLimitCount(), errorNumber);
}
@@ -440,29 +462,4 @@
}
}
-
- public SocialUserBo setAuthUserData(AuthUser authUserData, SocialUserBo socialUser) {
- socialUser.setUserId(LoginHelper.getUserId());
- socialUser.setAuthId(authUserData.getSource() + authUserData.getUuid());
- socialUser.setSource(authUserData.getSource());
- socialUser.setUserName(authUserData.getUsername());
- socialUser.setNickName(authUserData.getNickname());
- socialUser.setAvatar(authUserData.getAvatar());
- socialUser.setEmail(authUserData.getEmail());
- socialUser.setOpenId(authUserData.getUuid());
- socialUser.setAccessToken(authUserData.getToken().getAccessToken());
- socialUser.setExpireIn(authUserData.getToken().getExpireIn());
- socialUser.setRefreshToken(authUserData.getToken().getRefreshToken());
- socialUser.setAccessCode(authUserData.getToken().getAccessCode());
- socialUser.setUnionId(authUserData.getToken().getUnionId());
- socialUser.setScope(authUserData.getToken().getScope());
- socialUser.setTokenType(authUserData.getToken().getTokenType());
- socialUser.setIdToken(authUserData.getToken().getIdToken());
- socialUser.setMacAlgorithm(authUserData.getToken().getMacAlgorithm());
- socialUser.setMacKey(authUserData.getToken().getMacKey());
- socialUser.setCode(authUserData.getToken().getCode());
- socialUser.setOauthToken(authUserData.getToken().getOauthToken());
- socialUser.setOauthTokenSecret(authUserData.getToken().getOauthTokenSecret());
- return socialUser;
- }
}
--
Gitblit v1.9.3