18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
tongfei
2024-04-12 13:59:29 +08:00
parent 25a5bea5fc
commit f17286bfe5
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -4337,11 +4337,11 @@
<param name="content"></param> <param name="content"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.IService.ISendMessageService.SendEmail(System.Collections.Generic.List{MimeKit.MailboxAddress},System.String,System.String)"> <member name="M:WMS.Web.Domain.IService.ISendMessageService.SendEmail(System.String,System.String,System.String)">
<summary> <summary>
邮箱发送 邮箱发送
</summary> </summary>
<param name="toMailList"></param> <param name="mailAddress"></param>
<param name="textBody"></param> <param name="textBody"></param>
<returns></returns> <returns></returns>
</member> </member>
@@ -6199,7 +6199,7 @@
<param name="content"></param> <param name="content"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.Services.SendMessageService.SendEmail(System.Collections.Generic.List{MimeKit.MailboxAddress},System.String,System.String)"> <member name="M:WMS.Web.Domain.Services.SendMessageService.SendEmail(System.String,System.String,System.String)">
<summary> <summary>
邮箱发送消息 邮箱发送消息
</summary> </summary>

4
src/WMS.Web.Domain/IService/Public/ISendMessageService.cs
View File

@@ -25,10 +25,10 @@ namespace WMS.Web.Domain.IService
/// <summary> /// <summary>
/// 邮箱发送 /// 邮箱发送
/// </summary> /// </summary>
/// <param name="toMailList"></param> /// <param name="mailAddress"></param>
/// <param name="textBody"></param> /// <param name="textBody"></param>
/// <returns></returns> /// <returns></returns>
Task<Result> SendEmail(List<MailboxAddress> toMailList, string textBody, string coustomerName); Task<Result> SendEmail(string mailAddress, string textBody, string coustomerName);
/// <summary> /// <summary>
/// 执行 /// 执行

22
src/WMS.Web.Domain/Services/Public/SendMessageService.cs
View File

@@ -114,14 +114,14 @@ namespace WMS.Web.Domain.Services
/// <param name="toMailList"></param> /// <param name="toMailList"></param>
/// <param name="textBody"></param> /// <param name="textBody"></param>
/// <returns></returns> /// <returns></returns>
public async Task<Result> SendEmail(List<MailboxAddress> toMailList, string textBody, string coustomerName) public async Task<Result> SendEmail(string mailAddress, string textBody, string coustomerName)
{ {
// 创建 MimeMessage 实例 // 创建 MimeMessage 实例
MimeMessage message = new MimeMessage(); MimeMessage message = new MimeMessage();
//message.From.Add(new MailboxAddress( _emailOptions.SenderName, _emailOptions.SenderEmail)); // 设置发件人姓名和邮箱地址 //message.From.Add(new MailboxAddress( _emailOptions.SenderName, _emailOptions.SenderEmail)); // 设置发件人姓名和邮箱地址
message.From.Add(new MailboxAddress("深圳市元创时代", _emailOptions.SenderEmail)); // 设置发件人姓名和邮箱地址 message.From.Add(new MailboxAddress("深圳市元创时代", _emailOptions.SenderEmail)); // 设置发件人姓名和邮箱地址
//message.To.Add(new MailboxAddress("Recipient Name", "244188119@qq.com")); // 设置收件人姓名和邮箱地址 message.To.Add(new MailboxAddress(coustomerName, mailAddress)); // 设置收件人姓名和邮箱地址
message.To.AddRange(toMailList); //message.To.AddRange(toMailList);
//message.Subject = _emailOptions.SendTitle+$"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"; // 设置邮件主题 //message.Subject = _emailOptions.SendTitle+$"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"; // 设置邮件主题
message.Subject = $"【深圳市元创时代】-产品入库通知{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"; // 设置邮件主题 message.Subject = $"【深圳市元创时代】-产品入库通知{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"; // 设置邮件主题
@@ -141,13 +141,13 @@ namespace WMS.Web.Domain.Services
await client.SendAsync(message); // 发送邮件 await client.SendAsync(message); // 发送邮件
await client.DisconnectAsync(true); // 断开连接 await client.DisconnectAsync(true); // 断开连接
} }
_logger.LogInformation("邮箱发送消息：成功->收件方：" + JsonConvert.SerializeObject(toMailList) + " 内容：" + textBody); _logger.LogInformation("邮箱发送消息：成功->收件方：" + mailAddress + " 内容：" + textBody);
return Result.ReSuccess(); return Result.ReSuccess();
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogInformation("邮箱发送消息：失败->收件方：" + JsonConvert.SerializeObject(toMailList) + " 内容：" + textBody); _logger.LogInformation("邮箱发送消息：失败->收件方：" + mailAddress + " 内容：" + textBody);
return Result.ReFailure("邮箱发送失败：" + ex.Message, 50006); return Result.ReFailure("邮箱发送：失败->收件方："+mailAddress+",错误内容：" + ex.Message, 50006);
} }
} }
@@ -200,7 +200,7 @@ namespace WMS.Web.Domain.Services
data.Emails = string.Join(",", item.Emails); data.Emails = string.Join(",", item.Emails);
foreach (var ema in item.Emails) foreach (var ema in item.Emails)
{ {
data.EmailList.Add(new MailboxAddress("Recipient Name", ema)); data.EmailList.Add(new MailboxAddress(item.CustomerName, ema));
} }
foreach (var current_det in current_notSendDetails) foreach (var current_det in current_notSendDetails)
@@ -257,8 +257,12 @@ namespace WMS.Web.Domain.Services
i = i + 1; i = i + 1;
} }
//邮箱 foreach (var email in item.EmailList)
await this.SendEmail(item.EmailList, content, item.CustomerName); {
//邮箱
await this.SendEmail(email.Address, content, email.Name);
}
//短信 //短信
var sms_result = this.SendSms(item.PhoneNumbers, content); var sms_result = this.SendSms(item.PhoneNumbers, content);
//内容过长-分段发送 //内容过长-分段发送