Merge branch 'release-3' into release-3

FISCO-BCOS · Oct 9, 2024 · 08aa925 · 08aa925
2 parents 14a16c1 + 11caa78
commit 08aa925
Show file tree

Hide file tree

Showing 35 changed files with 377 additions and 119 deletions.
diff --git a/2.x/docs/articles/7_practice/拆解build_chain.sh解读FISCO-BCOS建链过程.md b/2.x/docs/articles/7_practice/拆解build_chain.sh解读FISCO-BCOS建链过程.md
@@ -29,7 +29,7 @@ bash build_chain.sh -l  127.0.0.1 -p 30300,20200,8545
 [INFO] Downloading fisco-bcos binary from https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.0/fisco-bcos.tar.gz ... 
 curl: (7) Failed to connect to github.com port 443: Connection refused ` 
  
-[INFO] Download speed is too low, try https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v2.9.0/fisco-bcos.tar.gz 
+[INFO] Download speed is too low, try https://gitee.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.0/fisco-bcos.tar.gz 
 
 这里讲了我们去访问GitHub中下载FISCO-BCOS的压缩包，结果发现链接失败所以跳转到国内的码云中去下载
 

diff --git a/2.x/docs/browser/deploy.md b/2.x/docs/browser/deploy.md
@@ -87,8 +87,8 @@ Python3.6及以上版本，需安装PyMysql依赖包：
 
 获取部署安装包：
 ```shell
-
 wget https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/fisco-bcos-browser/releases/download/v2.2.5/browser-deploy.zip
+# wget https:///FISCO-BCOS/fisco-bcos-browser/releases/download/v2.2.5/browser-deploy.zip
 
 ```
 解压安装包：

diff --git a/2.x/docs/browser/web.md b/2.x/docs/browser/web.md
@@ -66,6 +66,7 @@ cd fisco-bcos-browser
 `注意：当且仅当get_solc_js.sh脚本执行失败才需要执行下面的命令`
 
 ```shell
+    #TODO: 
     curl -#L https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeBASE/download/solidity/wasm/v0.4.25.js -o ./dist/static/js/v0.4.25.js
     curl -#L https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeBASE/download/solidity/wasm/v0.4.25-gm.js -o ./dist/static/js/v0.4.25-gm.js
     curl -#L https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeBASE/download/solidity/wasm/v0.5.2.js -o ./dist/static/js/v0.5.2.js

diff --git a/2.x/docs/console/console_of_java_sdk.md b/2.x/docs/console/console_of_java_sdk.md
@@ -70,8 +70,8 @@ curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v2.9.2/downloa
 
 ```eval_rst
 .. note::
-    - 如果因为网络问题导致长时间无法下载，0.5版本请尝试命令： `https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/console/releases/v2.9.2/download_console.sh && bash download_console.sh -v 0.5` 
-    0.6版本请尝试命令： `https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/console/releases/v2.9.2/download_console.sh && bash download_console.sh -v 0.6`
+    - 如果因为网络问题导致长时间无法下载，0.5版本请尝试命令： `https://gitee.com/FISCO-BCOS/console/releases/download/v2.9.2/download_console.sh && bash download_console.sh -v 0.5` 
+    0.6版本请尝试命令： `https://gitee.com/FISCO-BCOS/console/releases/download/v2.9.2/download_console.sh && bash download_console.sh -v 0.6`
 
 ```
 

diff --git a/2.x/docs/installation.md b/2.x/docs/installation.md
@@ -66,10 +66,10 @@ cd ~ && mkdir -p fisco && cd fisco
 ## 下载脚本
 curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.11.0/build_chain.sh && chmod u+x build_chain.sh
 ```
-
 ```eval_rst
 .. note::
-    - 如果因为网络问题导致长时间无法下载build_chain.sh脚本，请尝试 `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v2.11.0/build_chain.sh && chmod u+x build_chain.sh`
+    - 如果因为网络问题导致长时间无法下载build_chain.sh脚本，请尝试 `curl -#LO https://gitee.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.11.0/build_chain.sh && chmod u+x build_chain.sh`
+    
 ```
 
 ![](./../images/installation/download_build_chain.gif)

diff --git a/2.x/docs/manual/account.md b/2.x/docs/manual/account.md
@@ -30,7 +30,7 @@ curl -#LO https://raw.githubusercontent.com/FISCO-BCOS/console/master-2.0/tools/
 
 ```eval_rst
 .. note::
