fix: 补回 45af056 调整去掉的脚本创建代码的逻辑

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

@@ -21,8 +21,9 @@ public class DbJobPersistence : IJobPersistence
         using var scope = _serviceScopeFactory.CreateScope();
         var jobRepository = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysJobDetail>>();
         var triggerRepository = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysJobTrigger>>();
+        var dynamicJobCompiler = scope.ServiceProvider.GetRequiredService<DynamicJobCompiler>();
         // 获取所有定义的作业
-        var allJobs = App.EffectiveTypes.ScanToBuilders();
+        var allJobs = App.EffectiveTypes.ScanToBuilders().ToList();
         // 若数据库不存在任何作业，则直接返回
         if (!jobRepository.IsAny(u => true)) return allJobs;
 
@@ -39,20 +40,52 @@ public class DbJobPersistence : IJobPersistence
             // 同步数据库数据
             jobBuilder.LoadFrom(dbDetail);
 
+            // 获取作业的所有数据库的触发器
+            var dbTriggers = triggerRepository.GetList(u => u.JobId == jobBuilder.JobId).ToArray();
             // 遍历所有作业触发器
             foreach (var (_, triggerBuilder) in schedulerBuilder.GetEnumerable())
             {
                 // 加载数据库数据
-                var dbTrigger = triggerRepository.GetFirst(u => u.JobId == jobBuilder.JobId && u.TriggerId == triggerBuilder.TriggerId);
+                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();
         }
 
+        // 获取数据库所有通过脚本创建的作业
+        var allDbScriptJobs = jobRepository.GetList(u => u.CreateFromScript);
+        foreach (var dbDetail in allDbScriptJobs)
+        {
+            // 动态创建作业
+            var jobType = dynamicJobCompiler.BuildJob(dbDetail.ScriptCode);
+            var jobBuilder = JobBuilder.Create(jobType).LoadFrom(dbDetail);
+
+            // 强行设置为不扫描 IJob 实现类 [Trigger] 特性触发器，否则 SchedulerBuilder.Create 会再次扫描，导致重复添加同名触发器
+            jobBuilder.SetIncludeAnnotations(false);
+
+            // 获取作业的所有数据库的触发器加入到作业中
+            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());
+
+            // 标记更新
+            schedulerBuilder.Updated();
+
+            allJobs.Add(schedulerBuilder);
+        }
+
         return allJobs;
     }
 
@@ -83,7 +116,7 @@ public class DbJobPersistence : IJobPersistence
                 break;
 
             case PersistenceBehavior.Updated:
-                jobRepository.AsUpdateable(jobDetail).WhereColumns(u => new { u.JobId }).IgnoreColumns(u => new { u.Id }).ExecuteCommand();
+                jobRepository.AsUpdateable(jobDetail).WhereColumns(u => new { u.JobId }).IgnoreColumns(u => new { u.Id, u.CreateFromScript, u.ScriptCode }).ExecuteCommand();
                 break;
 
             case PersistenceBehavior.Removed: