optimization: change the configuration file from being read globally … (#1935)

* optimization: change the configuration file from being read globally to being read independently. * optimization: change the configuration file from being read globally to being read independently. * optimization: change the configuration file from being read globally to being read independently. * optimization: config file changed to dependency injection. * fix: replace global config with dependency injection * fix: replace global config with dependency injection * fix: import the enough param * fix: import the enough param * fix: import the enough param * fix: fix the component check of path * fix: fix the kafka of tls is nil problem * fix: fix the TLS.CACrt is nil error * fix: fix the valiable shadows problem * fix: fix the comflect * optimization: message remove options. * fix: fix the param pass error * fix: find error * fix: find error * fix: find eror * fix: find error * fix: find error * fix: del the undifined func * fix: find error * fix: fix the error * fix: pass config * fix: find error * fix: find error * fix: find error * fix: find error * fix: find error * fix: fix the config * fix: fix the error * fix: fix the config pass error * fix: fix the eror * fix: fix the error * fix: fix the error * fix: fix the error * fix: find error * fix: fix the error * fix: fix the config * fix: add return err * fix: fix the err2 * fix: err * fix: fix the func * fix: del the chinese comment * fix: fix the func * fix: fix the gateway_test logic * fix: s3 * test * test * fix: not found --------- Co-authored-by: luhaoling <2198702716@qq.com> Co-authored-by: withchao <993506633@qq.com>
2026-05-16 23:09:01 +08:00 · 2024-03-05 17:53:22 +08:00
parent efb8310531
commit 383758782e
114 changed files with 1743 additions and 1802 deletions
@@ -1,275 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// docURL: https://docs.aws.amazon.com/AmazonS3/latest/API/Welcome.html
-
-package aws
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/session"
-	sdk "github.com/aws/aws-sdk-go/service/s3"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/s3"
-)
-
-const (
-	minPartSize int64 = 1024 * 1024 * 1        // 1MB
-	maxPartSize int64 = 1024 * 1024 * 1024 * 5 // 5GB
-	maxNumSize  int64 = 10000
-)
-
-// const (
-// 	imagePng  = "png"
-// 	imageJpg  = "jpg"
-// 	imageJpeg = "jpeg"
-// 	imageGif  = "gif"
-// 	imageWebp = "webp"
-// )
-
-// const successCode = http.StatusOK
-
-// const (
-// 	videoSnapshotImagePng = "png"
-// 	videoSnapshotImageJpg = "jpg"
-// )
-
-func NewAWS() (s3.Interface, error) {
-	conf := config.Config.Object.Aws
-	credential := credentials.NewStaticCredentials(
-		conf.AccessKeyID,     // accessKey
-		conf.AccessKeySecret, // secretKey
-		"")                   // stoken
-
-	sess, err := session.NewSession(&aws.Config{
-		Region:      aws.String(conf.Region), // The area where the bucket is located
-		Credentials: credential,
-	})
-
-	if err != nil {
-		return nil, err
-	}
-	return &Aws{
-		bucket:     conf.Bucket,
-		client:     sdk.New(sess),
-		credential: credential,
-	}, nil
-}
-
-type Aws struct {
-	bucket     string
-	client     *sdk.S3
-	credential *credentials.Credentials
-}
-
-func (a *Aws) Engine() string {
-	return "aws"
-}
-
-func (a *Aws) InitiateMultipartUpload(ctx context.Context, name string) (*s3.InitiateMultipartUploadResult, error) {
-	input := &sdk.CreateMultipartUploadInput{
-		Bucket: aws.String(a.bucket), // TODO: To be verified whether it is required
-		Key:    aws.String(name),
-	}
-	result, err := a.client.CreateMultipartUploadWithContext(ctx, input)
-	if err != nil {
-		return nil, err
-	}
-	return &s3.InitiateMultipartUploadResult{
-		Bucket:   *result.Bucket,
-		Key:      *result.Key,
-		UploadID: *result.UploadId,
-	}, nil
-}
-
-func (a *Aws) CompleteMultipartUpload(ctx context.Context, uploadID string, name string, parts []s3.Part) (*s3.CompleteMultipartUploadResult, error) {
-	sdkParts := make([]*sdk.CompletedPart, len(parts))
-	for i, part := range parts {
-		sdkParts[i] = &sdk.CompletedPart{
-			ETag:       aws.String(part.ETag),
-			PartNumber: aws.Int64(int64(part.PartNumber)),
-		}
-	}
-	input := &sdk.CompleteMultipartUploadInput{
-		Bucket:   aws.String(a.bucket), // TODO: To be verified whether it is required
-		Key:      aws.String(name),
-		UploadId: aws.String(uploadID),
-		MultipartUpload: &sdk.CompletedMultipartUpload{
-			Parts: sdkParts,
-		},
-	}
-	result, err := a.client.CompleteMultipartUploadWithContext(ctx, input)
-	if err != nil {
-		return nil, err
-	}
-	return &s3.CompleteMultipartUploadResult{
-		Location: *result.Location,
-		Bucket:   *result.Bucket,
-		Key:      *result.Key,
-		ETag:     *result.ETag,
-	}, nil
-}
-
-func (a *Aws) PartSize(ctx context.Context, size int64) (int64, error) {
-	if size <= 0 {
-		return 0, errors.New("size must be greater than 0")
-	}
-	if size > maxPartSize*maxNumSize {
-		return 0, fmt.Errorf("AWS size must be less than the maximum allowed limit")
-	}
-	if size <= minPartSize*maxNumSize {
-		return minPartSize, nil
-	}
-	partSize := size / maxNumSize
-	if size%maxNumSize != 0 {
-		partSize++
-	}
-	return partSize, nil
-}
-
-func (a *Aws) DeleteObject(ctx context.Context, name string) error {
-	_, err := a.client.DeleteObjectWithContext(ctx, &sdk.DeleteObjectInput{
-		Bucket: aws.String(a.bucket),
-		Key:    aws.String(name),
-	})
-	return err
-}
-
-func (a *Aws) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyObjectInfo, error) {
-	result, err := a.client.CopyObjectWithContext(ctx, &sdk.CopyObjectInput{
-		Bucket:     aws.String(a.bucket),
-		Key:        aws.String(dst),
-		CopySource: aws.String(src),
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &s3.CopyObjectInfo{
-		ETag: *result.CopyObjectResult.ETag,
-		Key:  dst,
-	}, nil
-}
-
-func (a *Aws) IsNotFound(err error) bool {
-	if err == nil {
-		return false
-	}
-	if aerr, ok := err.(awserr.Error); ok {
-		switch aerr.Code() {
-		case sdk.ErrCodeNoSuchKey:
-			return true
-		default:
-			return false
-		}
-	}
-	return false
-}
-
-func (a *Aws) AbortMultipartUpload(ctx context.Context, uploadID string, name string) error {
-	_, err := a.client.AbortMultipartUploadWithContext(ctx, &sdk.AbortMultipartUploadInput{
-		Bucket:   aws.String(a.bucket),
-		Key:      aws.String(name),
-		UploadId: aws.String(uploadID),
-	})
-	return err
-}
-
-func (a *Aws) ListUploadedParts(ctx context.Context, uploadID string, name string, partNumberMarker int, maxParts int) (*s3.ListUploadedPartsResult, error) {
-	result, err := a.client.ListPartsWithContext(ctx, &sdk.ListPartsInput{
-		Bucket:           aws.String(a.bucket),
-		Key:              aws.String(name),
-		UploadId:         aws.String(uploadID),
-		MaxParts:         aws.Int64(int64(maxParts)),
-		PartNumberMarker: aws.Int64(int64(partNumberMarker)),
-	})
-	if err != nil {
-		return nil, err
-	}
-	parts := make([]s3.UploadedPart, len(result.Parts))
-	for i, part := range result.Parts {
-		parts[i] = s3.UploadedPart{
-			PartNumber:   int(*part.PartNumber),
-			LastModified: *part.LastModified,
-			Size:         *part.Size,
-			ETag:         *part.ETag,
-		}
-	}
-	return &s3.ListUploadedPartsResult{
-		Key:                  *result.Key,
-		UploadID:             *result.UploadId,
-		NextPartNumberMarker: int(*result.NextPartNumberMarker),
-		MaxParts:             int(*result.MaxParts),
-		UploadedParts:        parts,
-	}, nil
-}
-
-func (a *Aws) PartLimit() *s3.PartLimit {
-	return &s3.PartLimit{
-		MinPartSize: minPartSize,
-		MaxPartSize: maxPartSize,
-		MaxNumSize:  maxNumSize,
-	}
-}
-
-func (a *Aws) PresignedPutObject(ctx context.Context, name string, expire time.Duration) (string, error) {
-	req, _ := a.client.PutObjectRequest(&sdk.PutObjectInput{
-		Bucket: aws.String(a.bucket),
-		Key:    aws.String(name),
-	})
-	url, err := req.Presign(expire)
-	if err != nil {
-		return "", err
-	}
-	return url, nil
-}
-
-func (a *Aws) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, error) {
-	result, err := a.client.GetObjectWithContext(ctx, &sdk.GetObjectInput{
-		Bucket: aws.String(a.bucket),
-		Key:    aws.String(name),
-	})
-	if err != nil {
-		return nil, err
-	}
-	res := &s3.ObjectInfo{
-		Key:          name,
-		ETag:         *result.ETag,
-		Size:         *result.ContentLength,
-		LastModified: *result.LastModified,
-	}
-	return res, nil
-}
-
-// AccessURL todo.
-func (a *Aws) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
-	// todo
-	return "", nil
-}
-
-func (a *Aws) FormData(ctx context.Context, name string, size int64, contentType string, duration time.Duration) (*s3.FormData, error) {
-	// todo
-	return nil, nil
-}
-
-func (a *Aws) AuthSign(ctx context.Context, uploadID string, name string, expire time.Duration, partNumbers []int) (*s3.AuthSignResult, error) {
-	// todo
-	return nil, nil
-}
@@ -23,13 +23,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/OpenIMSDK/tools/errs"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"

