From 6941f2c4f33359d8746bc1388fb67e1995f96129 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Mar 2021 17:46:24 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
index 3424be1..d1cd4b1 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
@@ -63,13 +63,19 @@
}
}
// 扫块区块
- Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
+ Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
if(trc20BlockNum==null){
- trc20BlockNum = 28095275L;
+ trc20BlockNum = 28471475L;
}
Long blockNum = Long.valueOf(trc20BlockNum.toString());
redisUtils.set("USDT_TRC20_BLOCK_NUM",blockNum);
+ // 查询一下最新区块
+ long getnowblock = getnowblock()-20L;
+ if(getnowblock<blockNum){
+ // 如果当前区块比最新已确认区块还大，则不继续执行
+ return;
+ }
if (CollectionUtils.isEmpty(addressList)) {
return;
}
@@ -77,7 +83,7 @@
// 解析区块
httpTransactionInfo(addressList, blockNum);
- redisUtils.set("USDT_TRC20_BLOCK_NUM", (blockNum + 1L));
+
}
/**
@@ -90,11 +96,17 @@
if (StringUtils.isBlank(transactionInfoByBlockNum)) {
return;
}
+ // 不用等到扫完再累加 只要进来就加 还有一个条件是必须查询出区块再加 否则当区块超过实际区块
+ redisUtils.set("USDT_TRC20_BLOCK_NUM", (num + 1L));
JSONArray parseArray = JSON.parseArray(transactionInfoByBlockNum);
if (parseArray.size() > 0) {
for (Object e : parseArray) {
try {
String txId = JSON.parseObject(e.toString()).getString("id");
+ String contract_address = JSON.parseObject(e.toString()).getString("contract_address");
+ if(!"41a614f803b6fd780986a42c78ec9c7f77e6ded13c".equals(contract_address)){
+ continue;
+ }
//判断 数据库 txId 有 就不用往下继续了
JSONObject parseObject = JSON.parseObject(getTransactionById(txId));
String contractRet = parseObject.getJSONArray("ret").getJSONObject(0).getString("contractRet");
@@ -180,6 +192,7 @@
RestTemplate restTemplate = new RestTemplate();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
+ headers.set("TRON-PRO-API-KEY",Trc20Service.API_KEY);
HttpEntity<String> request = new HttpEntity<>(param);
ResponseEntity<String> result = restTemplate.postForEntity(url, request, String.class);
// System.out.println("url:" + url + ",param:" + param + ",result:" + result.getBody());
@@ -301,4 +314,23 @@
return true;
}
}
+
+ // https://api.trongrid.io/wallet/getnowblock
+
+ /**
+ * 获取最新区块
+ * @return
+ */
+ public long getnowblock(){
+ String url = http+"/wallet/getnowblock";
+ RestTemplate restTemplate = new RestTemplate();
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ headers.set("TRON-PRO-API-KEY",Trc20Service.API_KEY);
+ //HttpEntity<String> request = new HttpEntity<>();
+ String forObject = restTemplate.getForObject(url, String.class);
+ String number = JSON.parseObject(forObject).getJSONObject("block_header").getJSONObject("raw_data").getString("number");
+ return Long.valueOf(number);
+ }
+
}
--
Gitblit v1.9.1