From f916f0801b9422ecad5e788359aa6835c58e69a0 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 21 Oct 2022 11:39:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Helper/SendEmailHelper.cs | 5 +++- .../IRaCIS.Core.Application.xml | 7 ------ .../Document/TrialEmailNoticeConfigService.cs | 23 ++++++++++-------- IRaCISData/新建 DOCX 文档.docx | Bin 0 -> 10114 bytes 4 files changed, 17 insertions(+), 18 deletions(-) create mode 100644 IRaCISData/新建 DOCX 文档.docx diff --git a/IRaCIS.Core.Application/Helper/SendEmailHelper.cs b/IRaCIS.Core.Application/Helper/SendEmailHelper.cs index 053d18487..5db0001ce 100644 --- a/IRaCIS.Core.Application/Helper/SendEmailHelper.cs +++ b/IRaCIS.Core.Application/Helper/SendEmailHelper.cs @@ -72,7 +72,7 @@ public static class SendEmailHelper foreach (var item in sMTPEmailConfig.EmailAttachMentConfigList) { - await builder.Attachments.AddAsync(item.FileName, item.FileStream); + builder.Attachments.Add(item.FileName, item.FileData); } @@ -144,4 +144,7 @@ public class EmailAttachMentConfig public string FileName { get; set; } public Stream FileStream { get; set; } + + + public byte[] FileData { get; set; } } diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index af767e115..a29265f3e 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -7060,13 +7060,6 @@ - - - 同步项目标准字典信息 - - - - 修改全局阅片配置信息 diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index fe02470e3..904a5dc35 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -17,7 +17,7 @@ namespace IRaCIS.Core.Application.Service /// /// TrialEmailNoticeConfigService /// - [ApiExplorerSettings(GroupName = "Test")] + [ApiExplorerSettings(GroupName = "Trial")] public class TrialEmailNoticeConfigService : BaseService, ITrialEmailNoticeConfigService { @@ -71,7 +71,7 @@ namespace IRaCIS.Core.Application.Service } - private async Task FillWordTemplateAndEmailConfig(Guid trialId, Guid visitTaskId, Guid trialReadingCriterionId, CommonDocumentBusinessScenario businessScenarioEnum) + public async Task FillWordTemplateAndEmailConfig(Guid trialId, Guid visitTaskId, Guid trialReadingCriterionId, CommonDocumentBusinessScenario businessScenarioEnum) { var criterionTypeEnum = await _repository.Where(t => t.TrialId == trialId && t.Id == trialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync(); @@ -91,12 +91,12 @@ namespace IRaCIS.Core.Application.Service foreach (var item in emailConfig.ReceiveEmailList) { - sendEmailConfig.ToMailAddressList.Add(new MimeKit.MailboxAddress(string.Empty, item)); + sendEmailConfig.ToMailAddressList.Add(new MimeKit.MailboxAddress(item, item)); } foreach (var item in emailConfig.CopyEmailList) { - sendEmailConfig.CopyToMailAddressList.Add(new MimeKit.MailboxAddress(string.Empty, item)); + sendEmailConfig.CopyToMailAddressList.Add(new MimeKit.MailboxAddress(item, item)); } @@ -105,7 +105,7 @@ namespace IRaCIS.Core.Application.Service + Path.DirectorySeparatorChar.ToString() + "EmailTemplate" + Path.DirectorySeparatorChar.ToString() - + "SubjectEnrollConfirm.html"; + + "SubjectEnrollConfirmOrPDProgress.html"; using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile)) { @@ -121,11 +121,12 @@ namespace IRaCIS.Core.Application.Service var path= FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, emailConfig.FilePath); - //sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig() - //{ - // FileName = emailConfig.FileName, - // FileStream = - //}); + sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig() + { + FileName = emailConfig.FileName, + + FileData= File.ReadAllBytes(path) + }); if (businessScenarioEnum == CommonDocumentBusinessScenario.EnrollConfirmed) @@ -137,6 +138,8 @@ namespace IRaCIS.Core.Application.Service } + await SendEmailHelper.SendEmailAsync(sendEmailConfig); + return sendEmailConfig; } diff --git a/IRaCISData/新建 DOCX 文档.docx b/IRaCISData/新建 DOCX 文档.docx new file mode 100644 index 0000000000000000000000000000000000000000..6fb74f259242ded3990b31a083f898414413667d GIT binary patch literal 10114 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 literal 0 HcmV?d00001