From 1132b96243d26d46467b94beb0f9b217cd24923a Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 23 十一月 2020 11:41:42 +0800
Subject: [PATCH] 修复上传后weedfs可能报错的情况,没有fileUrl返回而是只有err
---
WeedFSClient.go | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/WeedFSClient.go b/WeedFSClient.go
index 5264404..c33b73b 100644
--- a/WeedFSClient.go
+++ b/WeedFSClient.go
@@ -9,10 +9,11 @@
"mime/multipart"
"net/http"
"github.com/kirinlabs/HttpRequest"
+ "strings"
"time"
)
-func UploadFile(uri string, fileName string, fileData []byte) (weedFilePath string, err error) {
+func UploadFile(uri string, fileName string, fileData []byte,timeout time.Duration) (weedFilePath string, err error) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
_, err = writer.CreateFormFile("file", fileName)
@@ -28,7 +29,9 @@
//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
+ if timeout <=0 {
+ timeout = 5 * time.Second
+ }
client := &http.Client{Timeout: timeout}
resp, err := client.Do(request)
if err != nil {
@@ -56,33 +59,55 @@
_, err := body.ReadFrom(resp.Body)
if err != nil {
fmt.Println("UploadFile body.ReadForm(resp.Body) err:", err)
+ return "", err
}
m := make(map[string]interface{})
if err := json.Unmarshal([]byte(body.String()), &m); err != nil {
return "", err
}
- filePath := m["fileUrl"].(string)
- return filePath,nil
+ if furl,ok := m["fileUrl"]; ok {
+ filePath := furl.(string)
+ return appendCollection2Uri(uri, filePath),nil
+ } else {
+ return "", errors.New("file server err")
+ }
}
}
-// 鑾峰緱涓�涓猣id
+func appendCollection2Uri(weedfsUri, fileUri string) string {
+ //鍒ゆ柇weedfsUri涓槸鍚﹀寘鍚玞ollection鍙傛暟
+ idx := strings.Index(weedfsUri, "?")
+ if idx > -1 {
+ return fileUri + weedfsUri[idx:]
+ } else {
+ return fileUri
+ }
+}
+// 鑾峰緱涓�涓猣id url eg:http://192.168.5.23:6333/assign/dir?collection=11111-persistent
func GetFid(url string)(weedPath string ,err error) {
res,err := HttpRequest.NewRequest().Post(url)
if err != nil {
fmt.Println("缃戠粶浼犺緭閿欒锛�")
+ return "", err
}
var m map[string]interface{}
err = res.Json(&m)
if err != nil {
return "",err
}
- return "http://"+m["url"].(string)+"/"+m["fid"].(string),err
+ u,ok1 := m["url"]
+ f,ok2 := m["fid"]
+ if ok1 && ok2 {
+ filePath := "http://"+u.(string)+"/"+f.(string)
+ return appendCollection2Uri(url, filePath),err
+ } else {
+ return "", errors.New("鏈幏鍙栧埌url鍜宖id")
+ }
}
-func UpDateFile(uri string, fileName string, fileData []byte) (m map[string]interface{}, err error) {
+func UpDateFile(uri string, fileName string, fileData []byte,timeout time.Duration) (m map[string]interface{}, err error) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
_, err = writer.CreateFormFile("file", fileName)
@@ -98,7 +123,9 @@
//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
+ if timeout <= 0 {
+ timeout = time.Duration(5 * time.Second) //瓒呮椂鏃堕棿5s
+ }
client := &http.Client{Timeout: timeout}
resp, err := client.Do(request)
if err != nil {
--
Gitblit v1.8.0