fangyeqing / xkl-interface · Commits

Go to a project

Authored by zhaoyue
Commit d0badda0aa055b5e47f25518eb44c4c1c4fed801 2 parents 69d9b4d2 4c91b635

Merge branch 'zhaoyue-dev3' into 'master' 

MOD admin pass



See merge request !36
Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
@@ -110,7 +110,9 @@ public class UpSoftAccountController { @@ -110,7 +110,9 @@ public class UpSoftAccountController {
110 public ResponseEntity<ResultModel> modpwd(@CurrentAdmin XklAdminEntity admin, @RequestParam String newpwd) { 110 public ResponseEntity<ResultModel> modpwd(@CurrentAdmin XklAdminEntity admin, @RequestParam String newpwd) {
111 Assert.notNull(newpwd, "password can not be empty"); 111 Assert.notNull(newpwd, "password can not be empty");
112 String salt = SecurityTool.genSalt(); 112 String salt = SecurityTool.genSalt();
113 - String pass2Db = SecurityTool.getPassword(admin.getAccount(), newpwd, salt); 113 + String adminType = Integer.toString(admin.getType());
  114 + String str = admin.getAccount() + newpwd + adminType + salt; // 构建待加密字符串
  115 + String pass2Db = SecurityTool.encode(SecurityTool.ALGORITHM_MD5, str);
114 admin.setPwd(pass2Db); 116 admin.setPwd(pass2Db);
115 admin.setSalt(salt); 117 admin.setSalt(salt);
116 adminRepository.save(admin); 118 adminRepository.save(admin);