Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions server/utils/upload/minio_oss.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package upload

import (
"bytes"
"context"
"errors"
"io"
"mime"
"mime/multipart"
"path/filepath"
Expand Down Expand Up @@ -59,14 +57,7 @@ func (m *Minio) UploadFile(file *multipart.FileHeader) (filePathres, key string,
global.GVA_LOG.Error("function file.Open() Failed", zap.Any("err", openError.Error()))
return "", "", errors.New("function file.Open() Failed, err:" + openError.Error())
}

filecontent := bytes.Buffer{}
_, err := io.Copy(&filecontent, f)
if err != nil {
global.GVA_LOG.Error("读取文件失败", zap.Any("err", err.Error()))
return "", "", errors.New("读取文件失败, err:" + err.Error())
}
f.Close() // 创建文件 defer 关闭
defer f.Close()

// 对文件名进行加密存储
ext := filepath.Ext(file.Filename)
Expand All @@ -88,7 +79,7 @@ func (m *Minio) UploadFile(file *multipart.FileHeader) (filePathres, key string,
defer cancel()

// Upload the file with PutObject 大文件自动切换为分片上传
info, err := m.Client.PutObject(ctx, global.GVA_CONFIG.Minio.BucketName, filePathres, &filecontent, file.Size, minio.PutObjectOptions{ContentType: contentType})
info, err := m.Client.PutObject(ctx, global.GVA_CONFIG.Minio.BucketName, filePathres, f, file.Size, minio.PutObjectOptions{ContentType: contentType})
if err != nil {
global.GVA_LOG.Error("上传文件到minio失败", zap.Any("err", err.Error()))
return "", "", errors.New("上传文件到minio失败, err:" + err.Error())
Expand Down
Loading