From e8d7e3861da36ff27e59080bbb59ab75af88f115 Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Fri, 15 Sep 2023 15:56:06 +0800
Subject: [PATCH] s3 public read

---
 pkg/common/db/s3/cos/cos.go |  3 +--
 pkg/common/db/s3/oss/oss.go | 17 +++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg/common/db/s3/cos/cos.go b/pkg/common/db/s3/cos/cos.go
index 7add88487..bd9cbac60 100644
--- a/pkg/common/db/s3/cos/cos.go
+++ b/pkg/common/db/s3/cos/cos.go
@@ -18,14 +18,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/tencentyun/cos-go-sdk-v5"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/tencentyun/cos-go-sdk-v5"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/s3"
 )
diff --git a/pkg/common/db/s3/oss/oss.go b/pkg/common/db/s3/oss/oss.go
index 0d59060a4..6a728127b 100644
--- a/pkg/common/db/s3/oss/oss.go
+++ b/pkg/common/db/s3/oss/oss.go
@@ -275,6 +275,7 @@ 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 {
@@ -302,11 +303,13 @@ func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration,
 			process += ",format," + format
 			opts = append(opts, oss.Process(process))
 		}
-		if opt.ContentType != "" {
-			opts = append(opts, oss.ResponseContentType(opt.ContentType))
-		}
-		if opt.Filename != "" {
-			opts = append(opts, oss.ResponseContentDisposition(`attachment; filename=`+strconv.Quote(opt.Filename)))
+		if !publicRead {
+			if opt.ContentType != "" {
+				opts = append(opts, oss.ResponseContentType(opt.ContentType))
+			}
+			if opt.Filename != "" {
+				opts = append(opts, oss.ResponseContentDisposition(`attachment; filename=`+strconv.Quote(opt.Filename)))
+			}
 		}
 	}
 	if expire <= 0 {
@@ -314,15 +317,13 @@ func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration,
 	} else if expire < time.Second {
 		expire = time.Second
 	}
-	if !config.Config.Object.Oss.PublicRead {
+	if !publicRead {
 		return o.bucket.SignURL(name, http.MethodGet, int64(expire/time.Second), opts...)
 	}
 	rawParams, err := oss.GetRawParams(opts)
 	if err != nil {
 		return "", err
 	}
-	l := len(rawParams)
-	_ = l
 	params := getURLParams(*o.bucket.Client.Conn, rawParams)
 	return getURL(o.um, o.bucket.BucketName, name, params).String(), nil
 }