-    - 如果因为网络问题导致长时间无法下载，请尝试 `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/get_account.sh && chmod u+x get_account.sh && bash get_account.sh -h`
+    - 如果因为网络问题导致长时间无法下载，请尝试 `curl -#LO https://gitee.com/FISCO-BCOS/console/raw/master/tools/get_account.sh && chmod u+x get_account.sh && bash get_account.sh -h`
 ```
 
 国密版本请使用下面的指令获取脚本
@@ -41,8 +41,8 @@ curl -#LO https://raw.githubusercontent.com/FISCO-BCOS/console/master-2.0/tools/
 
 ```eval_rst
 .. note::
-    - 如果因为网络问题导致长时间无法下载，请尝试 `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/get_gm_account.sh && chmod u+x get_gm_account.sh && bash get_gm_account.sh -h`
-    - get_gm_account需要下载tassl，如果无法下载，请尝试 `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/tassl-1.0.2/tassl.tar.gz` ，解压放在~/.fisco/tassl，1.0.9及以下版本放在~/.tassl
+    - 如果因为网络问题导致长时间无法下载，请尝试 `curl -#LO https://gitee.com/FISCO-BCOS/console/raw/master/tools/get_gm_account.sh && chmod u+x get_gm_account.sh && bash get_gm_account.sh -h`
+    - get_gm_account需要下载tassl，如果无法下载，请尝试 `curl -#LO https://gitee.com/FISCO-BCOS/console/releases/download/v2.9.2/tassl.tar.gz` ，解压放在~/.fisco/tassl，1.0.9及以下版本放在~/.tassl
 ```
 
 执行上面的指令，看到如下输出则下载到了正确的脚本，否则请重试。

diff --git a/2.x/docs/manual/distributed_storage.md b/2.x/docs/manual/distributed_storage.md
@@ -253,7 +253,7 @@ cd ~/fisco
 curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v2.9.2/download_console.sh
 
 # 若因为网络问题导致长时间无法执行上面的命令，请尝试下面的命令：
-https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/console/releases/v2.9.2/download_console.sh
+https://gitee.com/FISCO-BCOS/console/releases/download/v2.9.2/download_console.sh
 
 bash download_console.sh
 cp -n console/conf/config-example.toml console/conf/config.toml

diff --git a/2.x/docs/manual/group_use_cases.md b/2.x/docs/manual/group_use_cases.md
@@ -238,7 +238,7 @@ $ cd ~/fisco
 $ curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v2.9.2/download_console.sh && bash download_console.sh
 
 # 若因为网络问题导致长时间无法执行上面的命令，请尝试以下命令：
-$ https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/console/releases/v2.9.2/download_console.sh && bash download_console.sh
+$ https://gitee.com/FISCO-BCOS/console/releases/download/v2.9.2/download_console.sh && bash download_console.sh
 
 # 进入控制台操作目录
 $ cd console
@@ -626,7 +626,7 @@ $ cd ~/fisco
 $ curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v2.9.2/download_console.sh && bash download_console.sh
 
 # 若因为网络问题导致长时间无法执行上面的命令，请尝试以下命令：
-$ https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/console/releases/v2.9.2/download_console.sh && bash download_console.sh
+$ https://gitee.com/FISCO-BCOS/console/releases/download/v2.9.2/download_console.sh && bash download_console.sh
 ```
 
 **配置控制台**

diff --git a/2.x/docs/sdk/java_sdk/make_transaction.md b/2.x/docs/sdk/java_sdk/make_transaction.md
@@ -24,7 +24,7 @@ $ mkdir -p ~/fisco && cd ~/fisco
 $ curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v2.9.2/download_console.sh
 
 # 若因为网络问题导致长时间无法执行以上命令，请尝试以下命令：
