sync code, solve conflict

Author: Maggie WU

.gitignore

@@ -22,3 +22,5 @@ conf/
 gmcert.cnf
 gmsm2.param
 integrationTestEnv.sh
+gradle.properties
+gpg.gpg

CONTRIBUTING.md

@@ -0,0 +1,67 @@
+English / [中文](docs/CONTRIBUTING_CN.md)
+
+# Contributing and Review Guidelines
+
+All contributions are welcome! 
+
+## Branching
+
+Our branching method is [git-flow](https://jeffkreeftmeijer.com/git-flow/)
+
+- **master**: Latest stable branch
+- **dev**: Stable branch waiting for release(merge to master)
+- **feature-xxxx**: A developing branch of a new feature named xxxx
+- **bugfix-xxxx**: A branch to fix the bug named xxxx
+
+## How to
+
+### Issue
+
+Go to [issues page](https://github.com/FISCO-BCOS/java-sdk/issues)
+
+### Fix bugs
+
+1. **Fork** this repo
+2. **Create** a new branch named **bugfix-xxxx** forked from your repo's **master** branch
+3. **Fix** the bug
+4. **Test** the fixed code
+5. Make **pull request** back to this repo's **dev** branch 
+6. Wait the community to review the code
+7. Merged(**Bug fixed**)
+
+### Develop a new feature
+
+1. **Fork** this repo
+2. **Create** a new branch named **feature-xxxx** forked from your repo's **dev** branch
+3. **Coding** in feature-xxxx
+4. **Pull** this repo's dev branch to your feature-xxxx constantly
+5. **Test** your code
+6. Make **pull request** back to this repo's dev branch
+7. Wait the community to review the code
+8. Merged !!!!
+
+## Code formatting
+
+The code formatting tool are described by the [google-java-format-gradle-plugin](https://github.com/sherter/google-java-format-gradle-plugin).
+
+Execute the task `googleJavaFormat` to format all *.java files in the project
+```
+./gradlew goJF
+```
+Execute the task `verifyGoogleJavaFormat` to verify that all *.java files are formatted properly
+```          
+./gradlew verGJF
+```
+
+## Continuous integration
+
+**Continuous integration platform**
+
+* travis-ci: [![Build Status](https://travis-ci.org/FISCO-BCOS/java-sdk.svg?branch=master)](https://travis-ci.org/FISCO-BCOS/java-sdk)
+
+
+**Code quality**
+
+* Codacy: [![Codacy Badge](https://app.codacy.com/project/badge/Grade/d830a3be25c04b04b032870e4184482a)](https://www.codacy.com/gh/FISCO-BCOS/java-sdk/dashboard?utm_source=github.com&utm_medium=referral&utm_content=FISCO-BCOS/java-sdk&utm_campaign=Badge_Grade)
+
+

Changelog.md

@@ -0,0 +1,16 @@
+### v2.6.1-rc1
+
+(2020-09-30)
+
+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.
+* Support AMOP subscription and unsubscription at any time instead of just before start service.
+* ABI module add support of encode and decode of struct type data.
+* Use the common crypto tools of WeBank.
+* 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. 

README.md

@@ -1,12 +1,44 @@
 ![](docs/images/FISCO_BCOS_Logo.svg)
 
+English / [中文](docs/README_CN.md)
+
 # Java SDK
 
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 [![Build Status](https://travis-ci.org/FISCO-BCOS/java-sdk.svg?branch=master)](https://travis-ci.org/FISCO-BCOS/java-sdk)
 [![CodeFactor](https://www.codefactor.io/repository/github/fisco-bcos/java-sdk/badge)](https://www.codefactor.io/repository/github/fisco-bcos/java-sdk)
 [![GitHub All Releases](https://img.shields.io/github/downloads/FISCO-BCOS/java-sdk/total.svg)](https://github.com/FISCO-BCOS/java-sdk)
 
+This is the FISCO BCOS Client SDK for Java. Developers can use Java SDK to build blockchain applications with FISCO BCOS blockchain.
+
+## Functions
+* 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.
+
+## New Features
+This java sdk is a code refactoring version base on web3sdk (not recommend to use), it includes the following new features:
+
+* Support Toml config file, simplify configuration options.
+* Support connecting with nodes of different groups.
+* Support AMOP subscription and unsubscription at any time instead of just before start service.
+* ABI module add support of encode and decode of struct type data.
+* Use the common crypto tools of WeBank.
+* 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.
+
+## Documentation
+* [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)
+
+## Quick Start
+* [English](https://fisco-bcos-documentation.readthedocs.io/en/latest/docs/sdk/java_sdk/quick_start.html)
+* [Chinese](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/sdk/java_sdk/quick_start.html)
 
 ## Join Our Community
 

build.gradle

@@ -23,7 +23,7 @@ ext {
     nettySMSSLContextVersion = "1.1.0"
     toml4jVersion = "0.7.2"
     bcprovJDK15onVersion = "1.60"
-    keyMiniToolkit = "1.0-SNAPSHOT"
+    keyMiniToolkit = "1.0.0"
 
     solcJVersion = "0.4.25.1"
     //solcJVersion = "0.5.2.0"

docs/CONTRIBUTING_CN.md

@@ -0,0 +1,67 @@
+[English](../CONTRIBUTING.md) / 中文
+
+# 贡献代码
+
+非常感谢能有心为FISCO-BCOS社区贡献代码！
+
+## 分支策略
+
+项目采用[git-flow](https://jeffkreeftmeijer.com/git-flow/)的分支策略。
+
+* master：最新的稳定分支
+* dev：待发布的稳定分支
+* feature-xxxx：一个正在开发xxxx特性分支
+* bugfix-xxxx：一个正在修bug xxxx的分支
+
+## 贡献方法
+
+### Issue
+
+可直接去[issues page](https://github.com/FISCO-BCOS/java-sdk/issues)提issue。
+
+### 修复bug
+
+1. Fork本仓库到个人仓库
+2. 从个人仓库的master分支拉出一个bugfix-xxxx分支
+3. 在bugfix-xxxx上修复bug
+4. 测试修复的bug
+5. PR（Pull Request）到本仓库的dev分支
+6. 等待社区review这个PR
+7. PR合入，bug修复完成！
+
+### 开发新特性
+
+1. Fork本仓库到个人仓库
+2. 从个人仓库的dev分支拉出一个feature-xxxx分支
+3. 在feature-xxxx上进行特性开发
+4. 不定期的从本仓库的dev分支pull最新的改动到feature-xxxx分支
+5. 测试新特性
+6. PR（Pull Request）到本参考的dev分支
+7. 等待社区review这个PR
+8. PR合入，特性开发完成！
+
+## 代码格式化
+
+代码格式化gradle插件[google-java-format-gradle-plugin](https://github.com/sherter/google-java-format-gradle-plugin).
+
+执行任务 `googleJavaFormat`格式化java文件。
+```
+./gradlew goJF
+```
+执行任务 `verifyGoogleJavaFormat`验证java文件是否格式化完成
+```          
+./gradlew verGJF
+```
+
+## 持续集成（CI）
+
+持续集成框架
+
+* travis-ci: [![Build Status](https://travis-ci.org/FISCO-BCOS/java-sdk.svg?branch=master)](https://travis-ci.org/FISCO-BCOS/java-sdk)
+
+
+代码质量
+
+* Codacy: [![Codacy Badge](https://app.codacy.com/project/badge/Grade/d830a3be25c04b04b032870e4184482a)](https://www.codacy.com/gh/FISCO-BCOS/java-sdk/dashboard?utm_source=github.com&utm_medium=referral&utm_content=FISCO-BCOS/java-sdk&utm_campaign=Badge_Grade)
+
+

docs/README_CN.md

@@ -0,0 +1,52 @@
+![](images/FISCO_BCOS_Logo.svg)
+
+[English](../README.md) / 中文
+
+# Java SDK
+
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
+[![Build Status](https://travis-ci.org/FISCO-BCOS/java-sdk.svg?branch=master)](https://travis-ci.org/FISCO-BCOS/java-sdk)
+[![CodeFactor](https://www.codefactor.io/repository/github/fisco-bcos/java-sdk/badge)](https://www.codefactor.io/repository/github/fisco-bcos/java-sdk)
+[![GitHub All Releases](https://img.shields.io/github/downloads/FISCO-BCOS/java-sdk/total.svg)](https://github.com/FISCO-BCOS/java-sdk)
+
+这是FISCO BCOS客户端的Java SDK，提供了访问FISCO BCOS节点的Java API，支持节点状态查询、部署和调用合约等功能，基于Java SDK可开发区块链应用，目前支持FISCO BCOS 2.0+。
+
+## 功能
+* 提供合约编译功能，将Solidity合约文件转换成Java合约文件
+* 提供Java SDK API,提供访问FISCO BCOS JSON-RPC 的功能，并支持预编译（Precompiled）合约调用
+* 提供自定义构造和发送交易功能
+* 提供AMOP功能
+* 支持合约事件推送
+* 支持ABI解析
+* 提供账户管理接口
+
+## 新特性
+这个Java SDK是web3sdk（不推荐使用）的重构版本，其包含如下几个新特性：
+
+* 支持Toml配置文件的配置，简化配置项。
+* 支持连接不同群组的节点。
+* 支持AMOP动态订阅和取消订阅。
+* 支持解析结构体类型数据的ABI解析。
+* 使用Webank通用的加密包。
+* 添加群组管理模块，帮助应用管理多个群组中节点连接。
+* 使用模块化设计，便于组装再造。
+
+## 贡献代码
+欢迎参与FISCO BCOS的社区建设：
+- 点亮我们的小星星(点击项目左上方Star按钮)。
+- 提交代码(Pull requests)，参考我们的[代码贡献流程](CONTRIBUTING_CN.md)。
+- [提问和提交BUG](https://github.com/FISCO-BCOS/java-sdk/issues)。
+
+## 加入我们的社区
+
+FISCO BCOS开源社区是国内活跃的开源社区，社区长期为机构和个人开发者提供各类支持与帮助。已有来自各行业的数千名技术爱好者在研究和使用FISCO BCOS。如您对FISCO BCOS开源技术及应用感兴趣，欢迎加入社区获得更多支持与帮助。
+
+
+![](https://media.githubusercontent.com/media/FISCO-BCOS/LargeFiles/master/images/QR_image.png)
+
+
+## License
+
+![license](https://img.shields.io/badge/license-Apache%20v2-blue.svg)
+
+Web3SDK的开源协议为[Apache License 2.0](http://www.apache.org/licenses/). 详情参考[LICENSE](../LICENSE)。

sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ResponseCallback.java

@@ -57,7 +57,7 @@ public void onError(String errorMessage) {
         cancelTimeout();
         Response response = new Response();
         response.setErrorCode(ChannelMessageError.INTERNAL_MESSAGE_HANDLE_FAILED.getError());
-        response.setContent(errorMessage);
+        response.setErrorMessage(errorMessage);
         onResponse(response);
     }
 

sdk-core/src/main/java/org/fisco/bcos/sdk/network/ConnectionManager.java

@@ -231,11 +231,19 @@ private SslContext initSslContext(ConfigOption configOption) throws NetworkExcep
                             .build();
             return sslCtx;
         } catch (FileNotFoundException | SSLException e) {
+            logger.error(
+                    "initSslContext failed, caCert: {}, sslCert: {}, sslKey: {}, error: {}, e: {}",
+                    configOption.getCryptoMaterialConfig().getCaCertPath(),
+                    configOption.getCryptoMaterialConfig().getSdkCertPath(),
+                    configOption.getCryptoMaterialConfig().getSdkPrivateKeyPath(),
+                    e.getMessage(),
+                    e);
             throw new NetworkException(
                     "SSL context init failed, please make sure your cert and key files are properly configured. error info: "
                             + e.getMessage(),
                     NetworkException.INIT_CONTEXT_FAILED);
         } catch (IllegalArgumentException e) {
+            logger.error("initSslContext failed, error: {}, e: {}", e.getMessage(), e);
             throw new NetworkException(
                     "SSL context init failed, error info: " + e.getMessage(),
                     NetworkException.INIT_CONTEXT_FAILED);
@@ -273,6 +281,15 @@ private SslContext initSMSslContext(ConfigOption configOption) throws NetworkExc
                 | NoSuchAlgorithmException
                 | InvalidKeySpecException
                 | NoSuchProviderException e) {
+            logger.error(
+                    "initSMSslContext failed, caCert:{}, sslCert: {}, sslKey: {}, enCert: {}, enKey: {}, error: {}, e: {}",
+                    configOption.getCryptoMaterialConfig().getCaCertPath(),
+                    configOption.getCryptoMaterialConfig().getSdkCertPath(),
+                    configOption.getCryptoMaterialConfig().getSdkPrivateKeyPath(),
+                    configOption.getCryptoMaterialConfig().getEnSSLCertPath(),
+                    configOption.getCryptoMaterialConfig().getEnSSLPrivateKeyPath(),
+                    e.getMessage(),
+                    e);
             throw new NetworkException(
                     "SSL context init failed, please make sure your cert and key files are properly configured. error info: "
                             + e.getMessage(),
@@ -356,7 +373,7 @@ private boolean checkConnectionResult(
                                 + ":"
                                 + connInfo.getPort()
                                 + checkerMessage;
-                logger.debug(sslHandshakeFailedMessage);
+                logger.error(sslHandshakeFailedMessage);
                 errorMessageList.add(
                         new RetCode(
                                 NetworkException.SSL_HANDSHAKE_FAILED, sslHandshakeFailedMessage));
@@ -375,7 +392,7 @@ private boolean checkConnectionResult(
                                 + ":"
                                 + connInfo.getPort()
                                 + checkerMessage;
-                logger.debug(sslHandshakeFailedMessage);
+                logger.error(sslHandshakeFailedMessage);
                 errorMessageList.add(
                         new RetCode(
                                 NetworkException.SSL_HANDSHAKE_FAILED, sslHandshakeFailedMessage));

sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/CryptoSuite.java

@@ -189,8 +189,15 @@ public CryptoKeyPair createKeyPair(KeyPair keyPair) {
         return this.cryptoKeyPair;
     }
 
+    public CryptoKeyPair createKeyPair(String hexedPrivateKey) {
+        this.cryptoKeyPair = this.keyPairFactory.createKeyPair(hexedPrivateKey);
+        this.cryptoKeyPair.setConfig(config);
+        return this.cryptoKeyPair;
+    }
+
     public void setCryptoKeyPair(CryptoKeyPair cryptoKeyPair) {
         this.cryptoKeyPair = cryptoKeyPair;
+        this.cryptoKeyPair.setConfig(config);
     }
 
     public CryptoKeyPair getCryptoKeyPair() {