XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-08-08 10:14:36 +08:00
parent 168c7447bb 891c442da4
commit b832a66abf
10 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.API/appsettings.Event_IRC.json
View File

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

4
IRaCIS.Core.API/appsettings.Prod_IRC.json
View File

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

5
IRaCIS.Core.API/appsettings.Test_IRC.json
View File

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

5
IRaCIS.Core.API/appsettings.US_Prod_IRC.json
View File

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

5
IRaCIS.Core.API/appsettings.US_Test_IRC.json
View File

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

3
IRaCIS.Core.API/appsettings.US_Uat_IRC.json
View File

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

5
IRaCIS.Core.API/appsettings.Uat_IRC.json
View File

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

2
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

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

11
IRaCIS.Core.Domain/_Config/_AppSettings.cs
View File

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

1
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

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