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

s3 config

Browse Source
This commit is contained in:
withchao 2023-07-12 12:02:40 +08:00
parent d7c66c6f45
commit a2fc790cba
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/config.yaml
View File

@ -59,14 +59,14 @@ api:
listenIP: #默认为0.0.0.0 listenIP: #默认为0.0.0.0
object: object:
enable: minio #使用minio enable: "minio" #使用minio
apiURL: http://127.0.0.1:10002/object/ apiURL: "http://127.0.0.1:10002/object/"
minio: minio:
bucket: "openim" #不建议修改 bucket: "openim" #不建议修改
endpoint: http://127.0.0.1:10005 #minio对外服务的ip和端口，app要能访问此ip和端口 endpoint: "http://127.0.0.1:10005" #minio对外服务的ip和端口，app要能访问此ip和端口
accessKeyID: root #ID accessKeyID: "root" #ID
secretAccessKey: openIM123 #秘钥 secretAccessKey: "openIM123" #秘钥
sessionToken: #token sessionToken: "" #token
cos: #tencent cos cos: #tencent cos
bucketURL: "https://temp-1252357374.cos.ap-chengdu.myqcloud.com" bucketURL: "https://temp-1252357374.cos.ap-chengdu.myqcloud.com"
secretID: "" secretID: ""

4
pkg/common/config/config.go
View File

@ -110,7 +110,7 @@ type config struct {
SecretID string `yaml:"secretID"` SecretID string `yaml:"secretID"`
SecretKey string `yaml:"secretKey"` SecretKey string `yaml:"secretKey"`
SessionToken string `yaml:"sessionToken"` SessionToken string `yaml:"sessionToken"`
} `yaml:"tencent"` } `yaml:"cos"`
Oss struct { Oss struct {
Endpoint string `yaml:"endpoint"` Endpoint string `yaml:"endpoint"`
Bucket string `yaml:"bucket"` Bucket string `yaml:"bucket"`
@ -118,7 +118,7 @@ type config struct {
AccessKeyID string `yaml:"accessKeyID"` AccessKeyID string `yaml:"accessKeyID"`
AccessKeySecret string `yaml:"accessKeySecret"` AccessKeySecret string `yaml:"accessKeySecret"`
SessionToken string `yaml:"sessionToken"` SessionToken string `yaml:"sessionToken"`
} `yaml:"ali"` } `yaml:"oss"`
} `yaml:"object"` } `yaml:"object"`
RpcPort struct { RpcPort struct {

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

@ -33,17 +33,23 @@ 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{
copyURL: u.Host + "/", statObjectURL: statObjectURL,
client: client, copyURL: u.Host + "/",
credential: client.GetCredential(), client: client,
credential: client.GetCredential(),
}, nil }, nil
} }
type Cos struct { type Cos struct {
copyURL string statObjectURL string
client *cos.Client copyURL string
credential *cos.Credential client *cos.Client
credential *cos.Credential
} }
func (c *Cos) Engine() string { func (c *Cos) Engine() string {
@ -59,6 +65,7 @@ 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
@ -166,7 +173,10 @@ func (c *Cos) DeleteObject(ctx context.Context, name string) error {
} }
func (c *Cos) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, error) { func (c *Cos) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, error) {
info, err := c.client.Object.Head(ctx, name, nil) if name != "" && name[0] == '/' {
name = name[1:]
}
info, err := c.client.Object.Head(ctx, c.statObjectURL+name, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }