~jinersong/ruleprocess.git

			@@ -2,14 +2,11 @@

			import (
			"basic.com/dbapi.git"
			bigCache "basic.com/pubsub/cache.git"
			"basic.com/pubsub/protomsg.git"
			"encoding/json"
			"errors"
			"fmt"
			"github.com/go-yaml/yaml"
			"github.com/golang/protobuf/proto"
			"io/ioutil"
			"math"
			"nanomsg.org/go-mangos"
			"nanomsg.org/go-mangos/protocol/req"
			@@ -33,24 +30,8 @@
			}

			func Init() {
			data, err := ioutil.ReadFile("./config/conf.yml")
			if err != nil {
			fmt.Println("读取配置文件出错--", err)
			logger.Error("读取配置文件出错--", err)
			}
			c := conf{}
			//把yaml形式的字符串解析成struct类型
			yaml.Unmarshal(data, &c)
			logger.Debug("配置文件的值为：", c)
			serverIp = c.ServerIp
			serverPort = c.ServerPort
			dbTablePersons = c.DbTablePersons
			localConfig, err1 := cache.GetServerInfo()
			if err1 != nil {
			logger.Error("查询本机信息失败！")
			}
			logger.Debug("本机信息和server信息：", localConfig, serverIp, serverPort)
			bigCache.Init(dbTablePersons, serverIp, serverPort, localConfig.ServerId)
			//logger.Debug("本机信息和server信息：", localConfig, serverIp, serverPort)
			//bigCache.Init(dbTablePersons, serverIp, serverPort, localConfig.ServerId)
			go Push1()
			}

			@@ -96,7 +77,7 @@
			func GetPolygons(cameraId string) []protomsg.CameraPolygon {
			var cameraPolygons []protomsg.CameraPolygon
			cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
			//logger.Debug("------=======查看下全部区域：",cameraPolygons)
			logger.Debug("------=======查看下全部区域：",cameraPolygons)
			return cameraPolygons
			}