From d5bd256a3bc549a295c7e797a7a74bd3178c0529 Mon Sep 17 00:00:00 2001 From: liangjiajie Date: Sat, 26 Apr 2025 17:10:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=95=E8=AF=8D=E6=8B=BC=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xxl/job/core/thread/JobThread.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java index df33b8b0..7c10ee79 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java @@ -110,7 +110,7 @@ public class JobThread extends Thread{ TriggerParam triggerParam = null; try { - // to check toStop signal, we need cycle, so wo cannot use queue.take(), instand of poll(timeout) + // to check toStop signal, we need cycle, so we cannot use queue.take(), instead of poll(timeout) triggerParam = triggerQueue.poll(3L, TimeUnit.SECONDS); if (triggerParam!=null) { running = true; @@ -206,7 +206,7 @@ public class JobThread extends Thread{ if(triggerParam != null) { // callback handler info if (!toStop) { - // commonm + // common TriggerCallbackThread.pushCallBack(new HandleCallbackParam( triggerParam.getLogId(), triggerParam.getLogDateTime(), From f598c7905831a63ada939a878ae69c5430946030 Mon Sep 17 00:00:00 2001 From: khy <1906393947@qq.com> Date: Tue, 29 Apr 2025 09:15:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E9=80=9F=E5=BA=A6=E6=A8=A1=E5=BC=8F=E8=AE=A1=E7=AE=97=E4=B8=8B?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4bug?= =?UTF-8?q?=EF=BC=88=E6=AF=AB=E7=A7=92=E8=B6=85=E5=87=BAint=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xxl/job/admin/core/thread/JobScheduleHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java index 3f5e1106..d8d68695 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java @@ -372,7 +372,7 @@ public class JobScheduleHelper { Date nextValidTime = new CronExpression(jobInfo.getScheduleConf()).getNextValidTimeAfter(fromTime); return nextValidTime; } else if (ScheduleTypeEnum.FIX_RATE == scheduleTypeEnum /*|| ScheduleTypeEnum.FIX_DELAY == scheduleTypeEnum*/) { - return new Date(fromTime.getTime() + Integer.valueOf(jobInfo.getScheduleConf())*1000 ); + return new Date(fromTime.getTime() + Long.parseLong(jobInfo.getScheduleConf()) * 1000L); } return null; }