From bf3961378945556a8d5537490a8d011b62e73322 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 18 Sep 2024 16:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=85=AC=E5=8F=B8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/Controllers/ExtraController.cs        |  8 ++++++++
 IRaCIS.Core.API/IRaCIS.Core.API.xml                   |  2 +-
 .../Service/Management/DTO/UserModel.cs               |  2 ++
 IRaCIS.Core.Domain/_Config/_AppSettings.cs            | 11 +++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

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<ServiceVerifyConfigOption> _verifyConfig,
+             [FromServices] IOptionsMonitor<SystemEmailSendConfig> _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 @@
             <param name="doctorId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,ZiggyCreatures.Caching.Fusion.IFusionCache,IRaCIS.Application.Services.IUserService,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Application.Contracts.IReadingImageTaskService,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},IRaCIS.Application.Services.IMailVerificationService)">
+        <member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,ZiggyCreatures.Caching.Fusion.IFusionCache,IRaCIS.Application.Services.IUserService,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Application.Contracts.IReadingImageTaskService,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},IRaCIS.Application.Services.IMailVerificationService)">
             <summary>  系统用户登录接口[New] </summary>
         </member>
         <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrialInspection(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Application.Contracts.TrialCommand})">
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; }