From e1048126f8b32d263b92ffd891aaeb56e9de6a50 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Dec 2022 10:52:16 +0800
Subject: [PATCH] Merge branch 'BNBWEB' of http://120.27.238.55:7000/r/sys-dapp into BNBWEB

---
 src/main/java/cc/mrbird/febs/job/ChainListenerJob.java |   24 ++++--------------------
 1 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java b/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java
index c1efb2c..cc656a5 100644
--- a/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java
+++ b/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java
@@ -2,6 +2,7 @@
 
 import cc.mrbird.febs.common.contants.AppContants;
 import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.dapp.chain.BaseCoinService;
 import cc.mrbird.febs.dapp.chain.ChainEnum;
 import cc.mrbird.febs.dapp.chain.ChainService;
 import cc.mrbird.febs.dapp.chain.ContractEventService;
@@ -23,17 +24,13 @@
 public class ChainListenerJob implements ApplicationRunner {
 
     @Autowired
-    private ContractEventService bscCoinContractEvent;
-
-    @Autowired
-    private ContractEventService bscUsdtContractEvent;
+    private BaseCoinService baseCoinService;
 
     @Autowired
     private RedisUtils redisUtils;
 
     @Scheduled(cron = "0 0/5 * * * ? ")
     public void chainBlockUpdate() {
-        log.info("最新区块更新");
         BigInteger blockNumber = ChainService.getInstance(ChainEnum.BSC_TFC.name()).blockNumber();
 
         redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_NEWEST_NUM, blockNumber);
@@ -72,27 +69,14 @@
         log.info("区块链监听开始启动");
         Object incrementObj = redisUtils.get(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM);
         BigInteger newest = ChainService.getInstance(ChainEnum.BSC_TFC.name()).blockNumber();
-        BigInteger block;
+        BigInteger block = null;
         if (incrementObj == null) {
             block = newest;
         } else {
             block = (BigInteger) incrementObj;
         }
 
-        BigInteger section = BigInteger.valueOf(5000);
-        while (newest.subtract(block).compareTo(section) > -1) {
-            BigInteger end = block.add(section);
-            log.info("监听:[{} - {}]", block, end);
-            ChainService.contractEventListener(block, end, bscUsdtContractEvent, ChainEnum.BSC_USDT.name());
-            ChainService.contractEventListener(block, end, bscCoinContractEvent, ChainEnum.BSC_TFC.name());
-
-            block = block.add(section);
-            if (block.compareTo(newest) > 0) {
-                block = newest;
-            }
-        }
-        ChainService.contractEventListener(block, bscUsdtContractEvent, ChainEnum.BSC_USDT.name());
-        ChainService.contractEventListener(block, bscCoinContractEvent, ChainEnum.BSC_TFC.name());
+        ChainService.wssBaseCoinEventListener(block, baseCoinService);
 
         long end = System.currentTimeMillis();
         log.info("区块链监听启动完成, 消耗时间{}", end - start);

--
Gitblit v1.9.1