mirror of
https://gitee.com/dromara/RuoYi-Cloud-Plus.git
synced 2025-10-18 07:53:55 +00:00
update 优化 getLoginUser 方法 支持返回多种类型登陆实体
This commit is contained in:
@@ -62,23 +62,25 @@ public class LoginHelper {
|
|||||||
/**
|
/**
|
||||||
* 获取用户(多级缓存)
|
* 获取用户(多级缓存)
|
||||||
*/
|
*/
|
||||||
public static LoginUser getLoginUser() {
|
@SuppressWarnings("unchecked cast")
|
||||||
|
public static <T extends LoginUser> T getLoginUser() {
|
||||||
SaSession session = StpUtil.getTokenSession();
|
SaSession session = StpUtil.getTokenSession();
|
||||||
if (ObjectUtil.isNull(session)) {
|
if (ObjectUtil.isNull(session)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return (LoginUser) session.get(LOGIN_USER_KEY);
|
return (T) session.get(LOGIN_USER_KEY);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取用户基于token
|
* 获取用户基于token
|
||||||
*/
|
*/
|
||||||
public static LoginUser getLoginUser(String token) {
|
@SuppressWarnings("unchecked cast")
|
||||||
|
public static <T extends LoginUser> T getLoginUser(String token) {
|
||||||
SaSession session = StpUtil.getTokenSessionByToken(token);
|
SaSession session = StpUtil.getTokenSessionByToken(token);
|
||||||
if (ObjectUtil.isNull(session)) {
|
if (ObjectUtil.isNull(session)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return (LoginUser) session.get(LOGIN_USER_KEY);
|
return (T) session.get(LOGIN_USER_KEY);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -191,7 +193,11 @@ public class LoginHelper {
|
|||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public static boolean isTenantAdmin() {
|
public static boolean isTenantAdmin() {
|
||||||
return Convert.toBool(isTenantAdmin(getLoginUser().getRolePermission()));
|
LoginUser loginUser = getLoginUser();
|
||||||
|
if (loginUser == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return Convert.toBool(isTenantAdmin(loginUser.getRolePermission()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user