From 7ede4b8a1c123f6fc0463ce636944ec19a5df48e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AD=90=E9=BE=99?= Date: Mon, 10 Jul 2023 17:32:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8E=86=E5=8F=B2=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bean/vo/response/task_history.go | 1 + src/service/task_history.go | 2 +- src/service/task_manage.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bean/vo/response/task_history.go b/src/bean/vo/response/task_history.go index 87bc00e..5a33cd2 100644 --- a/src/bean/vo/response/task_history.go +++ b/src/bean/vo/response/task_history.go @@ -25,6 +25,7 @@ type TaskInfoListRes struct { type TaskExecLogRes struct { Id int `json:"id"` // 主键id + TaskId int `json:"task_id"` // 任务id ExecDesc string `json:"exec_desc"` // 执行说明 TaskName string `json:"task_name"` // 任务名称 ExecStartTime time.Time `json:"exec_start_time" ` // 执行开始时间 diff --git a/src/service/task_history.go b/src/service/task_history.go index a47a9ab..2870ca3 100644 --- a/src/service/task_history.go +++ b/src/service/task_history.go @@ -123,7 +123,7 @@ func (t *TaskHistorySvc) TaskExecLog(id int) (taskExecLogRes response.TaskExecLo //查询 _, err = db.Table("task_history").Alias("th").Where("id = ?", id). - Select("th.id,th.exec_desc,(select tm.task_name from task_manage tm where th.task_id = tm.id and tm.is_delete = 0) as task_name," + + Select("th.id,th.task_id,th.exec_desc,(select tm.task_name from task_manage tm where th.task_id = tm.id and tm.is_delete = 0) as task_name," + "th.exec_start_time,th.exec_end_time,th.state,th.exec_log").Get(&taskExecLogRes) if err != nil { err = resp.DbSelectError.WithError(err) diff --git a/src/service/task_manage.go b/src/service/task_manage.go index acf3640..83d4d6f 100644 --- a/src/service/task_manage.go +++ b/src/service/task_manage.go @@ -250,7 +250,7 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq, script string) (id if req.Value != "" { cmd = exec.Command("ansible-playbook", "/etc/ansible/ansible.yml", "--extra-vars", req.Value) } else { - cmd = exec.Command("ansible-playbook", "/etc/ansible/ansible.yml") + cmd = exec.Command("ansible-playbook", "/etc/ansible/ansible.yml", "--extra-vars", "{\"hosts\":\""+"cc"+"\"}") } //捕获正常日志 stdout, err := cmd.StdoutPipe() -- 2.26.0