修改项目结构

pipeline/component/component.go

@@ -2,7 +2,7 @@ package component
 
 import (
 	"errors"
-	"git.sxidc.com/go-tools/utils/strutils"
+	"strings"
 	"sync"
 )
 
@@ -26,7 +26,7 @@ func RegisterComponentBuilders(builders ...Builder) error {
 
 	for _, builder := range builders {
 		nodeType := builder.ProductType()
-		if strutils.IsStringEmpty(nodeType) {
+		if strings.TrimSpace(nodeType) == "" {
 			return errors.New("节点类型名称不能为空")
 		}
 
@@ -52,11 +52,11 @@ func UnRegisterComponents(typeNames []string) {
 }
 
 func BuildComponent(typeName string, name string, buildParams map[string]any, runParams map[string]any) (Component, error) {
-	if strutils.IsStringEmpty(typeName) {
+	if strings.TrimSpace(typeName) == "" {
 		return nil, errors.New("没有传递类型名称")
 	}
 
-	if strutils.IsStringEmpty(name) {
+	if strings.TrimSpace(name) == "" {
 		return nil, errors.New("没有传递名称")
 	}
 

pipeline/component/flow/flow.go

@@ -3,7 +3,7 @@ package flow
 import (
 	"errors"
 	"git.sxidc.com/go-tools/utils/pipeline/component"
-	"git.sxidc.com/go-tools/utils/strutils"
+	"strings"
 )
 
 type SubComponentBuildParams struct {
@@ -14,11 +14,11 @@ type SubComponentBuildParams struct {
 }
 
 func (params *SubComponentBuildParams) Check(parentNodeType string) error {
-	if strutils.IsStringEmpty(params.Type) {
+	if strings.TrimSpace(params.Type) == "" {
 		return errors.New(parentNodeType + "没有传递子节点类型")
 	}
 
-	if strutils.IsStringEmpty(params.Name) {
+	if strings.TrimSpace(params.Name) == "" {
 		return errors.New(parentNodeType + "没有传递子节点名称")
 	}
 

pipeline/definition.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"git.sxidc.com/go-tools/utils/pipeline/component"
 	"git.sxidc.com/go-tools/utils/pipeline/component/flow"
-	"git.sxidc.com/go-tools/utils/strutils"
 	"github.com/fatih/structs"
+	"strings"
 )
 
 type Definition struct {
@@ -14,7 +14,7 @@ type Definition struct {
 }
 
 func (def *Definition) Check() error {
-	if strutils.IsStringEmpty(def.Name) {
+	if strings.TrimSpace(def.Name) == "" {
 		return errors.New("流水线没有传递名称")
 	}
 
@@ -40,11 +40,11 @@ type ComponentDefinition struct {
 }
 
 func (def *ComponentDefinition) Check() error {
-	if strutils.IsStringEmpty(def.Type) {
+	if strings.TrimSpace(def.Type) == "" {
 		return errors.New("组件没有传递类型")
 	}
 
-	if strutils.IsStringEmpty(def.Name) {
+	if strings.TrimSpace(def.Name) == "" {
 		return errors.New("组件没有传递名称")
 	}
 
@@ -78,7 +78,7 @@ func (def *Definition) NewPipeline() (*Pipeline, error) {
 }
 
 func newPipelineWithBuildParams(name string, params *flow.SeqBuildParams) (*Pipeline, error) {
-	if strutils.IsStringEmpty(name) {
+	if strings.TrimSpace(name) == "" {
 		return nil, errors.New("没有传递流水线的名称")
 	}
 

pipeline/pipeline.go

@@ -5,9 +5,9 @@ import (
 	"git.sxidc.com/go-tools/utils/fileutils"
 	"git.sxidc.com/go-tools/utils/pipeline/component"
 	"git.sxidc.com/go-tools/utils/pipeline/component/flow"
-	"git.sxidc.com/go-tools/utils/strutils"
 	"gopkg.in/yaml.v3"
 	"os"
+	"strings"
 )
 
 func init() {
@@ -43,7 +43,7 @@ func (p *Pipeline) Run(globalRunParams map[string]any, dynamicParams map[string]
 }
 
 func NewPipelineFromYaml(yamlPath string) (*Pipeline, error) {
-	if strutils.IsStringEmpty(yamlPath) {
+	if strings.TrimSpace(yamlPath) == "" {
 		return nil, errors.New("没有传递流水线定义文件")
 	}
 
@@ -66,7 +66,7 @@ func NewPipelineFromYaml(yamlPath string) (*Pipeline, error) {
 }
 
 func NewPipelineFromYamlStr(yamlStr string) (*Pipeline, error) {
-	if strutils.IsStringEmpty(yamlStr) {
+	if strings.TrimSpace(yamlStr) == "" {
 		return nil, errors.New("没有传递流水线定义")
 	}
 
@@ -80,7 +80,7 @@ func NewPipelineFromYamlStr(yamlStr string) (*Pipeline, error) {
 }
 
 func LoadDynamicParamsFromYaml(yamlPath string) (map[string]any, error) {
-	if strutils.IsStringEmpty(yamlPath) {
+	if strings.TrimSpace(yamlPath) == "" {
 		return nil, errors.New("没有传递流水线动态参数文件不存在")
 	}
 
@@ -103,7 +103,7 @@ func LoadDynamicParamsFromYaml(yamlPath string) (map[string]any, error) {
 }
 
 func LoadDynamicParamsFromYamlStr(yamlStr string) (map[string]any, error) {
-	if strutils.IsStringEmpty(yamlStr) {
+	if strings.TrimSpace(yamlStr) == "" {
 		return nil, errors.New("没有传递流水线动态参数不存在")
 	}
 

pipeline/test/test_node/bool.go

@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 	"git.sxidc.com/go-tools/utils/pipeline/component"
-	"git.sxidc.com/go-tools/utils/strutils"
 	"github.com/mitchellh/mapstructure"
 	"math/rand"
+	"strings"
 )
 
 const (
@@ -38,7 +38,7 @@ func (n *BoolNode) Run(globalRunParams *component.GlobalRunParams, dynamicParams
 				return nil, errors.New(TypeBool + "节点运行时参数Decode失败: " + err.Error())
 			}
 
-			if strutils.IsStringEmpty(params.Operation) {
+			if strings.TrimSpace(params.Operation) == "" {
 				params.Operation = BoolOperationPass
 			}
 

yaml/yaml.go → yaml/yaml_loader/yaml_loader.go

@@ -1,4 +1,4 @@
-package yaml
+package yaml_loader
 
 import (
 	"bytes"

yaml/yaml_test.go → yaml/yaml_loader/yaml_loader_test.go

@@ -1,4 +1,4 @@
-package yaml
+package yaml_loader
 
 import (
 	"os"