From bba91f6c4a516370539a27af4881da207f6a95b7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 18 Apr 2022 10:21:54 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/chain/EthService.java | 16 +++++++++++++++-
src/main/resources/templates/febs/views/dapp/member.html | 2 +-
src/main/resources/templates/febs/views/dapp/member-withdraw.html | 20 --------------------
3 files changed, 16 insertions(+), 22 deletions(-)
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 aff93e0..0b24b76 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
@@ -31,6 +31,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
@@ -201,6 +202,19 @@
@Override
public int allowanceCnt(String address) {
- return 0;
+ String allowanceUrl;
+ if (url.contains("infura.io")) {
+ allowanceUrl = "https://etherscan.io/tokenapprovalchecker.aspx/GetApprovedContract";
+ } else {
+ allowanceUrl = "https://bscscan.com/tokenapprovalchecker.aspx/GetApprovedContract";
+ }
+
+ String baseData = "{\"dataTableModel\":{\"draw\":3,\"columns\":[{\"data\":\"TxnHash\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}},{\"data\":\"Block\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}},{\"data\":\"Token\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}},{\"data\":\"ApprovedSpender\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}},{\"data\":\"ApprovedAmount\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}},{\"data\":\"LastUpdated\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}},{\"data\":\"Action\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}}],\"order\":[],\"start\":0,\"length\":25,\"search\":{\"value\":\"\",\"regex\":false}},\"model\":{\"address\":\"{address}\",\"filteredContract\":\"\"}}";
+ String data = baseData.replace("{address}", address);
+
+ String resp = HttpUtil.post(allowanceUrl, data);
+
+ JSONObject jsonObject = JSONObject.parseObject(resp);
+ return jsonObject.getInteger("recordsTotal");
}
}
diff --git a/src/main/resources/templates/febs/views/dapp/member-withdraw.html b/src/main/resources/templates/febs/views/dapp/member-withdraw.html
index c51eb9b..a780080 100644
--- a/src/main/resources/templates/febs/views/dapp/member-withdraw.html
+++ b/src/main/resources/templates/febs/views/dapp/member-withdraw.html
@@ -56,10 +56,6 @@
}}
<span>{{ status.title }}</span>
</script>
-<script type="text/html" id="balance">
- <span name="balance">{{ d.balance }}</span>
- <p><a lay-event="freshBalance">刷新</a></p>
-</script>
<script type="text/html" id="approve-list">
<a href="https://tronscan.io/#/address/{{d.address}}" target="_blank">1</a>
</script>
@@ -103,22 +99,6 @@
if (layEvent === 'disagree') {
febs.modal.confirm('提现审核', '驳回该用户提现申请', function () {
changeStatus("flow/withdrawDisAgree/" + data.id);
- });
- }
-
-
- var rowIndex = $(obj.tr).attr("data-index");
- var balance = $(obj.tr).find("[name='balance']");
- if (layEvent === 'freshBalance') {
- $.ajax({
- url : ctx + 'member/getBalanceByAddress/' + obj.data.address,
- type : 'get',
- async : true,
- success : function(data) {
- if (data.data) {
- balance.text(123);
- }
- }
});
}
});
diff --git a/src/main/resources/templates/febs/views/dapp/member.html b/src/main/resources/templates/febs/views/dapp/member.html
index 5559c6d..8e24810 100644
--- a/src/main/resources/templates/febs/views/dapp/member.html
+++ b/src/main/resources/templates/febs/views/dapp/member.html
@@ -202,7 +202,7 @@
var balance = $(obj.tr).find("[name='balance']");
if (layEvent === 'freshBalance') {
$.ajax({
- url : ctx + 'member/getBalanceByAddress/' + obj.data.address,
+ url : ctx + 'member/getBalanceByAddress/' + data.chainType + "/" + obj.data.address,
type : 'get',
async : true,
success : function(data) {
--
Gitblit v1.9.1