Jelajahi Sumber

修复任务调度表创建

zhontai 2 tahun lalu
induk
melakukan
e35ae9d027

+ 27 - 3
src/hosts/ZhonTai.Host/Program.cs

@@ -1,8 +1,10 @@
-using Microsoft.Extensions.DependencyInjection;
+using FreeScheduler;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using ZhonTai.Admin.Core;
 using ZhonTai.Admin.Core.Configs;
 using ZhonTai.Admin.Core.Startup;
+using ZhonTai.Admin.Tools.TaskScheduler;
 using ZhonTai.ApiUI;
 
 new HostApp(new HostAppOptions
@@ -10,8 +12,30 @@ new HostApp(new HostAppOptions
 	//配置后置服务
 	ConfigurePostServices = context =>
 	{
-		//context.Services.AddTiDb(context);
-	},
+        //context.Services.AddTiDb(context);
+
+        //添加任务调度
+        context.Services.AddTaskScheduler(options =>
+        {
+            options.ConfigureFreeSql = freeSql =>
+            {
+                freeSql.CodeFirst
+                //配置任务表
+                .ConfigEntity<TaskInfo>(a =>
+                {
+                    a.Name("app_task");
+                })
+                //配置任务日志表
+                .ConfigEntity<TaskLog>(a =>
+                {
+                    a.Name("app_task_log");
+                });
+            };
+
+            //模块任务处理器
+            //options.TaskHandler = new ModuleTaskHandler(options.FreeSql);
+        });
+    },
 	//配置后置中间件
 	ConfigurePostMiddleware = context =>
     {

+ 0 - 1
src/platform/ZhonTai.Admin/Services/TaskScheduler/TaskService.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using System.Threading.Tasks;
-using ZhonTai.Admin.Core.Repositories;
 using ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Services.TaskScheduler.Dto;
 using ZhonTai.Admin.Domain.Task.Dto;

+ 3 - 1
src/platform/ZhonTai.Admin/Tools/TaskScheduler/TaskSchedulerServiceExtensions.cs

@@ -1,8 +1,10 @@
 using FreeScheduler;
+using FreeSql;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using ZhonTai.Admin.Core.Configs;
+using ZhonTai.Admin.Core.Consts;
 
 namespace ZhonTai.Admin.Tools.TaskScheduler;
 
@@ -20,7 +22,7 @@ public static class TaskSchedulerServiceExtensions
         ServiceProvider = services.BuildServiceProvider();
         var options = new TaskSchedulerOptions()
         {
-            FreeSql = ServiceProvider.GetService<IFreeSql>()
+            FreeSql = ServiceProvider.GetService<FreeSqlCloud>().Use(DbKeys.AppDb)
         };
         configureOptions?.Invoke(options);