Infrastructure/Cloudreve
0
Fork 0
Code Issues Pull requests Activity

Fix: incorrect capacity unit for OSS traffic limit

Browse source
This commit is contained in:
HFO4 2020-03-15 09:56:50 +08:00
parent 15074015b3
commit d1ca65461c
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/filesystem/driver/oss/handler_test.go
View file

@ -117,7 +117,7 @@ func TestDriver_Source(t *testing.T) {
// 限速 + 下载 // 限速 + 下载
{ {
ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, model.File{Name: "123.txt"}) ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, model.File{Name: "123.txt"})
res, err := handler.Source(ctx, "/123", url.URL{}, 10, true, 819201) res, err := handler.Source(ctx, "/123", url.URL{}, 10, true, 102401)
asserts.NoError(err) asserts.NoError(err)
resURL, err := url.Parse(res) resURL, err := url.Parse(res)
asserts.NoError(err) asserts.NoError(err)
@ -125,7 +125,7 @@ func TestDriver_Source(t *testing.T) {
asserts.NotEmpty(query.Get("Signature")) asserts.NotEmpty(query.Get("Signature"))
asserts.NotEmpty(query.Get("Expires")) asserts.NotEmpty(query.Get("Expires"))
asserts.Equal("ak", query.Get("OSSAccessKeyId")) asserts.Equal("ak", query.Get("OSSAccessKeyId"))
asserts.EqualValues("819201", query.Get("x-oss-traffic-limit")) asserts.EqualValues("819208", query.Get("x-oss-traffic-limit"))
asserts.NotEmpty(query.Get("response-content-disposition")) asserts.NotEmpty(query.Get("response-content-disposition"))
} }

3
pkg/filesystem/driver/oss/handller.go
View file

@ -248,6 +248,9 @@ func (handler Driver) Source(
signOptions = append(signOptions, oss.ResponseContentDisposition("attachment; filename=\""+url.PathEscape(fileName)+"\"")) signOptions = append(signOptions, oss.ResponseContentDisposition("attachment; filename=\""+url.PathEscape(fileName)+"\""))
} }
if speed > 0 { if speed > 0 {
// Byte 转换为 bit
speed *= 8
// OSS对速度值有范围限制 // OSS对速度值有范围限制
if speed < 819200 { if speed < 819200 {
speed = 819200 speed = 819200

5
service/admin/policy.go
View file

@ -54,6 +54,11 @@ type PolicyService struct {
// Delete 删除存储策略 // Delete 删除存储策略
func (service *PolicyService) Delete() serializer.Response { func (service *PolicyService) Delete() serializer.Response {
// 禁止删除默认策略
if service.ID == 1 {
return serializer.Err(serializer.CodeNoPermissionErr, "默认存储策略无法删除", nil)
}
policy, err := model.GetPolicyByID(service.ID) policy, err := model.GetPolicyByID(service.ID)
if err != nil { if err != nil {
return serializer.Err(serializer.CodeNotFound, "存储策略不存在", err) return serializer.Err(serializer.CodeNotFound, "存储策略不存在", err)