fix event decode bug (#916)

* fix event decode bug * update console docs
FISCO-BCOS · Aug 26, 2020 · 2a4f070 · 2a4f070
1 parent 3e44458
commit 2a4f070
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/docs/manual/console.md b/docs/manual/console.md
@@ -81,6 +81,15 @@ curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v1.1.0/downloa
 |-- replace_solc_jar.sh # 编译jar包替换脚本
 ```
 
+**注意：默认下载控制台的版本内置`0.4.25`版本的`solidity`编译器，用户需要编译`0.5`或者`0.6`版本的合约时，可以通过下列命令获取内置对应编译器版本的控制台**
+```bash
+# 0.5
+curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v1.1.0/download_console.sh && bash download_console.sh -v 0.5
+
+# 0.6
+curl -#LO https://github.com/FISCO-BCOS/console/releases/download/v1.1.0/download_console.sh && bash download_console.sh -v 0.6
+```
+
 ### 配置控制台
 - 区块链节点和证书的配置：
   - 将节点sdk目录下的`ca.crt`、`sdk.crt`和`sdk.key`文件拷贝到`conf`目录下。

diff --git a/docs/sdk/java_sdk.md b/docs/sdk/java_sdk.md
@@ -52,7 +52,6 @@ repositories {
         maven { url "https://dl.bintray.com/ethereum/maven/" }
     }
 ```
-**注：** 如果下载Web3SDK的依赖`solcJ-all-0.4.25.jar`速度过慢，可以[参考这里](../manual/console.html#jar)进行下载。
 
 ## 配置SDK
 
@@ -743,7 +742,7 @@ InputAndOutputResult[
 ```java
 // transactionReceipt为调用do_event接口的交易回执
 String jsonResult = txDecodeSampleDecoder.decodeEventReturnJson(transactionReceipt.getLogs());
-String mapResult = txDecodeSampleDecoder.decodeEventReturnJson(transactionReceipt.getLogs());
+Map<String, List<List<ResultEntity>>> mapResult = txDecodeSampleDecoder.decodeEventReturnObject(transactionReceipt.getLogs());
 
 System.out.println("json => \n" + jsonResult);
 System.out.println("map => \n" + mapResult);

diff --git a/en/docs/manual/console.md b/en/docs/manual/console.md
@@ -223,6 +223,7 @@ The console provides the account generation script get_account.sh (for the scrip
 
 
 The console startup methods are as follows:
+
 ```
 ./start.sh
 ./start.sh groupID

diff --git a/en/docs/sdk/java_sdk.md b/en/docs/sdk/java_sdk.md
@@ -720,7 +720,7 @@ Call ``` function do_event(uint256 _u,int256 _i,bool _b,address _addr,bytes32 _b
 ```java
 // transactionReceipt is the transaction receipt of calling do_event API
 String jsonResult = txDecodeSampleDecoder.decodeEventReturnJson(transactionReceipt.getLogs());
-String mapResult = txDecodeSampleDecoder.decodeEventReturnJson(transactionReceipt.getLogs());
+Map<String, List<List<EventResultEntity>>> mapResult = txDecodeSampleDecoder.decodeEventReturnObject(transactionReceipt.getLogs());
 
 System.out.println("json => \n" + jsonResult);
 System.out.println("map => \n" + mapResult);