Compare commits

..

No commits in common. "891c442da41337e767cbf460f944f388f9645de2" and "eedfa2add8b1206aa5d0eb5d264d9ffa13352502" have entirely different histories.

10 changed files with 8 additions and 39 deletions

View File

@ -47,11 +47,7 @@
"ContinuousReadingTimeMin": 120,
"ReadingRestTimeMin": 10,
"IsNeedChangePassWord": true,
"ChangePassWordDays": 90
"ReadingRestTimeMin": 10
},
"SystemEmailSendConfig": {
"Port": 465,

View File

@ -49,10 +49,8 @@
"ContinuousReadingTimeMin": 120,
"ReadingRestTimeMin": 10,
"IsNeedChangePassWord": true,
"ReadingRestTimeMin": 10
"ChangePassWordDays": 90
},
"SystemEmailSendConfig": {

View File

@ -65,10 +65,7 @@
"ContinuousReadingTimeMin": 120,
"ReadingRestTimeMin": 10,
"IsNeedChangePassWord": true,
"ChangePassWordDays": 90
"ReadingRestTimeMin": 10
},
"SystemEmailSendConfig": {

View File

@ -63,10 +63,7 @@
"ContinuousReadingTimeMin": 120,
"ReadingRestTimeMin": 10,
"IsNeedChangePassWord": true,
"ChangePassWordDays": 90
"ReadingRestTimeMin": 10
},
"SystemEmailSendConfig": {

View File

@ -69,10 +69,7 @@
"ContinuousReadingTimeMin": 120,
"ReadingRestTimeMin": 10,
"IsNeedChangePassWord": true,
"ChangePassWordDays": 90
"ReadingRestTimeMin": 10
},
"SystemEmailSendConfig": {

View File

@ -62,9 +62,6 @@
"ContinuousReadingTimeMin": 120,
"ReadingRestTimeMin": 10,
"IsNeedChangePassWord": true,
"ChangePassWordDays": 90,
"OpenLoginMFA": true
},

View File

@ -56,10 +56,7 @@
"ContinuousReadingTimeMin": 120,
"ReadingRestTimeMin": 10,
"IsNeedChangePassWord": true,
"ChangePassWordDays": 90
"ReadingRestTimeMin": 10
},
"SystemEmailSendConfig": {

View File

@ -794,7 +794,7 @@ namespace IRaCIS.Application.Services
}
//超过90天没修改密码
if (_verifyConfig.CurrentValue.IsNeedChangePassWord&& loginUser.LastChangePassWordTime != null && DateTime.Now.AddDays(-_verifyConfig.CurrentValue.ChangePassWordDays) > loginUser.LastChangePassWordTime.Value)
if (loginUser.LastChangePassWordTime != null && DateTime.Now.AddDays(-90) > loginUser.LastChangePassWordTime.Value)
{
loginUser.LoginState = 1;
}

View File

@ -36,17 +36,6 @@ namespace IRaCIS.Core.Domain.Share
/// </summary>
public int ReadingRestTimeMin { get; set; }
/// <summary>
/// 是否需要修改密码
/// </summary>
public bool IsNeedChangePassWord { get; set; }
/// <summary>
/// 修改密码的天数
/// </summary>
public int ChangePassWordDays { get; set; }
}
public class SystemEmailSendConfig

View File

@ -2870,6 +2870,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{
Unit = (ValueUnit)int.Parse(x.Code),
UnitName = x.Value.ToString(),
}).ToList();
//获取表格问题名称 组合成数组