From 79150d861587919a35b7b0363760155d91408e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E7=81=BF?= <weican@bd-apaas.com>
Date: Tue, 27 Jun 2023 17:27:12 +0800
Subject: [PATCH] =?UTF-8?q?form=20yml=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bean/vo/request/task_manage.go | 8 ++++----
 src/controller/task_manage.go      | 7 +------
 src/service/task_manage.go         | 4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/bean/vo/request/task_manage.go b/src/bean/vo/request/task_manage.go
index 5ac9ecb..36b50c2 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 607c0b9..eae8a7b 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 fd6ca07..00baa8b 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 {
-- 
2.26.0