From 5e1c7983086edbfc5a64412973439409f0e81268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AD=90=E9=BE=99?= <chenzilong@wodcloud.com>
Date: Fri, 7 Jul 2023 10:39:53 +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/service/task_manage.go | 44 ++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/service/task_manage.go b/src/service/task_manage.go
index 4c71ee6..07b0a04 100644
--- a/src/service/task_manage.go
+++ b/src/service/task_manage.go
@@ -5,8 +5,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/ghodss/yaml"
-	json "github.com/json-iterator/go"
 	"github.com/minio/minio-go/v7"
 	"gitlab.wodcloud.com/smart-operation/so-operation-api/src/bean/entity"
 	"gitlab.wodcloud.com/smart-operation/so-operation-api/src/bean/vo/request"
@@ -203,27 +201,27 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data map[string]i
 		}
 		req.Script = string(obj)
 	}
-	var scripts []map[string]interface{}
-	var script map[string]interface{}
-	j2, err := yaml.YAMLToJSON([]byte(req.Script))
-	if err != nil {
-		return nil, resp.YamlAnalysisError.WithError(err)
-	}
-	err = json.Unmarshal(j2, &scripts)
-	if err != nil {
-		return nil, resp.MarshalError.WithError(errors.New("yaml格式错误"))
-	}
-	script = scripts[0]
-	script["host"] = fmt.Sprintf("%s%d", AnsibleGroup, req.HostGroupId)
-	j, err := json.Marshal(script)
-	if err != nil {
-		return nil, resp.MarshalError.WithError(err)
-	}
-	y, err := yaml.JSONToYAML(j)
-	if err != nil {
-		return nil, resp.YamlAnalysisError.WithError(err)
-	}
-	req.Script = string(y)
+	//var scripts []map[string]interface{}
+	//var script map[string]interface{}
+	//j2, err := yaml.YAMLToJSON([]byte(req.Script))
+	//if err != nil {
+	//	return nil, resp.YamlAnalysisError.WithError(err)
+	//}
+	//err = json.Unmarshal(j2, &scripts)
+	//if err != nil {
+	//	return nil, resp.MarshalError.WithError(errors.New("yaml格式错误"))
+	//}
+	//script = scripts[0]
+	//script["host"] = fmt.Sprintf("%s%d", AnsibleGroup, req.HostGroupId)
+	//j, err := json.Marshal(script)
+	//if err != nil {
+	//	return nil, resp.MarshalError.WithError(err)
+	//}
+	//y, err := yaml.JSONToYAML(j)
+	//if err != nil {
+	//	return nil, resp.YamlAnalysisError.WithError(err)
+	//}
+	//req.Script = string(y)
 	//写入执行脚本
 	f2, err := os.Create("/etc/ansible/ansible.yml")
 	if err != nil {
-- 
2.26.0