opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 02:08:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !121 from zendwang/satoken

Browse Source
This commit is contained in:
zendwang 2021-12-03 06:10:21 +00:00 committed by Gitee
commit 3359213cb9
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
View File

@ -1,10 +1,10 @@
package com.ruoyi.common.utils; package com.ruoyi.common.utils;
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.http.HttpStatus; import cn.hutool.http.HttpStatus;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.spring.SpringUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
/** /**
@ -47,7 +47,9 @@ public class SecurityUtils {
**/ **/
public static SysUser getUser() { public static SysUser getUser() {
try { try {
return SpringUtils.getBean(UserService.class).selectUserById(getUserId()); SaSession session = StpUtil.getSession();
SysUser currentUser = session.getModel("currentUser", SysUser.class);
return currentUser;
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException("获取用户信息异常", HttpStatus.HTTP_UNAUTHORIZED); throw new ServiceException("获取用户信息异常", HttpStatus.HTTP_UNAUTHORIZED);
} }

5
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
@ -14,7 +15,6 @@ import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
import com.ruoyi.common.utils.*; import com.ruoyi.common.utils.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -73,6 +73,9 @@ public class SysLoginService {
recordLoginInfo(user.getUserId(), username); recordLoginInfo(user.getUserId(), username);
// 生成token // 生成token
LoginUtils.loginByDevice(user.getUserId(), UserType.SYS_USER, DeviceType.PC); LoginUtils.loginByDevice(user.getUserId(), UserType.SYS_USER, DeviceType.PC);
// 保存用户信息到UserSession
SaSession session = StpUtil.getSession(true);
session.set("currentUser", user);
return StpUtil.getTokenValue(); return StpUtil.getTokenValue();
} }