diff --git a/IRaCIS.Core.API/appsettings.Prod_IRC.json b/IRaCIS.Core.API/appsettings.Prod_IRC.json index abee6fb9f..db86245af 100644 --- a/IRaCIS.Core.API/appsettings.Prod_IRC.json +++ b/IRaCIS.Core.API/appsettings.Prod_IRC.json @@ -9,7 +9,7 @@ "ConnectionStrings": { //"RemoteNew": "Server=10.10.10.49,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true", //"Hangfire": "Server=10.10.10.49,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true" - "RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true", + "RemoteNew": "Server=101.132.193.237,1433;Database=Prod_IRC_pidr_restore_2;User ID=sa;Password=xc@123456;TrustServerCertificate=true", "Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true" }, "WeComNoticeConfig": { diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs b/IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs index 4bc335201..b07ec8da6 100644 --- a/IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs @@ -119,7 +119,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring var htmlBodyStr = string.Format( CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage), - userinfo.UserName, + userinfo.FullName, _systemEmailConfig.SiteUrl ); @@ -237,29 +237,18 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring return; } - var userWorkLanguageList = userinfoList.Select(x => x.UserWorkLanguage).Distinct().ToList(); - foreach (var workLanguage in userWorkLanguageList) + foreach (var userinfo in userinfoList) { - var langUserInfoList = userinfoList.Where(x => x.UserWorkLanguage == workLanguage).ToList(); - if (!langUserInfoList.Any()) - { - continue; - } - - string msg = $"{langUserInfoList.Count}生效通知,"; + string msg = $"{userinfo.UserName}生效通知,"; try { var messageToSend = new MimeMessage(); messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); - foreach (var userinfo in langUserInfoList) - { - messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); - } - + var workLanguage = userinfo.UserWorkLanguage; var userIsEn_US = workLanguage == UserWorkLanguage.US; var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; - var userNames = langUserInfoList.Select(x => x.UserName).ToList(); Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input => { @@ -267,7 +256,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring var htmlBodyStr = string.Format( CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage), - string.Join(',', userNames), + userinfo.FullName, _systemEmailConfig.SiteUrl ); diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs index d400704f8..1a555bc73 100644 --- a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs @@ -148,7 +148,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring var htmlBodyStr = string.Format( CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage), - userinfo.UserName, + userinfo.FullName, _systemEmailConfig.SiteUrl ); @@ -287,37 +287,26 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring join u in userinfoList on ut.ConfirmUserId equals u.Id select new { ut.TrialId, User = u }).ToList(); - var groupedList = userWithTrialList.GroupBy(x => new { x.TrialId, x.User.UserWorkLanguage }).ToList(); - foreach (var groupItem in groupedList) + foreach (var userWithTrial in userWithTrialList) { - var langUserInfoList = groupItem.Select(x => x.User).Distinct().ToList(); - if (!langUserInfoList.Any()) - { - continue; - } - - string msg = $"{langUserInfoList.Count}项目生效通知,"; + var userinfo = userWithTrial.User; + string msg = $"{userinfo.UserName}项目生效通知,"; try { var messageToSend = new MimeMessage(); messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); - foreach (var userinfo in langUserInfoList) - { - messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); - } - - var workLanguage = groupItem.Key.UserWorkLanguage; + var workLanguage = userinfo.UserWorkLanguage; var userIsEn_US = workLanguage == UserWorkLanguage.US; var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; - var userNames = langUserInfoList.Select(x => x.UserName).ToList(); Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input => { var topicStr = string.Format(input.topicStr, companyName); var htmlBodyStr = string.Format( CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage), - string.Join(',', userNames), + userinfo.FullName, _systemEmailConfig.SiteUrl ); @@ -325,7 +314,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring }; await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc, workLanguage); - var trialInfo = await _trialRepository.Where(x => x.Id == groupItem.Key.TrialId).FirstOrDefaultAsync(); + var trialInfo = await _trialRepository.Where(x => x.Id == userWithTrial.TrialId).FirstOrDefaultAsync(); if (trialInfo == null) { continue;