From 07fdbd2f16b164a1cc107ce75d5ef9035686fd10 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 23 Feb 2024 19:30:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=BF=83=E8=B7=B3=E9=97=B4=E9=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.ScheduledTask/CommonJobs/HeartbeatJob.cs | 7 +++++-- Src/Dlhis.ScheduledTask/Packs/JobPack.cs | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/CommonJobs/HeartbeatJob.cs b/Src/Dlhis.ScheduledTask/CommonJobs/HeartbeatJob.cs index f9453196..0d0c11b4 100644 --- a/Src/Dlhis.ScheduledTask/CommonJobs/HeartbeatJob.cs +++ b/Src/Dlhis.ScheduledTask/CommonJobs/HeartbeatJob.cs @@ -31,11 +31,14 @@ public class HeartbeatJob { var ipInfo = JsonConvert.DeserializeObject(device.ConnectionInfo); - await new TcpClient().ConnectAsync(IPAddress.Parse(ipInfo.IP), ipInfo.Port); + //超时时间 + var CancellationTokenSource = new CancellationTokenSource(300); + await new TcpClient().ConnectAsync(IPAddress.Parse(ipInfo.IP), ipInfo.Port, CancellationTokenSource.Token); + await _dbContext.Updateable().SetColumns(x => x.LastHeartbeatTime == DateTime.Now) .Where(x => x.DeviceUniqueNo == device.UniqueNo).ExecuteCommandAsync(); - _logger.LogInformation("心跳设备:{no}成功", device.UniqueNo); + _logger.LogInformation("心跳设备成功:{no}", device.UniqueNo); } catch (Exception ex) { diff --git a/Src/Dlhis.ScheduledTask/Packs/JobPack.cs b/Src/Dlhis.ScheduledTask/Packs/JobPack.cs index 2a09eefb..fc4c8870 100644 --- a/Src/Dlhis.ScheduledTask/Packs/JobPack.cs +++ b/Src/Dlhis.ScheduledTask/Packs/JobPack.cs @@ -43,7 +43,7 @@ public class JobPack : BaseAppPack }); //心跳 - RecurringJob.AddOrUpdate("Heartbeat", s => s.RunAsync(), "10 * * * * ?", new RecurringJobOptions + RecurringJob.AddOrUpdate("Heartbeat", s => s.RunAsync(), "0/10 * * * * ?", new RecurringJobOptions { TimeZone = TimeZoneInfo.Local });