diff --git a/.DS_Store b/.DS_Store index ea6c208..910c388 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/backend/providers/ali/oss_client.go b/backend/providers/ali/oss_client.go index 8a761ff..2754f6b 100644 --- a/backend/providers/ali/oss_client.go +++ b/backend/providers/ali/oss_client.go @@ -9,6 +9,25 @@ import ( "github.com/aliyun/alibabacloud-oss-go-sdk-v2/oss" ) +type OSSOption func(*OSSOptions) + +type OSSOptions struct { + internal bool + expire *time.Duration +} + +func WithExpire(expire time.Duration) OSSOption { + return func(o *OSSOptions) { + o.expire = &expire + } +} + +func WithInternal(internal bool) OSSOption { + return func(o *OSSOptions) { + o.internal = internal + } +} + type OSSClient struct { client *oss.Client internalClient *oss.Client @@ -23,36 +42,70 @@ func (c *OSSClient) GetClient() *oss.Client { return c.client } -func (c *OSSClient) PreSignUpload(ctx context.Context, path, mimeType string) (*oss.PresignResult, error) { +func (c *OSSClient) PreSignUpload(ctx context.Context, path, mimeType string, opts ...OSSOption) (*oss.PresignResult, error) { request := &oss.PutObjectRequest{ Bucket: oss.Ptr(c.config.Bucket), Key: oss.Ptr(c.GetSavePath(path)), ContentType: oss.Ptr(mimeType), } - return c.client.Presign(ctx, request) + opt := &OSSOptions{} + for _, o := range opts { + o(opt) + } + + client := c.client + if opt.internal { + client = c.internalClient + } + + return client.Presign(ctx, request) } -func (c *OSSClient) Download(ctx context.Context, path, dest string) error { +func (c *OSSClient) Download(ctx context.Context, path, dest string, opts ...OSSOption) error { request := &oss.GetObjectRequest{ Bucket: oss.Ptr(c.config.Bucket), Key: oss.Ptr(path), } - _, err := c.internalClient.GetObjectToFile(ctx, request, dest) - if err != nil { + opt := &OSSOptions{} + for _, o := range opts { + o(opt) + } + + client := c.client + if opt.internal { + client = c.internalClient + } + + if _, err := client.GetObjectToFile(ctx, request, dest); err != nil { return err } return nil } // GetSignedUrl -func (c *OSSClient) GetSignedUrl(ctx context.Context, path string) (string, error) { +func (c *OSSClient) GetSignedUrl(ctx context.Context, path string, opts ...OSSOption) (string, error) { request := &oss.GetObjectRequest{ Bucket: oss.Ptr(c.config.Bucket), Key: oss.Ptr(path), } - preSign, err := c.client.Presign(ctx, request, oss.PresignExpires(time.Minute*5)) + opt := &OSSOptions{} + for _, o := range opts { + o(opt) + } + + expire := time.Minute * 5 + if opt.expire != nil { + expire = *opt.expire + } + + client := c.client + if opt.internal { + client = c.internalClient + } + + preSign, err := client.Presign(ctx, request, oss.PresignExpires(expire)) if err != nil { return "", err } @@ -60,27 +113,46 @@ func (c *OSSClient) GetSignedUrl(ctx context.Context, path string) (string, erro } // Delete -func (c *OSSClient) Delete(ctx context.Context, path string) error { +func (c *OSSClient) Delete(ctx context.Context, path string, opts ...OSSOption) error { request := &oss.DeleteObjectRequest{ Bucket: oss.Ptr(c.config.Bucket), Key: oss.Ptr(path), } - _, err := c.internalClient.DeleteObject(ctx, request) - if err != nil { + opt := &OSSOptions{} + for _, o := range opts { + o(opt) + } + + client := c.client + if opt.internal { + client = c.internalClient + } + + if _, err := client.DeleteObject(ctx, request); err != nil { return err } return nil } // Upload -func (c *OSSClient) Upload(ctx context.Context, input, dst string) error { +func (c *OSSClient) Upload(ctx context.Context, input, dst string, opts ...OSSOption) error { request := &oss.PutObjectRequest{ Bucket: oss.Ptr(c.config.Bucket), Key: oss.Ptr(dst), } - if _, err := c.internalClient.PutObjectFromFile(ctx, request, input); err != nil { + opt := &OSSOptions{} + for _, o := range opts { + o(opt) + } + + client := c.client + if opt.internal { + client = c.internalClient + } + + if _, err := client.PutObjectFromFile(ctx, request, input); err != nil { return err } return nil