From 666d2744e4e374a0a377b28d836459d0f7f788dd Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Tue, 26 May 2026 09:49:47 +0800 Subject: [PATCH] update --- .../ruoyi/framework/web/service/SsoService.java | 17 +++++++++-------- .../framework/web/service/TokenService.java | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java index 1af7bb3..858eb12 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java @@ -6,6 +6,7 @@ import com.ruoyi.cms.service.impl.AppUserServiceImpl; import com.ruoyi.cms.util.StringUtil; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.entity.AppUser; +import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginSiteUser; import com.ruoyi.common.core.domain.model.LoginUser; @@ -253,10 +254,10 @@ public class SsoService { sysUser = saveSysUser(userJson, appUser.getUserId()); } //设置角色 -// List roles = sysRoleService.selectRolesByUserId(sysUser.getUserId()); -// if (sysUser != null) { -// sysUser.setRoles(roles); -// } + List roles = sysRoleService.selectRolesByUserId(sysUser.getUserId()); + if (sysUser != null) { + sysUser.setRoles(roles); + } //用户存在，生成本系统用户的token String token = loginSysUser(sysUser, userJson.getString("userName")); JSONObject backJson = new JSONObject(); @@ -343,10 +344,10 @@ public class SsoService { sysUser = saveSysUser(userJson, appUserId); } //设置角色 -// List roles = sysRoleService.selectRolesByUserId(sysUser.getUserId()); -// if (sysUser != null) { -// sysUser.setRoles(roles); -// } + List roles = sysRoleService.selectRolesByUserId(sysUser.getUserId()); + if (sysUser != null) { + sysUser.setRoles(roles); + } //用户存在，生成本系统用户的token String token = loginSysUser(sysUser, userJson.getString("userName")); JSONObject backJson = new JSONObject(); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java index 626dbd7..0ad5fef 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java @@ -195,7 +195,7 @@ public class TokenService loginUser.setLoginTime(System.currentTimeMillis()); loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE); // 根据uuid将loginUser缓存 - String userKey = getTokenKey(loginUser.getToken(), String.valueOf(loginUser.getUserId())); + String userKey = getTokenKey(String.valueOf(loginUser.getUserId())); redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES); }