From 9318f182b0a226d1a55d5989e37f037d1b87c910 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 17 八月 2024 10:10:51 +0800
Subject: [PATCH] reset 回滚 修改spring源码上下文持有者(存在数据未清理内存泄漏问题)
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 163 ++++++++++++++++++++++--------------------------------
1 files changed, 67 insertions(+), 96 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 88500b2..c7ad917 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
@@ -1,42 +1,36 @@
package org.dromara.web.service;
import cn.dev33.satoken.exception.NotLoginException;
-import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Opt;
import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.lock.annotation.Lock4j;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser;
+import org.dromara.common.core.constant.CacheConstants;
import org.dromara.common.core.constant.Constants;
-import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.constant.TenantConstants;
-import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.dto.RoleDTO;
import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.core.enums.DeviceType;
import org.dromara.common.core.enums.LoginType;
import org.dromara.common.core.enums.TenantStatus;
-import org.dromara.common.core.enums.UserStatus;
+import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.exception.user.UserException;
import org.dromara.common.core.utils.*;
import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.mybatis.helper.DataPermissionHelper;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.exception.TenantException;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.domain.SysUser;
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.domain.vo.*;
import org.dromara.system.mapper.SysUserMapper;
-import org.dromara.system.service.ISysPermissionService;
-import org.dromara.system.service.ISysSocialService;
-import org.dromara.system.service.ISysTenantService;
-import org.springframework.beans.BeanUtils;
+import org.dromara.system.service.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -64,68 +58,49 @@
private final ISysTenantService tenantService;
private final ISysPermissionService permissionService;
private final ISysSocialService sysSocialService;
+ private final ISysRoleService roleService;
+ private final ISysDeptService deptService;
private final SysUserMapper userMapper;
- /**
- * 绀句氦鐧诲綍
- *
- * @param source 鐧诲綍鏉ユ簮
- * @param authUser 鎺堟潈鍝嶅簲瀹炰綋
- * @return 缁熶竴鍝嶅簲瀹炰綋
- */
- public R<String> socialLogin(String source, AuthResponse<AuthUser> authUser) {
- // 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛
- if (!authUser.ok()) {
- return R.fail("瀵逛笉璧凤紝鎺堟潈淇℃伅楠岃瘉涓嶉�氳繃锛岃閫�鍑洪噸璇曪紒");
- }
- AuthUser authUserData = authUser.getData();
- 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 (!StpUtil.isLogin()) {
- return R.fail("鎺堟潈澶辫触锛岃鍏堢櫥褰曟墠鑳界粦瀹�");
- }
- 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);
+ /**
+ * 缁戝畾绗笁鏂圭敤鎴�
+ *
+ * @param authUserData 鎺堟潈鍝嶅簲瀹炰綋
+ */
+ @Lock4j
+ public void socialRegister(AuthUser authUserData) {
+ String authId = authUserData.getSource() + authUserData.getUuid();
+ // 绗笁鏂圭敤鎴蜂俊鎭�
+ SysSocialBo bo = BeanUtil.toBean(authUserData, SysSocialBo.class);
+ BeanUtil.copyProperties(authUserData.getToken(), bo);
+ Long userId = LoginHelper.getUserId();
+ bo.setUserId(userId);
+ bo.setAuthId(authId);
+ bo.setOpenId(authUserData.getUuid());
+ bo.setUserName(authUserData.getUsername());
+ bo.setNickName(authUserData.getNickname());
+ List<SysSocialVo> checkList = sysSocialService.selectByAuthId(authId);
+ if (CollUtil.isNotEmpty(checkList)) {
+ throw new ServiceException("姝や笁鏂硅处鍙峰凡缁忚缁戝畾!");
+ }
+ // 鏌ヨ鏄惁宸茬粡缁戝畾鐢ㄦ埛
+ SysSocialBo params = new SysSocialBo();
+ params.setUserId(userId);
+ params.setSource(bo.getSource());
+ List<SysSocialVo> list = sysSocialService.queryList(params);
+ if (CollUtil.isEmpty(list)) {
+ // 娌℃湁缁戝畾鐢ㄦ埛, 鏂板鐢ㄦ埛淇℃伅
sysSocialService.insertByBo(bo);
- SysUserVo sysUser = loadUserByUsername(LoginHelper.getTenantId(), LoginHelper.getUsername());
- // 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
- return loginAndRecord(sysUser.getTenantId(), sysUser.getUserName(), authUserData);
+ } else {
+ // 鏇存柊鐢ㄦ埛淇℃伅
+ bo.setId(list.get(0).getId());
+ sysSocialService.updateByBo(bo);
+ // 濡傛灉瑕佺粦瀹氱殑骞冲彴璐﹀彿宸茬粡琚粦瀹氳繃浜� 鏄惁鎶涘紓甯歌嚜琛屽喅鏂�
+ // throw new ServiceException("姝ゅ钩鍙拌处鍙峰凡缁忚缁戝畾!");
}
}
- /**
- * 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
- *
- * @param tenantId 绉熸埛ID
- * @param userName 鐢ㄦ埛鍚�
- * @param authUser 鎺堟潈鐢ㄦ埛淇℃伅
- * @return 缁熶竴鍝嶅簲瀹炰綋
- */
- private R<String> loginAndRecord(String tenantId, String userName, AuthUser authUser) {
- checkTenant(tenantId);
- SysUserVo user = loadUserByUsername(tenantId, userName);
- SaLoginModel model = new SaLoginModel();
- model.setDevice(DeviceType.PC.getDevice());
- // 鐢熸垚token
- LoginHelper.login(buildLoginUser(user), model);
- recordLogininfor(user.getTenantId(), userName, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
- recordLoginInfo(user.getUserId());
- return R.ok(StpUtil.getTokenValue());
- }
/**
* 閫�鍑虹櫥褰�
@@ -133,13 +108,20 @@
public void logout() {
try {
LoginUser loginUser = LoginHelper.getLoginUser();
+ if (ObjectUtil.isNull(loginUser)) {
+ return;
+ }
if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
// 瓒呯骇绠＄悊鍛� 鐧诲嚭娓呴櫎鍔ㄦ�佺鎴�
TenantHelper.clearDynamic();
}
- StpUtil.logout();
recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
} catch (NotLoginException ignored) {
+ } finally {
+ try {
+ StpUtil.logout();
+ } catch (NotLoginException ignored) {
+ }
}
}
@@ -161,25 +143,6 @@
SpringUtils.context().publishEvent(logininforEvent);
}
-
- private SysUserVo loadUserByUsername(String tenantId, String username) {
- SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
- .select(SysUser::getUserName, SysUser::getStatus)
- .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
- .eq(SysUser::getUserName, username));
- if (ObjectUtil.isNull(user)) {
- log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦�.", username);
- throw new UserException("user.not.exists", username);
- } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
- log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", username);
- throw new UserException("user.blocked", username);
- }
- if (TenantHelper.isEnable()) {
- return userMapper.selectTenantUserByUserName(username, tenantId);
- }
- return userMapper.selectUserByUserName(username);
- }
-
/**
* 鏋勫缓鐧诲綍鐢ㄦ埛
*/
@@ -189,12 +152,17 @@
loginUser.setUserId(user.getUserId());
loginUser.setDeptId(user.getDeptId());
loginUser.setUsername(user.getUserName());
+ loginUser.setNickname(user.getNickName());
loginUser.setUserType(user.getUserType());
loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
- loginUser.setDeptName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName());
- List<RoleDTO> roles = BeanUtil.copyToList(user.getRoles(), RoleDTO.class);
- loginUser.setRoles(roles);
+ if (ObjectUtil.isNotNull(user.getDeptId())) {
+ Opt<SysDeptVo> deptOpt = Opt.of(user.getDeptId()).map(deptService::selectDeptById);
+ loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY));
+ loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY));
+ }
+ List<SysRoleVo> roles = roleService.selectRolesByUserId(user.getUserId());
+ loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
return loginUser;
}
@@ -203,20 +171,20 @@
*
* @param userId 鐢ㄦ埛ID
*/
- public void recordLoginInfo(Long userId) {
+ public void recordLoginInfo(Long userId, String ip) {
SysUser sysUser = new SysUser();
sysUser.setUserId(userId);
- sysUser.setLoginIp(ServletUtils.getClientIP());
+ sysUser.setLoginIp(ip);
sysUser.setLoginDate(DateUtils.getNowDate());
sysUser.setUpdateBy(userId);
- userMapper.updateById(sysUser);
+ DataPermissionHelper.ignore(() -> userMapper.updateById(sysUser));
}
/**
* 鐧诲綍鏍￠獙
*/
public void checkLogin(LoginType loginType, String tenantId, String username, Supplier<Boolean> supplier) {
- String errorKey = GlobalConstants.PWD_ERR_CNT_KEY + username;
+ String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username;
String loginFail = Constants.LOGIN_FAIL;
// 鑾峰彇鐢ㄦ埛鐧诲綍閿欒娆℃暟锛岄粯璁や负0 (鍙嚜瀹氫箟闄愬埗绛栫暐 渚嬪: key + username + ip)
@@ -258,6 +226,9 @@
if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
return;
}
+ if (StringUtils.isBlank(tenantId)) {
+ throw new TenantException("tenant.number.not.blank");
+ }
SysTenantVo tenant = tenantService.queryByTenantId(tenantId);
if (ObjectUtil.isNull(tenant)) {
log.info("鐧诲綍绉熸埛锛歿} 涓嶅瓨鍦�.", tenantId);
--
Gitblit v1.9.3