From f6a912c1a6a26c809568f964941fb4ad4483274e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 31 May 2021 11:19:40 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 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 b386fe8..342ecde 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
@@ -1,19 +1,20 @@
package com.xcong.excoin.quartz.job;
-import com.xcong.excoin.common.enumerates.CoinTypeEnum;
+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.modules.member.dao.MemberCoinAddressDao;
-import com.xcong.excoin.modules.member.entity.MemberCoinAddressEntity;
+import com.xcong.excoin.rabbit.producer.UsdtUpdateProducer;
import com.xcong.excoin.utils.RedisUtils;
-import org.apache.commons.collections.CollectionUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestClientException;
import javax.annotation.Resource;
-import java.util.List;
+import java.util.concurrent.ConcurrentLinkedQueue;
/**
* 链上币种同步任务
@@ -21,6 +22,7 @@
* @author wzy
* @date 2020-07-02
**/
+@Slf4j
@Component
@ConditionalOnProperty(prefix = "app", name = "block-job", havingValue = "true")
public class BlockCoinUpdateJob {
@@ -34,21 +36,68 @@
@Resource
RedisUtils redisUtils;
+ @Autowired
+ private UsdtUpdateProducer usdtUpdateProducer;
+
+
+ public static ConcurrentLinkedQueue<Long> TRC_BLOCK = new ConcurrentLinkedQueue<>();
+
/**
* TRC20_USDT 同步
*/
- @Scheduled(cron = "0/3 * * * * ? ")
- @Async
+ @Scheduled(cron = "0/2 * * * * ? ")
+// @Async
public void usdtTc20Update() {
// 波场3秒出一个块
- trxUsdtUpdateService.monitorCoinListener();
+ Long blocnNum = TRC_BLOCK.poll();
+ if (blocnNum == null) {
+ return;
+ }
+ usdtUpdateProducer.sendTrc20BlockMsg(blocnNum.toString());
+ redisUtils.set("USDT_TRC20_CURRENT_BLOCK_NUM", blocnNum);
+// try {
+// trxUsdtUpdateService.monitorCoinListener(blocnNum);
+// } catch (RestClientException | HttpException e) {
+// // 此时是连接问题 这个块需要重新扫描
+// log.info("查询区块超时：" + blocnNum);
+// TRC_BLOCK.add(blocnNum);
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+
+ }
+
+ @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) {
+ // 没有则取最新的块
+ trc20BlockNum = getnowblock;
+ redisUtils.set("USDT_TRC20_BLOCK_NUM", getnowblock);
+ }
+ Long blockNum = Long.valueOf(trc20BlockNum.toString());
+ if (getnowblock <= blockNum) {
+ // 如果当前区块比最新已确认区块还大，则不继续执行
+ return;
+ }
+ // 得到最新区块和当前区块的差值
+ Long diff = getnowblock-blockNum;
+ for(long i=1;i<=diff;i++){
+ blockNum++;
+ TRC_BLOCK.add(blockNum);
+ }
+ // 将最新的最大区块放入redis
+ redisUtils.set("USDT_TRC20_BLOCK_NUM", blockNum);
}
/**
* ETH_USDT 同步 使用扫块 废弃这个定时任务
*/
//@Scheduled(cron = "0 0/10 * * * ? ")
- @Deprecated
+ //@Deprecated
public void ethUsdtUpdate() {
blockCoinService.updateEthUsdt();
}
@@ -56,7 +105,7 @@
/**
* eth 同步
*/
- @Scheduled(cron = "0 1/20 * * * ? ")
+// @Scheduled(cron = "0 1/20 * * * ? ")
public void ethUpdate() {
blockCoinService.updateEth();
}
--
Gitblit v1.9.1