Ver Fonte

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

Vanessa há 2 anos atrás
pai
commit
3000a7463b

+ 2 - 4
README.md

@@ -79,9 +79,7 @@ Cloud services require a paid subscription.
 
 * VIP identity
 * End-to-end encrypted data sync and backup
-* Cloud assets serving
-* WeChat notification
-* Cloud inbox
+* Cloud assets hosting
 
 ## 🏗️ Architecture design and open source ecosystem
 
@@ -279,7 +277,7 @@ The first sub-block under the list item is the block icon omitted. You can move
 
 All local features are free, even for commercial use.
 
-[Cloud Service](https://b3log.org/siyuan/pricing.html) requires an annual subscription. At present, only users in mainland China are supported to subscribe, and users outside of mainland China are not allowed to subscribe.
+[Cloud Service](https://b3log.org/siyuan/en/pricing.html) require a paid subscription to use.
 
 ## 🙏 Acknowledgement
 

+ 1 - 1
README_zh_CN.md

@@ -282,7 +282,7 @@
 
 所有本地功能都是免费的,即使是在商业环境下使用。
 
-[云端服务](https://b3log.org/siyuan/pricing.html)需要年付订阅。目前仅支持中国大陆地区用户订阅,非中国大陆地区用户请勿订阅。
+[云端服务](https://b3log.org/siyuan/pricing.html)需要年付订阅。
 
 如果你没有订阅需求但又想支持开发,欢迎进行捐赠:
 

+ 1 - 1
app/appearance/langs/en_US.json

@@ -431,7 +431,7 @@
   "cloudIntro6": "Unlimited number of devices and number of workspaces",
   "cloudIntro7": "Different local workspaces correspond to different data synchronization directories in the cloud",
   "cloudIntro8": "Different devices keep their own data history, and data that is overwritten or deleted by synchronization will not be lost",
-  "cloudIntro9": "Cloud assets serving service",
+  "cloudIntro9": "Cloud assets hosting service",
   "cloudIntro10": "Upload local asset files to the cloud with one click",
   "cloudIntro11": "One-click to copy the document to the Wechat MP, Zhihu, Yuque etc. platforms",
   "selectAll": "Select all",

+ 233 - 6
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0.sy

@@ -5,17 +5,244 @@
 	"Properties": {
 		"icon": "1f308",
 		"id": "20210808180303-v9awwp0",
-		"title": "Cloud",
-		"updated": "20210808180303"
+		"title": "Cloud Services",
+		"updated": "20230627215230"
 	},
 	"Children": [
 		{
-			"ID": "20210808180303-zdwqjbv",
+			"ID": "20230627215131-2ct8b6b",
 			"Type": "NodeParagraph",
 			"Properties": {
-				"id": "20210808180303-zdwqjbv",
-				"updated": "20210808180303"
-			}
+				"id": "20230627215131-2ct8b6b",
+				"updated": "20230627215141"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "Cloud services include:"
+				}
+			]
+		},
+		{
+			"ID": "20230627215141-57hf66s",
+			"Type": "NodeList",
+			"ListData": {},
+			"Properties": {
+				"id": "20230627215141-57hf66s",
+				"updated": "20230627215143"
+			},
+			"Children": [
+				{
+					"ID": "20230627215143-rk0fvgy",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627215143-rk0fvgy",
+						"updated": "20230627215143"
+					},
+					"Children": [
+						{
+							"ID": "20230627215143-vgkhonz",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627215143-vgkhonz",
+								"updated": "20230627215203"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "block-ref",
+									"TextMarkBlockRefID": "20210721112206-mhr9wxi",
+									"TextMarkBlockRefSubtype": "s",
+									"TextMarkTextContent": "Data sync"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230627215152-my19kfr",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627215152-my19kfr"
+					},
+					"Children": [
+						{
+							"ID": "20230627215152-ps6hh1v",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627215152-ps6hh1v",
+								"updated": "20230627215201"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "block-ref",
+									"TextMarkBlockRefID": "20220708103401-mgydrfg",
+									"TextMarkBlockRefSubtype": "s",
+									"TextMarkTextContent": "Data backup"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230627215154-orvtmhs",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627215154-orvtmhs"
+					},
+					"Children": [
+						{
+							"ID": "20230627215154-a5gj5qo",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627215154-a5gj5qo",
+								"updated": "20230627215159"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "block-ref",
+									"TextMarkBlockRefID": "20210721160238-yvhbh0h",
+									"TextMarkBlockRefSubtype": "s",
+									"TextMarkTextContent": "Assets hosting"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		{
+			"ID": "20230627215213-4em36k6",
+			"Type": "NodeParagraph",
+			"Properties": {
+				"id": "20230627215213-4em36k6",
+				"updated": "20230627215230"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "​"
+				},
+				{
+					"Type": "NodeTextMark",
+					"TextMarkType": "tag",
+					"TextMarkTextContent": "Note"
+				},
+				{
+					"Type": "NodeText",
+					"Data": "​: Cloud service related "
+				},
+				{
+					"Type": "NodeTextMark",
+					"TextMarkType": "block-ref",
+					"TextMarkBlockRefID": "20220105101227-n5zpr1a",
+					"TextMarkBlockRefSubtype": "s",
+					"TextMarkTextContent": "limitations"
+				},
+				{
+					"Type": "NodeText",
+					"Data": "."
+				}
+			]
+		},
+		{
+			"ID": "20230627215126-rgxazmg",
+			"Type": "NodeParagraph",
+			"Properties": {
+				"id": "20230627215126-rgxazmg",
+				"updated": "20230627215126"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "Cloud services require a paid subscription to use:"
+				}
+			]
+		},
+		{
+			"ID": "20230627215126-d2einq3",
+			"Type": "NodeList",
+			"ListData": {},
+			"Properties": {
+				"id": "20230627215126-d2einq3",
+				"updated": "20230627215126"
+			},
+			"Children": [
+				{
+					"ID": "20230627215126-bfsffng",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627215126-bfsffng",
+						"updated": "20230627215126"
+					},
+					"Children": [
+						{
+							"ID": "20230627215126-u7krjlc",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627215126-u7krjlc",
+								"updated": "20230627215126"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "a",
+									"TextMarkAHref": "https://ld246.com/subscribe/siyuan",
+									"TextMarkTextContent": "Mainland China"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230627215126-dfoapk1",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627215126-dfoapk1",
+						"updated": "20230627215126"
+					},
+					"Children": [
+						{
+							"ID": "20230627215126-f2a4f7i",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627215126-f2a4f7i",
+								"updated": "20230627215126"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "a",
+									"TextMarkAHref": "https://liuyun.io/subscribe/siyuan",
+									"TextMarkTextContent": "Non-Mainland China"
+								}
+							]
+						}
+					]
+				}
+			]
 		}
 	]
 }

+ 9 - 8
app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy

@@ -7,7 +7,7 @@
 		"id": "20200923234731-h3zkwm2",
 		"title": "FAQ",
 		"type": "doc",
-		"updated": "20230622164128"
+		"updated": "20230627215826"
 	},
 	"Children": [
 		{
@@ -1862,22 +1862,23 @@
 			]
 		},
 		{
-			"ID": "20230406111508-0lt5im7",
+			"ID": "20230627215819-kfmomdw",
 			"Type": "NodeParagraph",
 			"Properties": {
-				"id": "20230406111508-0lt5im7",
-				"updated": "20230406111508"
+				"id": "20230627215819-kfmomdw",
+				"updated": "20230627215826"
 			},
 			"Children": [
 				{
 					"Type": "NodeTextMark",
-					"TextMarkType": "a",
-					"TextMarkAHref": "https://b3log.org/siyuan/en/pricing.html",
-					"TextMarkTextContent": "Cloud Service"
+					"TextMarkType": "block-ref",
+					"TextMarkBlockRefID": "20210808180303-v9awwp0",
+					"TextMarkBlockRefSubtype": "s",
+					"TextMarkTextContent": "Cloud services"
 				},
 				{
 					"Type": "NodeText",
-					"Data": " requires an annual subscription. At present, only users in mainland China are supported to subscribe, and users outside of mainland China are not allowed to subscribe."
+					"Data": " require a paid subscription to use."
 				}
 			]
 		},

+ 296 - 6
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq.sy

@@ -5,17 +5,307 @@
 	"Properties": {
 		"icon": "1f308",
 		"id": "20210808180320-m0ztypq",
-		"title": "云端",
-		"updated": "20210808180320"
+		"title": "云端服务",
+		"updated": "20230627215006"
 	},
 	"Children": [
 		{
-			"ID": "20210808180320-p616wx3",
+			"ID": "20230627214156-ht6dcds",
 			"Type": "NodeParagraph",
 			"Properties": {
-				"id": "20210808180320-p616wx3",
-				"updated": "20210808180320"
-			}
+				"id": "20230627214156-ht6dcds",
+				"updated": "20230627214200"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "云端服务包括:"
+				}
+			]
+		},
+		{
+			"ID": "20230627214203-du6yegn",
+			"Type": "NodeList",
+			"ListData": {},
+			"Properties": {
+				"id": "20230627214203-du6yegn",
+				"updated": "20230627214514"
+			},
+			"Children": [
+				{
+					"ID": "20230627214207-4dqs5dd",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627214207-4dqs5dd",
+						"updated": "20230627214512"
+					},
+					"Children": [
+						{
+							"ID": "20230627214207-klfi0wr",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627214207-klfi0wr",
+								"updated": "20230627214512"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "block-ref",
+									"TextMarkBlockRefID": "20210721103420-vn6g2yy",
+									"TextMarkBlockRefSubtype": "s",
+									"TextMarkTextContent": "数据同步"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230627214217-vfryoy0",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627214217-vfryoy0",
+						"updated": "20230627214506"
+					},
+					"Children": [
+						{
+							"ID": "20230627214217-smu8wwk",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627214217-smu8wwk",
+								"updated": "20230627214506"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "block-ref",
+									"TextMarkBlockRefID": "20220708095345-tu7nz95",
+									"TextMarkBlockRefSubtype": "s",
+									"TextMarkTextContent": "数据备份"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230627214222-6nj8yan",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627214222-6nj8yan",
+						"updated": "20230627214514"
+					},
+					"Children": [
+						{
+							"ID": "20230627214222-firvwk7",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627214222-firvwk7",
+								"updated": "20230627214514"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "block-ref",
+									"TextMarkBlockRefID": "20220119224322-rdzzk5e",
+									"TextMarkBlockRefSubtype": "s",
+									"TextMarkTextContent": "微信提醒"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230627214234-2k47oas",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627214234-2k47oas"
+					},
+					"Children": [
+						{
+							"ID": "20230627214234-ucrvzhv",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627214234-ucrvzhv",
+								"updated": "20230627214238"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "block-ref",
+									"TextMarkBlockRefID": "20220414110705-tu2un99",
+									"TextMarkBlockRefSubtype": "s",
+									"TextMarkTextContent": "收集箱"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230627214240-tayfjho",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627214240-tayfjho",
+						"updated": "20230627214244"
+					},
+					"Children": [
+						{
+							"ID": "20230627214240-3nb4lbb",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627214240-3nb4lbb",
+								"updated": "20230627214244"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "block-ref",
+									"TextMarkBlockRefID": "20210721154441-vav9m02",
+									"TextMarkBlockRefSubtype": "s",
+									"TextMarkTextContent": "资源文件图床"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		{
+			"ID": "20230627214929-7n1kara",
+			"Type": "NodeParagraph",
+			"Properties": {
+				"id": "20230627214929-7n1kara",
+				"updated": "20230627215006"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "​"
+				},
+				{
+					"Type": "NodeTextMark",
+					"TextMarkType": "tag",
+					"TextMarkTextContent": "注意"
+				},
+				{
+					"Type": "NodeText",
+					"Data": "​:云端服务相关"
+				},
+				{
+					"Type": "NodeTextMark",
+					"TextMarkType": "block-ref",
+					"TextMarkBlockRefID": "20220105100506-auvmvcw",
+					"TextMarkBlockRefSubtype": "s",
+					"TextMarkTextContent": "限制"
+				},
+				{
+					"Type": "NodeText",
+					"Data": "。"
+				}
+			]
+		},
+		{
+			"ID": "20230627214107-jy810va",
+			"Type": "NodeParagraph",
+			"Properties": {
+				"id": "20230627214107-jy810va",
+				"updated": "20230627214333"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "云端服务需要付费订阅后才能使用:"
+				}
+			]
+		},
+		{
+			"ID": "20230627214313-3wp7zd5",
+			"Type": "NodeList",
+			"ListData": {},
+			"Properties": {
+				"id": "20230627214313-3wp7zd5",
+				"updated": "20230627214313"
+			},
+			"Children": [
+				{
+					"ID": "20230627214313-fjtr11t",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627214313-fjtr11t",
+						"updated": "20230627214313"
+					},
+					"Children": [
+						{
+							"ID": "20230627214313-gao4enb",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627214313-gao4enb",
+								"updated": "20230627214313"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "a",
+									"TextMarkAHref": "https://ld246.com/subscribe/siyuan",
+									"TextMarkTextContent": "中国大陆地区"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230627214313-fzrzva7",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627214313-fzrzva7",
+						"updated": "20230627214313"
+					},
+					"Children": [
+						{
+							"ID": "20230627214313-jpvnmct",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627214313-jpvnmct",
+								"updated": "20230627214313"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "a",
+									"TextMarkAHref": "https://liuyun.io/subscribe/siyuan",
+									"TextMarkTextContent": "非中国大陆地区"
+								}
+							]
+						}
+					]
+				}
+			]
 		}
 	]
 }

+ 11 - 45
app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy

@@ -7,7 +7,7 @@
 		"id": "20200813093015-u6bopdt",
 		"title": "常见问题",
 		"type": "doc",
-		"updated": "20230622164014"
+		"updated": "20230627214807"
 	},
 	"Children": [
 		{
@@ -1862,18 +1862,19 @@
 			"Type": "NodeParagraph",
 			"Properties": {
 				"id": "20230406111417-9705mvn",
-				"updated": "20230406111421"
+				"updated": "20230627214807"
 			},
 			"Children": [
 				{
 					"Type": "NodeTextMark",
-					"TextMarkType": "a",
-					"TextMarkAHref": "https://b3log.org/siyuan/pricing.html",
+					"TextMarkType": "block-ref",
+					"TextMarkBlockRefID": "20210808180320-m0ztypq",
+					"TextMarkBlockRefSubtype": "s",
 					"TextMarkTextContent": "云端服务"
 				},
 				{
 					"Type": "NodeText",
-					"Data": "需要年付订阅。目前仅支持中国大陆地区用户订阅,非中国大陆地区用户请勿订阅。"
+					"Data": "需要付费订阅后才能使用。"
 				}
 			]
 		},
@@ -1888,47 +1889,12 @@
 				{
 					"Type": "NodeText",
 					"Data": "如果你没有订阅需求但又想支持开发,欢迎进行捐赠:"
-				}
-			]
-		},
-		{
-			"ID": "20230406111846-ph7umq6",
-			"Type": "NodeList",
-			"ListData": {},
-			"Properties": {
-				"id": "20230406111846-ph7umq6",
-				"updated": "20230406111909"
-			},
-			"Children": [
+				},
 				{
-					"ID": "20230406111855-v2fuz94",
-					"Type": "NodeListItem",
-					"ListData": {
-						"BulletChar": 42,
-						"Marker": "Kg=="
-					},
-					"Properties": {
-						"id": "20230406111855-v2fuz94",
-						"updated": "20230406111909"
-					},
-					"Children": [
-						{
-							"ID": "20230406111855-uuos149",
-							"Type": "NodeParagraph",
-							"Properties": {
-								"id": "20230406111855-uuos149",
-								"updated": "20230406111909"
-							},
-							"Children": [
-								{
-									"Type": "NodeTextMark",
-									"TextMarkType": "a",
-									"TextMarkAHref": "https://ld246.com/sponsor",
-									"TextMarkTextContent": "靠爱发电 - 链滴"
-								}
-							]
-						}
-					]
+					"Type": "NodeTextMark",
+					"TextMarkType": "a",
+					"TextMarkAHref": "https://ld246.com/sponsor",
+					"TextMarkTextContent": "靠爱发电 - 链滴"
 				}
 			]
 		},

