fix:用户中心密码修改

nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java

@@ -94,13 +94,15 @@ public class UserController {
     @PostMapping(value = "/updatePass")
     public ResponseEntity<Object> updatePass(@RequestBody JSONObject passVo) throws Exception {
         // 解密，得到字符密码
-        String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("oldPass"));
-        String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("newPass"));
+//        String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("oldPass"));
+//        String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("newPass"));
+        String oldPass = passVo.getString("oldPass");
+        String newPass = passVo.getString("newPass");
         SysUser user = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, SecurityUtils.getCurrentUsername()));
-        if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(oldPass, "salt"))) {
+        if (!user.getPassword().equals(SaSecureUtil.md5BySalt(oldPass, "salt"))) {
             throw new BadRequestException(LangProcess.msg("login_pwd_1"));
         }
-        if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(newPass, "salt"))) {
+        if (user.getPassword().equals(SaSecureUtil.md5BySalt(newPass, "salt"))) {
             throw new BadRequestException(LangProcess.msg("login_pwd_2"));
         }
         user.setPassword(SaSecureUtil.md5BySalt(newPass, "salt"));

nladmin-ui/src/views/system/user/user.js

@@ -35,8 +35,10 @@ export function editUser(data) {
 
 export function updatePass(user) {
   const data = {
-    oldPass: encrypt(user.oldPass),
-    newPass: encrypt(user.newPass)
+    // oldPass: encrypt(user.oldPass),
+    // newPass: encrypt(user.newPass)
+    oldPass: user.oldPass,
+    newPass: user.newPass
   }
   return request({
     url: 'api/users/updatePass/',