diff --git a/IRaCIS.Core.API/Controllers/ExtraController.cs b/IRaCIS.Core.API/Controllers/ExtraController.cs index 9152ace33..73cc21a20 100644 --- a/IRaCIS.Core.API/Controllers/ExtraController.cs +++ b/IRaCIS.Core.API/Controllers/ExtraController.cs @@ -37,6 +37,7 @@ using Amazon.SecurityToken.Model; using Amazon.SecurityToken; using Amazon; using AssumeRoleRequest = Amazon.SecurityToken.Model.AssumeRoleRequest; +using AutoMapper; namespace IRaCIS.Api.Controllers { @@ -109,8 +110,12 @@ namespace IRaCIS.Api.Controllers [FromServices] ITokenService _tokenService, [FromServices] IReadingImageTaskService readingImageTaskService, [FromServices] IOptionsMonitor _verifyConfig, + [FromServices] IOptionsMonitor _emailConfig, + [FromServices] IMailVerificationService _mailVerificationService) { + var emailConfig= _emailConfig.CurrentValue; + var companyInfo = new SystemEmailSendConfigView() { CompanyName = emailConfig.CompanyName, CompanyNameCN = emailConfig.CompanyNameCN, CompanyShortName = emailConfig.CompanyShortName, CompanyShortNameCN = emailConfig.CompanyShortNameCN }; //MFA 邮箱验证 前端传递用户Id 和MFACode if (loginUser.UserId != null && _verifyConfig.CurrentValue.OpenLoginMFA) @@ -147,6 +152,7 @@ namespace IRaCIS.Api.Controllers await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(userId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes)); + loginReturn.CompanyInfo = companyInfo; return ResponseOutput.Ok(loginReturn); } @@ -274,6 +280,8 @@ namespace IRaCIS.Api.Controllers } } + + returnModel.Data.CompanyInfo = companyInfo; return returnModel; } diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index 4402bc0b9..068efa5a9 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -29,7 +29,7 @@ - + 系统用户登录接口[New] diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs index 7c2b014d7..6b63943e2 100644 --- a/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs +++ b/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs @@ -32,6 +32,8 @@ namespace IRaCIS.Application.Contracts public bool IsMFA { get; set; } = false; + public SystemEmailSendConfigView CompanyInfo { get; set; } + } public class UserBasicInfo diff --git a/IRaCIS.Core.Domain/_Config/_AppSettings.cs b/IRaCIS.Core.Domain/_Config/_AppSettings.cs index 2bca1cdfe..8afe0386d 100644 --- a/IRaCIS.Core.Domain/_Config/_AppSettings.cs +++ b/IRaCIS.Core.Domain/_Config/_AppSettings.cs @@ -78,6 +78,17 @@ namespace IRaCIS.Core.Domain.Share } + public class SystemEmailSendConfigView + { + public string CompanyName { get; set; } = string.Empty; + + public string CompanyNameCN { get; set; } = string.Empty; + + public string CompanyShortName { get; set; } = string.Empty; + + public string CompanyShortNameCN { get; set; } = string.Empty; + } + public class SystemPacsConfig { public int Port { get; set; }