From 72c38f17648de417c7dc822f3cc93868724775c0 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Wed, 14 Jul 2021 10:12:23 +0800 Subject: [PATCH 1/5] add process in handle --- .../java/com/webank/webase/front/transaction/TransService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/webank/webase/front/transaction/TransService.java b/src/main/java/com/webank/webase/front/transaction/TransService.java index ea61208e1..86c2d76ac 100644 --- a/src/main/java/com/webank/webase/front/transaction/TransService.java +++ b/src/main/java/com/webank/webase/front/transaction/TransService.java @@ -304,6 +304,7 @@ public static TransactionReceipt execTransaction(Function function, // String receiptMsg = FrontUtils.handleReceiptMsg(transactionReceipt); String receiptMsg = txDecoder.decodeReceiptStatus(transactionReceipt).getReceiptMessages(); transactionReceipt.setMessage(receiptMsg); + CommonUtils.processReceiptHexNumber(transactionReceipt); log.info("execTransaction end useTime:{}", Duration.between(startTime, Instant.now()).toMillis()); return transactionReceipt; From fa41d37bf7355cdfdb73e0ecb81af6a422ffc0be Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Wed, 14 Jul 2021 10:18:15 +0800 Subject: [PATCH 2/5] update trans --- .../java/com/webank/webase/front/transaction/TransService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/webank/webase/front/transaction/TransService.java b/src/main/java/com/webank/webase/front/transaction/TransService.java index 86c2d76ac..86c516f84 100644 --- a/src/main/java/com/webank/webase/front/transaction/TransService.java +++ b/src/main/java/com/webank/webase/front/transaction/TransService.java @@ -226,6 +226,7 @@ private Object handleTransByFunction(int groupId, Client web3j, String signUserI TransactionDecoderService txDecoder = new TransactionDecoderService(cryptoSuite); String receiptMsg = txDecoder.decodeReceiptStatus(responseReceipt).getReceiptMessages(); responseReceipt.setMessage(receiptMsg); + CommonUtils.processReceiptHexNumber(responseReceipt); response = responseReceipt; log.info("***node cost time***: {}", Duration.between(nodeStartTime, Instant.now()).toMillis()); @@ -301,7 +302,6 @@ public static TransactionReceipt execTransaction(Function function, log.info("execTransaction start startTime:{}", startTime.toEpochMilli()); TransactionReceipt transactionReceipt = commonContract.execTransaction(function); // cover null message through statusCode - // String receiptMsg = FrontUtils.handleReceiptMsg(transactionReceipt); String receiptMsg = txDecoder.decodeReceiptStatus(transactionReceipt).getReceiptMessages(); transactionReceipt.setMessage(receiptMsg); CommonUtils.processReceiptHexNumber(transactionReceipt); From 2993ba525ae378f016575ce809b9b282fbeec674 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Wed, 14 Jul 2021 14:56:18 +0800 Subject: [PATCH 3/5] update save contract log info --- .../java/com/webank/webase/front/contract/ContractService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/webank/webase/front/contract/ContractService.java b/src/main/java/com/webank/webase/front/contract/ContractService.java index 0463871b4..a9eb40764 100644 --- a/src/main/java/com/webank/webase/front/contract/ContractService.java +++ b/src/main/java/com/webank/webase/front/contract/ContractService.java @@ -512,7 +512,7 @@ public void deleteContract(Long contractId, int groupId) { * save contract data. */ public Contract saveContract(ReqContractSave contractReq) { - log.debug("start saveContract contractReq:{}", JsonUtils.toJSONString(contractReq)); + log.info("start saveContract contractReq:{}", JsonUtils.toJSONString(contractReq)); if (contractReq.getContractId() == null) { // new return newContract(contractReq); From 7e7cdab5eb2ab21b05ffd1581d2a6c666b18eec5 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Mon, 19 Jul 2021 11:43:25 +0800 Subject: [PATCH 4/5] update comment --- .../java/com/webank/webase/front/scaffold/ScaffoldService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/webank/webase/front/scaffold/ScaffoldService.java b/src/main/java/com/webank/webase/front/scaffold/ScaffoldService.java index c388547d1..35af489b2 100644 --- a/src/main/java/com/webank/webase/front/scaffold/ScaffoldService.java +++ b/src/main/java/com/webank/webase/front/scaffold/ScaffoldService.java @@ -91,7 +91,7 @@ public RspFile exportProject(ReqProject reqProject) { // if contract abi is null, not compile // if abi is [](empty list), compile already if (contract == null || contract.getContractAbi() == null) { - log.error("exportProject contract not exist or not compiled, id:{}", id); + log.error("exportProject contract not exist or abi empty, id:{}", id); throw new FrontException(ConstantCode.INVALID_CONTRACT_ID); } tbContractList.add(contract); From 1a8e3a174bb1849bbeb080c8513002ffb07d0f84 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Mon, 19 Jul 2021 11:43:39 +0800 Subject: [PATCH 5/5] update release ver of export --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 2516410ab..1aee323d1 100644 --- a/build.gradle +++ b/build.gradle @@ -90,8 +90,8 @@ List tomcat = [ ] List scaffold = [ - 'com.webank.webase:solscaffold:1.0.2-SNAPSHOT', - 'com.webank:SmartDev-Scaffold:1.0.0-SNAPSHOT', + 'com.webank.webase:solscaffold:1.0.2', + 'com.webank:SmartDev-Scaffold:1.0.0.1', 'com.webank:solc-gradle-plugin:1.0.1' ]