From 7f4f5e9d08426f49d5f215ec513cf2af406a60ea Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 10 Dec 2025 15:24:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=E5=8F=91?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Helper/Email/SendEmailHelper.cs | 4 ++-- .../MassTransit/Recurring/OldRecurringEmailHelper.cs | 3 ++- .../Service/Document/EmailSendService.cs | 4 ++-- .../Service/Document/TrialEmailNoticeConfigService.cs | 9 +++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/IRaCIS.Core.Application/Helper/Email/SendEmailHelper.cs b/IRaCIS.Core.Application/Helper/Email/SendEmailHelper.cs index 488333c0e..211665302 100644 --- a/IRaCIS.Core.Application/Helper/Email/SendEmailHelper.cs +++ b/IRaCIS.Core.Application/Helper/Email/SendEmailHelper.cs @@ -147,7 +147,7 @@ public static class SendEmailHelper return true; } - public static async Task SendEmailAsync(SMTPEmailConfig sMTPEmailConfig, EventHandler? messageSentSuccess = null) + public static async Task SendEmailAsync(SMTPEmailConfig sMTPEmailConfig,Trial? trial, EventHandler? messageSentSuccess = null) { var messageToSend = new MimeMessage(); @@ -217,7 +217,7 @@ public static class SendEmailHelper await smtp.ConnectAsync(sMTPEmailConfig.Host, sMTPEmailConfig.Port, SecureSocketOptions.Auto); - await smtp.AuthenticateAsync(sMTPEmailConfig.UserName, sMTPEmailConfig.AuthorizationCode); + await smtp.AuthenticateAsync(trial.EmailFromEmail, trial.EmailAuthorizationCode); await smtp.SendAsync(messageToSend); diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs b/IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs index 4d6ddb037..8055c2c3a 100644 --- a/IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs +++ b/IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs @@ -34,6 +34,7 @@ public static class OldRecurringEmailHelper var trialEmailConfig = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == businessScenario, ignoreQueryFilters: true) .Include(t => t.TrialEmailNoticeUserList).Include(t => t.TrialEmailBlackUserList).FirstOrDefaultAsync(); + var trialInfo=await _trialRepository.Where(t=>t.Id== trialId).FirstOrDefaultAsync(); if (trialEmailConfig == null || trialEmailConfig.IsAutoSend == false || trialEmailConfig.IsEnable == false) { @@ -162,7 +163,7 @@ public static class OldRecurringEmailHelper if (sendEmailConfig != null) { - await SendEmailHelper.SendEmailAsync(sendEmailConfig); + await SendEmailHelper.SendEmailAsync(sendEmailConfig, trialInfo); } diff --git a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs index 89c00759c..e00fec414 100644 --- a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs +++ b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs @@ -110,8 +110,8 @@ namespace IRaCIS.Core.Application.Service if (sendEmailConfig != null) { - - await SendEmailHelper.SendEmailAsync(sendEmailConfig); + var trialInfo = await _trialRepository.Where(t => t.Id == trialId).FirstOrDefaultAsync(); + await SendEmailHelper.SendEmailAsync(sendEmailConfig, trialInfo); } } diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 8a81eb8cd..d7a021a7d 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -13,6 +13,7 @@ using IRaCIS.Core.Application.Interfaces; using IRaCIS.Core.Application.MassTransit.Consumer; using IRaCIS.Core.Application.Service.Reading.Dto; using IRaCIS.Core.Application.ViewModel; +using IRaCIS.Core.Domain.Models; using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share.Common; using IRaCIS.Core.Infra.EFCore.Common; @@ -617,8 +618,8 @@ namespace IRaCIS.Core.Application.Service FileStream = File.OpenRead(phyPath), }); - - await SendEmailHelper.SendEmailAsync(sendEmailConfig); + var trialInfo = await _trialRepository.Where(t => t.Id == taskInfo.TrialId).FirstOrDefaultAsync(); + await SendEmailHelper.SendEmailAsync(sendEmailConfig, trialInfo); return string.Empty; } @@ -733,8 +734,8 @@ namespace IRaCIS.Core.Application.Service FileStream = pdfMemoryStream }); - - await SendEmailHelper.SendEmailAsync(sendEmailConfig); + var trialInfo = await _trialRepository.Where(t => t.Id == taskInfo.TrialId).FirstOrDefaultAsync(); + await SendEmailHelper.SendEmailAsync(sendEmailConfig, trialInfo); }