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 858eb12..caa0352 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,7 +6,6 @@ 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; @@ -18,7 +17,6 @@ import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.impl.SysRoleServiceImpl; import com.ruoyi.system.service.impl.SysUserServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -64,9 +62,6 @@ public class SsoService { @Autowired private SysUserRoleMapper sysUserRoleMapper; - @Autowired - private SysRoleServiceImpl sysRoleService; - //一体机,pc个人,企业 @Value("${lc_web_auth.appId}") String webAppId; @@ -253,11 +248,7 @@ public class SsoService { if (sysUser == null) { sysUser = saveSysUser(userJson, appUser.getUserId()); } - //设置角色 - 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,11 +334,7 @@ public class SsoService { if (sysUser == null) { sysUser = saveSysUser(userJson, appUserId); } - //设置角色 - List roles = sysRoleService.selectRolesByUserId(sysUser.getUserId()); - if (sysUser != null) { - sysUser.setRoles(roles); - } + //用户存在,生成本系统用户的token String token = loginSysUser(sysUser, userJson.getString("userName")); JSONObject backJson = new JSONObject();