From a824d25f28a66c4b970d5bf096d93a94005338fe Mon Sep 17 00:00:00 2001
From: Maggie WU <maggie@Maggies-MacBook-Pro.local>
Date: Thu, 29 Oct 2020 20:23:59 +0800
Subject: [PATCH] set version 2.6.1

---
 Changelog.md | 104 +++++++++++++++++++++++++++++++++++++++++++++++++--
 build.gradle |   2 +-
 2 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index cea195d53..d7e529c94 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,8 +1,73 @@
-### v2.6.1-rc1
+## 2.6.1
+(2020-10-29)
+Please read documentation of Java SDK.
 
+* [English User Handbook](https://fisco-bcos-documentation.readthedocs.io/en/latest/docs/sdk/java_sdk/index.html)
+* [Chinese User Handbook](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/sdk/java_sdk/index.html#)
+* [Chinese WIKI](https://github.com/FISCO-BCOS/java-sdk/wiki)
+
+Java SDK v2.6.1 include the following new features:
+
+Changed：
+* Hidden the amop private topic suffix in the callback function.
+* Added amop demo required resources.
+* Upgraded two dependencies that netty-sm-ssl-context to version v1.2.0 and netty to version v4.1.53.Final.
+* Improved the documentation of send transaction without bin file.
+* Removed unused arguments(abi file) in the functions like encodeMethodByInterface of ABI module.
+
+Fixed:
+* Solved the problem of crypto module cannot call by multiple tasks.
+* Solved invalid block limit problem, when console delete data and restart.
+* Fixed an event decode bug that cannot decode multiple events of one transaction.
+* Fixed the AMOP message data truncated bug.
+
+Compatibility
+
+* FISCO BCOS v2.0+.
+* Not compatible with Web3SDK. When two users want to use AMOP functions to talk with each other, they should either both use Java SDK, or both use Web3SDK. 
+
+----
+请参考文档：
+* [英文版用户手册](https://fisco-bcos-documentation.readthedocs.io/en/latest/docs/sdk/java_sdk/index.html)
+* [中文版用户手册](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/sdk/java_sdk/index.html#)
+* [中文版WIKI](https://github.com/FISCO-BCOS/java-sdk/wiki)
+
+修改：
+ * 隐藏AMOP私有话题的话题前缀。
+ * 添加AMOP Demo所需的资源文件。
+ * 升级两个依赖版本，netty-sm-ssl-context到v1.2.0，netty 到 v4.1.53.Final.
+ * 完善不使用bin文件构造交易的方法文档。
+ * 在ABI模块中的encodeMethodByInterface等方法中删除无用的参数（abi文件）。
+ 
+修复:
+ * 解决加密模块无法被多进程访问的问题。
+ * 解决控制台删除数据后重启会出现block limit不合法异常的问题。
+ * 解决同一个交易中如果有多个Event，只能解析一个无法解析多个的问题。
+ * 解决AMOP消息数据被截断的问题。
+
+适配性：
+* 适配FISCO BCOS v2.0+。
+* 不适配Web3SDK。意思是，如果两个用户想使用AMOP功能进行通信，他们必须要么同时使用Java SDK，要么同时使用Web3SDK。
+
+## v2.6.1-rc1
 (2020-09-30)
+Please read documentation of Java SDK.
 
-This java sdk is a code refactoring version base on web3sdk 2.6.1. It includes the following new features:
+* [English User Handbook](https://fisco-bcos-documentation.readthedocs.io/en/latest/docs/sdk/java_sdk/index.html)
+* [Chinese User Handbook](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/sdk/java_sdk/index.html#)
+* [Chinese WIKI](https://github.com/FISCO-BCOS/java-sdk/wiki)
+
+Support functions are:
+
+* Contract compiling.
+* Interacting with FISCO BCOS JSON-RPC interface.
+* constructing and sending transactions.
+* Advanced Messages Onchain Protocol(AMOP) functions.
+* Contract event subscription.
+* Encoding and decoding data with ABI. 
+* Account Management.
+
+This java sdk is a code refactoring version base on Web3SDK 2.6.1. It includes the following new features:
 
 * Support Toml config file, simplify configuration options.
 * Support connecting with nodes of different groups.
@@ -12,5 +77,36 @@ This java sdk is a code refactoring version base on web3sdk 2.6.1. It includes t
 * Add a new module called group management to help applications manage nodes which java SDK connecting with.
 * Use modular design, each module can use independently. For example, you can create crypto.jar file if only crypto module is needed.
 
-Please note that:
-Java SDK supports FISCO BCOS 2.X, but not compatible with web3sdk. Mean, when tow user want to use AMOP functions to talk with each other, they should either both use java sdk, or both use web3sdk. 
\ No newline at end of file
+Compatibility
+
+* FISCO BCOS v2.0+.
+* Not compatible with Web3SDK. When two users want to use AMOP functions to talk with each other, they should either both use Java SDK, or both use Web3SDK. 
+
+----
+
+请参考文档：
+* [英文版用户手册](https://fisco-bcos-documentation.readthedocs.io/en/latest/docs/sdk/java_sdk/index.html)
+* [中文版用户手册](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/sdk/java_sdk/index.html#)
+* [中文版WIKI](https://github.com/FISCO-BCOS/java-sdk/wiki)
+
+支持功能：
+* 合约编译。
+* FISCO BCOS JSON-RPC 调用。
+* 构造和发送交易。
+* AMOP功能。
+* 合约事件订阅。
+* ABI 数据编解码。
+* 账户管理。
+
+Java SDK是基于Web3SDK重构的，它包含的新特性有：
+* 支持Toml文件配置，简化配置项。
+* 支持同时连接不同群组的节点。
+* 支持动态订阅和取消订阅AMOP话题。
+* ABI模块支持对结构体的编解码。
+* 使用WeBank的通用加密工具。
+* 新增群组管理模块，帮助用户管理不同群组的节点，简化应用代码。
+* 使用模块化设计，便于组装再造。用户可以根据需要下载和使用必要的模块。
+
+适配性：
+* 适配FISCO BCOS v2.0+。
+* 不适配Web3SDK。意思是，如果两个用户想使用AMOP功能进行通信，他们必须要么同时使用Java SDK，要么同时使用Web3SDK。
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d11a37321..22535a391 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,7 @@ ext {
 // integrationTest.mustRunAfter test
 allprojects {
     group = 'org.fisco-bcos.java-sdk'
-    version = '2.6.1-SNAPSHOT'
+    version = '2.6.1'
     apply plugin: 'maven'
     apply plugin: 'maven-publish'
     apply plugin: 'idea'