From 52279c4da668ce086f13c4d972d98ef4ed5ea984 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 11 Nov 2022 23:17:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:art:=20=E6=95=B0=E6=8D=AE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/box.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/model/box.go b/kernel/model/box.go index 324e043e0..173d2e2bb 100644 --- a/kernel/model/box.go +++ b/kernel/model/box.go @@ -62,7 +62,7 @@ func autoStat() { Conf.Stat.TreeCount = treenode.CountTrees() Conf.Stat.CTreeCount = treenode.CeilCount(Conf.Stat.TreeCount) Conf.Stat.BlockCount = treenode.CountBlocks() - Conf.Stat.BlockCount = treenode.CeilCount(Conf.Stat.BlockCount) + Conf.Stat.CBlockCount = treenode.CeilCount(Conf.Stat.BlockCount) Conf.Stat.DataSize, _ = util.SizeOfDirectory(util.DataDir) Conf.Stat.CDataSize = util.CeilSize(Conf.Stat.DataSize) Conf.Save() From b3f85cca145a9389d525c0348efbd948b6bee444 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 11 Nov 2022 23:22:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:art:=20WebDAV=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=B7=B3=E8=BF=87=20HTTPS=20=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E6=A0=A1=E9=AA=8C=20Fix=20https://github.com/siyuan-n?= =?UTF-8?q?ote/siyuan/issues/6556?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/repository.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/model/repository.go b/kernel/model/repository.go index eed555017..8bc1548b3 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -20,10 +20,12 @@ import ( "bytes" "crypto/rand" "crypto/sha256" + "crypto/tls" "encoding/base64" "errors" "fmt" "math" + "net/http" "os" "path" "path/filepath" @@ -830,6 +832,8 @@ func newRepository() (ret *dejavu.Repo, err error) { webdavClient.SetHeader("Authorization", auth) webdavClient.SetHeader("User-Agent", util.UserAgent) webdavClient.SetTimeout(30 * time.Second) + // WebDAV 数据同步跳过 HTTPS 证书校验 https://github.com/siyuan-note/siyuan/issues/6556 + webdavClient.SetTransport(&http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}) cloudRepo = cloud.NewWebDAV(&cloud.BaseCloud{Conf: cloudConf}, webdavClient) default: err = fmt.Errorf("unknown cloud provider [%d]", Conf.Sync.Provider)