From f9748a7b1d4d0c3638c758dd538459e635e92388 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Apr 2021 11:08:46 +0800
Subject: [PATCH] 优化查询最新波场区块
---
src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java | 63 ++++++++++++++++++++-----------
src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java | 23 +++++++----
2 files changed, 55 insertions(+), 31 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 226b2ac..78c4c3d 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
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.blackchain.service;
+import cn.hutool.core.math.MathUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -24,7 +25,7 @@
import java.util.*;
/**
- * TRX TRC20服务类
+ * TRX TRC20服务类
*/
@Slf4j
@Service
@@ -36,7 +37,7 @@
private static String TRC20_CONTRACT_ADDRESS = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t";
/**
- * 手续费
+ * 手续费
*/
private final static BigDecimal TRX_FEE = new BigDecimal("10");
@@ -50,7 +51,7 @@
RedisUtils redisUtils;
/**
- * 扫块 同步充值USDT-TRC20和TRX
+ * 扫块 同步充值USDT-TRC20和TRX
*/
public void monitorCoinListener(Long blockNum) {
if (CollectionUtils.isEmpty(addressList)) {
@@ -72,7 +73,8 @@
}
/**
- * 解析区块数据 同步用户充值
+ * 解析区块数据 同步用户充值
+ *
* @param addressList
* @param num
*/
@@ -119,7 +121,8 @@
/**
- * 比对本地地址 同步TRX充值
+ * 比对本地地址 同步TRX充值
+ *
* @param parseObject
*/
private void transferContract(JSONObject parseObject) {
@@ -194,15 +197,16 @@
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,headers);
+ headers.set("TRON-PRO-API-KEY", Trc20Service.API_KEY);
+ HttpEntity<String> request = new HttpEntity<>(param, headers);
ResponseEntity<String> result = restTemplate.postForEntity(url, request, String.class);
// System.out.println("url:" + url + ",param:" + param + ",result:" + result.getBody());
return result;
}
/**
- * 比对本地地址 同步充值USDT-TRC20
+ * 比对本地地址 同步充值USDT-TRC20
+ *
* @param addressList
* @param txId
* @param parseObject
@@ -264,7 +268,8 @@
}
/**
- * 根据地址归集USDT-TRC20
+ * 根据地址归集USDT-TRC20
+ *
* @param address
* @return
*/
@@ -287,20 +292,20 @@
Trc20Service.sendTrc20(coinAddressEntity.getPrivateKey(), Trc20Service.POOL_ADDRESS, trc20Balance);
// 需要将存在redis的待归集地址删除
Object trc20_pool = redisUtils.get("TRC20_POOL");
- if(trc20_pool!=null){
+ if (trc20_pool != null) {
List<String> poolList = (List) trc20_pool;
Iterator<String> iterator = poolList.iterator();
- while (iterator.hasNext()){
+ while (iterator.hasNext()) {
String next = iterator.next();
- if(address.equals(next)){
+ if (address.equals(next)) {
iterator.remove();
}
}
- if(CollectionUtils.isEmpty(poolList)) {
- redisUtils.del("TRC20_POOL");
- }else{
- redisUtils.set("TRC20_POOL", poolList);
- }
+ if (CollectionUtils.isEmpty(poolList)) {
+ redisUtils.del("TRC20_POOL");
+ } else {
+ redisUtils.set("TRC20_POOL", poolList);
+ }
}
return true;
} else {
@@ -320,15 +325,16 @@
// https://api.trongrid.io/wallet/getnowblock
/**
- * 获取最新区块
+ * 获取最新区块
+ *
* @return
*/
- public long getnowblock(){
- String url = http+"/wallet/getnowblock";
+ 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);
+ headers.set("TRON-PRO-API-KEY", Trc20Service.API_KEY);
HttpEntity<String> request = new HttpEntity<>(headers);
ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.GET, request, String.class);
String forObject = exchange.getBody();
@@ -338,6 +344,17 @@
return Long.valueOf(number);
}
-
-
+ /**
+ * 从tronscan.io查询最新区块
+ * {"whole_block_count":29625671,"whole_pay":3392835760,"last_day_pay":460432,"last_day_block_count":28777}
+ * @return
+ */
+ public Long getnowblockFromTronScan() {
+ String roundNum = Math.random() + "";
+ String url = "https://apiasia.tronscan.io:5566/api/block/statistic?randomNum=" + roundNum;
+ RestTemplate restTemplate = new RestTemplate();
+ String forObject = restTemplate.getForObject(url, String.class);
+ String wholeBlockCount = JSON.parseObject(forObject).getString("whole_block_count");
+ return Long.valueOf(wholeBlockCount);
+ }
}
diff --git a/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
index 33d6c8a..dd131a3 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
@@ -54,19 +54,17 @@
if(blocnNum==null){
return;
}
+ System.out.println(TRC_BLOCK);
redisUtils.set("USDT_TRC20_CURRENT_BLOCK_NUM",blocnNum);
+ System.out.println("扫块："+blocnNum);
trxUsdtUpdateService.monitorCoinListener(blocnNum);
}
@Scheduled(cron = "0/2 * * * * ? ")
public void usdtTc20UpdateQueue() {
- // 当前时间戳
- long currentTimeMillis = System.currentTimeMillis()/1000;
- // 计算当前最新区块
- // 波场3秒出一个块 根据创世区块的时间可以计算出当前最新区块号
- Long count = (currentTimeMillis-TRX_CSQK)/3;
- // 减去未确认的区块
- long getnowblock =count-25;
+ // 查询最新区块号
+ long getnowblock =trxUsdtUpdateService.getnowblockFromTronScan()-25;
+ System.out.println("getnowblock:"+getnowblock);
// 生成块到队列
Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
if(trc20BlockNum==null){
@@ -123,5 +121,14 @@
blockCoinService.updateXrp();
}
-
+ public static void main(String[] args) {
+ // 当前时间戳
+ long currentTimeMillis = System.currentTimeMillis()/1000;
+ // 计算当前最新区块
+ // 波场3秒出一个块 根据创世区块的时间可以计算出当前最新区块号
+ Long count = (currentTimeMillis-TRX_CSQK)/3;
+ // 减去未确认的区块
+ long getnowblock =count-25;
+ System.out.println(count);
+ }
}
--
Gitblit v1.9.1