~jinersong/ruleprocess.git

			@@ -6,6 +6,7 @@
			"fmt"
			"log"
			"net"
			"ruleprocess/cache"
			"strings"
			"time"

			@@ -197,8 +198,13 @@
			}
			i := protomsg.Image{}
			err = proto.Unmarshal(bdata, &i)
			resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
			log.Println("已报警并上传改帧图片到服务器")
			//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
			resp, err =util.DrawPolygonOnImage(i)
			if err != nil {
			log.Println("画框或上传图片服务器出错",err)
			}else{
			log.Println("已报警并上传改帧图片到服务器")
			}
			} else {
			isAlarm = "0"
			// 不是报警数据不存
			@@ -206,12 +212,12 @@
			}
			// log.Println("图片上传返回值：", resp)
			// 查询本机信息
			flag, localConfig := dbapi.SysSetApi{}.GetServerInfo()
			if !flag {
			localConfig, err := cache.GetServerInfo()
			if err !=nil {
			log.Println("查询本机信息失败！")
			}
			// 查询cameraName
			camera, err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
			camera, err := cache.GetCameraById(msg.Cid)
			if err != nil {
			log.Println("查询摄像机信息失败")
			}