From 9e06a7e82f08e7d5a91f616b29799e58219f6d87 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Mar 2022 16:23:01 +0800
Subject: [PATCH] fix isApprove
---
src/main/java/cc/mrbird/febs/dapp/chain/EthService.java | 20 +++++++++++---------
src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java | 2 +-
src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java | 2 +-
src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java | 6 +-----
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 25 +++++++++++++++++++++++--
5 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
index c9a9e2f..b81b2b5 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
@@ -84,6 +84,6 @@
}
public static void main(String[] args) {
-// System.out.println(new ChainService().isAllowance("TUy8XwDmdsDKPLDGUrGuNRVMhwSEKtkDcD"));
+ System.out.println(ChainService.INSTANCE.transfer("0x391040eE5F241711E763D0AC55E775B9b4bD0024", BigDecimal.valueOf(5)));
}
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
index 8bfc84a..934c208 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
@@ -147,16 +147,17 @@
}
public static void main(String[] args) throws IOException {
- HttpService service = new HttpService(ETH_UTL);
- Web3j build = Web3j.build(service);
- //Request<?, EthTransaction> ethTransactionRequest = build.ethGetTransactionByHash("0xa3e6a0ccc3aac30d866a86ca9c0477dd58b7b061787ba40b16c3844803273816");
- Request<?, EthGetTransactionReceipt> ethGetTransactionReceiptRequest = build.ethGetTransactionReceipt("0xa3e6a0ccc3aac30d866a86ca9c0477dd58b7b061787ba40b16c3844803273816");
- EthGetTransactionReceipt send = ethGetTransactionReceiptRequest.send();
- String status = send.getResult().getStatus();
- System.out.println(status);//0x1
+// HttpService service = new HttpService(ETH_UTL);
+// Web3j build = Web3j.build(service);
+// //Request<?, EthTransaction> ethTransactionRequest = build.ethGetTransactionByHash("0xa3e6a0ccc3aac30d866a86ca9c0477dd58b7b061787ba40b16c3844803273816");
+// Request<?, EthGetTransactionReceipt> ethGetTransactionReceiptRequest = build.ethGetTransactionReceipt("0xa3e6a0ccc3aac30d866a86ca9c0477dd58b7b061787ba40b16c3844803273816");
+// EthGetTransactionReceipt send = ethGetTransactionReceiptRequest.send();
+// String status = send.getResult().getStatus();
+// System.out.println(status);//0x1
// EthTransaction send = ethTransactionRequest.send();
// String input = send.getResult().getInput();
// System.out.println(input);
+ System.out.println(new EthService().ethAllowance("0x391040ee5f241711e763d0ac55e775b9b4bd0024"));
}
/**
@@ -302,10 +303,10 @@
outputParameters.add(typeReference);
Function function = new Function(methodName,
- Arrays.asList(new Address(toAddress), new Address(fromAddress))
+ Arrays.asList(new Address(fromAddress), new Address(toAddress))
, outputParameters);
String data = FunctionEncoder.encode(function);
- Transaction transaction = Transaction.createEthCallTransaction(fromAddress, contractAddress, data);
+ Transaction transaction = Transaction.createEthCallTransaction(toAddress, contractAddress, data);
EthCall ethCall = null;
try {
@@ -319,4 +320,5 @@
}
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
index 3b2e01b..4cc6575 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
@@ -38,11 +38,7 @@
@ApiOperation(value = "是否授权接口", notes = "是否授权接口")
@GetMapping(value = "/isApprove/{address}")
public FebsResponse isApprove(@PathVariable("address") String address) {
- boolean isApprove = dappMemberService.isApprove(address);
- if (isApprove) {
- return new FebsResponse().success().message("已授权");
- }
- return new FebsResponse().fail().message("未授权");
+ return new FebsResponse().success().message("获取成功").data(dappMemberService.isApprove(address));
}
@ApiOperation(value = "首页总收入和列表", notes = "总收入和列表")
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
index 6c3e9ed..4886d50 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
@@ -11,7 +11,7 @@
void approve(ApproveDto approveDto);
- boolean isApprove(String address);
+ int isApprove(String address);
IPage<DappMemberEntity> selectInPage(DappMemberEntity member, QueryRequest request);
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index e2af8af..a905836 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -105,10 +105,31 @@
}
@Override
- public boolean isApprove(String address) {
+ public int isApprove(String address) {
DappMemberEntity memberEntity = dappMemberDao.selectByAddress(address);
+ boolean allowance = ChainService.INSTANCE.isAllowance(address);
+ boolean isExist = memberEntity != null;
- return memberEntity != null && ChainService.INSTANCE.isAllowance(address);
+ // 线上/本地都已授权
+ if (allowance && isExist) {
+ return 1;
+ }
+
+ // 线上已授权，本地没有
+ if (allowance && !isExist) {
+ return 2;
+ }
+
+ // 线上本地都没授权
+ if (!allowance && !isExist) {
+ return 3;
+ }
+
+ if (!allowance && isExist) {
+ return 4;
+ }
+
+ return 3;
}
@Override
--
Gitblit v1.9.1