Commit bece8e86 by wang_jiaxing

登陆接口修改

parent a35cdb66
...@@ -85,7 +85,7 @@ public class TokenUtil { ...@@ -85,7 +85,7 @@ public class TokenUtil {
authInfo.setAccount(user.getUsername()); authInfo.setAccount(user.getUsername());
authInfo.setUserId(user.getId()); authInfo.setUserId(user.getId());
authInfo.setUserName(user.getTrueName()); authInfo.setUserName(user.getTrueName());
authInfo.setAuthority(Func.join(userInfo.getRoles())); authInfo.setAuthority(user.getUserRolesStr());
authInfo.setPermission(Func.join(userInfo.getPermissions())); authInfo.setPermission(Func.join(userInfo.getPermissions()));
authInfo.setAccessToken(accessToken.getToken()); authInfo.setAccessToken(accessToken.getToken());
authInfo.setExpiresIn(accessToken.getExpire()); authInfo.setExpiresIn(accessToken.getExpire());
......
...@@ -204,10 +204,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement ...@@ -204,10 +204,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
} }
} }
userInfo.setUser(userNew); userInfo.setUser(userNew);
if (userNew != null) { // if (userNew != null) {
userInfo.setPermissions(userNew.getUserMenus()); // userInfo.setPermissions(userNew.getUserMenus());
userInfo.setRoles(userNew.getUserRoles()); // userInfo.setRoles(userNew.getUserRoles());
} // }
// if (Func.isNotEmpty(userNew)) { // if (Func.isNotEmpty(userNew)) {
// List<String> roleAlias = baseMapper.getRoleAlias(Func.toStrArray(user.getRoleId())); // List<String> roleAlias = baseMapper.getRoleAlias(Func.toStrArray(user.getRoleId()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment