admin/TaskPool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: cron task support seconds

Browse Source
This commit is contained in:
engigu
2025-12-21 10:59:13 +08:00
parent 2ae53f0ac7
commit f0beb8a654
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/services/cron_service.go
+4 -6
View File
@@ -22,10 +22,8 @@ type CronService struct {
// NewCronService creates a new cron service // NewCronService creates a new cron service
func NewCronService(taskService *TaskService, executorService *ExecutorService) *CronService { func NewCronService(taskService *TaskService, executorService *ExecutorService) *CronService {
// 使用秒级精度的 cron parser，支持 5 位和 6 位表达式 // 使用秒级精度的 cron parser，支持 6 位表达式（秒 分 时 日 月 周）
c := cron.New(cron.WithParser(cron.NewParser( c := cron.New(cron.WithSeconds())
cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow | cron.Descriptor,
)))
return &CronService{ return &CronService{
cron: c, cron: c,
@@ -135,9 +133,9 @@ func (cs *CronService) updateNextRun(taskID uint) {
} }
} }
// ValidateCron validates a cron expression // ValidateCron validates a cron expression (6 fields: second minute hour day month weekday)
func (cs *CronService) ValidateCron(expression string) error { func (cs *CronService) ValidateCron(expression string) error {
parser := cron.NewParser(cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow | cron.Descriptor) parser := cron.NewParser(cron.Second | cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow | cron.Descriptor)
_, err := parser.Parse(expression) _, err := parser.Parse(expression)
return err return err
} }
web/src/views/tasks/Tasks.vue
+15 -10
View File
@@ -26,13 +26,15 @@ const total = ref(0)
let searchTimer: ReturnType<typeof setTimeout> | null = null let searchTimer: ReturnType<typeof setTimeout> | null = null
const cronPresets = [ const cronPresets = [
{ label: '每分钟', value: '* * * * *' }, { label: '每5秒', value: '*/5 * * * * *' },
{ label: '每5分钟', value: '*/5 * * * *' }, { label: '每30秒', value: '*/30 * * * * *' },
{ label: '每小时', value: '0 * * * *' }, { label: '每分钟', value: '0 * * * * *' },
{ label: '每天0点', value: '0 0 * * *' }, { label: '每5分钟', value: '0 */5 * * * *' },
{ label: '每天8点', value: '0 8 * * *' }, { label: '每小时', value: '0 0 * * * *' },
{ label: '每周一', value: '0 0 * * 1' }, { label: '每天0点', value: '0 0 0 * * *' },
{ label: '每月1号', value: '0 0 1 * *' }, { label: '每天8点', value: '0 0 8 * * *' },
{ label: '每周一', value: '0 0 0 * * 1' },
{ label: '每月1号', value: '0 0 0 1 * *' },
] ]
async function loadTasks() { async function loadTasks() {
@@ -57,7 +59,7 @@ function handlePageChange(page: number) {
} }
function openCreate() { function openCreate() {
editingTask.value = { name: '', command: '', schedule: '0 * * * *', timeout: 30, enabled: true } editingTask.value = { name: '', command: '', schedule: '0 * * * * *', timeout: 30, enabled: true }
isEdit.value = false isEdit.value = false
showDialog.value = true showDialog.value = true
} }
@@ -195,11 +197,13 @@ onMounted(loadTasks)
</div> </div>
<div class="grid grid-cols-4 items-center gap-4"> <div class="grid grid-cols-4 items-center gap-4">
<Label class="text-right">定时规则</Label> <Label class="text-right">定时规则</Label>
<Input v-model="editingTask.schedule" placeholder="0 * * * *" class="col-span-3 font-mono" /> <Input v-model="editingTask.schedule" placeholder="0 * * * * *" class="col-span-3 font-mono" />
</div> </div>
<div class="grid grid-cols-4 items-start gap-4"> <div class="grid grid-cols-4 items-start gap-4">
<span></span> <span></span>
<div class="col-span-3 flex flex-wrap gap-1.5"> <div class="col-span-3">
<p class="text-xs text-muted-foreground mb-2">格式: 秒 分 时 日 月 周</p>
<div class="flex flex-wrap gap-1.5">
<span <span
v-for="preset in cronPresets" v-for="preset in cronPresets"
:key="preset.value" :key="preset.value"
@@ -208,6 +212,7 @@ onMounted(loadTasks)
> >
{{ preset.label }} {{ preset.label }}
</span> </span>
</div>
</div> </div>
</div> </div>
<div class="grid grid-cols-4 items-center gap-4"> <div class="grid grid-cols-4 items-center gap-4">