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 { 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 queryWrapper = new QueryWrapper<>(); return baseDao.selectCount(queryWrapper); @@ -149,4 +164,19 @@ public class SysUserServiceImpl extends BaseServiceImpl