From f11c45b7f0a486f0461caed204846e4e663a3cd8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 20 八月 2019 20:27:13 +0800
Subject: [PATCH] fix capture
---
service/CamraUpdatesnashot.go | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/service/CamraUpdatesnashot.go b/service/CamraUpdatesnashot.go
index ad5ab9f..0ca5c58 100644
--- a/service/CamraUpdatesnashot.go
+++ b/service/CamraUpdatesnashot.go
@@ -1,14 +1,12 @@
package service
import (
+ "basic.com/dbapi.git"
+ "basic.com/fileServer/WeedFSClient.git"
+ "basic.com/valib/capture.git"
"errors"
- "path/filepath"
"strconv"
"webserver/extend/config"
- "webserver/extend/esutil"
-
- "basic.com/dbapi.git"
- "basic.com/valib/capture.git"
)
/*浠ヤ笅灞炰簬鏃х増鏈湴鎽勫儚鏈鸿幏鍙栨埅鍥撅紙鍥芥爣鎽勫儚鏈哄簳鍥炬棤娉曞埛鏂帮級
func PostFormBufferData(uri string, filepath string, fileName string) (maps map[string]interface{}, err0 error) {
@@ -148,17 +146,15 @@
b,err := capture.Capture("./runtime/libcffmpeg.so",m,camera.Rtsp,capture.JPEGFileExt,1280,720,10)
if err == nil{
var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
- resp, err := esutil.PostFormBufferData(weedfsUri, camera.Name+".jpg", "file", b)
+ weedFilePath, err := WeedFSClient.UploadFile(weedfsUri, camera.Name+".jpg", b)
if err != nil {
return "",err
} else {
- fileurl := resp["fileUrl"].(string) // 鏂囦欢璺緞
- filename := filepath.Base(fileurl)
- ok := cameraApi.UpdateSnapshotUrl(cid, filename)
+ ok := cameraApi.UpdateSnapshotUrl(cid, weedFilePath)
if !ok {
return "", errors.New("update camera's snapshot fail")
}
- return filename, nil
+ return weedFilePath, nil
}
}else{
return "",err
--
Gitblit v1.8.0