~jinersong/ruleprocess.git

			@@ -4,7 +4,7 @@

			require (
			basic.com/dbapi.git v0.0.0-20190701055817-73bca225181f
			basic.com/pubsub/cache.git v0.0.0-20190705102856-7ce9cb1cceda
			basic.com/pubsub/cache.git v0.0.0-20190708022451-9403e8b0eaa6
			basic.com/pubsub/protomsg.git v0.0.0-20190706093248-8cd3a0511c78
			basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
			basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28

			@@ -1,7 +1,7 @@
			basic.com/dbapi.git v0.0.0-20190701055817-73bca225181f h1:CVB4pmUXTPPFN7w/DQfU1YWg2Tp2gG93TTr1M5W86sE=
			basic.com/dbapi.git v0.0.0-20190701055817-73bca225181f/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
			basic.com/pubsub/cache.git v0.0.0-20190705102856-7ce9cb1cceda h1:lWBg00n+UPFVLXo5Wx0ZADNAj6CRMquDxN3KfrDuQ9E=
			basic.com/pubsub/cache.git v0.0.0-20190705102856-7ce9cb1cceda/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
			basic.com/pubsub/cache.git v0.0.0-20190708022451-9403e8b0eaa6 h1:SisFlsnazb3r72Ao7GejllAlx2SXNXnxigm7rfvso4w=
			basic.com/pubsub/cache.git v0.0.0-20190708022451-9403e8b0eaa6/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
			basic.com/pubsub/protomsg.git v0.0.0-20190706093248-8cd3a0511c78 h1:rjF01FTFUvFc5zj3PQ1MN17z+FVYZZQInhtzn+vhMSk=
			basic.com/pubsub/protomsg.git v0.0.0-20190706093248-8cd3a0511c78/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
			basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051 h1:9flC2o3kasaM2Y6I+mY+mxmve/pyAY/UzGQZLT3lFHM=

			@@ -3,5 +3,5 @@
			import "testing"

			func TestInsertToEs(t *testing.T){
			InsertToEs()
			//InsertToEs()
			}

			@@ -2,7 +2,7 @@

			import (
			"encoding/json"
			"github.com/gogo/protobuf/proto"
			"fmt"
			"ruleprocess/cache"
			"ruleprocess/logger"
			"sort"
			@@ -235,7 +235,7 @@
			// 看看是否有只配人脸比对算法但没有配对比库的规则，如果有，则比对对象为全部底库
			for j := 0; j < len(groupRule.Rules); j++ {
			if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972"{
			if groupRule.Rules[j].SdkArgAlias == "对比底库" {
			if groupRule.Rules[j].SdkArgAlias == "compareBase" {
			compareFlag = true
			}
			}
			@@ -246,17 +246,23 @@
			logger.Info("没有配置对比底库参数")
			}
			for j := 0; j < len(groupRule.Rules); j++ {
			if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && groupRule.Rules[j].SdkArgAlias == "对比底库"{
			// 只有是人脸对比并且配置的参数是对比底库才走（若配的对比阈值则不走）
			if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && groupRule.Rules[j].SdkArgAlias == "compareBase" {
			for _, sdkData := range args.Sdkdata {
			if sdkData.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 搜索到人脸检测的sdkdata 现在关于人脸的只有他一个sdk，全找他
			for _, areaMap := range sdkData.AreaMapList {
			// 拿区域中每个人脸特征值去对比，填充其liker
			if groupRule.Rules[j].PolygonId == areaMap.areaId {
			for _,arg := range areaMap.args {
			bytes := bigCache.Getdbpersonmsg(string(arg.Feature),true)
			binfos := protomsg.Binfos{}
			proto.Unmarshal(bytes,&binfos)
			arg.Liker = binfos.Infos
			bytes := bigCache.Getdbpersonmsg("", arg.Feature, true)
			var m map[string]float32
			json.Unmarshal(bytes, &m)
			for key, val := range m {
			fmt.Println(key)
			baseinfo := protomsg.Baseinfo{}
			baseinfo.CompareScore = val
			arg.Liker = append(arg.Liker, &baseinfo)
			}
			logger.Info("-------------------成功给liker赋值：",arg.Liker)
			}
			}

	go.mod	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	go.sum	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	insertdata/insertDataToEs_test.go	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruleserver/ruleToformula.go	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史