From c032c423216dd3a97a18b689070b5c0ab948ad8c Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 11 Jul 2024 10:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E9=BB=98=E8=AE=A4=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/appsettings.Prod_IRC.json | 2 ++ IRaCIS.Core.API/appsettings.Test_IRC.json | 3 +++ IRaCIS.Core.API/appsettings.US_Prod_IRC.json | 3 +++ IRaCIS.Core.API/appsettings.US_Test_IRC.json | 18 +++++++++++------- IRaCIS.Core.API/appsettings.US_Uat_IRC.json | 3 +++ IRaCIS.Core.API/appsettings.Uat_IRC.json | 2 ++ .../Service/Management/UserService.cs | 7 +++++-- IRaCIS.Core.Domain/_Config/_AppSettings.cs | 3 +++ 8 files changed, 32 insertions(+), 9 deletions(-) diff --git a/IRaCIS.Core.API/appsettings.Prod_IRC.json b/IRaCIS.Core.API/appsettings.Prod_IRC.json index 7d6013b68..2fe6807e3 100644 --- a/IRaCIS.Core.API/appsettings.Prod_IRC.json +++ b/IRaCIS.Core.API/appsettings.Prod_IRC.json @@ -55,6 +55,8 @@ "FromName": "IRC", "AuthorizationCode": "ExtImg@2022", "SiteUrl": "http://irc.extimaging.com/login", + "OrganizationName": "Extlmaging", + "OrganizationNameCN": "Extlmaging", "CompanyName": "Extensive Imaging", "CompanyNameCN": "上海展影医疗科技有限公司", "CompanyShortName": "Extensive Imaging", diff --git a/IRaCIS.Core.API/appsettings.Test_IRC.json b/IRaCIS.Core.API/appsettings.Test_IRC.json index 85eecf776..1f4e89bd2 100644 --- a/IRaCIS.Core.API/appsettings.Test_IRC.json +++ b/IRaCIS.Core.API/appsettings.Test_IRC.json @@ -70,6 +70,9 @@ "FromName": "Test_IRC", "AuthorizationCode": "SHzyyl2021", "SiteUrl": "http://irc.test.extimaging.com/login", + + "OrganizationName": "Extlmaging", + "OrganizationNameCN": "Extlmaging", "CompanyName": "Extensive Imaging", "CompanyNameCN": "上海展影医疗科技有限公司", "CompanyShortName": "Extensive Imaging", diff --git a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json index 4641c5c50..ca614f2ac 100644 --- a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json @@ -67,6 +67,9 @@ "FromEmail": "donotreply@elevateimaging.ai", "FromName": "LiLi", "AuthorizationCode": "Q#669869497420ul", + + "OrganizationName": "Elevate Imaging", + "OrganizationNameCN": "Elevate Imaging", "CompanyName": "Elevate Imaging Inc.", "CompanyNameCN": "上海展影医疗科技有限公司", "CompanyShortName": "Elevate Imaging", diff --git a/IRaCIS.Core.API/appsettings.US_Test_IRC.json b/IRaCIS.Core.API/appsettings.US_Test_IRC.json index 5278ddb56..19d4dbe15 100644 --- a/IRaCIS.Core.API/appsettings.US_Test_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Test_IRC.json @@ -68,15 +68,19 @@ }, "SystemEmailSendConfig": { - "Port": 465, - "Host": "smtp.qiye.aliyun.com", - "FromEmail": "test@extimaging.com", - "FromName": "Test_IRC", - "AuthorizationCode": "SHzyyl2021", - "CompanyName": "Elevate Imaging", + "Port": 587, + "Host": "smtp-mail.outlook.com", + "FromEmail": "donotreply@elevateimaging.ai", + "FromName": "LiLi", + "AuthorizationCode": "Q#669869497420ul", + + "OrganizationName": "Elevate Imaging", + "OrganizationNameCN": "Elevate Imaging", + "CompanyName": "Elevate Imaging Inc.", "CompanyNameCN": "上海展影医疗科技有限公司", "CompanyShortName": "Elevate Imaging", - "CompanyShortNameCN": "展影医疗" + "CompanyShortNameCN": "展影医疗", + "SiteUrl": "https://lili.test.elevateimaging.ai/login" } } diff --git a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json index 5bd1d0708..8ed58013e 100644 --- a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json @@ -77,6 +77,9 @@ "FromEmail": "donotreply@elevateimaging.ai", "FromName": "LiLi", "AuthorizationCode": "Q#669869497420ul", + + "OrganizationName": "Elevate Imaging", + "OrganizationNameCN": "Elevate Imaging", "CompanyName": "Elevate Imaging Inc.", "CompanyNameCN": "上海展影医疗科技有限公司", "CompanyShortName": "Elevate Imaging", diff --git a/IRaCIS.Core.API/appsettings.Uat_IRC.json b/IRaCIS.Core.API/appsettings.Uat_IRC.json index c4b925a17..ddc5ad7ad 100644 --- a/IRaCIS.Core.API/appsettings.Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.Uat_IRC.json @@ -61,6 +61,8 @@ "FromName": "UAT_IRC", "AuthorizationCode": "SHzyyl2021", "SiteUrl": "http://irc.uat.extimaging.com/login", + "OrganizationName": "Extlmaging", + "OrganizationNameCN": "Extlmaging", "CompanyName": "Extensive Imaging", "CompanyNameCN": "上海展影医疗科技有限公司", "CompanyShortName": "Extensive Imaging", diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 2910bdc46..151b5c907 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -36,7 +36,7 @@ namespace IRaCIS.Application.Services private readonly IEasyCachingProvider _cache; private readonly IReadingImageTaskService _readingImageTaskService; private readonly IOptionsMonitor _verifyConfig; - + private readonly SystemEmailSendConfig _systemEmailConfig; public UserService(IRepository userRepository, @@ -47,6 +47,7 @@ namespace IRaCIS.Application.Services IReadingImageTaskService readingImageTaskService, IRepository userTrialRepository, IOptionsMonitor verifyConfig, + IOptionsMonitor systemEmailConfig, IRepository userLogRepository, IRepository userPassWordLogRepository , @@ -64,6 +65,8 @@ namespace IRaCIS.Application.Services _userTrialRepository = userTrialRepository; _userLogRepository = userLogRepository; _distributedLockProvider = distributedLockProvider; + + _systemEmailConfig = systemEmailConfig.CurrentValue; } @@ -593,7 +596,7 @@ namespace IRaCIS.Application.Services if (user.IsZhiZhun) { - user.OrganizationName = AppSettings.DefaultInternalOrganizationName; + user.OrganizationName = _userInfo.IsEn_Us? _systemEmailConfig.OrganizationName: _systemEmailConfig.OrganizationNameCN ; } await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId = model.Id, OptType = UserOptType.UpdateUser }, true); diff --git a/IRaCIS.Core.Domain/_Config/_AppSettings.cs b/IRaCIS.Core.Domain/_Config/_AppSettings.cs index 679d6d101..1361360fb 100644 --- a/IRaCIS.Core.Domain/_Config/_AppSettings.cs +++ b/IRaCIS.Core.Domain/_Config/_AppSettings.cs @@ -41,6 +41,9 @@ namespace IRaCIS.Core.Domain.Share public string SiteUrl { get; set; } + public string OrganizationName { get; set; } + public string OrganizationNameCN { get; set; } + public string CompanyName { get; set; } public string CompanyNameCN { get; set; }