From e3c33684b4907cc338866623d2362eb85100387d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 28 十月 2019 16:35:08 +0800
Subject: [PATCH] 修改一下推送成功条件
---
util/upload.go | 159 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 145 insertions(+), 14 deletions(-)
diff --git a/util/upload.go b/util/upload.go
index 9c7e6a2..e864d53 100644
--- a/util/upload.go
+++ b/util/upload.go
@@ -1,28 +1,35 @@
package util
import (
+ "basic.com/pubsub/protomsg.git"
"bytes"
"encoding/json"
"errors"
"fmt"
- uuid "github.com/satori/go.uuid"
"io"
"log"
"mime/multipart"
"net/http"
+ "basic.com/valib/logger.git"
"time"
+ "gocv.io/x/gocv"
)
-var weedfsUri = "http://192.168.1.182:9500/submit"
-func PostFormData(uri string) (maps map[string]interface{}, err0 error) {
+// 涓婁紶鍥剧墖锛堜簩杩涘埗娴侊級
+func PostFormBufferData(uri string, img protomsg.Image, fileName string,) (maps map[string]interface{}, err0 error) {
+ // 瑕佹寚瀹氳浆byte鐨勬牸寮�
+ imgs := gocv.NewMat()
+ imgs, _ = gocv.NewMatFromBytes(int(img.Height), int(img.Width), gocv.MatTypeCV8UC3, img.Data)
+ fdata,_ := gocv.IMEncode(".jpg",imgs)
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
- _, err := writer.CreateFormFile("file", uuid.NewV4().String())
+ _, err := writer.CreateFormFile("file", fileName)
if err != nil {
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))
+ file := bytes.NewBuffer(fdata)
request_reader := io.MultiReader(body, file, close_buf)
//_, err = io.Copy(part, file)
//writer.WriteField(key, val)
@@ -51,17 +58,141 @@
}
}()
defer resp.Body.Close()
- body = &bytes.Buffer{}
- _, err = body.ReadFrom(resp.Body)
- if err != nil {
- log.Fatal(err)
+ {
+ body := &bytes.Buffer{}
+ _, err := body.ReadFrom(resp.Body)
+ if err != nil {
+ log.Fatal(err)
+ }
+ fmt.Println(resp.StatusCode)
+ //fmt.Println(resp.Header)
+ fmt.Println(body)
+ //decoder := json.NewDecoder(strings.NewReader(body.String()))
+ decoder := make(map[string]interface{})
+ if err := json.Unmarshal([]byte(body.String()), &decoder); err != nil {
+ return nil, err
+ }
+ return decoder, nil
}
- fmt.Println(resp.StatusCode)
- //fmt.Println(body)
- //decoder := json.NewDecoder(strings.NewReader(body.String()))
- decoder := make(map[string]interface{})
- if err := json.Unmarshal([]byte(body.String()), &decoder); err != nil {
+}
+
+// 涓婁紶鍥剧墖锛堜簩杩涘埗娴侊級
+func PostFormBufferData1(uri string, fdata []byte, fileName string,) (maps map[string]interface{}, err0 error) {
+ // 瑕佹寚瀹氳浆byte鐨勬牸寮�
+ //imgs := gocv.NewMat()
+ //imgs, _ = gocv.NewMatFromBytes(1000, 1000, gocv.MatTypeCV8UC3, fbada)
+ //fdata,_ := gocv.IMEncode(".jpg",imgs)
+ body := &bytes.Buffer{}
+ writer := multipart.NewWriter(body)
+ _, err := writer.CreateFormFile("file", fileName)
+ if err != nil {
return nil, err
}
- return decoder, nil
+ 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))
+ file := bytes.NewBuffer(fdata)
+ 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
+ client := &http.Client{Timeout: timeout}
+ resp, err := client.Do(request)
+ if err != nil {
+ log.Fatal(err)
+ return nil, err
+ }
+ defer func() {
+ if r := recover(); r != nil {
+ fmt.Printf("panic鐨勫唴瀹�%v\n", r)
+ msg := "涓婁紶鍥剧墖鏈嶅姟鍣ㄥ紓甯�"
+ if _, ok := r.(error); ok {
+ msg = r.(error).Error()
+ fmt.Println("panic--recover()寰楀埌鐨勬槸error绫诲瀷")
+ }
+ if _, ok := r.(string); ok {
+ msg = r.(string)
+ fmt.Println("panic--recover()寰楀埌鐨勬槸string绫诲瀷")
+ }
+ err0 = errors.New(msg)
+ }
+ }()
+ defer resp.Body.Close()
+ {
+ body := &bytes.Buffer{}
+ _, err := body.ReadFrom(resp.Body)
+ if err != nil {
+ log.Fatal(err)
+ }
+ fmt.Println(resp.StatusCode)
+ //fmt.Println(resp.Header)
+ fmt.Println(body)
+ //decoder := json.NewDecoder(strings.NewReader(body.String()))
+ decoder := make(map[string]interface{})
+ if err := json.Unmarshal([]byte(body.String()), &decoder); err != nil {
+ return nil, err
+ }
+ return decoder, nil
+ }
}
+
+func UploadFromMat(url string,rook gocv.Mat)(maps map[string]interface{}, err0 error){
+ // 涓婁紶
+ fdata, _ := gocv.IMEncode(".jpg", rook)
+ body := &bytes.Buffer{}
+ writer := multipart.NewWriter(body)
+ _, err1 := writer.CreateFormFile("file", "fasjuierf")
+ if err1 != nil {
+ return nil, err1
+ }
+ 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))
+ file := bytes.NewBuffer(fdata)
+ request_reader := io.MultiReader(body, file, close_buf)
+ //_, err = io.Copy(part, file)
+ //writer.WriteField(key, val)
+ request, err := http.NewRequest("POST", url, request_reader)
+ request.Header.Add("Content-Type", writer.FormDataContentType())
+ timeout := time.Duration(5 * time.Second) //瓒呮椂鏃堕棿50ms
+ client := &http.Client{Timeout: timeout}
+ resp, err := client.Do(request)
+ if err != nil {
+ logger.Error(err)
+ return nil, err
+ }
+ defer func() {
+ if r := recover(); r != nil {
+ fmt.Printf("panic鐨勫唴瀹�%v\n", r)
+ msg := "涓婁紶鍥剧墖鏈嶅姟鍣ㄥ紓甯�"
+ if _, ok := r.(error); ok {
+ msg = r.(error).Error()
+ fmt.Println("panic--recover()寰楀埌鐨勬槸error绫诲瀷")
+ }
+ if _, ok := r.(string); ok {
+ msg = r.(string)
+ fmt.Println("panic--recover()寰楀埌鐨勬槸string绫诲瀷")
+ }
+ err0 = errors.New(msg)
+ }
+ }()
+ defer resp.Body.Close()
+ {
+ body := &bytes.Buffer{}
+ _, err := body.ReadFrom(resp.Body)
+ if err != nil {
+ log.Fatal(err)
+ }
+ fmt.Println(resp.StatusCode)
+ //fmt.Println(resp.Header)
+ fmt.Println(body)
+ //decoder := json.NewDecoder(strings.NewReader(body.String()))
+ decoder := make(map[string]interface{})
+ if err := json.Unmarshal([]byte(body.String()), &decoder); err != nil {
+ return nil, err
+ }
+ return decoder, nil
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0