fix debug宏问题

This commit is contained in:
2025-04-03 10:34:02 +08:00
parent 4595aa3a05
commit e3ac984edc
3 changed files with 12 additions and 3 deletions

View File

@@ -1,3 +1,5 @@
using Dlhis.Sys.Api;
using Dlhis.Sys.Api.Request;
using Kurisu.AspNetCore.Cache.Extensions; using Kurisu.AspNetCore.Cache.Extensions;
using Kurisu.AspNetCore.Startup; using Kurisu.AspNetCore.Startup;
@@ -20,4 +22,11 @@ public class Startup : DefaultStartup
base.ConfigureServices(services); base.ConfigureServices(services);
services.AddRedis(); services.AddRedis();
} }
/// <inheritdoc />
public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
base.Configure(app, env);
var r = app.ApplicationServices.GetService<IUserApi>().GetUserByIdsAsync(new IdsRequest { Ids = new List<int>() { 1 } }).GetAwaiter().GetResult();
}
} }

View File

@@ -47,7 +47,7 @@ public class AssignmentService : IAssignmentService
.CreateProtector("down:face") .CreateProtector("down:face")
.ToTimeLimitedDataProtector(); .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 => .Select(x =>
{ {
var d = x.Key.DeviceUniqueNo; var d = x.Key.DeviceUniqueNo;
@@ -257,7 +257,7 @@ public class AssignmentService : IAssignmentService
.WhereIF(request.Types.IsPresent(), deviceTask => request.Types.Contains(deviceTask.Type)) .WhereIF(request.Types.IsPresent(), deviceTask => request.Types.Contains(deviceTask.Type))
.Where((deviceTask, device, deviceTemplate) => deviceTask.Version < 10) .Where((deviceTask, device, deviceTemplate) => deviceTask.Version < 10)
#if !DEBUG #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) device.HeartbeatInterval == 0 || SqlFunc.DateAdd(deviceRegistry.LastHeartbeatTime, device.HeartbeatInterval, DateType.Second) > DateTime.Now)
#endif #endif
.OrderBy(deviceTask => new { deviceTask.CreateTime, Priority = SqlFunc.Desc(deviceTask.Priority) }) .OrderBy(deviceTask => new { deviceTask.CreateTime, Priority = SqlFunc.Desc(deviceTask.Priority) })

View File

@@ -60,7 +60,7 @@
} }
}, },
"RedisOptions": { "RedisOptions": {
"ConnectionString": "192.168.199.30:30115,defaultDatabase=1,password=dlhis123" "ConnectionString": "192.168.199.124:6379,defaultDatabase=1,password=dlhis123"
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"Serilog": { "Serilog": {