Pārlūkot izejas kodu

update document

xuxueli 5 gadus atpakaļ
vecāks
revīzija
7927905083

+ 2 - 7
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java Parādīt failu

88
                                 } else if (nowTime > jobInfo.getTriggerNextTime()) {
88
                                 } else if (nowTime > jobInfo.getTriggerNextTime()) {
89
                                     // 2.2、trigger-expire < 5s:direct-trigger && make next-trigger-time
89
                                     // 2.2、trigger-expire < 5s:direct-trigger && make next-trigger-time
90
 
90
 
91
-                                    CronExpression cronExpression = new CronExpression(jobInfo.getJobCron());
92
-                                    long nextTime = cronExpression.getNextValidTimeAfter(new Date()).getTime();
93
-
94
                                     // 1、trigger
91
                                     // 1、trigger
95
                                     JobTriggerPoolHelper.trigger(jobInfo.getId(), TriggerTypeEnum.CRON, -1, null, null);
92
                                     JobTriggerPoolHelper.trigger(jobInfo.getId(), TriggerTypeEnum.CRON, -1, null, null);
96
                                     logger.debug(">>>>>>>>>>> xxl-job, shecule push trigger : jobId = " + jobInfo.getId() );
93
                                     logger.debug(">>>>>>>>>>> xxl-job, shecule push trigger : jobId = " + jobInfo.getId() );
97
 
94
 
98
                                     // 2、fresh next
95
                                     // 2、fresh next
99
-                                    jobInfo.setTriggerLastTime(jobInfo.getTriggerNextTime());
100
-                                    jobInfo.setTriggerNextTime(nextTime);
101
-
96
+                                    refreshNextValidTime(jobInfo, new Date(jobInfo.getTriggerNextTime()));
102
 
97
 
103
                                     // next-trigger-time in 5s, pre-read again
98
                                     // next-trigger-time in 5s, pre-read again
104
-                                    if (jobInfo.getTriggerNextTime() - nowTime < PRE_READ_MS) {
99
+                                    if (jobInfo.getTriggerStatus()==1 && nowTime + PRE_READ_MS > jobInfo.getTriggerNextTime()) {
105
 
100
 
106
                                         // 1、make ring second
101
                                         // 1、make ring second
107
                                         int ringSecond = (int)((jobInfo.getTriggerNextTime()/1000)%60);
102
                                         int ringSecond = (int)((jobInfo.getTriggerNextTime()/1000)%60);

+ 1 - 1
xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml Parādīt failu

212
 		SELECT <include refid="Base_Column_List" />
212
 		SELECT <include refid="Base_Column_List" />
213
 		FROM xxl_job_info AS t
213
 		FROM xxl_job_info AS t
214
 		WHERE t.trigger_status = 1
214
 		WHERE t.trigger_status = 1
215
-			and t.trigger_next_time<![CDATA[ <= ]]> #{maxNextTime}
215
+			and t.trigger_next_time <![CDATA[ <= ]]> #{maxNextTime}
216
 	</select>
216
 	</select>
217
 
217
 
218
 	<update id="scheduleUpdate" parameterType="com.xxl.job.admin.core.model.XxlJobInfo"  >
218
 	<update id="scheduleUpdate" parameterType="com.xxl.job.admin.core.model.XxlJobInfo"  >