修复头像

utils/oss/minio.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
+	"strings"
 	"time"
 )
 
@@ -58,7 +59,7 @@ func (m *MinioOss) UploadFile(fileName, filePath, savePath string) (string, erro
 	return resourceUrl, err
 }
 
-func (m *MinioOss) GetExt(string) (ext string, err error) {
+func (m *MinioOss) GetExt(objectName string) (ext string, err error) {
 	if utils.MinIoAccessKeyId == `` || utils.MinIoAccessKeySecret == `` {
 		err = errors.New("MinIo信息未配置")
 		return
@@ -89,7 +90,7 @@ func (m *MinioOss) GetExt(string) (ext string, err error) {
 		err = fmt.Errorf("BucketExists: %v; err: %v", exists, errBucketExists)
 		return
 	}
-	info, minioErr := minioClient.StatObject(ctx, bucketName, "test.txt", minio.GetObjectOptions{})
+	info, minioErr := minioClient.StatObject(ctx, bucketName, objectName, minio.GetObjectOptions{})
 	if minioErr != nil {
 		err = fmt.Errorf("StatObject: %v; err: %v", info, minioErr)
 		return
@@ -135,20 +136,21 @@ func (m *MinioOss) GetFile(filePath, savePath string) (path string, err error) {
 		return
 	}
 	bucketName := utils.MinIoBucketname
+	objectName := filePath[strings.Index(filePath, utils.RESOURCE_DIR):]
 	exists, errBucketExists := minioClient.BucketExists(ctx, bucketName)
 	if errBucketExists != nil || !exists {
 		err = fmt.Errorf("BucketExists: %v; err: %v", exists, errBucketExists)
 		utils.FileLog.Error(err.Error())
 		return
 	}
-	ext, err := m.GetExt(filePath)
+	ext, err := m.GetExt(objectName)
 	if err != nil {
 		err = fmt.Errorf("GetExt: %v; err: %v", ext, err)
 		utils.FileLog.Error(err.Error())
 		return
 	}
 	path = savePath + ext
-	err = minioClient.FGetObject(ctx, bucketName, filePath, path, minio.GetObjectOptions{})
+	err = minioClient.FGetObject(ctx, bucketName, objectName, path, minio.GetObjectOptions{})
 	if err != nil {
 		utils.FileLog.Error(err.Error())
 		return