邮件测试

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

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -7060,13 +7060,6 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.TrialConfigService.AsyncTrialCriterionDictionary(IRaCIS.Core.Application.Contracts.AsyncTrialCriterionDictionaryInDto)">
-            <summary>
-            同步项目标准字典信息
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.Application.TrialConfigService.SetGlobalReadingInfo(IRaCIS.Core.Application.Contracts.SetGlobalReadingInfoInDto)">
             <summary>
             修改全局阅片配置信息

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -17,7 +17,7 @@ namespace IRaCIS.Core.Application.Service
     /// <summary>
     /// TrialEmailNoticeConfigService
     /// </summary>	
-    [ApiExplorerSettings(GroupName = "Test")]
+    [ApiExplorerSettings(GroupName = "Trial")]
     public class TrialEmailNoticeConfigService : BaseService, ITrialEmailNoticeConfigService
     {
 
@@ -71,7 +71,7 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
-        private async Task <SMTPEmailConfig> FillWordTemplateAndEmailConfig(Guid trialId, Guid visitTaskId, Guid trialReadingCriterionId, CommonDocumentBusinessScenario businessScenarioEnum)
+        public async Task <SMTPEmailConfig> FillWordTemplateAndEmailConfig(Guid trialId, Guid visitTaskId, Guid trialReadingCriterionId, CommonDocumentBusinessScenario businessScenarioEnum)
         {
             var criterionTypeEnum = await _repository.Where<ReadingQuestionCriterionTrial>(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()
+            sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
-            //{
+            {
-            //    FileName = emailConfig.FileName,
+                FileName = emailConfig.FileName,
-            //    FileStream =
+
-            //});
+                FileData= File.ReadAllBytes(path)
+            });
 
 
             if (businessScenarioEnum == CommonDocumentBusinessScenario.EnrollConfirmed)
@@ -137,6 +138,8 @@ namespace IRaCIS.Core.Application.Service
 
             }
 
+           await SendEmailHelper.SendEmailAsync(sendEmailConfig);
+
             return sendEmailConfig;
 
         }