diff --git a/src/service/task_manage.go b/src/service/task_manage.go index 4c71ee6ce31b558e0c5a92910f43d9dab9546947..07b0a04fd27fc60eaedd4c71cc7a5981dccafd6e 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 {