Merge remote-tracking branch 'origin/master'

This commit is contained in:
guofeihu
2024-09-12 19:19:18 +08:00
2 changed files with 14 additions and 8 deletions

View File

@@ -3,6 +3,7 @@ package com.njcn.user.pojo.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
@@ -19,24 +20,29 @@ import javax.validation.constraints.NotNull;
@ApiModel
public class PassWordRuleParam {
@ApiModelProperty(name = "errorsCount",value = "安码输入错误次数")
@NotNull(message = "码输入错误次数不可为空")
@NotNull(message = "码输入错误次数不可为空")
@Range(min = 3,max = 20,message = "密码输入次数配置超范围")
private Integer errorsCount;
@ApiModelProperty(name = "releaseTime",value = "自动解锁(分钟):")
@NotNull(message = "自动解锁(分钟)不可为空")
@Range(min = 5,max = 60,message = "自动解锁(分钟)超范围")
private Integer releaseTime;
@ApiModelProperty(name = "sessionTime",value = "*会话超时时间(分钟)")
@NotNull(message = "会话超时时间(分钟)不可为空")
@Range(min = 1,max = 1440000,message = "会话超时时间(分钟)超范围")
private Integer sessionTime;
@ApiModelProperty(name = "sessionRefreshTime",value = "*会话刷新时间(分钟)")
@NotNull(message = "会话刷新时间(分钟)不可为空")
@Range(min = 1,max = 1440000,message = "会话刷新时间(分钟)超范围")
private Integer sessionRefreshTime;
@ApiModelProperty(name = "passwordExpirationDays",value = "密码超期天数")
@NotNull(message = "密码超期天数不可为空")
private Integer passwordExpirationDays;
@ApiModelProperty(name = "passwordExpirationDays",value = "密码有效期")
@NotNull(message = "密码有效期不可为空")
@Range(min = 1,max = 180,message = "密码有效期超范围")
private Integer passwordExpirationMonth;
/* @ApiModelProperty(name = "mixedCheckFlag",value = "密码符号混合校验(0:否1是)")
//@NotNull(message = "密码符号混合校验不可为空")
@@ -53,11 +59,11 @@ public class PassWordRuleParam {
@ApiModelProperty(name = "maxUseUser",value = "大于0" )
@NotNull(message = "最大并发用户不可为空")
@Min(value = 1,message = "最大并发数需要大于0")
@Range(min = 10,max = 99,message = "最大并发用户超范围")
private Integer maxUseUser;
@NotNull(message = "账号长时间未登录休眠期(天)")
@Min(value = 1,message = "账号长时间未登录休眠期应大于0")
@Range(min = 1,max = 180,message = "账号长时间未登录休眠期(天)超范围")
private Integer sleepDay;
}

View File

@@ -38,7 +38,7 @@ public class PassWordRuleServiceImpl implements PassWordRuleService {
iUserStrategyService.lambdaUpdate().eq(UserStrategy::getType,"1")
.eq(UserStrategy::getState, DataStateEnum.ENABLE.getCode())
.set(UserStrategy::getLimitPwdTimes,passWordRuleParam.getErrorsCount())
.set(UserStrategy::getLimitPwdDate,passWordRuleParam.getPasswordExpirationDays())
.set(UserStrategy::getLimitPwdDate,passWordRuleParam.getPasswordExpirationMonth())
.set(UserStrategy::getLockPwdCheck,passWordRuleParam.getReleaseTime())
.set(UserStrategy::getMaxNum,passWordRuleParam.getMaxUseUser())
.set(UserStrategy::getSleep,passWordRuleParam.getSleepDay())
@@ -58,7 +58,7 @@ public class PassWordRuleServiceImpl implements PassWordRuleService {
passWordRuleParam.setErrorsCount(userStrategy.getLimitPwdTimes());
passWordRuleParam.setReleaseTime(userStrategy.getLockPwdCheck());
passWordRuleParam.setPasswordExpirationDays(userStrategy.getLimitPwdDate());
passWordRuleParam.setPasswordExpirationMonth(userStrategy.getLimitPwdDate());
passWordRuleParam.setMaxUseUser(userStrategy.getMaxNum());
passWordRuleParam.setSleepDay(userStrategy.getSleep());