From 58adc232b90053d67b87f1809e08014ee6c5adaf Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期三, 24 七月 2019 15:39:40 +0800
Subject: [PATCH] add defenceState query body
---
controllers/fileController.go | 47 ++++++++++++++++++-----------------------------
1 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index adb1e6e..8aa82b6 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,"鏈彁鍙栧埌浜鸿劯")
}
@@ -241,9 +234,9 @@
return
}
extNames := make([]string, 0)
- isAllFiald := true
addResult := make(map[string]interface{}, 0)
- details := make([]string, 0)
+ successList := make([]string, 0)
+ failList := make([]string,0)
for _, head := range fileHeaders {
//鏂囦欢鐨勫悕绉�
filename := head.Filename
@@ -252,26 +245,22 @@
if err != nil {
log.Fatal(err)
}
- //data, _ := ioutil.ReadAll(file)
- // weedfs 涓婁紶
+
field, _, err1 := uploadFileReturnAddr(file, filename, tableId)
- extNames = append(extNames, field)
- if isAllFiald && err1 == nil {
- isAllFiald = false
- }
- if err1 != nil {
- if field == "" {
- details = append(details, filename+"涓婁紶澶辫触,"+err1.Error())
- } else {
- details = append(details, filename+"鍔犲叆搴曞簱澶辫触,"+err1.Error())
- }
+ //extNames = append(extNames, field)
+
+ if err1 != nil || field == "" {
+ failList = append(failList, filename)
+ } else {
+ successList = append(successList, filename)
}
}
- addResult["isAllFiald"] = isAllFiald
+ addResult["successList"] = successList
+ addResult["failList"] = failList
addResult["fields"] = extNames
- addResult["detail"] = details
+ //addResult["detail"] = details
//fields := fdfsclient.UploadFileByBuffer100(bytess, extNames) // fastdfs 涓婁紶
- if !isAllFiald {
+ if len(successList)>0 {
util.ResponseFormat(c, code.Success, addResult)
} else {
util.ResponseFormat(c, code.ServiceInsideError, err.Error())
--
Gitblit v1.8.0