From de89695c27fac5ae87a47ec086ca2a272752a00a Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Mon, 16 May 2022 08:49:27 +0800
Subject: [PATCH] No incorrect template is configured. The default template is
 used

---
 .../ExceptionHandling/JobFailedNotifierProvider.cs    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.ExceptionHandling/LINGYUN/Abp/BackgroundTasks/ExceptionHandling/JobFailedNotifierProvider.cs b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.ExceptionHandling/LINGYUN/Abp/BackgroundTasks/ExceptionHandling/JobFailedNotifierProvider.cs
index 5f2f6493b..f1a6abf8a 100644
--- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.ExceptionHandling/LINGYUN/Abp/BackgroundTasks/ExceptionHandling/JobFailedNotifierProvider.cs
+++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.ExceptionHandling/LINGYUN/Abp/BackgroundTasks/ExceptionHandling/JobFailedNotifierProvider.cs
@@ -1,4 +1,5 @@
 using JetBrains.Annotations;
+using LINGYUN.Abp.BackgroundTasks.ExceptionHandling.Templates;
 using LINGYUN.Abp.BackgroundTasks.Jobs;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -49,15 +50,17 @@ public class JobFailedNotifierProvider : IJobFailedNotifierProvider, ITransientD
             exceptionTo is string to)
         {
             var template = eventData.Args.GetOrDefault(Prefix + SendEmailJob.PropertyTemplate)?.ToString() ?? "";
-            var content = eventData.Args.GetOrDefault(Prefix + SendEmailJob.PropertyBody)?.ToString() ?? "";
             var subject = eventData.Args.GetOrDefault(Prefix + SendEmailJob.PropertySubject)?.ToString() ?? "From job execute exception";
             var from = eventData.Args.GetOrDefault(Prefix + SendEmailJob.PropertyFrom)?.ToString() ?? "";
             var errorMessage = eventData.Exception.GetBaseException().Message;
 
             if (template.IsNullOrWhiteSpace())
             {
-                await EmailSender.SendAsync(from, to, subject, content, false);
-                return;
+                // var message = eventData.Args.GetOrDefault(Prefix + SendEmailJob.PropertyBody)?.ToString() ?? "";
+                // await EmailSender.SendAsync(from, to, subject, message, false);
+                // return;
+                // 默认使用内置模板发送错误
+                template = JobExceptionHandlingTemplates.JobExceptionNotifier;
             }
 
             var footer = eventData.Args.GetOrDefault("footer")?.ToString() ?? $"Copyright to LY Colin © {eventData.RunTime.Year}";
@@ -88,7 +91,7 @@ public class JobFailedNotifierProvider : IJobFailedNotifierProvider, ITransientD
 
             var culture = eventData.Args.GetOrDefault(Prefix + SendEmailJob.PropertyCulture)?.ToString() ?? CultureInfo.CurrentCulture.Name;
 
-            content = await TemplateRenderer.RenderAsync(
+            var content = await TemplateRenderer.RenderAsync(
                 templateName: template,
                 model: model,
                 cultureName: culture,