增加用户机构默认值修改

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",

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -74,6 +74,8 @@
 
     "SiteUrl": "http://irc.test.extimaging.com/login",
 
+    "OrganizationName": "Extlmaging",
+    "OrganizationNameCN": "Extlmaging",
     "CompanyName": "Extensive Imaging",
     "CompanyNameCN": "上海展影医疗科技有限公司",
     "CompanyShortName": "Extensive Imaging",

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",

IRaCIS.Core.API/appsettings.US_Test_IRC.json

@@ -68,15 +68,19 @@
   },
 
   "SystemEmailSendConfig": {
-    "Port": 465,
+    "Port": 587,
-    "Host": "smtp.qiye.aliyun.com",
+    "Host": "smtp-mail.outlook.com",
-    "FromEmail": "test@extimaging.com",
+    "FromEmail": "donotreply@elevateimaging.ai",
-    "FromName": "Test_IRC",
+    "FromName": "LiLi",
-    "AuthorizationCode": "SHzyyl2021",
+    "AuthorizationCode": "Q#669869497420ul",
-    "CompanyName": "Elevate Imaging",
+
+    "OrganizationName": "Elevate Imaging",
+    "OrganizationNameCN": "Elevate Imaging",
+    "CompanyName": "Elevate Imaging Inc.",
     "CompanyNameCN": "上海展影医疗科技有限公司",
     "CompanyShortName": "Elevate Imaging",
-    "CompanyShortNameCN": "展影医疗"
+    "CompanyShortNameCN": "展影医疗",
+    "SiteUrl": "https://lili.test.elevateimaging.ai/login"
   }
 
 }

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",

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",

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<ServiceVerifyConfigOption> _verifyConfig;
-
+        private readonly SystemEmailSendConfig _systemEmailConfig;
 
         public UserService(IRepository<User> userRepository,
 
@@ -47,6 +47,7 @@ namespace IRaCIS.Application.Services
             IReadingImageTaskService readingImageTaskService,
             IRepository<TrialUser> userTrialRepository,
             IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig,
+            IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig,
             IRepository<UserLog> userLogRepository,
                 IRepository<UserPassWordLog> userPassWordLogRepository
 ,
@@ -64,6 +65,8 @@ namespace IRaCIS.Application.Services
             _userTrialRepository = userTrialRepository;
             _userLogRepository = userLogRepository;
             _distributedLockProvider = distributedLockProvider;
+
+            _systemEmailConfig = systemEmailConfig.CurrentValue;
         }
 
 
@@ -589,7 +592,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);

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; }