XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改邮件发送
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-12-10 15:24:57 +08:00
parent 55a2301bb5
commit 7f4f5e9d08
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Helper/Email/SendEmailHelper.cs
View File

@ -147,7 +147,7 @@ public static class SendEmailHelper
return true; return true;
} }
public static async Task SendEmailAsync(SMTPEmailConfig sMTPEmailConfig, EventHandler<MessageSentEventArgs>? messageSentSuccess = null) public static async Task SendEmailAsync(SMTPEmailConfig sMTPEmailConfig,Trial? trial, EventHandler<MessageSentEventArgs>? messageSentSuccess = null)
{ {
var messageToSend = new MimeMessage(); var messageToSend = new MimeMessage();
@ -217,7 +217,7 @@ public static class SendEmailHelper
await smtp.ConnectAsync(sMTPEmailConfig.Host, sMTPEmailConfig.Port, SecureSocketOptions.Auto); 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); await smtp.SendAsync(messageToSend);

3
IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs
View File

@ -34,6 +34,7 @@ public static class OldRecurringEmailHelper
var trialEmailConfig = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == businessScenario, ignoreQueryFilters: true) var trialEmailConfig = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == businessScenario, ignoreQueryFilters: true)
.Include(t => t.TrialEmailNoticeUserList).Include(t => t.TrialEmailBlackUserList).FirstOrDefaultAsync(); .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) if (trialEmailConfig == null || trialEmailConfig.IsAutoSend == false || trialEmailConfig.IsEnable == false)
{ {
@ -162,7 +163,7 @@ public static class OldRecurringEmailHelper
if (sendEmailConfig != null) if (sendEmailConfig != null)
{ {
await SendEmailHelper.SendEmailAsync(sendEmailConfig); await SendEmailHelper.SendEmailAsync(sendEmailConfig, trialInfo);
} }

4
IRaCIS.Core.Application/Service/Document/EmailSendService.cs
View File

@ -110,8 +110,8 @@ namespace IRaCIS.Core.Application.Service
if (sendEmailConfig != null) if (sendEmailConfig != null)
{ {
var trialInfo = await _trialRepository.Where(t => t.Id == trialId).FirstOrDefaultAsync();
await SendEmailHelper.SendEmailAsync(sendEmailConfig); await SendEmailHelper.SendEmailAsync(sendEmailConfig, trialInfo);
} }
} }

9
IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
View File

@ -13,6 +13,7 @@ using IRaCIS.Core.Application.Interfaces;
using IRaCIS.Core.Application.MassTransit.Consumer; using IRaCIS.Core.Application.MassTransit.Consumer;
using IRaCIS.Core.Application.Service.Reading.Dto; using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Core.Application.ViewModel; using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Domain.Models;
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Domain.Share.Common; using IRaCIS.Core.Domain.Share.Common;
using IRaCIS.Core.Infra.EFCore.Common; using IRaCIS.Core.Infra.EFCore.Common;
@ -617,8 +618,8 @@ namespace IRaCIS.Core.Application.Service
FileStream = File.OpenRead(phyPath), FileStream = File.OpenRead(phyPath),
}); });
var trialInfo = await _trialRepository.Where(t => t.Id == taskInfo.TrialId).FirstOrDefaultAsync();
await SendEmailHelper.SendEmailAsync(sendEmailConfig); await SendEmailHelper.SendEmailAsync(sendEmailConfig, trialInfo);
return string.Empty; return string.Empty;
} }
@ -733,8 +734,8 @@ namespace IRaCIS.Core.Application.Service
FileStream = pdfMemoryStream FileStream = pdfMemoryStream
}); });
var trialInfo = await _trialRepository.Where(t => t.Id == taskInfo.TrialId).FirstOrDefaultAsync();
await SendEmailHelper.SendEmailAsync(sendEmailConfig); await SendEmailHelper.SendEmailAsync(sendEmailConfig, trialInfo);
} }