From 20f1fd7aed6ecc3fcd1dc811205dd3460975c3e6 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 05 十一月 2019 15:35:04 +0800
Subject: [PATCH] 添加一个获取fid的方法以及引入一个http第三方库

---
 WeedFSClient.go |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/WeedFSClient.go b/WeedFSClient.go
index a90f6f6..7c662b5 100644
--- a/WeedFSClient.go
+++ b/WeedFSClient.go
@@ -6,10 +6,9 @@
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"mime/multipart"
 	"net/http"
-	"strings"
+	"github.com/kirinlabs/HttpRequest"
 	"time"
 )
 
@@ -33,7 +32,7 @@
 	client := &http.Client{Timeout: timeout}
 	resp, err := client.Do(request)
 	if err != nil {
-		log.Fatal(err)
+		fmt.Println("UploadFile client.Do(request) err:", err)
 		return "", err
 	}
 	defer func() {
@@ -56,7 +55,7 @@
 		body := &bytes.Buffer{}
 		_, err := body.ReadFrom(resp.Body)
 		if err != nil {
-			log.Fatal(err)
+			fmt.Println("UploadFile body.ReadForm(resp.Body) err:", err)
 		}
 
 		m := make(map[string]interface{})
@@ -64,12 +63,21 @@
 			return "", err
 		}
 		filePath := m["fileUrl"].(string)
-		if strings.Contains(filePath,"/"){
-			idx := strings.Index(filePath,"/")
-			filePath = filePath[idx+1:]
-			return filePath,nil
-		} else {
-			return "",errors.New("file upload error")
-		}
+		return filePath,nil
 	}
+}
+
+// 鑾峰緱涓�涓猣id
+
+func GetFid(url string)(weedPath string ,err error) {
+	res,err := HttpRequest.NewRequest().Post(url)
+	if err != nil {
+		fmt.Println("缃戠粶浼犺緭閿欒锛�")
+	}
+	var m map[string]interface{}
+	err = res.Json(&m)
+	if err != nil {
+		return "",err
+	}
+	return "http://"+m["url"].(string)+"/"+m["fid"].(string),err
 }
\ No newline at end of file

--
Gitblit v1.8.0