From 5f48e7f9c10ed76112986b9d59c9517845df6b35 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 17 七月 2019 10:58:48 +0800
Subject: [PATCH] 改图片服务器地址
---
util/upload.go | 4 ++--
util/simpleCV.go | 4 ++--
insertdata/insertDataToEs.go | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index fcd3103..5384eef 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -307,7 +307,7 @@
if len(alarmRules) > 0 {
isAlarm = 1
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result))
+ resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result),weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
@@ -382,7 +382,7 @@
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result))
+ resp, err := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result),weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
diff --git a/util/simpleCV.go b/util/simpleCV.go
index 5b33210..a546983 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -155,7 +155,7 @@
}
}
-func DrawPolygonOnImage(cameraId string, img protomsg.Image, results []ruleserver.Result) (maps map[string]interface{}, err0 error) {
+func DrawPolygonOnImage(cameraId string, img protomsg.Image, results []ruleserver.Result,url string) (maps map[string]interface{}, err0 error) {
rook, _ := gocv.NewMatFromBytes(int(img.Height), int(img.Width), gocv.MatTypeCV8UC3, img.Data)
//rook := gocv.IMRead("/home/user/workspace/ruleprocess/util/105.jpg",gocv.IMReadColor)
@@ -182,7 +182,7 @@
}
}
//return nil,nil
- maps,err0 = UploadFromMat(rook)
+ maps,err0 = UploadFromMat(url,rook)
return
}
diff --git a/util/upload.go b/util/upload.go
index 90e2d0d..78cd5c1 100644
--- a/util/upload.go
+++ b/util/upload.go
@@ -137,7 +137,7 @@
}
}
-func UploadFromMat(rook gocv.Mat)(maps map[string]interface{}, err0 error){
+func UploadFromMat(url string,rook gocv.Mat)(maps map[string]interface{}, err0 error){
// 涓婁紶
fdata, _ := gocv.IMEncode(".jpg", rook)
body := &bytes.Buffer{}
@@ -153,7 +153,7 @@
request_reader := io.MultiReader(body, file, close_buf)
//_, err = io.Copy(part, file)
//writer.WriteField(key, val)
- request, err := http.NewRequest("POST", "http://192.168.1.182:6333/submit", request_reader)
+ request, err := http.NewRequest("POST", url, request_reader)
request.Header.Add("Content-Type", writer.FormDataContentType())
timeout := time.Duration(5 * time.Second) //瓒呮椂鏃堕棿50ms
client := &http.Client{Timeout: timeout}
--
Gitblit v1.8.0