From f38dc1281ac5c71a33f55dc9220bb3a211a7c565 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 20 Nov 2023 21:35:38 +0800 Subject: [PATCH] :art: Update data sync notes in the user guide https://github.com/siyuan-note/siyuan/issues/9699 --- .../20210721112206-mhr9wxi.sy | 216 +++++++++++++++++- .../20230808120347-3cob0nb.sy | 177 +++++++++++++- .../20211226121438-xaafdo8.sy | 187 ++++++++++++++- 3 files changed, 571 insertions(+), 9 deletions(-) diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20230805231614-vqn28eh/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20230805231614-vqn28eh/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy index c9079305c..bdbf62979 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20230805231614-vqn28eh/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20230805231614-vqn28eh/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy @@ -5,7 +5,7 @@ "Properties": { "id": "20210721112206-mhr9wxi", "title": "Data sync", - "updated": "20230713213257" + "updated": "20231120213154" }, "Children": [ { @@ -1139,7 +1139,7 @@ "ListData": {}, "Properties": { "id": "20210721112403-th2r6zf", - "updated": "20220807180100" + "updated": "20231120213154" }, "Children": [ { @@ -1164,7 +1164,23 @@ "Children": [ { "Type": "NodeText", - "Data": "Synchronization will not be triggered in the case of sudden disconnection such as sleep or shutdown, please manually click the synchronization button to synchronize" + "Data": "Synchronization will not be triggered in the case " + }, + { + "Type": "NodeText", + "Data": "of" + }, + { + "Type": "NodeText", + "Data": " sudden disconnection such " + }, + { + "Type": "NodeText", + "Data": "as" + }, + { + "Type": "NodeText", + "Data": " sleep or shutdown, please manually click the synchronization button to synchronize" } ] } @@ -1192,7 +1208,27 @@ "Children": [ { "Type": "NodeText", - "Data": "Do not use a third-party sync disk and SiYuan sync at the same time, it may cause data damage" + "Data": "Do" + }, + { + "Type": "NodeText", + "Data": " not use a third-party sync disk and " + }, + { + "Type": "NodeText", + "Data": "SiYuan" + }, + { + "Type": "NodeText", + "Data": " sync " + }, + { + "Type": "NodeText", + "Data": "at" + }, + { + "Type": "NodeText", + "Data": " the same time, it may cause data damage" } ] } @@ -1225,6 +1261,178 @@ ] } ] + }, + { + "ID": "20231120213145-qvushc7", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20231120213145-qvushc7" + }, + "Children": [ + { + "ID": "20231120213145-xe9nogq", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120213145-xe9nogq", + "updated": "20231120213148" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "In the automatic synchronization mode, if you need to exit, please use the normal exit method (for example, do not use sliding to remove on the mobile APP, do not use the end process to force close on the desktop) to ensure data sync" + } + ] + } + ] + }, + { + "ID": "20231120213153-tpjbi5o", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20231120213153-tpjbi5o", + "updated": "20231120213154" + }, + "Children": [ + { + "ID": "20231120213154-sjzx64a", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120213154-sjzx64a", + "updated": "20231120213154" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "If the data snapshot takes more than 7 seconds before data synchronization, you will be prompted to clean up the data warehouse. If you need to change the default time, you can use the following two methods." + } + ] + }, + { + "ID": "20231120213154-llmdq2d", + "Type": "NodeList", + "ListData": {}, + "Properties": { + "id": "20231120213154-llmdq2d", + "updated": "20231120213154" + }, + "Children": [ + { + "ID": "20231120213154-04v43ak", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20231120213154-04v43ak", + "updated": "20231120213154" + }, + "Children": [ + { + "ID": "20231120213154-s3auhbe", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120213154-s3auhbe", + "updated": "20231120213154" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Environment variable " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "SIYUAN_SYNC_INDEX_TIMING" + }, + { + "Type": "NodeText", + "Data": "​, for example " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "SIYUAN_SYNC_INDEX_TIMING=30000" + }, + { + "Type": "NodeText", + "Data": "​, the unit is milliseconds" + } + ] + } + ] + }, + { + "ID": "20231120213154-vbz394m", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20231120213154-vbz394m", + "updated": "20231120213154" + }, + "Children": [ + { + "ID": "20231120213154-j43r82y", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120213154-j43r82y", + "updated": "20231120213154" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Directly modify " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "repo.syncIndexTiming" + }, + { + "Type": "NodeText", + "Data": "​ in workspace/conf/conf.json" + } + ] + } + ] + } + ] + }, + { + "ID": "20231120213154-aoykqw3", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120213154-aoykqw3", + "updated": "20231120213154" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "The minimum value can only be configured to " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "7000" + }, + { + "Type": "NodeText", + "Data": "​ (7 seconds), and the maximum value is not limited; when starting, environment variables will be read first to overwrite the values in the conf file." + } + ] + } + ] } ] } diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20230805222417-2lj3dvk/20230808120348-orm8sjf/20230808120347-3cob0nb.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20230805222417-2lj3dvk/20230808120348-orm8sjf/20230808120347-3cob0nb.sy index 614307a4b..063d7bb62 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20230805222417-2lj3dvk/20230808120348-orm8sjf/20230808120347-3cob0nb.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20230805222417-2lj3dvk/20230808120348-orm8sjf/20230808120347-3cob0nb.sy @@ -5,7 +5,7 @@ "Properties": { "id": "20230808120347-3cob0nb", "title": "数据同步", - "updated": "20230220103623" + "updated": "20231120213300" }, "Children": [ { @@ -1150,7 +1150,7 @@ "ListData": {}, "Properties": { "id": "20230808120347-um16u4f", - "updated": "20220807180028" + "updated": "20231120213300" }, "Children": [ { @@ -1236,6 +1236,179 @@ ] } ] + }, + { + "ID": "20231120211520-p8tb9wg", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20231120211520-p8tb9wg", + "updated": "20231120213300" + }, + "Children": [ + { + "ID": "20231120211520-1xtrwfh", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120211520-1xtrwfh", + "updated": "20231120213300" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "自动同步模式下，如需退出，请使用正常的退出应用（比如移动端 APP 不要使用滑动移除，桌面端不要使用结束进程强制关闭）方式以保证数据同步执行" + } + ] + } + ] + }, + { + "ID": "20231120211807-pzxmsee", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20231120211807-pzxmsee", + "updated": "20231120212111" + }, + "Children": [ + { + "ID": "20231120211807-n24g7wl", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120211807-n24g7wl", + "updated": "20231120211921" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "数据同步前进行数据快照如果耗时超过 7 秒会提示清理数据仓库，如果需要改动默认耗时，可通过如下两种方式" + } + ] + }, + { + "ID": "20231120211944-fvla0hc", + "Type": "NodeList", + "ListData": {}, + "Properties": { + "id": "20231120211944-fvla0hc", + "updated": "20231120212046" + }, + "Children": [ + { + "ID": "20231120211944-ol64svy", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20231120211944-ol64svy", + "updated": "20231120211944" + }, + "Children": [ + { + "ID": "20231120211944-4edb9kx", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120211944-4edb9kx", + "updated": "20231120211944" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "环境变量 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "SIYUAN_SYNC_INDEX_TIMING" + }, + { + "Type": "NodeText", + "Data": "​，例如 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "SIYUAN_SYNC_INDEX_TIMING=30000" + }, + { + "Type": "NodeText", + "Data": "​，单位是毫秒" + } + ] + } + ] + }, + { + "ID": "20231120211944-5yhw1vi", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20231120211944-5yhw1vi", + "updated": "20231120212046" + }, + "Children": [ + { + "ID": "20231120211944-chb1tvm", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120211944-chb1tvm", + "updated": "20231120212046" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "直接修改 工作空间/conf/conf.json 中的 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "repo.syncIndexTiming" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + } + ] + } + ] + }, + { + "ID": "20231120211944-m955a64", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120211944-m955a64", + "updated": "20231120212111" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "最小值只能配置为 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "7000" + }, + { + "Type": "NodeText", + "Data": "​（7 秒），最大值不限制；启动时会优先读取环境变量覆盖 conf 文件中的值。" + } + ] + } + ] } ] } diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20230805232636-zh0adz2/20211226121232-23s79xr/20211226121438-xaafdo8.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20230805232636-zh0adz2/20211226121232-23s79xr/20211226121438-xaafdo8.sy index 502cba467..44c1a0596 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20230805232636-zh0adz2/20211226121232-23s79xr/20211226121438-xaafdo8.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20230805232636-zh0adz2/20211226121232-23s79xr/20211226121438-xaafdo8.sy @@ -5,7 +5,7 @@ "Properties": { "id": "20211226121438-xaafdo8", "title": "資料同步", - "updated": "20230630142312" + "updated": "20231120213316" }, "Children": [ { @@ -1143,7 +1143,7 @@ "ListData": {}, "Properties": { "id": "20211226121454-kv5itch", - "updated": "20220807180200" + "updated": "20231120213316" }, "Children": [ { @@ -1196,7 +1196,15 @@ "Children": [ { "Type": "NodeText", - "Data": "請勿同時使用第三方同步碟和思源同步，可能會導致資料損壞" + "Data": "請勿同時使用第三方同步碟和" + }, + { + "Type": "NodeText", + "Data": "思源" + }, + { + "Type": "NodeText", + "Data": "同步，可能會導致資料損壞" } ] } @@ -1229,6 +1237,179 @@ ] } ] + }, + { + "ID": "20231120213057-gojar0n", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20231120213057-gojar0n", + "updated": "20231120213316" + }, + "Children": [ + { + "ID": "20231120213057-v754ak8", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120213057-v754ak8", + "updated": "20231120213316" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "自動同步模式下，如需退出，請使用正常的退出應用（例如行動端 APP 不要使用滑動移除，桌面端不要使用結束程序強制關閉）方式以確保資料同步執行" + } + ] + } + ] + }, + { + "ID": "20231120213105-95jggay", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20231120213105-95jggay", + "updated": "20231120213106" + }, + "Children": [ + { + "ID": "20231120213106-0hx9knh", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120213106-0hx9knh", + "updated": "20231120213106" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "資料同步前進行資料快照如果耗時超過 7 秒會提示清理資料倉儲，若需要變更預設耗時，可透過以下兩種方式" + } + ] + }, + { + "ID": "20231120213106-kbnm4po", + "Type": "NodeList", + "ListData": {}, + "Properties": { + "id": "20231120213106-kbnm4po", + "updated": "20231120213106" + }, + "Children": [ + { + "ID": "20231120213106-qr96es4", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20231120213106-qr96es4", + "updated": "20231120213106" + }, + "Children": [ + { + "ID": "20231120213106-6m5igg4", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120213106-6m5igg4", + "updated": "20231120213106" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "環境變數 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "SIYUAN_SYNC_INDEX_TIMING" + }, + { + "Type": "NodeText", + "Data": "​，例如 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "SIYUAN_SYNC_INDEX_TIMING=30000" + }, + { + "Type": "NodeText", + "Data": "​，單位是毫秒" + } + ] + } + ] + }, + { + "ID": "20231120213106-d3jyt3j", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20231120213106-d3jyt3j", + "updated": "20231120213106" + }, + "Children": [ + { + "ID": "20231120213106-jnkaa0w", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120213106-jnkaa0w", + "updated": "20231120213106" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "直接修改 工作空間/conf/conf.json 中的 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "repo.syncIndexTiming" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + } + ] + } + ] + }, + { + "ID": "20231120213106-56yd2us", + "Type": "NodeParagraph", + "Properties": { + "id": "20231120213106-56yd2us", + "updated": "20231120213106" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "最小值只能配置為 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "7000" + }, + { + "Type": "NodeText", + "Data": "​（7 秒），最大值不限制；啟動時會優先讀取環境變數覆蓋 conf 檔案中的值。" + } + ] + } + ] } ] }