Merge pull request #79 from WeBankFinTech/dev

v1.3.2 dev=>master
WeBankBlockchain · Jun 22, 2020 · 43d6285 · 43d6285
2 parents bcb3601 + d4c84ca
commit 43d6285
Show file tree

Hide file tree

Showing 12 changed files with 353 additions and 84 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,21 @@
+### v1.3.2
+
+ (2020-06-17)
+
+**Fix**
+- 移除Fastjson，替换为Jackson 2.11.0; web3sdk升级为2.4.1
+- 升级依赖包：spring: 4.3.27; log4j: 2.13.3; slf4j: 1.7.30;
+
+**兼容性**
+
+- 支持FISCO-BCOS v2.0.0-rc1 版本
+- 支持FISCO-BCOS v2.0.0-rc2 版本
+- 支持FISCO-BCOS v2.0.0-rc3 版本
+- 支持FISCO-BCOS v2.0.0 及以上版本
+- WeBASE-Sign v1.3.0+
+
+详细了解，请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/latest/)。
+
 ### v1.3.1
 
  (2020-06-01)
@@ -11,7 +29,7 @@
 - 支持FISCO-BCOS v2.0.0-rc2 版本
 - 支持FISCO-BCOS v2.0.0-rc3 版本
 - 支持FISCO-BCOS v2.0.0 及以上版本
-- WeBASE-Sign v1.3.0
+- WeBASE-Sign v1.3.0+
 
 详细了解，请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/latest/)。
 

diff --git a/build.gradle b/build.gradle
@@ -13,18 +13,26 @@ targetCompatibility = 1.8
 // In this section you declare where to find the dependencies of your project
 repositories {
     maven { url "http://maven.aliyun.com/nexus/content/groups/public/"}
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
     maven { url 'https://dl.bintray.com/ethereum/maven/'}
     mavenLocal()
     mavenCentral()
 }
 
 
