msb-public-java
/
xxl-job
mirror of https://gitee.com/xuxueli0323/xxl-job.git
4
2
Code Issues Projects Releases Wiki Activity

调度中心Cron前端组件优化，解决week配置与后端兼容性问题(ISSUE-2220)。

Browse Source
3.1.0-release
xuxueli 7 months ago
parent d3e1453bf4
commit f0d3645888
5 changed files with 338 additions and 357 deletions
Show Stats Download Patch File Download Diff File

5
doc/XXL-JOB官方文档.md
Unescape View File

@ -2455,8 +2455,9 @@ public void execute() {
### 7.38 版本 v3.0.1 Release Notes[规划中] ### 7.38 版本 v3.0.1 Release Notes[规划中]
- 1、【修复】任务操作逻辑优化，修复边界情况下逻辑中断问题(ISSUE-2081)。 - 1、【修复】任务操作逻辑优化，修复边界情况下逻辑中断问题(ISSUE-2081)。
- 2、[规划中]登陆态Token生成逻辑优化，混淆登陆时间属性，降低token泄漏风险； - 2、【修复】调度中心Cron前端组件优化，解决week配置与后端兼容性问题(ISSUE-2220)。
- 3、[规划中]组件扫描改为BeanPostProcessor方式，避免小概率情况下提前初始化；底层组件移除单例写法，汇总factory统一管理； - 3、[规划中]登陆态Token生成逻辑优化，混淆登陆时间属性，降低token泄漏风险；
- 4、[规划中]组件扫描改为BeanPostProcessor方式，避免小概率情况下提前初始化；底层组件移除单例写法，汇总factory统一管理；
### TODO LIST ### TODO LIST
- 1、调度隔离：调度中心针对不同执行器，各自维护不同的调度和远程触发组件。 - 1、调度隔离：调度中心针对不同执行器，各自维护不同的调度和远程触发组件。

386
xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java
Unescape View File

@ -1,20 +1,3 @@
/*
* All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
*/
package com.xxl.job.admin.core.cron; package com.xxl.job.admin.core.cron;
import java.io.Serializable; import java.io.Serializable;
@ -25,6 +8,7 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.TimeZone; import java.util.TimeZone;
@ -35,83 +19,86 @@ import java.util.TreeSet;
* expressions provide the ability to specify complex time combinations such as * expressions provide the ability to specify complex time combinations such as
* "At 8:00am every Monday through Friday" or "At 1:30am every * "At 8:00am every Monday through Friday" or "At 1:30am every
* last Friday of the month". * last Friday of the month".
* <P> * <p>
* Cron expressions are comprised of 6 required fields and one optional field * Cron expressions are comprised of 6 required fields and one optional field
* separated by white space. The fields respectively are described as follows: * separated by white space. The fields respectively are described as follows:
* * </p>
* <table cellspacing="8"> * <table>
* <caption>Examples of cron expressions and their meanings.</caption>
* <tr> * <tr>
* <th align="left">Field Name</th> * <th>Field Name</th>
* <th align="left">&nbsp;</th> * <th>&nbsp;</th>
* <th align="left">Allowed Values</th> * <th>Allowed Values</th>
* <th align="left">&nbsp;</th> * <th>&nbsp;</th>
* <th align="left">Allowed Special Characters</th> * <th>Allowed Special Characters</th>
* </tr> * </tr>
* <tr> * <tr>
* <td align="left"><code>Seconds</code></td> * <td><code>Seconds</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>0-59</code></td> * <td><code>0-59</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>, - * /</code></td> * <td><code>, - * /</code></td>
* </tr> * </tr>
* <tr> * <tr>
* <td align="left"><code>Minutes</code></td> * <td><code>Minutes</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>0-59</code></td> * <td><code>0-59</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>, - * /</code></td> * <td><code>, - * /</code></td>
* </tr> * </tr>
* <tr> * <tr>
* <td align="left"><code>Hours</code></td> * <td><code>Hours</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>0-23</code></td> * <td><code>0-23</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>, - * /</code></td> * <td><code>, - * /</code></td>
* </tr> * </tr>
* <tr> * <tr>
* <td align="left"><code>Day-of-month</code></td> * <td><code>Day-of-month</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>1-31</code></td> * <td><code>1-31</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>, - * ? / L W</code></td> * <td><code>, - * ? / L W</code></td>
* </tr> * </tr>
* <tr> * <tr>
* <td align="left"><code>Month</code></td> * <td><code>Month</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>0-11 or JAN-DEC</code></td> * <td><code>0-11 or JAN-DEC</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>, - * /</code></td> * <td><code>, - * /</code></td>
* </tr> * </tr>
* <tr> * <tr>
* <td align="left"><code>Day-of-Week</code></td> * <td><code>Day-of-Week</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>1-7 or SUN-SAT</code></td> * <td><code>1-7 or SUN-SAT</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>, - * ? / L #</code></td> * <td><code>, - * ? / L #</code></td>
* </tr> * </tr>
* <tr> * <tr>
* <td align="left"><code>Year (Optional)</code></td> * <td><code>Year (Optional)</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>empty, 1970-2199</code></td> * <td><code>empty, 1970-2199</code></td>
* <td align="left">&nbsp;</th> * <td>&nbsp;</td>
* <td align="left"><code>, - * /</code></td> * <td><code>, - * /</code></td>
* </tr> * </tr>
* </table> * </table>
* <P> * <p>
* The '*' character is used to specify all values. For example, &quot;*&quot; * The '*' character is used to specify all values. For example, &quot;*&quot;
* in the minute field means &quot;every minute&quot;. * in the minute field means &quot;every minute&quot;.
* <P> * </p>
* <p>
* The '?' character is allowed for the day-of-month and day-of-week fields. It * The '?' character is allowed for the day-of-month and day-of-week fields. It
* is used to specify 'no specific value'. This is useful when you need to * is used to specify 'no specific value'. This is useful when you need to
* specify something in one of the two fields, but not the other. * specify something in one of the two fields, but not the other.
* <P> * <p>
* The '-' character is used to specify ranges For example &quot;10-12&quot; in * The '-' character is used to specify ranges For example &quot;10-12&quot; in
* the hour field means &quot;the hours 10, 11 and 12&quot;. * the hour field means &quot;the hours 10, 11 and 12&quot;.
* <P> * <p>
* The ',' character is used to specify additional values. For example * The ',' character is used to specify additional values. For example
* &quot;MON,WED,FRI&quot; in the day-of-week field means &quot;the days Monday, * &quot;MON,WED,FRI&quot; in the day-of-week field means &quot;the days Monday,
* Wednesday, and Friday&quot;. * Wednesday, and Friday&quot;.
* <P> * </p>
* <p>
* The '/' character is used to specify increments. For example &quot;0/15&quot; * The '/' character is used to specify increments. For example &quot;0/15&quot;
* in the seconds field means &quot;the seconds 0, 15, 30, and 45&quot;. And * in the seconds field means &quot;the seconds 0, 15, 30, and 45&quot;. And
* &quot;5/15&quot; in the seconds field means &quot;the seconds 5, 20, 35, and * &quot;5/15&quot; in the seconds field means &quot;the seconds 5, 20, 35, and
@ -123,7 +110,8 @@ import java.util.TreeSet;
* on every &quot;nth&quot; value in the given set. Thus &quot;7/6&quot; in the * on every &quot;nth&quot; value in the given set. Thus &quot;7/6&quot; in the
* month field only turns on month &quot;7&quot;, it does NOT mean every 6th * month field only turns on month &quot;7&quot;, it does NOT mean every 6th
* month, please note that subtlety. * month, please note that subtlety.
* <P> * </p>
* <p>
* The 'L' character is allowed for the day-of-month and day-of-week fields. * The 'L' character is allowed for the day-of-month and day-of-week fields.
* This character is short-hand for &quot;last&quot;, but it has different * This character is short-hand for &quot;last&quot;, but it has different
* meaning in each of the two fields. For example, the value &quot;L&quot; in * meaning in each of the two fields. For example, the value &quot;L&quot; in
@ -136,7 +124,8 @@ import java.util.TreeSet;
* from the last day of the month, such as "L-3" which would mean the third-to-last * from the last day of the month, such as "L-3" which would mean the third-to-last
* day of the calendar month. <i>When using the 'L' option, it is important not to * day of the calendar month. <i>When using the 'L' option, it is important not to
* specify lists, or ranges of values, as you'll get confusing/unexpected results.</i> * specify lists, or ranges of values, as you'll get confusing/unexpected results.</i>
* <P> * </p>
* <p>
* The 'W' character is allowed for the day-of-month field. This character * The 'W' character is allowed for the day-of-month field. This character
* is used to specify the weekday (Monday-Friday) nearest the given day. As an * is used to specify the weekday (Monday-Friday) nearest the given day. As an
* example, if you were to specify &quot;15W&quot; as the value for the * example, if you were to specify &quot;15W&quot; as the value for the
@ -148,11 +137,13 @@ import java.util.TreeSet;
* 1st is a Saturday, the trigger will fire on Monday the 3rd, as it will not * 1st is a Saturday, the trigger will fire on Monday the 3rd, as it will not
* 'jump' over the boundary of a month's days. The 'W' character can only be * 'jump' over the boundary of a month's days. The 'W' character can only be
* specified when the day-of-month is a single day, not a range or list of days. * specified when the day-of-month is a single day, not a range or list of days.
* <P> * </p>
* <p>
* The 'L' and 'W' characters can also be combined for the day-of-month * The 'L' and 'W' characters can also be combined for the day-of-month
* expression to yield 'LW', which translates to &quot;last weekday of the * expression to yield 'LW', which translates to &quot;last weekday of the
* month&quot;. * month&quot;.
* <P> * </p>
* <p>
* The '#' character is allowed for the day-of-week field. This character is * The '#' character is allowed for the day-of-week field. This character is
* used to specify &quot;the nth&quot; XXX day of the month. For example, the * used to specify &quot;the nth&quot; XXX day of the month. For example, the
* value of &quot;6#3&quot; in the day-of-week field means the third Friday of * value of &quot;6#3&quot; in the day-of-week field means the third Friday of
@ -163,7 +154,7 @@ import java.util.TreeSet;
* no firing will occur that month. If the '#' character is used, there can * no firing will occur that month. If the '#' character is used, there can
* only be one expression in the day-of-week field (&quot;3#1,6#3&quot; is * only be one expression in the day-of-week field (&quot;3#1,6#3&quot; is
* not valid, since there are two expressions). * not valid, since there are two expressions).
* <P> * </p>
* <!--The 'C' character is allowed for the day-of-month and day-of-week fields. * <!--The 'C' character is allowed for the day-of-month and day-of-week fields.
* This character is short-hand for "calendar". This means values are * This character is short-hand for "calendar". This means values are
* calculated against the associated calendar, if any. If no calendar is * calculated against the associated calendar, if any. If no calendar is
@ -171,12 +162,13 @@ import java.util.TreeSet;
* value of "5C" in the day-of-month field means "the first day included by the * value of "5C" in the day-of-month field means "the first day included by the
* calendar on or after the 5th". A value of "1C" in the day-of-week field * calendar on or after the 5th". A value of "1C" in the day-of-week field
* means "the first day included by the calendar on or after Sunday".--> * means "the first day included by the calendar on or after Sunday".-->
* <P> * <p>
* The legal characters and the names of months and days of the week are not * The legal characters and the names of months and days of the week are not
* case sensitive. * case sensitive.
* *
* <p> * <p>
* <b>NOTES:</b> * <b>NOTES:</b>
* </p>
* <ul> * <ul>
* <li>Support for specifying both a day-of-week and a day-of-month value is * <li>Support for specifying both a day-of-week and a day-of-month value is
* not complete (you'll need to use the '?' character in one of these fields). * not complete (you'll need to use the '?' character in one of these fields).
@ -189,15 +181,13 @@ import java.util.TreeSet;
* interpretation CronExpression chooses. An example would be * interpretation CronExpression chooses. An example would be
* "0 0 14-6 ? * FRI-MON". </li> * "0 0 14-6 ? * FRI-MON". </li>
* </ul> * </ul>
* </p>
* *
* *
* @author Sharada Jambula, James House * @author Sharada Jambula, James House
* @author Contributions from Mads Henderson * @author Contributions from Mads Henderson
* @author Refactoring from CronTrigger to CronExpression by Aaron Craven * @author Refactoring from CronTrigger to CronExpression by Aaron Craven
* *
* Borrowed from quartz v2.3.1 * Borrowed from quartz v2.5.0
*
*/ */
public final class CronExpression implements Serializable, Cloneable { public final class CronExpression implements Serializable, Cloneable {
@ -212,11 +202,14 @@ public final class CronExpression implements Serializable, Cloneable {
protected static final int YEAR = 6; protected static final int YEAR = 6;
protected static final int ALL_SPEC_INT = 99; // '*' protected static final int ALL_SPEC_INT = 99; // '*'
protected static final int NO_SPEC_INT = 98; // '?' protected static final int NO_SPEC_INT = 98; // '?'
protected static final int MAX_LAST_DAY_OFFSET = 30;
protected static final int LAST_DAY_OFFSET_START = 32; // "L-30"
protected static final int LAST_DAY_OFFSET_END = LAST_DAY_OFFSET_START + MAX_LAST_DAY_OFFSET; // 'L'
protected static final Integer ALL_SPEC = ALL_SPEC_INT; protected static final Integer ALL_SPEC = ALL_SPEC_INT;
protected static final Integer NO_SPEC = NO_SPEC_INT; protected static final Integer NO_SPEC = NO_SPEC_INT;
protected static final Map<String, Integer> monthMap = new HashMap<String, Integer>(20); protected static final Map<String, Integer> monthMap = new HashMap<>(20);
protected static final Map<String, Integer> dayMap = new HashMap<String, Integer>(60); protected static final Map<String, Integer> dayMap = new HashMap<>(60);
static { static {
monthMap.put("JAN", 0); monthMap.put("JAN", 0);
monthMap.put("FEB", 1); monthMap.put("FEB", 1);
@ -246,15 +239,13 @@ public final class CronExpression implements Serializable, Cloneable {
protected transient TreeSet<Integer> minutes; protected transient TreeSet<Integer> minutes;
protected transient TreeSet<Integer> hours; protected transient TreeSet<Integer> hours;
protected transient TreeSet<Integer> daysOfMonth; protected transient TreeSet<Integer> daysOfMonth;
protected transient TreeSet<Integer> nearestWeekdays;
protected transient TreeSet<Integer> months; protected transient TreeSet<Integer> months;
protected transient TreeSet<Integer> daysOfWeek; protected transient TreeSet<Integer> daysOfWeek;
protected transient TreeSet<Integer> years; protected transient TreeSet<Integer> years;
protected transient boolean lastdayOfWeek = false; protected transient boolean lastDayOfWeek = false;
protected transient int nthdayOfWeek = 0; protected transient int nthDayOfWeek = 0;
protected transient boolean lastdayOfMonth = false;
protected transient boolean nearestWeekday = false;
protected transient int lastdayOffset = 0;
protected transient boolean expressionParsed = false; protected transient boolean expressionParsed = false;
public static final int MAX_YEAR = Calendar.getInstance().get(Calendar.YEAR) + 100; public static final int MAX_YEAR = Calendar.getInstance().get(Calendar.YEAR) + 100;
@ -296,7 +287,7 @@ public final class CronExpression implements Serializable, Cloneable {
try { try {
buildExpression(cronExpression); buildExpression(cronExpression);
} catch (ParseException ex) { } catch (ParseException ex) {
throw new AssertionError(); throw new AssertionError("Could not parse expression!", ex);
} }
if (expression.getTimeZone() != null) { if (expression.getTimeZone() != null) {
setTimeZone((TimeZone) expression.getTimeZone().clone()); setTimeZone((TimeZone) expression.getTimeZone().clone());
@ -363,9 +354,9 @@ public final class CronExpression implements Serializable, Cloneable {
// the second immediately following it. // the second immediately following it.
while (difference == 1000) { while (difference == 1000) {
newDate = getTimeAfter(lastDate); newDate = getTimeAfter(lastDate);
if(newDate == null) { if(newDate == null)
break; break;
}
difference = newDate.getTime() - lastDate.getTime(); difference = newDate.getTime() - lastDate.getTime();
if (difference == 1000) { if (difference == 1000) {
@ -443,25 +434,28 @@ public final class CronExpression implements Serializable, Cloneable {
try { try {
if (seconds == null) { if (seconds == null) {
seconds = new TreeSet<Integer>(); seconds = new TreeSet<>();
} }
if (minutes == null) { if (minutes == null) {
minutes = new TreeSet<Integer>(); minutes = new TreeSet<>();
} }
if (hours == null) { if (hours == null) {
hours = new TreeSet<Integer>(); hours = new TreeSet<>();
} }
if (daysOfMonth == null) { if (daysOfMonth == null) {
daysOfMonth = new TreeSet<Integer>(); daysOfMonth = new TreeSet<>();
}
if (nearestWeekdays == null) {
nearestWeekdays = new TreeSet<>();
} }
if (months == null) { if (months == null) {
months = new TreeSet<Integer>(); months = new TreeSet<>();
} }
if (daysOfWeek == null) { if (daysOfWeek == null) {
daysOfWeek = new TreeSet<Integer>(); daysOfWeek = new TreeSet<>();
} }
if (years == null) { if (years == null) {
years = new TreeSet<Integer>(); years = new TreeSet<>();
} }
int exprOn = SECOND; int exprOn = SECOND;
@ -469,13 +463,13 @@ public final class CronExpression implements Serializable, Cloneable {
StringTokenizer exprsTok = new StringTokenizer(expression, " \t", StringTokenizer exprsTok = new StringTokenizer(expression, " \t",
false); false);
if(exprsTok.countTokens() > 7) {
throw new ParseException("Invalid expression has too many terms: " + expression, -1);
}
while (exprsTok.hasMoreTokens() && exprOn <= YEAR) { while (exprsTok.hasMoreTokens() && exprOn <= YEAR) {
String expr = exprsTok.nextToken().trim(); String expr = exprsTok.nextToken().trim();
// throw an exception if L is used with other days of the month
if(exprOn == DAY_OF_MONTH && expr.indexOf('L') != -1 && expr.length() > 1 && expr.contains(",")) {
throw new ParseException("Support for specifying 'L' and 'LW' with other days of the month is not implemented", -1);
}
// throw an exception if L is used with other days of the week // throw an exception if L is used with other days of the week
if(exprOn == DAY_OF_WEEK && expr.indexOf('L') != -1 && expr.length() > 1 && expr.contains(",")) { if(exprOn == DAY_OF_WEEK && expr.indexOf('L') != -1 && expr.length() > 1 && expr.contains(",")) {
throw new ParseException("Support for specifying 'L' with other days of the week is not implemented", -1); throw new ParseException("Support for specifying 'L' with other days of the week is not implemented", -1);
@ -519,7 +513,7 @@ public final class CronExpression implements Serializable, Cloneable {
throw pe; throw pe;
} catch (Exception e) { } catch (Exception e) {
throw new ParseException("Illegal cron expression format (" throw new ParseException("Illegal cron expression format ("
+ e.toString() + ")", 0); + e + ")", 0);
} }
} }
@ -572,8 +566,8 @@ public final class CronExpression implements Serializable, Cloneable {
} else if (c == '#') { } else if (c == '#') {
try { try {
i += 4; i += 4;
nthdayOfWeek = Integer.parseInt(s.substring(i)); nthDayOfWeek = Integer.parseInt(s.substring(i));
if (nthdayOfWeek < 1 || nthdayOfWeek > 5) { if (nthDayOfWeek < 1 || nthDayOfWeek > 5) {
throw new Exception(); throw new Exception();
} }
} catch (Exception e) { } catch (Exception e) {
@ -582,7 +576,7 @@ public final class CronExpression implements Serializable, Cloneable {
i); i);
} }
} else if (c == 'L') { } else if (c == 'L') {
lastdayOfWeek = true; lastDayOfWeek = true;
i++; i++;
} }
} }
@ -611,9 +605,8 @@ public final class CronExpression implements Serializable, Cloneable {
"'?' can only be specified for Day-of-Month or Day-of-Week.", "'?' can only be specified for Day-of-Month or Day-of-Week.",
i); i);
} }
if (type == DAY_OF_WEEK && !lastdayOfMonth) { if (type == DAY_OF_WEEK) {
int val = daysOfMonth.last(); if (!daysOfMonth.isEmpty() && daysOfMonth.last() == NO_SPEC_INT) {
if (val == NO_SPEC_INT) {
throw new ParseException( throw new ParseException(
"'?' can only be specified for Day-of-Month -OR- Day-of-Week.", "'?' can only be specified for Day-of-Month -OR- Day-of-Week.",
i); i);
@ -657,30 +650,36 @@ public final class CronExpression implements Serializable, Cloneable {
return i; return i;
} else if (c == 'L') { } else if (c == 'L') {
i++; i++;
if (type == DAY_OF_MONTH) {
lastdayOfMonth = true;
}
if (type == DAY_OF_WEEK) { if (type == DAY_OF_WEEK) {
addToSet(7, 7, 0, type); addToSet(7, 7, 0, type);
} }
if(type == DAY_OF_MONTH && s.length() > i) { if (type == DAY_OF_MONTH) {
int dom = LAST_DAY_OFFSET_END;
boolean nearestWeekday = false;
if (s.length() > i) {
c = s.charAt(i); c = s.charAt(i);
if(c == '-') { if (c == '-') {
ValueSet vs = getValue(0, s, i+1); ValueSet vs = getValue(0, s, i + 1);
lastdayOffset = vs.value; int offset = vs.value;
if(lastdayOffset > 30) { if (offset > MAX_LAST_DAY_OFFSET)
throw new ParseException("Offset from last day must be <= 30", i + 1); throw new ParseException("Offset from last day must be <= " + MAX_LAST_DAY_OFFSET, i + 1);
} dom -= offset;
i = vs.pos; i = vs.pos;
} }
if(s.length() > i) { if (s.length() > i) {
c = s.charAt(i); c = s.charAt(i);
if(c == 'W') { if (c == 'W') {
nearestWeekday = true; nearestWeekday = true;
i++; i++;
} }
} }
} }
if (nearestWeekday) {
nearestWeekdays.add(dom);
} else {
daysOfMonth.add(dom);
}
}
return i; return i;
} else if (c >= '0' && c <= '9') { } else if (c >= '0' && c <= '9') {
int val = Integer.parseInt(String.valueOf(c)); int val = Integer.parseInt(String.valueOf(c));
@ -733,10 +732,9 @@ public final class CronExpression implements Serializable, Cloneable {
if (c == 'L') { if (c == 'L') {
if (type == DAY_OF_WEEK) { if (type == DAY_OF_WEEK) {
if(val < 1 || val > 7) { if(val < 1 || val > 7)
throw new ParseException("Day-of-Week values must be between 1 and 7", -1); throw new ParseException("Day-of-Week values must be between 1 and 7", -1);
} lastDayOfWeek = true;
lastdayOfWeek = true;
} else { } else {
throw new ParseException("'L' option is not valid here. (pos=" + i + ")", i); throw new ParseException("'L' option is not valid here. (pos=" + i + ")", i);
} }
@ -747,16 +745,12 @@ public final class CronExpression implements Serializable, Cloneable {
} }
if (c == 'W') { if (c == 'W') {
if (type == DAY_OF_MONTH) { if (type != DAY_OF_MONTH) {
nearestWeekday = true;
} else {
throw new ParseException("'W' option is not valid here. (pos=" + i + ")", i); throw new ParseException("'W' option is not valid here. (pos=" + i + ")", i);
} }
if(val > 31) { if(val > 31)
throw new ParseException("The 'W' option does not make sense with values larger than 31 (max number of days in a month)", i); throw new ParseException("The 'W' option does not make sense with values larger than 31 (max number of days in a month)", i);
} nearestWeekdays.add(val);
TreeSet<Integer> set = getSet(type);
set.add(val);
i++; i++;
return i; return i;
} }
@ -767,8 +761,8 @@ public final class CronExpression implements Serializable, Cloneable {
} }
i++; i++;
try { try {
nthdayOfWeek = Integer.parseInt(s.substring(i)); nthDayOfWeek = Integer.parseInt(s.substring(i));
if (nthdayOfWeek < 1 || nthdayOfWeek > 5) { if (nthDayOfWeek < 1 || nthDayOfWeek > 5) {
throw new Exception(); throw new Exception();
} }
} catch (Exception e) { } catch (Exception e) {
@ -876,23 +870,20 @@ public final class CronExpression implements Serializable, Cloneable {
buf.append("daysOfMonth: "); buf.append("daysOfMonth: ");
buf.append(getExpressionSetSummary(daysOfMonth)); buf.append(getExpressionSetSummary(daysOfMonth));
buf.append("\n"); buf.append("\n");
buf.append("nearestWeekdays: ");
buf.append(getExpressionSetSummary(nearestWeekdays));
buf.append("\n");
buf.append("months: "); buf.append("months: ");
buf.append(getExpressionSetSummary(months)); buf.append(getExpressionSetSummary(months));
buf.append("\n"); buf.append("\n");
buf.append("daysOfWeek: "); buf.append("daysOfWeek: ");
buf.append(getExpressionSetSummary(daysOfWeek)); buf.append(getExpressionSetSummary(daysOfWeek));
buf.append("\n"); buf.append("\n");
buf.append("lastdayOfWeek: "); buf.append("lastDayOfWeek: ");
buf.append(lastdayOfWeek); buf.append(lastDayOfWeek);
buf.append("\n");
buf.append("nearestWeekday: ");
buf.append(nearestWeekday);
buf.append("\n"); buf.append("\n");
buf.append("NthDayOfWeek: "); buf.append("NthDayOfWeek: ");
buf.append(nthdayOfWeek); buf.append(nthDayOfWeek);
buf.append("\n");
buf.append("lastdayOfMonth: ");
buf.append(lastdayOfMonth);
buf.append("\n"); buf.append("\n");
buf.append("years: "); buf.append("years: ");
buf.append(getExpressionSetSummary(years)); buf.append(getExpressionSetSummary(years));
@ -1200,7 +1191,7 @@ public final class CronExpression implements Serializable, Cloneable {
// get second................................................. // get second.................................................
st = seconds.tailSet(sec); st = seconds.tailSet(sec);
if (st != null && st.size() != 0) { if (st != null && !st.isEmpty()) {
sec = st.first(); sec = st.first();
} else { } else {
sec = seconds.first(); sec = seconds.first();
@ -1215,7 +1206,7 @@ public final class CronExpression implements Serializable, Cloneable {
// get minute................................................. // get minute.................................................
st = minutes.tailSet(min); st = minutes.tailSet(min);
if (st != null && st.size() != 0) { if (st != null && !st.isEmpty()) {
t = min; t = min;
min = st.first(); min = st.first();
} else { } else {
@ -1236,7 +1227,7 @@ public final class CronExpression implements Serializable, Cloneable {
// get hour................................................... // get hour...................................................
st = hours.tailSet(hr); st = hours.tailSet(hr);
if (st != null && st.size() != 0) { if (st != null && !st.isEmpty()) {
t = hr; t = hr;
hr = st.first(); hr = st.first();
} else { } else {
@ -1263,61 +1254,12 @@ public final class CronExpression implements Serializable, Cloneable {
boolean dayOfMSpec = !daysOfMonth.contains(NO_SPEC); boolean dayOfMSpec = !daysOfMonth.contains(NO_SPEC);
boolean dayOfWSpec = !daysOfWeek.contains(NO_SPEC); boolean dayOfWSpec = !daysOfWeek.contains(NO_SPEC);
if (dayOfMSpec && !dayOfWSpec) { // get day by day of month rule if (dayOfMSpec && !dayOfWSpec) { // get day by day of month rule
st = daysOfMonth.tailSet(day); Optional<Integer> smallestDay = findSmallestDay(day, mon, cl.get(Calendar.YEAR), daysOfMonth);
if (lastdayOfMonth) { Optional<Integer> smallestDayForWeekday = findSmallestDay(day, mon, cl.get(Calendar.YEAR), nearestWeekdays);
if(!nearestWeekday) {
t = day; t = day;
day = getLastDayOfMonth(mon, cl.get(Calendar.YEAR)); day = -1;
day -= lastdayOffset; if (smallestDayForWeekday.isPresent()) {
if(t > day) { day = smallestDayForWeekday.get();
mon++;
if(mon > 12) {
mon = 1;
tmon = 3333; // ensure test of mon != tmon further below fails
cl.add(Calendar.YEAR, 1);
}
day = 1;
}
} else {
t = day;
day = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
day -= lastdayOffset;
java.util.Calendar tcal = java.util.Calendar.getInstance(getTimeZone());
tcal.set(Calendar.SECOND, 0);
tcal.set(Calendar.MINUTE, 0);
tcal.set(Calendar.HOUR_OF_DAY, 0);
tcal.set(Calendar.DAY_OF_MONTH, day);
tcal.set(Calendar.MONTH, mon - 1);
tcal.set(Calendar.YEAR, cl.get(Calendar.YEAR));
int ldom = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
int dow = tcal.get(Calendar.DAY_OF_WEEK);
if(dow == Calendar.SATURDAY && day == 1) {
day += 2;
} else if(dow == Calendar.SATURDAY) {
day -= 1;
} else if(dow == Calendar.SUNDAY && day == ldom) {
day -= 2;
} else if(dow == Calendar.SUNDAY) {
day += 1;
}
tcal.set(Calendar.SECOND, sec);
tcal.set(Calendar.MINUTE, min);
tcal.set(Calendar.HOUR_OF_DAY, hr);
tcal.set(Calendar.DAY_OF_MONTH, day);
tcal.set(Calendar.MONTH, mon - 1);
Date nTime = tcal.getTime();
if(nTime.before(afterTime)) {
day = 1;
mon++;
}
}
} else if(nearestWeekday) {
t = day;
day = daysOfMonth.first();
java.util.Calendar tcal = java.util.Calendar.getInstance(getTimeZone()); java.util.Calendar tcal = java.util.Calendar.getInstance(getTimeZone());
tcal.set(Calendar.SECOND, 0); tcal.set(Calendar.SECOND, 0);
@ -1348,23 +1290,17 @@ public final class CronExpression implements Serializable, Cloneable {
tcal.set(Calendar.MONTH, mon - 1); tcal.set(Calendar.MONTH, mon - 1);
Date nTime = tcal.getTime(); Date nTime = tcal.getTime();
if(nTime.before(afterTime)) { if(nTime.before(afterTime)) {
day = daysOfMonth.first(); day = -1;
mon++;
} }
} else if (st != null && st.size() != 0) {
t = day;
day = st.first();
// make sure we don't over-run a short month, such as february
int lastDay = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
if (day > lastDay) {
day = daysOfMonth.first();
mon++;
} }
} else { if (smallestDay.isPresent()) {
day = daysOfMonth.first(); if (day == -1 || smallestDay.get() < day) {
day = smallestDay.get();
}
} else if (day == -1) {
day = 1;
mon++; mon++;
} }
if (day != t || mon != tmon) { if (day != t || mon != tmon) {
cl.set(Calendar.SECOND, 0); cl.set(Calendar.SECOND, 0);
cl.set(Calendar.MINUTE, 0); cl.set(Calendar.MINUTE, 0);
@ -1376,7 +1312,7 @@ public final class CronExpression implements Serializable, Cloneable {
continue; continue;
} }
} else if (dayOfWSpec && !dayOfMSpec) { // get day by day of week rule } else if (dayOfWSpec && !dayOfMSpec) { // get day by day of week rule
if (lastdayOfWeek) { // are we looking for the last XXX day of if (lastDayOfWeek) { // are we looking for the last XXX day of
// the month? // the month?
int dow = daysOfWeek.first(); // desired int dow = daysOfWeek.first(); // desired
// d-o-w // d-o-w
@ -1419,7 +1355,7 @@ public final class CronExpression implements Serializable, Cloneable {
continue; continue;
} }
} else if (nthdayOfWeek != 0) { } else if (nthDayOfWeek != 0) {
// are we looking for the Nth XXX day in the month? // are we looking for the Nth XXX day in the month?
int dow = daysOfWeek.first(); // desired int dow = daysOfWeek.first(); // desired
// d-o-w // d-o-w
@ -1431,10 +1367,7 @@ public final class CronExpression implements Serializable, Cloneable {
daysToAdd = dow + (7 - cDow); daysToAdd = dow + (7 - cDow);
} }
boolean dayShifted = false; boolean dayShifted = daysToAdd > 0;
if (daysToAdd > 0) {
dayShifted = true;
}
day += daysToAdd; day += daysToAdd;
int weekOfMonth = day / 7; int weekOfMonth = day / 7;
@ -1442,7 +1375,7 @@ public final class CronExpression implements Serializable, Cloneable {
weekOfMonth++; weekOfMonth++;
} }
daysToAdd = (nthdayOfWeek - weekOfMonth) * 7; daysToAdd = (nthDayOfWeek - weekOfMonth) * 7;
day += daysToAdd; day += daysToAdd;
if (daysToAdd < 0 if (daysToAdd < 0
|| day > getLastDayOfMonth(mon, cl || day > getLastDayOfMonth(mon, cl
@ -1468,7 +1401,7 @@ public final class CronExpression implements Serializable, Cloneable {
int dow = daysOfWeek.first(); // desired int dow = daysOfWeek.first(); // desired
// d-o-w // d-o-w
st = daysOfWeek.tailSet(cDow); st = daysOfWeek.tailSet(cDow);
if (st != null && st.size() > 0) { if (st != null && !st.isEmpty()) {
dow = st.first(); dow = st.first();
} }
@ -1491,7 +1424,7 @@ public final class CronExpression implements Serializable, Cloneable {
cl.set(Calendar.MONTH, mon); cl.set(Calendar.MONTH, mon);
// no '- 1' here because we are promoting the month // no '- 1' here because we are promoting the month
continue; continue;
} else if (daysToAdd > 0) { // are we swithing days? } else if (daysToAdd > 0) { // are we switching days?
cl.set(Calendar.SECOND, 0); cl.set(Calendar.SECOND, 0);
cl.set(Calendar.MINUTE, 0); cl.set(Calendar.MINUTE, 0);
cl.set(Calendar.HOUR_OF_DAY, 0); cl.set(Calendar.HOUR_OF_DAY, 0);
@ -1522,7 +1455,7 @@ public final class CronExpression implements Serializable, Cloneable {
// get month................................................... // get month...................................................
st = months.tailSet(mon); st = months.tailSet(mon);
if (st != null && st.size() != 0) { if (st != null && !st.isEmpty()) {
t = mon; t = mon;
mon = st.first(); mon = st.first();
} else { } else {
@ -1549,7 +1482,7 @@ public final class CronExpression implements Serializable, Cloneable {
// get year................................................... // get year...................................................
st = years.tailSet(year); st = years.tailSet(year);
if (st != null && st.size() != 0) { if (st != null && !st.isEmpty()) {
t = year; t = year;
year = st.first(); year = st.first();
} else { } else {
@ -1645,6 +1578,27 @@ public final class CronExpression implements Serializable, Cloneable {
} }
private Optional<Integer> findSmallestDay(int day, int mon, int year, TreeSet<Integer> set) {
if (set.isEmpty()) {
return Optional.empty();
}
final int lastDay = getLastDayOfMonth(mon, year);
// For "L", "L-1", etc.
int smallestDay = Optional.ofNullable(set.ceiling(LAST_DAY_OFFSET_END - (lastDay - day)))
.map(d -> d - LAST_DAY_OFFSET_START + 1)
.orElse(Integer.MAX_VALUE);
// For "1", "2", etc.
SortedSet<Integer> st = set.subSet(day, LAST_DAY_OFFSET_START);
// make sure we don't over-run a short month, such as february
if (!st.isEmpty() && st.first() < smallestDay && st.first() <= lastDay) {
smallestDay = st.first();
}
return smallestDay == Integer.MAX_VALUE ? Optional.empty() : Optional.of(smallestDay);
}
private void readObject(java.io.ObjectInputStream stream) private void readObject(java.io.ObjectInputStream stream)
throws java.io.IOException, ClassNotFoundException { throws java.io.IOException, ClassNotFoundException {

15
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js
Unescape View File

@ -258,24 +258,27 @@
var weekly3 = $("<div/>",{"class":"line"}); var weekly3 = $("<div/>",{"class":"line"});
$("<input/>",{type : "radio", value : "3", name : "week"}).appendTo(weekly3); $("<input/>",{type : "radio", value : "3", name : "week"}).appendTo(weekly3);
$(weekly3).append("周期 从星期"); $(weekly3).append("周期 每周第");
$("<input/>",{type : "text", id : "weekStart_0", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly3); $("<input/>",{type : "text", id : "weekStart_0", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly3);
$(weekly3).append("-"); $(weekly3).append("天-第");
$("<input/>",{type : "text", id : "weekEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly3); $("<input/>",{type : "text", id : "weekEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly3);
$(weekly3).append("天");
$(weekly3).appendTo(weeklyTab); $(weekly3).appendTo(weeklyTab);
var weekly4 = $("<div/>",{"class":"line"}); var weekly4 = $("<div/>",{"class":"line"});
$("<input/>",{type : "radio", value : "4", name : "week"}).appendTo(weekly4); $("<input/>",{type : "radio", value : "4", name : "week"}).appendTo(weekly4);
$(weekly4).append("第"); $(weekly4).append("从第");
$("<input/>",{type : "text", id : "weekStart_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly4); $("<input/>",{type : "text", id : "weekStart_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly4);
$(weekly4).append("周的星期"); $(weekly4).append("天开始，间隔");
$("<input/>",{type : "text", id : "weekEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly4); $("<input/>",{type : "text", id : "weekEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly4);
$(weekly4).append("天执行一次");
$(weekly4).appendTo(weeklyTab); $(weekly4).appendTo(weeklyTab);
var weekly5 = $("<div/>",{"class":"line"}); var weekly5 = $("<div/>",{"class":"line"});
$("<input/>",{type : "radio", value : "5", name : "week"}).appendTo(weekly5); $("<input/>",{type : "radio", value : "5", name : "week"}).appendTo(weekly5);
$(weekly5).append("本月最后一个星期"); $(weekly5).append("本月最后一周的第");
$("<input/>",{type : "text", id : "weekStart_2", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly5); $("<input/>",{type : "text", id : "weekStart_2", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly5);
$(weekly5).append("天");
$(weekly5).appendTo(weeklyTab); $(weekly5).appendTo(weeklyTab);
var weekly6 = $("<div/>",{"class":"line"}); var weekly6 = $("<div/>",{"class":"line"});
@ -283,7 +286,7 @@
$(weekly6).append("指定"); $(weekly6).append("指定");
$(weekly6).appendTo(weeklyTab); $(weekly6).appendTo(weeklyTab);
$(weeklyTab).append('<div class="imp weekList"><input type="checkbox" disabled="disabled" style="margin-left: 5px" value="1">1<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="2">2<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="3">3<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="4">4<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="5">5<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="6">6<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="7">7</div>'); $(weeklyTab).append('<div class="imp weekList"><input type="checkbox" disabled="disabled" style="margin-left: 5px" value="1">周日<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="2">周一<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="3">周二<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="4">周三<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="5">周四<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="6">周五<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="7">周六</div>');
$("<input/>",{type : "hidden", id : "weekHidden"}).appendTo(weeklyTab); $("<input/>",{type : "hidden", id : "weekHidden"}).appendTo(weeklyTab);
$(weeklyTab).appendTo(tabContent); $(weeklyTab).appendTo(tabContent);

4
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js
Unescape View File

@ -268,7 +268,7 @@
$("<input/>",{type : "radio", value : "4", name : "week"}).appendTo(weekly4); $("<input/>",{type : "radio", value : "4", name : "week"}).appendTo(weekly4);
$(weekly4).append("The"); $(weekly4).append("The");
$("<input/>",{type : "text", id : "weekStart_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly4); $("<input/>",{type : "text", id : "weekStart_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly4);
$(weekly4).append("th week, and day "); $(weekly4).append("th week, once every ");
$("<input/>",{type : "text", id : "weekEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly4); $("<input/>",{type : "text", id : "weekEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly4);
$(weekly4).appendTo(weeklyTab); $(weekly4).appendTo(weeklyTab);
@ -283,7 +283,7 @@
$(weekly6).append("specify"); $(weekly6).append("specify");
$(weekly6).appendTo(weeklyTab); $(weekly6).appendTo(weeklyTab);
$(weeklyTab).append('<div class="imp weekList"><input type="checkbox" disabled="disabled" style="margin-left: 5px" value="1">1<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="2">2<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="3">3<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="4">4<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="5">5<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="6">6<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="7">7</div>'); $(weeklyTab).append('<div class="imp weekList"><input type="checkbox" disabled="disabled" style="margin-left: 5px" value="1">SUN<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="2">MON<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="3">TUE<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="4">WED<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="5">THU<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="6">FRI<input type="checkbox" disabled="disabled" style="margin-left: 5px" value="7">SAT</div>');
$("<input/>",{type : "hidden", id : "weekHidden"}).appendTo(weeklyTab); $("<input/>",{type : "hidden", id : "weekHidden"}).appendTo(weeklyTab);
$(weeklyTab).appendTo(tabContent); $(weeklyTab).appendTo(tabContent);

23
xxl-job-admin/src/test/java/com/xxl/job/admin/core/util/CronExpressionTest.java
Unescape View File

@ -0,0 +1,23 @@
package com.xxl.job.admin.core.util;
import com.xxl.job.admin.core.cron.CronExpression;
import com.xxl.job.core.util.DateUtil;
import org.junit.jupiter.api.Test;
import java.text.ParseException;
import java.util.Date;
public class CronExpressionTest {
@Test
public void shouldWriteValueAsString() throws ParseException {
CronExpression cronExpression = new CronExpression("0 0 0 ? * 1");
Date lastTriggerTime = new Date();
for (int i = 0; i < 5; i++) {
Date nextTriggerTime = cronExpression.getNextValidTimeAfter(lastTriggerTime);
System.out.println(DateUtil.formatDateTime(nextTriggerTime));
lastTriggerTime = nextTriggerTime;
}
}
}
Write Preview
Loading…
Cancel
Save