From 49bea897a567d059e159509340ce8c68fad56a1c Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 22 七月 2019 16:28:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
controllers/fileController.go | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 7dbc615..8ca674f 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -14,8 +14,10 @@
"log"
"mime/multipart"
"net/http"
+ "path"
"strconv"
"strings"
+ "time"
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
@@ -71,7 +73,7 @@
// fastdfs 涓婁紶 鏆傚簾寮�
//field := fdfsclient.UploadFileByBuffer(data, fileSuffix)
}
- field, result, err := uploadFileReturnAddr(file, filename, tableId)
+ fileNameOnly, result, err := uploadFileReturnAddr(file, filename, tableId)
if err != nil {
if err.Error() == "NotFeatureFindError" {
util.ResponseFormat(c, code.NotFeatureFindError, filename)
@@ -87,7 +89,7 @@
util.ResponseFormat(c, code.ServiceInsideError, result["data"])
}
} else {
- util.ResponseFormat(c, code.Success, field)
+ util.ResponseFormat(c, code.Success, fileNameOnly)
}
}
@@ -103,7 +105,7 @@
//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
fileBytes, _ := ioutil.ReadAll(file)
- faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes)
+ faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*5)
if err ==nil && len(faceArr) >0 {
var faceBase64= ""
var field = ""
@@ -150,7 +152,7 @@
//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
var faceBase64=""
- faceArr, err,pI := service.GetFaceFeaFromSdk(fileBytes)
+ faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*5)
if faceArr ==nil {
return "",nil,errors.New("NotFeatureFindError")
}
@@ -179,17 +181,19 @@
field = field[idx+1:]
}
fmt.Println("field:",field)
+ ext := path.Ext(filename)
+ fileNameOnly := strings.TrimSuffix(filename, ext)
dbperson := new(models.Dbtablepersons)
dbperson.PersonPicUrl = field // 鍥剧墖璺粡
dbperson.TableId = tableId //
- dbperson.PersonName = filename // 鍥剧墖鍚�
+ dbperson.PersonName = fileNameOnly // 鍥剧墖鍚�
// 婕旂ずbase64缂栫爜
dbperson.FaceFeature = faceBase64 // 鐗瑰緛鍊糱ase64 鐮�
result := addDbPerson(dbperson)
- return field, result, nil
+ return fileNameOnly, result, nil
}
@@ -237,9 +241,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
@@ -248,26 +252,24 @@
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
- }
+ //extNames = append(extNames, field)
+
if err1 != nil {
if field == "" {
- details = append(details, filename+"涓婁紶澶辫触,"+err1.Error())
+ failList = append(failList, filename+"涓婁紶澶辫触,"+err1.Error())
} else {
- details = append(details, filename+"鍔犲叆搴曞簱澶辫触,"+err1.Error())
+ successList = append(successList, filename+"鍔犲叆搴曞簱澶辫触,"+err1.Error())
}
}
}
- 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