调整代码逻辑

soc-common/soc-common-security/src/main/java/com/xunmei/common/security/service/TokenService.java

@@ -234,15 +234,10 @@ public class TokenService {
         String userKey = getTokenKey(loginUser.getToken(), String.valueOf(loginUser.getUserid()), loginUser.getPlatformType());
 //        remoteUserService.userLoginInfo(loginUser.getUserid(), DateUtils.getNowDate(), loginUser.getIpaddr(), SecurityConstants.INNER);
         //登陆后删除之前的token
-        // admin 用户的 ID 是1 按前缀删除缓存时 会把其他人的Token都删除掉， 固排除 admin
- /*       if (!"admin".equals(loginUser.getSysUser().getUsername())) {
-            String userKeyPrefix = getTokenKey(loginUser.getUserid().toString() + "_" + loginUser.getPlatformType());
-            RedisUtils.deleteByPrefix(userKeyPrefix);
-        }*/
+        String userKeyPrefix = ACCESS_TOKEN + loginUser.getUserid().toString() + ":" + loginUser.getPlatformType();
+        RedisUtils.deleteByPrefix(userKeyPrefix);
 
         RedisUtils.setCacheObject(userKey, loginUser, Duration.ofMinutes(configExpireTime));
-        //redisService.deleteByPrefix(userKey);
-        // redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
     }
 
     /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -154,9 +154,8 @@ public class SysUserController extends BaseController {
             return R.fail("用户名或密码错误");
         }
         //获取当前用户的角色数据。
-   /*     List<SysRole> sysRoles = roleService.selectRolesByUserId(sysUser.getId());
-        sysUser.setRoles(sysRoles);*/
-
+        List<SysRole> sysRoles = roleService.selectRolesByUserId(sysUser.getId());
+        sysUser.setRoles(sysRoles);
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(sysUser);
         // 权限集合