同步

API/Wood.Admin.WebApi/Startup.cs

@@ -419,6 +419,7 @@ namespace Wood.Admin.WebApi
 			app.UseEndpoints(endpoints =>
 			{
 				endpoints.MapControllerRoute("default", "{controller=ApiHome}/{action=Index}/{id?}");
+				endpoints.MapFallbackToFile("Index.Html");
 			});
 
 			//启用 自动job
@@ -437,7 +438,7 @@ namespace Wood.Admin.WebApi
 			{
 				c.RoutePrefix = "api-doc";
 				foreach (var assembly in assembly)
-					c.SwaggerEndpoint(assembly.GetName().Name + "/swagger.json", "Wood Api " + assembly.GetName().Name);
+					c.SwaggerEndpoint(assembly.GetName().Name + "/swagger.json", "TaskManager" + assembly.GetName().Name);
 			});
 			//自动 注册所有事件
 			app.UseEventBus(assembly);

API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs

@@ -146,7 +146,7 @@ namespace TaskManager.Controllers
                 await _logger.AddError("任务名称或客户端不能为空",taskName);
                 return;
             }
-            var sublist = _jobDbContext.TaskSub.Where(p => p.TaskName == taskName && p.WriteState == false && p.Subscriber == client ).ToList();
+            var sublist = _jobDbContext.TaskSub.Where(p => taskName.Contains(p.TaskName)  && p.WriteState == false && p.Subscriber == client ).ToList();
             int pageSize = 1000;
             if (!sublist.Any())
             {

API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs

@@ -48,7 +48,12 @@ namespace TaskManager.Controllers
                     var tran = transaction.GetDbTransaction();
                     try
                     {
-                        _jobDbContext.BulkInsert(list);
+                        await _jobDbContext.BulkInsertAsync(list);
+                        //_jobDbContext.BulkMerge(list, options => {
+                        //    options.ColumnPrimaryKeyExpression = p => p.Id;
+                        
+                        
+                        //});
                         await ConfirmDataInsertAsync(list, _jobDbContext, tran);
 
                         // 提交事务