-$ https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/console/releases/v2.9.2/download_console.sh
+$ https://gitee.com/FISCO-BCOS/console/releases/download/v2.9.2/download_console.sh
 
 $ bash download_console.sh
 ```

diff --git a/2.x/docs/sdk/java_sdk/quick_start.md b/2.x/docs/sdk/java_sdk/quick_start.md
@@ -111,7 +111,7 @@ $ mkdir -p ~/fisco && cd ~/fisco
 $ curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v2.9.2/download_console.sh
 
 # 若因为网络问题导致长时间无法执行以上命令，请尝试以下命令：
-$ https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/console/releases/v2.9.2/download_console.sh
+$ https://gitee.com/FISCO-BCOS/console/releases/download/v2.9.2/download_console.sh
 
 $ bash download_console.sh
 $ cd ~/fisco/console

diff --git a/2.x/docs/tutorial/cdn.md b/2.x/docs/tutorial/cdn.md
@@ -51,9 +51,9 @@ FISCO BCOS国密版本需要使用TASSL生成国密版本的证书，部署工
 
 FISCO BCOS在国密模式下使用sm2曲线和对应签名算法，在非国密场景使用secp256k1曲线和ecdsa签名算法。为方便用户提供了生成脚本，脚本生成私钥并以账户地址命名，支持PEM和PKCS12两种格式。详情请参考这里[https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/manual/account.html](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/manual/account.html)
 
-get_account.sh脚本依赖于openssl指令，用于生成secp256k1私钥，如果从GitHub下载失败，可以尝试镜像地址[https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/get_account.sh](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/get_account.sh)
+get_account.sh脚本依赖于openssl指令，用于生成secp256k1私钥，如果从GitHub下载失败，可以尝试镜像地址[https://gitee.com/FISCO-BCOS/console/raw/master/tools/get_account.sh](https://gitee.com/FISCO-BCOS/console/raw/master/tools/get_account.sh)
 
-get_gm_account.sh脚本用于生成sm2私钥，依赖于TASSL。如果从GitHub下载失败，可以尝试镜像地址[https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/get_gm_account.sh](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/get_gm_account.sh)
+get_gm_account.sh脚本用于生成sm2私钥，依赖于TASSL。如果从GitHub下载失败，可以尝试镜像地址[https://gitee.com/FISCO-BCOS/console/raw/master/tools/get_gm_account.sh](https://gitee.com/FISCO-BCOS/console/raw/master/tools/get_gm_account.sh)
 
 
 ## 举例：使用国内镜像建链
@@ -66,7 +66,7 @@ get_gm_account.sh脚本用于生成sm2私钥，依赖于TASSL。如果从GitHub
 curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.11.0/build_chain.sh
 ```
 
-如果下载失败请尝试`curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v2.11.0/build_chain.sh`
+如果下载失败请尝试`curl -#LO https://gitee.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.11.0/build_chain.sh`
 
 ### 下载二进制程序
 

diff --git a/2.x/docs/tutorial/sdk_application.md b/2.x/docs/tutorial/sdk_application.md
@@ -387,7 +387,7 @@ $ tar -zxf asset-app.tar.gz
 
 ```eval_rst
 .. note::
-    - 如果因为网络问题导致长时间无法下载，请尝试将`199.232.28.133 raw.githubusercontent.com`追加到`/etc/hosts`中，或者请尝试 `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/asset-app.tar.gz`
+    - 如果因为网络问题导致长时间无法下载，请尝试将`199.232.28.133 raw.githubusercontent.com`追加到`/etc/hosts`中，或者请尝试 `curl -#LO https://gitee.com/FISCO-BCOS/asset-app-demo/releases/download/v0.0.1/asset-app.tar.gz`
 ```
 
 ![](../../images/tutorial/download_asset.png)

diff --git a/2.x/en/docs/manual/account.md b/2.x/en/docs/manual/account.md
@@ -27,7 +27,7 @@ curl -#LO https://raw.githubusercontent.com/FISCO-BCOS/console/master-2.0/tools/
 ```eval_rst
 .. note::
     - If the get_account.sh script cannot be downloaded for a long time due to network problems, try `curl -#LO https://gitee.com/FISCO-BCOS/console/raw/master-2.0/tools/get_account.sh && chmod u+x get_account.sh && bash get_account.sh -h`
-    - Please use `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/tassl-1.0.2/tassl.tar.gz`, and place in `~/.fisco/tassl`
+    - Please use `curl -#LO https://gitee.com/FISCO-BCOS/console/releases/download/v2.9.2/tassl.tar.gz`, and place in `~/.fisco/tassl`
 ```
 
 If you use guomi version fisco, please execute below command to get `get_gm_account.sh`

diff --git a/2.x/en/docs/tutorial/sdk_application.md b/2.x/en/docs/tutorial/sdk_application.md
@@ -324,7 +324,7 @@ $ tar -zxf asset-app.tar.gz
 
 ```eval_rst
 .. note::