+ 6 - 5
app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy

@@ -6,7 +6,7 @@
 		"icon": "2753",
 		"id": "20211226115227-r1rty9v",
 		"title": "常見問題",
-		"updated": "20230622164112"
+		"updated": "20230627214818"
 	},
 	"Children": [
 		{
@@ -1859,18 +1859,19 @@
 			"Type": "NodeParagraph",
 			"Properties": {
 				"id": "20230406111448-rqncida",
-				"updated": "20230406111448"
+				"updated": "20230627214818"
 			},
 			"Children": [
 				{
 					"Type": "NodeTextMark",
-					"TextMarkType": "a",
-					"TextMarkAHref": "https://b3log.org/siyuan/pricing.html",
+					"TextMarkType": "block-ref",
+					"TextMarkBlockRefID": "20211226121232-23s79xr",
+					"TextMarkBlockRefSubtype": "s",
 					"TextMarkTextContent": "雲端服務"
 				},
 				{
 					"Type": "NodeText",
-					"Data": "需要年付訂閱。目前僅支持中國大陸地區用戶訂閱,非中國大陸地區用戶請勿訂閱。"
+					"Data": "需要付費訂閱後才能使用。"
 				}
 			]
 		},

+ 231 - 4
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr.sy

@@ -5,8 +5,8 @@
 	"Properties": {
 		"icon": "1f308",
 		"id": "20211226121232-23s79xr",
-		"title": "雲端",
-		"updated": "20211226121243"
+		"title": "雲端服務",
+		"updated": "20230627215033"
 	},
 	"Children": [
 		{
@@ -14,8 +14,235 @@
 			"Type": "NodeParagraph",
 			"Properties": {
 				"id": "20211226121232-oms16q8",
-				"updated": "20211226121232"
-			}
+				"updated": "20230627214434"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "雲端服務包括:"
+				}
+			]
+		},
+		{
+			"ID": "20230627214440-h0iez4q",
+			"Type": "NodeList",
+			"ListData": {},
+			"Properties": {
+				"id": "20230627214440-h0iez4q",
+				"updated": "20230627214441"
+			},
+			"Children": [
+				{
+					"ID": "20230627214441-1quupl3",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627214441-1quupl3",
+						"updated": "20230627214441"
+					},
+					"Children": [
+						{
+							"ID": "20230627214441-tk1krtk",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627214441-tk1krtk",
+								"updated": "20230627214625"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "block-ref",
+									"TextMarkBlockRefID": "20211226121438-xaafdo8",
+									"TextMarkBlockRefSubtype": "s",
+									"TextMarkTextContent": "資料同步"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230627214614-svfqar6",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627214614-svfqar6"
+					},
+					"Children": [
+						{
+							"ID": "20230627214614-vhru3is",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627214614-vhru3is",
+								"updated": "20230627214627"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "block-ref",
+									"TextMarkBlockRefID": "20220708102441-u6wopo9",
+									"TextMarkBlockRefSubtype": "s",
+									"TextMarkTextContent": "資料備份"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230627214619-snofbrm",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627214619-snofbrm"
+					},
+					"Children": [
+						{
+							"ID": "20230627214619-wc9toen",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627214619-wc9toen",
+								"updated": "20230627214629"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "block-ref",
+									"TextMarkBlockRefID": "20211226121332-irgblss",
+									"TextMarkBlockRefSubtype": "s",
+									"TextMarkTextContent": "資料文件圖庫"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		{
+			"ID": "20230627215018-zq42ir3",
+			"Type": "NodeParagraph",
+			"Properties": {
+				"id": "20230627215018-zq42ir3",
+				"updated": "20230627215033"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "​"
+				},
+				{
+					"Type": "NodeTextMark",
+					"TextMarkType": "tag",
+					"TextMarkTextContent": "注意"
+				},
+				{
+					"Type": "NodeText",
+					"Data": "​:雲端服務相關"
+				},
+				{
+					"Type": "NodeTextMark",
+					"TextMarkType": "block-ref",
+					"TextMarkBlockRefID": "20220105101348-corstqc",
+					"TextMarkBlockRefSubtype": "s",
+					"TextMarkTextContent": "限制"
+				},
+				{
+					"Type": "NodeText",
+					"Data": "。"
+				}
+			]
+		},
+		{
+			"ID": "20230627214435-kgv5ksk",
+			"Type": "NodeParagraph",
+			"Properties": {
+				"id": "20230627214435-kgv5ksk",
+				"updated": "20230627214439"
+			},
+			"Children": [
+				{
+					"Type": "NodeText",
+					"Data": "雲端服務需要付費訂閱後才能使用:"
+				}
+			]
+		},
+		{
+			"ID": "20230627214637-1umoipp",
+			"Type": "NodeList",
+			"ListData": {},
+			"Properties": {
+				"id": "20230627214637-1umoipp",
+				"updated": "20230627214637"
+			},
+			"Children": [
+				{
+					"ID": "20230627214637-ttdymvc",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627214637-ttdymvc",
+						"updated": "20230627214637"
+					},
+					"Children": [
+						{
+							"ID": "20230627214637-8asvug0",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627214637-8asvug0",
+								"updated": "20230627214637"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "a",
+									"TextMarkAHref": "https://ld246.com/subscribe/siyuan",
+									"TextMarkTextContent": "中國大陸地區"
+								}
+							]
+						}
+					]
+				},
+				{
+					"ID": "20230627214637-45q41xq",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230627214637-45q41xq",
+						"updated": "20230627214637"
+					},
+					"Children": [
+						{
+							"ID": "20230627214637-nemj94t",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230627214637-nemj94t",
+								"updated": "20230627214637"
+							},
+							"Children": [
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "a",
+									"TextMarkAHref": "https://liuyun.io/subscribe/siyuan",
+									"TextMarkTextContent": "非中國大陸地區"
+								}
+							]
+						}
+					]
+				}
+			]
 		}
 	]
 }

