diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/ZR.Admin.WebApi/Controllers/CommonController.cs index 83d461a..2122e9e 100644 --- a/ZR.Admin.WebApi/Controllers/CommonController.cs +++ b/ZR.Admin.WebApi/Controllers/CommonController.cs @@ -74,7 +74,8 @@ namespace ZR.Admin.WebApi.Controllers { return ToResponse(ApiResult.Error($"请配置邮箱信息")); } - MailHelper mailHelper = new(OptionsSetting.MailOptions.From, OptionsSetting.MailOptions.Smtp, OptionsSetting.MailOptions.Port, OptionsSetting.MailOptions.Password); + + MailHelper mailHelper = new(); string[] toUsers = sendEmailVo.ToUser.Split(",", StringSplitOptions.RemoveEmptyEntries); if (sendEmailVo.SendMe) diff --git a/ZR.Admin.WebApi/Startup.cs b/ZR.Admin.WebApi/Startup.cs index b375704..175e0b2 100644 --- a/ZR.Admin.WebApi/Startup.cs +++ b/ZR.Admin.WebApi/Startup.cs @@ -143,7 +143,7 @@ namespace ZR.Admin.WebApi //עREDIS Task.Run(() => { - RedisServer.Initalize(); + //RedisServer.Initalize(); }); } } diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json index 2d66141..3b26549 100644 --- a/ZR.Admin.WebApi/appsettings.json +++ b/ZR.Admin.WebApi/appsettings.json @@ -47,13 +47,14 @@ //Ϣ "MailOptions": { // - "From": "xxxx@qq.com", + "From": "", //egxxxx@qq.com // "Password": "123456", //Э "Smtp": "smtp.qq.com", "Port": 587 }, + //redis "RedisServer": { "Cache": "127.0.0.1:6379,defaultDatabase=0,poolsize=50,ssl=false,writeBuffer=10240,prefix=cache:", "Session": "127.0.0.1:6379,defaultDatabase=0,poolsize=50,ssl=false,writeBuffer=10240,prefix=session:" diff --git a/ZR.Common/MailHelper.cs b/ZR.Common/MailHelper.cs index b2e12c8..4555895 100644 --- a/ZR.Common/MailHelper.cs +++ b/ZR.Common/MailHelper.cs @@ -1,4 +1,5 @@ -using MailKit.Net.Smtp; +using Infrastructure; +using MailKit.Net.Smtp; using MimeKit; using MimeKit.Text; using System; @@ -30,7 +31,16 @@ namespace ZR.Common /// public bool UseSsl { get; set; } = false; public string mailSign = @""; + private readonly MailOptions mailOptions = new(); + public MailHelper() + { + ConfigUtils.Instance.Bind("MailOptions", mailOptions); + FromEmail = mailOptions.From; + Smtp = mailOptions.Smtp; + FromPwd = mailOptions.Password; + Port = mailOptions.Port; + } public MailHelper(string fromEmail, string smtp, int port, string fromPwd) { FromEmail = fromEmail; @@ -82,7 +92,6 @@ namespace ZR.Common /// /// 发送邮件 /// - /// /// /// /// @@ -141,7 +150,7 @@ namespace ZR.Common using (var client = new SmtpClient()) { client.ServerCertificateValidationCallback = (s, c, h, e) => true; - + //Smtp服务器 //client.Connect("smtp.qq.com", 587, false); client.Connect(Smtp, Port, true);