-    - If the asset-app.tar.gz cannot be downloaded for a long time due to network problems, try `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/asset-app.tar.gz`
+    - If the asset-app.tar.gz cannot be downloaded for a long time due to network problems, try `curl -#LO https://gitee.com/FISCO-BCOS/asset-app-demo/releases/download/v0.0.1/asset-app.tar.gz`
 ```
 
 The directory structure of the asset-app project is as follows:

diff --git a/3.x/zh_CN/conf.py b/3.x/zh_CN/conf.py
@@ -87,7 +87,7 @@
 # The short X.Y version.
 version = '3.0'
 # The full version, including alpha/beta/rc tags.
-release = 'v3.9.0'
+release = 'v3.11.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -369,12 +369,12 @@ def replace_source(app, exception):
             for file in files:
                 if file.endswith('.html'):
                     html_path = os.path.join(root, file)
-                    
+
                     with open(html_path, 'r') as file:
                         lines = file.readlines()
 
                     new_lines = [line.replace('https://unpkg.com', 'https://npm.onmicrosoft.cn') for line in lines]
-                    new_lines = [line.replace('https://cdnjs.cloudflare.com', 'https://cdn.bootcdn.net') for line in new_lines] 
+                    new_lines = [line.replace('https://cdnjs.cloudflare.com', 'https://cdn.bootcdn.net') for line in new_lines]
 
                     with open(html_path, 'w') as file:
                         file.writelines(new_lines)
diff --git a/3.x/zh_CN/docs/articles/7_practice/拆解build_chain.sh解读FISCO-BCOS建链过程.md b/3.x/zh_CN/docs/articles/7_practice/拆解build_chain.sh解读FISCO-BCOS建链过程.md
@@ -29,7 +29,7 @@ bash build_chain.sh -l  127.0.0.1 -p 30300,20200,8545
 [INFO] Downloading fisco-bcos binary from https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.0/fisco-bcos.tar.gz ... 
 curl: (7) Failed to connect to github.com port 443: Connection refused ` 
  
-[INFO] Download speed is too low, try https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v2.9.0/fisco-bcos.tar.gz 
+[INFO] Download speed is too low, try https://gitee.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.0/fisco-bcos.tar.gz 
 
 这里讲了我们去访问GitHub中下载FISCO-BCOS的压缩包，结果发现链接失败所以跳转到国内的码云中去下载
 

diff --git a/3.x/zh_CN/docs/develop/account.md b/3.x/zh_CN/docs/develop/account.md
@@ -30,7 +30,7 @@ curl -#LO https://raw.githubusercontent.com/FISCO-BCOS/console/master/tools/get_
 
 ```eval_rst
 .. note::
-    - 如果因为网络问题导致长时间无法下载，请尝试 `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/get_account.sh && chmod u+x get_account.sh && bash get_account.sh -h`
+    - 如果因为网络问题导致长时间无法下载，请尝试 `curl -#LO https://gitee.com/FISCO-BCOS/console/raw/master/tools/get_account.sh && chmod u+x get_account.sh && bash get_account.sh -h`
 ```
 
 国密版本请使用下面的指令获取脚本
@@ -41,7 +41,7 @@ curl -#LO https://raw.githubusercontent.com/FISCO-BCOS/console/master/tools/get_
 
 ```eval_rst
 .. note::
-    - 如果因为网络问题导致长时间无法下载，请尝试 `curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/get_gm_account.sh && chmod u+x get_gm_account.sh && bash get_gm_account.sh -h`
+    - 如果因为网络问题导致长时间无法下载，请尝试 `curl -#LO https://gitee.com/FISCO-BCOS/console/raw/master/tools/get_gm_account.sh && chmod u+x get_gm_account.sh && bash get_gm_account.sh -h`
 ```
 
 执行上面的指令，看到如下输出则下载到了正确的脚本，否则请重试。

diff --git a/3.x/zh_CN/docs/develop/committee_usage.md b/3.x/zh_CN/docs/develop/committee_usage.md
@@ -33,7 +33,7 @@ FISCO BCOS Air版的建链部署工具详情请参考：[Air版部署工具](../
 ## 如果使用-A选项，则开启权限设置，并且随机生成一个账户地址，作为初始化治理委员的唯一admin账户
 bash build_chain.sh -l 127.0.0.1:4 -o nodes -A
 
-[INFO] Downloading fisco-bcos binary from https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v3.0.0/fisco-bcos-linux-x86_64.tar.gz ...
+[INFO] Downloading fisco-bcos binary from https://github.com/FISCO-BCOS/FISCO-BCOS/releases/v3.0.0/fisco-bcos-linux-x86_64.tar.gz ...
 ######################################################################## 100.0%
 [INFO] Generate ca cert successfully!
 Processing IP:127.0.0.1 Total:4
@@ -42,7 +42,7 @@ Processing IP:127.0.0.1 Total:4
 [INFO] Generate nodes/127.0.0.1/node1/conf cert successful!
 [INFO] Generate nodes/127.0.0.1/node2/conf cert successful!
 [INFO] Generate nodes/127.0.0.1/node3/conf cert successful!
-[INFO] Downloading get_account.sh from https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/tools/get_account.sh...
+[INFO] Downloading get_account.sh from https://gitee.com/FISCO-BCOS/console/raw/master/tools/get_account.sh...
 ######################################################################## 100.0%
 [INFO] Generate uuid success: 4cf39d8a-9f9f-43d0-baa4-3b89d6c9e013
 [INFO] Generate uuid success: 16d14ff1-b3f0-4104-8b3e-1bb5faf0ee12