From c62e35534555271218976f812d324c61f4a6f599 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Tue, 26 Apr 2022 19:05:54 +0800 Subject: [PATCH] fix: cannot use LAN OSS endpoint for uploading --- assets | 2 +- pkg/filesystem/driver/oss/handler.go | 4 ++++ pkg/filesystem/manage_test.go | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/assets b/assets index 1daecbf..c4a7dfe 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 1daecbfe7e33a0fa0dd822594432dcba790447f5 +Subproject commit c4a7dfea2c05077e6e7c7042c8598886bf6f5531 diff --git a/pkg/filesystem/driver/oss/handler.go b/pkg/filesystem/driver/oss/handler.go index cc6cb95..62bccbc 100644 --- a/pkg/filesystem/driver/oss/handler.go +++ b/pkg/filesystem/driver/oss/handler.go @@ -408,6 +408,10 @@ func (handler *Driver) signSourceURL(ctx context.Context, path string, ttl int64 // Token 获取上传策略和认证Token func (handler *Driver) Token(ctx context.Context, ttl int64, uploadSession *serializer.UploadSession, file fsctx.FileHeader) (*serializer.UploadCredential, error) { + // 初始化客户端 + if err := handler.InitOSSClient(true); err != nil { + return nil, err + } // 生成回调地址 siteURL := model.GetSiteURL() diff --git a/pkg/filesystem/manage_test.go b/pkg/filesystem/manage_test.go index 03cf94e..eb78f1e 100644 --- a/pkg/filesystem/manage_test.go +++ b/pkg/filesystem/manage_test.go @@ -320,6 +320,12 @@ func TestFileSystem_CreateDirectory(t *testing.T) { _, err = fs.CreateDirectory(ctx, "/") asserts.NoError(err) asserts.NoError(mock.ExpectationsWereMet()) + + // 直接创建根目录, 重设根目录 + fs.Root = &model.Folder{} + _, err = fs.CreateDirectory(ctx, "/") + asserts.NoError(err) + asserts.NoError(mock.ExpectationsWereMet()) } func TestFileSystem_ListDeleteFiles(t *testing.T) {