diff --git a/Src/Dlhis.ScheduledTask/Program.cs b/Src/Dlhis.ScheduledTask/Program.cs
index 1958c236..457839be 100644
--- a/Src/Dlhis.ScheduledTask/Program.cs
+++ b/Src/Dlhis.ScheduledTask/Program.cs
@@ -1,3 +1,5 @@
+using Dlhis.Sys.Api;
+using Dlhis.Sys.Api.Request;
using Kurisu.AspNetCore.Cache.Extensions;
using Kurisu.AspNetCore.Startup;
@@ -20,4 +22,11 @@ public class Startup : DefaultStartup
base.ConfigureServices(services);
services.AddRedis();
}
+
+ ///
+ public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+ {
+ base.Configure(app, env);
+ var r = app.ApplicationServices.GetService().GetUserByIdsAsync(new IdsRequest { Ids = new List() { 1 } }).GetAwaiter().GetResult();
+ }
}
\ No newline at end of file
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
index fe27168a..95e2be6f 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
@@ -47,7 +47,7 @@ public class AssignmentService : IAssignmentService
.CreateProtector("down:face")
.ToTimeLimitedDataProtector();
- return data.GroupBy(x => new { x.DeviceUniqueNo, x.DeviceConnectionInfo, x.FuncStr })
+ return data.GroupBy(x => new { x.DeviceUniqueNo, x.DeviceConnectionInfo, x.FuncStr })
.Select(x =>
{
var d = x.Key.DeviceUniqueNo;
@@ -257,7 +257,7 @@ public class AssignmentService : IAssignmentService
.WhereIF(request.Types.IsPresent(), deviceTask => request.Types.Contains(deviceTask.Type))
.Where((deviceTask, device, deviceTemplate) => deviceTask.Version < 10)
#if !DEBUG
- .Where((deviceTask, device, deviceTemplate, ga, gaLeave, department, deviceRegistry) =>
+ .Where((deviceTask, device, ga, gaLeave, department, deviceRegistry) =>
device.HeartbeatInterval == 0 || SqlFunc.DateAdd(deviceRegistry.LastHeartbeatTime, device.HeartbeatInterval, DateType.Second) > DateTime.Now)
#endif
.OrderBy(deviceTask => new { deviceTask.CreateTime, Priority = SqlFunc.Desc(deviceTask.Priority) })
diff --git a/Src/Dlhis.ScheduledTask/appsettings.json b/Src/Dlhis.ScheduledTask/appsettings.json
index 81500d52..a1b023d2 100644
--- a/Src/Dlhis.ScheduledTask/appsettings.json
+++ b/Src/Dlhis.ScheduledTask/appsettings.json
@@ -60,7 +60,7 @@
}
},
"RedisOptions": {
- "ConnectionString": "192.168.199.30:30115,defaultDatabase=1,password=dlhis123"
+ "ConnectionString": "192.168.199.124:6379,defaultDatabase=1,password=dlhis123"
},
"AllowedHosts": "*",
"Serilog": {