wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

:sparkles:新增邮件发送日志

Browse Source
This commit is contained in:
不做码农
2023-11-21 11:48:22 +08:00
parent e8812787ad
commit de143b04bc
19 changed files with 357 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZR.Admin.WebApi/Controllers/CommonController.cs
-34
View File
@@ -1,6 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
using ZR.Admin.WebApi.Filters;
using ZR.Model.System;
using ZR.Service.IService;
@@ -75,39 +74,6 @@ namespace ZR.Admin.WebApi.Controllers
return SUCCESS(msg);
}
/// <summary>
/// 发送邮件
/// </summary>
/// <param name="sendEmailVo">请求参数接收实体</param>
/// <returns></returns>
[ActionPermissionFilter(Permission = "tool:email:send")]
[Log(Title = "发送邮件")]
[HttpPost]
public IActionResult SendEmail([FromBody] SendEmailDto sendEmailVo)
{
if (sendEmailVo == null)
{
return ToResponse(ApiResult.Error($"请求参数不完整"));
}
if (string.IsNullOrEmpty(OptionsSetting.MailOptions.FromEmail) || string.IsNullOrEmpty(OptionsSetting.MailOptions.Password))
{
return ToResponse(ApiResult.Error($"请配置邮箱信息"));
}
MailHelper mailHelper = new();
string[] toUsers = sendEmailVo.ToUser.Split(",", StringSplitOptions.RemoveEmptyEntries);
if (sendEmailVo.SendMe)
{
toUsers.Append(mailHelper.FromEmail);
}
string result = mailHelper.SendMail(toUsers, sendEmailVo.Subject, sendEmailVo.Content, sendEmailVo.FileUrl, sendEmailVo.HtmlContent);
logger.Info($"发送邮件{JsonConvert.SerializeObject(sendEmailVo)}, 结果{result}");
return SUCCESS(result);
}
#region 上传
/// <summary>
ZR.Admin.WebApi/Controllers/Email/EmailLogController.cs
+142
View File
@@ -0,0 +1,142 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Dto;
using ZR.ServiceCore.Model;
using ZR.ServiceCore.Services;
//创建时间：2023-11-20
namespace ZR.Admin.WebApi.Controllers.Email
{
/// <summary>
/// 邮件发送记录
/// </summary>
[Verify]
[Route("system/EmailLog")]
[ApiExplorerSettings(GroupName = "sys")]
public class EmailLogController : BaseController
{
/// <summary>
/// 邮件发送记录接口
/// </summary>
private readonly IEmailLogService _EmailLogService;
private OptionsSetting OptionsSetting;
public EmailLogController(
IEmailLogService EmailLogService,
IOptions<OptionsSetting> options)
{
_EmailLogService = EmailLogService;
OptionsSetting = options.Value;
}
/// <summary>
/// 查询邮件发送记录列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "emaillog:list")]
public IActionResult QueryEmailLog([FromQuery] EmailLogQueryDto parm)
{
var response = _EmailLogService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询邮件发送记录详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "emaillog:query")]
public IActionResult GetEmailLog(long Id)
{
var response = _EmailLogService.GetInfo(Id);
var info = response.Adapt<EmailLogDto>();
return SUCCESS(info);
}
/// <summary>
/// 添加邮件发送记录
/// </summary>
/// <returns></returns>
[HttpPost("sendEmail")]
[ActionPermissionFilter(Permission = "tool:email:send")]
[Log(Title = "邮件发送", BusinessType = BusinessType.INSERT)]
public IActionResult SendEmail([FromBody] EmailLogDto dto)
{
if (dto.IdArr.Length <= 0) { return ToResponse(ApiResult.Error($"发送失败Id 不能为空")); }
int count = 0;
foreach (var item in dto.IdArr)
{
var response = _EmailLogService.GetInfo(item);
if (response?.IsSend == 0)
{
MailHelper mailHelper = new();
string[] toUsers = response.ToEmails.Split(",", StringSplitOptions.RemoveEmptyEntries);
string result = mailHelper.SendMail(toUsers, response.Subject, "", response.FileUrl, response.EmailContent);
count += _EmailLogService.Update(x => x.Id == item, x => new EmailLog()
{
IsSend = 1,
SendTime = DateTime.Now,
SendResult = result
});
}
}
return SUCCESS(count);
}
/// <summary>
/// 删除邮件发送记录
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "emaillog:delete")]
[Log(Title = "邮件发送记录", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteEmailLog(string ids)
{
long[] idsArr = Tools.SpitLongArrary(ids);
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _EmailLogService.Delete(idsArr);
return ToResponse(response);
}
/// <summary>
/// 发送邮件
/// </summary>
/// <param name="sendEmailVo">请求参数接收实体</param>
/// <returns></returns>
[ActionPermissionFilter(Permission = "tool:email:send")]
[Log(Title = "发送邮件")]
[HttpPost("/common/SendEmail")]
public IActionResult SendEmail([FromBody] SendEmailDto sendEmailVo)
{
if (sendEmailVo == null)
{
return ToResponse(ApiResult.Error($"请求参数不完整"));
}
if (string.IsNullOrEmpty(OptionsSetting.MailOptions.FromEmail) || string.IsNullOrEmpty(OptionsSetting.MailOptions.Password))
{
return ToResponse(ApiResult.Error($"请配置邮箱信息"));
}
MailHelper mailHelper = new();
string[] toUsers = sendEmailVo.ToUser.Split(",", StringSplitOptions.RemoveEmptyEntries);
string result = string.Empty;
if (sendEmailVo.IsSend)
{
result = mailHelper.SendMail(toUsers, sendEmailVo.Subject, sendEmailVo.Content, sendEmailVo.FileUrl, sendEmailVo.HtmlContent);
}
_EmailLogService.AddEmailLog(new EmailLog() { EmailContent = sendEmailVo.HtmlContent, Subject = sendEmailVo.Subject, ToEmails = sendEmailVo.ToUser, AddTime = DateTime.Now, FromEmail = OptionsSetting.MailOptions.FromEmail, IsSend = sendEmailVo.IsSend ? 1 : 0, SendResult = result });
//logger.Info($"发送邮件{JsonConvert.SerializeObject(sendEmailVo)}, 结果{result}");
return SUCCESS(result);
}
}
}
ZR.Admin.WebApi/Controllers/System/EmailTplController.cs → ZR.Admin.WebApi/Controllers/Email/EmailTplController.cs
+3 -3
View File
@@ -5,13 +5,14 @@ using ZR.Service.System.ISystemService;
using ZR.ServiceCore.Model;
//创建时间：2023-11-12
namespace ZR.Admin.WebApi.Controllers
namespace ZR.Admin.WebApi.Controllers.Email
{
/// <summary>
/// 邮件模板
/// </summary>
[Verify]
[Route("system/EmailTpl")]
[ApiExplorerSettings(GroupName = "sys")]
public class EmailTplController : BaseController
{
/// <summary>
@@ -37,7 +38,6 @@ namespace ZR.Admin.WebApi.Controllers
return SUCCESS(response);
}
/// <summary>
/// 查询邮件模板详情
/// </summary>
@@ -47,7 +47,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetEmailTpl(int Id)
{
var response = _EmailTplService.GetInfo(Id);
var info = response.Adapt<EmailTpl>();
return SUCCESS(info);
}