github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Fix: OSS SDK will encode all object key (#694)" 

This reverts commit 270f617b and fix #802
pull/807/head
HFO4 2021-03-22 16:22:21 +08:00
parent ccaefdab33
commit c0f7214cdb
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -27,4 +27,3 @@ version.lock
*.ini *.ini
conf/conf.ini conf/conf.ini
/statik/ /statik/
/vendor/

2
assets

@ -1 +1 @@
Subproject commit 35c5966f66cd0b67fbd2a3f828ce256302316c17 Subproject commit 51c246ef02e248259ddcf4c2d90e0c5a1af11a48

11
pkg/filesystem/file.go
View File

@ -2,6 +2,8 @@ package filesystem
import ( import (
"context" "context"
"io"
model "github.com/cloudreve/Cloudreve/v3/models" model "github.com/cloudreve/Cloudreve/v3/models"
"github.com/cloudreve/Cloudreve/v3/pkg/conf" "github.com/cloudreve/Cloudreve/v3/pkg/conf"
"github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx" "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx"
@ -9,8 +11,6 @@ import (
"github.com/cloudreve/Cloudreve/v3/pkg/serializer" "github.com/cloudreve/Cloudreve/v3/pkg/serializer"
"github.com/cloudreve/Cloudreve/v3/pkg/util" "github.com/cloudreve/Cloudreve/v3/pkg/util"
"github.com/juju/ratelimit" "github.com/juju/ratelimit"
"io"
"net/url"
) )
/* ============ /* ============
@ -289,11 +289,8 @@ func (fs *FileSystem) SignURL(ctx context.Context, file *model.File, ttl int64,
if err != nil { if err != nil {
return "", serializer.NewError(serializer.CodeNotSet, "无法获取外链", err) return "", serializer.NewError(serializer.CodeNotSet, "无法获取外链", err)
} }
// 阿里云的 golang SDK 会把整个object KEY也编码 临时解决方案是清空`RawPath`让golang的`url.EscapedPath`修正这个问题
// https://github.com/cloudreve/Cloudreve/issues/677 https://github.com/aliyun/aliyun-oss-go-sdk/blob/6f7e8f88c64181cc2d86d8bd46090b68851e645a/oss/conn.go#L767 return source, nil
sourceUrl, _ := url.Parse(source)
sourceUrl.RawPath = ""
return sourceUrl.String(), nil
} }
// ResetFileIfNotExist 重设当前目标文件为 path，如果当前目标为空 // ResetFileIfNotExist 重设当前目标文件为 path，如果当前目标为空