From 8a091aa1d9915053b1863d8947ccffd760ff26cf Mon Sep 17 00:00:00 2001
From: userInner <1239989762@qq.com>
Date: Tue, 18 Jul 2023 10:53:06 +0800
Subject: [PATCH 1/5] Update storage_security.md (#1700)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Update storage_security.md
1.在执行bash gen_data_secure_key.sh 127.0.0.1 8150 123456，输入内容有所改变。 2.查看共识（PBFT），需要启动三个及以上节点，原文档只启动了一个节点，无法产生共识
* Update storage_security.md
key_manager_url 更改为 key_center_url
---
2.x/docs/manual/storage_security.md | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/2.x/docs/manual/storage_security.md b/2.x/docs/manual/storage_security.md
index c884af1b5..126443e20 100644
--- a/2.x/docs/manual/storage_security.md
+++ b/2.x/docs/manual/storage_security.md
@@ -76,8 +76,7 @@ CiherDataKey generated: ed157f4588b86d61a2e1745efe71e6ea
Append these into config.ini to enable disk encryption:
[storage_security]
enable=true
-key_manager_ip=127.0.0.1
-key_manager_port=8150
+key_center_url=127.0.0.1:8150
cipher_data_key=ed157f4588b86d61a2e1745efe71e6ea
```
@@ -134,11 +133,11 @@ bash encrypt_node_key.sh 127.0.0.1 8150 ../../nodes/127.0.0.1/node0/conf/node.ke
## 节点运行
-直接启动节点即可
+启动所有节点。注意：在此之前,请先完成对节点的加密。
```shell
-cd nodes/127.0.0.1/node0/
-./start.sh
+cd nodes
+bash start_all.sh
```
## 正确性判断
From 4907ca924c8a0556a3a180267befa6a7c757da58 Mon Sep 17 00:00:00 2001
From: flowerrun <93572056+flowerrun@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:04:14 +0800
Subject: [PATCH 2/5] Update index.rst (#1788)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
修改区块链网络搭建的超链为：<./docs/installation.html>`_
---
2.x/index.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/2.x/index.rst b/2.x/index.rst
index 64ffd7bac..f73ebbe13 100644
--- a/2.x/index.rst
+++ b/2.x/index.rst
@@ -41,7 +41,7 @@ FISCO BCOS 是一个稳定、高效、安全的区块链底层平台，经过多
- `关键概念 <./docs/tutorial/key_concepts.html>`_
- - `区块链网络搭建 <./docs/blockchain_dev/index.html>`_
+ - `区块链网络搭建 <./docs/installation.html>`_
- `区块链应用开发 <./docs/app_dev/index.html>`_
- `FISCO BCOS Java SDK <./docs/sdk/java_sdk/index.html>`_
- `问题排查 <./docs/faq/index.html>`_
From bf2da50e0567107d1209024fdb0812658a886c29 Mon Sep 17 00:00:00 2001
From: Bach <99306893+Bachamht@users.noreply.github.com>
Date: Thu, 11 Apr 2024 18:00:45 +0800
Subject: [PATCH 3/5] Update node.js_sdk_quick_start.md
---
.../articles/4_tools/44_sdk/node.js_sdk_quick_start.md | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/2.x/docs/articles/4_tools/44_sdk/node.js_sdk_quick_start.md b/2.x/docs/articles/4_tools/44_sdk/node.js_sdk_quick_start.md
index 0d3c0b18d..a3152f3e1 100644
--- a/2.x/docs/articles/4_tools/44_sdk/node.js_sdk_quick_start.md
+++ b/2.x/docs/articles/4_tools/44_sdk/node.js_sdk_quick_start.md
@@ -66,14 +66,15 @@ Node.js SDK依赖下列软件：
```
const Configuration = require('./nodejs-sdk/packages/api/common/configuration').Configuration;
-Configuration.setConfig(path.join(__dirname, args.config));
+const configFilePath = path.join(__dirname, 'Path to config.json');
+const configuration = new Configuration(configFilePath);
```
2、获取当前块高的API位于Web3jService中，构造一个该对象：
```
const Web3jService = require('./nodejs-sdk/packages/api').Web3jService;
-let web3jService = new Web3jService();
+let web3jService = new Web3jService(configuration);
```
3、调用Web3jService的getBlockNumber接口，获取返回值并在控制台中输出：
@@ -110,4 +111,4 @@ Node.js SDK除了提供API外，还提供了一个小巧的CLI工具供用户直
## 五、Node.js SDK的未来需要你
-当前，Node.js SDK还在成长，在某些地方仍然需要进一步打磨，比如需要CLI工具能够解析SQL语句，或者SDK的性能需要优化……秉承开源的精神，我们相信社区的能量能够将Node.js SDK 变得更加方便易用，欢迎广大开发者踊跃在issue或PR中贡献自己的idea和力量！
\ No newline at end of file
+当前，Node.js SDK还在成长，在某些地方仍然需要进一步打磨，比如需要CLI工具能够解析SQL语句，或者SDK的性能需要优化……秉承开源的精神，我们相信社区的能量能够将Node.js SDK 变得更加方便易用，欢迎广大开发者踊跃在issue或PR中贡献自己的idea和力量！
From 33d3530368a3853de3c6e79c6b95e850f5c0c1f0 Mon Sep 17 00:00:00 2001
From: Kyon <32325790+kyonRay@users.noreply.github.com>
Date: Wed, 17 Apr 2024 17:32:45 +0800
Subject: [PATCH 4/5] Update storage_security.md
---
2.x/docs/manual/storage_security.md | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/2.x/docs/manual/storage_security.md b/2.x/docs/manual/storage_security.md
index 126443e20..c884af1b5 100644
--- a/2.x/docs/manual/storage_security.md
+++ b/2.x/docs/manual/storage_security.md
@@ -76,7 +76,8 @@ CiherDataKey generated: ed157f4588b86d61a2e1745efe71e6ea
Append these into config.ini to enable disk encryption:
[storage_security]
enable=true
-key_center_url=127.0.0.1:8150
+key_manager_ip=127.0.0.1
+key_manager_port=8150
cipher_data_key=ed157f4588b86d61a2e1745efe71e6ea
```
@@ -133,11 +134,11 @@ bash encrypt_node_key.sh 127.0.0.1 8150 ../../nodes/127.0.0.1/node0/conf/node.ke
## 节点运行
-启动所有节点。注意：在此之前,请先完成对节点的加密。
+直接启动节点即可
```shell
-cd nodes
-bash start_all.sh
+cd nodes/127.0.0.1/node0/
+./start.sh
```
## 正确性判断
From eb898854bd31e00301d47be2d69c137f4cc32c3c Mon Sep 17 00:00:00 2001
From: Kyon <32325790+kyonRay@users.noreply.github.com>
Date: Wed, 17 Apr 2024 17:33:12 +0800
Subject: [PATCH 5/5] Update index.rst
---
2.x/index.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/2.x/index.rst b/2.x/index.rst
index b77c7d1f4..65f73a029 100644
--- a/2.x/index.rst
+++ b/2.x/index.rst
@@ -77,7 +77,7 @@ FISCO BCOS 是一个稳定、高效、安全的区块链底层平台，经过多
- `关键概念 <./docs/tutorial/key_concepts.html>`_
- - `区块链网络搭建 <./docs/installation.html>`_
+ - `区块链网络搭建 <./docs/blockchain_dev/index.html>`_
- `区块链应用开发 <./docs/app_dev/index.html>`_
- `FISCO BCOS Java SDK <./docs/sdk/java_sdk/index.html>`_
- `问题排查 <./docs/faq/index.html>`_