diff --git a/IRaCIS.Core.API/appsettings.Test_HIR.json b/IRaCIS.Core.API/appsettings.Test_HIR.json index 0f52c6d19..093dc9938 100644 --- a/IRaCIS.Core.API/appsettings.Test_HIR.json +++ b/IRaCIS.Core.API/appsettings.Test_HIR.json @@ -21,7 +21,7 @@ //"viewEndpoint": "https://hir.test.extimaging.com/oss/hir-test" "ViewEndpoint": "https://hir-oss.test.extimaging.com/hir-test" } - + }, "ConnectionStrings": { "RemoteNew": "Server=106.14.89.110,1435;Database=Test_HIR_New;User ID=sa;Password=xc@123456;TrustServerCertificate=true", @@ -41,7 +41,8 @@ // 是否强制用户定期修改密码 "IsNeedChangePassWord": true, // 密码有效期(天),到期后必须修改 - "ChangePassWordDays": 1000 + "ChangePassWordDays": 1000, + "OpenImageShare": true, }, "SystemEmailSendConfig": { diff --git a/IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs b/IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs index 465bf5d6e..702d3fc24 100644 --- a/IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs +++ b/IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs @@ -43,6 +43,8 @@ public class ServiceVerifyConfigOption public int CmoveInstanceIntervalMinutes { get; set; } + + public bool OpenImageShare { get; set; } } public class SystemEmailSendConfig @@ -92,6 +94,8 @@ public class SystemEmailSendConfigView public string CompanyShortNameCN { get; set; } = string.Empty; public string EmailRegexStr { get; set; } + + public bool OpenImageShare { get; set; } } public class SystemPacsConfig diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs index 398546f4c..1c9a46264 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs @@ -5,6 +5,7 @@ using IRaCIS.Core.Application.Contracts.Dicom.DTO; using IRaCIS.Core.Domain.Share; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using System.Windows.Input; namespace IRaCIS.Core.Application.Services { @@ -27,6 +28,7 @@ namespace IRaCIS.Core.Application.Services var addEntity = await _imageShareRepository.AddAsync(imageShare); + addEntity.ExpireTime = DateTime.Now.AddDays(7); //验证码 4位 int verificationPassWord = new Random().Next(1000, 10000); @@ -36,7 +38,7 @@ namespace IRaCIS.Core.Application.Services var success = await _imageShareRepository.SaveChangesAsync(); - return ResponseOutput.Result(success, new { ResourceId = imageShare.Id, Password = verificationPassWord.ToString() }); + return ResponseOutput.Result(success, new { ResourceId = imageShare.Id, Password = verificationPassWord.ToString(), ImageShareExpireDays = 7 }); } diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 9707e4013..3b041089c 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -1125,7 +1125,8 @@ namespace IRaCIS.Core.Application.Service [HttpPost] public async Task> GetUserLoginRoleList(IRCLoginDto loginDto, [FromServices] ITokenService _tokenService, - [FromServices] IOptionsMonitor _emailConfig + [FromServices] IOptionsMonitor _emailConfig, + [FromServices] IOptionsMonitor _basicSystemConfigConfig ) { @@ -1133,7 +1134,10 @@ namespace IRaCIS.Core.Application.Service var password = loginDto.Password; var emailConfig = _emailConfig.CurrentValue; + var basicConfig = _basicSystemConfigConfig.CurrentValue; var companyInfo = new SystemEmailSendConfigView() { CompanyName = emailConfig.CompanyName, CompanyNameCN = emailConfig.CompanyNameCN, CompanyShortName = emailConfig.CompanyShortName, CompanyShortNameCN = emailConfig.CompanyShortNameCN, SystemShortName = emailConfig.SystemShortName, EmailRegexStr = emailConfig.EmailRegexStr }; + companyInfo.OpenImageShare = basicConfig.OpenImageShare; + int maxFailures = _verifyConfig.CurrentValue.LoginMaxFailCount;