From 5315d91bfeeb1f29610347aad09baec85a85f819 Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Tue, 26 May 2026 00:17:14 +0800 Subject: [PATCH] update --- .../framework/web/service/SsoService.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 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 d8f8fb6..1af7bb3 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,13 +6,11 @@ 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; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.encrypt.EncryptUtil; import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.framework.manager.AsyncManager; @@ -255,10 +253,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(); @@ -345,10 +343,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();