Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zhny
Project
Project
Details
Activity
Releases
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
王夏晖
zhny
Commits
6663bf07
Commit
6663bf07
authored
May 21, 2018
by
王夏晖
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
密码重置,权限菜单完善
parent
505231d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
LoginController.java
...soft/business/system/user/controller/LoginController.java
+3
-3
UserServiceImpl.java
...ft/business/system/user/service/impl/UserServiceImpl.java
+2
-0
No files found.
src/main/java/org/rcisoft/business/system/user/controller/LoginController.java
View file @
6663bf07
...
...
@@ -53,9 +53,9 @@ public class LoginController extends PaginationController<SysUser> {
@ApiOperation
(
value
=
"修改密码"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"newPassWord"
,
value
=
"新密码"
,
required
=
true
,
dataType
=
"varchar"
,
paramType
=
"body"
),
@ApiImplicitParam
(
name
=
"oldPassWord"
,
value
=
"旧密码"
,
required
=
true
,
dataType
=
"varchar"
,
paramType
=
"body"
)})
@
Pu
tMapping
(
value
=
"/updatePassWord"
)
@
Reques
tMapping
(
value
=
"/updatePassWord"
)
@ResponseBody
public
Result
updatePassWord
(
@Request
Body
String
newPassWord
,
@RequestBody
String
oldPassWord
){
public
Result
updatePassWord
(
@Request
Param
String
newPassWord
,
@RequestParam
String
oldPassWord
){
String
userId
=
UserUtil
.
getUserInfoProp
(
getToken
(),
UserUtil
.
USER_ID
);
int
flag
=
userService
.
updatePassWord
(
newPassWord
,
oldPassWord
,
userId
);
return
Result
.
builder
(
new
PersistModel
(
flag
));
...
...
@@ -68,7 +68,7 @@ public class LoginController extends PaginationController<SysUser> {
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"needUserId"
,
value
=
"需要修改密码的用户的ID"
,
required
=
true
,
dataType
=
"varchar"
,
paramType
=
"body"
)})
@ResponseBody
@PutMapping
(
value
=
"/resetPassWord"
)
public
Result
resetPassWord
(
@Request
Body
String
needUserId
){
public
Result
resetPassWord
(
@Request
Param
String
needUserId
){
String
userId
=
UserUtil
.
getUserInfoProp
(
getToken
(),
UserUtil
.
USER_ID
);
int
flag
=
userService
.
resetPassWord
(
userId
,
needUserId
);
return
Result
.
builder
(
new
PersistModel
(
flag
));
...
...
src/main/java/org/rcisoft/business/system/user/service/impl/UserServiceImpl.java
View file @
6663bf07
...
...
@@ -337,6 +337,7 @@ public class UserServiceImpl implements UserService {
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"id"
,
tmap
.
get
(
"MENU_ID"
));
map
.
put
(
"label"
,
tmap
.
get
(
"MENU_NM"
));
map
.
put
(
"url"
,
tmap
.
get
(
"MENU_URL"
));
result
.
add
(
map
);
}
}
...
...
@@ -347,6 +348,7 @@ public class UserServiceImpl implements UserService {
if
(
tmap
.
get
(
"MENU_PID"
)!=
null
&&
tmap
.
get
(
"MENU_PID"
).
toString
().
equals
(
pid
)){
Map
<
String
,
Object
>
m
=
new
HashMap
<>();
m
.
put
(
"id"
,
tmap
.
get
(
"MENU_ID"
));
m
.
put
(
"url"
,
tmap
.
get
(
"MENU_URL"
));
m
.
put
(
"label"
,
tmap
.
get
(
"MENU_NM"
));
childList
.
add
(
m
);
}
...
...
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