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 09:49:47 +08:00
parent 5315d91bfe
commit 666d2744e4
2 changed files with 10 additions and 9 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,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<SysRole> roles = sysRoleService.selectRolesByUserId(sysUser.getUserId());
// if (sysUser != null) {
// sysUser.setRoles(roles);
// }
List<SysRole> 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<SysRole> roles = sysRoleService.selectRolesByUserId(sysUser.getUserId());
// if (sysUser != null) {
// sysUser.setRoles(roles);
// }
List<SysRole> roles = sysRoleService.selectRolesByUserId(sysUser.getUserId());
if (sysUser != null) {
sysUser.setRoles(roles);
}
//用户存在，生成本系统用户的token
String token = loginSysUser(sysUser, userJson.getString("userName"));
JSONObject backJson = new JSONObject();

2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
View File

@@ -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);
}