github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

v1.9 发布，详情查看发行版说明

pull/62/head^2
zhengjie 2019-05-18 17:53:27 +08:00
parent 343ce346db
commit 4d9cbfe08b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
View File

@ -131,15 +131,15 @@ public class UserController {
/** /**
* 验证密码 * 验证密码
* @param pass * @param user
* @return * @return
*/ */
@GetMapping(value = "/users/validPass/{pass}") @PostMapping(value = "/users/validPass")
public ResponseEntity validPass(@PathVariable String pass){ public ResponseEntity validPass(@RequestBody User user){
UserDetails userDetails = SecurityUtils.getUserDetails(); UserDetails userDetails = SecurityUtils.getUserDetails();
Map map = new HashMap(); Map map = new HashMap();
map.put("status",200); map.put("status",200);
if(!userDetails.getPassword().equals(EncryptUtils.encryptPassword(pass))){ if(!userDetails.getPassword().equals(EncryptUtils.encryptPassword(user.getPassword()))){
map.put("status",400); map.put("status",400);
} }
return new ResponseEntity(map,HttpStatus.OK); return new ResponseEntity(map,HttpStatus.OK);
@ -147,16 +147,16 @@ public class UserController {
/** /**
* 修改密码 * 修改密码
* @param pass * @param user
* @return * @return
*/ */
@GetMapping(value = "/users/updatePass/{pass}") @PostMapping(value = "/users/updatePass")
public ResponseEntity updatePass(@PathVariable String pass){ public ResponseEntity updatePass(@RequestBody User user){
UserDetails userDetails = SecurityUtils.getUserDetails(); UserDetails userDetails = SecurityUtils.getUserDetails();
if(userDetails.getPassword().equals(EncryptUtils.encryptPassword(pass))){ if(userDetails.getPassword().equals(EncryptUtils.encryptPassword(user.getPassword()))){
throw new BadRequestException("新密码不能与旧密码相同"); throw new BadRequestException("新密码不能与旧密码相同");
} }
userService.updatePass(userDetails.getUsername(),EncryptUtils.encryptPassword(pass)); userService.updatePass(userDetails.getUsername(),EncryptUtils.encryptPassword(user.getPassword()));
return new ResponseEntity(HttpStatus.OK); return new ResponseEntity(HttpStatus.OK);
} }