zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
chenyanchang
2026-05-26 00:17:14 +08:00
parent f198ddfd55
commit 5315d91bfe
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
View File

@@ -6,13 +6,11 @@ import com.ruoyi.cms.service.impl.AppUserServiceImpl;
import com.ruoyi.cms.util.StringUtil; import com.ruoyi.cms.util.StringUtil;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.AppUser; 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.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginSiteUser; import com.ruoyi.common.core.domain.model.LoginSiteUser;
import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.encrypt.EncryptUtil; import com.ruoyi.common.utils.encrypt.EncryptUtil;
import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.AsyncManager;
@@ -255,10 +253,10 @@ public class SsoService {
sysUser = saveSysUser(userJson, appUser.getUserId()); sysUser = saveSysUser(userJson, appUser.getUserId());
} }
//设置角色 //设置角色
List<SysRole> roles = sysRoleService.selectRolesByUserId(sysUser.getUserId()); // List<SysRole> roles = sysRoleService.selectRolesByUserId(sysUser.getUserId());
if (sysUser != null) { // if (sysUser != null) {
sysUser.setRoles(roles); // sysUser.setRoles(roles);
} // }
//用户存在，生成本系统用户的token //用户存在，生成本系统用户的token
String token = loginSysUser(sysUser, userJson.getString("userName")); String token = loginSysUser(sysUser, userJson.getString("userName"));
JSONObject backJson = new JSONObject(); JSONObject backJson = new JSONObject();
@@ -345,10 +343,10 @@ public class SsoService {
sysUser = saveSysUser(userJson, appUserId); sysUser = saveSysUser(userJson, appUserId);
} }
//设置角色 //设置角色
List<SysRole> roles = sysRoleService.selectRolesByUserId(sysUser.getUserId()); // List<SysRole> roles = sysRoleService.selectRolesByUserId(sysUser.getUserId());
if (sysUser != null) { // if (sysUser != null) {
sysUser.setRoles(roles); // sysUser.setRoles(roles);
} // }
//用户存在，生成本系统用户的token //用户存在，生成本系统用户的token
String token = loginSysUser(sysUser, userJson.getString("userName")); String token = loginSysUser(sysUser, userJson.getString("userName"));
JSONObject backJson = new JSONObject(); JSONObject backJson = new JSONObject();