From f5ccf07540a258da34dc2a5c6147dfe88e7e63cb Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 3 Jul 2022 22:40:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:art:=20=E5=85=AC=E6=B5=8B=E4=BA=91?= =?UTF-8?q?=E7=AB=AF=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E4=BB=93=E5=BA=93?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/5337?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20210808180117-6v0mkxr/.siyuan/sort.json | 2 - .../20210721112159-9p645xm.sy | 35 +- .../20210721112206-mhr9wxi.sy | 127 +++- .../20210721112211-fwc1x43.sy | 649 ----------------- .../20210721112229-fp97j3c.sy | 544 --------------- .../20220105101227-n5zpr1a.sy | 10 +- .../20210117215840-jcl17fx.sy | 18 +- .../20210808180117-czj9bvb/.siyuan/sort.json | 2 - .../20201002090451-hb9j8ai.sy | 654 ------------------ .../20210721101227-pi8f6ga.sy | 42 +- .../20210721103420-vn6g2yy.sy | 144 +++- .../20210721110423-5m6vo52.sy | 560 --------------- .../20220105100506-auvmvcw.sy | 10 +- .../20210117211155-56n4odu.sy | 16 +- .../20211226090932-5lcq56f/.siyuan/sort.json | 2 - .../20211226115043-afhev0g.sy | 16 +- .../20211226121413-nznc7x0.sy | 653 ----------------- .../20211226121438-xaafdo8.sy | 126 +++- .../20211226121503-k3jma6m.sy | 42 +- .../20211227210109-0f92zh2.sy | 544 --------------- .../20220105101348-corstqc.sy | 10 +- 21 files changed, 458 insertions(+), 3748 deletions(-) delete mode 100644 app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112211-fwc1x43.sy delete mode 100644 app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112229-fp97j3c.sy delete mode 100644 app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20201002090451-hb9j8ai.sy delete mode 100644 app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721110423-5m6vo52.sy delete mode 100644 app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121413-nznc7x0.sy delete mode 100644 app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211227210109-0f92zh2.sy diff --git a/app/guide/20210808180117-6v0mkxr/.siyuan/sort.json b/app/guide/20210808180117-6v0mkxr/.siyuan/sort.json index 85f9f5009..f39c503cf 100644 --- a/app/guide/20210808180117-6v0mkxr/.siyuan/sort.json +++ b/app/guide/20210808180117-6v0mkxr/.siyuan/sort.json @@ -33,8 +33,6 @@ "20210615213222-vs5tzbd": 13, "20210721112159-9p645xm": 1, "20210721112206-mhr9wxi": 3, - "20210721112211-fwc1x43": 4, - "20210721112229-fp97j3c": 2, "20210721160238-yvhbh0h": 5, "20210808180303-6yi0dv5": 1, "20210808180303-axh6q1d": 4, diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112159-9p645xm.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112159-9p645xm.sy index bfbc27253..cfa78208d 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112159-9p645xm.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112159-9p645xm.sy @@ -12,7 +12,7 @@ "Type": "NodeParagraph", "Properties": { "id": "20210721112251-nlv1v47", - "updated": "20210721112251" + "updated": "20220703223420" }, "Children": [ { @@ -37,7 +37,7 @@ }, { "Type": "NodeText", - "Data": ", divided into three parts:" + "Data": ", divided into the following sections:" } ] }, @@ -47,7 +47,7 @@ "ListData": {}, "Properties": { "id": "20210721112251-y58mwa8", - "updated": "20210721112319" + "updated": "20210721112251" }, "Children": [ { @@ -58,7 +58,8 @@ "Marker": "Kg==" }, "Properties": { - "id": "20210721112251-2g73fn6" + "id": "20210721112251-2g73fn6", + "updated": "20210721112251" }, "Children": [ { @@ -76,32 +77,6 @@ } ] }, - { - "ID": "20210721112251-evmyz01", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210721112251-evmyz01" - }, - "Children": [ - { - "ID": "20210721112251-mvo15y4", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721112251-mvo15y4" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Backup data: Provided to the backup function, the data is encrypted" - } - ] - } - ] - }, { "ID": "20210721112251-mbp661h", "Type": "NodeListItem", diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy index 9b7083df5..a4ddf22f0 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20210721112206-mhr9wxi", "title": "Data Sync", - "updated": "20220510105000" + "updated": "20220703223222" }, "Children": [ { @@ -56,6 +56,131 @@ } ] }, + { + "ID": "20210721112229-fp97j3c", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20210721112229-fp97j3c", + "title": "End-to-end Encryption", + "updated": "20220703223222" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "End-to-end Encryption" + } + ] + }, + { + "ID": "20220703223157-9xwnaxy", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703223157-9xwnaxy", + "updated": "20220703223157" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Data synchronization is transmitted through end-to-end encryption, and the cloud does not store any plaintext data." + } + ] + }, + { + "ID": "20220703223157-z6lmqw5", + "Type": "NodeList", + "ListData": {}, + "Properties": { + "id": "20220703223157-z6lmqw5", + "updated": "20220703223157" + }, + "Children": [ + { + "ID": "20220703223157-mzolzze", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703223157-mzolzze", + "updated": "20220703223157" + }, + "Children": [ + { + "ID": "20220703223157-80pgm8w", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703223157-80pgm8w", + "updated": "20220703223157" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "The key is only stored locally and will not be uploaded to the cloud" + } + ] + } + ] + }, + { + "ID": "20220703223157-6qldbi9", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703223157-6qldbi9", + "updated": "20220703223157" + }, + "Children": [ + { + "ID": "20220703223157-4t6fh6p", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703223157-4t6fh6p", + "updated": "20220703223157" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Encryption and decryption process is performed entirely on the local device" + } + ] + } + ] + }, + { + "ID": "20220703223157-dpfgnuy", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703223157-dpfgnuy", + "updated": "20220703223157" + }, + "Children": [ + { + "ID": "20220703223157-gh25cti", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703223157-gh25cti", + "updated": "20220703223157" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "The encryption algorithm is the industry-recognized and secure AES GCM" + } + ] + } + ] + } + ] + }, { "ID": "20210721112403-77frbcy", "Type": "NodeHeading", diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112211-fwc1x43.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112211-fwc1x43.sy deleted file mode 100644 index a6c1ec151..000000000 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112211-fwc1x43.sy +++ /dev/null @@ -1,649 +0,0 @@ -{ - "ID": "20210721112211-fwc1x43", - "Type": "NodeDocument", - "Properties": { - "id": "20210721112211-fwc1x43", - "title": "Data Backup", - "updated": "20220605010124" - }, - "Children": [ - { - "ID": "20210721113518-5xszb36", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20210721113518-5xszb36", - "updated": "20210721113518" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Backup" - } - ] - }, - { - "ID": "20210721113518-i92bte8", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113518-i92bte8", - "updated": "20210721113518" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Backup refers to encrypting and copying all files in the " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "workspace/data/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " folder to the " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "workspace/backup/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " folder." - } - ] - }, - { - "ID": "20210721113518-eonfkpy", - "Type": "NodeHeading", - "HeadingLevel": 3, - "Properties": { - "id": "20210721113518-eonfkpy", - "updated": "20210721113518" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "How to use" - } - ] - }, - { - "ID": "20210721113518-l6iveb9", - "Type": "NodeList", - "ListData": { - "Typ": 1 - }, - "Properties": { - "id": "20210721113518-l6iveb9", - "updated": "20220110113847" - }, - "Children": [ - { - "ID": "20210721113518-xj8t7rh", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "MS4=", - "Num": 1 - }, - "Properties": { - "id": "20210721113518-xj8t7rh", - "updated": "20220110113847" - }, - "Children": [ - { - "ID": "20210721113518-pbw2e0k", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113518-pbw2e0k", - "updated": "20220110113847" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Open " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "Settings - Cloud" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": ", configure " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "End-to-end encryption password" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - } - ] - } - ] - }, - { - "ID": "20210721113518-b1zmoh9", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "Mi4=", - "Num": 2 - }, - "Properties": { - "id": "20210721113518-b1zmoh9", - "updated": "20210721113608" - }, - "Children": [ - { - "ID": "20210721113518-nf6ppdd", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113518-nf6ppdd", - "updated": "20210721113608" - }, - "Children": [ - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "Settings - Cloud - Local backup" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " select " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "Backup and upload" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": ", after the backup is completed, a popup will prompt whether to upload, select " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "Confirm" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - } - ] - } - ] - }, - { - "ID": "20210721113518-p5y9e4c", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "My4=", - "Num": 3 - }, - "Properties": { - "id": "20210721113518-p5y9e4c" - }, - "Children": [ - { - "ID": "20210721113518-9wpyewo", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113518-9wpyewo" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "After the upload is complete, there will be a copy of the same encrypted data as the local backup in the cloud" - } - ] - } - ] - } - ] - }, - { - "ID": "20210721113518-3gs4xw8", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20210721113518-3gs4xw8", - "updated": "20210721113518" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Recovery" - } - ] - }, - { - "ID": "20210721113518-q0g9b8t", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113518-q0g9b8t", - "updated": "20210721113518" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Restoration refers to restoring the encrypted data in the " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "workspace/backup/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " folder to the " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "workspace/data/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " folder." - } - ] - }, - { - "ID": "20210721113518-36cr3ep", - "Type": "NodeHeading", - "HeadingLevel": 3, - "Properties": { - "id": "20210721113518-36cr3ep", - "updated": "20210721113518" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "How to use" - } - ] - }, - { - "ID": "20210721113518-ehrjn0l", - "Type": "NodeList", - "ListData": { - "Typ": 1 - }, - "Properties": { - "id": "20210721113518-ehrjn0l", - "updated": "20220110113910" - }, - "Children": [ - { - "ID": "20210721113518-xxudcbj", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "MS4=", - "Num": 1 - }, - "Properties": { - "id": "20210721113518-xxudcbj", - "updated": "20220110113910" - }, - "Children": [ - { - "ID": "20210721113518-7hc0mv6", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113518-7hc0mv6", - "updated": "20220110113910" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Open " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "Settings - Cloud" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": ", configure " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "End-to-end encryption password" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - } - ] - } - ] - }, - { - "ID": "20210721113518-mxh48fj", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "Mi4=", - "Num": 2 - }, - "Properties": { - "id": "20210721113518-mxh48fj", - "updated": "20210721113649" - }, - "Children": [ - { - "ID": "20210721113518-jtxtft6", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113518-jtxtft6", - "updated": "20210721113649" - }, - "Children": [ - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "Settings - Cloud - Cloud backup" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " Select " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "Download and recover" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": ", after the download is complete, a pop-up will prompt whether to restore, select " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "Confirm" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - } - ] - } - ] - }, - { - "ID": "20210721113518-e5ax8sg", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "My4=", - "Num": 3 - }, - "Properties": { - "id": "20210721113518-e5ax8sg" - }, - "Children": [ - { - "ID": "20210721113518-j15ej6g", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113518-j15ej6g" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "After the recovery is complete, the application will be closed, and you can restart it manually" - } - ] - } - ] - } - ] - }, - { - "ID": "20210721113518-bxfmlzu", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20210721113518-bxfmlzu", - "updated": "20211106114644" - }, - "Children": [ - { - "Type": "NodeTag", - "Data": "span", - "Children": [ - { - "Type": "NodeTagOpenMarker" - }, - { - "Type": "NodeText", - "Data": "Note" - }, - { - "Type": "NodeTagCloseMarker" - } - ] - } - ] - }, - { - "ID": "20210721113518-flygugq", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20210721113518-flygugq", - "updated": "20220605010124" - }, - "Children": [ - { - "ID": "20210721113518-t2bu4ls", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210721113518-t2bu4ls", - "updated": "20220605010124" - }, - "Children": [ - { - "ID": "20210721113518-vu6mx99", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113518-vu6mx99", - "updated": "20220605010124" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Do not use a third-party sync disk and SiYuan backup at the same time, it may cause data damage" - } - ] - } - ] - }, - { - "ID": "20210721113518-7gtij1a", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210721113518-7gtij1a" - }, - "Children": [ - { - "ID": "20210721113518-wo686i8", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113518-wo686i8" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "After restoring from the backup, the current workspace data will be overwritten and cannot be restored. Please confirm before using the backup to restore" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112229-fp97j3c.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112229-fp97j3c.sy deleted file mode 100644 index 18c12ceee..000000000 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112229-fp97j3c.sy +++ /dev/null @@ -1,544 +0,0 @@ -{ - "ID": "20210721112229-fp97j3c", - "Type": "NodeDocument", - "Properties": { - "id": "20210721112229-fp97j3c", - "title": "End-to-end Encryption", - "updated": "20220115002915" - }, - "Children": [ - { - "ID": "20220110113929-087uy2y", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220110113929-087uy2y", - "updated": "20220110113932" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Overview" - } - ] - }, - { - "ID": "20210721113811-5tkf18n", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113811-5tkf18n", - "updated": "20210721113815" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "SiYuan will encrypt data before backup and synchronization, and the encrypted data can be safely transmitted and hosted over the network." - } - ] - }, - { - "ID": "20210721113811-8fa6box", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20210721113811-8fa6box", - "updated": "20220111133331" - }, - "Children": [ - { - "ID": "20210721113811-dhoce9n", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210721113811-dhoce9n" - }, - "Children": [ - { - "ID": "20210721113811-j40wc0h", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113811-j40wc0h" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "The encryption and decryption process is completely performed on the local device" - } - ] - } - ] - }, - { - "ID": "20210721113811-ny6w1wu", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210721113811-ny6w1wu" - }, - "Children": [ - { - "ID": "20210721113811-qtrzt85", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113811-qtrzt85" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "The encryption algorithm is AES GCM, which is recognized as safe in the industry" - } - ] - } - ] - }, - { - "ID": "20210721113811-59an6f2", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210721113811-59an6f2" - }, - "Children": [ - { - "ID": "20210721113811-nnym9aw", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721113811-nnym9aw" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "The password set by the user is encrypted with the built-in key of the program and stored locally" - } - ] - } - ] - } - ] - }, - { - "ID": "20220110113934-fl0d0js", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220110113934-fl0d0js", - "updated": "20220110113937" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Password generation" - } - ] - }, - { - "ID": "20220110113934-dae2jau", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110113934-dae2jau", - "updated": "20220115002540" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "There are two methods to generate end-to-end encrypted passwords:" - } - ] - }, - { - "ID": "20220110113934-rfporqh", - "Type": "NodeList", - "ListData": { - "Typ": 1 - }, - "Properties": { - "id": "20220110113934-rfporqh", - "updated": "20220110113934" - }, - "Children": [ - { - "ID": "20220110113934-gwjk3qx", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "MS4=", - "Num": 1 - }, - "Properties": { - "id": "20220110113934-gwjk3qx" - }, - "Children": [ - { - "ID": "20220110113934-emopzba", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110113934-emopzba" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Automatic generation of algorithm based on user id" - } - ] - } - ] - }, - { - "ID": "20220110113934-dpi5mhr", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "Mi4=", - "Num": 2 - }, - "Properties": { - "id": "20220110113934-dpi5mhr" - }, - "Children": [ - { - "ID": "20220110113934-ozy5c5y", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110113934-ozy5c5y" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Based on user-defined password generation" - } - ] - } - ] - } - ] - }, - { - "ID": "20220115002535-0pj2k32", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002535-0pj2k32", - "updated": "20220115002553" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "The differences between the two password generation methods are:" - } - ] - }, - { - "ID": "20220115002535-ssrjw0d", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20220115002535-ssrjw0d", - "updated": "20220115002535" - }, - "Children": [ - { - "ID": "20220115002535-021hil0", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220115002535-021hil0" - }, - "Children": [ - { - "ID": "20220115002535-ntfil4j", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002535-ntfil4j" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "The id generation method is mainly for simplicity and convenience, but technically developers can decrypt data in the cloud" - } - ] - } - ] - }, - { - "ID": "20220115002535-cqgvx4i", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220115002535-cqgvx4i" - }, - "Children": [ - { - "ID": "20220115002535-9pk7z51", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002535-9pk7z51" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "The main purpose of using a custom password is to be more secure (unless you know the password or brute force, it cannot be decrypted), but the operation is relatively troublesome and the password must be remembered" - } - ] - } - ] - } - ] - }, - { - "ID": "20220110113934-uwfmdbs", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220110113934-uwfmdbs", - "updated": "20220110114008" - }, - "Children": [ - { - "Type": "NodeTag", - "Data": "span", - "Children": [ - { - "Type": "NodeTagOpenMarker" - }, - { - "Type": "NodeText", - "Data": "Note" - }, - { - "Type": "NodeTagCloseMarker" - } - ] - } - ] - }, - { - "ID": "20220110113934-ldpj5fk", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110113934-ldpj5fk", - "updated": "20220110113934" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Once the password generation method is selected:" - } - ] - }, - { - "ID": "20220110113934-v3n5kmk", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20220110113934-v3n5kmk", - "updated": "20220110113934" - }, - "Children": [ - { - "ID": "20220110113934-vo6xgcm", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220110113934-vo6xgcm" - }, - "Children": [ - { - "ID": "20220110113934-io3fleg", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110113934-io3fleg" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Need to keep the same build method on all devices" - } - ] - } - ] - }, - { - "ID": "20220110113934-kwtmv92", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220110113934-kwtmv92" - }, - "Children": [ - { - "ID": "20220110113934-mt1rt0e", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110113934-mt1rt0e" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "You cannot switch after selecting the generation method" - } - ] - } - ] - }, - { - "ID": "20220110113934-xv21745", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220110113934-xv21745" - }, - "Children": [ - { - "ID": "20220110113934-7zz23zi", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110113934-7zz23zi" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "If you use a custom password, please keep in mind" - } - ] - } - ] - } - ] - }, - { - "ID": "20220115002811-6is8h67", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220115002811-6is8h67", - "updated": "20220115002814" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Encrypted content" - } - ] - }, - { - "ID": "20220115002811-g4zajnf", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002811-g4zajnf", - "updated": "20220115002811" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "data/.siyuan folder and sub-files conf.json, syncignore, these data are configuration and metadata required for synchronization, so they will not be encrypted." - } - ] - }, - { - "ID": "20220115002811-hd5mct8", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002811-hd5mct8", - "updated": "20220115002811" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "In addition to this, all data in the data folder will be encrypted. The specific encrypted content is:" - } - ] - }, - { - "ID": "20220115002811-uhgonx9", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20220115002811-uhgonx9", - "updated": "20220115002915" - }, - "Children": [ - { - "ID": "20220115002811-1lxfxt8", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220115002811-1lxfxt8", - "updated": "20220115002858" - }, - "Children": [ - { - "ID": "20220115002811-tphbdpy", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002811-tphbdpy", - "updated": "20220115002858" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Folder name and file name (such as the file name of .sy files and assets files)" - } - ] - } - ] - }, - { - "ID": "20220115002811-iga6lri", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220115002811-iga6lri", - "updated": "20220115002915" - }, - "Children": [ - { - "ID": "20220115002811-xu85jj7", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002811-xu85jj7", - "updated": "20220115002915" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "file content" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20220105101227-n5zpr1a.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20220105101227-n5zpr1a.sy index ffacbf63c..d99935791 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20220105101227-n5zpr1a.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20220105101227-n5zpr1a.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20220105101227-n5zpr1a", "title": "Limitations", - "updated": "20220325115446" + "updated": "20220703223555" }, "Children": [ { @@ -13,7 +13,7 @@ "ListData": {}, "Properties": { "id": "20220105101254-dhwb8a1", - "updated": "20220325115446" + "updated": "20220703223555" }, "Children": [ { @@ -25,7 +25,7 @@ }, "Properties": { "id": "20220105101254-jmyydpw", - "updated": "20220325115446" + "updated": "20220703223555" }, "Children": [ { @@ -33,12 +33,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220105101254-gm1ctyf", - "updated": "20220325115446" + "updated": "20220703223555" }, "Children": [ { "Type": "NodeText", - "Data": "During synchronization or backup, single file transfer larger than 100MB is not supported" + "Data": "Sync does not support single file transfers larger than 100MB" } ] } diff --git a/app/guide/20210808180117-6v0mkxr/20210117215840-jcl17fx.sy b/app/guide/20210808180117-6v0mkxr/20210117215840-jcl17fx.sy index 1794c410f..ad7ffc1c4 100644 --- a/app/guide/20210808180117-6v0mkxr/20210117215840-jcl17fx.sy +++ b/app/guide/20210808180117-6v0mkxr/20210117215840-jcl17fx.sy @@ -6,7 +6,7 @@ "id": "20210117215840-jcl17fx", "title": "Data Security", "type": "doc", - "updated": "20220626214710" + "updated": "20220703223851" }, "Children": [ { @@ -227,12 +227,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20210721113914-knx9uy7", - "updated": "20220111133319" + "updated": "20220703223247" }, "Children": [ { "Type": "NodeText", - "Data": "SiYuan cloud backup and synchronization use " + "Data": "SiYuan cloud synchronization use " }, { "Type": "NodeBlockRef", @@ -253,7 +253,7 @@ }, { "Type": "NodeBlockRefText", - "Data": "end-to-end encryption" + "Data": "End-to-end Encryption" }, { "Type": "NodeCloseParen" @@ -290,7 +290,7 @@ "ListData": {}, "Properties": { "id": "20210721113914-m1bcp7i", - "updated": "20210721113914" + "updated": "20220703223851" }, "Children": [ { @@ -301,19 +301,21 @@ "Marker": "Kg==" }, "Properties": { - "id": "20210721113914-fg1idfp" + "id": "20210721113914-fg1idfp", + "updated": "20220703223851" }, "Children": [ { "ID": "20210721113914-rmfboog", "Type": "NodeParagraph", "Properties": { - "id": "20210721113914-rmfboog" + "id": "20210721113914-rmfboog", + "updated": "20220703223851" }, "Children": [ { "Type": "NodeText", - "Data": "Regularly back up data to the cloud and offline devices at the same time" + "Data": "Regularly back up data, refer to 321 Backup Guidelines (Minimum 3 copies, 2 media, and 1 offsite storage)" } ] } diff --git a/app/guide/20210808180117-czj9bvb/.siyuan/sort.json b/app/guide/20210808180117-czj9bvb/.siyuan/sort.json index f214567a7..7e9f3c948 100644 --- a/app/guide/20210808180117-czj9bvb/.siyuan/sort.json +++ b/app/guide/20210808180117-czj9bvb/.siyuan/sort.json @@ -14,7 +14,6 @@ "20200910201551-h4twhas": 5, "20200915214115-42b8zma": 7, "20200922102318-oz84yu3": 2, - "20201002090451-hb9j8ai": 4, "20201004184819-nj8ibyg": 15, "20201117101902-2ewjjum": 6, "20201121212605-9td1a62": 5, @@ -33,7 +32,6 @@ "20210615211733-v6rzowm": 13, "20210721101227-pi8f6ga": 1, "20210721103420-vn6g2yy": 3, - "20210721110423-5m6vo52": 2, "20210721154441-vav9m02": 7, "20210808180320-abz7w6k": 2, "20210808180320-fqgskfj": 1, diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20201002090451-hb9j8ai.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20201002090451-hb9j8ai.sy deleted file mode 100644 index d4c824a3e..000000000 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20201002090451-hb9j8ai.sy +++ /dev/null @@ -1,654 +0,0 @@ -{ - "ID": "20201002090451-hb9j8ai", - "Type": "NodeDocument", - "Properties": { - "id": "20201002090451-hb9j8ai", - "title": "数据备份", - "type": "doc", - "updated": "20210525213840" - }, - "Children": [ - { - "ID": "20210721095815-pjpu0ho", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20210721095815-pjpu0ho", - "updated": "20210721103929" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "备份" - } - ] - }, - { - "ID": "20210721100319-z1q1k3i", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721100319-z1q1k3i", - "updated": "20210721101817" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "备份指的是将 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空间/data/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 文件夹下的所有文件加密复制到 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空间/backup/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 文件夹下。" - } - ] - }, - { - "ID": "20210721101818-3brt3sh", - "Type": "NodeHeading", - "HeadingLevel": 3, - "Properties": { - "id": "20210721101818-3brt3sh", - "updated": "20210721103834" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "使用方式" - } - ] - }, - { - "ID": "20210721101907-5xurf7e", - "Type": "NodeList", - "ListData": { - "Typ": 1 - }, - "Properties": { - "id": "20210721101907-5xurf7e", - "updated": "20220110113852" - }, - "Children": [ - { - "ID": "20210721102104-aignutr", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "MS4=", - "Num": 1 - }, - "Properties": { - "id": "20210721102104-aignutr", - "updated": "20220110113852" - }, - "Children": [ - { - "ID": "20210721102104-774n55n", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721102104-774n55n", - "updated": "20220110113852" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "打开 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "设置 - 云端" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": "，配置 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "端到端加密密码" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - } - ] - } - ] - }, - { - "ID": "20210721101912-si7n74r", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "Mi4=", - "Num": 2 - }, - "Properties": { - "id": "20210721101912-si7n74r" - }, - "Children": [ - { - "ID": "20210721101912-rnfotfa", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721101912-rnfotfa", - "updated": "20210721102434" - }, - "Children": [ - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "设置 - 云端 - 本地备份" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 选择 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "备份并上传" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": "，备份完成后会弹框提示是否上传，选择 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "确定" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - } - ] - } - ] - }, - { - "ID": "20210721102434-4ndwfs4", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "My4=", - "Num": 3 - }, - "Properties": { - "id": "20210721102434-4ndwfs4", - "updated": "20210721102529" - }, - "Children": [ - { - "ID": "20210721102434-fhoui8e", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721102434-fhoui8e", - "updated": "20210721102529" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "上传完成以后云端会存在一份和本地备份相同的加密数据" - } - ] - } - ] - } - ] - }, - { - "ID": "20210721100316-1sdy3qp", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20210721100316-1sdy3qp", - "updated": "20210721100722" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "恢复" - } - ] - }, - { - "ID": "20210721101034-sw8hyea", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721101034-sw8hyea", - "updated": "20210721101814" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "恢复指的是将 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空间/backup/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 文件夹下加密过的数据恢复到 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空间/data/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 文件夹下。" - } - ] - }, - { - "ID": "20210721101727-6mp76gc", - "Type": "NodeHeading", - "HeadingLevel": 3, - "Properties": { - "id": "20210721101727-6mp76gc", - "updated": "20210721103842" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "使用方式" - } - ] - }, - { - "ID": "20210721102538-a63eeng", - "Type": "NodeList", - "ListData": { - "Typ": 1 - }, - "Properties": { - "id": "20210721102538-a63eeng", - "updated": "20220110113759" - }, - "Children": [ - { - "ID": "20210721102543-5li9vau", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "MS4=", - "Num": 1 - }, - "Properties": { - "id": "20210721102543-5li9vau", - "updated": "20220110113759" - }, - "Children": [ - { - "ID": "20210721102543-gziwktr", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721102543-gziwktr", - "updated": "20220110113759" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "打开 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "设置 - 云端" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": "，配置 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "端到端加密密码" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - } - ] - } - ] - }, - { - "ID": "20210721102553-ficqem0", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "Mi4=", - "Num": 2 - }, - "Properties": { - "id": "20210721102553-ficqem0" - }, - "Children": [ - { - "ID": "20210721102553-opzco0i", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721102553-opzco0i", - "updated": "20210721102640" - }, - "Children": [ - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "设置 - 云端 - 云端备份" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 选择 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "下载并恢复" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": "，下载完成后会弹框提示是否恢复，选择 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "确定" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - } - ] - } - ] - }, - { - "ID": "20210721102642-72j85al", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "My4=", - "Num": 3 - }, - "Properties": { - "id": "20210721102642-72j85al", - "updated": "20210721102659" - }, - "Children": [ - { - "ID": "20210721102642-6fpdtxw", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721102642-6fpdtxw", - "updated": "20210721102659" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "恢复完成后会关闭应用，手动重启即可" - } - ] - } - ] - } - ] - }, - { - "ID": "20210721100216-m2d5xka", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20210721100216-m2d5xka", - "updated": "20211106112557" - }, - "Children": [ - { - "Type": "NodeTag", - "Data": "span", - "Children": [ - { - "Type": "NodeTagOpenMarker" - }, - { - "Type": "NodeText", - "Data": "注意" - }, - { - "Type": "NodeTagCloseMarker" - } - ] - } - ] - }, - { - "ID": "20210524213716-ohh5os5", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20210524213716-ohh5os5", - "updated": "20210525213840" - }, - "Children": [ - { - "ID": "20210721110005-0zh6q73", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210721110005-0zh6q73", - "updated": "20220605005935" - }, - "Children": [ - { - "ID": "20210721110005-34zreuo", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721110005-34zreuo", - "updated": "20220605005935" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "请勿同时使用第三方同步盘和思源备份，可能会导致数据损坏" - } - ] - } - ] - }, - { - "ID": "20210525213740-3z17tp0", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210525213740-3z17tp0", - "updated": "20210525213840" - }, - "Children": [ - { - "ID": "20210525213740-43xo6jf", - "Type": "NodeParagraph", - "Properties": { - "id": "20210525213740-43xo6jf", - "updated": "20210525213840" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "从备份恢复后当前工作空间数据会被覆盖，且无法恢复，使用备份恢复前请务必进行确认" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721101227-pi8f6ga.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721101227-pi8f6ga.sy index 20923a407..5f5b23dfb 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721101227-pi8f6ga.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721101227-pi8f6ga.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20210721101227-pi8f6ga", "title": "存储空间", - "updated": "20210721154411" + "updated": "20220703223351" }, "Children": [ { @@ -12,7 +12,7 @@ "Type": "NodeParagraph", "Properties": { "id": "20210721101227-ihokmao", - "updated": "20210721102906" + "updated": "20220703223351" }, "Children": [ { @@ -37,7 +37,7 @@ }, { "Type": "NodeText", - "Data": "，分为三个部分：" + "Data": "，分为以下部分：" } ] }, @@ -47,7 +47,7 @@ "ListData": {}, "Properties": { "id": "20210721102906-c702lun", - "updated": "20210721103222" + "updated": "20210721103035" }, "Children": [ { @@ -78,34 +78,6 @@ } ] }, - { - "ID": "20210721102917-hlzlmod", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210721102917-hlzlmod", - "updated": "20210721103201" - }, - "Children": [ - { - "ID": "20210721102917-3iozeti", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721102917-3iozeti", - "updated": "20210721103201" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "备份数据：提供给备份功能使用，数据是加密的" - } - ] - } - ] - }, { "ID": "20210721102922-6m5qwbk", "Type": "NodeListItem", @@ -128,7 +100,11 @@ "Children": [ { "Type": "NodeText", - "Data": "资源文件：提供给复制到公众号、知乎和语雀等使用，HTTPS CDN" + "Data": "资源文件" + }, + { + "Type": "NodeText", + "Data": "：提供给复制到公众号、知乎和语雀等使用，HTTPS CDN" } ] } diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy index 8c7c9b5c5..aa22454e6 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20210721103420-vn6g2yy", "title": "数据同步", - "updated": "20220510104801" + "updated": "20220703222554" }, "Children": [ { @@ -52,7 +52,147 @@ }, { "Type": "NodeText", - "Data": " 文件夹数据一致，包括资源文件、模板、挂件以及笔记本数据。" + "Data": " 文件夹数据一致，包括" + }, + { + "Type": "NodeText", + "Data": "资源文件" + }, + { + "Type": "NodeText", + "Data": "、模板、" + }, + { + "Type": "NodeText", + "Data": "挂件" + }, + { + "Type": "NodeText", + "Data": "以及笔记本数据。" + } + ] + }, + { + "ID": "20210721110423-5m6vo52", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20210721110423-5m6vo52", + "updated": "20220703222554" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "端到端加密" + } + ] + }, + { + "ID": "20210525215124-ifljpao", + "Type": "NodeParagraph", + "Properties": { + "id": "20210525215124-ifljpao", + "updated": "20220703222031" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "数据同步通过端到端加密传输，云端不保存任何明文数据。" + } + ] + }, + { + "ID": "20210525215316-438zsvu", + "Type": "NodeList", + "ListData": {}, + "Properties": { + "id": "20210525215316-438zsvu", + "updated": "20210525220426" + }, + "Children": [ + { + "ID": "20220703222217-vfqq9x9", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703222217-vfqq9x9", + "updated": "20220703222217" + }, + "Children": [ + { + "ID": "20220703222217-cvrogps", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703222217-cvrogps", + "updated": "20220703222217" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "密钥仅存储在本地，不会上传到云端" + } + ] + } + ] + }, + { + "ID": "20210525220029-7myvzw8", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20210525220029-7myvzw8", + "updated": "20210721111300" + }, + "Children": [ + { + "ID": "20210525220029-c9i66lb", + "Type": "NodeParagraph", + "Properties": { + "id": "20210525220029-c9i66lb", + "updated": "20210721111300" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "加密和解密过程完全在本地设备上进行" + } + ] + } + ] + }, + { + "ID": "20210525220320-a9li63c", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20210525220320-a9li63c", + "updated": "20210525220426" + }, + "Children": [ + { + "ID": "20210525220320-h0rm7h0", + "Type": "NodeParagraph", + "Properties": { + "id": "20210525220320-h0rm7h0", + "updated": "20210525220426" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "加密算法为业界公认安全的 AES GCM" + } + ] + } + ] } ] }, diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721110423-5m6vo52.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721110423-5m6vo52.sy deleted file mode 100644 index 3f1225454..000000000 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721110423-5m6vo52.sy +++ /dev/null @@ -1,560 +0,0 @@ -{ - "ID": "20210721110423-5m6vo52", - "Type": "NodeDocument", - "Properties": { - "id": "20210721110423-5m6vo52", - "title": "端到端加密", - "updated": "20220115000748" - }, - "Children": [ - { - "ID": "20220110112614-pmxt6hj", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220110112614-pmxt6hj", - "updated": "20220110112616" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "概述" - } - ] - }, - { - "ID": "20210525215124-ifljpao", - "Type": "NodeParagraph", - "Properties": { - "id": "20210525215124-ifljpao", - "updated": "20210721111027" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "思源在进行备份和同步前会进行数据加密，加密后的数据可以放心地进行网络传输和托管。" - } - ] - }, - { - "ID": "20210525215316-438zsvu", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20210525215316-438zsvu", - "updated": "20220111133236" - }, - "Children": [ - { - "ID": "20210525220029-7myvzw8", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210525220029-7myvzw8", - "updated": "20210721111300" - }, - "Children": [ - { - "ID": "20210525220029-c9i66lb", - "Type": "NodeParagraph", - "Properties": { - "id": "20210525220029-c9i66lb", - "updated": "20210721111300" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "加密和解密过程完全在本地设备上进行" - } - ] - } - ] - }, - { - "ID": "20210525220320-a9li63c", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210525220320-a9li63c" - }, - "Children": [ - { - "ID": "20210525220320-h0rm7h0", - "Type": "NodeParagraph", - "Properties": { - "id": "20210525220320-h0rm7h0", - "updated": "20210525220426" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "加密算法为业界公认安全的 AES GCM" - } - ] - } - ] - }, - { - "ID": "20210525220057-l8oobjx", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210525220057-l8oobjx", - "updated": "20210630171753" - }, - "Children": [ - { - "ID": "20210525220057-j32ssb4", - "Type": "NodeParagraph", - "Properties": { - "id": "20210525220057-j32ssb4", - "updated": "20210630171753" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "用户设置的密码使用程序内置密钥加密后存储在本地" - } - ] - } - ] - } - ] - }, - { - "ID": "20220110112606-80hi7xj", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220110112606-80hi7xj", - "updated": "20220110112702" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "密码生成" - } - ] - }, - { - "ID": "20220110112401-c98y8ge", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110112401-c98y8ge", - "updated": "20220110112709" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "端到端加密密码有两种生成方式：" - } - ] - }, - { - "ID": "20220110112710-m679zvm", - "Type": "NodeList", - "ListData": { - "Typ": 1 - }, - "Properties": { - "id": "20220110112710-m679zvm", - "updated": "20220110113519" - }, - "Children": [ - { - "ID": "20220110112711-f5p30ve", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "MS4=", - "Num": 1 - }, - "Properties": { - "id": "20220110112711-f5p30ve" - }, - "Children": [ - { - "ID": "20220110112711-4d3h6ib", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110112711-4d3h6ib", - "updated": "20220110112901" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "基于用户 id 的算法自动生成" - } - ] - } - ] - }, - { - "ID": "20220110112825-pum725m", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "Mi4=", - "Num": 2 - }, - "Properties": { - "id": "20220110112825-pum725m", - "updated": "20220110113519" - }, - "Children": [ - { - "ID": "20220110112825-r86nrzz", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110112825-r86nrzz", - "updated": "20220110113519" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "基于用户自定义密码生成" - } - ] - } - ] - } - ] - }, - { - "ID": "20220115001624-6mku466", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115001624-6mku466", - "updated": "20220115002008" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "这两种密码生成方式的区别是：" - } - ] - }, - { - "ID": "20220115001637-hltae6p", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20220115001637-hltae6p", - "updated": "20220115002445" - }, - "Children": [ - { - "ID": "20220115001638-enezfl8", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220115001638-enezfl8", - "updated": "20220115002418" - }, - "Children": [ - { - "ID": "20220115001638-93vi3fb", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115001638-93vi3fb", - "updated": "20220115002418" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "使用 id 生成方式主要是为了简单方便，但从技术上而言开发者是能够在云端解密数据的" - } - ] - } - ] - }, - { - "ID": "20220115001714-xgv19z7", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220115001714-xgv19z7", - "updated": "20220115002445" - }, - "Children": [ - { - "ID": "20220115001714-8feaplt", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115001714-8feaplt", - "updated": "20220115002445" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "使用自定义密码方式主要是为了更加安全（除非知道密码或者暴力破解，否则不可能被解密），但操作相对麻烦一点且必须牢记密码" - } - ] - } - ] - } - ] - }, - { - "ID": "20220110112926-l56c42w", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220110112926-l56c42w", - "updated": "20220110113156" - }, - "Children": [ - { - "Type": "NodeTag", - "Data": "span", - "Children": [ - { - "Type": "NodeTagOpenMarker" - }, - { - "Type": "NodeText", - "Data": "注意" - }, - { - "Type": "NodeTagCloseMarker" - } - ] - } - ] - }, - { - "ID": "20220110113445-nvxr49j", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110113445-nvxr49j", - "updated": "20220110113453" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "一旦选定密码生成方式以后：" - } - ] - }, - { - "ID": "20220110113116-ta5467v", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20220110113116-ta5467v", - "updated": "20220110113433" - }, - "Children": [ - { - "ID": "20220110113117-cj52pj6", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220110113117-cj52pj6" - }, - "Children": [ - { - "ID": "20220110113117-061so6e", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110113117-061so6e", - "updated": "20220110113645" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "所有设备上都需要保持相同的生成方式" - } - ] - } - ] - }, - { - "ID": "20220110113221-rrdd8mk", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220110113221-rrdd8mk", - "updated": "20220110113433" - }, - "Children": [ - { - "ID": "20220110113221-u08ojq7", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110113221-u08ojq7", - "updated": "20220110113433" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "选定生成方式后无法进行切换" - } - ] - } - ] - }, - { - "ID": "20220110113655-u9hjd8j", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220110113655-u9hjd8j", - "updated": "20220110113655" - }, - "Children": [ - { - "ID": "20220110113655-u7sgwic", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110113655-u7sgwic", - "updated": "20220110113655" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "如果使用自定义密码，请务必牢记" - } - ] - } - ] - } - ] - }, - { - "ID": "20220114235050-cqm6gau", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220114235050-cqm6gau", - "updated": "20220115001324" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "加密内容" - } - ] - }, - { - "ID": "20220114235542-jjeec4f", - "Type": "NodeParagraph", - "Properties": { - "id": "20220114235542-jjeec4f", - "updated": "20220115000734" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "data/.siyuan 文件夹和子文件 conf.json、syncignore，这些数据是同步所需的配置和元数据，所以不会被加密。" - } - ] - }, - { - "ID": "20220115001129-ym9wh0l", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115001129-ym9wh0l", - "updated": "20220115001129" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "除此以外所有 data 文件夹下的数据都会被加密，具体加密内容为：" - } - ] - }, - { - "ID": "20220115000532-t8nejer", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20220115000532-t8nejer", - "updated": "20220115000748" - }, - "Children": [ - { - "ID": "20220115000533-9p9lcw9", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220115000533-9p9lcw9" - }, - "Children": [ - { - "ID": "20220115000533-r4fdh7x", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115000533-r4fdh7x", - "updated": "20220115000623" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "文件夹名和文件名（比如 .sy 文件和 assets 资源文件的文件名）" - } - ] - } - ] - }, - { - "ID": "20220115000741-ocyzlew", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220115000741-ocyzlew", - "updated": "20220115000748" - }, - "Children": [ - { - "ID": "20220115000741-cnei5th", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115000741-cnei5th", - "updated": "20220115000748" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "文件内容" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20220105100506-auvmvcw.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20220105100506-auvmvcw.sy index cc7f44fe1..eb482cef4 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20220105100506-auvmvcw.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20220105100506-auvmvcw.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20220105100506-auvmvcw", "title": "限制", - "updated": "20220325115453" + "updated": "20220703223435" }, "Children": [ { @@ -13,7 +13,7 @@ "ListData": {}, "Properties": { "id": "20220105100506-t539921", - "updated": "20220325115453" + "updated": "20220703223435" }, "Children": [ { @@ -25,7 +25,7 @@ }, "Properties": { "id": "20220105100537-cv7d0lj", - "updated": "20220325115453" + "updated": "20220703223435" }, "Children": [ { @@ -33,12 +33,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220105100537-d94pnme", - "updated": "20220325115453" + "updated": "20220703223435" }, "Children": [ { "Type": "NodeText", - "Data": "同步或备份时，不支持大于 100MB 的单个文件传输" + "Data": "同步不支持大于 100MB 的单个文件传输" } ] } diff --git a/app/guide/20210808180117-czj9bvb/20210117211155-56n4odu.sy b/app/guide/20210808180117-czj9bvb/20210117211155-56n4odu.sy index 1dbcd7798..fd50817f8 100644 --- a/app/guide/20210808180117-czj9bvb/20210117211155-56n4odu.sy +++ b/app/guide/20210808180117-czj9bvb/20210117211155-56n4odu.sy @@ -6,7 +6,7 @@ "id": "20210117211155-56n4odu", "title": "数据安全", "type": "doc", - "updated": "20220626213935" + "updated": "20220703223831" }, "Children": [ { @@ -263,12 +263,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20210721110555-81sqopb", - "updated": "20220111133217" + "updated": "20220703222819" }, "Children": [ { "Type": "NodeText", - "Data": "思源云端备份和同步使用" + "Data": "思源云端同步使用" }, { "Type": "NodeBlockRef", @@ -334,7 +334,8 @@ "Num": -1 }, "Properties": { - "id": "20210117214728-szj3mg9" + "id": "20210117214728-szj3mg9", + "updated": "20220703223831" }, "Children": [ { @@ -349,7 +350,8 @@ "Num": -1 }, "Properties": { - "id": "20210117215237-1mbl2ly" + "id": "20210117215237-1mbl2ly", + "updated": "20220703223831" }, "Children": [ { @@ -357,12 +359,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20210302223430-wz2k547", - "updated": "20210525221031" + "updated": "20220703223831" }, "Children": [ { "Type": "NodeText", - "Data": "定期将数据同时备份到云端和离线设备上" + "Data": "定期备份数据，参考 321 备份原则（至少 3 个副本、2 种介质和 1 个异地存储）" } ] } diff --git a/app/guide/20211226090932-5lcq56f/.siyuan/sort.json b/app/guide/20211226090932-5lcq56f/.siyuan/sort.json index 2dd25897d..253e12104 100644 --- a/app/guide/20211226090932-5lcq56f/.siyuan/sort.json +++ b/app/guide/20211226090932-5lcq56f/.siyuan/sort.json @@ -19,10 +19,8 @@ "20211226121232-23s79xr": 7, "20211226121319-emrk2yy": 1, "20211226121332-irgblss": 5, - "20211226121413-nznc7x0": 4, "20211226121438-xaafdo8": 3, "20211226121503-k3jma6m": 1, - "20211227210109-0f92zh2": 2, "20220105101348-corstqc": 6, "20220628204420-ui79vkt": 2 } \ No newline at end of file diff --git a/app/guide/20211226090932-5lcq56f/20211226115043-afhev0g.sy b/app/guide/20211226090932-5lcq56f/20211226115043-afhev0g.sy index 055137b3d..add1aa9c2 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115043-afhev0g.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115043-afhev0g.sy @@ -5,7 +5,7 @@ "icon": "1f50f", "id": "20211226115043-afhev0g", "title": "資料安全", - "updated": "20220626214021" + "updated": "20220703223919" }, "Children": [ { @@ -234,12 +234,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20211226115155-04oj3rp", - "updated": "20220111133353" + "updated": "20220703223003" }, "Children": [ { "Type": "NodeText", - "Data": "思源雲端備份和同步使用" + "Data": "思源雲端同步使用" }, { "Type": "NodeBlockRef", @@ -253,7 +253,7 @@ }, { "Type": "NodeBlockRefID", - "Data": "20211226121407-gvqi3gd" + "Data": "20211227210109-0f92zh2" }, { "Type": "NodeBlockRefSpace" @@ -297,7 +297,7 @@ "ListData": {}, "Properties": { "id": "20211226115155-z39qt19", - "updated": "20211228141139" + "updated": "20220703223919" }, "Children": [ { @@ -309,7 +309,7 @@ }, "Properties": { "id": "20211226115155-h7jnnu0", - "updated": "20211228141139" + "updated": "20220703223919" }, "Children": [ { @@ -317,12 +317,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20211226115155-vyt8fzz", - "updated": "20211228141139" + "updated": "20220703223919" }, "Children": [ { "Type": "NodeText", - "Data": "定期將資料同時備份到雲端和離線設備上" + "Data": "定期備份數據，參考 321 備份原則（至少 3 個副本、2 種介質和 1 個異地存儲）" } ] } diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121413-nznc7x0.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121413-nznc7x0.sy deleted file mode 100644 index 689040f26..000000000 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121413-nznc7x0.sy +++ /dev/null @@ -1,653 +0,0 @@ -{ - "ID": "20211226121413-nznc7x0", - "Type": "NodeDocument", - "Properties": { - "id": "20211226121413-nznc7x0", - "title": "資料備份", - "updated": "20220605010033" - }, - "Children": [ - { - "ID": "20211226121432-5j3nbah", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20211226121432-5j3nbah", - "updated": "20211226010539" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "備份" - } - ] - }, - { - "ID": "20211226121432-4e6e9j0", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121432-4e6e9j0", - "updated": "20211226010555" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "備份指的是將 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空間/data/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 文件夾下的所有文件加密複製到 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空間/backup/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 文件夾下。" - } - ] - }, - { - "ID": "20211226121432-td0zcpk", - "Type": "NodeHeading", - "HeadingLevel": 3, - "Properties": { - "id": "20211226121432-td0zcpk", - "updated": "20211226010539" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "使用方式" - } - ] - }, - { - "ID": "20211226121432-tfz9877", - "Type": "NodeList", - "ListData": { - "Typ": 1 - }, - "Properties": { - "id": "20211226121432-tfz9877", - "updated": "20220110114131" - }, - "Children": [ - { - "ID": "20211226121432-l8ayvpl", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "MS4=", - "Num": 1 - }, - "Properties": { - "id": "20211226121432-l8ayvpl", - "updated": "20220110114131" - }, - "Children": [ - { - "ID": "20211226121432-8z7sxlh", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121432-8z7sxlh", - "updated": "20220110114131" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "打開 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "設置 - 雲端" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": "，配置 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "端到端加密密碼" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - } - ] - } - ] - }, - { - "ID": "20211226121432-1u0ree0", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "Mi4=", - "Num": 2 - }, - "Properties": { - "id": "20211226121432-1u0ree0", - "updated": "20211228133514" - }, - "Children": [ - { - "ID": "20211226121432-8u5ygww", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121432-8u5ygww", - "updated": "20211228133514" - }, - "Children": [ - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "設置 - 雲端 - 本地備份" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 選擇 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "備份並上傳" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": "，備份完成後會彈出視窗提示是否上傳，選擇 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "確定" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - } - ] - } - ] - }, - { - "ID": "20211226121432-1bmfiqi", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "My4=", - "Num": 3 - }, - "Properties": { - "id": "20211226121432-1bmfiqi", - "updated": "20211228141222" - }, - "Children": [ - { - "ID": "20211226121432-bg7mbtb", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121432-bg7mbtb", - "updated": "20211228141222" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "上傳完成以後雲端會存在一份和本地備份相同的加密資料" - } - ] - } - ] - } - ] - }, - { - "ID": "20211226121432-17ixdjm", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20211226121432-17ixdjm", - "updated": "20211226010539" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "恢復" - } - ] - }, - { - "ID": "20211226121432-t16ldqq", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121432-t16ldqq", - "updated": "20211228141557" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "恢復指的是將 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空間/backup/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 文件夾下加密過的資料恢復到 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空間/data/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 文件夾下。" - } - ] - }, - { - "ID": "20211226121432-podfmgj", - "Type": "NodeHeading", - "HeadingLevel": 3, - "Properties": { - "id": "20211226121432-podfmgj", - "updated": "20211226010539" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "使用方式" - } - ] - }, - { - "ID": "20211226121432-p59r7ul", - "Type": "NodeList", - "ListData": { - "Typ": 1 - }, - "Properties": { - "id": "20211226121432-p59r7ul", - "updated": "20220110114134" - }, - "Children": [ - { - "ID": "20211226121432-gd80cvp", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "MS4=", - "Num": 1 - }, - "Properties": { - "id": "20211226121432-gd80cvp", - "updated": "20220110114134" - }, - "Children": [ - { - "ID": "20211226121432-0zexezq", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121432-0zexezq", - "updated": "20220110114134" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "打開 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "設置 - 雲端" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": "，配置 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "端到端加密密碼" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - } - ] - } - ] - }, - { - "ID": "20211226121432-z94elg7", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "Mi4=", - "Num": 2 - }, - "Properties": { - "id": "20211226121432-z94elg7", - "updated": "20211228133519" - }, - "Children": [ - { - "ID": "20211226121432-aunx20t", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121432-aunx20t", - "updated": "20211228133519" - }, - "Children": [ - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "設置 - 雲端 - 雲端備份" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 選擇 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "下載並恢復" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": "，下載完成後會彈出視窗提示是否恢復，選擇 " - }, - { - "Type": "NodeKbd", - "Data": "kbd", - "Children": [ - { - "Type": "NodeKbdOpenMarker" - }, - { - "Type": "NodeText", - "Data": "確定" - }, - { - "Type": "NodeKbdCloseMarker" - } - ] - } - ] - } - ] - }, - { - "ID": "20211226121432-66eoqc5", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "My4=", - "Num": 3 - }, - "Properties": { - "id": "20211226121432-66eoqc5" - }, - "Children": [ - { - "ID": "20211226121432-st1ky57", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121432-st1ky57" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "恢復完成後會關閉應用，手動重啟即可" - } - ] - } - ] - } - ] - }, - { - "ID": "20211226121432-j0ac78e", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20211226121432-j0ac78e", - "updated": "20211226010539" - }, - "Children": [ - { - "Type": "NodeTag", - "Data": "span", - "Children": [ - { - "Type": "NodeTagOpenMarker" - }, - { - "Type": "NodeText", - "Data": "注意" - }, - { - "Type": "NodeTagCloseMarker" - } - ] - } - ] - }, - { - "ID": "20211226121432-vk1p2ti", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20211226121432-vk1p2ti", - "updated": "20220605010033" - }, - "Children": [ - { - "ID": "20211226121432-0mjndvh", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20211226121432-0mjndvh", - "updated": "20220605010033" - }, - "Children": [ - { - "ID": "20211226121432-8v0c4ao", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121432-8v0c4ao", - "updated": "20220605010033" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "請勿同時使用第三方同步盤和思源備份，可能會導致資料損壞" - } - ] - } - ] - }, - { - "ID": "20211226121432-geavq00", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20211226121432-geavq00", - "updated": "20211228141446" - }, - "Children": [ - { - "ID": "20211226121432-jzl32l3", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121432-jzl32l3", - "updated": "20211228141446" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "從備份恢復後當前工作空間資料會被覆蓋，且無法恢復，使用備份恢復前請務必進行確認" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy index d19e252b1..948be3834 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20211226121438-xaafdo8", "title": "資料同步", - "updated": "20220510105029" + "updated": "20220703223113" }, "Children": [ { @@ -56,6 +56,130 @@ } ] }, + { + "ID": "20211227210109-0f92zh2", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20211227210109-0f92zh2", + "title": "端到端加密", + "updated": "20220703223113" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "端到端加密" + } + ] + }, + { + "ID": "20220703223050-c15s118", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703223050-c15s118" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "數據同步通過端到端加密傳輸，雲端不保存任何明文數據。" + } + ] + }, + { + "ID": "20220703223050-mrhujtt", + "Type": "NodeList", + "ListData": {}, + "Properties": { + "id": "20220703223050-mrhujtt", + "updated": "20220703223050" + }, + "Children": [ + { + "ID": "20220703223050-bc8yax3", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703223050-bc8yax3", + "updated": "20220703223050" + }, + "Children": [ + { + "ID": "20220703223050-hb3id1r", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703223050-hb3id1r", + "updated": "20220703223050" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "密鑰僅存儲在本地，不會上傳到雲端" + } + ] + } + ] + }, + { + "ID": "20220703223050-r6ah4qz", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703223050-r6ah4qz", + "updated": "20220703223050" + }, + "Children": [ + { + "ID": "20220703223050-z2k2sr1", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703223050-z2k2sr1", + "updated": "20220703223050" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "加密和解密過程完全在本地設備上進行" + } + ] + } + ] + }, + { + "ID": "20220703223050-cwpobbf", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703223050-cwpobbf", + "updated": "20220703223050" + }, + "Children": [ + { + "ID": "20220703223050-3ot9kpq", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703223050-3ot9kpq", + "updated": "20220703223050" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "加密算法為業界公認安全的 AES GCM" + } + ] + } + ] + } + ] + }, { "ID": "20211226121454-g3niy0i", "Type": "NodeHeading", diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121503-k3jma6m.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121503-k3jma6m.sy index c56a7bdcc..68efdce06 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121503-k3jma6m.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121503-k3jma6m.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20211226121503-k3jma6m", "title": "存儲空間", - "updated": "20211226121514" + "updated": "20211228141328" }, "Children": [ { @@ -12,7 +12,7 @@ "Type": "NodeParagraph", "Properties": { "id": "20211226121514-9r4k5e3", - "updated": "20211226005932" + "updated": "20220703223401" }, "Children": [ { @@ -37,7 +37,7 @@ }, { "Type": "NodeText", - "Data": "，分為三個部分：" + "Data": "，分為以下部分：" } ] }, @@ -47,7 +47,7 @@ "ListData": {}, "Properties": { "id": "20211226121514-hmpy0lc", - "updated": "20211228141330" + "updated": "20211228141328" }, "Children": [ { @@ -78,34 +78,6 @@ } ] }, - { - "ID": "20211226121514-oxrrbse", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20211226121514-oxrrbse", - "updated": "20211228141330" - }, - "Children": [ - { - "ID": "20211226121514-s9iqfeb", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121514-s9iqfeb", - "updated": "20211228141330" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "備份資料：提供給備份功能使用，資料是加密的" - } - ] - } - ] - }, { "ID": "20211226121514-tq33ai6", "Type": "NodeListItem", @@ -128,7 +100,11 @@ "Children": [ { "Type": "NodeText", - "Data": "資料文件：提供給複製到公眾號、知乎和語雀等使用，HTTPS CDN" + "Data": "資料文件" + }, + { + "Type": "NodeText", + "Data": "：提供給複製到公眾號、知乎和語雀等使用，HTTPS CDN" } ] } diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211227210109-0f92zh2.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211227210109-0f92zh2.sy deleted file mode 100644 index 087408e5e..000000000 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211227210109-0f92zh2.sy +++ /dev/null @@ -1,544 +0,0 @@ -{ - "ID": "20211227210109-0f92zh2", - "Type": "NodeDocument", - "Properties": { - "id": "20211227210109-0f92zh2", - "title": "端到端加密", - "updated": "20220115002802" - }, - "Children": [ - { - "ID": "20220110114146-u6sy1u5", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220110114146-u6sy1u5", - "updated": "20220110114148" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "概述" - } - ] - }, - { - "ID": "20211227210129-fcbjzws", - "Type": "NodeParagraph", - "Properties": { - "id": "20211227210129-fcbjzws", - "updated": "20211228141355" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "思源在進行備份和同步前會進行資料加密，加密後的資料可以放心地進行網絡傳輸和託管。" - } - ] - }, - { - "ID": "20211227210129-smiq240", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20211227210129-smiq240", - "updated": "20220111133402" - }, - "Children": [ - { - "ID": "20211227210129-75f879z", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20211227210129-75f879z" - }, - "Children": [ - { - "ID": "20211227210129-r6ewnfz", - "Type": "NodeParagraph", - "Properties": { - "id": "20211227210129-r6ewnfz" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "加密和解密過程完全在本地設備上進行" - } - ] - } - ] - }, - { - "ID": "20211227210129-01n2zqt", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20211227210129-01n2zqt", - "updated": "20211228125302" - }, - "Children": [ - { - "ID": "20211227210129-ft38gmp", - "Type": "NodeParagraph", - "Properties": { - "id": "20211227210129-ft38gmp", - "updated": "20211228125302" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "加密演算法為業界公認安全的 AES GCM" - } - ] - } - ] - }, - { - "ID": "20211227210129-xxov0k1", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20211227210129-xxov0k1", - "updated": "20211228124716" - }, - "Children": [ - { - "ID": "20211227210129-3ufp77h", - "Type": "NodeParagraph", - "Properties": { - "id": "20211227210129-3ufp77h", - "updated": "20211228124716" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "用戶設置的密碼使用程式內置金鑰加密後存儲在本地" - } - ] - } - ] - } - ] - }, - { - "ID": "20220110114207-zrjgaz5", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220110114207-zrjgaz5", - "updated": "20220110114207" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "密碼生成" - } - ] - }, - { - "ID": "20220110114207-nos5pku", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110114207-nos5pku", - "updated": "20220110114207" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "端到端加密密碼有兩種生成方式：" - } - ] - }, - { - "ID": "20220110114207-48qatwp", - "Type": "NodeList", - "ListData": { - "Typ": 1 - }, - "Properties": { - "id": "20220110114207-48qatwp", - "updated": "20220110114207" - }, - "Children": [ - { - "ID": "20220110114207-hws3yuw", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "MS4=", - "Num": 1 - }, - "Properties": { - "id": "20220110114207-hws3yuw" - }, - "Children": [ - { - "ID": "20220110114207-qhp89hs", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110114207-qhp89hs" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "基於用戶 id 的算法自動生成" - } - ] - } - ] - }, - { - "ID": "20220110114207-dlc2d3a", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "Mi4=", - "Num": 2 - }, - "Properties": { - "id": "20220110114207-dlc2d3a" - }, - "Children": [ - { - "ID": "20220110114207-tzfreu4", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110114207-tzfreu4" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "基於用戶自定義密碼生成" - } - ] - } - ] - } - ] - }, - { - "ID": "20220115002724-yl730ol", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002724-yl730ol", - "updated": "20220115002724" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "這兩種密碼生成方式的區別是：" - } - ] - }, - { - "ID": "20220115002724-5byll50", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20220115002724-5byll50", - "updated": "20220115002724" - }, - "Children": [ - { - "ID": "20220115002724-lxsf22n", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220115002724-lxsf22n" - }, - "Children": [ - { - "ID": "20220115002724-3si1p5n", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002724-3si1p5n" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "使用 id 生成方式主要是為了簡單方便，但從技術上而言開發者是能夠在雲端解密數據的" - } - ] - } - ] - }, - { - "ID": "20220115002724-qr3gsik", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220115002724-qr3gsik" - }, - "Children": [ - { - "ID": "20220115002724-a7msyfv", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002724-a7msyfv" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "使用自定義密碼方式主要是為了更加安全（除非知道密碼或者暴力破解，否則不可能被解密），但操作相對麻煩一點且必須牢記密碼" - } - ] - } - ] - } - ] - }, - { - "ID": "20220110114207-nbytbqa", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220110114207-nbytbqa", - "updated": "20220110114207" - }, - "Children": [ - { - "Type": "NodeTag", - "Data": "span", - "Children": [ - { - "Type": "NodeTagOpenMarker" - }, - { - "Type": "NodeText", - "Data": "注意" - }, - { - "Type": "NodeTagCloseMarker" - } - ] - } - ] - }, - { - "ID": "20220110114207-ohld939", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110114207-ohld939", - "updated": "20220110114207" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "一旦選定密碼生成方式以後：" - } - ] - }, - { - "ID": "20220110114207-sqvif7q", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20220110114207-sqvif7q", - "updated": "20220110114207" - }, - "Children": [ - { - "ID": "20220110114207-3bbiriv", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220110114207-3bbiriv" - }, - "Children": [ - { - "ID": "20220110114207-7j5wz5j", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110114207-7j5wz5j" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "所有設備上都需要保持相同的生成方式" - } - ] - } - ] - }, - { - "ID": "20220110114207-fs2r8fw", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220110114207-fs2r8fw" - }, - "Children": [ - { - "ID": "20220110114207-w5each0", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110114207-w5each0" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "選定生成方式後無法進行切換" - } - ] - } - ] - }, - { - "ID": "20220110114207-2j9ziit", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220110114207-2j9ziit" - }, - "Children": [ - { - "ID": "20220110114207-c73g17p", - "Type": "NodeParagraph", - "Properties": { - "id": "20220110114207-c73g17p" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "如果使用自定義密碼，請務必牢記" - } - ] - } - ] - } - ] - }, - { - "ID": "20220115002802-yw2j4sv", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220115002802-yw2j4sv", - "updated": "20220115002802" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "加密內容" - } - ] - }, - { - "ID": "20220115002802-2hu9liw", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002802-2hu9liw", - "updated": "20220115002802" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "data/.siyuan 文件夾和子文件 conf.json、syncignore，這些數據是同步所需的配置和元數據，所以不會被加密。" - } - ] - }, - { - "ID": "20220115002802-ypdctfk", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002802-ypdctfk", - "updated": "20220115002802" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "除此以外所有 data 文件夾下的數據都會被加密，具體加密內容為：" - } - ] - }, - { - "ID": "20220115002802-ntgt6g0", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20220115002802-ntgt6g0", - "updated": "20220115002802" - }, - "Children": [ - { - "ID": "20220115002802-pkl9p2x", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220115002802-pkl9p2x" - }, - "Children": [ - { - "ID": "20220115002802-d040150", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002802-d040150" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "文件夾名和文件名（比如 .sy 文件和 assets 資源文件的文件名）" - } - ] - } - ] - }, - { - "ID": "20220115002802-6pps56w", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220115002802-6pps56w" - }, - "Children": [ - { - "ID": "20220115002802-o0pxks8", - "Type": "NodeParagraph", - "Properties": { - "id": "20220115002802-o0pxks8" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "文件內容" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20220105101348-corstqc.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20220105101348-corstqc.sy index f21ee9175..8b3f5da25 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20220105101348-corstqc.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20220105101348-corstqc.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20220105101348-corstqc", "title": "限制", - "updated": "20220325115500" + "updated": "20220703223528" }, "Children": [ { @@ -13,7 +13,7 @@ "ListData": {}, "Properties": { "id": "20220105101409-es213ce", - "updated": "20220325115500" + "updated": "20220703223528" }, "Children": [ { @@ -25,7 +25,7 @@ }, "Properties": { "id": "20220105101409-r9z7pa7", - "updated": "20220325115500" + "updated": "20220703223528" }, "Children": [ { @@ -33,12 +33,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220105101409-jfva42o", - "updated": "20220325115500" + "updated": "20220703223528" }, "Children": [ { "Type": "NodeText", - "Data": "同步或備份時，不支持大於 100MB 的單個文件傳輸" + "Data": "同步不支持大於 100MB 的單個文件傳輸" } ] } From b387adb81ad224239b3ab149df22d873cae1eef3 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 3 Jul 2022 23:28:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:art:=20=E5=85=AC=E6=B5=8B=E4=BA=91?= =?UTF-8?q?=E7=AB=AF=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E4=BB=93=E5=BA=93?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/5337?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20210721112206-mhr9wxi.sy | 619 +++++------------ .../20210721103420-vn6g2yy.sy | 591 +++++----------- .../20211226121438-xaafdo8.sy | 637 +++++------------- kernel/conf/sync.go | 7 +- 4 files changed, 519 insertions(+), 1335 deletions(-) diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy index a4ddf22f0..fef2d6efd 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20210721112206-mhr9wxi", "title": "Data Sync", - "updated": "20220703223222" + "updated": "20220420100331" }, "Children": [ { @@ -197,16 +197,63 @@ ] }, { - "ID": "20211027220510-0egr1r9", + "ID": "20220703231817-nbhxxb6", "Type": "NodeParagraph", "Properties": { - "id": "20211027220510-0egr1r9", - "updated": "20211106114232" + "id": "20220703231817-nbhxxb6", + "updated": "20220703231839" }, "Children": [ { "Type": "NodeText", - "Data": "Open " + "Data": "After " + }, + { + "Type": "NodeBlockRef", + "Data": "span", + "Children": [ + { + "Type": "NodeOpenParen" + }, + { + "Type": "NodeOpenParen" + }, + { + "Type": "NodeBlockRefID", + "Data": "20220615120602-iya2886" + }, + { + "Type": "NodeBlockRefSpace" + }, + { + "Type": "NodeBlockRefText", + "Data": "initializing the data repo key" + }, + { + "Type": "NodeCloseParen" + }, + { + "Type": "NodeCloseParen" + } + ] + }, + { + "Type": "NodeText", + "Data": ", if all goes well, the synchronization is already configured." + } + ] + }, + { + "ID": "20220703231817-t13itml", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703231817-t13itml", + "updated": "20220703231817" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "If you need to pause sync, you can turn off the option " }, { "Type": "NodeKbd", @@ -217,7 +264,7 @@ }, { "Type": "NodeText", - "Data": "Settings - Cloud - Cloud sync" + "Data": "Settings" }, { "Type": "NodeKbdCloseMarker" @@ -226,150 +273,47 @@ }, { "Type": "NodeText", - "Data": " and proceed through the synchronization setting wizard." - } - ] - }, - { - "ID": "20211027220510-4qkvcnz", - "Type": "NodeList", - "ListData": { - "Typ": 1 - }, - "Properties": { - "id": "20211027220510-4qkvcnz", - "updated": "20220110113833" - }, - "Children": [ - { - "ID": "20211027220510-4qik87y", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "MS4=", - "Num": 1 - }, - "Properties": { - "id": "20211027220510-4qik87y", - "updated": "20220110113833" - }, - "Children": [ - { - "ID": "20211027220510-4acljz5", - "Type": "NodeParagraph", - "Properties": { - "id": "20211027220510-4acljz5", - "updated": "20220110113833" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Set the " - }, - { - "Type": "NodeText", - "Data": "end-to-end encryption" - }, - { - "Type": "NodeText", - "Data": " password" - } - ] - } - ] + "Data": " - " }, { - "ID": "20211027220510-arpjijt", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "Mi4=", - "Num": 2 - }, - "Properties": { - "id": "20211027220510-arpjijt" - }, + "Type": "NodeKbd", + "Data": "kbd", "Children": [ { - "ID": "20211027220510-wz0rbnw", - "Type": "NodeParagraph", - "Properties": { - "id": "20211027220510-wz0rbnw" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Create or select a cloud synchronization directory. After selecting, the cloud synchronization directory will be used for data synchronization in the current workspace" - } - ] - } - ] - }, - { - "ID": "20211027220510-i02t3c4", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "My4=", - "Num": 3 - }, - "Properties": { - "id": "20211027220510-i02t3c4" - }, - "Children": [ - { - "ID": "20211027220510-u8153il", - "Type": "NodeParagraph", - "Properties": { - "id": "20211027220510-u8153il" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Enable sync switch" - } - ] - } - ] - } - ] - }, - { - "ID": "20210727103226-gfx0f7l", - "Type": "NodeParagraph", - "Properties": { - "id": "20210727103226-gfx0f7l", - "updated": "20210727103347" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Please perform the above operations on the " - }, - { - "Type": "NodeEmphasis", - "Data": "em", - "Children": [ - { - "Type": "NodeEmA6kOpenMarker", - "Data": "*" + "Type": "NodeKbdOpenMarker" }, { "Type": "NodeText", - "Data": "main" + "Data": "Cloud" }, { - "Type": "NodeEmA6kCloseMarker", - "Data": "*" + "Type": "NodeKbdCloseMarker" } ] }, { "Type": "NodeText", - "Data": " device first, then select the same cloud sync directory on other devices and turn on the sync switch. If you want to switch, rename or remove the cloud sync directory, please turn off the sync switch on all devices before proceeding." + "Data": " - " + }, + { + "Type": "NodeKbd", + "Data": "kbd", + "Children": [ + { + "Type": "NodeKbdOpenMarker" + }, + { + "Type": "NodeText", + "Data": "Enable cloud sync" + }, + { + "Type": "NodeKbdCloseMarker" + } + ] + }, + { + "Type": "NodeText", + "Data": "." } ] }, @@ -535,187 +479,146 @@ ] }, { - "ID": "20210721112403-k020foj", + "ID": "20220703232248-hhbh17m", "Type": "NodeParagraph", "Properties": { - "id": "20210721112403-k020foj", - "updated": "20220510104937" + "id": "20220703232248-hhbh17m", + "updated": "20220703232251" }, "Children": [ { "Type": "NodeText", - "Data": "SiYuan performs corresponding operations by comparing the cloud data version and the local data version:" + "Data": "SiYuan performs corresponding operations by comparing cloud data snapshots and local data snapshots:" } ] }, { - "ID": "20210721112403-7z02hlf", + "ID": "20220703232248-j1dq9w6", "Type": "NodeList", "ListData": {}, "Properties": { - "id": "20210721112403-7z02hlf", - "updated": "20210901163505" + "id": "20220703232248-j1dq9w6", + "updated": "20220703232358" }, "Children": [ { - "ID": "20210721112403-6vsuax6", + "ID": "20220703232248-anr56yy", "Type": "NodeListItem", "ListData": { "BulletChar": 42, "Marker": "Kg==" }, "Properties": { - "id": "20210721112403-6vsuax6", - "updated": "20210901163400" + "id": "20220703232248-anr56yy", + "updated": "20220703232248" }, "Children": [ { - "ID": "20210721112403-vy0km58", + "ID": "20220703232248-sq7sqfd", "Type": "NodeParagraph", "Properties": { - "id": "20210721112403-vy0km58", - "updated": "20210901163400" + "id": "20220703232248-sq7sqfd", + "updated": "20220703232248" }, "Children": [ { "Type": "NodeText", - "Data": "Skip if the version is equal" + "Data": "If the snapshots are the same, ignore this synchronization" } ] } ] }, { - "ID": "20210721112403-t742q8e", + "ID": "20220703232248-nuapm43", "Type": "NodeListItem", "ListData": { "BulletChar": 42, "Marker": "Kg==" }, "Properties": { - "id": "20210721112403-t742q8e", - "updated": "20220510104256" + "id": "20220703232248-nuapm43", + "updated": "20220703232358" }, "Children": [ { - "ID": "20210721112403-ai2lz2c", + "ID": "20220703232248-6oj5sng", "Type": "NodeParagraph", "Properties": { - "id": "20210721112403-ai2lz2c", - "updated": "20220510104256" + "id": "20220703232248-6oj5sng", + "updated": "20220703232248" }, "Children": [ { "Type": "NodeText", - "Data": "If the cloud version is greater than the local version, download the cloud data locally and decrypt it to the " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "workspace/data/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " folder, and the local overwritten or deleted files will be moved to the " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "workspace/history/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " folder" + "Data": "If the snapshots are different, upload the local changes from the last sync to the cloud, and merge the latest changes from the cloud to the local" } ] - } - ] - }, - { - "ID": "20210721112403-5kg7vat", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210721112403-5kg7vat", - "updated": "20210901163505" - }, - "Children": [ + }, { - "ID": "20210721112403-lyikpwu", - "Type": "NodeParagraph", + "ID": "20220703232248-kl3io11", + "Type": "NodeList", + "ListData": {}, "Properties": { - "id": "20210721112403-lyikpwu", - "updated": "20210901163505" + "id": "20220703232248-kl3io11", + "updated": "20220703232358" }, "Children": [ { - "Type": "NodeText", - "Data": "If the cloud version is less than the local version, scan for changes in " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", + "ID": "20220703232248-z2ww7lp", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703232248-z2ww7lp", + "updated": "20220703232248" + }, "Children": [ { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "/workspace/data/" - }, - { - "Type": "NodeCodeSpanCloseMarker" + "ID": "20220703232248-qj3gsdd", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703232248-qj3gsdd", + "updated": "20220703232248" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Merge directly if there is no conflict between the changes at both ends" + } + ] } ] }, { - "Type": "NodeText", - "Data": ", then encrypt the changes and copy them to the folder " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", + "ID": "20220703232248-jneoxfm", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703232248-jneoxfm", + "updated": "20220703232358" + }, "Children": [ { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "workspace/sync/" - }, - { - "Type": "NodeCodeSpanCloseMarker" + "ID": "20220703232248-x7l12qz", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703232248-x7l12qz", + "updated": "20220703232358" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "If there is a file conflict, the local will overwrite the cloud, and the conflicting files from the cloud will be generated in the data history." + } + ] } ] - }, - { - "Type": "NodeText", - "Data": ", and finally upload and overwrite the cloud data" } ] } @@ -724,16 +627,16 @@ ] }, { - "ID": "20220510105000-503cjse", + "ID": "20220703232248-f48ijwk", "Type": "NodeParagraph", "Properties": { - "id": "20220510105000-503cjse", - "updated": "20220510105000" + "id": "20220703232248-f48ijwk", + "updated": "20220703232248" }, "Children": [ { "Type": "NodeText", - "Data": "The version comparison is automatically performed at regular intervals. The time interval algorithm is described as follows:" + "Data": "Synchronization occurs automatically at regular intervals, and the time interval algorithm is described as follows:" } ] }, @@ -839,12 +742,12 @@ "HeadingLevel": 3, "Properties": { "id": "20220307095105-xr4ht8a", - "updated": "20220307095105" + "updated": "20220703232432" }, "Children": [ { "Type": "NodeText", - "Data": "Normal scene" + "Data": "Normal scenario" } ] }, @@ -988,33 +891,33 @@ ] }, { - "ID": "20220307095105-fiqosxx", + "ID": "20220703232421-8zpzkw4", "Type": "NodeHeading", "HeadingLevel": 3, "Properties": { - "id": "20220307095105-fiqosxx", - "updated": "20220307095105" + "id": "20220703232421-8zpzkw4", + "updated": "20220703232435" }, "Children": [ { "Type": "NodeText", - "Data": "Override scene" + "Data": "Conflict scenario" } ] }, { - "ID": "20220307095105-ep79t8e", + "ID": "20220703232421-gmxxahn", "Type": "NodeList", "ListData": { "Typ": 1 }, "Properties": { - "id": "20220307095105-ep79t8e", - "updated": "20220307095105" + "id": "20220703232421-gmxxahn", + "updated": "20220703232715" }, "Children": [ { - "ID": "20220307095105-8826dy9", + "ID": "20220703232421-tfvngal", "Type": "NodeListItem", "ListData": { "Typ": 1, @@ -1023,26 +926,28 @@ "Num": 1 }, "Properties": { - "id": "20220307095105-8826dy9" + "id": "20220703232421-tfvngal", + "updated": "20220703232625" }, "Children": [ { - "ID": "20220307095105-x0he7bs", + "ID": "20220703232421-vhp8oio", "Type": "NodeParagraph", "Properties": { - "id": "20220307095105-x0he7bs" + "id": "20220703232421-vhp8oio", + "updated": "20220703232625" }, "Children": [ { "Type": "NodeText", - "Data": "Not syncing after editing on device A (for example, when there is no network and it is offline)" + "Data": "Sync after editing the file a on device A" } ] } ] }, { - "ID": "20220307095105-izitvbz", + "ID": "20220703232421-wfhhavr", "Type": "NodeListItem", "ListData": { "Typ": 1, @@ -1051,26 +956,28 @@ "Num": 2 }, "Properties": { - "id": "20220307095105-izitvbz" + "id": "20220703232421-wfhhavr", + "updated": "20220703232627" }, "Children": [ { - "ID": "20220307095105-w9ngf5y", + "ID": "20220703232421-2wl7eyb", "Type": "NodeParagraph", "Properties": { - "id": "20220307095105-w9ngf5y" + "id": "20220703232421-2wl7eyb", + "updated": "20220703232627" }, "Children": [ { "Type": "NodeText", - "Data": "Not syncing after editing on device B" + "Data": "Sync after editing the file a on device B" } ] } ] }, { - "ID": "20220307095105-sd6qr1j", + "ID": "20220703232421-axvmpcs", "Type": "NodeListItem", "ListData": { "Typ": 1, @@ -1079,153 +986,25 @@ "Num": 3 }, "Properties": { - "id": "20220307095105-sd6qr1j" + "id": "20220703232421-axvmpcs", + "updated": "20220703232715" }, "Children": [ { - "ID": "20220307095105-3u4gbc3", + "ID": "20220703232421-r4nw5op", "Type": "NodeParagraph", "Properties": { - "id": "20220307095105-3u4gbc3" + "id": "20220703232421-r4nw5op", + "updated": "20220703232715" }, "Children": [ { "Type": "NodeText", - "Data": "Perform synchronization on device A. At this time, the cloud data will be overwritten by the data of device A, that is, the cloud and device A keep the same data." + "Data": "At this time, the cloud file a will be overwritten by a of the B device, and the history of the previous A device file a will be generated on the B device" } ] } ] - }, - { - "ID": "20220307095105-e5htllk", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "NC4=", - "Num": 4 - }, - "Properties": { - "id": "20220307095105-e5htllk" - }, - "Children": [ - { - "ID": "20220307095105-dhos0vm", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307095105-dhos0vm" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Perform a sync on device B, at which point there are three possible scenarios" - } - ] - }, - { - "ID": "20220307095105-278fg11", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20220307095105-278fg11" - }, - "Children": [ - { - "ID": "20220307095105-yq7mdka", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220307095105-yq7mdka" - }, - "Children": [ - { - "ID": "20220307095105-6dgsvev", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307095105-6dgsvev" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Device B data skip synchronization because the version and cloud are the same" - } - ] - } - ] - }, - { - "ID": "20220307095105-spgvmup", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220307095105-spgvmup" - }, - "Children": [ - { - "ID": "20220307095105-4etoiq4", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307095105-4etoiq4" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Device B data covers the cloud" - } - ] - } - ] - }, - { - "ID": "20220307095105-w45og3n", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220307095105-w45og3n" - }, - "Children": [ - { - "ID": "20220307095105-9cvcbpq", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307095105-9cvcbpq" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Device B data is overwritten by the cloud" - } - ] - } - ] - } - ] - } - ] - } - ] - }, - { - "ID": "20220307095105-gl7j2q4", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307095105-gl7j2q4", - "updated": "20220307095105" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "In this scenario, the process of using synchronization is to edit offline on both devices, and then perform synchronization, so that the expected results of normal synchronization cannot be obtained. Even so, the data will not be lost, and the overwritten data can be retrieved through history." } ] }, @@ -1293,34 +1072,6 @@ } ] }, - { - "ID": "20210721195846-if71i5z", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210721195846-if71i5z", - "updated": "20210721195846" - }, - "Children": [ - { - "ID": "20210721195846-wcikaav", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721195846-wcikaav", - "updated": "20210721195846" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Before renaming or deleting the cloud directory, please turn off synchronization on all devices before editing or deleting" - } - ] - } - ] - }, { "ID": "20210721160159-gc5tin2", "Type": "NodeListItem", diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy index aa22454e6..209019e43 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20210721103420-vn6g2yy.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20210721103420-vn6g2yy", "title": "数据同步", - "updated": "20220703222554" + "updated": "20220703232528" }, "Children": [ { @@ -212,16 +212,59 @@ ] }, { - "ID": "20210721103955-bqzteuz", + "ID": "20211027205711-07u1glm", "Type": "NodeParagraph", "Properties": { - "id": "20210721103955-bqzteuz", - "updated": "20211106114053" + "id": "20211027205711-07u1glm", + "updated": "20220703225408" + }, + "Children": [ + { + "Type": "NodeBlockRef", + "Data": "span", + "Children": [ + { + "Type": "NodeOpenParen" + }, + { + "Type": "NodeOpenParen" + }, + { + "Type": "NodeBlockRefID", + "Data": "20220615113758-i2279ot" + }, + { + "Type": "NodeBlockRefSpace" + }, + { + "Type": "NodeBlockRefText", + "Data": "初始化数据仓库密钥" + }, + { + "Type": "NodeCloseParen" + }, + { + "Type": "NodeCloseParen" + } + ] + }, + { + "Type": "NodeText", + "Data": "后如果一切正常就已经配置好同步了。" + } + ] + }, + { + "ID": "20220703225413-0ir4w8k", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703225413-0ir4w8k", + "updated": "20220703225453" }, "Children": [ { "Type": "NodeText", - "Data": "打开 " + "Data": "如果需要暂停同步，可关闭选项 " }, { "Type": "NodeKbd", @@ -232,7 +275,7 @@ }, { "Type": "NodeText", - "Data": "设置 - 云端 - 云端同步" + "Data": "设置" }, { "Type": "NodeKbdCloseMarker" @@ -241,154 +284,47 @@ }, { "Type": "NodeText", - "Data": " ，通过同步设置向导进行操作。" - } - ] - }, - { - "ID": "20210721103758-pc3i4x8", - "Type": "NodeList", - "ListData": { - "Typ": 1 - }, - "Properties": { - "id": "20210721103758-pc3i4x8", - "updated": "20211027205734" - }, - "Children": [ - { - "ID": "20211027205711-eup41br", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "MS4=", - "Num": 1 - }, - "Properties": { - "id": "20211027205711-eup41br", - "updated": "20220110113741" - }, - "Children": [ - { - "ID": "20211027205711-07u1glm", - "Type": "NodeParagraph", - "Properties": { - "id": "20211027205711-07u1glm", - "updated": "20220110113741" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "设置" - }, - { - "Type": "NodeText", - "Data": "端到端加密" - }, - { - "Type": "NodeText", - "Data": "密码" - } - ] - } - ] + "Data": " - " }, { - "ID": "20210721104534-zgn4ihf", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "Mi4=", - "Num": 2 - }, - "Properties": { - "id": "20210721104534-zgn4ihf", - "updated": "20211027205734" - }, + "Type": "NodeKbd", + "Data": "kbd", "Children": [ { - "ID": "20210721104534-2yhd04d", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721104534-2yhd04d", - "updated": "20211027205734" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "创建或选择一个云端同步目录，选择以后该云端同步目录将用于当前工作空间数据同步" - } - ] - } - ] - }, - { - "ID": "20210721103957-niox81t", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "My4=", - "Num": 3 - }, - "Properties": { - "id": "20210721103957-niox81t", - "updated": "20210901163120" - }, - "Children": [ - { - "ID": "20210721103957-6v20946", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721103957-6v20946", - "updated": "20211027205115" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "启用同步开关" - } - ] - } - ] - } - ] - }, - { - "ID": "20210727102835-sm3eyau", - "Type": "NodeParagraph", - "Properties": { - "id": "20210727102835-sm3eyau", - "updated": "20210727103336" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "以上操作请先在" - }, - { - "Type": "NodeEmphasis", - "Data": "em", - "Children": [ - { - "Type": "NodeEmA6kOpenMarker", - "Data": "*" + "Type": "NodeKbdOpenMarker" }, { "Type": "NodeText", - "Data": "主力" + "Data": "云端" }, { - "Type": "NodeEmA6kCloseMarker", - "Data": "*" + "Type": "NodeKbdCloseMarker" } ] }, { "Type": "NodeText", - "Data": "设备上进行，然后在其他设备上选择相同的云端同步目录，并打开同步开关即可。如果要切换、重命名或者删除云端同步目录，请先在所有设备上关闭同步开关后再操作。" + "Data": " - " + }, + { + "Type": "NodeKbd", + "Data": "kbd", + "Children": [ + { + "Type": "NodeKbdOpenMarker" + }, + { + "Type": "NodeText", + "Data": "启用云端同步" + }, + { + "Type": "NodeKbdCloseMarker" + } + ] + }, + { + "Type": "NodeText", + "Data": "。" } ] }, @@ -560,12 +496,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20210721103726-sbnev8w", - "updated": "20220510104539" + "updated": "20220703225614" }, "Children": [ { "Type": "NodeText", - "Data": "思源通过对比云端数据版本和本地数据版本进行相应操作：" + "Data": "思源通过对比云端数据快照和本地数据快照进行相应操作：" } ] }, @@ -575,7 +511,7 @@ "ListData": {}, "Properties": { "id": "20210721105306-biv12a6", - "updated": "20220510104208" + "updated": "20220703230810" }, "Children": [ { @@ -595,12 +531,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20210721105353-aseijn5", - "updated": "20210901163356" + "updated": "20220703230507" }, "Children": [ { "Type": "NodeText", - "Data": "如果版本相等则略过" + "Data": "如果快照相同则忽略本次同步" } ] } @@ -615,7 +551,7 @@ }, "Properties": { "id": "20210721105305-dt1ritx", - "updated": "20220510104208" + "updated": "20220703230810" }, "Children": [ { @@ -623,136 +559,78 @@ "Type": "NodeParagraph", "Properties": { "id": "20210721105305-kx4c8fj", - "updated": "20220510104208" + "updated": "20220703230630" }, "Children": [ { "Type": "NodeText", - "Data": "如果云端版本大于本地版本，则将云端数据下载到本地并解密到 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空间/data/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 文件夹下，本地被覆盖或者删除的文件会移动到 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空间/history/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 文件夹下" + "Data": "如果快照不同，则将本地距离上次同步的变更上传到云端，将云端最新的变更合并到本地" } ] - } - ] - }, - { - "ID": "20210721105329-52g70vv", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210721105329-52g70vv", - "updated": "20210901163421" - }, - "Children": [ + }, { - "ID": "20210721105329-ypobf4a", - "Type": "NodeParagraph", + "ID": "20220703230633-13vbbzy", + "Type": "NodeList", + "ListData": {}, "Properties": { - "id": "20210721105329-ypobf4a", - "updated": "20210901163421" + "id": "20220703230633-13vbbzy", + "updated": "20220703230810" }, "Children": [ { - "Type": "NodeText", - "Data": "如果" - }, - { - "Type": "NodeText", - "Data": "云端" - }, - { - "Type": "NodeText", - "Data": "版本小于本地，则扫描 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", + "ID": "20220703230631-lbfy9lc", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703230631-lbfy9lc" + }, "Children": [ { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "/工作空间/data/" - }, - { - "Type": "NodeCodeSpanCloseMarker" + "ID": "20220703230631-0tywed7", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703230631-0tywed7", + "updated": "20220703230650" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "如果两端的变更没有冲突则直接合并" + } + ] } ] }, { - "Type": "NodeText", - "Data": " 变更，然后将变更加密复制到 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", + "ID": "20220703230651-ofu1uh9", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703230651-ofu1uh9", + "updated": "20220703230810" + }, "Children": [ { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空间/sync/" - }, - { - "Type": "NodeCodeSpanCloseMarker" + "ID": "20220703230651-vzbvnjf", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703230651-vzbvnjf", + "updated": "20220703230810" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "如果存在文件冲突，则以本地为准覆盖云端，同时拉取到的云端冲突文件会归入到数据历史中" + } + ] } ] - }, - { - "Type": "NodeText", - "Data": " 文件夹下，最后进行上传并覆盖" - }, - { - "Type": "NodeText", - "Data": "云端" - }, - { - "Type": "NodeText", - "Data": "数据" } ] } @@ -765,12 +643,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220510104118-7cotqs7", - "updated": "20220510104547" + "updated": "20220703230821" }, "Children": [ { "Type": "NodeText", - "Data": "版本对比每隔一段时间自动进行，时间间隔算法描述如下：" + "Data": "同步每隔一段时间自动进行，时间间隔算法描述如下：" } ] }, @@ -1035,12 +913,12 @@ "HeadingLevel": 3, "Properties": { "id": "20220307093107-2e2r5ps", - "updated": "20220307093112" + "updated": "20220703231010" }, "Children": [ { "Type": "NodeText", - "Data": "覆盖场景" + "Data": "冲突场景" } ] }, @@ -1052,7 +930,7 @@ }, "Properties": { "id": "20220307093112-lz7p32d", - "updated": "20220307093113" + "updated": "20220703232528" }, "Children": [ { @@ -1073,12 +951,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220307093113-bxpwcpj", - "updated": "20220307093144" + "updated": "20220703231043" }, "Children": [ { "Type": "NodeText", - "Data": "在设备 A 上编辑后不同步（比如没有网络处于离线状态时）" + "Data": "在设备 A 上编辑 a 文件后同步" } ] } @@ -1094,7 +972,8 @@ "Num": 2 }, "Properties": { - "id": "20220307093124-wkxgisu" + "id": "20220307093124-wkxgisu", + "updated": "20220703231050" }, "Children": [ { @@ -1102,41 +981,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220307093124-0pb8mwl", - "updated": "20220307093152" + "updated": "20220703231050" }, "Children": [ { "Type": "NodeText", - "Data": "在设备 B 上编辑后不同步" - } - ] - } - ] - }, - { - "ID": "20220307093153-alpffju", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "My4=", - "Num": 3 - }, - "Properties": { - "id": "20220307093153-alpffju" - }, - "Children": [ - { - "ID": "20220307093153-znl772s", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307093153-znl772s", - "updated": "20220307094020" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "设备 A 上执行同步，此时云端数据会被设备 A 数据覆盖，既云端和设备 A 保持数据一致" + "Data": "在设备 B 上编辑 a 文件后同步" } ] } @@ -1148,11 +998,12 @@ "ListData": { "Typ": 1, "Delimiter": 46, - "Marker": "NC4=", - "Num": 4 + "Marker": "My4=", + "Num": 3 }, "Properties": { - "id": "20220307094021-74y5lau" + "id": "20220307094021-74y5lau", + "updated": "20220703232528" }, "Children": [ { @@ -1160,104 +1011,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220307094021-jtlbgw4", - "updated": "20220307094152" + "updated": "20220703232528" }, "Children": [ { "Type": "NodeText", - "Data": "在设备 B 上执行同步，此时会出现三种可能的情况" - } - ] - }, - { - "ID": "20220307094056-jmfulxx", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20220307094056-jmfulxx", - "updated": "20220307094059" - }, - "Children": [ - { - "ID": "20220307094201-bbiy343", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220307094201-bbiy343" - }, - "Children": [ - { - "ID": "20220307094201-d28icvq", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307094201-d28icvq", - "updated": "20220307094237" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "设备 B 数据因为版本和云端相同进而略过同步" - } - ] - } - ] - }, - { - "ID": "20220307094059-pxgspk6", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220307094059-pxgspk6" - }, - "Children": [ - { - "ID": "20220307094059-11ww58o", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307094059-11ww58o", - "updated": "20220307094116" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "设备 B 数据覆盖云端" - } - ] - } - ] - }, - { - "ID": "20220307094116-s90arq8", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220307094116-s90arq8" - }, - "Children": [ - { - "ID": "20220307094116-q6j55pf", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307094116-q6j55pf", - "updated": "20220307094210" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "设备 B 数据被云端覆盖" - } - ] - } - ] + "Data": "此时云端 a 文件会被 B 设备上的 a 覆盖，同时在 B 设备上生成之前 A 设备 a 的历史" } ] } @@ -1265,20 +1024,6 @@ } ] }, - { - "ID": "20220307094246-38jrwfr", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307094246-38jrwfr", - "updated": "20220307094825" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "该场景下，使用同步的过程是在两个设备上都离线编辑，然后再执行同步，这样无法得到正常的同步预期结果。尽管如此，数据也不会发生丢失，可通过历史找回被覆盖的数据。" - } - ] - }, { "ID": "20210721105949-0diekoc", "Type": "NodeHeading", @@ -1343,42 +1088,6 @@ } ] }, - { - "ID": "20210721195711-c0ljv7q", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20210721195711-c0ljv7q", - "updated": "20210721195828" - }, - "Children": [ - { - "ID": "20210721195711-gvej1i2", - "Type": "NodeParagraph", - "Properties": { - "id": "20210721195711-gvej1i2", - "updated": "20210721195828" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "重命名或删除" - }, - { - "Type": "NodeText", - "Data": "云端" - }, - { - "Type": "NodeText", - "Data": "目录前，请在所有设备上关闭同步后再修改或删除" - } - ] - } - ] - }, { "ID": "20210721155947-tnbqkki", "Type": "NodeListItem", diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy index 948be3834..bf06c5bdf 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20211226121438-xaafdo8.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20211226121438-xaafdo8", "title": "資料同步", - "updated": "20220703223113" + "updated": "20220703232524" }, "Children": [ { @@ -196,16 +196,59 @@ ] }, { - "ID": "20211226121454-eo49ng8", + "ID": "20220703231425-knmdjxb", "Type": "NodeParagraph", "Properties": { - "id": "20211226121454-eo49ng8", - "updated": "20211228130421" + "id": "20220703231425-knmdjxb", + "updated": "20220703231555" + }, + "Children": [ + { + "Type": "NodeBlockRef", + "Data": "span", + "Children": [ + { + "Type": "NodeOpenParen" + }, + { + "Type": "NodeOpenParen" + }, + { + "Type": "NodeBlockRefID", + "Data": "20220615120134-y8wnvbq" + }, + { + "Type": "NodeBlockRefSpace" + }, + { + "Type": "NodeBlockRefText", + "Data": "初始化數據倉庫密鑰" + }, + { + "Type": "NodeCloseParen" + }, + { + "Type": "NodeCloseParen" + } + ] + }, + { + "Type": "NodeText", + "Data": "后如果一切正常就已经配置好同步了。" + } + ] + }, + { + "ID": "20220703231555-yc4t5qa", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703231555-yc4t5qa", + "updated": "20220703231604" }, "Children": [ { "Type": "NodeText", - "Data": "打開 " + "Data": "如果需要暫停同步，可關閉選項 " }, { "Type": "NodeKbd", @@ -216,7 +259,7 @@ }, { "Type": "NodeText", - "Data": "設置 - 雲端 - 雲端同步" + "Data": "設置" }, { "Type": "NodeKbdCloseMarker" @@ -225,152 +268,47 @@ }, { "Type": "NodeText", - "Data": " ，通過同步設置向導進行作業。" - } - ] - }, - { - "ID": "20211226121454-jhgfygm", - "Type": "NodeList", - "ListData": { - "Typ": 1 - }, - "Properties": { - "id": "20211226121454-jhgfygm", - "updated": "20220110114127" - }, - "Children": [ - { - "ID": "20211226121454-uv2o9ya", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "MS4=", - "Num": 1 - }, - "Properties": { - "id": "20211226121454-uv2o9ya", - "updated": "20220110114127" - }, - "Children": [ - { - "ID": "20211226121454-jht5wtu", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121454-jht5wtu", - "updated": "20220110114127" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "設置" - }, - { - "Type": "NodeText", - "Data": "端到端加密" - }, - { - "Type": "NodeText", - "Data": "密碼" - } - ] - } - ] + "Data": " - " }, { - "ID": "20211226121454-q2nwzs4", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "Mi4=", - "Num": 2 - }, - "Properties": { - "id": "20211226121454-q2nwzs4", - "updated": "20211228141154" - }, + "Type": "NodeKbd", + "Data": "kbd", "Children": [ { - "ID": "20211226121454-7ui6tey", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121454-7ui6tey", - "updated": "20211228141154" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "創建或選擇一個雲端同步目錄，選擇以後該雲端同步目錄將用於當前工作空間資料同步" - } - ] - } - ] - }, - { - "ID": "20211226121454-ggm3tr1", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "My4=", - "Num": 3 - }, - "Properties": { - "id": "20211226121454-ggm3tr1" - }, - "Children": [ - { - "ID": "20211226121454-upj6vzq", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121454-upj6vzq" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "啟用同步開關" - } - ] - } - ] - } - ] - }, - { - "ID": "20211226121454-z4qs6jx", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121454-z4qs6jx", - "updated": "20211228130502" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "以上作業請先在" - }, - { - "Type": "NodeEmphasis", - "Data": "em", - "Children": [ - { - "Type": "NodeEmA6kOpenMarker", - "Data": "*" + "Type": "NodeKbdOpenMarker" }, { "Type": "NodeText", - "Data": "主力" + "Data": "雲端" }, { - "Type": "NodeEmA6kCloseMarker", - "Data": "*" + "Type": "NodeKbdCloseMarker" } ] }, { "Type": "NodeText", - "Data": "設備上進行，然後在其他設備上選擇相同的雲端同步目錄，並打開同步開關即可。如果要切換、重命名或者刪除雲端同步目錄，請先在所有設備上關閉同步開關後再作業。" + "Data": " - " + }, + { + "Type": "NodeKbd", + "Data": "kbd", + "Children": [ + { + "Type": "NodeKbdOpenMarker" + }, + { + "Type": "NodeText", + "Data": "啟用雲端同步" + }, + { + "Type": "NodeKbdCloseMarker" + } + ] + }, + { + "Type": "NodeText", + "Data": "。" } ] }, @@ -534,203 +472,146 @@ ] }, { - "ID": "20211226121454-qo8jhii", + "ID": "20220703231942-d4h4gcm", "Type": "NodeParagraph", "Properties": { - "id": "20211226121454-qo8jhii", - "updated": "20220510104916" + "id": "20220703231942-d4h4gcm", + "updated": "20220703231942" }, "Children": [ { "Type": "NodeText", - "Data": "思源通過對比雲端數據版本和本地數據版本進行相應作業：" + "Data": "思源通過對比雲端數據快照和本地數據快照進行相應操作：" } ] }, { - "ID": "20211226121454-v4rgxob", + "ID": "20220703231942-e565c49", "Type": "NodeList", "ListData": {}, "Properties": { - "id": "20211226121454-v4rgxob", - "updated": "20211228141209" + "id": "20220703231942-e565c49", + "updated": "20220703231942" }, "Children": [ { - "ID": "20211226121454-t7668m6", + "ID": "20220703231942-78uj9i1", "Type": "NodeListItem", "ListData": { "BulletChar": 42, "Marker": "Kg==" }, "Properties": { - "id": "20211226121454-t7668m6", - "updated": "20211226121454" + "id": "20220703231942-78uj9i1", + "updated": "20220703231942" }, "Children": [ { - "ID": "20211226121454-lci1ctl", + "ID": "20220703231942-04tl6at", "Type": "NodeParagraph", "Properties": { - "id": "20211226121454-lci1ctl", - "updated": "20211226121454" + "id": "20220703231942-04tl6at", + "updated": "20220703231942" }, "Children": [ { "Type": "NodeText", - "Data": "如果版本相等則略過" + "Data": "如果快照相同則忽略本次同步" } ] } ] }, { - "ID": "20211226121454-mk5pevf", + "ID": "20220703231942-xzs4i10", "Type": "NodeListItem", "ListData": { "BulletChar": 42, "Marker": "Kg==" }, "Properties": { - "id": "20211226121454-mk5pevf", - "updated": "20220510104240" + "id": "20220703231942-xzs4i10", + "updated": "20220703231942" }, "Children": [ { - "ID": "20211226121454-s9uvmqy", + "ID": "20220703231942-314drnc", "Type": "NodeParagraph", "Properties": { - "id": "20211226121454-s9uvmqy", - "updated": "20220510104240" + "id": "20220703231942-314drnc", + "updated": "20220703231942" }, "Children": [ { "Type": "NodeText", - "Data": "如果雲端版本大於本地版本，則將雲端資料下載到本地並解密到 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空間/data/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 文件夾下，本地被覆蓋或者刪除的文件會移動到 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空間/history/" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 文件夾下" + "Data": "如果快照不同，則將本地距離上次同步的變更上傳到雲端，將雲端最新的變更合併到本地" } ] - } - ] - }, - { - "ID": "20211226121454-rmdap08", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20211226121454-rmdap08", - "updated": "20211228141209" - }, - "Children": [ + }, { - "ID": "20211226121454-o5x53rx", - "Type": "NodeParagraph", + "ID": "20220703231942-kniy7e9", + "Type": "NodeList", + "ListData": {}, "Properties": { - "id": "20211226121454-o5x53rx", - "updated": "20211228141209" + "id": "20220703231942-kniy7e9", + "updated": "20220703231942" }, "Children": [ { - "Type": "NodeText", - "Data": "如果" - }, - { - "Type": "NodeText", - "Data": "雲端" - }, - { - "Type": "NodeText", - "Data": "版本小於本地，則掃描 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", + "ID": "20220703231942-70w9qsj", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703231942-70w9qsj", + "updated": "20220703231942" + }, "Children": [ { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "/工作空間/data/" - }, - { - "Type": "NodeCodeSpanCloseMarker" + "ID": "20220703231942-uq6hcsx", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703231942-uq6hcsx", + "updated": "20220703231942" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "如果兩端的變更沒有衝突則直接合併" + } + ] } ] }, { - "Type": "NodeText", - "Data": " 變更，然後將變更加密複製到 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", + "ID": "20220703231942-skyyrpj", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20220703231942-skyyrpj", + "updated": "20220703231942" + }, "Children": [ { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "工作空間/sync/" - }, - { - "Type": "NodeCodeSpanCloseMarker" + "ID": "20220703231942-24cgfdl", + "Type": "NodeParagraph", + "Properties": { + "id": "20220703231942-24cgfdl", + "updated": "20220703231942" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "如果存在文件衝突，則以本地為準覆蓋雲端，同時拉取到的雲端衝突文件會歸入到數據歷史中" + } + ] } ] - }, - { - "Type": "NodeText", - "Data": " 文件夾下，最後進行上傳並覆蓋" - }, - { - "Type": "NodeText", - "Data": "雲端" - }, - { - "Type": "NodeText", - "Data": "資料" } ] } @@ -739,16 +620,16 @@ ] }, { - "ID": "20220510105029-rawx8il", + "ID": "20220703231942-pkvgxz9", "Type": "NodeParagraph", "Properties": { - "id": "20220510105029-rawx8il", - "updated": "20220510105029" + "id": "20220703231942-pkvgxz9", + "updated": "20220703231942" }, "Children": [ { "Type": "NodeText", - "Data": "版本對比每隔一段時間自動進行，時間間隔算法描述如下：" + "Data": "同步每隔一段時間自動進行，時間間隔算法描述如下：" } ] }, @@ -1003,33 +884,33 @@ ] }, { - "ID": "20220307095239-tezgp0o", + "ID": "20220703231640-y2kpysi", "Type": "NodeHeading", "HeadingLevel": 3, "Properties": { - "id": "20220307095239-tezgp0o", - "updated": "20220307095239" + "id": "20220703231640-y2kpysi", + "updated": "20220703231640" }, "Children": [ { "Type": "NodeText", - "Data": "覆蓋場景" + "Data": "衝突場景" } ] }, { - "ID": "20220307095239-7565ggv", + "ID": "20220703231640-9pkvgzl", "Type": "NodeList", "ListData": { "Typ": 1 }, "Properties": { - "id": "20220307095239-7565ggv", - "updated": "20220307095239" + "id": "20220703231640-9pkvgzl", + "updated": "20220703232524" }, "Children": [ { - "ID": "20220307095239-7ea0sqd", + "ID": "20220703231640-i8rkg1k", "Type": "NodeListItem", "ListData": { "Typ": 1, @@ -1038,26 +919,28 @@ "Num": 1 }, "Properties": { - "id": "20220307095239-7ea0sqd" + "id": "20220703231640-i8rkg1k", + "updated": "20220703231640" }, "Children": [ { - "ID": "20220307095239-zx0xhv2", + "ID": "20220703231640-jqwuxcf", "Type": "NodeParagraph", "Properties": { - "id": "20220307095239-zx0xhv2" + "id": "20220703231640-jqwuxcf", + "updated": "20220703231640" }, "Children": [ { "Type": "NodeText", - "Data": "在設備 A 上編輯後不同步（比如沒有網絡處於離線狀態時）" + "Data": "在設備 A 上編輯 a 文件後同步" } ] } ] }, { - "ID": "20220307095239-ab37rw8", + "ID": "20220703231640-avwyybn", "Type": "NodeListItem", "ListData": { "Typ": 1, @@ -1066,26 +949,28 @@ "Num": 2 }, "Properties": { - "id": "20220307095239-ab37rw8" + "id": "20220703231640-avwyybn", + "updated": "20220703231640" }, "Children": [ { - "ID": "20220307095239-ejo8dqf", + "ID": "20220703231640-2klknr1", "Type": "NodeParagraph", "Properties": { - "id": "20220307095239-ejo8dqf" + "id": "20220703231640-2klknr1", + "updated": "20220703231640" }, "Children": [ { "Type": "NodeText", - "Data": "在設備 B 上編輯後不同步" + "Data": "在設備 B 上編輯 a 文件後同步" } ] } ] }, { - "ID": "20220307095239-9bq1woa", + "ID": "20220703231640-ytzbgh6", "Type": "NodeListItem", "ListData": { "Typ": 1, @@ -1094,153 +979,25 @@ "Num": 3 }, "Properties": { - "id": "20220307095239-9bq1woa" + "id": "20220703231640-ytzbgh6", + "updated": "20220703232524" }, "Children": [ { - "ID": "20220307095239-2cm8wqx", + "ID": "20220703231640-qqg6ca6", "Type": "NodeParagraph", "Properties": { - "id": "20220307095239-2cm8wqx" + "id": "20220703231640-qqg6ca6", + "updated": "20220703232524" }, "Children": [ { "Type": "NodeText", - "Data": "設備 A 上執行同步，此時雲端數據會被設備 A 數據覆蓋，既云端和設備 A 保持數據一致" + "Data": "此時雲端 a 文件會被 B 設備上的 a 覆蓋，同時在 B 設備上生成之前 A 設備 a 的歷史" } ] } ] - }, - { - "ID": "20220307095239-yt5ulni", - "Type": "NodeListItem", - "ListData": { - "Typ": 1, - "Delimiter": 46, - "Marker": "NC4=", - "Num": 4 - }, - "Properties": { - "id": "20220307095239-yt5ulni" - }, - "Children": [ - { - "ID": "20220307095239-ee4xhp1", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307095239-ee4xhp1" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "在設備 B 上執行同步，此時會出現三種可能的情況" - } - ] - }, - { - "ID": "20220307095239-df4h0fo", - "Type": "NodeList", - "ListData": {}, - "Properties": { - "id": "20220307095239-df4h0fo" - }, - "Children": [ - { - "ID": "20220307095239-2yvb8si", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220307095239-2yvb8si" - }, - "Children": [ - { - "ID": "20220307095239-y7qy3tr", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307095239-y7qy3tr" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "設備 B 數據因為版本和雲端相同進而略過同步" - } - ] - } - ] - }, - { - "ID": "20220307095239-xy53q6n", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220307095239-xy53q6n" - }, - "Children": [ - { - "ID": "20220307095239-nehg0y8", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307095239-nehg0y8" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "設備 B 數據覆蓋雲端" - } - ] - } - ] - }, - { - "ID": "20220307095239-b4a1r7g", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220307095239-b4a1r7g" - }, - "Children": [ - { - "ID": "20220307095239-z38fy9q", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307095239-z38fy9q" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "設備 B 數據被雲端覆蓋" - } - ] - } - ] - } - ] - } - ] - } - ] - }, - { - "ID": "20220307095239-3qnw1k7", - "Type": "NodeParagraph", - "Properties": { - "id": "20220307095239-3qnw1k7", - "updated": "20220307095239" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "該場景下，使用同步的過程是在兩個設備上都離線編輯，然後再執行同步，這樣無法得到正常的同步預期結果。儘管如此，數據也不會發生丟失，可通過歷史找回被覆蓋的數據。" } ] }, @@ -1277,7 +1034,7 @@ "ListData": {}, "Properties": { "id": "20211226121454-kv5itch", - "updated": "20220420100403" + "updated": "20220703231653" }, "Children": [ { @@ -1308,40 +1065,6 @@ } ] }, - { - "ID": "20211226121454-4vhcu0v", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20211226121454-4vhcu0v" - }, - "Children": [ - { - "ID": "20211226121454-f8zn2s6", - "Type": "NodeParagraph", - "Properties": { - "id": "20211226121454-f8zn2s6" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "重命名或刪除" - }, - { - "Type": "NodeText", - "Data": "雲端" - }, - { - "Type": "NodeText", - "Data": "目錄前，請在所有設備上關閉同步後再修改或刪除" - } - ] - } - ] - }, { "ID": "20211226121454-150ti1m", "Type": "NodeListItem", diff --git a/kernel/conf/sync.go b/kernel/conf/sync.go index e3fcad61d..ede546dc1 100644 --- a/kernel/conf/sync.go +++ b/kernel/conf/sync.go @@ -35,9 +35,10 @@ type Sync struct { func NewSync() *Sync { return &Sync{ - CloudName: "main", - Enabled: true, - Mode: 1, + CloudName: "main", + Enabled: true, + Mode: 1, + UseDataRepo: true, } }