From 0e28dd6942c8a7207146f6a6b542bc45f75462b0 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 16 十二月 2019 13:35:26 +0800
Subject: [PATCH] ---
---
algorithm/middleware/middleware.go | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/algorithm/middleware/middleware.go b/algorithm/middleware/middleware.go
index 1a933fd..507f864 100644
--- a/algorithm/middleware/middleware.go
+++ b/algorithm/middleware/middleware.go
@@ -73,7 +73,8 @@
//logger.Info("褰撳墠璧扮殑瑙勫垯鏄�--锛�", groupRule.Rules[j],sdkName,groupRule.Rules[j].SdkArgAlias, "---","")
for _, areaMap := range sdkData.AreaMapList {
ruleResult := CallSo(sdk.Id, groupRule.Rules[j], areaMap,lable,args,message)
- if groupRule.Rules[j].RuleWithPre == "contain" {
+ logger.Info("鍓嶇疆杩炴帴绗︼細",groupRule.Rules[j])
+ if groupRule.Rules[j].RuleWithPre == "鈯�" {
assembleDta(args,groupRule.Rules[j-1],groupRule.Rules[j])
// 鎶婂綋鍓嶅皬瑙勫垯缁撴灉缃┖
ruleResult = structure.LittleRuleResult{}
@@ -376,7 +377,7 @@
soName = "static.so"
case "812b674b-2375-4589-919a-5c1c3278a978":
soName = "plate.so"
- case "浜轰綋璺熻釜":
+ case "520af340-f257-4fe2-ac3c-695c390e53dc":
soName = "personTrack.so"
}
//soInfo,err := cache.GetSoInfoById(sdkId)
@@ -461,18 +462,19 @@
// }
//}
-func assembleData(args *structure.SdkDatas,resultSplice []*structure.LittleRuleResult,groupRule protomsg.GroupRule) {
- for index,result := range resultSplice {
- if strings.Contains(result.Result,"contain") {
- assembleDta(args,groupRule.Rules[index-1],groupRule.Rules[index])
- // 鍒犻櫎甯︽湁contain鐨勮鍒欑粨鏋�
- resultSplice = append(resultSplice[:index],resultSplice[index+1:]...)
- }
- }
-}
+//func assembleData(args *structure.SdkDatas,resultSplice []*structure.LittleRuleResult,groupRule protomsg.GroupRule) {
+// for index,result := range resultSplice {
+// if strings.Contains(result.Result,"contain") {
+// assembleDta(args,groupRule.Rules[index-1],groupRule.Rules[index])
+// // 鍒犻櫎甯︽湁contain鐨勮鍒欑粨鏋�
+// resultSplice = append(resultSplice[:index],resultSplice[index+1:]...)
+// }
+// }
+//}
// 濡傛灉瑙勫垯缁勪腑鏈夊寘鍚鍙凤紝鎶婅鍒欑粍涔嬪悗鐨勮鍒欏搴旂殑绠楁硶鍜屽尯鍩熸彁鍙栫殑鏁版嵁瑁呴厤鍒板墠闈㈠幓
func assembleDta(args *structure.SdkDatas,rule1,rule2 *protomsg.Rule) {
// 鎷垮埌鍚庨潰鐨勯偅涓尯鍩熺殑鏁版嵁
+ logger.Info("瑙﹀彂浜嗗寘鍚簨浠讹紝鎶婂悗鑰呯殑鏁版嵁缁欏埌鍓嶈��",*rule1,*rule2)
area := structure.AreaMap{}
for _, sdkData := range args.Sdkdata {
for _, areaMap := range sdkData.AreaMapList {
@@ -488,6 +490,7 @@
// 鎷垮埌鍖呭惈绗︿箣鍓嶇殑鏁版嵁锛岄亶鍘嗚閰�
for _,arg := range areaMap.FilterData {
mergeArg(arg,area)
+ logger.Info("鍚堝苟鍚庣殑arg鏄細",*arg)
}
// 娓呯┖浜鸿劯锛屼汉鑴镐笉鍐嶅崟鐙彃鍏ヤ簡
area.FilterData = nil
--
Gitblit v1.8.0