From 7c2fd421ce84a7ef8b9d611b84fa9e2f4ba3efaf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 08 八月 2019 19:42:56 +0800
Subject: [PATCH] 测试比对进程
---
go.sum | 8 ++------
go.mod | 4 ++--
ruleserver/readyDataForRule.go | 8 ++++----
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/go.mod b/go.mod
index 3876b4b..7e55bd2 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@
require (
basic.com/dbapi.git v0.0.0-20190724082851-b6ae90344405
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48
- basic.com/pubsub/protomsg.git v0.0.0-20190726110245-a9a6b404a78e
+ basic.com/pubsub/protomsg.git v0.0.0-20190801122504-ad6c105f7a2b
basic.com/pubsub/sdkcompare.git v0.0.0-20190715013640-f536a4647d00
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28
@@ -25,5 +25,5 @@
gocv.io/x/gocv v0.20.0
golang.org/x/net v0.0.0-20190603091049-60506f45cf65 // indirect
golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed // indirect
- nanomsg.org/go-mangos v1.4.0 // indirect
+ nanomsg.org/go-mangos v1.4.0
)
diff --git a/go.sum b/go.sum
index e4836bc..e5cf3ce 100644
--- a/go.sum
+++ b/go.sum
@@ -8,12 +8,8 @@
basic.com/pubsub/cache.git v0.0.0-20190718024458-be52360c4814/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 h1:BBA30Rgljn6MRieC4gUncETJDyna3ObyubTo9HEQ2M0=
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
-basic.com/pubsub/protomsg.git v0.0.0-20190722020214-73680afe2ba3 h1:qgY1QFopeLa24Q9LGToXAVkbU9+QUMLzTxRsYur0tgs=
-basic.com/pubsub/protomsg.git v0.0.0-20190722020214-73680afe2ba3/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
-basic.com/pubsub/protomsg.git v0.0.0-20190724081647-e1995f9a80e8 h1:hZYUcHcivGiofP3mGUWOOv6zKFAQp1V2uAkhjAXFfys=
-basic.com/pubsub/protomsg.git v0.0.0-20190724081647-e1995f9a80e8/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
-basic.com/pubsub/protomsg.git v0.0.0-20190726110245-a9a6b404a78e h1:uea7U8fNeQr4TMQgTYjW99NrmZRCCzpfERBZ8/WCqkI=
-basic.com/pubsub/protomsg.git v0.0.0-20190726110245-a9a6b404a78e/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20190801122504-ad6c105f7a2b h1:2eskhTo22eo07AmAj3xVo31U/+qRFf6P1qhlfxoaFOc=
+basic.com/pubsub/protomsg.git v0.0.0-20190801122504-ad6c105f7a2b/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/sdkcompare.git v0.0.0-20190715013640-f536a4647d00 h1:sK+Tx7rvM9J2WnNIwrzMDjZSylWiKNfQO0prUBfKsDk=
basic.com/pubsub/sdkcompare.git v0.0.0-20190715013640-f536a4647d00/go.mod h1:8by33F9E1w17Pw/rDgJGJXAo122w0wDENG14hiMS+RE=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051 h1:9flC2o3kasaM2Y6I+mY+mxmve/pyAY/UzGQZLT3lFHM=
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 9a1cb7c..4ef37a0 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -175,15 +175,15 @@
Source:false,
}
bytes := Push("tcp://192.168.1.182:40010",comArg,sock)
- var m map[string]float32
- err1 := json.Unmarshal(bytes, &m)
+ var scResult protomsg.SdkCompareResult
+ err1 := proto.Unmarshal(bytes, &scResult)
if err1 != nil {
logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
}
//logger.Info("----------------------------------------map鏄�", m)
ids := []string{}
- for key, _ := range m {
- ids = append(ids, key)
+ for _,key := range scResult.CompareResult {
+ ids = append(ids, key.Id)
}
logger.Info("------------------------------------------------------------------------------------------------------------------------")
//logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
--
Gitblit v1.8.0