liuxiaolong
2019-06-29 10094361e04705f3d81a5cbd2f0868467fc9c784
rm log
4个文件已修改
57 ■■■■ 已修改文件
controllers/fileController.go 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
extend/esutil/EsClient.go 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/CamraUpdatesnashot.go 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/FaceSdkService.go 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/fileController.go
@@ -131,8 +131,7 @@
    if err !=nil {
        return "",nil,err
    }
    fmt.Println("fileBytes.len:",len(fileBytes))
    fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", file)
    fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", fileBytes)
    if e != nil {
        fmt.Println(e.Error())
        return "", nil, e
extend/esutil/EsClient.go
@@ -98,7 +98,7 @@
    return dat, nil
}
func PostFormData(uri string, filename, paramName string, file multipart.File) (maps map[string]interface{}, err0 error) {
func PostFormData(uri string, filename, paramName string, fileBytes []byte) (maps map[string]interface{}, err0 error) {
    body := &bytes.Buffer{}
    writer := multipart.NewWriter(body)
    _, err := writer.CreateFormFile(paramName, filename)
@@ -106,11 +106,11 @@
        return nil, err
    }
    boundary := writer.Boundary()
    //close_string := fmt.Sprintf("\r\n--%s--\r\n", boundary)
    close_buf := bytes.NewBufferString(fmt.Sprintf("\r\n--%s--\r\n", boundary))
    fmt.Println("PostFormData.fileLen:",len(fileBytes))
    file := bytes.NewBuffer(fileBytes)
    request_reader := io.MultiReader(body, file, close_buf)
    //_, err = io.Copy(part, file)
    //writer.WriteField(key, val)
    request, err := http.NewRequest("POST", uri, request_reader)
    request.Header.Add("Content-Type", writer.FormDataContentType())
    timeout := time.Duration(5 * time.Second) //超时时间50ms
service/CamraUpdatesnashot.go
@@ -19,7 +19,6 @@
        "basic.com/dbapi.git"
   )
func PostFormBufferData(uri string, filepath string, fileName string) (maps map[string]interface{}, err0 error) {
          // 要指定转byte的格式
            picMat := gocv.IMRead(filepath, gocv.IMReadColor)
@@ -90,8 +89,6 @@
      return decoder, nil
          }
}
func processphoto(cid string) (local string, err error) {
    var camApi dbapi.CameraApi
service/FaceSdkService.go
@@ -3,7 +3,6 @@
import (
    "basic.com/pubsub/protomsg.git"
    "basic.com/valib/deliver.git"
    "encoding/base64"
    "fmt"
    "github.com/gogo/protobuf/proto"
    "github.com/pierrec/lz4"
@@ -244,21 +243,23 @@
                fmt.Println("Len(sdkInfos)=",len(sdkInfos))
                for _,swt :=range sdkInfos{
                    if swt.Sdktype =="FaceDetect"{
                        fmt.Println("人脸检测结果长度:",len(swt.Sdkdata))
                        if len(swt.Sdkdata)>1{
                            var pfp protomsg.ParamFacePos
                            err := proto.Unmarshal(swt.Sdkdata, &pfp)
                            if err !=nil {
                                fmt.Println("faceDetect result unmarshal err:",err)
                            } else {
                                for _,face :=range pfp.Faces{
                                    fmt.Println("FacePos:",face.Pos)
                                    fmt.Println("ThftResult:",face.Result)
                                }
                            }
                        }
                    }
                    //人脸检测的结果
                    //if swt.Sdktype =="FaceDetect"{
                    //    fmt.Println("人脸检测结果长度:",len(swt.Sdkdata))
                    //    if len(swt.Sdkdata)>1{
                    //        var pfp protomsg.ParamFacePos
                    //        err := proto.Unmarshal(swt.Sdkdata, &pfp)
                    //        if err !=nil {
                    //            fmt.Println("faceDetect result unmarshal err:",err)
                    //        } else {
                    //            for _,face :=range pfp.Faces{
                    //                fmt.Println("FacePos:",face.Pos)
                    //                fmt.Println("ThftResult:",face.Result)
                    //            }
                    //        }
                    //    }
                    //}
                    //人脸提取的结果
                    if swt.Sdktype == "FaceExtract"{
                        fmt.Println("人脸提取结果长度:",len(swt.Sdkdata))
                        if len(swt.Sdkdata) > 1{
@@ -270,11 +271,11 @@
                                if len(pff.ExtComp) >0 {
                                    resultMap.Write(perId,pff.ExtComp)
                                    for _,fea :=range pff.ExtComp{
                                        base64Fea := base64.StdEncoding.EncodeToString(fea.Feats)
                                        fmt.Println("perId:",perId)
                                        fmt.Println("faceFeature:",base64Fea)
                                    }
                                    //for _,fea :=range pff.ExtComp{
                                    //    base64Fea := base64.StdEncoding.EncodeToString(fea.Feats)
                                    //    fmt.Println("perId:",perId)
                                    //    fmt.Println("faceFeature:",base64Fea)
                                    //}
                                }
                            }
                            break