From 4db8023227b3900740b8be361c436ddadb1d0585 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 14 一月 2025 08:42:06 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 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 0548e0d..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,8 +98,11 @@ @ApiOperation(value = "个人信息-修改密码") @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PostMapping("/updatePwd") - public AjaxResult updatePwd(String username,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(); @@ -121,6 +125,7 @@ // tokenService.setLoginUser(loginUser); return success(); } + return error("修改密码异常,请联系管理员"); } -- Gitblit v1.7.1