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

chore: adjust task language model serializer

Browse Source
This commit is contained in:
engigu
2026-03-25 08:57:35 +08:00
parent 70d3041f26
commit 793947f868
7 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/services/tasks/executor_service.go
+3 -3
View File
@@ -378,7 +378,7 @@ func (es *ExecutorService) HandleTaskRetry(task *models.Task, req *executor.Exec
WorkDir: latestTask.WorkDir,
Envs: newEnvs,
Timeout: latestTask.Timeout,
Languages: latestTask.Languages,
Languages: []map[string]string(latestTask.Languages),
UseMise: latestTask.UseMise(),
Type: executor.TaskTypeManual,
Metadata: executor.ExecutionMetadata{
@@ -459,7 +459,7 @@ func (es *ExecutorService) ExecuteDispatcher(ctx context.Context, req *executor.
WorkDir: req.WorkDir,
Envs: req.Envs,
Timeout: req.Timeout,
Languages: task.Languages,
Languages: []map[string]string(task.Languages),
UseMise: req.UseMise, // 使用请求中的 UseMise 标志 (由调度器统一处理过)
}, stdout, stderr, hooks)
}
@@ -596,7 +596,7 @@ func (es *ExecutorService) ExecuteTask(taskID string, extraEnvs []string) *execu
WorkDir: task.WorkDir,
Envs: envs,
Timeout: task.Timeout,
Languages: task.Languages,
Languages: []map[string]string(task.Languages),
UseMise: task.UseMise(),
Type: executor.TaskTypeManual,
}
internal/services/tasks/task_service.go
+2 -2
View File
@@ -22,7 +22,7 @@ func (ts *TaskService) GetTaskBySourceID(sourceID string) *models.Task {
return &task
}
func (ts *TaskService) CreateTask(name, command, schedule string, timeout int, workDir, cleanConfig, envs, taskType, config string, agentID *string, languages []map[string]string, triggerType string, tags string, retryCount int, retryInterval int, randomRange int, sourceID string) *models.Task {
func (ts *TaskService) CreateTask(name, command, schedule string, timeout int, workDir, cleanConfig, envs, taskType, config string, agentID *string, languages models.TaskLanguages, triggerType string, tags string, retryCount int, retryInterval int, randomRange int, sourceID string) *models.Task {
if taskType == "" {
taskType = "task"
}
@@ -99,7 +99,7 @@ func (ts *TaskService) GetTaskByID(id string) *models.Task {
return &task
}
func (ts *TaskService) UpdateTask(id string, name, command, schedule string, timeout int, workDir, cleanConfig, envs string, enabled bool, taskType, config string, agentID *string, languages []map[string]string, triggerType string, tags string, retryCount int, retryInterval int, randomRange int, sourceID string) *models.Task {
func (ts *TaskService) UpdateTask(id string, name, command, schedule string, timeout int, workDir, cleanConfig, envs string, enabled bool, taskType, config string, agentID *string, languages models.TaskLanguages, triggerType string, tags string, retryCount int, retryInterval int, randomRange int, sourceID string) *models.Task {
var task models.Task
res := database.DB.Where("id = ?", id).Limit(1).Find(&task)
if res.Error != nil || res.RowsAffected == 0 {