Merge branch 'debug'

main.go

@@ -25,9 +25,7 @@ func main() {
 	web.BConfig.MaxMemory = 1024 * 1024 * 128
 	web.BConfig.RecoverFunc = Recover
 
-	if utils.MinioClient != nil {
-		services.RepairImageData()
-	}
+	services.RepairImageData()
 	web.Run()
 }
 

utils/config.go

@@ -15,7 +15,6 @@ var (
 	REDIS_CACHE string      //缓存地址
 	Rc          RedisClient //redis缓存
 	PRCPool     ClientPool  //rpc连接池
-	MinioClient *MinioOss
 )
 var ObjectStorageClient string // 目前有oss minio，默认oss
 // 推送模版消息
@@ -256,5 +255,5 @@ func init() {
 
 	Rc = redisClient
 
-	MinioClient = DefaultClient()
+	//MinioClient = DefaultClient()
 }

utils/minio.go

@@ -1,125 +0,0 @@
-package utils
-
-import (
-	"context"
-	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio-go/v7/pkg/credentials"
-	"sync"
-	"time"
-)
-
-const (
-	DefaultExpiredTime = 30 * time.Minute
-)
-
-var (
-	once        sync.Once
-	minioClient *MinioOss
-)
-
-type MinioOss struct {
-	bucketName  string
-	ObjectName  string
-	minioClient *minio.Client
-	ExpiredTime time.Duration
-}
-
-func (mo *MinioOss) oss() *minio.Client {
-	return mo.minioClient
-}
-func (mo *MinioOss) GetObject(objectName string, filePath string) (err error) {
-	err = minioClient.oss().FGetObject(context.Background(), mo.GetBucketName(), objectName, filePath, minio.GetObjectOptions{})
-	return
-}
-func (mo *MinioOss) SaveObject(objectName string, filePath string) (err error) {
-	_, err = minioClient.oss().FPutObject(context.Background(), mo.GetBucketName(), objectName, filePath, minio.PutObjectOptions{})
-	return
-}
-func (mo *MinioOss) GetState(objectName string) (state minio.ObjectInfo, err error) {
-	state, err = minioClient.oss().StatObject(context.Background(), mo.GetBucketName(), objectName, minio.GetObjectOptions{})
-	return
-}
-func (mo *MinioOss) GetObjectExt(contentType string) (ext string) {
-	return getFileExtensionFromContentType(contentType)
-}
-func getFileExtensionFromContentType(contentType string) string {
-	switch contentType {
-	case "image/jpeg":
-		return ".jpg"
-	case "image/png":
-		return ".png"
-	case "application/pdf":
-		return ".pdf"
-	case "application/msword":
-		return ".doc"
-	case "application/vnd.openxmlformats-officedocument.wordprocessingml.document":
-		return ".docx"
-	case "application/vnd.ms-excel":
-		return ".xls"
-	case "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet":
-		return ".xlsx"
-	case "text/plain":
-		return ".txt"
-	case "application/json":
-		return ".json"
-	case "application/octet-stream":
-		return ".bin"
-	default:
-		return ""
-	}
-}
-
-func DefaultClient() *MinioOss {
-	once.Do(func() {
-		if minioClient == nil {
-			// 此处兼容一下前后端endpoint不一致的情况, 前端用minio_endpoint后端用minio_back_endpoint, minio_back_endpoint为空则都取前者
-			endpoint := MinIoEndpoint
-			if MinIoBackEndpoint != "" {
-				endpoint = MinIoBackEndpoint
-			}
-			accessKeyID := MinIoAccessKeyId
-			secretAccessKey := MinIoAccessKeySecret
-			useSSL := false
-			if MinIoUseSSL == "true" {
-				useSSL = true
-			}
-			client, err := minio.New(endpoint, &minio.Options{
-				Creds:  credentials.NewStaticV4(accessKeyID, secretAccessKey, ""),
-				Secure: useSSL,
-			})
-			if err != nil {
-				FileLog.Error("初始化minio客户端失败: %s", err)
-			}
-			bucketName := MinIoBucketname
-			exists, errBucketExists := client.BucketExists(context.Background(), bucketName)
-			if errBucketExists != nil || !exists {
-				FileLog.Error("BucketExists: %v; err: %v", exists, errBucketExists)
-			}
-			minioClient = &MinioOss{
-				minioClient: client,
-				bucketName:  bucketName,
-				ExpiredTime: DefaultExpiredTime,
-			}
-		}
-	})
-	return minioClient
-}
-
-func (mo *MinioOss) GetBucketName() string {
-	return mo.bucketName
-}
-func (mo *MinioOss) GetExpiredTime() time.Duration {
-	return mo.ExpiredTime
-}
-
-// 生成预签名的PUT URL
-func (mo *MinioOss) GeneratePreSignedPutURLHandler(objectName string) (url string, err error) {
-	// 生成预签名的PUT URL
-	PreSignedURL, err := minioClient.oss().PresignedPutObject(context.Background(), minioClient.GetBucketName(), objectName, minioClient.GetExpiredTime())
-	if err != nil {
-		FileLog.Error("生成预签名的PUT URL失败: %s", err)
-		return
-	}
-	url = PreSignedURL.String()
-	return
-}

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