Browse Source

Feat: adapt minio for S3 policy and fix listing files

pull/630/head
HFO4 5 years ago
parent
commit
95f318e069
  1. 2
      assets
  2. 2
      models/policy.go
  3. 7
      pkg/filesystem/driver/s3/handler.go

2
assets

@ -1 +1 @@
Subproject commit f342a2a7774c5163f8d5a6760b556b69d6fe498f
Subproject commit 8ec4514b7690eef20b283c1f00ee2d921f19ae7d

2
models/policy.go

@ -52,7 +52,7 @@ type PolicyOption struct {
OdRedirect string `json:"od_redirect,omitempty"` OdRedirect string `json:"od_redirect,omitempty"`
// Region 区域代码 // Region 区域代码
Region string `json:"region"`
Region string `json:"region,omitempty"`
} }
var thumbSuffix = map[string][]string{ var thumbSuffix = map[string][]string{

7
pkg/filesystem/driver/s3/handler.go

@ -87,10 +87,9 @@ func (handler Driver) List(ctx context.Context, base string, recursive bool) ([]
} }
opt := &s3.ListObjectsInput{ opt := &s3.ListObjectsInput{
Bucket: &handler.Policy.BucketName,
Prefix: &base,
EncodingType: aws.String(""),
MaxKeys: aws.Int64(1000),
Bucket: &handler.Policy.BucketName,
Prefix: &base,
MaxKeys: aws.Int64(1000),
} }
// 是否为递归列出 // 是否为递归列出

Loading…
Cancel
Save