Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-app-report
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
xzxt-app-report
Commits
bece8e86
Commit
bece8e86
authored
Dec 01, 2023
by
wang_jiaxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
登陆接口修改
parent
a35cdb66
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
+1
-1
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+4
-4
No files found.
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
View file @
bece8e86
...
...
@@ -85,7 +85,7 @@ public class TokenUtil {
authInfo
.
setAccount
(
user
.
getUsername
());
authInfo
.
setUserId
(
user
.
getId
());
authInfo
.
setUserName
(
user
.
getTrueName
());
authInfo
.
setAuthority
(
Func
.
join
(
userInfo
.
getRoles
()
));
authInfo
.
setAuthority
(
user
.
getUserRolesStr
(
));
authInfo
.
setPermission
(
Func
.
join
(
userInfo
.
getPermissions
()));
authInfo
.
setAccessToken
(
accessToken
.
getToken
());
authInfo
.
setExpiresIn
(
accessToken
.
getExpire
());
...
...
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
View file @
bece8e86
...
...
@@ -204,10 +204,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
}
}
userInfo
.
setUser
(
userNew
);
if
(
userNew
!=
null
)
{
userInfo
.
setPermissions
(
userNew
.
getUserMenus
());
userInfo
.
setRoles
(
userNew
.
getUserRoles
());
}
//
if (userNew != null) {
//
userInfo.setPermissions(userNew.getUserMenus());
//
userInfo.setRoles(userNew.getUserRoles());
//
}
// if (Func.isNotEmpty(userNew)) {
// List<String> roleAlias = baseMapper.getRoleAlias(Func.toStrArray(user.getRoleId()));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment