From 4afe59c57d73bcc443f963921eb9a5cf757713de Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 10:18:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
index 3d4c11e..49a0356 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
@@ -14,6 +14,7 @@
import com.ruoyi.system.api.domain.SysFile;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.dto.UpdatePassword;
import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -97,11 +98,14 @@
@ApiOperation(value = "个人信息-修改密码")
@Log(title = "个人信息", businessType = BusinessType.UPDATE)
@PostMapping("/updatePwd")
- public AjaxResult updatePwd(String oldPassword, String newPassword)
+ public AjaxResult updatePwd(@RequestBody UpdatePassword updatePassword)
{
+ String newPassword = updatePassword.getNewPassword();
+ String oldPassword = updatePassword.getOldPassword();
+ String username = updatePassword.getUsername();
System.err.println(oldPassword);
System.err.println(newPassword);
- String username = SecurityUtils.getUsername();
+// String username = SecurityUtils.getUsername();
SysUser user = userService.selectUserByUserName(username);
String password = user.getPassword();
if (!SecurityUtils.matchesPassword(oldPassword, password))
@@ -121,6 +125,7 @@
// tokenService.setLoginUser(loginUser);
return success();
}
+
return error("修改密码异常，请联系管理员");
}
--
Gitblit v1.7.1