feat: add startup task and fix backup import
This commit is contained in:
@@ -416,6 +416,10 @@ func (es *ExecutorService) StopCron() {
|
||||
|
||||
// AddCronTask 添加计划任务
|
||||
func (es *ExecutorService) AddCronTask(task *models.Task) error {
|
||||
if task.TriggerType != constant.TriggerTypeCron {
|
||||
es.RemoveCronTask(task.ID) // 如果不是cron类型,确保从调度器移除
|
||||
return nil
|
||||
}
|
||||
return es.cronManager.AddTask(task)
|
||||
}
|
||||
|
||||
@@ -439,8 +443,19 @@ func (es *ExecutorService) loadCronTasks() {
|
||||
tasks := es.taskService.GetTasks()
|
||||
count := 0
|
||||
for _, task := range tasks {
|
||||
// 只调度本地任务(agent_id 为空或 0)
|
||||
if task.Enabled && (task.AgentID == nil || *task.AgentID == 0) {
|
||||
if !task.Enabled {
|
||||
continue
|
||||
}
|
||||
|
||||
if task.TriggerType == constant.TriggerTypeBaihuStartup {
|
||||
go func(t models.Task) {
|
||||
// 延迟一点时间再触发,确保系统完全启动
|
||||
time.Sleep(3 * time.Second)
|
||||
logger.Infof("[Executor] 触发开机服务启动任务 #%d: %s", t.ID, t.Name)
|
||||
es.ExecuteTask(int(t.ID), nil)
|
||||
}(task)
|
||||
} else if task.TriggerType == constant.TriggerTypeCron && task.Schedule != "" && (task.AgentID == nil || *task.AgentID == 0) {
|
||||
// 只调度本地任务(agent_id 为空或 0)的定时任务
|
||||
err := es.cronManager.AddTask(&task)
|
||||
if err != nil {
|
||||
continue
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package tasks
|
||||
|
||||
import (
|
||||
"github.com/engigu/baihu-panel/internal/constant"
|
||||
"github.com/engigu/baihu-panel/internal/database"
|
||||
"github.com/engigu/baihu-panel/internal/models"
|
||||
)
|
||||
@@ -11,14 +12,18 @@ func NewTaskService() *TaskService {
|
||||
return &TaskService{}
|
||||
}
|
||||
|
||||
func (ts *TaskService) CreateTask(name, command, schedule string, timeout int, workDir, cleanConfig, envs, taskType, config string, agentID *uint, languages []map[string]string) *models.Task {
|
||||
func (ts *TaskService) CreateTask(name, command, schedule string, timeout int, workDir, cleanConfig, envs, taskType, config string, agentID *uint, languages []map[string]string, triggerType string) *models.Task {
|
||||
if taskType == "" {
|
||||
taskType = "task"
|
||||
}
|
||||
if triggerType == "" {
|
||||
triggerType = constant.TriggerTypeCron
|
||||
}
|
||||
task := &models.Task{
|
||||
Name: name,
|
||||
Command: command,
|
||||
Type: taskType,
|
||||
TriggerType: triggerType,
|
||||
Config: config,
|
||||
Schedule: schedule,
|
||||
Timeout: timeout,
|
||||
@@ -29,6 +34,9 @@ func (ts *TaskService) CreateTask(name, command, schedule string, timeout int, w
|
||||
AgentID: agentID,
|
||||
Enabled: true,
|
||||
}
|
||||
if triggerType != constant.TriggerTypeCron {
|
||||
task.NextRun = nil
|
||||
}
|
||||
database.DB.Create(task)
|
||||
return task
|
||||
}
|
||||
@@ -66,7 +74,7 @@ func (ts *TaskService) GetTaskByID(id int) *models.Task {
|
||||
return &task
|
||||
}
|
||||
|
||||
func (ts *TaskService) UpdateTask(id int, name, command, schedule string, timeout int, workDir, cleanConfig, envs string, enabled bool, taskType, config string, agentID *uint, languages []map[string]string) *models.Task {
|
||||
func (ts *TaskService) UpdateTask(id int, name, command, schedule string, timeout int, workDir, cleanConfig, envs string, enabled bool, taskType, config string, agentID *uint, languages []map[string]string, triggerType string) *models.Task {
|
||||
var task models.Task
|
||||
if err := database.DB.First(&task, id).Error; err != nil {
|
||||
return nil
|
||||
@@ -84,6 +92,12 @@ func (ts *TaskService) UpdateTask(id int, name, command, schedule string, timeou
|
||||
if taskType != "" {
|
||||
task.Type = taskType
|
||||
}
|
||||
if triggerType != "" {
|
||||
task.TriggerType = triggerType
|
||||
}
|
||||
if task.TriggerType != constant.TriggerTypeCron {
|
||||
task.NextRun = nil
|
||||
}
|
||||
task.Config = config
|
||||
database.DB.Save(&task)
|
||||
return &task
|
||||
|
||||
Reference in New Issue
Block a user