-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/s3"
 	"github.com/tencentyun/cos-go-sdk-v5"
 )
@@ -50,13 +50,15 @@ const (

 const successCode = http.StatusOK

-const (
-// videoSnapshotImagePng = "png"
-// videoSnapshotImageJpg = "jpg"
-)
+type Config struct {
+	BucketURL    string
+	SecretID     string
+	SecretKey    string
+	SessionToken string
+	PublicRead   bool
+}

-func NewCos() (s3.Interface, error) {
-	conf := config.Config.Object.Cos
+func NewCos(conf Config) (s3.Interface, error) {
 	u, err := url.Parse(conf.BucketURL)
 	if err != nil {
 		panic(err)
@@ -69,6 +71,7 @@ func NewCos() (s3.Interface, error) {
 		},
 	})
 	return &Cos{
+		publicRead: conf.PublicRead,
 		copyURL:    u.Host + "/",
 		client:     client,
 		credential: client.GetCredential(),
@@ -76,6 +79,7 @@ func NewCos() (s3.Interface, error) {
 }

 type Cos struct {
+	publicRead bool
 	copyURL    string
 	client     *cos.Client
 	credential *cos.Credential
@@ -226,7 +230,7 @@ func (c *Cos) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyO
 }

 func (c *Cos) IsNotFound(err error) bool {
-	switch e := err.(type) {
+	switch e := errs.Unwrap(err).(type) {
 	case *cos.ErrorResponse:
 		return e.Response.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
 	default:
@@ -327,7 +331,7 @@ func (c *Cos) AccessURL(ctx context.Context, name string, expire time.Duration,
 }

 func (c *Cos) getPresignedURL(ctx context.Context, name string, expire time.Duration, opt *cos.PresignedURLOptions) (*url.URL, error) {
-	if !config.Config.Object.Cos.PublicRead {
+	if !c.publicRead {
 		return c.client.Object.GetPresignedURL(ctx, http.MethodGet, name, c.credential.SecretID, c.credential.SecretKey, expire, opt)
 	}
 	return c.client.Object.GetObjectURL(name), nil
@@ -42,51 +42,79 @@ func ImageWidthHeight(img image.Image) (int, int) {
 	return bounds.X, bounds.Y
 }

-// resizeImage resizes an image to a specified maximum width and height, maintaining the aspect ratio.
-// If both maxWidth and maxHeight are set to 0, the original image is returned.
-// If both are non-zero, the image is scaled to fit within the constraints while maintaining aspect ratio.
-// If only one of maxWidth or maxHeight is non-zero, the image is scaled accordingly.
 func resizeImage(img image.Image, maxWidth, maxHeight int) image.Image {
 	bounds := img.Bounds()
-	imgWidth, imgHeight := bounds.Dx(), bounds.Dy()
+	imgWidth := bounds.Max.X
+	imgHeight := bounds.Max.Y

-	// Return original image if no resizing is needed.
+	// 计算缩放比例
+	scaleWidth := float64(maxWidth) / float64(imgWidth)
+	scaleHeight := float64(maxHeight) / float64(imgHeight)
+
+	// 如果都为0，则不缩放，返回原始图片
 	if maxWidth == 0 && maxHeight == 0 {
 		return img
 	}

-	var scale float64 = 1
+	// 如果宽度和高度都大于0，则选择较小的缩放比例，以保持宽高比
 	if maxWidth > 0 && maxHeight > 0 {
-		scaleWidth := float64(maxWidth) / float64(imgWidth)
-		scaleHeight := float64(maxHeight) / float64(imgHeight)
-		// Choose the smaller scale to fit both constraints.
-		scale = min(scaleWidth, scaleHeight)
-	} else if maxWidth > 0 {
-		scale = float64(maxWidth) / float64(imgWidth)
-	} else if maxHeight > 0 {
-		scale = float64(maxHeight) / float64(imgHeight)
-	}
-
-	newWidth := int(float64(imgWidth) * scale)
-	newHeight := int(float64(imgHeight) * scale)
-
-	// Resize the image by creating a new image and manually copying pixels.
-	thumbnail := image.NewRGBA(image.Rect(0, 0, newWidth, newHeight))
-	for y := 0; y < newHeight; y++ {
-		for x := 0; x < newWidth; x++ {
-			srcX := int(float64(x) / scale)
-			srcY := int(float64(y) / scale)
-			thumbnail.Set(x, y, img.At(srcX, srcY))
+		scale := scaleWidth
+		if scaleHeight < scaleWidth {
+			scale = scaleHeight
 		}
+
+		// 计算缩略图尺寸
+		thumbnailWidth := int(float64(imgWidth) * scale)
+		thumbnailHeight := int(float64(imgHeight) * scale)
+
+		// 使用"image"库的Resample方法生成缩略图
+		thumbnail := image.NewRGBA(image.Rect(0, 0, thumbnailWidth, thumbnailHeight))
+		for y := 0; y < thumbnailHeight; y++ {
+			for x := 0; x < thumbnailWidth; x++ {
+				srcX := int(float64(x) / scale)
+				srcY := int(float64(y) / scale)
+				thumbnail.Set(x, y, img.At(srcX, srcY))
+			}
+		}
+
+		return thumbnail
 	}

-	return thumbnail
-}
+	// 如果只指定了宽度或高度，则根据最大不超过的规则生成缩略图
+	if maxWidth > 0 {
+		thumbnailWidth := maxWidth
+		thumbnailHeight := int(float64(imgHeight) * scaleWidth)

-// min returns the smaller of x or y.
-func min(x, y float64) float64 {
-	if x < y {
-		return x
+		// 使用"image"库的Resample方法生成缩略图
+		thumbnail := image.NewRGBA(image.Rect(0, 0, thumbnailWidth, thumbnailHeight))
+		for y := 0; y < thumbnailHeight; y++ {
+			for x := 0; x < thumbnailWidth; x++ {
+				srcX := int(float64(x) / scaleWidth)
+				srcY := int(float64(y) / scaleWidth)
+				thumbnail.Set(x, y, img.At(srcX, srcY))
+			}
+		}
+
+		return thumbnail
 	}
-	return y
+
+	if maxHeight > 0 {
+		thumbnailWidth := int(float64(imgWidth) * scaleHeight)
+		thumbnailHeight := maxHeight
+
+		// 使用"image"库的Resample方法生成缩略图
+		thumbnail := image.NewRGBA(image.Rect(0, 0, thumbnailWidth, thumbnailHeight))
+		for y := 0; y < thumbnailHeight; y++ {
+			for x := 0; x < thumbnailWidth; x++ {
+				srcX := int(float64(x) / scaleHeight)
+				srcY := int(float64(y) / scaleHeight)
+				thumbnail.Set(x, y, img.At(srcX, srcY))
+			}
+		}
+
+		return thumbnail
+	}
+
+	// 默认情况下，返回原始图片
+	return img
 }
@@ -18,6 +18,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/OpenIMSDK/tools/errs"
 	"io"
 	"net/http"
 	"net/url"
@@ -33,7 +34,6 @@ import (
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/minio/minio-go/v7/pkg/signer"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/s3"
 )
@@ -43,7 +43,7 @@ const (
 )

 const (
-	minPartSize int64 = 1024 * 1024 * 5        // 1MB
+	minPartSize int64 = 1024 * 1024 * 5        // 5MB
 	maxPartSize int64 = 1024 * 1024 * 1024 * 5 // 5GB
 	maxNumSize  int64 = 10000
 )
@@ -57,13 +57,23 @@ const (

 const successCode = http.StatusOK

-func NewMinio(cache cache.MinioCache) (s3.Interface, error) {
-	u, err := url.Parse(config.Config.Object.Minio.Endpoint)
+type Config struct {
+	Bucket          string
+	Endpoint        string
+	AccessKeyID     string
+	SecretAccessKey string
+	SessionToken    string
+	SignEndpoint    string
+	PublicRead      bool
+}
+
+func NewMinio(cache cache.MinioCache, conf Config) (s3.Interface, error) {
+	u, err := url.Parse(conf.Endpoint)
 	if err != nil {
 		return nil, err
 	}
 	opts := &minio.Options{
-		Creds:  credentials.NewStaticV4(config.Config.Object.Minio.AccessKeyID, config.Config.Object.Minio.SecretAccessKey, config.Config.Object.Minio.SessionToken),
+		Creds:  credentials.NewStaticV4(conf.AccessKeyID, conf.SecretAccessKey, conf.SessionToken),
 		Secure: u.Scheme == "https",
 	}
 	client, err := minio.New(u.Host, opts)
@@ -71,26 +81,27 @@ func NewMinio(cache cache.MinioCache) (s3.Interface, error) {
 		return nil, err
 	}
 	m := &Minio{
-		bucket: config.Config.Object.Minio.Bucket,
+		conf:   conf,
+		bucket: conf.Bucket,
 		core:   &minio.Core{Client: client},
 		lock:   &sync.Mutex{},
 		init:   false,
 		cache:  cache,
 	}
-	if config.Config.Object.Minio.SignEndpoint == "" || config.Config.Object.Minio.SignEndpoint == config.Config.Object.Minio.Endpoint {
+	if conf.SignEndpoint == "" || conf.SignEndpoint == conf.Endpoint {
 		m.opts = opts
 		m.sign = m.core.Client
 		m.prefix = u.Path
 		u.Path = ""
-		config.Config.Object.Minio.Endpoint = u.String()
-		m.signEndpoint = config.Config.Object.Minio.Endpoint
+		conf.Endpoint = u.String()
+		m.signEndpoint = conf.Endpoint
 	} else {
-		su, err := url.Parse(config.Config.Object.Minio.SignEndpoint)
+		su, err := url.Parse(conf.SignEndpoint)
 		if err != nil {
 			return nil, err
 		}
 		m.opts = &minio.Options{
-			Creds:  credentials.NewStaticV4(config.Config.Object.Minio.AccessKeyID, config.Config.Object.Minio.SecretAccessKey, config.Config.Object.Minio.SessionToken),
+			Creds:  credentials.NewStaticV4(conf.AccessKeyID, conf.SecretAccessKey, conf.SessionToken),
 			Secure: su.Scheme == "https",
 		}
 		m.sign, err = minio.New(su.Host, m.opts)
@@ -99,8 +110,8 @@ func NewMinio(cache cache.MinioCache) (s3.Interface, error) {
 		}
 		m.prefix = su.Path
 		su.Path = ""
-		config.Config.Object.Minio.SignEndpoint = su.String()
-		m.signEndpoint = config.Config.Object.Minio.SignEndpoint
+		conf.SignEndpoint = su.String()
+		m.signEndpoint = conf.SignEndpoint
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
@@ -111,6 +122,7 @@ func NewMinio(cache cache.MinioCache) (s3.Interface, error) {
 }

 type Minio struct {
+	conf         Config
 	bucket       string
 	signEndpoint string
 	location     string
@@ -132,31 +144,30 @@ func (m *Minio) initMinio(ctx context.Context) error {
 	if m.init {
 		return nil
 	}
-	conf := config.Config.Object.Minio
-	exists, err := m.core.Client.BucketExists(ctx, conf.Bucket)
+	exists, err := m.core.Client.BucketExists(ctx, m.conf.Bucket)
 	if err != nil {
 		return fmt.Errorf("check bucket exists error: %w", err)
 	}
 	if !exists {
-		if err = m.core.Client.MakeBucket(ctx, conf.Bucket, minio.MakeBucketOptions{}); err != nil {
+		if err = m.core.Client.MakeBucket(ctx, m.conf.Bucket, minio.MakeBucketOptions{}); err != nil {
 			return fmt.Errorf("make bucket error: %w", err)
 		}
 	}
-	if conf.PublicRead {
+	if m.conf.PublicRead {
 		policy := fmt.Sprintf(
 			`{"Version": "2012-10-17","Statement": [{"Action": ["s3:GetObject","s3:PutObject"],"Effect": "Allow","Principal": {"AWS": ["*"]},"Resource": ["arn:aws:s3:::%s/*"],"Sid": ""}]}`,
-			conf.Bucket,
+			m.conf.Bucket,
 		)
-		if err = m.core.Client.SetBucketPolicy(ctx, conf.Bucket, policy); err != nil {
+		if err = m.core.Client.SetBucketPolicy(ctx, m.conf.Bucket, policy); err != nil {
 			return err
 		}
 	}
-	m.location, err = m.core.Client.GetBucketLocation(ctx, conf.Bucket)
+	m.location, err = m.core.Client.GetBucketLocation(ctx, m.conf.Bucket)
 	if err != nil {
 		return err
 	}
 	func() {
-		if conf.SignEndpoint == "" || conf.SignEndpoint == conf.Endpoint {
+		if m.conf.SignEndpoint == "" || m.conf.SignEndpoint == m.conf.Endpoint {
 			return
 		}
 		defer func() {
@@ -176,7 +187,7 @@ func (m *Minio) initMinio(ctx context.Context) error {
 		blc := reflect.ValueOf(m.sign).Elem().FieldByName("bucketLocCache")
 		vblc := reflect.New(reflect.PtrTo(blc.Type()))
 		*(*unsafe.Pointer)(vblc.UnsafePointer()) = unsafe.Pointer(blc.UnsafeAddr())
-		vblc.Elem().Elem().Interface().(interface{ Set(string, string) }).Set(conf.Bucket, m.location)
+		vblc.Elem().Elem().Interface().(interface{ Set(string, string) }).Set(m.conf.Bucket, m.location)
 	}()
 	m.init = true
 	return nil
@@ -341,10 +352,7 @@ func (m *Minio) CopyObject(ctx context.Context, src string, dst string) (*s3.Cop
 }

 func (m *Minio) IsNotFound(err error) bool {
-	if err == nil {
-		return false
-	}
-	switch e := err.(type) {
+	switch e := errs.Unwrap(err).(type) {
 	case minio.ErrorResponse:
 		return e.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
 	case *minio.ErrorResponse:
@@ -397,7 +405,7 @@ func (m *Minio) PresignedGetObject(ctx context.Context, name string, expire time
 		rawURL *url.URL
 		err    error
 	)
-	if config.Config.Object.Minio.PublicRead {
+	if m.conf.PublicRead {
 		rawURL, err = makeTargetURL(m.sign, m.bucket, name, m.location, false, query)
 	} else {
 		rawURL, err = m.sign.PresignedGetObject(ctx, m.bucket, name, expire, query)
@@ -32,7 +32,6 @@ import (

 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/s3"
 )

@@ -52,13 +51,17 @@ const (

 const successCode = http.StatusOK

-/* const (
-	videoSnapshotImagePng = "png"
-	videoSnapshotImageJpg = "jpg"
-) */
+type Config struct {
+	Endpoint        string
+	Bucket          string
+	BucketURL       string
+	AccessKeyID     string
+	AccessKeySecret string
+	SessionToken    string
+	PublicRead      bool
+}

-func NewOSS() (s3.Interface, error) {
-	conf := config.Config.Object.Oss
+func NewOSS(conf Config) (s3.Interface, error) {
 	if conf.BucketURL == "" {
 		return nil, errs.Wrap(errors.New("bucket url is empty"))
 	}
@@ -78,6 +81,7 @@ func NewOSS() (s3.Interface, error) {
 		bucket:      bucket,
 		credentials: client.Config.GetCredentials(),
 		um:          *(*urlMaker)(reflect.ValueOf(bucket.Client.Conn).Elem().FieldByName("url").UnsafePointer()),
+		publicRead:  conf.PublicRead,
 	}, nil
 }

@@ -86,6 +90,7 @@ type OSS struct {
 	bucket      *oss.Bucket
 	credentials oss.Credentials
 	um          urlMaker
+	publicRead  bool
 }

 func (o *OSS) Engine() string {
@@ -236,7 +241,7 @@ func (o *OSS) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyO
 }

 func (o *OSS) IsNotFound(err error) bool {
-	switch e := err.(type) {
+	switch e := errs.Unwrap(err).(type) {
 	case oss.ServiceError:
 		return e.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
 	case *oss.ServiceError:
@@ -282,7 +287,6 @@ func (o *OSS) ListUploadedParts(ctx context.Context, uploadID string, name strin
 }

 func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
-	publicRead := config.Config.Object.Oss.PublicRead
 	var opts []oss.Option
 	if opt != nil {
 		if opt.Image != nil {
@@ -310,7 +314,7 @@ func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration,
 			process += ",format," + format
 			opts = append(opts, oss.Process(process))
 		}
-		if !publicRead {
+		if !o.publicRead {
 			if opt.ContentType != "" {
 				opts = append(opts, oss.ResponseContentType(opt.ContentType))
 			}
@@ -324,7 +328,7 @@ func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration,
 	} else if expire < time.Second {
 		expire = time.Second
 	}
-	if !publicRead {
+	if !o.publicRead {
 		return o.bucket.SignURL(name, http.MethodGet, int64(expire/time.Second), opts...)
 	}
 	rawParams, err := oss.GetRawParams(opts)