From 91d7ca06128f996844aa7d2d691d083c944bdf1d Mon Sep 17 00:00:00 2001
From: lishihai <dslsh@dscom>
Date: 星期三, 03 七月 2024 17:22:16 +0800
Subject: [PATCH] 导入物料/产品->新模版BUG修复
---
utils/upload/seaweed.go | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/utils/upload/seaweed.go b/utils/upload/seaweed.go
index 931df16..5f10ab5 100644
--- a/utils/upload/seaweed.go
+++ b/utils/upload/seaweed.go
@@ -1,17 +1,15 @@
package upload
import (
- "basic.com/fileserver/WeedFSClient.git"
- uuid "github.com/satori/go.uuid"
- "strconv"
"time"
"wms/conf"
"wms/pkg/logx"
+ "wms/pkg/weedfs"
)
-func UploadFileToSeaWeed(fileType, ext string, fileBytes []byte) (string, error) {
+func UploadFileToSeaWeed(fileType, fileName string, fileBytes []byte) (string, error) {
//assignUrl := conf.WebConf.FileServer + "/dir/assign?collection=" + time.Now().Format("2006-01-02 15:04:05")[:10] + "-" + conf.WebConf.ServerId + "-" + fileType
- assignUrl := conf.WebConf.FileServer + "/dir/assign?collection=" + strconv.FormatInt(time.Now().Unix(), 10) + "-" + conf.WebConf.ServerId + "-" + fileType
+ assignUrl := conf.WebConf.FileServer + "/dir/assign?collection=12345-" + conf.WebConf.ServerId + "-" + fileType
picUrl, err := WeedFSClient.GetFid(assignUrl)
if err != nil {
@@ -19,7 +17,7 @@
return picUrl, err
}
- picFileName := uuid.NewV4().String() + "." + ext
- go WeedFSClient.UploadFile(picUrl, picFileName, fileBytes, 3*time.Second)
+ //picFileName := uuid.NewV4().String() + "." + ext
+ go WeedFSClient.UploadFile(picUrl, fileName, fileBytes, 3*time.Second)
return picUrl, nil
}
--
Gitblit v1.8.0