Merge pull request #20 from skyhackvip/optimize/1

define const

.gitignore

@@ -0,0 +1,2 @@
+tags
+dist/

configs/config.go

@@ -37,13 +37,6 @@ type AppConf struct {
 	DslLoadPath   string `yaml:"DslLoadPath"`
 }
 
-//策略
-type Strategy struct {
-	Name     string `yaml:"name"`
-	Priority int    `yaml:"priority"` //越大越优先
-	Score    int    `yaml:"score"`    //策略分
-}
-
 func LoadConfig(path string) (*Conf, error) {
 	conf := new(Conf)
 	file, err := ioutil.ReadFile(path)
@@ -57,8 +50,17 @@ func LoadConfig(path string) (*Conf, error) {
 	return conf, nil
 }
 
+//策略
+type Strategy struct {
+	Name     string `yaml:"name"`
+	Priority int    `yaml:"priority"` //越大越优先
+	Score    int    `yaml:"score"`    //策略分
+}
+
+//keywords for execute
 const (
-	CONSOLE = "console"
-	FILE    = "file"
-	DB      = "db"
+	CONSOLE  = "console"
+	FILE     = "file"
+	DB       = "db"
+	PARALLEL = "parallel"
 )

configs/const.go

@@ -118,8 +118,8 @@ const (
 	RULESET        = "ruleset"
 	ABTEST         = "abtest"
 	CONDITIONAL    = "conditional"
-	DECISIONTREE   = "decisiontree"
-	DECISIONMATRIX = "decisionmatrix"
+	DECISIONTREE   = "tree"
+	DECISIONMATRIX = "matrix"
 	SCORECARD      = "scorecard"
 )
 

core/inode.go

@@ -12,6 +12,10 @@
 //
 package core
 
+import (
+	"github.com/skyhackvip/risk_engine/configs"
+)
+
 //各类型节点实现该接口
 type INode interface {
 	GetName() string
@@ -51,29 +55,29 @@ const (
 )
 
 var nodeStrMap = map[NodeType]string{
-	TypeStart:       "start",
-	TypeEnd:         "end",
-	TypeRuleset:     "ruleset",
-	TypeAbtest:      "abtest",
-	TypeConditional: "conditional",
-	TypeTree:        "tree",
-	TypeMatrix:      "matrix",
-	TypeScorecard:   "scorecard",
+	TypeStart:       configs.START,
+	TypeEnd:         configs.END,
+	TypeRuleset:     configs.RULESET,
+	TypeAbtest:      configs.ABTEST,
+	TypeConditional: configs.CONDITIONAL,
+	TypeTree:        configs.DECISIONTREE,
+	TypeMatrix:      configs.DECISIONMATRIX,
+	TypeScorecard:   configs.SCORECARD,
 }
 
 func (nodeType NodeType) String() string {
 	return nodeStrMap[nodeType]
 }
 
 var nodeTypeMap map[string]NodeType = map[string]NodeType{
-	"start":       TypeStart,
-	"end":         TypeEnd,
-	"ruleset":     TypeRuleset,
-	"abtest":      TypeAbtest,
-	"conditional": TypeConditional,
-	"tree":        TypeTree,
-	"matrix":      TypeMatrix,
-	"scorecard":   TypeScorecard,
+	configs.START:          TypeStart,
+	configs.END:            TypeEnd,
+	configs.RULESET:        TypeRuleset,
+	configs.ABTEST:         TypeAbtest,
+	configs.CONDITIONAL:    TypeConditional,
+	configs.DECISIONTREE:   TypeTree,
+	configs.DECISIONMATRIX: TypeMatrix,
+	configs.SCORECARD:      TypeScorecard,
 }
 
 func GetNodeType(name string) NodeType {

core/matrix.go

@@ -70,7 +70,7 @@ func (matrixNode MatrixNode) Parse(ctx *PipelineContext) (*NodeResult, error) {
 	var xResult string
 	var yResult string
 
-	if matrixNode.ExecPlan == "parallel" { //并发分组执行
+	if matrixNode.ExecPlan == configs.PARALLEL { //并发分组执行
 		ruleMap := make(map[string][]Rule)
 		for _, rule := range matrixNode.Rules {
 			if rule.Kind == configs.MATRIXX {

core/ruleset.go

@@ -58,7 +58,7 @@ func (rulesetNode RulesetNode) Parse(ctx *PipelineContext) (*NodeResult, error)
 	//ruleset 批量调用特征
 	depends := ctx.GetFeatures(info.Depends)
 
-	if rulesetNode.ExecPlan == "parallel" { //并发执行规则
+	if rulesetNode.ExecPlan == configs.PARALLEL { //并发执行规则
 		var wg sync.WaitGroup
 		var mu sync.Mutex
 		for _, rule := range rulesetNode.Rules {