From 312edd4b15183fceedeab8beec566fe36ebbfa48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com>
Date: Tue, 25 Mar 2025 16:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=9A=E5=8A=A1=E5=B1=82?=
 =?UTF-8?q?=E4=B8=BA=E6=B7=BB=E5=8A=A0=E6=96=B0=E6=96=B9=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=EF=BC=8C=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=20--SysUserService.java=20?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=892=E4=B8=AA=E6=96=B9=E6=B3=95=20--SysUserServi?=
 =?UTF-8?q?ceImpl.java=20=E5=AE=9E=E7=8E=B0=E9=87=8D=E7=BD=AE=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E7=9B=B4=E6=8E=A5=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/service/SysUserService.java   | 18 +++++++++
 .../sys/service/impl/SysUserServiceImpl.java  | 40 ++++++++++++++++---
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java
index 0f172fb7..f8f609dc 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java
@@ -22,8 +22,26 @@ public interface SysUserService extends BaseService<SysUserEntity> {
 
     void delete(Long[] ids);
 
+    /**
+     * 验证是否允许修改密码更改
+     * @param userId 用户id
+     * @param passwordDTO 验证密码的参数
+     */
     void changePassword(Long userId, PasswordDTO passwordDTO);
 
+    /**
+     * 直接修改密码，不需要验证
+     * @param userId 用户id
+     * @param password 密码
+     */
+    void changePasswordDirectly(Long userId, String password);
+
+    /**
+     * 重置密码
+     * @param userId 用户id
+     * @return 随机生成符合规范的密码
+     */
+    String resetPassword(Long userId);
     /**
      * 管理员分页用户信息
      * @param dto 分页查找参数
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java
index 3075d7ea..72ab062a 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java
@@ -3,7 +3,6 @@ package xiaozhi.modules.sys.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import xiaozhi.common.constant.Constant;
@@ -22,10 +21,7 @@ import xiaozhi.modules.sys.enums.SuperAdminEnum;
 import xiaozhi.modules.sys.service.SysUserService;
 import xiaozhi.modules.sys.vo.AdminPageUserVO;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -91,6 +87,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void changePassword(Long userId, PasswordDTO passwordDTO) {
         SysUserEntity sysUserEntity = sysUserDao.selectById(userId);
 
@@ -115,6 +112,24 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         updateById(sysUserEntity);
     }
 
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void changePasswordDirectly(Long userId, String password) {
+        SysUserEntity sysUserEntity = new SysUserEntity();
+        sysUserEntity.setId(userId);
+        sysUserEntity.setPassword(PasswordUtils.encode(password));
+        updateById(sysUserEntity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String resetPassword(Long userId) {
+        String password = generatePassword();
+        changePasswordDirectly(userId,password);
+        return password;
+    }
+
     private Long getUserCount() {
         QueryWrapper<SysUserEntity> queryWrapper = new QueryWrapper<>();
         return baseDao.selectCount(queryWrapper);
@@ -149,4 +164,19 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         Matcher matcher = pattern.matcher(password);
         return matcher.matches();
     }
+
+    private static final String CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()";
+    private static final Random random = new Random();
+    /**
+     * 生成随机密码
+     * @return 随机生成的密码
+     */
+    private String generatePassword(){
+        StringBuilder password = new StringBuilder();
+        for (int i = 0; i < 10; i++) {
+            int randomIndex = random.nextInt(CHARACTERS.length());
+            password.append(CHARACTERS.charAt(randomIndex));
+        }
+        return password.toString();
+    }
 }