blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-11 23:47:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

cicd: robot automated Change

Browse Source
This commit is contained in:
withchao 2023-09-14 10:33:12 +00:00 committed by github-actions[bot]
parent a4fbda85d0
commit 7f77d9e0a9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/common/db/s3/minio/minio.go
View File

@ -140,7 +140,10 @@ func (m *Minio) initMinio(ctx context.Context) error {
} }
} }
if conf.PublicRead { if 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) 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,
)
if err := m.core.Client.SetBucketPolicy(ctx, conf.Bucket, policy); err != nil { if err := m.core.Client.SetBucketPolicy(ctx, conf.Bucket, policy); err != nil {
return err return err
} }

3
pkg/common/db/s3/oss/oss.go
View File

@ -18,7 +18,6 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"github.com/aliyun/aliyun-oss-go-sdk/oss"
"net/http" "net/http"
"net/url" "net/url"
"reflect" "reflect"
@ -26,6 +25,8 @@ import (
"strings" "strings"
"time" "time"
"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/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3"
) )