From a55747a7cedc4c4f04f33755a27862c959c1ad30 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Apr 2021 11:09:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/activity' into activity
---
src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 45a7805..dd131a3 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
@@ -6,6 +6,7 @@
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;
@@ -23,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
@@ -52,18 +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){
@@ -120,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