From 2c1e55bd0cf20310f16a31fb871d0a092d820ae8 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 28 Jul 2025 17:16:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=86=E7=A0=81=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=9E=E9=A6=96=E6=AC=A1=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8E=BB=E9=99=A4=E6=97=A5=E6=9C=9F=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=8C=E8=A1=A5=E5=85=85=E5=8F=82=E6=95=B0=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E7=BF=BB=E8=AF=91=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/database/lite/install/sys_i18n.sql | 1 + build/database/lite/upgrade/upg_sys_i18n.sql | 1 + build/database/std/install/sys_i18n.sql | 1 + build/database/std/upgrade/upg_sys_i18n.sql | 1 + src/modules/system/controller/sys_profile.go | 22 ++++++++++---------- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/build/database/lite/install/sys_i18n.sql b/build/database/lite/install/sys_i18n.sql index 538f12ff..c2207969 100644 --- a/build/database/lite/install/sys_i18n.sql +++ b/build/database/lite/install/sys_i18n.sql @@ -931,3 +931,4 @@ dayLt: Days less than, default 30 days'); INSERT INTO "sys_i18n" VALUES (756, 'dictData.trace_interfaces.14', 'N14', 'N14'); INSERT INTO "sys_i18n" VALUES (757, 'dictData.trace_interfaces.5', 'N5', 'N5'); INSERT INTO "sys_i18n" VALUES (758, "alarm.export.alarmCode", "告警编码", "Alarm Code"); +INSERT INTO "sys_i18n" VALUES (759, "config.sys.user.fristPasswdChangeRemark", "关闭改为false 开启改为true, 建议同时设置密码有效期", "Off to false On to true, it is recommended to set the password expiration date at the same time."); diff --git a/build/database/lite/upgrade/upg_sys_i18n.sql b/build/database/lite/upgrade/upg_sys_i18n.sql index e11b4272..126a3ffc 100644 --- a/build/database/lite/upgrade/upg_sys_i18n.sql +++ b/build/database/lite/upgrade/upg_sys_i18n.sql @@ -930,3 +930,4 @@ dayLt: Days less than, default 30 days'); REPLACE INTO "sys_i18n" VALUES (756, 'dictData.trace_interfaces.14', 'N14', 'N14'); REPLACE INTO "sys_i18n" VALUES (757, 'dictData.trace_interfaces.5', 'N5', 'N5'); REPLACE INTO "sys_i18n" VALUES (758, "alarm.export.alarmCode", "告警编码", "Alarm Code"); +REPLACE INTO "sys_i18n" VALUES (759, "config.sys.user.fristPasswdChangeRemark", "关闭改为false 开启改为true, 建议同时设置密码有效期", "Off to false On to true, it is recommended to set the password expiration date at the same time."); diff --git a/build/database/std/install/sys_i18n.sql b/build/database/std/install/sys_i18n.sql index 4e84a680..83045948 100644 --- a/build/database/std/install/sys_i18n.sql +++ b/build/database/std/install/sys_i18n.sql @@ -773,5 +773,6 @@ INSERT INTO `sys_i18n` VALUES (755, 'job.ne_alarm_state_check_license_remark', ' INSERT INTO `sys_i18n` VALUES (756, 'dictData.trace_interfaces.14', 'N14', 'N14'); INSERT INTO `sys_i18n` VALUES (757, 'dictData.trace_interfaces.5', 'N5', 'N5'); INSERT INTO `sys_i18n` VALUES (758, "alarm.export.alarmCode", "告警编码", "Alarm Code"); +INSERT INTO `sys_i18n` VALUES (759, "config.sys.user.fristPasswdChangeRemark", "关闭改为false 开启改为true, 建议同时设置密码有效期", "Off to false On to true, it is recommended to set the password expiration date at the same time."); -- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/upgrade/upg_sys_i18n.sql b/build/database/std/upgrade/upg_sys_i18n.sql index f89bccb3..ef55f345 100644 --- a/build/database/std/upgrade/upg_sys_i18n.sql +++ b/build/database/std/upgrade/upg_sys_i18n.sql @@ -770,5 +770,6 @@ REPLACE INTO `sys_i18n` VALUES (755, 'job.ne_alarm_state_check_license_remark', REPLACE INTO `sys_i18n` VALUES (756, 'dictData.trace_interfaces.14', 'N14', 'N14'); REPLACE INTO `sys_i18n` VALUES (757, 'dictData.trace_interfaces.5', 'N5', 'N5'); REPLACE INTO `sys_i18n` VALUES (758, "alarm.export.alarmCode", "告警编码", "Alarm Code"); +REPLACE INTO `sys_i18n` VALUES (759, "config.sys.user.fristPasswdChangeRemark", "关闭改为false 开启改为true, 建议同时设置密码有效期", "Off to false On to true, it is recommended to set the password expiration date at the same time."); -- Dump completed on 2025-02-14 15:26:56 diff --git a/src/modules/system/controller/sys_profile.go b/src/modules/system/controller/sys_profile.go index 659fcf08..6dfbd9b2 100644 --- a/src/modules/system/controller/sys_profile.go +++ b/src/modules/system/controller/sys_profile.go @@ -290,17 +290,17 @@ func (s *SysProfileController) PasswordForce(c *gin.Context) { return } - // 首次登录 - forcePasswdChange := userInfo.LoginCount <= 2 - // 非首次登录，判断密码是否过期 - if !forcePasswdChange { - alert, _ := s.sysUserService.ValidatePasswordExpireTime(userInfo.PasswordUpdateTime) - forcePasswdChange = alert - } - if !forcePasswdChange { - c.JSON(403, resp.ErrMsg("not matching the amendment")) - return - } + // // 首次登录 + // forcePasswdChange := userInfo.LoginCount <= 2 + // // 非首次登录，判断密码是否过期 + // if !forcePasswdChange { + // alert, _ := s.sysUserService.ValidatePasswordExpireTime(userInfo.PasswordUpdateTime) + // forcePasswdChange = alert + // } + // if !forcePasswdChange { + // c.JSON(403, resp.ErrMsg("not matching the amendment")) + // return + // } // 检查密码是否与历史密码一致 err = s.sysUserService.ValidatePasswordNotAllowedHistory(userInfo.UserId, body.Password)