From b9ad013ae22ca24baaa6c7b6b6d1a2ffc6186c03 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 2 Nov 2022 16:00:22 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E5=BC=80=E6=BA=90=E4=BA=91=E7=AB=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9C=8D=E5=8A=A1=E5=AE=9E=E7=8E=B0=20https:?= =?UTF-8?q?//github.com/siyuan-note/siyuan/issues/6445?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/conf/sync.go | 2 +- kernel/go.mod | 2 +- kernel/go.sum | 4 ++-- kernel/model/repository.go | 8 +++++++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/kernel/conf/sync.go b/kernel/conf/sync.go index adcae7861..6b5cd3936 100644 --- a/kernel/conf/sync.go +++ b/kernel/conf/sync.go @@ -41,8 +41,8 @@ type OSS struct { Endpoint string `json:"endpoint"` // 服务端点 AccessKey string `json:"accessKey"` // Access Key SecretKey string `json:"secretKey"` // Secret Key - Regin string `json:"regin"` // 存储区域 Bucket string `json:"bucket"` // 存储空间 + Region string `json:"region"` // 存储区域 } const ( diff --git a/kernel/go.mod b/kernel/go.mod index 49f7bb300..5106a18aa 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -36,7 +36,7 @@ require ( github.com/panjf2000/ants/v2 v2.6.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/radovskyb/watcher v1.0.7 - github.com/siyuan-note/dejavu v0.0.0-20221102025652-e55edc4ad90c + github.com/siyuan-note/dejavu v0.0.0-20221102075801-148594bd43e2 github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 github.com/siyuan-note/eventbus v0.0.0-20220916025349-3ac6e75522da github.com/siyuan-note/filelock v0.0.0-20221007163134-7e64809023ef diff --git a/kernel/go.sum b/kernel/go.sum index 8ca5afa43..2903e393a 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -353,8 +353,8 @@ github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1l github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= -github.com/siyuan-note/dejavu v0.0.0-20221102025652-e55edc4ad90c h1:E+vDe5m9l3VD+Id7p3ELDSHjk/BH6u7woCILIdXEEJ0= -github.com/siyuan-note/dejavu v0.0.0-20221102025652-e55edc4ad90c/go.mod h1:+U86jfsvpacZBThE3Ouf/ZQ4EsB4jGPJsMO2iuRv0LQ= +github.com/siyuan-note/dejavu v0.0.0-20221102075801-148594bd43e2 h1:EjflBUJdr+vE56QHL/CaDGIiMmXl6AJLc0Ged9yVDL8= +github.com/siyuan-note/dejavu v0.0.0-20221102075801-148594bd43e2/go.mod h1:+U86jfsvpacZBThE3Ouf/ZQ4EsB4jGPJsMO2iuRv0LQ= github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE= github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw= github.com/siyuan-note/eventbus v0.0.0-20220916025349-3ac6e75522da h1:/jNhl7LC+9BhkWvNxuJDdsNfA/2wvfuj9mqWx4CbV90= diff --git a/kernel/model/repository.go b/kernel/model/repository.go index d40839bd3..25e4756bc 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -1017,7 +1017,7 @@ func buildCloudConf() (ret *cloud.Conf, err error) { } userId, token, availableSize := "0", "", int64(1024*1024*1024*1024*2) - if nil != Conf.User { + if nil != Conf.User && conf.ProviderSiYuan == Conf.Sync.Provider { userId = Conf.User.UserId token = Conf.User.UserToken availableSize = Conf.User.GetCloudRepoAvailableSize() @@ -1029,6 +1029,12 @@ func buildCloudConf() (ret *cloud.Conf, err error) { Token: token, AvailableSize: availableSize, Server: util.AliyunServer, + + Endpoint: Conf.Sync.OSS.Endpoint, + AccessKey: Conf.Sync.OSS.AccessKey, + SecretKey: Conf.Sync.OSS.SecretKey, + Bucket: Conf.Sync.OSS.Bucket, + Region: Conf.Sync.OSS.Region, } return }