From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 23 四月 2025 18:12:46 +0800
Subject: [PATCH] 前端联调
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 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 6397d3e..95e1ac1 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
@@ -94,9 +94,9 @@
}
/**
- * 重置密码
+ * 重置密码 后台-登录
*/
- @ApiOperation(value = "个人信息-修改密码")
+ @ApiOperation(value = "修改密码",notes = "后台-登录")
@Log(title = "个人信息", businessType = BusinessType.UPDATE)
@PostMapping("/updatePwd")
public AjaxResult updatePwd(@RequestBody UpdatePassword updatePassword)
@@ -108,11 +108,9 @@
System.err.println(newPassword);
// String username = SecurityUtils.getUsername();
SysUser user =null;
- if (updatePassword.getType()==1){
- user = userService.selectUserByUserName(username);
- }else{
- user = userService.selectUserShopByUserName(username);
- }
+
+ user = userService.selectUserByUserName(username);
+
if (Objects.isNull(user))
{
return error("未查询到该账号");
@@ -126,7 +124,7 @@
{
return error("新密码不能与旧密码相同");
}
- if (updatePassword.getType()==1&&userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) {
+ if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) {
// 更新缓存用户密码
// LoginUser loginUser = SecurityUtils.getLoginUser();
// SysUser sysUser = loginUser.getSysUser();
@@ -134,14 +132,7 @@
// tokenService.setLoginUser(loginUser);
return success();
}
- if (updatePassword.getType()==2&&userService.resetUserShopPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) {
- // 更新缓存用户密码
-// LoginUser loginUser = SecurityUtils.getLoginUser();
-// SysUser sysUser = loginUser.getSysUser();
-// loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword));
-// tokenService.setLoginUser(loginUser);
- return success();
- }
+
return error("修改密码异常，请联系管理员");
}
--
Gitblit v1.7.1