From f6f88824857d093ca5acbe6df700db538582c91a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 16 Apr 2024 17:15:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/auth/entity/SysUserEntity.java    |  5 +----
 .../main/java/io/dataease/auth/server/AuthServer.java  |  2 +-
 .../src/main/java/io/dataease/ext/AuthMapper.xml       |  2 --
 .../java/io/dataease/ext/ExtSystemParameterMapper.java |  4 +++-
 .../java/io/dataease/ext/ExtSystemParameterMapper.xml  |  4 ++++
 .../service/system/SystemParameterService.java         | 10 ++++++----
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java b/core/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
index da02b7ab67..2022ee6150 100644
--- a/core/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
+++ b/core/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
@@ -6,9 +6,8 @@ import lombok.Data;
 import java.io.Serializable;
 
 @Data
-public class SysUserEntity implements Serializable {
 
-    private static final long serialVersionUID = 7606000748052557474L;
+public class SysUserEntity implements Serializable {
 
     @ApiModelProperty(hidden = true)
     private Long userId;
@@ -45,6 +44,4 @@ public class SysUserEntity implements Serializable {
 
     @ApiModelProperty(hidden = true)
     private Integer from;
-    @ApiModelProperty(hidden = true)
-    private Long pwdResetTime;
 }
diff --git a/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java
index 90ff442385..4916401ca7 100644
--- a/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java
+++ b/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java
@@ -202,7 +202,7 @@ public class AuthServer implements AuthApi {
             if (user.getIsAdmin()) {
                 result.put("validityPeriod", -1);
             } else {
-                Integer validityPeriod = systemParameterService.pwdValidityPeriod(user.getPwdResetTime());
+                Integer validityPeriod = systemParameterService.pwdValidityPeriod(user.getUserId());
                 if (validityPeriod.equals(0)) {
                     DataEaseException.throwException("pwdValidityPeriod");
                 }
diff --git a/core/backend/src/main/java/io/dataease/ext/AuthMapper.xml b/core/backend/src/main/java/io/dataease/ext/AuthMapper.xml
index 4578aafe29..cc24a305d9 100644
--- a/core/backend/src/main/java/io/dataease/ext/AuthMapper.xml
+++ b/core/backend/src/main/java/io/dataease/ext/AuthMapper.xml
@@ -14,7 +14,6 @@
         <result column="is_admin" jdbcType="BIT" property="isAdmin"/>
         <result column="from" property="from"/>
         <result column="dept_name" property="deptName"/>
-        <result column="pwd_reset_time" jdbcType="BIGINT" property="pwdResetTime"/>
     </resultMap>
 
     <resultMap id="roleMap" type="io.dataease.auth.api.dto.CurrentRoleDto">
@@ -49,7 +48,6 @@
                password,
                enabled,
                email,
-               pwd_reset_time,
                phone,
                language,
                is_admin,
diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSystemParameterMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtSystemParameterMapper.java
index 56901a9b55..c3f0ffda8c 100644
--- a/core/backend/src/main/java/io/dataease/ext/ExtSystemParameterMapper.java
+++ b/core/backend/src/main/java/io/dataease/ext/ExtSystemParameterMapper.java
@@ -1,5 +1,7 @@
 package io.dataease.ext;
 
 public interface ExtSystemParameterMapper {
-    String  email();
+    String email();
+
+    long queryPwdResetTime(Long userId);
 }
diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSystemParameterMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtSystemParameterMapper.xml
index 3540224fbc..ce966270f7 100644
--- a/core/backend/src/main/java/io/dataease/ext/ExtSystemParameterMapper.xml
+++ b/core/backend/src/main/java/io/dataease/ext/ExtSystemParameterMapper.xml
@@ -5,4 +5,8 @@
     <select id="email" resultType="string">
        select param_value from system_parameter where param_key=#{smtp.account}
     </select>
+
+    <select id="queryPwdResetTime" resultType="Long">
+        select pwd_reset_time from sys_user where user_id = #{userId}
+    </select>
 </mapper>
diff --git a/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java b/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java
index c13ae34151..e37c18c7cc 100644
--- a/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java
+++ b/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java
@@ -298,15 +298,17 @@ public class SystemParameterService {
         return param.getParamValue();
     }
 
-    public Integer pwdValidityPeriod(Long pwdTime) {
-        if (ObjectUtils.isEmpty(pwdTime)) {
-            return -1;
-        }
+    public Integer pwdValidityPeriod(Long userId) {
+
         Map<String, LoginLimitXpackService> beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType((LoginLimitXpackService.class));
         boolean loginLimitPluginLoaded = beansOfType.keySet().size() > 0;
         if (!loginLimitPluginLoaded) return -1;
         String value = getValue(LOGIN_LIMIT_OPEN_MODIFY_PWD.getValue());
         if (StringUtils.isNotBlank(value) && StringUtils.equals("true", value)) {
+            long pwdTime = extSystemParameterMapper.queryPwdResetTime(userId);
+            if (ObjectUtils.isEmpty(pwdTime)) {
+                return -1;
+            }
             long dayTime = 24 * 3600L * 1000L;
             String pwdCycle = getValue(LOGIN_LIMIT_PWD_CYCLE.getValue());
             Long expireCycle = null;