消息组件配置参数增加IServiceProvider，以便从任意服务加载配置信息

README.md

@@ -74,7 +74,7 @@ public class Startup
         services.AddEasyNotice(config =>
         {
             config.IntervalSeconds = 10;//同一标题的消息，10秒内只能发一条，避免短时间内大量发送重复消息
-            config.UseEmail(option =>
+            config.UseEmail((option, serviceProvider) =>
             {
                 option.Host = "smtp.qq.com";//SMTP地址
                 option.Port = 465;//SMTP端口
@@ -138,7 +138,7 @@ public class Startup
         services.AddEasyNotice(config =>
         {
             config.IntervalSeconds = 10;//同一标题的消息，10秒内只能发一条，避免短时间内大量发送重复消息
-            config.UseDingTalk(option =>
+            config.UseDingTalk((option, serviceProvider) =>
             {
                 option.WebHook = "https://oapi.dingtalk.com/robot/send?access_token=xxxxx";//通知地址
                 option.Secret = "secret";//签名校验
@@ -194,7 +194,7 @@ public class Startup
         services.AddEasyNotice(config =>
         {
             config.IntervalSeconds = 10;//同一标题的消息，10秒内只能发一条，避免短时间内大量发送重复消息
-            config.UseFeishu(option =>
+            config.UseFeishu((option, serviceProvider) =>
             {
                 option.WebHook = "https://open.feishu.cn/open-apis/bot/v2/hook/xxxxx";//通知地址
                 option.Secret = "secret";//签名校验
@@ -250,7 +250,7 @@ public class Startup
         services.AddEasyNotice(config =>
         {
             config.IntervalSeconds = 10;//同一标题的消息，10秒内只能发一条，避免短时间内大量发送重复消息
-            config.UseWeixin(option =>
+            config.UseWeixin((option, serviceProvider) =>
             {
                 option.WebHook = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=xxxxx";//通知地址
             });

sample/EasyNotice.Demo.WebApi/Controller/NoticeController.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using EasyNotice.Core;
+using Microsoft.AspNetCore.Mvc;
 
 namespace EasyNotice.Demo.WebApi.Controller
 {
@@ -26,36 +27,36 @@ public NoticeController(IEmailProvider provider,
         /// 邮件发送
         /// </summary>
         [HttpGet]
-        public async Task SendMail([FromQuery] string str)
+        public async Task<EasyNoticeSendResponse> SendMail([FromQuery] string str)
         {
-            await _mailProvider.SendAsync(str, new Exception(str));
+            return await _mailProvider.SendAsync(str, new Exception(str));
         }
 
         /// <summary>
         /// 钉钉发送
         /// </summary>
         [HttpGet]
-        public async Task SendDingTalk([FromQuery] string str)
+        public async Task<EasyNoticeSendResponse> SendDingTalk([FromQuery] string str)
         {
-            await _dingtalkProvider.SendAsync(str, new Exception(str));
+            return await _dingtalkProvider.SendAsync(str, new Exception(str));
         }
 
         /// <summary>
         /// 飞书发送
         /// </summary>
         [HttpGet]
-        public async Task SendFeishu([FromQuery] string str)
+        public async Task<EasyNoticeSendResponse> SendFeishu([FromQuery] string str)
         {
-            await _feishuProvider.SendAsync(str, new Exception(str));
+            return await _feishuProvider.SendAsync(str, new Exception(str));
         }
 
         /// <summary>
         /// 企业微信发送
         /// </summary>
         [HttpGet]
-        public async Task SendWexin([FromQuery] string str)
+        public async Task<EasyNoticeSendResponse> SendWexin([FromQuery] string str)
         {
-            await _weixinProvider.SendAsync(str, new Exception(str));
+            return await _weixinProvider.SendAsync(str, new Exception(str));
         }
     }
 }

sample/EasyNotice.Demo.WebApi/Extensions/NoticeExtensions.cs

@@ -20,21 +20,21 @@ public static IServiceCollection AddNotice(this IServiceCollection services, ICo
                 var mailOptions = baseConfiguration.GetSection(EmailOptions.SectionName).Get<EmailOptions>();
                 if (mailOptions != null)
                 {
-                    config.UseEmail(x =>
+                    config.UseEmail((option, serviceProvider) =>
                     {
-                        x.Password = mailOptions.Password;
-                        x.Host = mailOptions.Host;
-                        x.FromAddress = mailOptions.FromAddress;
-                        x.FromName = mailOptions.FromName;
-                        x.Port = mailOptions.Port;
-                        x.ToAddress = mailOptions.ToAddress;
+                        option.Password = mailOptions.Password;
+                        option.Host = mailOptions.Host;
+                        option.FromAddress = mailOptions.FromAddress;
+                        option.FromName = mailOptions.FromName;
+                        option.Port = mailOptions.Port;
+                        option.ToAddress = mailOptions.ToAddress;
                     });
                 }
 
                 var dingtalkOptions = baseConfiguration.GetSection(DingtalkOptions.SectionName).Get<DingtalkOptions>();
                 if (dingtalkOptions != null)
                 {
-                    config.UseDingTalk(x =>
+                    config.UseDingTalk((x, serviceProvider) =>
                     {
                         x.Secret = dingtalkOptions.Secret;
                         x.WebHook = dingtalkOptions.WebHook;
@@ -44,19 +44,19 @@ public static IServiceCollection AddNotice(this IServiceCollection services, ICo
                 var feishuOptions = baseConfiguration.GetSection(FeishuOptions.SectionName).Get<DingtalkOptions>();
                 if (feishuOptions != null)
                 {
-                    config.UseFeishu(x =>
+                    config.UseFeishu((option, serviceProvider) =>
                     {
-                        x.Secret = feishuOptions.Secret;
-                        x.WebHook = feishuOptions.WebHook;
+                        option.Secret = feishuOptions.Secret;
+                        option.WebHook = feishuOptions.WebHook;
                     });
                 }
 
                 var weixinOptions = baseConfiguration.GetSection(WeixinOptions.SectionName).Get<WeixinOptions>();
                 if (weixinOptions != null)
                 {
-                    config.UseWeixin(x =>
+                    config.UseWeixin((option, serviceProvider) =>
                     {
-                        x.WebHook = weixinOptions.WebHook;
+                        option.WebHook = weixinOptions.WebHook;
                     });
                 }
             });

src/EasyNotice.Dingtalk/Extensions/DingtalkExtension.cs

@@ -8,7 +8,7 @@ public static class DingtalkExtension
     {
         public static EasyNoticeOptions UseDingTalk(
             this EasyNoticeOptions options,
-            Action<DingtalkOptions> configure
+            Action<DingtalkOptions, IServiceProvider> configure
             )
         {
             if (configure == null)

src/EasyNotice.Dingtalk/Extensions/DingtalkOptionsExtension.cs

@@ -5,9 +5,9 @@ namespace EasyNotice.Dingtalk
 {
     public class DingtalkOptionsExtension : IEasyNoticeOptionsExtension
     {
-        private readonly Action<DingtalkOptions> configure;
+        private readonly Action<DingtalkOptions, IServiceProvider> configure;
 
-        public DingtalkOptionsExtension(Action<DingtalkOptions> configure)
+        public DingtalkOptionsExtension(Action<DingtalkOptions, IServiceProvider> configure)
         {
             this.configure = configure;
         }

src/EasyNotice.Dingtalk/Provider/DingtalkProvider.cs

@@ -124,7 +124,7 @@ private async Task<EasyNoticeSendResponse> SendBaseAsync(MessageBase message)
                     }
                     else
                     {
-                        return new EasyNoticeSendResponse() { ErrCode = dingtalkResponse.ErrCode, ErrMsg = !string.IsNullOrEmpty(dingtalkResponse.Description) ? $"{dingtalkResponse.Description}，{dingtalkResponse.Solution}" : dingtalkResponse.ErrMsg };
+                        return new EasyNoticeSendResponse() { ErrCode = dingtalkResponse.ErrCode, ErrMsg = !string.IsNullOrEmpty(dingtalkResponse.Description) ? $"{dingtalkResponse.Description}，{dingtalkResponse.Solution}".TrimEnd('，') : dingtalkResponse.ErrMsg };
                     }
                 }, message.title, _noticeOptions.IntervalSeconds);
             }

src/EasyNotice.Email/Extensions/EmailExtension.cs

@@ -8,7 +8,7 @@ public static class EmailExtension
     {
         public static EasyNoticeOptions UseEmail(
             this EasyNoticeOptions options,
-            Action<EmailOptions> configure)
+            Action<EmailOptions, IServiceProvider> configure)
         {
             if (configure == null)
             {

src/EasyNotice.Email/Extensions/EmailOptionsExtension.cs

@@ -5,9 +5,9 @@ namespace EasyNotice.Email
 {
     internal class EmailOptionsExtension : IEasyNoticeOptionsExtension
     {
-        private readonly Action<EmailOptions> configure;
+        private readonly Action<EmailOptions, IServiceProvider> configure;
 
-        public EmailOptionsExtension(Action<EmailOptions> configure)
+        public EmailOptionsExtension(Action<EmailOptions, IServiceProvider> configure)
         {
             this.configure = configure;
         }

src/EasyNotice.Feishu/Extensions/FeishuExtension.cs

@@ -8,7 +8,7 @@ public static class FeishuExtension
     {
         public static EasyNoticeOptions UseFeishu(
             this EasyNoticeOptions options,
-            Action<FeishuOptions> configure
+            Action<FeishuOptions, IServiceProvider> configure
             )
         {
             if (configure == null)

src/EasyNotice.Feishu/Extensions/FeishuOptionsExtension.cs

@@ -5,9 +5,9 @@ namespace EasyNotice.Feishu
 {
     public class FeishuOptionsExtension : IEasyNoticeOptionsExtension
     {
-        private readonly Action<FeishuOptions> configure;
+        private readonly Action<FeishuOptions, IServiceProvider> configure;
 
-        public FeishuOptionsExtension(Action<FeishuOptions> configure)
+        public FeishuOptionsExtension(Action<FeishuOptions, IServiceProvider> configure)
         {
             this.configure = configure;
         }

src/EasyNotice.Weixin/Extensions/WeixinExtension.cs

@@ -8,7 +8,7 @@ public static class WeixinExtension
     {
         public static EasyNoticeOptions UseWeixin(
             this EasyNoticeOptions options,
-            Action<WeixinOptions> configure
+            Action<WeixinOptions, IServiceProvider> configure
             )
         {
             if (configure == null)

src/EasyNotice.Weixin/Extensions/WeixinOptionsExtension.cs

@@ -5,9 +5,9 @@ namespace EasyNotice.Weixin
 {
     public class WeixinOptionsExtension : IEasyNoticeOptionsExtension
     {
-        private readonly Action<WeixinOptions> configure;
+        private readonly Action<WeixinOptions, IServiceProvider> configure;
 
-        public WeixinOptionsExtension(Action<WeixinOptions> configure)
+        public WeixinOptionsExtension(Action<WeixinOptions, IServiceProvider> configure)
         {
             this.configure = configure;
         }

test/EasyNotice.UnitTests/DingTalkNoticeTest.cs

@@ -20,7 +20,7 @@ public DingTalkNoticeTest()
             services.AddEasyNotice(config =>
             {
                 config.IntervalSeconds = 10;//同一标题的消息，10秒内只能发一条，避免短时间内大量发送重复消息
-                config.UseDingTalk(option =>
+                config.UseDingTalk((option, serviceProvider) =>
                 {
                     option.WebHook = "https://oapi.dingtalk.com/robot/send?access_token=xxx";//通知地址
                     option.Secret = "secret";//签名校验
@@ -44,5 +44,13 @@ public async Task DingTalk_Send_AtUser_Should_Be_Succeed()
             var response = await _dingtalkProvider.SendAsync("通知标题", new Exception("custom exception"), new EasyNoticeAtUser() { IsAtAll = false, Mobile = new[] { "138xxxxxxxx" } });
             Assert.True(response.IsSuccess);
         }
+
+        [Fact]
+        public async Task DingTalk_Send_Markdown_Should_Be_Succeed()
+        {
+            var response = await _dingtalkProvider.SendMarkdownAsync("通知标题", "#### <font color=#008800>订单审核通过</font> 信息如下：\r\n订单号：11111111111\r\n商品名：手机");
+            Assert.True(response.IsSuccess);
+        }
+
     }
 }

test/EasyNotice.UnitTests/EmailNoticeTest.cs

@@ -17,7 +17,7 @@ public EmailNoticeTest()
             services.AddEasyNotice(config =>
             {
                 config.IntervalSeconds = 10;//同一标题的消息，10秒内只能发一条，避免短时间内大量发送重复消息
-                config.UseEmail(option =>
+                config.UseEmail((option, serviceProvider) =>
                 {
                     option.Host = "smtp.qq.com";
                     option.Port = 465;

test/EasyNotice.UnitTests/FeishuNoticeTest.cs

@@ -20,7 +20,7 @@ public FeishuNoticeTest()
             services.AddEasyNotice(config =>
             {
                 config.IntervalSeconds = 10;//同一标题的消息，10秒内只能发一条，避免短时间内大量发送重复消息
-                config.UseFeishu(option =>
+                config.UseFeishu((option, serviceProvider) =>
                 {
                     option.WebHook = "https://open.feishu.cn/open-apis/bot/v2/hook/xxxxx";//通知地址
                     option.Secret = "secret";//签名校验

test/EasyNotice.UnitTests/WeixinNoticeTest.cs

@@ -20,7 +20,7 @@ public WeixinNoticeTest()
             services.AddEasyNotice(config =>
             {
                 config.IntervalSeconds = 10;//同一标题的消息，10秒内只能发一条，避免短时间内大量发送重复消息
-                config.UseWeixin(option =>
+                config.UseWeixin((option, serviceProvider) =>
                 {
                     option.WebHook = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=xxxxx";//通知地址
                 });