Merge remote-tracking branch 'origin/dev' into dev

app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy

@@ -5,7 +5,7 @@
 	"Properties": {
 		"id": "20210721112206-mhr9wxi",
 		"title": "Data sync",
-		"updated": "20230219121759"
+		"updated": "20230220103712"
 	},
 	"Children": [
 		{
@@ -195,7 +195,70 @@
 				},
 				{
 					"Type": "NodeText",
-					"Data": "​: If the amount of data is large, it is recommended to export the data package through "
+					"Data": "​​: "
+				}
+			]
+		},
+		{
+			"ID": "20230220103708-l6sdi3r",
+			"Type": "NodeList",
+			"ListData": {},
+			"Properties": {
+				"id": "20230220103708-l6sdi3r",
+				"updated": "20230220103712"
+			},
+			"Children": [
+				{
+					"ID": "20230220103711-5uo9kru",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230220103711-5uo9kru",
+						"updated": "20230220103712"
+					},
+					"Children": [
+						{
+							"ID": "20230220103711-ur0xszr",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230220103711-ur0xszr",
+								"updated": "20230220103712"
+							},
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "Before enabling synchronization, please ensure that the system time of all devices participating in the synchronization is consistent"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230220103708-fmphm6k",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230220103708-fmphm6k",
+						"updated": "20230220103708"
+					},
+					"Children": [
+						{
+							"ID": "20230220103708-ml52xbc",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230220103708-ml52xbc",
+								"updated": "20230220103710"
+							},
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "If the amount of data is large, it is recommended to export the data package through "
 								},
 								{
 									"Type": "NodeTextMark",
@@ -213,7 +276,11 @@
 								},
 								{
 									"Type": "NodeText",
-					"Data": "​, and finally configure synchronization."
+									"Data": "​, and finally configure synchronization"
+								}
+							]
+						}
+					]
 				}
 			]
 		},

app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy

@@ -5,7 +5,7 @@
 	"Properties": {
 		"id": "20210721103420-vn6g2yy",
 		"title": "数据同步",
-		"updated": "20230219121719"
+		"updated": "20230220103623"
 	},
 	"Children": [
 		{
@@ -210,7 +210,70 @@
 				},
 				{
 					"Type": "NodeText",
-					"Data": "​：如果数据量较大，建议通过设置中的 "
+					"Data": "​​："
+				}
+			]
+		},
+		{
+			"ID": "20230220103537-66ectjt",
+			"Type": "NodeList",
+			"ListData": {},
+			"Properties": {
+				"id": "20230220103537-66ectjt",
+				"updated": "20230220103623"
+			},
+			"Children": [
+				{
+					"ID": "20230220103539-wkjhxe6",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230220103539-wkjhxe6",
+						"updated": "20230220103623"
+					},
+					"Children": [
+						{
+							"ID": "20230220103539-gdkhwg2",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230220103539-gdkhwg2",
+								"updated": "20230220103623"
+							},
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "启用同步前，请确保参与同步的所有设备系统时间一致"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230220103538-ry0bpxw",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230220103538-ry0bpxw",
+						"updated": "20230220103538"
+					},
+					"Children": [
+						{
+							"ID": "20230220103538-63twmyh",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230220103538-63twmyh",
+								"updated": "20230220103539"
+							},
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "如果数据量较大，建议通过设置中的 "
 								},
 								{
 									"Type": "NodeTextMark",
@@ -228,7 +291,11 @@
 								},
 								{
 									"Type": "NodeText",
-					"Data": "​，最后再配置同步。"
+									"Data": "​，最后再配置同步"
+								}
+							]
+						}
+					]
 				}
 			]
 		},

app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy

@@ -5,7 +5,7 @@
 	"Properties": {
 		"id": "20211226121438-xaafdo8",
 		"title": "資料同步",
-		"updated": "20230219121811"
+		"updated": "20230220103721"
 	},
 	"Children": [
 		{
@@ -194,7 +194,70 @@
 				},
 				{
 					"Type": "NodeText",
-					"Data": "​：如果數據量較大，建議通過設置中的 "
+					"Data": "​​："
+				}
+			]
+		},
+		{
+			"ID": "20230220103637-v3wy8lv",
+			"Type": "NodeList",
+			"ListData": {},
+			"Properties": {
+				"id": "20230220103637-v3wy8lv",
+				"updated": "20230220103721"
+			},
+			"Children": [
+				{
+					"ID": "20230220103642-bba2hvw",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230220103642-bba2hvw",
+						"updated": "20230220103721"
+					},
+					"Children": [
+						{
+							"ID": "20230220103642-jkqyctc",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230220103642-jkqyctc",
+								"updated": "20230220103721"
+							},
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "啟用同步前，請確保參與同步的所有設備系統時間一致"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230220103640-opmw3uo",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230220103640-opmw3uo",
+						"updated": "20230220103640"
+					},
+					"Children": [
+						{
+							"ID": "20230220103640-gpbn39m",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230220103640-gpbn39m",
+								"updated": "20230220103641"
+							},
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "如果數據量較大，建議通過設置中的 "
 								},
 								{
 									"Type": "NodeTextMark",
@@ -212,7 +275,11 @@
 								},
 								{
 									"Type": "NodeText",
-					"Data": "​，最後再配置同步。"
+									"Data": "​，最後再配置同步"
+								}
+							]
+						}
+					]
 				}
 			]
 		},

