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 10:14:19 +08:00
parent 666d2744e4
commit 896198b57f
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,6 @@ 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;
@@ -18,7 +17,6 @@ import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysUserRoleMapper; import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.impl.SysRoleServiceImpl;
import com.ruoyi.system.service.impl.SysUserServiceImpl; import com.ruoyi.system.service.impl.SysUserServiceImpl;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
@@ -64,9 +62,6 @@ public class SsoService {
@Autowired @Autowired
private SysUserRoleMapper sysUserRoleMapper; private SysUserRoleMapper sysUserRoleMapper;
@Autowired
private SysRoleServiceImpl sysRoleService;
//一体机，pc个人，企业 //一体机，pc个人，企业
@Value("${lc_web_auth.appId}") @Value("${lc_web_auth.appId}")
String webAppId; String webAppId;
@@ -253,11 +248,7 @@ public class SsoService {
if (sysUser == null) { if (sysUser == null) {
sysUser = saveSysUser(userJson, appUser.getUserId()); sysUser = saveSysUser(userJson, appUser.getUserId());
} }
//设置角色
List<SysRole> roles = sysRoleService.selectRolesByUserId(sysUser.getUserId());
if (sysUser != null) {
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();
@@ -343,11 +334,7 @@ public class SsoService {
if (sysUser == null) { if (sysUser == null) {
sysUser = saveSysUser(userJson, appUserId); sysUser = saveSysUser(userJson, appUserId);
} }
//设置角色
List<SysRole> roles = sysRoleService.selectRolesByUserId(sysUser.getUserId());
if (sysUser != null) {
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();