From 0cb21b19188b13724fe3e21abaf25dcd82b66323 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 22 七月 2019 17:08:10 +0800
Subject: [PATCH] add WeedFSClient
---
controllers/fileController.go | 17 +++++------------
service/CamraUpdatesnashot.go | 16 ++--------------
2 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 8ca674f..a5bc403 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -2,6 +2,7 @@
import (
"basic.com/pubsub/protomsg.git"
+ "basic.com/fileServer/WeedFSClient.git"
"bytes"
"encoding/base64"
"errors"
@@ -108,7 +109,6 @@
faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*5)
if err ==nil && len(faceArr) >0 {
var faceBase64= ""
- var field = ""
var rcFace *protomsg.Rect
for _,r := range faceArr {
rcFace = r.Pos.RcFace
@@ -117,19 +117,12 @@
}
//鏍规嵁浜鸿劯鍧愭爣鎵ｅ嚭浜鸿劯灏忓浘
cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
- fileInfo, e := esutil.PostFormData(weedfsUri, "娴嬭瘯浜鸿劯鍒囧浘", "file", cutFaceImgData)
- if e != nil {
- fmt.Println(e.Error())
-
+ weedFilePath, e := WeedFSClient.UploadFile(weedfsUri, "testCutFace", cutFaceImgData)
+ if e !=nil{
+ util.ResponseFormat(c,code.ComError,"鏂囦欢涓婁紶澶辫触")
} else {
- field = fileInfo[picUrlField].(string) // 鏂囦欢璺緞
+ util.ResponseFormat(c,code.Success,weedFilePath + ";" + faceBase64)
}
- if strings.Contains(field,"/"){
- idx := strings.Index(field, "/")
- field = field[idx+1:]
- }
- fmt.Println("field:",field)
- util.ResponseFormat(c,code.Success,field + ";" + faceBase64)
} else {
util.ResponseFormat(c,code.ComError,"鏈彁鍙栧埌浜鸿劯")
}
diff --git a/service/CamraUpdatesnashot.go b/service/CamraUpdatesnashot.go
index 4027daf..ad5ab9f 100644
--- a/service/CamraUpdatesnashot.go
+++ b/service/CamraUpdatesnashot.go
@@ -1,28 +1,16 @@
package service
import (
- "bytes"
- "encoding/json"
"errors"
- "flag"
- "fmt"
- "gocv.io/x/gocv"
- "io"
- "log"
- "mime/multipart"
- "net/http"
- "os"
- "os/exec"
"path/filepath"
"strconv"
- "time"
"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) {
// 瑕佹寚瀹氳浆byte鐨勬牸寮�
picMat := gocv.IMRead(filepath, gocv.IMReadColor)
@@ -143,7 +131,7 @@
return "", errors.New("update filelocal to camera fail")
}
return filename, nil
-}
+}*/
//璋冪敤缁熶竴鎺ュ彛锛屽埛鏂板簳鍥撅紙闆嗘垚鍥芥爣搴曞浘鍒锋柊锛�
func UpdateCapture(cid string) (fileName string,err error){
--
Gitblit v1.8.0