From b1dd5d5f9e927282f336be9ce343dbefd56c296d Mon Sep 17 00:00:00 2001 From: codingcattwo <847701726@qq.com> Date: Thu, 27 Apr 2023 17:50:49 +0800 Subject: [PATCH 1/3] update version --- conf.py | 2 +- docs/WeBASE-APP-SDK/appintegration.md | 2 +- release_note.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf.py b/conf.py index e30aa3f1..46fe644d 100644 --- a/conf.py +++ b/conf.py @@ -110,7 +110,7 @@ # The short X.Y version. version = '3.0' # The full version, including alpha/beta/rc tags. -release = 'v3.0.1' +release = 'v3.0.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/WeBASE-APP-SDK/appintegration.md b/docs/WeBASE-APP-SDK/appintegration.md index 7a612fe0..920fbc4d 100644 --- a/docs/WeBASE-APP-SDK/appintegration.md +++ b/docs/WeBASE-APP-SDK/appintegration.md @@ -24,7 +24,7 @@ repositories { maven { url "http://maven.aliyun.com/nexus/content/groups/public/" } } dependencies { - implementation 'com.webank:webase-app-sdk:1.5.1' + implementation 'com.webank:webase-app-sdk:1.5.5' implementation 'org.bouncycastle:bcprov-jdk15on:1.67' implementation 'org.apache.commons:commons-lang3:3.8.1' implementation 'com.squareup.okhttp3:okhttp:4.8.1' diff --git a/release_note.txt b/release_note.txt index a93b3efe..59f6f534 100644 --- a/release_note.txt +++ b/release_note.txt @@ -1 +1 @@ -v3.0.1 +v3.0.2 From 87637cd32df2a84a6dd1922f3fa2ba70f51a95de Mon Sep 17 00:00:00 2001 From: codingcattwo <847701726@qq.com> Date: Fri, 21 Jul 2023 15:39:20 +0800 Subject: [PATCH 2/3] update app sdk doc --- docs/WeBASE-APP-SDK/appintegration.md | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/WeBASE-APP-SDK/appintegration.md b/docs/WeBASE-APP-SDK/appintegration.md index 920fbc4d..e859a0a7 100644 --- a/docs/WeBASE-APP-SDK/appintegration.md +++ b/docs/WeBASE-APP-SDK/appintegration.md @@ -14,6 +14,7 @@ WeBASE-APP-SDK是应用集成SDK，提供调用WeBASE-Node-Manager的接口， - `v1.5.1`及其以上版本，应用配置AppConfig的属性`isTransferEncrypt`需和WeBASE-Node-Manager的配置文件`/conf/application.yml`下的配置`constant.isTransferEncrypt`相同，默认为`true`。 - 如果`v1.5.0`需要使用SDK，应用配置AppConfig的属性`isTransferEncrypt`需设置为`false`。`v1.5.1`及其以上版本新增的接口调用不了。 +- `1.5.6`以上版本，既支持WeBASE 1.5.x及以上版本，同时支持WeBASE 3.1.0及以上版本（WeBASE 3.0.2版本暂未支持webase-app-sdk） ### 添加依赖 @@ -24,18 +25,20 @@ repositories { maven { url "http://maven.aliyun.com/nexus/content/groups/public/" } } dependencies { - implementation 'com.webank:webase-app-sdk:1.5.5' + implementation 'com.webank:webase-app-sdk:1.5.6-SNAPSHOT' implementation 'org.bouncycastle:bcprov-jdk15on:1.67' implementation 'org.apache.commons:commons-lang3:3.8.1' implementation 'com.squareup.okhttp3:okhttp:4.8.1' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.0' - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.0' - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0' - implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.0' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.2' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2' + implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.2' implementation 'org.projectlombok:lombok:1.18.12' - implementation 'org.apache.logging.log4j:log4j-api:2.13.3' - implementation 'org.apache.logging.log4j:log4j-core:2.13.3' - implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3' + annotationProcessor 'org.projectlombok:lombok:1.18.12' + implementation 'org.apache.logging.log4j:log4j-api:2.20.0' + implementation 'org.apache.logging.log4j:log4j-core:2.20.0' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.20.0' + implementation 'org.slf4j:slf4j-api:1.7.36' } ``` From 87fefa23b16eaf9bbfdaf8044087f0469c4136fd Mon Sep 17 00:00:00 2001 From: codingcattwo <847701726@qq.com> Date: Fri, 21 Jul 2023 15:44:57 +0800 Subject: [PATCH 3/3] update version 3.1.0 & fisco 3.4.0 --- conf.py | 2 +- docs/WeBASE-Install/developer.md | 2 +- docs/WeBASE/ChangeLOG.md | 12 ++++++++++++ docs/WeBASE/install.md | 10 +++++----- index.rst | 3 ++- release_note.txt | 2 +- 6 files changed, 22 insertions(+), 9 deletions(-) diff --git a/conf.py b/conf.py index 46fe644d..42978bf9 100644 --- a/conf.py +++ b/conf.py @@ -110,7 +110,7 @@ # The short X.Y version. version = '3.0' # The full version, including alpha/beta/rc tags. -release = 'v3.0.2' +release = 'v3.1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/WeBASE-Install/developer.md b/docs/WeBASE-Install/developer.md index 284f6684..41cbd637 100644 --- a/docs/WeBASE-Install/developer.md +++ b/docs/WeBASE-Install/developer.md @@ -29,7 +29,7 @@ 1. 下载安装包 ```shell - wget https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeBASE/releases/download/v3.0.2/webase-front.zip + wget https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeBASE/releases/download/v3.1.0/webase-front.zip ``` diff --git a/docs/WeBASE/ChangeLOG.md b/docs/WeBASE/ChangeLOG.md index 09fd9e24..83f5c11f 100644 --- a/docs/WeBASE/ChangeLOG.md +++ b/docs/WeBASE/ChangeLOG.md @@ -7,6 +7,18 @@ FISCO-BCOS 2.0与3.0对比、JDK版本、WeBASE及其他子系统的版本兼容说明！`请查看 `_ ``` +### WeBASE v3.1.0 + +WeBASE v3.1.0 版本支持 FISCO-BCOS 3.0.0及以上版本。WeBASE 子系统推荐使用下表的版本搭配，FISCO-BCOS 推荐使用 [FISCO BCOS v3.4.0](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.4.0)版本。 + +| WeBASE子系统名称 | 配套版本地址 | FISCO-BCOS 2.X.X | +| ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ | +| [节点前置服务](https://webasedoc.readthedocs.io/zh_CN/lab/docs/WeBASE-Front/index.html) | [WeBASE-Front Release v3.1.0](https://github.com/WeBankBlockchain/WeBASE-Front/releases/tag/v3.1.0) | [FISCO BCOS v3.2.0](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.2.0) | +| [节点管理服务](https://webasedoc.readthedocs.io/zh_CN/lab/docs/WeBASE-Node-Manager/index.html) | [WeBASE-Node-Manager Release v3.1.0](https://github.com/WeBankBlockchain/WeBASE-Node-Manager/releases/tag/v3.1.0) | [FISCO BCOS v3.4.0](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.4.0) | +| [WeBASE管理平台](https://webasedoc.readthedocs.io/zh_CN/lab/docs/WeBASE-Web/index.html) | [WeBASE-Web Release v3.1.0](https://github.com/WeBankBlockchain/WeBASE-Web/releases/tag/v3.1.0) | [FISCO BCOS v3.4.0](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.4.0) | +| [签名服务](https://webasedoc.readthedocs.io/zh_CN/lab/docs/WeBASE-Sign/index.html) | [WeBASE-Sign Release v3.0.2](https://github.com/WeBankBlockchain/WeBASE-Sign/releases/tag/v3.0.2) | [FISCO BCOS v3.4.0](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.4.0) | + + ### WeBASE v3.0.2 diff --git a/docs/WeBASE/install.md b/docs/WeBASE/install.md index 273ab92c..c951e0e0 100644 --- a/docs/WeBASE/install.md +++ b/docs/WeBASE/install.md @@ -100,7 +100,7 @@ Python3.6及以上版本，需安装`PyMySQL`依赖包 获取部署安装包： ```shell -wget https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeBASE/releases/download/v3.0.2/webase-deploy.zip +wget https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeBASE/releases/download/v3.1.0/webase-deploy.zip ``` 解压安装包： ```shell @@ -139,10 +139,10 @@ cd webase-deploy ```shell [common] # WeBASE子系统的最新版本（v3.0版本） -webase.web.version=v3.0.2 -webase.mgr.version=v3.0.2 +webase.web.version=v3.1.0 +webase.mgr.version=v3.1.0 webase.sign.version=v3.0.2 -webase.front.version=v3.0.2 +webase.front.version=v3.1.0 # 节点管理子系统mysql数据库配置 mysql.ip=localhost @@ -184,7 +184,7 @@ node.p2pPort=30300 # 节点rpc端口 node.rpcPort=20200 # FISCO-BCOS版本（v3.0.0或以上版本） -fisco.version=v3.2.0 +fisco.version=v3.4.0 # 搭建节点个数（默认两个） node.counts=nodeCounts # 是否搭建Liquid合约链（Solidity和Liquid合约需要二选一，默认Solidity diff --git a/index.rst b/index.rst index 6447a625..a0705b0c 100644 --- a/index.rst +++ b/index.rst @@ -74,7 +74,8 @@ WeBASE（WeBank Blockchain Application Software Extension） 是在区块链应
            更多资料

- + + - `WeBASE社区文章 <./docs/WeBASE-Console-Suit/articles/index.html>`_ - `WeBASE贡献指南 <./docs/WeBASE/CONTRIBUTING.html>`_ - `WeBASE国内镜像仓库、文档、安装包资源 <./docs/WeBASE/mirror.html>`_ - `开源社区 <./docs/More/community.html>`_ diff --git a/release_note.txt b/release_note.txt index 59f6f534..3dc22901 100644 --- a/release_note.txt +++ b/release_note.txt @@ -1 +1 @@ -v3.0.2 +v3.1.0