From 2384b02f9582dbd7ea717ca360b99568a131ee7a Mon Sep 17 00:00:00 2001 From: overBaker <55166473+yuhan-feng@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:19:24 +0800 Subject: [PATCH] Add files via upload --- internal/dao/storage/storage.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/dao/storage/storage.go b/internal/dao/storage/storage.go index 8a9cf4cc..0f03fa20 100644 --- a/internal/dao/storage/storage.go +++ b/internal/dao/storage/storage.go @@ -21,9 +21,6 @@ import ( "github.com/rocboss/paopao-ce/internal/core" "github.com/sirupsen/logrus" "github.com/tencentyun/cos-go-sdk-v5" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/aws/aws-sdk-go/service/s3" ) func MustAliossService() (core.ObjectStorageService, core.VersionInfo) { @@ -232,12 +229,15 @@ func MustMinioService() (core.ObjectStorageService, core.VersionInfo) { } func MustS3Service() (core.ObjectStorageService, core.VersionInfo) { - // Initialize AWS S3 client object. - client, err := s3.NewClient(conf.S3Setting.Region, conf.S3Setting.AccessKey, conf.S3Setting.SecretKey) + // Initialize s3 client object use minio-go. + client, err := minio.New(conf.S3Setting.Endpoint, &minio.Options{ + Creds: credentials.NewStaticV4(conf.S3Setting.AccessKey, conf.S3Setting.SecretKey, ""), + Secure: conf.S3Setting.Secure, + }) if err != nil { - logrus.Fatalf("storage.MustS3Service create client failed: %s", err) + logrus.Fatalf("storage.MustS3Service create client failed: %s", err) } - + domain := conf.GetOssDomain() var cs core.OssCreateService if cfg.If("OSS:TempDir") { @@ -265,7 +265,7 @@ func MustS3Service() (core.ObjectStorageService, core.VersionInfo) { } logrus.Debugln("use OSS:Direct feature") } - + obj := &s3Servant{ OssCreateService: cs, client: client,