Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:memo: Clarify README and user guide recovery instructions

Daniel430cbcc578ec
diff --git a/README.ja.md b/README.ja.md
index 56280bae2a..5157e7b665 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -11,7 +11,7 @@
<a title="Docker Image Size" target="_blank" href="https://hub.docker.com/r/b3log/siyuan"><img src="https://img.shields.io/docker/image-size/b3log/siyuan.svg?style=flat-square&color=ff96b4"></a>
<a title="Hits" target="_blank" href="https://github.com/siyuan-note/siyuan"><img src="https://hits.b3log.org/siyuan-note/siyuan.svg"></a>
<br>
-<a title="AGPLv3" target="_blank" href="https://www.gnu.org/licenses/agpl-3.0.txt"><img src="http://img.shields.io/badge/license-AGPLv3-orange.svg?style=flat-square"></a>
+<a title="AGPLv3" target="_blank" href="https://www.gnu.org/licenses/agpl-3.0.txt"><img src="https://img.shields.io/badge/license-AGPLv3-orange.svg?style=flat-square"></a>
<a title="Code Size" target="_blank" href="https://github.com/siyuan-note/siyuan"><img src="https://img.shields.io/github/languages/code-size/siyuan-note/siyuan.svg?style=flat-square&color=yellow"></a>
<a title="GitHub Pull Requests" target="_blank" href="https://github.com/siyuan-note/siyuan/pulls"><img src="https://img.shields.io/github/issues-pr-closed/siyuan-note/siyuan.svg?style=flat-square&color=FF9966"></a>
<br>
@@ -197,6 +197,8 @@ SiYuanは、プライバシーを最優先とする個人の知識管理シス
詳細なパラメータは `--help` を参照してください。以下は新しい環境変数を使用した起動コマンドの例です:
+先に `AuthCode` に自分の強力なパスワードを設定してください(Bash では `export AuthCode='自分の強力なパスワード'` を使用し、Compose では同じディレクトリの `.env` ファイルからも読み込めます)。未設定または空の場合、例はエラーで停止します。
+
```bash
docker run -d \
-v workspace_dir_host:workspace_dir_container \
@@ -206,7 +208,7 @@ docker run -d \
b3log/siyuan \
serve \
--workspace=workspace_dir_container \
- --accessAuthCode=xxx
+ --accessAuthCode="${AuthCode:?Set AuthCode}"
```
- `PUID`: カスタムユーザーID(オプション、指定しない場合はデフォルトで `1000`)
@@ -230,6 +232,8 @@ docker run -d \
簡略化するために、ホストとコンテナでワークスペースフォルダーのパスを一致させることをお勧めします。たとえば、`workspace_dir_host` と `workspace_dir_container` の両方を `/siyuan/workspace` に設定します。対応する起動コマンドは次のようになります:
+先に `AuthCode` に自分の強力なパスワードを設定してください(Bash では `export AuthCode='自分の強力なパスワード'` を使用し、Compose では同じディレクトリの `.env` ファイルからも読み込めます)。未設定または空の場合、例はエラーで停止します。
+
```bash
docker run -d \
-v /siyuan/workspace:/siyuan/workspace \
@@ -239,19 +243,21 @@ docker run -d \
b3log/siyuan \
serve \
--workspace=/siyuan/workspace/ \
- --accessAuthCode=xxx
+ --accessAuthCode="${AuthCode:?Set AuthCode}"
```
#### Docker Compose
Docker Composeを使用してSiYuanを実行するユーザー向けに、環境変数 `PUID` と `PGID` を使用してユーザーとグループのIDをカスタマイズできます。以下はDocker Composeの設定例です:
+先に `AuthCode` に自分の強力なパスワードを設定してください(Bash では `export AuthCode='自分の強力なパスワード'` を使用し、Compose では同じディレクトリの `.env` ファイルからも読み込めます)。未設定または空の場合、例はエラーで停止します。
+
```yaml
version: "3.9"
services:
main:
image: b3log/siyuan
- command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=${AuthCode}']
+ command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=${AuthCode:?Set AuthCode}']
ports:
- 6806:6806
volumes:
@@ -370,18 +376,21 @@ Apps - DiscoverApps - More Options(右上、Custom App を除く)- YAML で
テンプレート例:
+デプロイ前に、以下の `SIYUAN_ACCESS_AUTH_CODE=` の後に自分の強力なパスワードを入力してください。空のままにしないでください。
+
```yaml
services:
siyuan:
image: b3log/siyuan
container_name: siyuan
- command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=2222']
+ command: ['serve', '--workspace=/siyuan/workspace/']
ports:
- 6806:6806
volumes:
- /mnt/Pool_1/Apps_Data/siyuan:/siyuan/workspace # Adjust to your dataset path
restart: unless-stopped
environment:
+ - SIYUAN_ACCESS_AUTH_CODE=
- TZ=Asia/Tokyo # 必要に応じてタイムゾーンに置き換えてください
- PUID=1001
- PGID=1002
@@ -398,6 +407,8 @@ services:
組み込み CLI で、サーバー起動なしにワークスペースデータへ直接アクセスできます。
+CLI は暗号化ノートブックの操作をサポートしていません。アプリ内の専用手順でロックを解除して操作してください。
+
### クイックスタート
```bash
@@ -465,7 +476,7 @@ ln -s /インストール先/SiYuan/resources/kernel/SiYuan-Kernel /usr/local/bi
- `widgets` はウィジェットを保存するために使用されます
- `plugins` はプラグインを保存するために使用されます
- `public` は公開データを保存するために使用されます
-- 残りのフォルダーはユーザーが作成したノートブックフォルダーであり、ノートブックフォルダー内の `.sy` サフィックスのファイルはドキュメントデータを保存するために使用され、データ形式はJSONです
+- ノートブックフォルダーには文書データが保存されます。通常のノートブックの `.sy` 文書は JSON で保存され、暗号化ノートブックの `.sy` 文書は暗号文で保存されます。
### サードパーティの同期ディスクを介したデータ同期をサポートしていますか?
@@ -493,20 +504,26 @@ SiYuanは完全にオープンソースであり、貢献を歓迎します:
<kbd>設定</kbd> - <kbd>情報</kbd> - <kbd>現在のバージョン</kbd> で <kbd>更新を確認</kbd> できます。また、[公式ダウンロード](https://b3log.org/siyuan/en/download.html) または [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) をフォローして新しいバージョンを入手することもできます。
+**注意:** ワークスペースをインストール先に置かないでください。更新時にインストール先のファイルが削除されます。
+
### 一部のブロック(リスト項目内の段落ブロックなど)がブロックアイコンを見つけられない場合はどうすればよいですか?
リスト項目の最初のサブブロックはブロックアイコンが省略されています。このブロックにカーソルを移動し、<kbd>Ctrl+/</kbd> を使用してそのブロックメニューをトリガーできます。
### データリポジトリキーを紛失した場合はどうすればよいですか?
-- データリポジトリキーが以前に複数のデバイスで正しく初期化されている場合、キーはすべてのデバイスで同じであり、<kbd>設定</kbd> - <kbd>アカウントと同期</kbd> - <kbd>ローカルデータリポジトリ</kbd> - <kbd>データリポジトリキー</kbd> - <kbd>キー文字列をコピー</kbd> で見つけることができます
+データリポジトリキーはスナップショットと同期データを保護するもので、暗号化ノートブックのマスターパスワードやキーバックアップとは別のものです。データリポジトリをリセットしても、紛失したマスターパスワードを復元したり、対応する暗号化キーのバックアップを代替したりすることはできません。
+
+リセット前に思源を正常に終了し、ワークスペース全体をバックアップしてください。暗号化ノートブックがある場合は、対応する暗号化キーのバックアップを別途保存し、マスターパスワードが使えることを確認してください。古い同期ディレクトリとクラウドスナップショットは、新しい同期の完了、データの完全性、復元に必要な情報の保管を確認してから、必要に応じて削除してください。
+
+- データリポジトリキーが以前に複数のデバイスで正しく初期化されている場合、キーはすべてのデバイスで同じであり、<kbd>設定</kbd> - <kbd>アカウントと同期</kbd> - <kbd>データリポジトリ</kbd> - <kbd>データリポジトリキー</kbd> - <kbd>キー文字列をコピー</kbd> で見つけることができます
- 以前に正しく構成されていない場合(たとえば、複数のデバイスでキーが一致しない場合)またはすべてのデバイスが使用できず、キー文字列を取得できない場合は、以下の手順でキーをリセットできます:
- 1. データを手動でバックアップします。<kbd>データのエクスポート</kbd> を使用するか、ファイルシステム上で <kbd>ワークスペース/data/</kbd> フォルダーをコピーします
- 2. <kbd>設定</kbd> - <kbd>アカウントと同期</kbd> - <kbd>ローカルデータリポジトリ</kbd> - <kbd>データリポジトリキー</kbd> - <kbd>データリポジトリをリセット</kbd>
+ 1. 思源を正常に終了してワークスペース全体をバックアップし、暗号化ノートブックがある場合は対応する暗号化キーのバックアップとマスターパスワードも保管する
+ 2. <kbd>設定</kbd> - <kbd>アカウントと同期</kbd> - <kbd>データリポジトリ</kbd> - <kbd>データリポジトリキー</kbd> - <kbd>データリポジトリのリセット</kbd>
3. データリポジトリキーを再初期化します。1台のデバイスでキーを初期化した後、他のデバイスでキーをインポートします
- 4. クラウドは新しい同期ディレクトリを使用します。古い同期ディレクトリは使用できなくなり、削除できます
- 5. 既存のクラウドスナップショットは使用できなくなり、削除できます
+ 4. クラウドで新しい同期ディレクトリを使用し、新しい同期の完了、データの完全性、復元に必要な情報の保管を確認してから、必要に応じて古いディレクトリを削除する
+ 5. 新しい同期の完了、データの完全性、復元に必要な情報の保管を確認してから、必要に応じて古いクラウドスナップショットを削除する
### 支払いが必要ですか?
diff --git a/README.md b/README.md
index 755d207f0d..a0b559add6 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
<a title="Docker Image Size" target="_blank" href="https://hub.docker.com/r/b3log/siyuan"><img src="https://img.shields.io/docker/image-size/b3log/siyuan.svg?style=flat-square&color=ff96b4"></a>
<a title="Hits" target="_blank" href="https://github.com/siyuan-note/siyuan"><img src="https://hits.b3log.org/siyuan-note/siyuan.svg"></a>
<br>
-<a title="AGPLv3" target="_blank" href="https://www.gnu.org/licenses/agpl-3.0.txt"><img src="http://img.shields.io/badge/license-AGPLv3-orange.svg?style=flat-square"></a>
+<a title="AGPLv3" target="_blank" href="https://www.gnu.org/licenses/agpl-3.0.txt"><img src="https://img.shields.io/badge/license-AGPLv3-orange.svg?style=flat-square"></a>
<a title="Code Size" target="_blank" href="https://github.com/siyuan-note/siyuan"><img src="https://img.shields.io/github/languages/code-size/siyuan-note/siyuan.svg?style=flat-square&color=yellow"></a>
<a title="GitHub Pull Requests" target="_blank" href="https://github.com/siyuan-note/siyuan/pulls"><img src="https://img.shields.io/github/issues-pr-closed/siyuan-note/siyuan.svg?style=flat-square&color=FF9966"></a>
<br>
@@ -198,6 +198,8 @@ Use the following parameters when running the container with `docker run b3log/s
More parameters can be found using `--help`. Here’s an example of a startup command with the new environment variables:
+First set `AuthCode` to your own strong password (use `export AuthCode='your-strong-password'` in Bash; Compose can also read a `.env` file in the same directory). The example stops with an error if the value is unset or empty.
+
```bash
docker run -d \
-v workspace_dir_host:workspace_dir_container \
@@ -206,7 +208,7 @@ docker run -d \
b3log/siyuan \
serve \
--workspace=workspace_dir_container \
- --accessAuthCode=xxx
+ --accessAuthCode="${AuthCode:?Set AuthCode}"
```
- `PUID`: Custom user ID (optional, defaults to `1000` if not provided)
@@ -230,6 +232,8 @@ docker run -d \
To simplify things, it is recommended to configure the workspace folder path to be consistent on the host and container, such as having both `workspace_dir_host` and `workspace_dir_container` configured as `/siyuan/workspace`. The corresponding startup command would be:
+First set `AuthCode` to your own strong password (use `export AuthCode='your-strong-password'` in Bash; Compose can also read a `.env` file in the same directory). The example stops with an error if the value is unset or empty.
+
```bash
docker run -d \
-v /siyuan/workspace:/siyuan/workspace \
@@ -238,19 +242,21 @@ docker run -d \
b3log/siyuan \
serve \
--workspace=/siyuan/workspace/ \
- --accessAuthCode=xxx
+ --accessAuthCode="${AuthCode:?Set AuthCode}"
```
#### Docker Compose
For users running SiYuan with Docker Compose, the environment variables `PUID` and `PGID` can be passed to customize the user and group IDs. Here's an example of a Docker Compose configuration:
+First set `AuthCode` to your own strong password (use `export AuthCode='your-strong-password'` in Bash; Compose can also read a `.env` file in the same directory). The example stops with an error if the value is unset or empty.
+
```yaml
version: "3.9"
services:
main:
image: b3log/siyuan
- command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=${AuthCode}']
+ command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=${AuthCode:?Set AuthCode}']
ports:
- 6806:6806
volumes:
@@ -367,18 +373,21 @@ Navigate to Apps - DiscoverApps - More Options (on top right, besides Custom App
Template reference:
+Before deploying, fill in your own strong password after `SIYUAN_ACCESS_AUTH_CODE=` below; do not leave it empty.
+
```yaml
services:
siyuan:
image: b3log/siyuan
container_name: siyuan
- command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=2222']
+ command: ['serve', '--workspace=/siyuan/workspace/']
ports:
- 6806:6806
volumes:
- /mnt/Pool_1/Apps_Data/siyuan:/siyuan/workspace # Adjust to your dataset path
restart: unless-stopped
environment:
+ - SIYUAN_ACCESS_AUTH_CODE=
- TZ=America/New_York # Replace with your timezone if needed
- PUID=1001
- PGID=1002
@@ -394,6 +403,8 @@ Select Beta or Alpha in `Settings - About - Update channel` to receive prereleas
The built-in CLI provides direct access to workspace data — no running server required.
+The CLI does not support operations on encrypted notebooks. Unlock and access them through the dedicated in-app workflow.
+
### Quick Start
```bash
@@ -477,7 +488,7 @@ The data is saved in the workspace data folder:
- `widgets` is used to save widgets
- `plugins` is used to save plugins
- `public` is used to save public data
-- The rest of the folders are the notebook folders created by the user, files with the suffix of `.sy` in the notebook folder are used to save the document data, and the data format is JSON
+- Notebook folders contain the document data. Ordinary notebooks store `.sy` documents as JSON; encrypted notebooks store them as ciphertext.
### Does it support data synchronization through a third-party sync disk?
@@ -505,20 +516,26 @@ For more details, please refer to [Development Guide](https://github.com/siyuan-
You can <kbd>Check update</kbd> in <kbd>Settings</kbd> - <kbd>About</kbd> - <kbd>Current Version</kbd>, or pay attention to [Official Download](https://b3log.org/siyuan/en/download.html) or [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) to get the new version.
+**Note:** Keep your workspace outside the installation directory; updating SiYuan clears files in the installation directory.
+
### What if some blocks (such as paragraph blocks in list items) cannot find the block icon?
The block icon is omitted for the first sub-block under the list item. You can move the cursor into this block and trigger its block menu with <kbd>Ctrl+/</kbd> .
### What should I do if the data repo key is lost?
-- If the data repo key is correctly initialized on multiple devices previously, the key is the same on all devices and can be retrieved in <kbd>Settings</kbd> - <kbd>Account & Sync</kbd> - <kbd>Local Data Repo</kbd> - <kbd>Data repo key</kbd> - <kbd>Copy key string</kbd>
+The data repo key protects snapshots and sync data. It is separate from the encrypted-notebook master password and key backups. Resetting the data repo cannot recover a lost master password or replace matching encryption key backups.
+
+Before resetting, exit SiYuan normally and back up the complete workspace. If you have encrypted notebooks, also keep separate, matching encryption key backups and confirm that the master password works. Delete old cloud sync directories and snapshots only after the new sync completes, data is verified, and recovery materials are safely preserved.
+
+- If the data repo key is correctly initialized on multiple devices previously, the key is the same on all devices and can be retrieved in <kbd>Settings</kbd> - <kbd>Account & Sync</kbd> - <kbd>Data repo</kbd> - <kbd>Data repo key</kbd> - <kbd>Copy key string</kbd>
- If it has not been configured correctly before (for example, the keys on multiple devices are inconsistent) or all devices are unavailable and the key string cannot be obtained, you can reset the key by following the steps below:
- 1. Manually back up the data, you can use <kbd>Export Data</kbd> or directly copy the <kbd>workspace/data/</kbd> folder on the file system
- 2. <kbd>Settings</kbd> - <kbd>Account & Sync</kbd> - <kbd>Local Data Repo</kbd> - <kbd>Data repo key</kbd> - <kbd>Reset data repo</kbd>
+ 1. Exit SiYuan normally and back up the complete workspace; for encrypted notebooks, also preserve matching encryption key backups and the master password
+ 2. <kbd>Settings</kbd> - <kbd>Account & Sync</kbd> - <kbd>Data repo</kbd> - <kbd>Data repo key</kbd> - <kbd>Reset data repo</kbd>
3. Reinitialize the data repo key. After initializing the key on one device, other devices import the key
- 4. The cloud uses the new synchronization directory, the old synchronization directory is no longer available and can be deleted
- 5. The existing cloud snapshots are no longer available and can be deleted
+ 4. Use a new cloud sync directory; delete the old directory only after the new sync completes, data is verified, and recovery materials are safely preserved
+ 5. Delete old cloud snapshots only after the new sync completes, data is verified, and recovery materials are safely preserved
### Do I need to pay for it?
diff --git a/README.tr.md b/README.tr.md
index eac78443cf..168fd0a2ad 100644
--- a/README.tr.md
+++ b/README.tr.md
@@ -11,7 +11,7 @@
<a title="Docker Görüntü Boyutu" target="_blank" href="https://hub.docker.com/r/b3log/siyuan"><img src="https://img.shields.io/docker/image-size/b3log/siyuan.svg?style=flat-square&color=ff96b4"></a>
<a title="Görüntülenme Sayısı" target="_blank" href="https://github.com/siyuan-note/siyuan"><img src="https://hits.b3log.org/siyuan-note/siyuan.svg"></a>
<br>
-<a title="AGPLv3" target="_blank" href="https://www.gnu.org/licenses/agpl-3.0.txt"><img src="http://img.shields.io/badge/license-AGPLv3-orange.svg?style=flat-square"></a>
+<a title="AGPLv3" target="_blank" href="https://www.gnu.org/licenses/agpl-3.0.txt"><img src="https://img.shields.io/badge/license-AGPLv3-orange.svg?style=flat-square"></a>
<a title="Kod Boyutu" target="_blank" href="https://github.com/siyuan-note/siyuan"><img src="https://img.shields.io/github/languages/code-size/siyuan-note/siyuan.svg?style=flat-square&color=yellow"></a>
<a title="GitHub Pull İstekleri" target="_blank" href="https://github.com/siyuan-note/siyuan/pulls"><img src="https://img.shields.io/github/issues-pr-closed/siyuan-note/siyuan.svg?style=flat-square&color=FF9966"></a>
<br>
@@ -198,6 +198,8 @@ Docker görüntüsü oluşturulurken giriş noktası şu şekilde ayarlanır: `E
Tüm parametreleri görmek için `--help` komutunu kullanabilirsin. Yeni ortam değişkenleriyle bir örnek başlatma komutu aşağıdadır:
+Önce `AuthCode` değişkenini kendi güçlü parolanla ayarla (Bash için `export AuthCode='kendi-güçlü-parolan'` kullan; Compose aynı dizindeki `.env` dosyasını da okuyabilir). Değer ayarlanmamışsa veya boşsa örnek hata vererek durur.
+
```bash
docker run -d \
-v workspace_dir_host:workspace_dir_container \
@@ -207,7 +209,7 @@ docker run -d \
b3log/siyuan \
serve \
--workspace=workspace_dir_container \
- --accessAuthCode=xxx
+ --accessAuthCode="${AuthCode:?Set AuthCode}"
```
- `PUID`: Özel kullanıcı kimliği (isteğe bağlı, belirtilmezse varsayılan değer `1000` olarak kullanılır)
@@ -231,6 +233,8 @@ docker run -d \
Kurulumu basitleştirmek için, host ve konteyner üzerindeki çalışma alanı yollarını aynı şekilde ayarlaman önerilir. Örneğin her ikisini de `/siyuan/workspace` olarak tanımlayabilirsin. Buna karşılık gelen başlatma komutu şu şekildedir:
+Önce `AuthCode` değişkenini kendi güçlü parolanla ayarla (Bash için `export AuthCode='kendi-güçlü-parolan'` kullan; Compose aynı dizindeki `.env` dosyasını da okuyabilir). Değer ayarlanmamışsa veya boşsa örnek hata vererek durur.
+
```bash
docker run -d \
-v /siyuan/workspace:/siyuan/workspace \
@@ -240,19 +244,21 @@ docker run -d \
b3log/siyuan \
serve \
--workspace=/siyuan/workspace/ \
- --accessAuthCode=xxx
+ --accessAuthCode="${AuthCode:?Set AuthCode}"
```
#### Docker Compose
SiYuan’ı Docker Compose ile çalıştıran kullanıcılar için, `PUID` ve `PGID` ortam değişkenleri kullanılarak kullanıcı ve grup kimlikleri özelleştirilebilir. Aşağıda örnek bir Docker Compose yapılandırması bulunmaktadır:
+Önce `AuthCode` değişkenini kendi güçlü parolanla ayarla (Bash için `export AuthCode='kendi-güçlü-parolan'` kullan; Compose aynı dizindeki `.env` dosyasını da okuyabilir). Değer ayarlanmamışsa veya boşsa örnek hata vererek durur.
+
```yaml
version: "3.9"
services:
main:
image: b3log/siyuan
- command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=${AuthCode}']
+ command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=${AuthCode:?Set AuthCode}']
ports:
- 6806:6806
volumes:
@@ -371,18 +377,21 @@ Apps --> DiscoverApps --> More Options (sağ üst, Custom App hariç) --> YAML i
Şablon örneği:
+Dağıtımdan önce aşağıdaki `SIYUAN_ACCESS_AUTH_CODE=` ifadesinden sonra kendi güçlü parolanı gir; boş bırakma.
+
```yaml
services:
siyuan:
image: b3log/siyuan
container_name: siyuan
- command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=2222']
+ command: ['serve', '--workspace=/siyuan/workspace/']
ports:
- 6806:6806
volumes:
- /mnt/Pool_1/Apps_Data/siyuan:/siyuan/workspace # Veri kümesi yolunuza göre ayarlayın
restart: unless-stopped
environment:
+ - SIYUAN_ACCESS_AUTH_CODE=
- TZ=Europe/Istanbul # Gerekirse kendi saat diliminizle değiştirin
- PUID=1001
- PGID=1002
@@ -399,6 +408,8 @@ services:
Yerleşik CLI ile sunucu başlatmadan çalışma alanı verilerine doğrudan erişin.
+CLI, şifreli not defterleri üzerinde işlem yapmayı desteklemez. Kilitlerini açmak ve içeriklerine erişmek için uygulama içindeki özel işlemleri kullan.
+
### Hızlı Başlangıç
```bash
@@ -471,7 +482,7 @@ Veriler, çalışma alanı klasöründeki `data` klasöründe saklanır:
- `widgets`: bileşenlerin kaydedildiği klasör
- `plugins`: eklentilerin kaydedildiği klasör
- `public`: genel verilerin saklandığı klasör
-- Diğer klasörler, kullanıcının oluşturduğu not defteri (notebook) klasörleridir. `.sy` uzantılı dosyalar belge verilerini saklar ve JSON formatındadır.
+- Not defteri klasörleri belge verilerini saklar. Normal not defterlerinde `.sy` belgeleri JSON olarak, şifreli not defterlerinde ise şifreli veri olarak saklanır.
### Üçüncü taraf senkronizasyon diskiyle veri senkronizasyonu destekleniyor mu?
@@ -499,22 +510,28 @@ Daha fazla bilgi için [Geliştirme Rehberi](https://github.com/siyuan-note/siyu
Ayrıca, <kbd>Ayarlar</kbd> → <kbd>Hakkında</kbd> → <kbd>Geçerli Sürüm</kbd> sekmesinden <kbd>Güncellemeyi kontrol et</kbd> seçeneğini kullanabilir veya [Resmî İndirme Sayfası](https://b3log.org/siyuan/en/download.html) ya da [GitHub Sürümleri](https://github.com/siyuan-note/siyuan/releases) sayfalarını takip edebilirsiniz.
+**Not:** Çalışma alanını kurulum dizininin dışında tut; SiYuan güncellenirken kurulum dizinindeki dosyalar silinir.
+
### Bazı bloklar (örneğin liste öğelerindeki paragraflar) blok simgesini bulamıyorsa ne yapmalıyım?
Liste öğesinin altındaki ilk alt blok, blok simgesi görünmeyen bloktur. İmleci bu bloğa getirip <kbd>Ctrl+/</kbd> tuş kombinasyonuyla blok menüsünü açabilirsin.
### Veri deposu anahtarı (data repo key) kaybolursa ne yapmalıyım?
+Veri deposu anahtarı, anlık görüntüleri ve senkronizasyon verilerini korur; şifreli not defterlerinin ana parolasından ve anahtar yedeklerinden ayrıdır. Veri deposunu sıfırlamak, kayıp ana parolayı kurtarmaz ve eşleşen şifreleme anahtarı yedeklerinin yerini tutmaz.
+
+Sıfırlamadan önce SiYuan’ı normal şekilde kapat ve çalışma alanının tamamını yedekle. Şifreli not defterlerin varsa eşleşen şifreleme anahtarı yedeklerini ayrıca sakla ve ana parolanın çalıştığını doğrula. Eski bulut senkronizasyon dizinlerini ve anlık görüntüleri ancak yeni senkronizasyon tamamlandıktan, verilerin eksiksiz olduğu doğrulandıktan ve kurtarma bilgileri güvenle saklandıktan sonra gerektiğinde sil.
+
- Eğer daha önce birden fazla cihazda doğru şekilde başlatıldıysa, tüm cihazlarda aynı anahtar kullanılır. Bu durumda anahtarı şu adımlarla kopyalayabilirsin:
- <kbd>Ayarlar</kbd> → <kbd>Hesap ve Senkronizasyon</kbd> → <kbd>Yerel Veri Deposu</kbd> → <kbd>Veri deposu anahtarı</kbd> → <kbd>Anahtar dizgesini kopyala</kbd>
+ <kbd>Ayarlar</kbd> → <kbd>Hesap ve Senkronizasyon</kbd> → <kbd>Veri deposu</kbd> → <kbd>Veri deposu anahtarı</kbd> → <kbd>Anahtar dizgesini kopyala</kbd>
- Eğer cihazlar arasında farklı anahtarlar kullanılmışsa veya hiçbiri erişilebilir değilse, aşağıdaki adımlarla yeni bir anahtar oluşturabilirsin:
- 1. Verilerini manuel olarak yedekle (<kbd>Verileri Dışa Aktar</kbd> seçeneğiyle veya dosya sisteminde `workspace/data/` klasörünü kopyalayarak).
- 2. <kbd>Ayarlar</kbd> → <kbd>Hesap ve Senkronizasyon</kbd> → <kbd>Yerel Veri Deposu</kbd> → <kbd>Veri deposu anahtarı</kbd> → <kbd>Veri deposunu sıfırla</kbd>.
+ 1. SiYuan’ı normal şekilde kapat ve çalışma alanının tamamını yedekle; şifreli not defterleri için eşleşen şifreleme anahtarı yedeklerini ve ana parolayı da sakla
+ 2. <kbd>Ayarlar</kbd> → <kbd>Hesap ve Senkronizasyon</kbd> → <kbd>Veri deposu</kbd> → <kbd>Veri deposu anahtarı</kbd> → <kbd>Veri deposunu sıfırla</kbd>.
3. Anahtarı yeniden başlat. Bir cihazda oluşturduktan sonra diğer cihazlara bu anahtarı aktar.
- 4. Bulutta yeni senkronizasyon dizinini kullan; eski dizin artık erişilemez ve silinebilir.
- 5. Mevcut bulut anlık görüntüleri (snapshot) artık geçerli değildir, bunlar da silinebilir.
+ 4. Bulutta yeni bir senkronizasyon dizini kullan; eski dizini ancak yeni senkronizasyon tamamlanıp veriler doğrulandıktan ve kurtarma bilgileri güvenle saklandıktan sonra gerektiğinde sil
+ 5. Eski bulut anlık görüntülerini ancak yeni senkronizasyon tamamlanıp veriler doğrulandıktan ve kurtarma bilgileri güvenle saklandıktan sonra gerektiğinde sil
### Ücretli mi?
diff --git a/README.zh-CN.md b/README.zh-CN.md
index a94251767f..078639f07b 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -11,7 +11,7 @@
<a title="Docker Image Size" target="_blank" href="https://hub.docker.com/r/b3log/siyuan"><img src="https://img.shields.io/docker/image-size/b3log/siyuan.svg?style=flat-square&color=ff96b4"></a>
<a title="Hits" target="_blank" href="https://github.com/siyuan-note/siyuan"><img src="https://hits.b3log.org/siyuan-note/siyuan.svg"></a>
<br>
-<a title="AGPLv3" target="_blank" href="https://www.gnu.org/licenses/agpl-3.0.txt"><img src="http://img.shields.io/badge/license-AGPLv3-orange.svg?style=flat-square"></a>
+<a title="AGPLv3" target="_blank" href="https://www.gnu.org/licenses/agpl-3.0.txt"><img src="https://img.shields.io/badge/license-AGPLv3-orange.svg?style=flat-square"></a>
<a title="Code Size" target="_blank" href="https://github.com/siyuan-note/siyuan"><img src="https://img.shields.io/github/languages/code-size/siyuan-note/siyuan.svg?style=flat-square&color=yellow"></a>
<a title="GitHub Pull Requests" target="_blank" href="https://github.com/siyuan-note/siyuan/pulls"><img src="https://img.shields.io/github/issues-pr-closed/siyuan-note/siyuan.svg?style=flat-square&color=FF9966"></a>
<br>
@@ -202,6 +202,8 @@
更多的参数可参考 `--help`。下面是一条启动命令示例:
+请先将 `AuthCode` 设置为你自己的强密码(Bash 中使用 `export AuthCode='你的强密码'`,Compose 也可从同目录的 `.env` 文件读取)。未设置或为空时,示例会报错并停止。
+
```bash
docker run -d \
-v workspace_dir_host:workspace_dir_container \
@@ -211,7 +213,7 @@ docker run -d \
b3log/siyuan \
serve \
--workspace=workspace_dir_container \
- --accessAuthCode=xxx
+ --accessAuthCode="${AuthCode:?Set AuthCode}"
```
- `PUID`: 自定义用户 ID(可选,如果未提供,默认为 `1000`)
@@ -235,6 +237,8 @@ docker run -d \
为了简化,建议将 workspace 文件夹路径在宿主机和容器上配置为一致的,比如将 `workspace_dir_host` 和 `workspace_dir_container` 都配置为 `/siyuan/workspace`,对应的启动命令示例:
+请先将 `AuthCode` 设置为你自己的强密码(Bash 中使用 `export AuthCode='你的强密码'`,Compose 也可从同目录的 `.env` 文件读取)。未设置或为空时,示例会报错并停止。
+
```bash
docker run -d \
-v /siyuan/workspace:/siyuan/workspace \
@@ -244,19 +248,21 @@ docker run -d \
b3log/siyuan \
serve \
--workspace=/siyuan/workspace/ \
- --accessAuthCode=xxx
+ --accessAuthCode="${AuthCode:?Set AuthCode}"
```
#### Docker Compose
对于使用 Docker Compose 运行思源的用户,可以通过环境变量 `PUID` 和 `PGID` 来自定义用户和组的 ID。下面是一个 Docker Compose 配置示例:
+请先将 `AuthCode` 设置为你自己的强密码(Bash 中使用 `export AuthCode='你的强密码'`,Compose 也可从同目录的 `.env` 文件读取)。未设置或为空时,示例会报错并停止。
+
```yaml
version: "3.9"
services:
main:
image: b3log/siyuan
- command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=${AuthCode}']
+ command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=${AuthCode:?Set AuthCode}']
ports:
- 6806:6806
volumes:
@@ -271,14 +277,14 @@ services:
在此设置中:
-- PUID “和 ”PGID "是动态设置并传递给容器的
+- `PUID` 和 `PGID` 是动态设置并传递给容器的
- 如果没有提供这些变量,则使用默认的 `1000`
在环境中指定 `PUID` 和 `PGID` 后,就无需在 compose 文件中明确设置 `user` 指令(`user: '1000:1000'`)。容器将在启动时根据这些环境变量动态调整用户和组。
#### 用户权限
-在镜像中,“entrypoint.sh ”脚本确保以指定的 “PUID ”和 “PGID ”创建 “siyuan ”用户和组。因此,当主机创建工作区文件夹时,请注意设置文件夹的用户和组所有权,使其与计划使用的 `PUID` 和 `PGID` 匹配。例如
+在镜像中,`entrypoint.sh` 脚本确保以指定的 `PUID` 和 `PGID` 创建 `siyuan` 用户和组。因此,当主机创建工作区文件夹时,请注意设置文件夹的用户和组所有权,使其与计划使用的 `PUID` 和 `PGID` 匹配。例如:
```bash
chown -R 1001:1002 /siyuan/workspace
@@ -374,18 +380,21 @@ chmod 755 /mnt/Pool_1/Apps_Data/siyuan
模板参考:
+部署前,请将下面的 `SIYUAN_ACCESS_AUTH_CODE=` 补全为你自己的强密码;不要留空。
+
```yaml
services:
siyuan:
image: b3log/siyuan
container_name: siyuan
- command: ['serve', '--workspace=/siyuan/workspace/', '--accessAuthCode=2222']
+ command: ['serve', '--workspace=/siyuan/workspace/']
ports:
- 6806:6806
volumes:
- /mnt/Pool_1/Apps_Data/siyuan:/siyuan/workspace # Adjust to your dataset path
restart: unless-stopped
environment:
+ - SIYUAN_ACCESS_AUTH_CODE=
- TZ=Asia/Shanghai # 按需替换为你的时区
- PUID=1001
- PGID=1002
@@ -422,7 +431,7 @@ services:
#### 访问思源笔记
- 如果你填写了域名,请在浏览器输入域名访问
-- 如你选择了 `IP+端口`,请在浏览器地输入 `http://<宝塔面板IP>:6806` 访问
+- 如你选择了 `IP+端口`,请在浏览器中输入 `http://<宝塔面板IP>:6806` 访问
</details>
@@ -481,7 +490,7 @@ services:
#### 访问思源笔记
- 如果你通过`OpenResty`反向代理反代了网站,并且填写了域名,请在浏览器输入`域名`访问
-- 如你选择了 `端口外部访问`,请在浏览器地输入 `http://<1Panel面板IP>:6806` 访问
+- 如你选择了 `端口外部访问`,请在浏览器中输入 `http://<1Panel面板IP>:6806` 访问
</details>
@@ -493,6 +502,8 @@ services:
内置 CLI,直接访问工作空间数据,无需启动内核服务。
+CLI 不支持操作加密笔记本;请通过应用内的专用流程解锁和操作。
+
### 快速开始
```bash
@@ -576,7 +587,7 @@ CLI 可执行文件为 `<安装目录>/resources/kernel/SiYuan-Kernel`,可通
- `widgets` 用于保存挂件
- `plugins` 用于保存插件
- `public` 用于保存公开的数据
-- 其余文件夹就是用户自己创建的笔记本文件夹,笔记本文件夹下 `.sy` 后缀的文件用于保存文档数据,数据格式为 JSON
+- 其余笔记本文件夹用于保存文档数据。普通笔记本的 `.sy` 文档以 JSON 保存,加密笔记本的 `.sy` 文档以密文保存。
### 支持通过第三方同步盘进行数据同步吗?
@@ -612,14 +623,18 @@ CLI 可执行文件为 `<安装目录>/resources/kernel/SiYuan-Kernel`,可通
### 数据仓库密钥遗失怎么办?
-- 如果之前在多个设备上正确初始化过数据仓库密钥的话,那么该密钥在所有设备上都是相同的,可以在 <kbd>设置</kbd> - <kbd>账号与同步</kbd> - <kbd>本地数据仓库</kbd> - <kbd>数据仓库密钥</kbd> - <kbd>复制密钥字符串</kbd> 找回
+数据仓库密钥用于快照和同步,与加密笔记本的主密码及密钥备份不同。重置数据仓库不能恢复遗失的加密笔记本主密码,也不能替代匹配的加密密钥备份。
+
+重置前,请先正常退出思源并备份完整工作空间;如有加密笔记本,还应单独保存匹配的加密密钥备份,并确认主密码可用。完成新同步并确认数据完整、恢复材料已妥善保存后,再按需删除旧同步目录和云端快照。
+
+- 如果之前在多个设备上正确初始化过数据仓库密钥的话,那么该密钥在所有设备上都是相同的,可以在 <kbd>设置</kbd> - <kbd>账号与同步</kbd> - <kbd>数据仓库</kbd> - <kbd>数据仓库密钥</kbd> - <kbd>复制密钥字符串</kbd> 找回
- 如果之前没有正确配置(比如多个设备上密钥不一致)或者所有设备均不可用,已经无法获得密钥字符串,则可通过如下步骤重置密钥:
- 1. 手动备份好数据,可通过 <kbd>导出 Data</kbd> 或者直接在文件系统上复制 <kbd>工作空间/data/</kbd> 文件夹
- 2. <kbd>设置</kbd> - <kbd>账号与同步</kbd> - <kbd>本地数据仓库</kbd> - <kbd>数据仓库密钥</kbd> - <kbd>重置数据仓库</kbd>
+ 1. 正常退出思源后,备份完整工作空间;如有加密笔记本,同时保留匹配的加密密钥备份和主密码
+ 2. <kbd>设置</kbd> - <kbd>账号与同步</kbd> - <kbd>数据仓库</kbd> - <kbd>数据仓库密钥</kbd> - <kbd>重置数据仓库</kbd>
3. 重新初始化数据仓库密钥,在一台设备上初始化密钥以后,其他设备导入密钥
- 4. 云端使用新的同步目录,旧的同步目录已经无法使用,可以删除
- 5. 已有的云端快照已经无法使用,可以删除
+ 4. 云端改用新的同步目录;完成新同步并确认数据完整、恢复材料已妥善保存后,再按需删除旧同步目录
+ 5. 完成新同步并确认数据完整、恢复材料已妥善保存后,再按需删除旧云端快照
### 使用需要付费吗?
diff --git a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy
index fabd6bc0c1..f357cf00c4 100644
--- a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy
+++ b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy
@@ -7,7 +7,7 @@
"id": "20200923234731-h3zkwm2",
"title": "FAQ",
"type": "doc",
- "updated": "20261018005815"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1296,7 +1296,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20220708111435-xmj42q4",
- "updated": "20250115163037"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1305,13 +1305,41 @@
}
]
},
+ {
+ "ID": "20261021111316-pu0s77m",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261021111316-pu0s77m",
+ "updated": "20261021111316"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "The data repo key protects snapshots and sync data. It is separate from the encrypted-notebook master password and key backups. Resetting the data repo cannot recover a lost master password or replace matching encryption key backups."
+ }
+ ]
+ },
+ {
+ "ID": "20261021111316-rfqpx3c",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261021111316-rfqpx3c",
+ "updated": "20261021111316"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "Before resetting, exit SiYuan normally and back up the complete workspace. If you have encrypted notebooks, also keep separate, matching encryption key backups and confirm that the master password works. Delete old cloud sync directories and snapshots only after the new sync completes, data is verified, and recovery materials are safely preserved."
+ }
+ ]
+ },
{
"ID": "20220708111435-a2z4tpd",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20220708111435-a2z4tpd",
- "updated": "20250115163037"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1323,7 +1351,7 @@
},
"Properties": {
"id": "20220708111435-kw4fp2b",
- "updated": "20220708111614"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1331,7 +1359,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111435-2ozs1pt",
- "updated": "20220708111614"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1356,6 +1384,15 @@
"Type": "NodeText",
"Data": " - "
},
+ {
+ "Type": "NodeTextMark",
+ "TextMarkType": "kbd",
+ "TextMarkTextContent": "Data repo"
+ },
+ {
+ "Type": "NodeText",
+ "Data": " - "
+ },
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
@@ -1387,7 +1424,7 @@
},
"Properties": {
"id": "20220708111435-ptoqng0",
- "updated": "20250115163037"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1395,7 +1432,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111435-vqcxyea",
- "updated": "20220708111435"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1412,7 +1449,7 @@
},
"Properties": {
"id": "20220708111435-w2hbl28",
- "updated": "20250115163037"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1426,7 +1463,7 @@
},
"Properties": {
"id": "20220708111435-nev43mp",
- "updated": "20250115163037"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1434,30 +1471,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111435-zrahxh3",
- "updated": "20250115163037"
+ "updated": "20261021111316"
},
"Children": [
{
"Type": "NodeText",
- "Data": "Manually back up the data, you can use "
- },
- {
- "Type": "NodeTextMark",
- "TextMarkType": "kbd",
- "TextMarkTextContent": "Export Data"
- },
- {
- "Type": "NodeText",
- "Data": "​ or directly copy the "
- },
- {
- "Type": "NodeTextMark",
- "TextMarkType": "code",
- "TextMarkTextContent": "workspace/data/"
- },
- {
- "Type": "NodeText",
- "Data": "​ folder on the file system"
+ "Data": "Exit SiYuan normally and back up the complete workspace; for encrypted notebooks, also preserve matching encryption key backups and the master password"
}
]
}
@@ -1474,7 +1493,7 @@
},
"Properties": {
"id": "20220708111435-extloil",
- "updated": "20220708111603"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1482,7 +1501,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111435-cjteir8",
- "updated": "20220708111603"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1506,7 +1525,16 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
- "TextMarkTextContent": "Data rep key"
+ "TextMarkTextContent": "Data repo"
+ },
+ {
+ "Type": "NodeText",
+ "Data": " - "
+ },
+ {
+ "Type": "NodeTextMark",
+ "TextMarkType": "kbd",
+ "TextMarkTextContent": "Data repo key"
},
{
"Type": "NodeText",
@@ -1532,7 +1560,7 @@
},
"Properties": {
"id": "20220708111435-29zhnwl",
- "updated": "20220708111456"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1540,7 +1568,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111435-pfbzbnj",
- "updated": "20220708111456"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1562,7 +1590,7 @@
},
"Properties": {
"id": "20220708111435-rsas3a7",
- "updated": "20220708111435"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1570,12 +1598,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111435-i8ykkah",
- "updated": "20220708111435"
+ "updated": "20261021111316"
},
"Children": [
{
"Type": "NodeText",
- "Data": "The cloud uses the new synchronization directory, the old synchronization directory is no longer available and can be deleted"
+ "Data": "Use a new cloud sync directory; delete the old directory only after the new sync completes, data is verified, and recovery materials are safely preserved"
}
]
}
@@ -1592,7 +1620,7 @@
},
"Properties": {
"id": "20220708111435-jjdh23m",
- "updated": "20220708111435"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1600,12 +1628,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111435-yrc4wlj",
- "updated": "20220708111435"
+ "updated": "20261021111316"
},
"Children": [
{
"Type": "NodeText",
- "Data": "The existing cloud snapshots are no longer available and can be deleted"
+ "Data": "Delete old cloud snapshots only after the new sync completes, data is verified, and recovery materials are safely preserved"
}
]
}
diff --git a/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy b/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy
index c9719262b7..d90776e6f3 100644
--- a/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy
+++ b/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy
@@ -7,7 +7,7 @@
"id": "20200813093015-u6bopdt",
"title": "常见问题",
"type": "doc",
- "updated": "20261018005815"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1288,7 +1288,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20211222010224-qmstv96",
- "updated": "20250115163009"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1297,13 +1297,41 @@
}
]
},
+ {
+ "ID": "20261021111316-1f48qy9",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261021111316-1f48qy9",
+ "updated": "20261021111316"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "数据仓库密钥用于快照和同步,与加密笔记本的主密码及密钥备份不同。重置数据仓库不能恢复遗失的加密笔记本主密码,也不能替代匹配的加密密钥备份。"
+ }
+ ]
+ },
+ {
+ "ID": "20261021111316-2xzo53c",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261021111316-2xzo53c",
+ "updated": "20261021111316"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "重置前,请先正常退出思源并备份完整工作空间;如有加密笔记本,还应单独保存匹配的加密密钥备份,并确认主密码可用。完成新同步并确认数据完整、恢复材料已妥善保存后,再按需删除旧同步目录和云端快照。"
+ }
+ ]
+ },
{
"ID": "20220708110122-ygojquy",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20220708110122-ygojquy",
- "updated": "20250115163009"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1315,7 +1343,7 @@
},
"Properties": {
"id": "20220708110317-qinyreu",
- "updated": "20220708110317"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1323,7 +1351,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708110317-bm72kaa",
- "updated": "20220708110319"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1348,6 +1376,15 @@
"Type": "NodeText",
"Data": " - "
},
+ {
+ "Type": "NodeTextMark",
+ "TextMarkType": "kbd",
+ "TextMarkTextContent": "数据仓库"
+ },
+ {
+ "Type": "NodeText",
+ "Data": " - "
+ },
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
@@ -1379,7 +1416,7 @@
},
"Properties": {
"id": "20220708110319-8i1b89v",
- "updated": "20250115163009"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1387,7 +1424,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708110319-t01rvor",
- "updated": "20220708110411"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1404,7 +1441,7 @@
},
"Properties": {
"id": "20211222010251-cxpfurj",
- "updated": "20250115163009"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1418,7 +1455,7 @@
},
"Properties": {
"id": "20220708105959-z16oh3d",
- "updated": "20250115163009"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1426,30 +1463,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708105959-rehb5y0",
- "updated": "20250115163009"
+ "updated": "20261021111316"
},
"Children": [
{
"Type": "NodeText",
- "Data": "手动备份好数据,可通过 "
- },
- {
- "Type": "NodeTextMark",
- "TextMarkType": "kbd",
- "TextMarkTextContent": "导出 Data"
- },
- {
- "Type": "NodeText",
- "Data": "​ 或者直接在文件系统上复制 "
- },
- {
- "Type": "NodeTextMark",
- "TextMarkType": "code",
- "TextMarkTextContent": "工作空间/data/"
- },
- {
- "Type": "NodeText",
- "Data": "​ 文件夹"
+ "Data": "正常退出思源后,备份完整工作空间;如有加密笔记本,同时保留匹配的加密密钥备份和主密码"
}
]
}
@@ -1465,7 +1484,8 @@
"Num": 2
},
"Properties": {
- "id": "20220708105945-eha9x8j"
+ "id": "20220708105945-eha9x8j",
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1473,7 +1493,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708105945-vphvmxv",
- "updated": "20220708105947"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1494,6 +1514,15 @@
"Type": "NodeText",
"Data": " - "
},
+ {
+ "Type": "NodeTextMark",
+ "TextMarkType": "kbd",
+ "TextMarkTextContent": "数据仓库"
+ },
+ {
+ "Type": "NodeText",
+ "Data": " - "
+ },
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
@@ -1522,7 +1551,8 @@
"Num": 3
},
"Properties": {
- "id": "20211222010407-ze0dmor"
+ "id": "20211222010407-ze0dmor",
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1530,7 +1560,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20211222010407-cc9eipr",
- "updated": "20220708110523"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1552,7 +1582,7 @@
},
"Properties": {
"id": "20211222010438-yululiy",
- "updated": "20220708111112"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1560,12 +1590,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20211222010438-jpbst6x",
- "updated": "20220708111112"
+ "updated": "20261021111316"
},
"Children": [
{
"Type": "NodeText",
- "Data": "云端使用新的同步目录,旧的同步目录已经无法使用,可以删除"
+ "Data": "云端改用新的同步目录;完成新同步并确认数据完整、恢复材料已妥善保存后,再按需删除旧同步目录"
}
]
}
@@ -1582,7 +1612,7 @@
},
"Properties": {
"id": "20220708111036-jlcjqa1",
- "updated": "20220708111119"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1590,12 +1620,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111036-9ly6dz0",
- "updated": "20220708111119"
+ "updated": "20261021111316"
},
"Children": [
{
"Type": "NodeText",
- "Data": "已有的云端快照已经无法使用,可以删除"
+ "Data": "完成新同步并确认数据完整、恢复材料已妥善保存后,再按需删除旧云端快照"
}
]
}
diff --git a/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy b/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy
index 2448773107..74f6986fd0 100644
--- a/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy
+++ b/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy
@@ -7,7 +7,7 @@
"id": "20211226115227-r1rty9v",
"title": "常見問題",
"type": "doc",
- "updated": "20261018005815"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1292,7 +1292,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20220708111330-n2z718x",
- "updated": "20250115163022"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1301,13 +1301,41 @@
}
]
},
+ {
+ "ID": "20261021111316-5ujrvvb",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261021111316-5ujrvvb",
+ "updated": "20261021111316"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "資料倉庫密鑰用於快照和同步,與加密筆記本的主密碼及密鑰備份不同。重設資料倉庫無法復原遺失的加密筆記本主密碼,也不能取代相符的加密密鑰備份。"
+ }
+ ]
+ },
+ {
+ "ID": "20261021111316-1b5why0",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261021111316-1b5why0",
+ "updated": "20261021111316"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "重設前,請先正常結束思源並備份完整工作空間;如有加密筆記本,還應另外保存相符的加密密鑰備份,並確認主密碼可用。完成新同步並確認資料完整、復原所需資料已妥善保存後,再視需要刪除舊同步目錄和雲端快照。"
+ }
+ ]
+ },
{
"ID": "20220708111330-a0zn0bb",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20220708111330-a0zn0bb",
- "updated": "20250115163022"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1319,7 +1347,7 @@
},
"Properties": {
"id": "20220708111330-tpwl6ss",
- "updated": "20220708111330"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1327,7 +1355,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111330-rwngczp",
- "updated": "20220708111330"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1352,6 +1380,15 @@
"Type": "NodeText",
"Data": " - "
},
+ {
+ "Type": "NodeTextMark",
+ "TextMarkType": "kbd",
+ "TextMarkTextContent": "資料倉庫"
+ },
+ {
+ "Type": "NodeText",
+ "Data": " - "
+ },
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
@@ -1364,7 +1401,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
- "TextMarkTextContent": "複製密鑰字符串"
+ "TextMarkTextContent": "複製密鑰字串"
},
{
"Type": "NodeText",
@@ -1383,7 +1420,7 @@
},
"Properties": {
"id": "20220708111330-bslu8jv",
- "updated": "20250115163022"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1391,7 +1428,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111330-f6b9i12",
- "updated": "20220708111330"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1408,7 +1445,7 @@
},
"Properties": {
"id": "20220708111330-pdaci5v",
- "updated": "20250115163022"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1422,7 +1459,7 @@
},
"Properties": {
"id": "20220708111330-iw5l8s4",
- "updated": "20250115163022"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1430,30 +1467,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111330-r231m35",
- "updated": "20250115163022"
+ "updated": "20261021111316"
},
"Children": [
{
"Type": "NodeText",
- "Data": "手動備份好資料,可通過 "
- },
- {
- "Type": "NodeTextMark",
- "TextMarkType": "kbd",
- "TextMarkTextContent": "導出 Data"
- },
- {
- "Type": "NodeText",
- "Data": "​ 或者直接在文件系統上複製 "
- },
- {
- "Type": "NodeTextMark",
- "TextMarkType": "code",
- "TextMarkTextContent": "工作空間/data/"
- },
- {
- "Type": "NodeText",
- "Data": "​ 文件夾"
+ "Data": "正常結束思源後,備份完整工作空間;如有加密筆記本,同時保留相符的加密密鑰備份和主密碼"
}
]
}
@@ -1470,7 +1489,7 @@
},
"Properties": {
"id": "20220708111330-qtzmeir",
- "updated": "20220708111330"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1478,7 +1497,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111330-etvajn2",
- "updated": "20220708111330"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1499,6 +1518,15 @@
"Type": "NodeText",
"Data": " - "
},
+ {
+ "Type": "NodeTextMark",
+ "TextMarkType": "kbd",
+ "TextMarkTextContent": "資料倉庫"
+ },
+ {
+ "Type": "NodeText",
+ "Data": " - "
+ },
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
@@ -1528,7 +1556,7 @@
},
"Properties": {
"id": "20220708111330-5l71k76",
- "updated": "20220708111330"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1536,7 +1564,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111330-9g2ec2m",
- "updated": "20220708111330"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1558,7 +1586,7 @@
},
"Properties": {
"id": "20220708111330-unsbsmn",
- "updated": "20220708111330"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1566,12 +1594,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111330-tzas9ec",
- "updated": "20220708111330"
+ "updated": "20261021111316"
},
"Children": [
{
"Type": "NodeText",
- "Data": "雲端使用新的同步目錄,舊的同步目錄已經無法使用,可以刪除"
+ "Data": "雲端改用新的同步目錄;完成新同步並確認資料完整、復原所需資料已妥善保存後,再視需要刪除舊同步目錄"
}
]
}
@@ -1588,7 +1616,7 @@
},
"Properties": {
"id": "20220708111330-fm3lx39",
- "updated": "20220708111330"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1596,12 +1624,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708111330-w2kzmb0",
- "updated": "20220708111330"
+ "updated": "20261021111316"
},
"Children": [
{
"Type": "NodeText",
- "Data": "已有的雲端快照已經無法使用,可以刪除"
+ "Data": "完成新同步並確認資料完整、復原所需資料已妥善保存後,再視需要刪除舊雲端快照"
}
]
}
diff --git a/app/guide/20240530133126-axarxgx/20240530101000-jp793ic.sy b/app/guide/20240530133126-axarxgx/20240530101000-jp793ic.sy
index 82313c2834..0c52334e11 100644
--- a/app/guide/20240530133126-axarxgx/20240530101000-jp793ic.sy
+++ b/app/guide/20240530133126-axarxgx/20240530101000-jp793ic.sy
@@ -8,7 +8,7 @@
"id": "20240530101000-jp793ic",
"title": "よくある質問",
"type": "doc",
- "updated": "20261018005815"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1350,7 +1350,7 @@
"Properties": {
"ID": "20240530101000-xkwaw8d",
"id": "20240530101000-r8dsete",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1359,6 +1359,34 @@
}
]
},
+ {
+ "ID": "20261021111316-0db9udw",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261021111316-0db9udw",
+ "updated": "20261021111316"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "データリポジトリキーはスナップショットと同期データを保護するもので、暗号化ノートブックのマスターパスワードやキーバックアップとは別のものです。データリポジトリをリセットしても、紛失したマスターパスワードを復元したり、対応する暗号化キーのバックアップを代替したりすることはできません。"
+ }
+ ]
+ },
+ {
+ "ID": "20261021111316-4azknzb",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261021111316-4azknzb",
+ "updated": "20261021111316"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "リセット前に思源を正常に終了し、ワークスペース全体をバックアップしてください。暗号化ノートブックがある場合は、対応する暗号化キーのバックアップを別途保存し、マスターパスワードが使えることを確認してください。古い同期ディレクトリとクラウドスナップショットは、新しい同期の完了、データの完全性、復元に必要な情報の保管を確認してから、必要に応じて削除してください。"
+ }
+ ]
+ },
{
"ID": "20240530101000-uqxlw8g",
"Type": "NodeList",
@@ -1371,7 +1399,7 @@
"Properties": {
"ID": "20240530101000-86x5uzc",
"id": "20240530101000-uqxlw8g",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1387,7 +1415,7 @@
"Properties": {
"ID": "20240530101000-19bohb0",
"id": "20240530101000-qwvljpb",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1396,7 +1424,7 @@
"Properties": {
"ID": "20240530101000-l1h5udu",
"id": "20240530101000-sa4zw1a",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1410,16 +1438,25 @@
},
{
"Type": "NodeText",
- "Data": "​ - "
+ "Data": " - "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
- "TextMarkTextContent": "情報"
+ "TextMarkTextContent": "アカウントと同期"
},
{
"Type": "NodeText",
- "Data": "​ - "
+ "Data": " - "
+ },
+ {
+ "Type": "NodeTextMark",
+ "TextMarkType": "kbd",
+ "TextMarkTextContent": "データリポジトリ"
+ },
+ {
+ "Type": "NodeText",
+ "Data": " - "
},
{
"Type": "NodeTextMark",
@@ -1428,7 +1465,7 @@
},
{
"Type": "NodeText",
- "Data": "​ - "
+ "Data": " - "
},
{
"Type": "NodeTextMark",
@@ -1457,7 +1494,7 @@
"Properties": {
"ID": "20240530101000-508zmqc",
"id": "20240530101000-idjxzo9",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1466,7 +1503,7 @@
"Properties": {
"ID": "20240530101000-tspwa80",
"id": "20240530101000-z69cpib",
- "updated": "20240530101000"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1490,7 +1527,7 @@
"Properties": {
"ID": "20240530101000-kiyyp29",
"id": "20240530101000-bkcq3ah",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1509,7 +1546,7 @@
"Properties": {
"ID": "20240530101000-m67unc5",
"id": "20240530101000-j626kwo",
- "updated": "20261016191102"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1518,53 +1555,12 @@
"Properties": {
"ID": "20240530101000-l0xrhri",
"id": "20240530101000-f7nk7ay",
- "updated": "20261016191102"
+ "updated": "20261021111316"
},
"Children": [
- {
- "Type": "NodeTextMark",
- "TextMarkType": "kbd",
- "TextMarkTextContent": "設定"
- },
{
"Type": "NodeText",
- "Data": " - "
- },
- {
- "Type": "NodeTextMark",
- "TextMarkType": "kbd",
- "TextMarkTextContent": "アプリ"
- },
- {
- "Type": "NodeText",
- "Data": " - "
- },
- {
- "Type": "NodeTextMark",
- "TextMarkType": "kbd",
- "TextMarkTextContent": "データ"
- },
- {
- "Type": "NodeText",
- "Data": " - "
- },
- {
- "Type": "NodeTextMark",
- "TextMarkType": "kbd",
- "TextMarkTextContent": "エクスポート Data"
- },
- {
- "Type": "NodeText",
- "Data": " からデータをバックアップするか、ファイルシステムの "
- },
- {
- "Type": "NodeTextMark",
- "TextMarkType": "code",
- "TextMarkTextContent": "workspace/data/"
- },
- {
- "Type": "NodeText",
- "Data": " フォルダをコピーします"
+ "Data": "思源を正常に終了してワークスペース全体をバックアップし、暗号化ノートブックがある場合は対応する暗号化キーのバックアップとマスターパスワードも保管する"
}
]
}
@@ -1586,7 +1582,7 @@
"Properties": {
"ID": "20240530101000-y8ykhvp",
"id": "20240530101000-nbh4zn7",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1595,7 +1591,7 @@
"Properties": {
"ID": "20240530101000-zl7ne0h",
"id": "20240530101000-2bzatij",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1609,22 +1605,40 @@
},
{
"Type": "NodeText",
- "Data": "​ - "
+ "Data": " - "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
- "TextMarkTextContent": "情報"
+ "TextMarkTextContent": "アカウントと同期"
},
{
"Type": "NodeText",
- "Data": "​ - "
+ "Data": " - "
+ },
+ {
+ "Type": "NodeTextMark",
+ "TextMarkType": "kbd",
+ "TextMarkTextContent": "データリポジトリ"
+ },
+ {
+ "Type": "NodeText",
+ "Data": " - "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "データリポジトリキー"
},
+ {
+ "Type": "NodeText",
+ "Data": " - "
+ },
+ {
+ "Type": "NodeTextMark",
+ "TextMarkType": "kbd",
+ "TextMarkTextContent": "データリポジトリのリセット"
+ },
{
"Type": "NodeText",
"Data": " ​ からデータリポジトリのリセットを実行します"
@@ -1649,7 +1663,7 @@
"Properties": {
"ID": "20240530101000-ziowgm5",
"id": "20240530101000-shu4th0",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1658,7 +1672,7 @@
"Properties": {
"ID": "20240530101000-glsf17c",
"id": "20240530101000-au0mf5v",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1685,7 +1699,7 @@
"Properties": {
"ID": "20240530101000-725q7r8",
"id": "20240530101000-fl0ix0m",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1694,12 +1708,12 @@
"Properties": {
"ID": "20240530101000-cv34uf4",
"id": "20240530101000-91zw5g6",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
"Type": "NodeText",
- "Data": "クラウドでは新しい同期ディレクトリが使用され、古い同期ディレクトリは削除できます"
+ "Data": "クラウドで新しい同期ディレクトリを使用し、新しい同期の完了、データの完全性、復元に必要な情報の保管を確認してから、必要に応じて古いディレクトリを削除する"
}
]
}
@@ -1721,7 +1735,7 @@
"Properties": {
"ID": "20240530101000-42rthkp",
"id": "20240530101000-lcrcoyt",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
@@ -1730,12 +1744,12 @@
"Properties": {
"ID": "20240530101000-qmq7x4y",
"id": "20240530101000-rhl7rel",
- "updated": "20261016202856"
+ "updated": "20261021111316"
},
"Children": [
{
"Type": "NodeText",
- "Data": "クラウドでは新しいクラウドスナップショットが使用され、古いクラウドスナップショットは削除できます"
+ "Data": "新しい同期の完了、データの完全性、復元に必要な情報の保管を確認してから、必要に応じて古いクラウドスナップショットを削除する"
}
]
}