From 99993ab8201dc833a4d576d8ba9292a98f065c6f Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 12 Feb 2023 11:41:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:arrow=5Fup:=20=E6=9B=B4=E6=96=B0=E5=86=85?= =?UTF-8?q?=E6=A0=B8=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/go.mod | 2 +- kernel/go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index 4722cb579..05453a759 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -40,7 +40,7 @@ require ( github.com/patrickmn/go-cache v2.1.0+incompatible github.com/radovskyb/watcher v1.0.7 github.com/shirou/gopsutil/v3 v3.23.1 - github.com/siyuan-note/dejavu v0.0.0-20230211034120-c61245065d20 + github.com/siyuan-note/dejavu v0.0.0-20230212031819-32964d704bd2 github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 github.com/siyuan-note/eventbus v0.0.0-20230203085647-fb624740be03 github.com/siyuan-note/filelock v0.0.0-20221117095924-e1947438a35e diff --git a/kernel/go.sum b/kernel/go.sum index 14262fc77..ef73d74b1 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -35,8 +35,6 @@ github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhP github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw= github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef h1:2JGTg6JapxP9/R33ZaagQtAM4EkkSYnIAlOG5EI8gkM= github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef/go.mod h1:JS7hed4L1fj0hXcyEejnW57/7LCetXggd+vwrRnYeII= -github.com/aws/aws-sdk-go v1.44.197 h1:pkg/NZsov9v/CawQWy+qWVzJMIZRQypCtYjUBXFomF8= -github.com/aws/aws-sdk-go v1.44.197/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.199 h1:hYuQmS4zLMJR9v2iOp2UOD6Vi/0V+nwyR/Uhrkrtlbc= github.com/aws/aws-sdk-go v1.44.199/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -266,8 +264,8 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA= github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= -github.com/siyuan-note/dejavu v0.0.0-20230211034120-c61245065d20 h1:dU9TvaIMpVonfTPqlub63dzPBxKreBfttAFoespg5JA= -github.com/siyuan-note/dejavu v0.0.0-20230211034120-c61245065d20/go.mod h1:cqtscX5+nWrRW83+pV6DRkMrmV75FbdVKgj6MV/yMpc= +github.com/siyuan-note/dejavu v0.0.0-20230212031819-32964d704bd2 h1:H+57dsGkLA5b6yqT9/csS+JWX+Lnm8wYyfR5MAQkUlM= +github.com/siyuan-note/dejavu v0.0.0-20230212031819-32964d704bd2/go.mod h1:RGGfMTYCp7iNdAu2x/fjj+svQqD0PKaRgxfOWtYnkHo= 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-20230203085647-fb624740be03 h1:W7nGGluE6sBrFSVkmucGsh2NruleOPsQle7fcAW115o= From 5bac9c4b6dbf5037cc3b873933591c76a1acec54 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 12 Feb 2023 15:42:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:bug:=20`=E5=AE=8C=E5=85=A8=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E5=90=8C=E6=AD=A5`=20=E6=A8=A1=E5=BC=8F=E4=B8=8B=20An?= =?UTF-8?q?droid=20=E5=89=8D=E5=90=8E=E5=8F=B0=E5=88=87=E6=8D=A2=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E8=A7=A6=E5=8F=91=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=20Fix=20https://github.com/siyuan-note/siyua?= =?UTF-8?q?n/issues/7349?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/sync.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kernel/api/sync.go b/kernel/api/sync.go index 9a1cbe63d..37489fd2a 100644 --- a/kernel/api/sync.go +++ b/kernel/api/sync.go @@ -63,10 +63,13 @@ func performSync(c *gin.Context) { } // 云端同步模式支持 `完全手动同步` 模式 https://github.com/siyuan-note/siyuan/issues/7295 - upload := true - if uploadArg := arg["upload"]; nil != uploadArg { - upload = uploadArg.(bool) + uploadArg := arg["upload"] + if nil == uploadArg { + // 必须传入同步方向，未传的话不执行同步 + return } + + upload := uploadArg.(bool) if upload { model.SyncDataUpload() } else {