+ 1 - 1
kernel/model/conf.go

@@ -516,7 +516,7 @@ func Close(force bool, execInstallPkg int) (exitCode int) {
 		util.PushMsg(Conf.Language(130), 1000*5)
 		// 桌面端退出拉起更新安装时有时需要重启两次 https://github.com/siyuan-note/siyuan/issues/6544
 		// 这里多等待一段时间,等待安装程序启动
-		time.Sleep(4 * time.Second)
+		time.Sleep(3 * time.Second)
 	}
 	logging.LogInfof("exited kernel")
 	closeSyncWebSocket()

+ 1 - 1
kernel/model/updater.go

@@ -41,7 +41,7 @@ func execNewVerInstallPkg(newVerInstallPkgPath string) {
 	logging.LogInfof("installing the new version [%s]", newVerInstallPkgPath)
 	var cmd *exec.Cmd
 	if gulu.OS.IsWindows() {
-		cmd = exec.Command(newVerInstallPkgPath)
+		cmd = exec.Command("cmd.exe", "/C", "start", newVerInstallPkgPath)
 	} else if gulu.OS.IsDarwin() {
 		exec.Command("chmod", "+x", newVerInstallPkgPath).CombinedOutput()
 		cmd = exec.Command("open", newVerInstallPkgPath)

BIN
screenshots/feature3-2.png


BIN
screenshots/feature3-3.png