diff --git a/src/bean/vo/request/task_manage.go b/src/bean/vo/request/task_manage.go index 5ac9ecb31ade30306aaad02b26fc9d4c767ac6fd..36b50c2d3974de4eb54b87a0d2db3ae29e56b231 100644 --- a/src/bean/vo/request/task_manage.go +++ b/src/bean/vo/request/task_manage.go @@ -32,8 +32,8 @@ type ListTaskManageReq struct { } type ExecScriptReq struct { - HostGroupId int `json:"host_group_id" vd:"$>0;msg:'请输入主机分组id'"` //主机分组id - Type int `json:"type"` //脚本额外变量类型1yaml 2json - Value string `json:"value"` //脚本额外变量值 - Script string `json:"script"` //执行脚本 + HostGroupId int `form:"host_group_id" vd:"$>0;msg:'请输入主机分组id'"` //主机分组id + Type int `form:"type"` //脚本额外变量类型1yaml 2json + Value string `form:"value"` //脚本额外变量值 + Script string `form:"script"` //执行脚本 } diff --git a/src/controller/task_manage.go b/src/controller/task_manage.go index 607c0b94747c1d53519273330027e73de82fb870..eae8a7b8a8a186ca35f0823b7a69855ef6192d5a 100644 --- a/src/controller/task_manage.go +++ b/src/controller/task_manage.go @@ -119,12 +119,7 @@ func ListTaskManage(c *gin.Context) { func ExecScript(c *gin.Context) { var req request.ExecScriptReq - if err := c.ShouldBindJSON(&req); err != nil { - SendJsonResponse(c, resp.InvalidParam.WithError(err), nil) - return - } - //参数校验 - if err := util.ValidateSimple(req, "HostManageId"); 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 fd6ca070ae29da87300b7c69f58fb5312dad73cb..00baa8bfad0177bbce23df70feca711218a39547 100644 --- a/src/service/task_manage.go +++ b/src/service/task_manage.go @@ -194,9 +194,9 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data interface{}, } var cmd *exec.Cmd if req.Value != "" { - cmd = exec.Command("ansible", "-i", "/etc/ansible/hosts", "/etc/ansible/ansible.yml", "--extra-vars", req.Value) + cmd = exec.Command("ansible-playbook", "-i", "/etc/ansible/hosts", "/etc/ansible/ansible.yml", "--extra-vars", req.Value) } else { - cmd = exec.Command("ansible", "-i", "/etc/ansible/hosts", "/etc/ansible/ansible.yml") + cmd = exec.Command("ansible-playbook", "-i", "/etc/ansible/hosts", "/etc/ansible/ansible.yml") } output, err := cmd.Output() if err != nil {