From 86422aa8581159c0a6a960b7bcf40fdb10996d85 Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期五, 02 八月 2019 19:56:34 +0800 Subject: [PATCH] --- --- insertdata/insertDataToEs.go | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go index c688f04..f6edd79 100644 --- a/insertdata/insertDataToEs.go +++ b/insertdata/insertDataToEs.go @@ -166,6 +166,7 @@ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 { logger.Info("寰�ES鎻掍汉鑴告暟鎹�") faces := PutFace(msg) + logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces) if faces != nil { for _,face := range faces { // 涓婁紶澶у浘 @@ -269,11 +270,10 @@ } // 褰掔疆浜鸿劯 -func PutFace(msg ruleserver.ResultMsg) []FaceAndRules{ +func PutFace(msg ruleserver.ResultMsg) []*FaceAndRules{ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 { logger.Info("鏁寸悊浜鸿劯鏁版嵁") - os.Exit(1) - faces := []FaceAndRules{} + faces := []*FaceAndRules{} for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) { hebingFace(faces, faceResult) } @@ -282,7 +282,7 @@ return nil } } -func hebingFace(faces []FaceAndRules, faceResult ruleserver.FaceResult) { +func hebingFace(faces []*FaceAndRules, faceResult ruleserver.FaceResult){ for _, arg := range faceResult.Args { // 鎷垮埌姣忎竴寮犱汉鑴� flag := false @@ -292,10 +292,11 @@ face.rules = append(face.rules,faceResult.Result) } } - if flag { - faces = append(faces, FaceAndRules{arg, []ruleserver.Result{faceResult.Result}}) + if !flag { + faces = append(faces, &FaceAndRules{arg, []ruleserver.Result{faceResult.Result}}) } } + logger.Info("鏁寸悊涓殑鏁版嵁",faces) } // 寰�es涓彃鍏olo鏁版嵁 -- Gitblit v1.8.0