From 0991fb487fc442e647430c36e05ec2fc16dbcdf3 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Thu, 20 Nov 2025 14:46:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/backend/framework/utils/PasswordGenerator.java  | 2 +-
 .../deploy/backend/system/api/UserApiController.java       | 5 +++--
 .../backend/system/service/impl/UserServiceImpl.java       | 7 +++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/framework/utils/PasswordGenerator.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/utils/PasswordGenerator.java
index 44475cfe..02e4c263 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/framework/utils/PasswordGenerator.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/utils/PasswordGenerator.java
@@ -23,7 +23,7 @@ public class PasswordGenerator {
      * 生成示例密码(仅用于测试)
      */
     public static void main(String[] args) {
-        String rawPassword = "admin123";
+        String rawPassword = "lianyu_123";
         String encodedPassword = encode(rawPassword);
         System.out.println("Raw password: " + rawPassword);
         System.out.println("Encoded password: " + encodedPassword);
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/api/UserApiController.java b/backend/src/main/java/com/qqchen/deploy/backend/system/api/UserApiController.java
index c24893aa..c9ae4246 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/system/api/UserApiController.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/system/api/UserApiController.java
@@ -2,6 +2,7 @@ package com.qqchen.deploy.backend.system.api;
 
 import com.qqchen.deploy.backend.system.model.query.UserQuery;
 import com.qqchen.deploy.backend.system.model.request.DepartmentAssignRequest;
+import com.qqchen.deploy.backend.system.model.request.ResetPasswordRequest;
 import com.qqchen.deploy.backend.framework.controller.BaseController;
 import com.qqchen.deploy.backend.framework.api.Response;
 import com.qqchen.deploy.backend.system.entity.User;
@@ -82,8 +83,8 @@ public class UserApiController extends BaseController<User, UserDTO, Long, UserQ
 
     @Operation(summary = "重置用户密码")
     @PostMapping("/{id}/reset-password")
-    public Response<Void> resetPassword(@PathVariable Long id, @RequestBody String newPassword) {
-        userService.resetPassword(id, newPassword);
+    public Response<Void> resetPassword(@PathVariable Long id, @Validated @RequestBody ResetPasswordRequest request) {
+        userService.resetPassword(id, request.getNewPassword());
         return Response.success();
     }
 
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/service/impl/UserServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/system/service/impl/UserServiceImpl.java
index b581b778..2676771e 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/system/service/impl/UserServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/system/service/impl/UserServiceImpl.java
@@ -276,6 +276,13 @@ public class UserServiceImpl extends BaseServiceImpl<User, UserDTO, UserQuery, L
         // 更新基本信息
         userConverter.updateEntity(user, dto);
         
+        // ✅ 如果提供了新密码，需要加密后更新（因为 updateEntity 忽略了 password 字段）
+        if (dto.getPassword() != null && !dto.getPassword().isEmpty()) {
+            String encodedPassword = PasswordGenerator.encode(dto.getPassword());
+            user.setPassword(encodedPassword);
+            log.info("用户 {} 的密码已更新", user.getUsername());
+        }
+        
         // 如果指定了部门ID，更新用户部门
         if (dto.getDepartmentId() != null) {
             Department department = departmentRepository.findById(dto.getDepartmentId())