From 495e9dcc80d830d9da9ad677f5c245b5fc4cbfa6 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 22 Apr 2021 14:28:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/activity' into activity
---
src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java | 69 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 19 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 6d5f3d4..145d71d 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
@@ -6,13 +6,17 @@
import com.xcong.excoin.modules.member.dao.MemberCoinAddressDao;
import com.xcong.excoin.modules.member.entity.MemberCoinAddressEntity;
import com.xcong.excoin.utils.RedisUtils;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
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 javax.annotation.Resource;
+import java.util.LinkedList;
import java.util.List;
+import java.util.concurrent.ConcurrentLinkedQueue;
/**
* 链上币种同步任务
@@ -20,8 +24,9 @@
* @author wzy
* @date 2020-07-02
**/
+@Slf4j
@Component
-@ConditionalOnProperty(prefix = "app", name = "block-job", havingValue = "true")
+//@ConditionalOnProperty(prefix = "app", name = "block-job", havingValue = "true")
public class BlockCoinUpdateJob {
@Resource
@@ -32,31 +37,56 @@
@Resource
RedisUtils redisUtils;
+
+ // 创世区块时间 ，每三秒出一个块
+ private final static Long TRX_CSQK=1530442002L;
+
+ public static ConcurrentLinkedQueue<Long> TRC_BLOCK = new ConcurrentLinkedQueue<>();
+
/**
* TRC20_USDT 同步
*/
@Scheduled(cron = "0/3 * * * * ? ")
+ @Async
public void usdtTc20Update() {
- // 需要加锁
- boolean lock = redisUtils.setNotExist("USDT_TRC20_UPDATE", 1, 30);
- if(lock){
- try{
- trxUsdtUpdateService.monitorCoinListener();
- } catch (Exception e){
- e.printStackTrace();
- }finally {
- // 若异常 需要删除
- redisUtils.del("USDT_TRC20_UPDATE");
- }
+ // 波场3秒出一个块
+ Long blocnNum = TRC_BLOCK.poll();
+ if(blocnNum==null){
+ return;
}
-
+ 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;
+ // 生成块到队列
+ 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;
+ }
+ // 将得到的区块+1 放入队列
+ TRC_BLOCK.add(blockNum+1L);
+ redisUtils.incr("USDT_TRC20_BLOCK_NUM",1);
+ }
/**
* ETH_USDT 同步 使用扫块 废弃这个定时任务
*/
//@Scheduled(cron = "0 0/10 * * * ? ")
- @Deprecated
+ //@Deprecated
public void ethUsdtUpdate() {
blockCoinService.updateEthUsdt();
}
@@ -64,7 +94,7 @@
/**
* eth 同步
*/
- @Scheduled(cron = "0 1/20 * * * ? ")
+// @Scheduled(cron = "0 1/20 * * * ? ")
public void ethUpdate() {
blockCoinService.updateEth();
}
@@ -72,24 +102,25 @@
/**
* BTC_USDT 同步
*/
- @Scheduled(cron = "0 2/10 * * * ? ")
+// @Scheduled(cron = "0 2/10 * * * ? ")
public void btcUsdtUpdate() {
blockCoinService.updateBtcUsdt();
}
- @Scheduled(cron = "0 3/20 * * * ? ")
+ // @Scheduled(cron = "0 3/20 * * * ? ")
public void btcUpdate() {
blockCoinService.updateBtc();
}
- @Scheduled(cron = "0 4/20 * * * ? ")
+ // @Scheduled(cron = "0 4/20 * * * ? ")
public void eosUpdate() {
blockCoinService.updateEos();
}
- @Scheduled(cron = "0 6/20 * * * ? ")
+ // @Scheduled(cron = "0 6/20 * * * ? ")
public void xrpUpdate() {
blockCoinService.updateXrp();
}
+
}
--
Gitblit v1.9.1