blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-26 19:46:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3dev' of github.com:OpenIMSDK/Open-IM-Server into v3dev

Browse Source
This commit is contained in:
wangchuxiao 2023-07-12 12:20:44 +08:00
commit 3658f2b198
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/common/db/s3/cos/cos.go
View File

@ -33,12 +33,7 @@ func NewCos() (s3.Interface, error) {
SessionToken: conf.SessionToken, SessionToken: conf.SessionToken,
}, },
}) })
statObjectURL := u.String()
if statObjectURL != "" && statObjectURL[len(statObjectURL)-1] != '/' {
statObjectURL += "/"
}
return &Cos{ return &Cos{
statObjectURL: statObjectURL,
copyURL: u.Host + "/", copyURL: u.Host + "/",
client: client, client: client,
credential: client.GetCredential(), credential: client.GetCredential(),
@ -65,7 +60,6 @@ func (c *Cos) PartLimit() *s3.PartLimit {
} }
func (c *Cos) InitiateMultipartUpload(ctx context.Context, name string) (*s3.InitiateMultipartUploadResult, error) { func (c *Cos) InitiateMultipartUpload(ctx context.Context, name string) (*s3.InitiateMultipartUploadResult, error) {
name = c.client.BaseURL.BucketURL.String() + name
result, _, err := c.client.Object.InitiateMultipartUpload(ctx, name, nil) result, _, err := c.client.Object.InitiateMultipartUpload(ctx, name, nil)
if err != nil { if err != nil {
return nil, err return nil, err