修复在定时任务 构造函数中使用Sqlsugar 直接解析仓储会导致事件总线中的仓储 COntextID一直不变导致的数据库连接异常的bug

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

@@ -1,154 +1,126 @@
-namespace Admin.NET.Core.Service;
-
-/// <summary>
-/// 作业持久化（数据库）
-/// </summary>
-public class DbJobPersistence : IJobPersistence
+using Admin.NET.Core;
+using ConferenceAIOServer.Core;
+using Furion;
+using Furion.Schedule;
+using Mapster;
+using Microsoft.Extensions.DependencyInjection;
+using SqlSugar;
+
+namespace ConferenceAIOServer.Core
 {
-    private readonly IServiceScope _serviceScope;
-    private readonly ISqlSugarClient _sqlSugarClient;
-    private readonly SqlSugarRepository<SysJobDetail> _jobRepository;
-    private readonly SqlSugarRepository<SysJobTrigger> _triggerRepository;
-    private readonly DynamicJobCompiler _dynamicJobCompiler;
-
-    public DbJobPersistence(IServiceProvider serviceProvider)
-    {
-        _serviceScope = serviceProvider.CreateScope();
-        var services = _serviceScope.ServiceProvider;
-        _dynamicJobCompiler = services.GetService<DynamicJobCompiler>();
-        _sqlSugarClient = services.GetService<ISqlSugarClient>();
-        _jobRepository = services.GetService<SqlSugarRepository<SysJobDetail>>();
-        _triggerRepository = services.GetService<SqlSugarRepository<SysJobTrigger>>();
-    }
 
     /// <summary>
-    /// 作业调度服务启动时
+    /// 作业持久化（数据库）
     /// </summary>
-    /// <returns></returns>
-    public IEnumerable<SchedulerBuilder> Preload()
+    public class DbJobPersistence : IJobPersistence
     {
-        // 获取所有定义的作业
-        var allJobs = App.EffectiveTypes.ScanToBuilders().ToList();
-        // 若数据库不存在任何作业，则直接返回
-        if (!_jobRepository.IsAny(u => true)) return allJobs;
-
-        // 遍历所有定义的作业
-        foreach (var schedulerBuilder in allJobs)
+        private readonly IServiceScopeFactory _serviceScopeFactory;
+        public DbJobPersistence(IServiceScopeFactory serviceScopeFactory)
         {
-            // 获取作业信息构建器
-            var jobBuilder = schedulerBuilder.GetJobBuilder();
-
-            // 加载数据库数据
-            var dbDetail = _jobRepository.GetFirst(u => u.JobId == jobBuilder.JobId);
-            if (dbDetail == null) continue;
-
-            // 同步数据库数据
-            jobBuilder.LoadFrom(dbDetail);
-
-            // 获取作业的所有数据库的触发器
-            var dbTriggers = _triggerRepository.GetList(u => u.JobId == jobBuilder.JobId).ToArray();
-            // 遍历所有作业触发器
-            foreach (var (_, triggerBuilder) in schedulerBuilder.GetEnumerable())
-            {
-                // 加载数据库数据
-                var dbTrigger = dbTriggers.FirstOrDefault(u => u.JobId == jobBuilder.JobId && u.TriggerId == triggerBuilder.TriggerId);
-                if (dbTrigger == null) continue;
-
-                triggerBuilder.LoadFrom(dbTrigger)
-                              .Updated();   // 标记更新
-            }
-            // 遍历所有非编译时定义的触发器加入到作业中
-            foreach (var dbTrigger in dbTriggers)
-            {
-                if (schedulerBuilder.GetTriggerBuilder(dbTrigger.TriggerId)?.JobId == jobBuilder.JobId) continue;
-                var triggerBuilder = TriggerBuilder.Create(dbTrigger.TriggerId).LoadFrom(dbTrigger);
-                schedulerBuilder.AddTriggerBuilder(triggerBuilder); // 先添加
-                triggerBuilder.Updated(); // 再标记更新
-            }
-
-            // 标记更新
-            schedulerBuilder.Updated();
+            _serviceScopeFactory = serviceScopeFactory;
         }
 
-        // 获取数据库所有通过脚本创建的作业
-        var allDbScriptJobs = _jobRepository.GetList(u => u.CreateFromScript);
-        foreach (var dbDetail in allDbScriptJobs)
+        /// <summary>
+        /// 作业调度服务启动时
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<SchedulerBuilder> Preload()
         {
-            // 动态创建作业
-            var jobType = _dynamicJobCompiler.BuildJob(dbDetail.ScriptCode);
-            var jobBuilder = JobBuilder.Create(jobType).LoadFrom(dbDetail);
+            using var scope = _serviceScopeFactory.CreateScope();
+            var _jobRepository = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysJobDetail>>();
+            var _triggerRepository = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysJobTrigger>>();
+            // 获取所有定义的作业
+            var allJobs = App.EffectiveTypes.ScanToBuilders();
+            // 若数据库不存在任何作业，则直接返回
+            if (!_jobRepository.IsAny(u => true)) return allJobs;
+
+            // 遍历所有定义的作业
+            foreach (var schedulerBuilder in allJobs)
+            {
+                // 获取作业信息构建器
+                var jobBuilder = schedulerBuilder.GetJobBuilder();
 
-            // 强行设置为不扫描 IJob 实现类 [Trigger] 特性触发器，否则 SchedulerBuilder.Create 会再次扫描，导致重复添加同名触发器
-            jobBuilder.SetIncludeAnnotations(false);
+                // 加载数据库数据
+                var dbDetail = _jobRepository.GetFirst(u => u.JobId == jobBuilder.JobId);
+                if (dbDetail == null) continue;
 
-            // 获取作业的所有数据库的触发器加入到作业中
-            var dbTriggers = _triggerRepository.GetList(u => u.JobId == jobBuilder.JobId).ToArray();
-            var triggerBuilders = dbTriggers.Select(u => TriggerBuilder.Create(u.TriggerId).LoadFrom(u).Updated());
-            var schedulerBuilder = SchedulerBuilder.Create(jobBuilder, triggerBuilders.ToArray());
+                // 同步数据库数据
+                jobBuilder.LoadFrom(dbDetail);
 
-            // 标记更新
-            schedulerBuilder.Updated();
+                // 遍历所有作业触发器
+                foreach (var (_, triggerBuilder) in schedulerBuilder.GetEnumerable())
+                {
+                    // 加载数据库数据
+                    var dbTrigger = _triggerRepository.GetFirst(u => u.JobId == jobBuilder.JobId && u.TriggerId == triggerBuilder.TriggerId);
+                    if (dbTrigger == null) continue;
 
-            allJobs.Add(schedulerBuilder);
-        }
+                    triggerBuilder.LoadFrom(dbTrigger)
+                                  .Updated();   // 标记更新
+                }
 
-        return allJobs;
-    }
-
-    /// <summary>
-    /// 作业计划初始化通知
-    /// </summary>
-    /// <param name="builder"></param>
-    /// <returns></returns>
-    public SchedulerBuilder OnLoading(SchedulerBuilder builder)
-    {
-        return builder;
-    }
+                // 标记更新
+                schedulerBuilder.Updated();
+            }
 
-    /// <summary>
-    /// 作业计划Scheduler的JobDetail变化时
-    /// </summary>
-    /// <param name="context"></param>
-    public void OnChanged(PersistenceContext context)
-    {
-        var jobDetail = context.JobDetail.Adapt<SysJobDetail>();
-        if (context.Behavior == PersistenceBehavior.Appended)
-        {
-            _sqlSugarClient.Insertable(jobDetail).ExecuteCommand();
-        }
-        else if (context.Behavior == PersistenceBehavior.Updated)
-        {
-            _sqlSugarClient.Updateable(jobDetail).WhereColumns(u => new { u.JobId }).IgnoreColumns(u => new { u.Id, u.CreateFromScript, u.ScriptCode }).ExecuteCommand();
+            return allJobs;
         }
-        else if (context.Behavior == PersistenceBehavior.Removed)
-        {
-            _sqlSugarClient.Deleteable<SysJobDetail>().Where(u => u.JobId == jobDetail.JobId).ExecuteCommand();
-        }
-    }
 
-    /// <summary>
-    /// 作业计划Scheduler的触发器Trigger变化时
-    /// </summary>
-    /// <param name="context"></param>
-    public void OnTriggerChanged(PersistenceTriggerContext context)
-    {
-        var jobTrigger = context.Trigger.Adapt<SysJobTrigger>();
-        if (context.Behavior == PersistenceBehavior.Appended)
+        /// <summary>
+        /// 作业计划初始化通知
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <returns></returns>
+        public SchedulerBuilder OnLoading(SchedulerBuilder builder)
         {
-            _sqlSugarClient.Insertable(jobTrigger).ExecuteCommand();
+            return builder;
         }
-        else if (context.Behavior == PersistenceBehavior.Updated)
+
+        /// <summary>
+        /// 作业计划Scheduler的JobDetail变化时
+        /// </summary>
+        /// <param name="context"></param>
+        public void OnChanged(PersistenceContext context)
         {
-            _sqlSugarClient.Updateable(jobTrigger).WhereColumns(u => new { u.TriggerId, u.JobId }).IgnoreColumns(u => new { u.Id }).ExecuteCommand();
+            using var scope = _serviceScopeFactory.CreateScope();
+            var _jobRepository = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysJobDetail>>();
+
+            var jobDetail = context.JobDetail.Adapt<SysJobDetail>();
+            if (context.Behavior == PersistenceBehavior.Appended)
+            {
+                _jobRepository.AsInsertable(jobDetail).ExecuteCommand();
+            }
+            else if (context.Behavior == PersistenceBehavior.Updated)
+            {
+                _jobRepository.AsUpdateable(jobDetail).WhereColumns(u => new { u.JobId }).IgnoreColumns(u => new { u.Id }).ExecuteCommand();
+            }
+            else if (context.Behavior == PersistenceBehavior.Removed)
+            {
+                _jobRepository.AsDeleteable().Where(u => u.JobId == jobDetail.JobId).ExecuteCommand();
+            }
         }
-        else if (context.Behavior == PersistenceBehavior.Removed)
+
+        /// <summary>
+        /// 作业计划Scheduler的触发器Trigger变化时
+        /// </summary>
+        /// <param name="context"></param>
+        public void OnTriggerChanged(PersistenceTriggerContext context)
         {
-            _sqlSugarClient.Deleteable<SysJobTrigger>().Where(u => u.TriggerId == jobTrigger.TriggerId && u.JobId == jobTrigger.JobId).ExecuteCommand();
+            using var scope = _serviceScopeFactory.CreateScope();
+            var _triggerRepository = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysJobTrigger>>();
+            var jobTrigger = context.Trigger.Adapt<SysJobTrigger>();
+            if (context.Behavior == PersistenceBehavior.Appended)
+            {
+                _triggerRepository.AsInsertable(jobTrigger).ExecuteCommand();
+            }
+            else if (context.Behavior == PersistenceBehavior.Updated)
+            {
+                _triggerRepository.AsUpdateable(jobTrigger).WhereColumns(u => new { u.TriggerId, u.JobId }).IgnoreColumns(u => new { u.Id }).ExecuteCommand();
+            }
+            else if (context.Behavior == PersistenceBehavior.Removed)
+            {
+                _triggerRepository.AsDeleteable().Where(u => u.TriggerId == jobTrigger.TriggerId && u.JobId == jobTrigger.JobId).ExecuteCommand();
+            }
         }
-    }
 
-    public void Dispose()
-    {
-        _serviceScope?.Dispose();
     }
 }