From 01423aa626cf19b65630ac34d3a16d6920ced202 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 02 七月 2019 18:29:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
controllers/fileController.go | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 777fde5..c21b53f 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -10,6 +10,7 @@
"github.com/satori/go.uuid"
"image"
"image/jpeg"
+ "io/ioutil"
"log"
"mime/multipart"
"net/http"
@@ -101,8 +102,8 @@
//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
-
- faceExtArr, err := getFaceFeaFromSdk(file)
+ fileBytes, _ := ioutil.ReadAll(file)
+ faceExtArr, err := getFaceFeaFromSdk(fileBytes)
if err ==nil && len(faceExtArr) >0 {
var faceBase64= ""
for _,r := range faceExtArr {
@@ -126,15 +127,18 @@
defer file.Close()
field := ""
// weedfs 涓婁紶
- {
- fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", file)
- if e != nil {
- fmt.Println(e.Error())
- return "", nil, e
- } else {
- field = fileInfo[picUrlField].(string) // 鏂囦欢璺緞
- }
+ fileBytes, err := ioutil.ReadAll(file)
+ if err !=nil {
+ return "",nil,err
}
+ fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", fileBytes)
+ if e != nil {
+ fmt.Println(e.Error())
+ return "", nil, e
+ } else {
+ field = fileInfo[picUrlField].(string) // 鏂囦欢璺緞
+ }
+
if field != "" {
// 杩斿洖鐗瑰緛鍊� fileInfo["point"] = v.RcFace fileInfo["feature"] = feat
@@ -151,13 +155,15 @@
} */ // linux
if strings.Contains(field,"/"){
idx := strings.Index(field, "/")
- field = field[:idx+1]
+ field = field[idx+1:]
}
fmt.Println("field:",field)
+ //imgB, _ := ioutil.ReadAll(file)
+ //fmt.Println("img.length:",len(imgB))
//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
var faceBase64=""
- faceExtArr, err := getFaceFeaFromSdk(file)
+ faceExtArr, err := getFaceFeaFromSdk(fileBytes)
if faceExtArr ==nil {
return "",nil,errors.New("NotFeatureFindError")
}
@@ -184,8 +190,8 @@
}
}
-func getFaceFeaFromSdk(file multipart.File) ([]*protomsg.ResultFaceExtCom,error){
- s := service.NewFaceSdkService(file)
+func getFaceFeaFromSdk(fileBytes []byte) ([]*protomsg.ResultFaceExtCom,error){
+ s := service.NewFaceSdkService(fileBytes)
i, err := s.ReadFromUploadImg()
if err !=nil{
fmt.Println("readFromUploadImg err:",err)
--
Gitblit v1.8.0