kernel/go.mod

@@ -41,7 +41,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-20230218054009-995bd41a222a
+	github.com/siyuan-note/dejavu v0.0.0-20230220015315-3ef79d7929d4
 	github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75
 	github.com/siyuan-note/eventbus v0.0.0-20230216103454-41885eac6c2b
 	github.com/siyuan-note/filelock v0.0.0-20221117095924-e1947438a35e
@@ -101,7 +101,7 @@ require (
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/onsi/ginkgo/v2 v2.8.2 // indirect
+	github.com/onsi/ginkgo/v2 v2.8.3 // indirect
 	github.com/open-spaced-repetition/go-fsrs v0.1.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/pkg/errors v0.9.1 // indirect

kernel/go.sum

@@ -214,8 +214,8 @@ github.com/mssola/user_agent v0.5.3 h1:lBRPML9mdFuIZgI2cmlQ+atbpJdLdeVl2IDodjBR5
 github.com/mssola/user_agent v0.5.3/go.mod h1:TTPno8LPY3wAIEKRpAtkdMT0f8SE24pLRGPahjCH4uw=
 github.com/olahol/melody v1.1.1 h1:amgBhR7pDY0rA0JHWprgLF0LnVztognAwEQgf/WYLVM=
 github.com/olahol/melody v1.1.1/go.mod h1:GgkTl6Y7yWj/HtfD48Q5vLKPVoZOH+Qqgfa7CvJgJM4=
-github.com/onsi/ginkgo/v2 v2.8.2 h1:rWe/YULhcr//R7U3kN11ISrlT7aVPW9K/AbXbGakXqY=
+github.com/onsi/ginkgo/v2 v2.8.3 h1:RpbK1G8nWPNaCVFBWsOGnEQQGgASi6b8fxcWBvDYjxQ=
-github.com/onsi/ginkgo/v2 v2.8.2/go.mod h1:88PAUAEownL21VmApu+QCg9mlPSt7W8fnb6LsLfV9Eg=
+github.com/onsi/ginkgo/v2 v2.8.3/go.mod h1:6OaUA8BCi0aZfmzYT/q9AacwTzDpNbxILUT+TlBq6MY=
 github.com/onsi/gomega v1.27.0 h1:QLidEla4bXUuZVFa4KX6JHCsuGgbi85LC/pCHrt/O08=
 github.com/open-spaced-repetition/go-fsrs v0.1.0 h1:6H1nCuxuR9p/GmKji0zET1uT5KDwOmW++k7jgr8L0Gk=
 github.com/open-spaced-repetition/go-fsrs v0.1.0/go.mod h1:H07GOB0A1OBeu3401x8qWKGaa43QjfrDoWy9nba7QCc=
@@ -267,8 +267,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-20230218054009-995bd41a222a h1:tKUq/k29oDWUx8uu6hfVtC1ihb855scMfl/ItJyItDg=
+github.com/siyuan-note/dejavu v0.0.0-20230220015315-3ef79d7929d4 h1:J9bDUdn+ZjPUnUbOwrFMdqabEg+vrakdj/QhPBpiesA=
-github.com/siyuan-note/dejavu v0.0.0-20230218054009-995bd41a222a/go.mod h1:NPdIkEzOxCYs4YQvdAWble6mTQM9I7++I0OxpIQUgPM=
+github.com/siyuan-note/dejavu v0.0.0-20230220015315-3ef79d7929d4/go.mod h1:NPdIkEzOxCYs4YQvdAWble6mTQM9I7++I0OxpIQUgPM=
 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-20230216103454-41885eac6c2b h1:828lTUW2C0uNiolODqoACu7J8sDUzswD4Xo04mUombg=