From 08d6ef989fbd10f3a85a119a934020361cb1d347 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 14 May 2021 10:44:37 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
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 4b2514f..d421ba1 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
@@ -1,5 +1,6 @@
package com.xcong.excoin.quartz.job;
+import cn.hutool.http.HttpException;
import com.xcong.excoin.modules.blackchain.service.TrxUsdtUpdateService;
import com.xcong.excoin.modules.coin.service.BlockCoinService;
import com.xcong.excoin.utils.RedisUtils;
@@ -21,7 +22,7 @@
**/
@Slf4j
@Component
-@ConditionalOnProperty(prefix = "app", name = "block-job", havingValue = "true")
+//@ConditionalOnProperty(prefix = "app", name = "block-job", havingValue = "true")
public class BlockCoinUpdateJob {
@Resource
@@ -50,7 +51,7 @@
redisUtils.set("USDT_TRC20_CURRENT_BLOCK_NUM", blocnNum);
try {
trxUsdtUpdateService.monitorCoinListener(blocnNum);
- } catch (RestClientException e) {
+ } catch (RestClientException | HttpException e) {
// 此时是连接问题 这个块需要重新扫描
log.info("查询区块超时：" + blocnNum);
TRC_BLOCK.add(blocnNum);
@@ -60,11 +61,11 @@
}
- @Scheduled(cron = "0/2 * * * * ? ")
+ @Scheduled(cron = "0 0/1 * * * ? ")
public void usdtTc20UpdateQueue() {
// 查询最新区块号
long getnowblock = trxUsdtUpdateService.getnowblockFromTronScan() - 25;
- // 生成块到队列
+ // 拿到redis里最新区块
Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
if (trc20BlockNum == null) {
// 没有则取最新的块
@@ -72,13 +73,18 @@
redisUtils.set("USDT_TRC20_BLOCK_NUM", getnowblock);
}
Long blockNum = Long.valueOf(trc20BlockNum.toString());
- if (getnowblock < blockNum) {
+ if (getnowblock <= blockNum) {
// 如果当前区块比最新已确认区块还大，则不继续执行
return;
}
- // 将得到的区块+1 放入队列
- TRC_BLOCK.add(blockNum + 1L);
- redisUtils.incr("USDT_TRC20_BLOCK_NUM", 1);
+ // 得到最新区块和当前区块的差值
+ Long diff = getnowblock-blockNum;
+ for(long i=1;i<=diff;i++){
+ blockNum++;
+ TRC_BLOCK.add(blockNum);
+ }
+ // 将最新的最大区块放入redis
+ redisUtils.set("USDT_TRC20_BLOCK_NUM", blockNum);
}
/**
--
Gitblit v1.9.1