fix: 解决计划任务执行周期错误的问题 (#5412)

Refs #5404
pull/5425/head
ssongliu 6 months ago committed by GitHub
parent ff549a4793
commit 05e62a6f94
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -827,12 +827,12 @@ const message = {
perMonth: '', perMonth: '',
perWeek: '', perWeek: '',
perHour: '', perHour: '',
perNDay: ' N ', perNDay: ' N ',
perDay: '', perDay: '',
perNHour: ' N ', perNHour: ' N ',
perNMinute: ' N ', perNMinute: ' N ',
perNSecond: ' N ', perNSecond: ' N ',
per: '', per: '每',
handle: '', handle: '',
day: '日', day: '日',
monday: '', monday: '',

@ -828,12 +828,12 @@ const message = {
perMonth: '', perMonth: '',
perWeek: '', perWeek: '',
perHour: '', perHour: '',
perNDay: ' N ', perNDay: ' N ',
perDay: '', perDay: '',
perNHour: ' N ', perNHour: ' N ',
perNMinute: ' N ', perNMinute: ' N ',
perNSecond: ' N ', perNSecond: ' N ',
per: '', per: '每',
handle: '', handle: '',
day: '日', day: '日',
monday: '', monday: '',

@ -92,12 +92,10 @@ export function transObjToSpec(specType: string, week, day, hour, minute, second
case 'perWeek': case 'perWeek':
return `${minute} ${hour} * * ${week}`; return `${minute} ${hour} * * ${week}`;
case 'perNDay': case 'perNDay':
day = Number(day) + 1 + '';
return `${minute} ${hour} */${day} * *`; return `${minute} ${hour} */${day} * *`;
case 'perDay': case 'perDay':
return `${minute} ${hour} * * *`; return `${minute} ${hour} * * *`;
case 'perNHour': case 'perNHour':
hour = Number(hour) + 1 + '';
return `${minute} */${hour} * * *`; return `${minute} */${hour} * * *`;
case 'perHour': case 'perHour':
return `${minute} * * * *`; return `${minute} * * * *`;
@ -141,13 +139,13 @@ export function transSpecToObj(spec: string) {
} }
if (specs[1].indexOf('*/') !== -1) { if (specs[1].indexOf('*/') !== -1) {
specItem.specType = 'perNHour'; specItem.specType = 'perNHour';
specItem.hour = Number(specs[1].replaceAll('*/', '')) - 1; specItem.hour = Number(specs[1].replaceAll('*/', ''));
return specItem; return specItem;
} }
specItem.hour = Number(specs[1]); specItem.hour = Number(specs[1]);
if (specs[2].indexOf('*/') !== -1) { if (specs[2].indexOf('*/') !== -1) {
specItem.specType = 'perNDay'; specItem.specType = 'perNDay';
specItem.day = Number(specs[2].replaceAll('*/', '')) - 1; specItem.day = Number(specs[2].replaceAll('*/', ''));
return specItem; return specItem;
} }
if (specs[2] !== '*') { if (specs[2] !== '*') {

Loading…
Cancel
Save