From 440eda8c0ce47db6c8813ada0ab3b5adf1921212 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 17 七月 2019 15:04:21 +0800
Subject: [PATCH] fix snapshot weedfs
---
controllers/fileController.go | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 868bd7a..7dbc615 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -14,13 +14,14 @@
"log"
"mime/multipart"
"net/http"
+ "strconv"
"strings"
"webserver/extend/code"
+ "webserver/extend/config"
"webserver/extend/esutil"
"webserver/extend/util"
"webserver/models"
"webserver/service"
-
)
type FileController struct {
@@ -34,7 +35,6 @@
//var picUrlField = "fid"
/**涓婁紶鏂规硶**/
-var weedfsUri = "http://192.168.1.182:6333/submit"
//var weedfsUri = "http://192.168.1.182:9500/submit"
@@ -99,17 +99,17 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
-
+ var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
fileBytes, _ := ioutil.ReadAll(file)
- faceExtArr, err, pI := getFaceFeaFromSdk(fileBytes)
- if err ==nil && len(faceExtArr) >0 {
+ faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes)
+ if err ==nil && len(faceArr) >0 {
var faceBase64= ""
var field = ""
var rcFace *protomsg.Rect
- for _,r := range faceExtArr {
- rcFace = r.Pos.Pos.RcFace
+ for _,r := range faceArr {
+ rcFace = r.Pos.RcFace
faceBase64 = base64.StdEncoding.EncodeToString(r.Feats)//鑾峰彇鎻愬彇鍒扮殑绗竴寮犱汉鑴哥壒寰�
break
}
@@ -150,20 +150,21 @@
//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
var faceBase64=""
- faceExtArr, err,pI := getFaceFeaFromSdk(fileBytes)
- if faceExtArr ==nil {
+ faceArr, err,pI := service.GetFaceFeaFromSdk(fileBytes)
+ if faceArr ==nil {
return "",nil,errors.New("NotFeatureFindError")
}
var rcFace *protomsg.Rect
- if err ==nil && len(faceExtArr) >0 {
- for _,r := range faceExtArr {
+ if err ==nil && len(faceArr) >0 {
+ for _,r := range faceArr {
//鎷垮埌浜鸿劯鐨勫潗鏍�
- rcFace = r.Pos.Pos.RcFace
+ rcFace = r.Pos.RcFace
faceBase64 = base64.StdEncoding.EncodeToString(r.Feats)//鑾峰彇鎻愬彇鍒扮殑绗竴寮犱汉鑴哥壒寰�
break
}
}
+ var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
//鏍规嵁浜鸿劯鍧愭爣鎵ｅ嚭浜鸿劯灏忓浘
cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", cutFaceImgData)
@@ -192,26 +193,26 @@
}
-func getFaceFeaFromSdk(fileBytes []byte) ([]*protomsg.ResultFaceExtCom,error,*protomsg.Image){
- s := service.NewFaceSdkService(fileBytes)
- i, err := s.ReadFromUploadImg()
- if err !=nil{
- fmt.Println("readFromUploadImg err:",err)
- return nil,err,i
- }
- bc, err := service.ImgCompress(i)
- if err !=nil {
- fmt.Println("ImgCompress err:",err)
- return nil,err,i
- }
- s.PushImgMsg(bc)
- s.GetFaceFea()
- if s.Result == nil{
- return nil,errors.New("no fea"),i
- } else {
- return s.Result,nil,i
- }
-}
+//func getFaceFeaFromSdk(fileBytes []byte) ([]*protomsg.ResultFaceExtCom,error,*protomsg.Image){
+// s := service.NewFaceSdkService(fileBytes)
+// i, err := s.ReadFromUploadImg()
+// if err !=nil{
+// fmt.Println("readFromUploadImg err:",err)
+// return nil,err,i
+// }
+// bc, err := service.ImgCompress(i)
+// if err !=nil {
+// fmt.Println("ImgCompress err:",err)
+// return nil,err,i
+// }
+// s.PushImgMsg(bc)
+// s.GetFaceFea()
+// if s.Result == nil{
+// return nil,errors.New("no fea"),i
+// } else {
+// return s.Result,nil,i
+// }
+//}
/**涓婁紶鏂规硶**/
@@ -312,6 +313,7 @@
util.ResponseFormat(c, code.UploadFileError, err2.Error())
return
}
+ var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
{
uri := weedfsUri
fileInfo, e := esutil.PostFormBufferData(uri, filename, "file", uploadData)
--
Gitblit v1.8.0