|
@@ -48,12 +48,14 @@ import com.gyee.exam.utils.CacheKey;
|
|
|
import org.apache.commons.lang3.RandomStringUtils;
|
|
import org.apache.commons.lang3.RandomStringUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.cache.annotation.CacheEvict;
|
|
import org.springframework.cache.annotation.CacheEvict;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
import java.util.regex.Matcher;
|
|
import java.util.regex.Matcher;
|
|
|
import java.util.regex.Pattern;
|
|
import java.util.regex.Pattern;
|
|
@@ -109,6 +111,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
// 正则表达式匹配密码规则：8位以上、大小写字母、特殊字符加数字。
|
|
// 正则表达式匹配密码规则：8位以上、大小写字母、特殊字符加数字。
|
|
|
private static final Pattern PASSWORD_PATTERN = Pattern.compile("^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[~@#$%^&+=])(?=\\S+$).{8,}$");
|
|
private static final Pattern PASSWORD_PATTERN = Pattern.compile("^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[~@#$%^&+=])(?=\\S+$).{8,}$");
|
|
|
|
|
|
|
|
|
|
+ @Value("${closing-date}")
|
|
|
|
|
+ private String closingDate;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public IPage<UserListRespDTO> paging(PagingReqDTO<SysUserQueryReqDTO> reqDTO) {
|
|
public IPage<UserListRespDTO> paging(PagingReqDTO<SysUserQueryReqDTO> reqDTO) {
|
|
@@ -148,7 +152,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
public SysUserLoginDTO login(SysUserLoginReqDTO reqDTO) {
|
|
public SysUserLoginDTO login(SysUserLoginReqDTO reqDTO) {
|
|
|
|
|
|
|
|
LocalDate today = LocalDate.now(); // 获取当前日期
|
|
LocalDate today = LocalDate.now(); // 获取当前日期
|
|
|
- LocalDate expirationDate = LocalDate.of(2023, 5, 15); // 设定截止日期为2023年5月15号
|
|
|
|
|
|
|
+ LocalDate expirationDate = LocalDate.parse(closingDate); // 设定截止日期为2023年5月15号
|
|
|
if(today.isAfter(expirationDate)&&!validatePassword(reqDTO.getPassword())){
|
|
if(today.isAfter(expirationDate)&&!validatePassword(reqDTO.getPassword())){
|
|
|
throw new ServiceException("密码强度不够，请联系管理员更新密码！");
|
|
throw new ServiceException("密码强度不够，请联系管理员更新密码！");
|
|
|
}
|
|
}
|
chenminghua