From e0f0035a7d02098f14e9d800a16d42d4c9380e9c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 20 十二月 2019 16:22:25 +0800
Subject: [PATCH] test
---
service/CamraUpdatesnashot.go | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/service/CamraUpdatesnashot.go b/service/CamraUpdatesnashot.go
index ad5ab9f..6e68767 100644
--- a/service/CamraUpdatesnashot.go
+++ b/service/CamraUpdatesnashot.go
@@ -1,14 +1,13 @@
package service
import (
- "errors"
- "path/filepath"
- "strconv"
- "webserver/extend/config"
- "webserver/extend/esutil"
-
"basic.com/dbapi.git"
+ "basic.com/fileServer/WeedFSClient.git"
"basic.com/valib/capture.git"
+ "basic.com/valib/logger.git"
+ "errors"
+ "strconv"
+ "webserver/cache"
)
/*浠ヤ笅灞炰簬鏃х増鏈湴鎽勫儚鏈鸿幏鍙栨埅鍥撅紙鍥芥爣鎽勫儚鏈哄簳鍥炬棤娉曞埛鏂帮級
func PostFormBufferData(uri string, filepath string, fileName string) (maps map[string]interface{}, err0 error) {
@@ -145,20 +144,23 @@
if camera.Type == 1{//鍥芥爣鎽勫儚鏈�
m = capture.GB28181
}
- b,err := capture.Capture("./runtime/libcffmpeg.so",m,camera.Rtsp,capture.JPEGFileExt,1280,720,10)
+ b,err := capture.Capture("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)
+ localConf, err2 := cache.GetServerInfo()
+ if err2 !=nil || localConf.WebPicIp == "" {
+ logger.Debug("localConfig is wrong!!!")
+ return "",err2
+ }
+ var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit"
+ 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