update v2.11.0 doc (#1803)

* update download link (#1802)

* add 2.11.0 changelog (#1800)

* update v2.11.0 doc

Author: bxq2011hust

2.x/conf.py

@@ -76,9 +76,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.9'
+version = '2.11'
 # The full version, including alpha/beta/rc tags.
-release = 'v2.9.0'
+release = 'v2.11.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -354,17 +354,17 @@ def setup(app):
 def replace_source(app, exception):
     if exception is None:
         build_dir = os.environ.get('READTHEDOCS_OUTPUT', '_build')
-        
+
         for root, dirs, files in os.walk(build_dir):
             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)

2.x/docs/articles/3_features/36_cryptographic/national_cryptography_features.md

@@ -74,7 +74,7 @@
 buildchain.sh脚本的-g为国密编译选项，使用成功后会生成国密版的节点。默认从GitHub下载最新稳定版本可执行程序，操作方式：
 
 ```bash
-curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+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

2.x/docs/articles/4_tools/five_step_to_develop_application.md

@@ -14,7 +14,7 @@
 (请先在home目录创建fisco目录，接下来都在这个目录操作）
 
 ```bash
-$ curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+$ 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

2.x/docs/articles/7_community/fisco适配达梦数据库/fisco达梦数据库.md

@@ -190,7 +190,7 @@ make -j4
 
 ```shell
 #需要手动复制rt和oci驱动至deps/libs文件夹中，如下图所示，其余的依赖会在编译中自动放入。这两个依赖，#libdmoci.a在网盘提供的包里有。librt.a请在您的系统目录下寻找。也可以使用命令查找
-whereis librt.a 
+whereis librt.a
 ```
 
 ![image-20231016111815321](fisco达梦数据库.assets/image-20231016111815321.png)
@@ -210,7 +210,7 @@ whereis librt.a
 cd ~ && mkdir -p fisco && cd fisco
 
 ## 下载脚本
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.11.0/build_chain.sh && chmod u+x build_chain.sh
 ## 执行建链脚本
 bash build_chain.sh -l 127.0.0.1:4 -p 30300,20200,8545
 ```

2.x/docs/articles/7_practice/build_chain_with_wsl_on_windows.md

@@ -91,7 +91,7 @@ wsl
 cd ~
 sudo apt install -y openssl curl
 cd ~ && mkdir -p fisco && cd fisco
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.11.0/build_chain.sh && chmod u+x build_chain.sh
 bash build_chain.sh -l 127.0.0.1:4 -p 30300,20200,8545
 ```
 

2.x/docs/articles/7_practice/kunpeng_platform_compiles_and_runs_fisco-bcos-2.6.0.md

@@ -197,7 +197,7 @@ cp ${HOME}/FISCO-BCOS/build/bin/fisco-bcos bin
 ### 3. 下载 build_chain.sh 脚本
 
 ```
-curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/v2.11.0/build_chain.sh && chmod u+x build_chain.sh
 ```
 
 ### 4. 运行一键搭建2群组3机构6节点底层FISCO-BCOS联盟链服务脚本

2.x/docs/change_log/2_11_0.md

@@ -0,0 +1,14 @@
+# [v2.11.0](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.11.0)
+
+标签：``v2.11.0`` ``版本特性``
+
+## 2.11.0
+
+### 新增
+
+- `WITH_TBB`编译选项，可以在编译是关闭对`parallel_for`的使用
+- 日志模块新增部分配置项，支持更灵活的日志格式配置和文件归档配置
+
+### 兼容性
+
+**2.11.0向前兼容**，旧版本可以直接替换程序升级

2.x/docs/installation.md

@@ -64,12 +64,12 @@ sudo yum install -y openssl openssl-devel
 cd ~ && mkdir -p fisco && cd fisco
 
 ## 下载脚本
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+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.9.1/build_chain.sh && chmod u+x build_chain.sh`
+    - 如果因为网络问题导致长时间无法下载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`
 ```
 
 ![](./../images/installation/download_build_chain.gif)

2.x/docs/manual/configuration.md

@@ -179,6 +179,18 @@ boostlog示例配置如下：
     flush=true
 ```
 
+#### v2.11.0新增配置项
+
+- `log.format`：配置每条日志的格式，关键字用%包裹，支持关键字包括`LineID, TimeStamp, ProcessID, ThreadName, ThreadID, Message 和 GroupId`
+- `log.enable_rotate_by_hour`：默认为true，配置为`false`时`log.log_name_pattern,log.rotate_name_pattern,log.archive_path,log.compress_archive_file,log.max_archive_files,log.max_archive_size,log.min_free_space`才生效，否则日志为按小时或文件大小产生新的文件
+- `log.log_name_pattern`： 日志文件的文件名模式，可以配置字符串，也支持格式化字符，%前缀，Y,m,d,H,M,S代表年月日时分秒，N代表单调递增的编号，可以%5N使用定长编号
+- `log.rotate_name_pattern`： 滚动后产生的日志文件的文件名，支持的格式化字符与log.log_name_pattern 相同
+- `log.archive_path`： 历史日志文件的归档文件夹
+- `log.compress_archive_file`： 是否压缩归档的日志文件
+- `log.max_archive_files`： 归档文件夹中最大文件个数，0为不限制
+- `log.max_archive_size`： 归档文件夹最大硬盘空间限制，单位MB，0为不限制
+- `log.min_free_space`： 归档文件夹最小空间，默认为0
+
 #### 统计日志配置
 
 考虑到实时监控系统资源使用情况在实际生产系统中非常重要，FISCO BCOS v2.4.0引入了统计日志，统计日志配置项位于`config.ini`中。

2.x/docs/manual/group_use_cases.md

@@ -79,7 +79,7 @@ mkdir -p ~/fisco && cd ~/fisco
 - 获取build_chain.sh脚本
 
 ```bash
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+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
@@ -499,7 +499,7 @@ $ cd ~/fisco/nodes/127.0.0.1 && bash stop_all.sh
 ```bash
 $ mkdir -p ~/fisco && cd ~/fisco
 # 获取build_chain.sh脚本
-$ curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+$ curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.11.0/build_chain.sh && chmod u+x build_chain.sh
 
 # 若因为网络问题导致长时间无法执行上面的命令，请尝试以下命令：
 $ curl -#LO https://gitee.com/FISCO-BCOS/FISCO-BCOS/raw/master-2.0/tools/build_chain.sh && chmod u+x build_chain.sh
@@ -647,11 +647,11 @@ $ cp ~/fisco/console/conf/config-example.toml ~/fisco/console/conf/config.toml
 # 修改控制台连接节点的端口为20100和20101
 # linux系统使用如下命令:
 $ sed -i 's/127.0.0.1:20200/127.0.0.1:20100/g' ~/fisco/console/conf/config.toml
-$ sed -i 's/127.0.0.1:20201/127.0.0.1:20101/g' ~/fisco/console/conf/config.toml  
+$ sed -i 's/127.0.0.1:20201/127.0.0.1:20101/g' ~/fisco/console/conf/config.toml
 
 # mac系统使用如下命令:
 $ sed -i .bkp 's/127.0.0.1:20200/127.0.0.1:20100/g' ~/fisco/console/conf/config.toml
-$ sed -i .bkp 's/127.0.0.1:20201/127.0.0.1:20101/g' ~/fisco/console/conf/config.toml 
+$ sed -i .bkp 's/127.0.0.1:20201/127.0.0.1:20101/g' ~/fisco/console/conf/config.toml
 ```
 
 **通过控制台向群组发交易**

2.x/docs/manual/guomi_crypto.md

@@ -16,7 +16,7 @@ sudo apt install -y openssl curl
 # 准备环境
 cd ~ && mkdir -p fisco && cd fisco
 # 下载build_chain.sh脚本
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.11.0/build_chain.sh && chmod u+x build_chain.sh
 
 # 若因为网络问题导致长时间无法执行上面的命令，请尝试以下命令：
 curl -#LO https://gitee.com/FISCO-BCOS/FISCO-BCOS/raw/master-2.0/tools/build_chain.sh && chmod u+x build_chain.sh

2.x/docs/manual/storage_security.md

@@ -1,6 +1,6 @@
 # 存储加密
 
-标签：``存储安全`` ``存储加密`` ``落盘加密`` 
+标签：``存储安全`` ``存储加密`` ``落盘加密``
 
 ----
 
@@ -25,7 +25,7 @@
 
 下载`build_chain.sh`脚本
 ``` shell
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+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

2.x/docs/sdk/nodejs_sdk/install.md

@@ -1,6 +1,6 @@
 # 快速安装
 
-标签：``安装Node.js`` ``命令行工具`` 
+标签：``安装Node.js`` ``命令行工具``
 
 ----
 ## 环境要求
@@ -80,7 +80,7 @@ Node.js SDK内嵌CLI工具，供用户在命令行中方便地与区块链进行
 
 ```bash
 # 获取开发部署工具build_chain.sh脚本
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+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

2.x/docs/tutorial/cdn.md

@@ -63,10 +63,10 @@ get_gm_account.sh脚本用于生成sm2私钥，依赖于TASSL。如果从GitHub
 ### 下载开发部署工具
 
 ```bash
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh
+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.9.1/build_chain.sh`
+如果下载失败请尝试`curl -#LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/releases/v2.11.0/build_chain.sh`
 
 ### 下载二进制程序
 
@@ -110,7 +110,7 @@ FISCO BCOS在编译时会自动下载依赖包，每个依赖包有多个源。
 1. 创建编译目录
 
 ```bash
-cd FISCO-BCOS 
+cd FISCO-BCOS
 # 切换到2.0版本
 git checkout master-2.0
 mkdir build && cd build

2.x/docs/tutorial/docker.md

@@ -32,7 +32,7 @@ sudo yum install -y curl openssl openssl-devel
 cd ~ && mkdir -p fisco && cd fisco
 
 ## 下载脚本
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+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
@@ -129,10 +129,10 @@ Status: Image is up to date for fiscoorg/fiscobcos:v2.7.2
 c27dcaa0adfbf45820506f659913e6dacb8a148425801ea80ab078100a8d57b7   # 启动节点的 CONTAINER ID
 e66fe7c68d3a8db5d8c18fe5749eba25fd41350ebbaa7accbc8374e03bfba690   # 启动节点的 CONTAINER ID
 2bb7b89e2a46b9a4f92fbf9b48b39023540fccdae14de52e091fa17ea219905e   # 启动节点的 CONTAINER ID
- node0 start successfully                                           
- node2 start successfully                                           
- node3 start successfully                                           
- node1 start successfully                                           
+ node0 start successfully
+ node2 start successfully
+ node3 start successfully
+ node1 start successfully
 ```
 
 ## 5. 检查容器

2.x/docs/tutorial/enc.md

@@ -24,7 +24,7 @@
 用[```build_chain.sh```](../tutorial/installation.md)脚本，用普通的操作方法，先生成节点。
 
 ``` shell
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+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

2.x/docs/tutorial/multihost.md

@@ -31,7 +31,7 @@
 mkdir -p ~/fisco && cd ~/fisco
 
 # 下载开发部署工具build_chain
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+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
@@ -45,9 +45,9 @@ curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/buil
 # 这里所有区块链节点均属于agencyA，并仅启动了群组1
 # (注: 下面的ip信息需要根据真实的机器IP填写)
 cat >> ipconf << EOF
-196.168.0.1 agencyA 1 
-196.168.0.3 agencyA 1 
-196.168.0.4 agencyA 1 
+196.168.0.1 agencyA 1
+196.168.0.3 agencyA 1
+196.168.0.4 agencyA 1
 196.168.0.2 agencyA 1
 EOF
 ```

2.x/docs/tutorial/mysql_node.md

@@ -137,7 +137,7 @@ sudo yum install -y openssl openssl-devel curl
 mkdir -p ~/fisco && cd ~/fisco
 
 ## 下载脚本
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+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

2.x/en/docs/manual/storage_security.md

@@ -16,7 +16,7 @@ Each agency has a Key Manager. For specific deployment steps, please refer to [K
 Use the script [```build_chain.sh```] (../installation.md) to build a node with normal operations.
 
 ``` shell
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+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

3.x/zh_CN/docs/articles/3_features/36_cryptographic/national_cryptography_features.md

@@ -74,7 +74,7 @@
 buildchain.sh脚本的-g为国密编译选项，使用成功后会生成国密版的节点。默认从GitHub下载最新稳定版本可执行程序，操作方式：
 
 ```bash
-curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+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

3.x/zh_CN/docs/articles/4_tools/five_step_to_develop_application.md

@@ -14,7 +14,7 @@
 (请先在home目录创建fisco目录，接下来都在这个目录操作）
 
 ```bash
-$ curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+$ 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

3.x/zh_CN/docs/articles/7_practice/build_chain_with_wsl_on_windows.md

@@ -91,7 +91,7 @@ wsl
 cd ~
 sudo apt install -y openssl curl
 cd ~ && mkdir -p fisco && cd fisco
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.11.0/build_chain.sh && chmod u+x build_chain.sh
 bash build_chain.sh -l 127.0.0.1:4 -p 30300,20200,8545
 ```
 

3.x/zh_CN/docs/sdk/nodejs_sdk/install.md

@@ -1,6 +1,6 @@
 # 快速安装
 
-标签：``安装Node.js`` ``命令行工具`` 
+标签：``安装Node.js`` ``命令行工具``
 
 ----
 ## 环境要求
@@ -80,7 +80,7 @@ Node.js SDK内嵌CLI工具，供用户在命令行中方便地与区块链进行
 
 ```bash
 # 获取开发部署工具build_chain.sh脚本
-curl -#LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+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