From f12500f6992defb2481d5977e3bddb22328e3e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AD=90=E9=BE=99?= Date: Fri, 7 Jul 2023 16:42:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E8=BF=90=E7=BB=B4?= =?UTF-8?q?=20=E7=AB=8B=E5=8D=B3=E6=89=A7=E8=A1=8C=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bean/vo/request/task_manage.go | 10 +++++----- src/controller/task_manage.go | 2 +- src/service/task_manage.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bean/vo/request/task_manage.go b/src/bean/vo/request/task_manage.go index 29bfaf2..621d422 100644 --- a/src/bean/vo/request/task_manage.go +++ b/src/bean/vo/request/task_manage.go @@ -33,10 +33,10 @@ type ListTaskManageReq struct { } type ExecScriptReq struct { - TaskId int `json:"task_id" binding:"required"` //主机分组id + TaskId int `form:"task_id" binding:"required"` //主机分组id HostGroupId int `form:"host_group_id" binding:"required"` //主机分组id - Type int `json:"type" binding:"oneof=1 2"` //脚本额外变量类型1yaml 2json - Value string `json:"value"` //脚本额外变量值 - Script string `json:"script"` //执行脚本 - YmlFileName string `json:"yml_file_name"` //执行脚本url + Type int `form:"type" binding:"oneof=1 2"` //脚本额外变量类型1yaml 2json + Value string `form:"value"` //脚本额外变量值 + Script string `form:"script"` //执行脚本 + YmlFileName string `form:"yml_file_name"` //执行脚本url } diff --git a/src/controller/task_manage.go b/src/controller/task_manage.go index 7cb1001..a508b32 100644 --- a/src/controller/task_manage.go +++ b/src/controller/task_manage.go @@ -123,7 +123,7 @@ func ListTaskManage(c *gin.Context) { func ExecScript(c *gin.Context) { var req request.ExecScriptReq - if err := c.ShouldBindJSON(&req); err != nil { + if err := c.ShouldBind(&req); err != nil { SendJsonResponse(c, resp.InvalidParam.WithError(err), nil) return } diff --git a/src/service/task_manage.go b/src/service/task_manage.go index 67fa7ad..0f74238 100644 --- a/src/service/task_manage.go +++ b/src/service/task_manage.go @@ -232,7 +232,7 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (err error) { //新增任务历史 id, err := AddExecHistory(request.AddExecHistory{ TaskId: req.TaskId, - CreateUser: t.User.SystemAccount, + CreateUser: "", }) if err != nil { return -- 2.26.0