diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index 973f9f31d..34c342542 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -36,6 +36,7 @@ 2.0.1 6.5.0 8.2.0 + 0.34.0 8.0.* 8.0.0 2.6.1 diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj index 3a9d50536..032f735dc 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj @@ -10,6 +10,7 @@ + diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Emailing/LINGYUN/Abp/Notifications/Emailing/EmailingNotificationPublishProvider.cs b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Emailing/LINGYUN/Abp/Notifications/Emailing/EmailingNotificationPublishProvider.cs index 3c12a7233..574475263 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Emailing/LINGYUN/Abp/Notifications/Emailing/EmailingNotificationPublishProvider.cs +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Emailing/LINGYUN/Abp/Notifications/Emailing/EmailingNotificationPublishProvider.cs @@ -1,5 +1,6 @@ using LINGYUN.Abp.Identity; using LINGYUN.Abp.RealTime.Localization; +using Markdig; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -59,6 +60,11 @@ public class EmailingNotificationPublishProvider : NotificationPublishProvider { var title = notification.Data.TryGetData("title").ToString(); var message = notification.Data.TryGetData("message").ToString(); + // markdown进行处理 + if (notification.ContentType == NotificationContentType.Markdown) + { + message = Markdown.ToHtml(message); + } await EmailSender.SendAsync(emailAddress, title, message); } @@ -92,6 +98,12 @@ public class EmailingNotificationPublishProvider : NotificationPublishProvider } } + // markdown进行处理 + if (notification.ContentType == NotificationContentType.Markdown) + { + message = Markdown.ToHtml(message); + } + await EmailSender.SendAsync(emailAddress, title, message); } }