diff --git a/ZR.Admin.WebApi/Extensions/TasksExtension.cs b/ZR.Admin.WebApi/Extensions/TasksExtension.cs
index 2ca150e696ffd54f1739c687a24d4d111877ec95..3a3be4da0b638fe43ed86dcf127535552f8e4049 100644
--- a/ZR.Admin.WebApi/Extensions/TasksExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/TasksExtension.cs
@@ -33,11 +33,12 @@ namespace ZR.Admin.WebApi.Extensions
///
public static IApplicationBuilder UseAddTaskSchedulers(this IApplicationBuilder app)
{
- var _tasksQzService = (ISysTasksQzService)App.GetRequiredService(typeof(ISysTasksQzService));
+ ///var _tasksQzService = (ISysTasksQzService)App.GetRequiredService(typeof(ISysTasksQzService));
ITaskSchedulerServer _schedulerServer = App.GetRequiredService();
- var tasks = _tasksQzService.GetList(m => m.IsStart);
+ ///var tasks = _tasksQzService.GetList(m => m.IsStart);
+ var tasks = SqlSugar.IOC.DbScoped.SugarScope.Queryable().Where(m => m.IsStart).ToList();
//程序启动后注册所有定时任务
foreach (var task in tasks)
diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json
index f4ddf7bfb7cacca853d77a52ecd806610f10b7d3..b709f7ca4f91ab7be0c3ceb83d0edd69997d9a42 100644
--- a/ZR.Admin.WebApi/appsettings.json
+++ b/ZR.Admin.WebApi/appsettings.json
@@ -7,8 +7,8 @@
}
},
"ConnectionStrings": {
- "conn_zrAdmin": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;uid=sa;pwd=zradmin123;database=ZrAdmin;Trusted_Connection=SSPI",
- "conn_bus": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;uid=zr;pwd=zradmin123;database=ZrAdmin;Trusted_Connection=SSPI"
+ "conn_zrAdmin": "server=it-sql08test;uid=wftest;pwd=wftest;database=ZrAdmin;",
+ "conn_bus": "server=it-sql08test;uid=wftest;pwd=wftest;database=ZrAdmin;"
},
"conn_zrAdmin_type": 1, //MySql = 0, SqlServer = 1
"conn_bus_type": 1,
@@ -34,7 +34,7 @@
"domainUrl": "http://xxx.xxx.com" //Դ
},
"gen": {
- "conn": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;user=zr;pwd=abc;database=ZrAdmin;Trusted_Connection=SSPI",
+ "conn": "server=it-sql08test;uid=wftest;pwd=wftest;database=ZrAdmin;",
"dbType": 1, //MySql = 0, SqlServer = 1
"autoPre": true, //Զȥǰ
"author": "zr",
diff --git a/ZR.Service/System/IService/ISysTasksLogService.cs b/ZR.Service/System/IService/ISysTasksLogService.cs
index fe0815d9b3ced965842c27b0acf32c270938db36..381796aa47daeb81fe1c2ee95f299de8e6851f33 100644
--- a/ZR.Service/System/IService/ISysTasksLogService.cs
+++ b/ZR.Service/System/IService/ISysTasksLogService.cs
@@ -1,4 +1,5 @@
-using ZR.Model.System;
+using System.Threading.Tasks;
+using ZR.Model.System;
using ZR.Repository;
namespace ZR.Service.System.IService
@@ -10,6 +11,6 @@ namespace ZR.Service.System.IService
///
///
//public int AddTaskLog(string jobId);
- SysTasksLog AddTaskLog(string jobId, SysTasksLog tasksLog);
+ Task AddTaskLog(string jobId, SysTasksLog tasksLog);
}
}
diff --git a/ZR.Service/System/SysTasksLogService.cs b/ZR.Service/System/SysTasksLogService.cs
index 0aa6cd238b96205b96b0b8147a5105156f71bfac..61c9ec61137ee5c5a039a41ce8e54cbc2ee53c50 100644
--- a/ZR.Service/System/SysTasksLogService.cs
+++ b/ZR.Service/System/SysTasksLogService.cs
@@ -1,6 +1,7 @@
using Infrastructure.Attribute;
using System;
using System.Linq.Expressions;
+using System.Threading.Tasks;
using ZR.Model;
using ZR.Model.System;
using ZR.Repository;
@@ -12,7 +13,7 @@ namespace ZR.Service.System
/// 任务日志
///
[AppService(ServiceLifetime = LifeTime.Transient, ServiceType = typeof(ISysTasksLogService))]
- public class SysTasksLogService : BaseRepository, ISysTasksLogService
+ public class SysTasksLogService : BaseService, ISysTasksLogService
{
private ISysTasksQzService _tasksQzService;
public SysTasksLogService(ISysTasksQzService tasksQzService)
@@ -20,10 +21,10 @@ namespace ZR.Service.System
_tasksQzService = tasksQzService;
}
- public SysTasksLog AddTaskLog(string jobId, SysTasksLog logModel)
+ public async Task AddTaskLog(string jobId, SysTasksLog logModel)
{
//获取任务信息
- var model = _tasksQzService.GetSingleAsync(f => f.ID == jobId).Result;
+ var model = await _tasksQzService.GetSingleAsync(f => f.ID == jobId);
if (model != null)
{
@@ -33,7 +34,7 @@ namespace ZR.Service.System
logModel.CreateTime = DateTime.Now;
}
- InsertAsync(logModel);
+ await InsertAsync(logModel);
return logModel;
}
diff --git a/ZR.Tasks/TaskScheduler/JobBase.cs b/ZR.Tasks/TaskScheduler/JobBase.cs
index 3de199769e9636ac374fa4ef86142df245f3fce4..5d27c758a3be23789315156d51ebab206957042d 100644
--- a/ZR.Tasks/TaskScheduler/JobBase.cs
+++ b/ZR.Tasks/TaskScheduler/JobBase.cs
@@ -56,7 +56,7 @@ namespace ZR.Tasks
JobMessage = logMsg
};
- RecordTaskLog(context, logModel);
+ await RecordTaskLog(context, logModel);
return logModel;
}
@@ -65,7 +65,7 @@ namespace ZR.Tasks
///
///
///
- protected void RecordTaskLog(IJobExecutionContext context, SysTasksLog logModel)
+ protected async Task RecordTaskLog(IJobExecutionContext context, SysTasksLog logModel)
{
var tasksLogService = (ISysTasksLogService)App.GetRequiredService(typeof(ISysTasksLogService));
var taskQzService = (ISysTasksQzService)App.GetRequiredService(typeof(ISysTasksQzService));
@@ -74,11 +74,11 @@ namespace ZR.Tasks
IJobDetail job = context.JobDetail;
logModel.InvokeTarget = job.JobType.FullName;
- logModel = tasksLogService.AddTaskLog(job.Key.Name, logModel);
+ logModel = await tasksLogService.AddTaskLog(job.Key.Name, logModel);
//成功后执行次数+1
if (logModel.Status == "0")
{
- taskQzService.UpdateAsync(f => new SysTasksQz()
+ await taskQzService.UpdateAsync(f => new SysTasksQz()
{
RunTimes = f.RunTimes + 1,
LastRunTime = DateTime.Now