From 31ad1fbeb87fc5804ad6a72bbce024d00cba6927 Mon Sep 17 00:00:00 2001 From: PIGCLOUD Date: Fri, 9 Jan 2026 19:29:04 +0800 Subject: [PATCH] =?UTF-8?q?fix(pigx-common-security):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 PigxUserDetailsService 中密码修改时间的处理逻辑 - 当 passwordModifyTime 为 null 时使用 createTime 作为替代值 --- .../common/security/service/PigxUserDetailsService.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsService.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsService.java index 78fb504c8..0df1c9137 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsService.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsService.java @@ -31,10 +31,7 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; -import java.util.Collection; -import java.util.HashSet; -import java.util.Optional; -import java.util.Set; +import java.util.*; /** * @author lengleng @@ -106,7 +103,7 @@ public interface PigxUserDetailsService extends UserDetailsService, Ordered { info.getNickname(), info.getName(), info.getEmail(), info.getTenantId(), SecurityConstants.BCRYPT + info.getPassword(), true, true, UserTypeEnum.TOB.getStatus(), !CommonConstants.STATUS_LOCK.equals(info.getPasswordExpireFlag()) // 密码过期判断 - , info.getPasswordModifyTime(), !CommonConstants.STATUS_LOCK.equals(info.getLockFlag()), authorities); + , Objects.isNull(info.getPasswordModifyTime()) ? info.getCreateTime() : info.getPasswordModifyTime(), !CommonConstants.STATUS_LOCK.equals(info.getLockFlag()), authorities); } /**