diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml index a545d2f9..7c135cba 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml @@ -232,10 +232,12 @@ UPDATE xxl_job_info SET trigger_last_time = #{triggerLastTime}, - trigger_next_time = #{triggerNextTime}, - trigger_status = #{triggerStatus} + trigger_next_time = #{triggerNextTime} + + , trigger_status = #{triggerStatus} + WHERE id = #{id} AND trigger_status = 1 - \ No newline at end of file + 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 cf07a55a..df33b8b0 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 @@ -36,7 +36,7 @@ public class JobThread extends Thread{ private String stopReason; private boolean running = false; // if running job - private int idleTimes = 0; // idel times + private int idleTimes = 0; // idle times public JobThread(int jobId, IJobHandler handler) { @@ -185,7 +185,7 @@ public class JobThread extends Thread{ } else { if (idleTimes > 30) { if(triggerQueue.size() == 0) { // avoid concurrent trigger causes jobId-lost - XxlJobExecutor.removeJobThread(jobId, "excutor idel times over limit."); + XxlJobExecutor.removeJobThread(jobId, "excutor idle times over limit."); } } }