third

pkg/common/db/obj/minio.go

@@ -9,6 +9,7 @@ import (
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/minio/minio-go/v7/pkg/s3utils"
+	"net/http"
 	"net/url"
 	"time"
 )
@@ -85,8 +86,18 @@ func (m *minioImpl) DataBucket() string {
 	return m.dataBucket
 }
 
-func (m *minioImpl) GetURL(ctx context.Context, bucket string, name string, expires time.Duration) (string, error) {
-	u, err := m.client.PresignedGetObject(ctx, bucket, name, expires, nil)
+func (m *minioImpl) PresignedGetURL(ctx context.Context, bucket string, name string, expires time.Duration, opt *HeaderOption) (string, error) {
+	var reqParams url.Values
+	if opt != nil {
+		reqParams = make(url.Values)
+		if opt.ContentType != "" {
+			reqParams.Set("response-content-type", opt.ContentType)
+		}
+		if opt.Filename != "" {
+			reqParams.Set("response-content-disposition", "attachment;filename="+opt.Filename)
+		}
+	}
+	u, err := m.client.PresignedGetObject(ctx, bucket, name, expires, reqParams)
 	if err != nil {
 		return "", err
 	}
@@ -177,9 +188,9 @@ func (m *minioImpl) IsNotFound(err error) bool {
 	}
 	switch e := err.(type) {
 	case minio.ErrorResponse:
-		return e.StatusCode == 404 && e.Code == "NoSuchKey"
+		return e.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
 	case *minio.ErrorResponse:
-		return e.StatusCode == 404 && e.Code == "NoSuchKey"
+		return e.StatusCode == http.StatusNotFound || e.Code == "NoSuchKey"
 	default:
 		return false
 	}

pkg/common/db/obj/obj.go

@@ -19,6 +19,11 @@ type ApplyPutArgs struct {
 	MaxObjectSize int64
 }
 
+type HeaderOption struct {
+	ContentType string
+	Filename    string
+}
+
 type ObjectInfo struct {
 	Size int64
 	Hash string
@@ -37,9 +42,8 @@ type Interface interface {
 	TempBucket() string
 	// DataBucket 永久存储的桶名
 	DataBucket() string
-	// GetURL 通过桶名和对象名返回URL
-	//GetURL(bucket string, name string) string
-	GetURL(ctx context.Context, bucket string, name string, expires time.Duration) (string, error)
+	// PresignedGetURL 通过桶名和对象名返回URL
+	PresignedGetURL(ctx context.Context, bucket string, name string, expires time.Duration, opt *HeaderOption) (string, error)
 	// PresignedPutURL 申请上传,返回PUT的上传地址
 	PresignedPutURL(ctx context.Context, args *ApplyPutArgs) (string, error)
 	// GetObjectInfo 获取对象信息