-def spring_boot_version="1.5.9.RELEASE"
+def spring_boot_version="1.5.22.RELEASE"
 List spring_boot =[ 
     "org.springframework.boot:spring-boot-starter-web:$spring_boot_version",
     "org.springframework.boot:spring-boot-autoconfigure:$spring_boot_version",
     "org.springframework.boot:spring-boot-configuration-processor:$spring_boot_version",
-    // "org.springframework.boot:spring-boot-starter-log4j2:$spring_boot_version"
+]
+
+// cover old version
+def spring_version="4.3.27.RELEASE"
+List spring =[
+    "org.springframework:spring-web:$spring_version",
+    "org.springframework:spring-webmvc:$spring_version",
+    "org.springframework:spring-jdbc:$spring_version"
 ]
 
 List mysql = [
@@ -38,18 +46,12 @@ List swagger = [
     'io.springfox:springfox-swagger-ui:2.8.0'
 ]
 
-def log4j_version="2.13.1"
-List logger = [
+def log4j_version="2.13.3"
+List log4j = [
     "org.apache.logging.log4j:log4j-api:$log4j_version",
     "org.apache.logging.log4j:log4j-core:$log4j_version",
     "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version",
-    "org.apache.logging.log4j:log4j-web:$log4j_version",
-    "org.slf4j:jcl-over-slf4j:1.7.12"
-]
-
-List netty = [
-    'io.netty:netty-all:4.1.15.Final',
-    'io.netty:netty-tcnative:2.0.0.Final'
+    "org.apache.logging.log4j:log4j-web:$log4j_version"
 ]
 
 List dangdang = [
@@ -62,15 +64,6 @@ List zookeeper = [
     'com.github.sgroschupf:zkclient:0.1'
 ]
 
-List web3sdk = [
-//    'org.ethereum:solcJ-all:0.4.25', // web3sdk已包含该包 无需再次引入
-    'org.apache.httpcomponents:httpclient:4.5.2',
-    'org.bouncycastle:bcprov-jdk15on:1.54',
-    'com.lambdaworks:scrypt:1.4.0',
-    'com.squareup:javapoet:1.7.0',
-    'io.reactivex.rxjava2:rxjava:2.2.7',
-    'com.github.jnr:jnr-unixsocket:0.15'
-]
 
 List jaxb = [
      "javax.xml.bind:jaxb-api:2.3.0",
@@ -79,22 +72,35 @@ List jaxb = [
      "javax.activation:activation:1.1.1"
 ]
 
+def jackson_version = "2.11.0"
 List jackson = [
-    "com.fasterxml.jackson.core:jackson-databind:2.10.0",
-    "com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.0",
-    "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.0",
-    "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.0"
+    "com.fasterxml.jackson.core:jackson-databind:$jackson_version",
+    "com.fasterxml.jackson.core:jackson-annotations:$jackson_version",
+    "com.fasterxml.jackson.core:jackson-core:$jackson_version",
+    "com.fasterxml.jackson.module:jackson-module-parameter-names:$jackson_version",
+    "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jackson_version",
+    "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version",
+]
+
+
+// cover old version
+def tomcat_version = "8.5.56"
+List tomcat = [
+    "org.apache.tomcat.embed:tomcat-embed-core:$tomcat_version",
+    "org.apache.tomcat.embed:tomcat-embed-el:$tomcat_version",
+    "org.apache.tomcat.embed:tomcat-embed-websocket:$tomcat_version",
+    "org.apache.tomcat:tomcat-jdbc:$tomcat_version",
+    "org.apache.tomcat:tomcat-juli:$tomcat_version"
 ]
 
 dependencies {
-    compile spring_boot,mysql,swagger,web3sdk,logger,netty,dangdang,zookeeper,jaxb,jackson
-    // guomi contract compile: USE 'socJ-all-0.4.25-gm' to REPLACE 'ethereum:solcJ-all'
-    compile "org.fisco-bcos:web3sdk:2.4.0"
+    compile spring_boot,spring,mysql,swagger,log4j,dangdang,zookeeper,jaxb,jackson,tomcat
+    compile "org.fisco-bcos:web3sdk:2.4.1"
     // support guomi/ecdsa same time, support solcJ-0.5.2
     compile "org.fisco-bcos:solcJ:0.4.25-rc1"
+    compile "org.slf4j:jcl-over-slf4j:1.7.30"
     compile "org.apache.commons:commons-lang3:3.6"
     compile "commons-io:commons-io:2.4"
-    compile "com.alibaba:fastjson:1.2.70"
     compile "io.shardingsphere:sharding-jdbc-spring-boot-starter:3.1.0"
     compile 'org.projectlombok:lombok:1.18.2'
     annotationProcessor 'org.projectlombok:lombok:1.18.2'

diff --git a/src/main/java/com/webank/webase/transaction/base/BaseController.java b/src/main/java/com/webank/webase/transaction/base/BaseController.java
@@ -14,8 +14,8 @@
 
 package com.webank.webase.transaction.base;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.webank.webase.transaction.util.JsonUtils;
+
 import com.webank.webase.transaction.base.exception.BaseException;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
@@ -47,8 +47,10 @@ protected ResponseEntity checkParamResult(BindingResult bindingResult) throws Ba
 
         RetCode retCode = null;
         try {
-            JSONObject jsonObject = JSON.parseObject(errorMsg);
-            retCode = JSONObject.toJavaObject(jsonObject, RetCode.class);
+            retCode = JsonUtils.toJavaObject(errorMsg, RetCode.class);
+            if (retCode == null) {
+                log.error("json parse error");
+            }
         } catch (Exception ex) {
             log.warn("OnWarning:retCodeJson convert error");
             throw new BaseException(ConstantCode.PARAM_VAILD_FAIL);
@@ -65,7 +67,7 @@ protected ResponseEntity checkParamResult(BindingResult bindingResult) throws Ba
      */
     private String getParamValidFaildMessage(BindingResult bindingResult) {
         List<ObjectError> errorList = bindingResult.getAllErrors();
-        log.info("errorList:{}", JSON.toJSONString(errorList));
+        log.info("errorList:{}", JsonUtils.toJSONString(errorList));
         if (errorList == null) {
             log.warn("onWarning:errorList is empty!");
             return null;

diff --git a/src/main/java/com/webank/webase/transaction/config/MyComplexShardingAlgorithm.java b/src/main/java/com/webank/webase/transaction/config/MyComplexShardingAlgorithm.java
@@ -14,7 +14,7 @@
 
 package com.webank.webase.transaction.config;
 
-import com.alibaba.fastjson.JSON;
+import com.webank.webase.transaction.util.JsonUtils;
 import io.shardingsphere.api.algorithm.sharding.ListShardingValue;
 import io.shardingsphere.api.algorithm.sharding.ShardingValue;
 import io.shardingsphere.api.algorithm.sharding.complex.ComplexKeysShardingAlgorithm;
@@ -35,8 +35,8 @@ public class MyComplexShardingAlgorithm implements ComplexKeysShardingAlgorithm
     @Override
     public Collection<String> doSharding(Collection<String> collection,
             Collection<ShardingValue> shardingValues) {
-        log.debug("collection:" + JSON.toJSONString(collection) + ",shardingValues:"
-                + JSON.toJSONString(shardingValues));
+        log.debug("collection:" + JsonUtils.toJSONString(collection) + ",shardingValues:"
+                + JsonUtils.toJSONString(shardingValues));
         // table sharding by id and gmt_create
         Collection<Long> idValues = getLongShardingValue(shardingValues, "id");
         Collection<Date> gmtValues = getDateShardingValue(shardingValues, "gmt_create");

diff --git a/src/main/java/com/webank/webase/transaction/contract/ContractController.java b/src/main/java/com/webank/webase/transaction/contract/ContractController.java
@@ -14,7 +14,7 @@
 
 package com.webank.webase.transaction.contract;
 
-import com.alibaba.fastjson.JSON;
+import com.webank.webase.transaction.util.JsonUtils;
 import com.webank.webase.transaction.base.BaseController;
 import com.webank.webase.transaction.base.ResponseEntity;
 import com.webank.webase.transaction.base.exception.BaseException;
@@ -74,7 +74,7 @@ public ResponseEntity compile(
     @PostMapping("/deploy")
     public ResponseEntity deploy(@Valid @RequestBody ReqDeployInfo deployInfo, BindingResult result)
             throws BaseException {
-        log.info("deploy start. deployInfo:{}", JSON.toJSONString(deployInfo));
+        log.info("deploy start. deployInfo:{}", JsonUtils.toJSONString(deployInfo));
         checkParamResult(result);
         return contractService.deploy(deployInfo);
     }

diff --git a/src/main/java/com/webank/webase/transaction/contract/ContractService.java b/src/main/java/com/webank/webase/transaction/contract/ContractService.java
@@ -14,8 +14,6 @@
 
 package com.webank.webase.transaction.contract;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.webank.webase.transaction.base.ConstantCode;
 import com.webank.webase.transaction.base.ConstantProperties;
 import com.webank.webase.transaction.base.ResponseEntity;
@@ -28,6 +26,7 @@
 import com.webank.webase.transaction.trans.TransService;
 import com.webank.webase.transaction.util.CommonUtils;
 import com.webank.webase.transaction.util.ContractAbiUtil;
+import com.webank.webase.transaction.util.JsonUtils;
 import com.webank.webase.transaction.util.LogUtils;
 import java.io.File;
 import java.io.IOException;
@@ -121,7 +120,7 @@ public ResponseEntity compile(MultipartFile zipFile) throws BaseException, IOExc
                 compileInfo.setContractName(contractName);
                 compileInfo.setContractBin(result.getContract(contractName).bin);
                 compileInfo
-                        .setContractAbi(JSONArray.parseArray(result.getContract(contractName).abi));
+                        .setContractAbi(JsonUtils.toJavaObjectList(result.getContract(contractName).abi, Object.class));
                 compileInfos.add(compileInfo);
             }
         }
@@ -172,7 +171,7 @@ public ResponseEntity deploy(ReqDeployInfo req) throws BaseException {
             }
         }
         // check parameters
-        String contractAbi = JSON.toJSONString(req.getContractAbi());
+        String contractAbi = JsonUtils.toJSONString(req.getContractAbi());
         List<Object> params = req.getFuncParam();
         AbiDefinition abiDefinition = ContractAbiUtil.getAbiDefinition(contractAbi);
         List<String> funcInputTypes = ContractAbiUtil.getFuncInputType(abiDefinition);
@@ -188,7 +187,7 @@ public ResponseEntity deploy(ReqDeployInfo req) throws BaseException {
         deployInfoDto.setUuidDeploy(uuid);
         deployInfoDto.setContractBin(req.getContractBin());
         deployInfoDto.setContractAbi(contractAbi);
-        deployInfoDto.setFuncParam(JSON.toJSONString(params));
+        deployInfoDto.setFuncParam(JsonUtils.toJSONString(params));
         deployInfoDto.setSignType(req.getSignType());
         deployInfoDto.setSignUserId(req.getSignUserId());
         deployInfoDto.setGmtCreate(new Date());
@@ -308,7 +307,7 @@ public void run() {
      * @param deployInfoDto deployInfoDto
      */
     public void deploySend(DeployInfoDto deployInfoDto) {
-        log.debug("deploySend deployInfoDto:{}", JSON.toJSONString(deployInfoDto));
+        log.debug("deploySend deployInfoDto:{}", JsonUtils.toJSONString(deployInfoDto));
         Long id = deployInfoDto.getId();
         log.info("deploySend id:{}", id);
         int groupId = deployInfoDto.getGroupId();
@@ -334,7 +333,7 @@ public void deploySend(DeployInfoDto deployInfoDto) {
 
             String contractAbi = deployInfoDto.getContractAbi();
             String contractBin = deployInfoDto.getContractBin();
-            List<Object> params = JSONArray.parseArray(deployInfoDto.getFuncParam());
+            List<Object> params = JsonUtils.toJavaObjectList(deployInfoDto.getFuncParam(), Object.class);
 
             // get function abi
             AbiDefinition abiDefinition = ContractAbiUtil.getAbiDefinition(contractAbi);

diff --git a/src/main/java/com/webank/webase/transaction/keystore/KeyStoreService.java b/src/main/java/com/webank/webase/transaction/keystore/KeyStoreService.java
@@ -14,7 +14,7 @@
 
 package com.webank.webase.transaction.keystore;
 
-import com.alibaba.fastjson.JSON;
+import com.webank.webase.transaction.util.JsonUtils;
 import com.webank.webase.transaction.base.ConstantCode;
 import com.webank.webase.transaction.base.ConstantProperties;
 import com.webank.webase.transaction.base.ResponseEntity;
@@ -121,10 +121,10 @@ public String getSignData(EncodeInfo params) {
             log.info("getSignData url:{}", url);
             HttpHeaders headers = CommonUtils.buildHeaders();
             HttpEntity<String> formEntity =
-                    new HttpEntity<String>(JSON.toJSONString(params), headers);
+                    new HttpEntity<String>(JsonUtils.toJSONString(params), headers);
             ResponseEntity response =
                     restTemplate.postForObject(url, formEntity, ResponseEntity.class);
-            log.info("getSignData response:{}", JSON.toJSONString(response));
+            log.info("getSignData response:{}", JsonUtils.toJSONString(response));
             if (response.getCode() == 0) {
                 signInfo = CommonUtils.object2JavaBean(response.getData(), SignInfo.class);
             }
@@ -148,7 +148,7 @@ public boolean checkSignUserId(String signUserId) {
             String url = String.format(SIGN_USERINFO_URL, properties.getSignServer(), signUserId);
             log.info("checkSignUserId url:{}", url);
             ResponseEntity response = restTemplate.getForObject(url, ResponseEntity.class);
-            log.info("checkSignUserId response:{}", JSON.toJSONString(response));
+            log.info("checkSignUserId response:{}", JsonUtils.toJSONString(response));
             if (response.getCode() == 0) {
                 return true;
             }

diff --git a/src/main/java/com/webank/webase/transaction/trans/TransController.java b/src/main/java/com/webank/webase/transaction/trans/TransController.java
@@ -14,7 +14,7 @@
 
 package com.webank.webase.transaction.trans;
 
-import com.alibaba.fastjson.JSON;
+import com.webank.webase.transaction.util.JsonUtils;
 import com.webank.webase.transaction.base.BaseController;
 import com.webank.webase.transaction.base.ResponseEntity;
 import com.webank.webase.transaction.base.exception.BaseException;
@@ -56,7 +56,7 @@ public class TransController extends BaseController {
     @PostMapping("/send")
     public ResponseEntity send(@Valid @RequestBody ReqTransSendInfo transSendInfo,
             BindingResult result) throws BaseException {
-        log.info("transSend start. transSendInfo:{}", JSON.toJSONString(transSendInfo));
+        log.info("transSend start. transSendInfo:{}", JsonUtils.toJSONString(transSendInfo));
         checkParamResult(result);
         return transService.save(transSendInfo);
     }
@@ -72,7 +72,7 @@ public ResponseEntity send(@Valid @RequestBody ReqTransSendInfo transSendInfo,
     @PostMapping("/call")
     public ResponseEntity call(@Valid @RequestBody ReqTransCallInfo transCallInfo,
             BindingResult result) throws BaseException {
-        log.info("call start. transCallInfo:{}", JSON.toJSONString(transCallInfo));
+        log.info("call start. transCallInfo:{}", JsonUtils.toJSONString(transCallInfo));
         checkParamResult(result);
         return transService.call(transCallInfo);
     }