From 91f99205338e201f277b06d52f50b1bfc79f208b Mon Sep 17 00:00:00 2001 From: nies Date: Tue, 4 Jan 2022 15:46:32 +0800 Subject: [PATCH] =?UTF-8?q?(update)=E4=BF=AE=E6=94=B9=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=8E=A5=E5=8F=A3=EF=BC=8C=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E6=88=90=E9=9A=8F=E6=9C=BA=E5=AF=86=E7=A0=81=E7=9A=84=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=BF=9B=E8=A1=8C=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ISysUserPasswordService.java | 2 +- .../core/apiservice/controller/busi/SysUserController.java | 14 +++++--------- .../serviceimpl/busi/SysUserSavePasswordService.java | 8 +++++--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserPasswordService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserPasswordService.java index 504b270..34d6658 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserPasswordService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserPasswordService.java @@ -30,7 +30,7 @@ public interface ISysUserPasswordService extends ICrudService { void updatePassword(Long userId, String password); @ApiOperation(value = "重置用户密码") - void updatePasswordResetLastModifyTime(Long userId, String password); + void updatePasswordResetLastModifyTime(Long userId, String password,Boolean isCheckPassword); void updatePasswordWizoutSession(String loginName, String password, String newPwd); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 6238667..8e1af6b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -22,7 +22,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.model.platform.AccountExportModel; -import cn.estsh.i3plus.pojo.model.platform.UserExportModel; import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -39,7 +38,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.ObjectUtils; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -56,14 +54,10 @@ import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; import java.io.OutputStream; -import java.sql.ResultSet; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import static java.util.stream.Collectors.toCollection; - /** * @Description : 系统用户操作服务 * @Reference : @@ -569,8 +563,10 @@ public class SysUserController extends CoreBaseController { String password = RandomStringUtils.random(6, true, false); - userPasswordService.updatePasswordResetLastModifyTime(user.getId(), password); - + //随机生成密码的不检验密码的长度、复杂等信息 + userPasswordService.updatePasswordResetLastModifyTime(user.getId(), password, false); + //重置成随机密码会让用户首次登录修改密码 + sysUserService.updateUserLoginNum(user.getId(),0); String content = "系统提示：\n" + "\t" + getSessionUser().getUserName() + "使用密码重置功能帮您重置了【" + user.getUserLoginName() + "】账号的密码，" + "新密码是：" + password + ""; @@ -622,7 +618,7 @@ public class SysUserController extends CoreBaseController { Integer num = personnelService.checkSysUserResetPassword(user); num = CommonConstWords.CONFIG_PWD_RESET_PASSWORD_DEFAULT - num; - userPasswordService.updatePasswordResetLastModifyTime(user.getId(), password); + userPasswordService.updatePasswordResetLastModifyTime(user.getId(), password, true); LOGGER.info("系统提示：{} 使用密码重置功能帮{}重置了{}账号的密码，新密码是：{}", getSessionUser().getUserName(), user.getUserName(), user.getUserLoginName(), password); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserSavePasswordService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserSavePasswordService.java index ee69306..a025737 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserSavePasswordService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserSavePasswordService.java @@ -78,7 +78,7 @@ public class SysUserSavePasswordService extends CrudService imp .build(); } - updatePasswordResetLastModifyTime(user.getId(), newPwd); + updatePasswordResetLastModifyTime(user.getId(), newPwd, true); } @Override @@ -108,11 +108,13 @@ public class SysUserSavePasswordService extends CrudService imp } @Override - public void updatePasswordResetLastModifyTime(Long userId, String password) { + public void updatePasswordResetLastModifyTime(Long userId, String password, Boolean isCheckPassword) { SysUser user = userService.getSysUserById(userId); ValidatorBean.checkNotNull(user, "不存在的用户信息"); user.setUserLoginPassword(password); - userPasswordUtil.checkPasswordSave(user); + if (isCheckPassword){ + userPasswordUtil.checkPasswordSave(user); + } userPasswordRDao.updateByProperties( new String[]{"userId", "isDeleted"},