IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +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-10 17:10:00 +08:00
parent cb14fca6c7 a7a2bd3e4f
commit c42a47b6b9
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/common/db/controller/s3.go
+5 -2
View File
@@ -6,6 +6,7 @@ import (
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/cont"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
"path/filepath"
"time"
)
@@ -61,8 +62,10 @@ func (s *s3Database) AccessURL(ctx context.Context, name string, expire time.Dur
return time.Time{}, "", err
}
opt := &s3.AccessURLOption{
ContentType: obj.ContentType,
ContentDisposition: `attachment; filename=` + obj.Name,
ContentType: obj.ContentType,
}
if filename := filepath.Base(obj.Name); filename != "" {
opt.ContentDisposition = `attachment; filename=` + filename
}
expireTime := time.Now().Add(expire)
rawURL, err := s.s3.AccessURL(ctx, obj.Key, expire, opt)