From 8573ffdd7f2da009c9adad9f5eb9f50810c2f184 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 25 六月 2023 22:19:27 +0800
Subject: [PATCH] update satoken 1.34.0 => 1.35.0.RC 优化过期配置 支持多端token自定义有效期
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 91 ++++++++++++++++++++-------------------------
1 files changed, 41 insertions(+), 50 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 84c554d..52bf56c 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
@@ -6,7 +6,6 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthResponse;
@@ -33,22 +32,18 @@
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.common.web.config.properties.CaptchaProperties;
import org.dromara.system.domain.SysUser;
-import org.dromara.system.domain.bo.SocialUserBo;
-import org.dromara.system.domain.bo.SysUserBo;
-import org.dromara.system.domain.vo.SocialUserVo;
+import org.dromara.system.domain.bo.SysSocialBo;
+import org.dromara.system.domain.vo.SysSocialVo;
import org.dromara.system.domain.vo.SysTenantVo;
import org.dromara.system.domain.vo.SysUserVo;
-import org.dromara.system.mapper.SocialUserMapper;
import org.dromara.system.mapper.SysUserMapper;
-import org.dromara.system.service.ISocialUserService;
+import org.dromara.system.service.ISysSocialService;
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;
-import java.io.IOException;
import java.time.Duration;
import java.util.Date;
import java.util.List;
@@ -65,8 +60,7 @@
public class SysLoginService {
private final SysUserMapper userMapper;
- private final ISocialUserService socialUserService;
- private final ISysUserService userService;
+ private final ISysSocialService sysSocialService;
private final CaptchaProperties captchaProperties;
private final ISysPermissionService permissionService;
private final ISysTenantService tenantService;
@@ -173,58 +167,56 @@
*
* @param source 鐧诲綍鏉ユ簮
* @param authUser 鎺堟潈鍝嶅簲瀹炰綋
- * @param request Http璇锋眰瀵硅薄
* @return 缁熶竴鍝嶅簲瀹炰綋
*/
- public R<String> socialLogin(String source, AuthResponse<AuthUser> authUser, HttpServletRequest request) throws IOException {
+ public R<String> socialLogin(String source, AuthResponse<AuthUser> authUser) {
// 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛
if (!authUser.ok()) {
return R.fail("瀵逛笉璧凤紝鎺堟潈淇℃伅楠岃瘉涓嶉�氳繃锛岃閫�鍑洪噸璇曪紒");
}
AuthUser authUserData = authUser.getData();
- String authId = source + authUserData.getUuid();
-
- SocialUserVo user = socialUserService.selectSocialUserByAuthId(authId);
- if (ObjectUtil.isNotNull(user)) {
- //鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
+ SysSocialVo social = sysSocialService.selectByAuthId(authUserData.getSource() + authUserData.getUuid());
+ if (ObjectUtil.isNotNull(social)) {
+ SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getUserId, social.getUserId()));
+ // 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
return loginAndRecord(user.getTenantId(), user.getUserName(), authUserData);
} else {
// 鍒ゆ柇鏄惁宸茬櫥褰�
- if (LoginHelper.getUserId() == null) {
- return R.fail("鎺堟潈澶辫触锛岃鍏堢櫥褰曞啀缁戝畾");
+ if (!StpUtil.isLogin()) {
+ return R.fail("鎺堟潈澶辫触锛岃鍏堢櫥褰曟墠鑳界粦瀹�");
}
- SocialUserBo socialUserBo = new 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);
+ SysSocialBo bo = new SysSocialBo();
+ bo.setUserId(LoginHelper.getUserId());
+ bo.setAuthId(authUserData.getSource() + authUserData.getUuid());
+ bo.setSource(authUserData.getSource());
+ bo.setUserName(authUserData.getUsername());
+ bo.setNickName(authUserData.getNickname());
+ bo.setAvatar(authUserData.getAvatar());
+ bo.setOpenId(authUserData.getUuid());
+ BeanUtils.copyProperties(authUserData.getToken(), bo);
- socialUserService.insertByBo(socialUserBo);
- SysUserVo lodingData = loadUserByUsername(LoginHelper.getTenantId(), LoginHelper.getUsername());
- //鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
- return loginAndRecord(lodingData.getTenantId(), socialUserBo.getUserName(), authUserData);
+ sysSocialService.insertByBo(bo);
+ SysUserVo sysUser = loadUserByUsername(LoginHelper.getTenantId(), LoginHelper.getUsername());
+ // 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
+ return loginAndRecord(sysUser.getTenantId(), sysUser.getUserName(), authUserData);
}
}
/**
* 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
*
- * @param tenantId 绉熸埛ID
- * @param userName 鐢ㄦ埛鍚�
- * @param authUser 鎺堟潈鐢ㄦ埛淇℃伅
+ * @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());
+ SysUserVo user = loadUserByUsername(tenantId, userName);
+ LoginHelper.loginByDevice(buildLoginUser(user), DeviceType.SOCIAL);
+ recordLogininfor(user.getTenantId(), userName, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
+ recordLoginInfo(user.getUserId());
return R.ok(StpUtil.getTokenValue());
}
@@ -345,7 +337,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)) {
@@ -414,25 +406,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);
}
--
Gitblit v1.9.3