update 整合 satoken 权限、鉴权一体化框架

This commit is contained in:
疯狂的狮子li
2021-09-23 19:13:58 +08:00
parent 071c4c1412
commit 553c29ab8a
54 changed files with 653 additions and 1581 deletions

View File

@ -1,11 +1,12 @@
package com.ruoyi.common.utils;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.http.HttpStatus;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.service.IUserService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.spring.SpringUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
/**
* 安全服务工具类
@ -19,14 +20,7 @@ public class SecurityUtils
**/
public static Long getUserId()
{
try
{
return getLoginUser().getUserId();
}
catch (Exception e)
{
throw new ServiceException("获取用户ID异常", HttpStatus.HTTP_UNAUTHORIZED);
}
return StpUtil.getLoginIdAsLong();
}
/**
@ -36,7 +30,7 @@ public class SecurityUtils
{
try
{
return getLoginUser().getDeptId();
return getUser().getDeptId();
}
catch (Exception e)
{
@ -51,7 +45,7 @@ public class SecurityUtils
{
try
{
return getLoginUser().getUsername();
return getUser().getUserName();
}
catch (Exception e)
{
@ -62,11 +56,11 @@ public class SecurityUtils
/**
* 获取用户
**/
public static LoginUser getLoginUser()
public static SysUser getUser()
{
try
{
return (LoginUser) getAuthentication().getPrincipal();
return SpringUtils.getBean(IUserService.class).selectUserById(getUserId());
}
catch (Exception e)
{
@ -74,14 +68,6 @@ public class SecurityUtils
}
}
/**
* 获取Authentication
*/
public static Authentication getAuthentication()
{
return SecurityContextHolder.getContext().getAuthentication();
}
/**
* 生成BCryptPasswordEncoder密码
*