From e5df488268e29b272932e6cc1d2b1e7034590ba0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 12 六月 2024 11:40:45 +0800
Subject: [PATCH] weedfs包放到项目里
---
utils/upload/seaweed.go | 2
go.mod | 2
pkg/weedfs/weedfs.go | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 166 insertions(+), 3 deletions(-)
diff --git a/go.mod b/go.mod
index 3d1b8cc..1ac6b6b 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,6 @@
go 1.18
require (
- basic.com/aps/nsqclient.git v0.0.0-20230517072415-37491f4a5d25
- basic.com/fileserver/WeedFSClient.git v0.0.0-20231110020027-b2e7576d21e7
github.com/blevesearch/bleve/v2 v2.3.10
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/gin-gonic/gin v1.9.0
diff --git a/pkg/weedfs/weedfs.go b/pkg/weedfs/weedfs.go
new file mode 100644
index 0000000..f855d0f
--- /dev/null
+++ b/pkg/weedfs/weedfs.go
@@ -0,0 +1,165 @@
+package WeedFSClient
+
+import (
+ "bytes"
+ "encoding/json"
+ "errors"
+ "fmt"
+ "github.com/kirinlabs/HttpRequest"
+ "io"
+ "mime/multipart"
+ "net/http"
+ "strings"
+ "time"
+)
+
+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)
+ if err != nil {
+ return "", 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(fileData)
+ 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())
+ if timeout <= 0 {
+ timeout = 5 * time.Second
+ }
+ client := &http.Client{Timeout: timeout}
+ resp, err := client.Do(request)
+ if err != nil {
+ fmt.Println("UploadFile client.Do(request) err:", err)
+ return "", 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绫诲瀷")
+ }
+ err = errors.New(msg)
+ }
+ }()
+ defer resp.Body.Close()
+ {
+ body := &bytes.Buffer{}
+ _, 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
+ }
+ if furl, ok := m["fileUrl"]; ok {
+ filePath := furl.(string)
+ return appendCollection2Uri(uri, filePath), nil
+ } else {
+ fmt.Println("no fileUrl in m, m:", m)
+ return "", errors.New("file server err")
+ }
+ }
+}
+
+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
+ }
+ u, ok1 := m["publicUrl"]
+ 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, timeout time.Duration) (m map[string]interface{}, err error) {
+ body := &bytes.Buffer{}
+ writer := multipart.NewWriter(body)
+ _, 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(fileData)
+ 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())
+ if timeout <= 0 {
+ timeout = time.Duration(5 * time.Second) //瓒呮椂鏃堕棿5s
+ }
+ client := &http.Client{Timeout: timeout}
+ resp, err := client.Do(request)
+ if err != nil {
+ fmt.Println("UploadFile client.Do(request) err:", 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绫诲瀷")
+ }
+ err = errors.New(msg)
+ }
+ }()
+ defer resp.Body.Close()
+ {
+ body := &bytes.Buffer{}
+ _, err := body.ReadFrom(resp.Body)
+ if err != nil {
+ fmt.Println("UploadFile body.ReadForm(resp.Body) err:", err)
+ }
+
+ m := make(map[string]interface{})
+ if err := json.Unmarshal([]byte(body.String()), &m); err != nil {
+ return nil, err
+ }
+ return m, nil
+ }
+}
diff --git a/utils/upload/seaweed.go b/utils/upload/seaweed.go
index 0efd120..5f10ab5 100644
--- a/utils/upload/seaweed.go
+++ b/utils/upload/seaweed.go
@@ -1,10 +1,10 @@
package upload
import (
- "basic.com/fileserver/WeedFSClient.git"
"time"
"wms/conf"
"wms/pkg/logx"
+ "wms/pkg/weedfs"
)
func UploadFileToSeaWeed(fileType, fileName string, fileBytes []byte) (string, error) {
--
Gitblit v1.8.0