!1322 几处描述统一使用网站标题

Merge pull request !1322 from ir0nmax/next

Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs

@@ -41,8 +41,9 @@ public class AppEventSubscriber : IEventSubscriber, ISingleton, IDisposable
         //var mailTempPath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Temp\\ErrorMail.tp");
         //var mailTemp = File.ReadAllText(mailTempPath);
         //var mail = await _serviceScope.ServiceProvider.GetRequiredService<IViewEngine>().RunCompileFromCachedAsync(mailTemp, );
-
-        var title = "Admin.NET 系统异常";
+        
+        var webTitle = await _serviceScope.ServiceProvider.GetRequiredService<SysConfigService>().GetConfigValue<string>(ConfigConst.SysWebTitle);
+        var title = $"{webTitle} 系统异常";
         await _serviceScope.ServiceProvider.GetRequiredService<SysEmailService>().SendEmail(JSON.Serialize(context.Source.Payload), title);
     }
 

Admin.NET/Admin.NET.Core/Job/LogJob.cs

@@ -36,12 +36,13 @@ public class LogJob : IJob
         await logOpRep.CopyNew().AsDeleteable().Where(u => (DateTime)u.CreateTime < DateTime.Now.AddDays(-daysAgo)).ExecuteCommandAsync(stoppingToken); // 删除操作日志
         await logDiffRep.CopyNew().AsDeleteable().Where(u => (DateTime)u.CreateTime < DateTime.Now.AddDays(-daysAgo)).ExecuteCommandAsync(stoppingToken); // 删除差异日志
 
+        string msg = $"【{DateTime.Now}】清理系统日志成功，删除 {daysAgo} 天前的日志数据！";
         var originColor = Console.ForegroundColor;
         Console.ForegroundColor = ConsoleColor.Yellow;
-        Console.WriteLine($"【{DateTime.Now}】清理系统日志（{daysAgo}天前）");
+        Console.WriteLine(msg);
         Console.ForegroundColor = originColor;
 
         // 自定义日志
-        _logger.LogInformation($"【{DateTime.Now}】清理系统日志...");
+        _logger.LogInformation(msg);
     }
 }

Admin.NET/Admin.NET.Core/Job/OnlineUserJob.cs

@@ -31,15 +31,16 @@ public class OnlineUserJob : IJob
         var rep = serviceScope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysOnlineUser>>();
         await rep.CopyNew().AsDeleteable().ExecuteCommandAsync(stoppingToken);
 
+        string msg = $"【{DateTime.Now}】清理在线用户成功！服务已重启...";
         var originColor = Console.ForegroundColor;
         Console.ForegroundColor = ConsoleColor.Red;
-        Console.WriteLine($"【{DateTime.Now}】清空在线用户列表");
+        Console.WriteLine(msg);
         Console.ForegroundColor = originColor;
 
         // 缓存租户列表
         await serviceScope.ServiceProvider.GetRequiredService<SysTenantService>().CacheTenant();
 
         // 自定义日志
-        _logger.LogInformation($"【{DateTime.Now}】服务已重启...");
+        _logger.LogInformation(msg);
     }
 }

Admin.NET/Admin.NET.Core/Service/Job/JobMonitor.cs

@@ -33,7 +33,7 @@ public class JobMonitor : IJobMonitor
         if (await _sysConfigService.GetConfigValue<bool>(CommonConst.SysErrorMail) && context.Exception != null)
         {
             var errorInfo = $"【{context.Trigger.Description}】定时任务错误：{context.Exception}";
-            await _eventPublisher.PublishAsync(CommonConst.SendErrorMail, errorInfo);
+            await _eventPublisher.PublishAsync(CommonConst.SendErrorMail, errorInfo, stoppingToken);
         }
     }
 }

Admin.NET/Admin.NET.Core/Service/Message/SysEmailService.cs

@@ -16,10 +16,12 @@ namespace Admin.NET.Core.Service;
 public class SysEmailService : IDynamicApiController, ITransient
 {
     private readonly EmailOptions _emailOptions;
+    private readonly SysConfigService _sysConfigService;
 
-    public SysEmailService(IOptions<EmailOptions> emailOptions)
+    public SysEmailService(IOptions<EmailOptions> emailOptions, SysConfigService sysConfigService)
     {
         _emailOptions = emailOptions.Value;
+        _sysConfigService = sysConfigService;
     }
 
     /// <summary>
@@ -29,8 +31,10 @@ public class SysEmailService : IDynamicApiController, ITransient
     /// <param name="title"></param>
     /// <returns></returns>
     [DisplayName("发送邮件")]
-    public async Task SendEmail([Required] string content, string title = "Admin.NET 系统邮件")
+    public async Task SendEmail([Required] string content, string title = "")
     {
+        var webTitle = await _sysConfigService.GetConfigValue<string>(ConfigConst.SysWebTitle);
+        title = string.IsNullOrWhiteSpace(title) ? $"{webTitle} 系统邮件" : title;
         var message = new MimeMessage();
         message.From.Add(new MailboxAddress(_emailOptions.DefaultFromEmail, _emailOptions.DefaultFromEmail));
         message.To.Add(new MailboxAddress(_emailOptions.DefaultToEmail, _emailOptions.DefaultToEmail));