From 4a1e4abf6ed1deafdb293d3aa85d099ef5c63a1a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 14 Jun 2022 11:28:23 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/job/ChainListenerJob.java |   78 ++++++++++++++++++++-------------------
 1 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java b/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java
index 4a25c8a..c1efb2c 100644
--- a/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java
+++ b/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java
@@ -7,6 +7,8 @@
 import cc.mrbird.febs.dapp.chain.ContractEventService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -18,7 +20,7 @@
 @Slf4j
 @Component
 @ConditionalOnProperty(prefix = "system", name = "chain-listener", havingValue = "true")
-public class ChainListenerJob {
+public class ChainListenerJob implements ApplicationRunner {
 
     @Autowired
     private ContractEventService bscCoinContractEvent;
@@ -29,8 +31,43 @@
     @Autowired
     private RedisUtils redisUtils;
 
-    @PostConstruct
-    public void chainListenerJob() {
+    @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);
+    }
+
+    @Scheduled(cron = "0/2 * * * * ? ")
+    public void chainIncrementBlock() {
+        Object newestBlockObj = redisUtils.get(AppContants.REDIS_KEY_BLOCK_ETH_NEWEST_NUM);
+        BigInteger newestBlock;
+        if (newestBlockObj == null) {
+            newestBlock = ChainService.getInstance(ChainEnum.BSC_TFC.name()).blockNumber();
+        } else {
+            newestBlock = (BigInteger) newestBlockObj;
+        }
+
+        Object incrementObj = redisUtils.get(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM);
+        BigInteger toIncrement;
+        if (incrementObj == null) {
+            toIncrement = newestBlock;
+        } else {
+            BigInteger incrementBlock = (BigInteger) incrementObj;
+
+            // 最新区块小于增加区块
+            if (newestBlock.compareTo(incrementBlock) <= 0) {
+                return;
+            }
+            toIncrement = incrementBlock.add(BigInteger.ONE);
+        }
+
+        redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM, toIncrement);
+    }
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
         long start = System.currentTimeMillis();
         log.info("区块链监听开始启动");
         Object incrementObj = redisUtils.get(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM);
@@ -60,39 +97,4 @@
         long end = System.currentTimeMillis();
         log.info("区块链监听启动完成, 消耗时间{}", end - start);
     }
-
-    @Scheduled(cron = "0 0/5 * * * ? ")
-    public void chainBlockUpdate() {
-        BigInteger blockNumber = ChainService.getInstance(ChainEnum.BSC_TFC.name()).blockNumber();
-
-        redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_NEWEST_NUM, blockNumber);
-    }
-
-    @Scheduled(cron = "0/2 * * * * ? ")
-    public void chainIncrementBlock() {
-        Object newestBlockObj = redisUtils.get(AppContants.REDIS_KEY_BLOCK_ETH_NEWEST_NUM);
-        BigInteger newestBlock;
-        if (newestBlockObj == null) {
-            newestBlock = ChainService.getInstance(ChainEnum.BSC_TFC.name()).blockNumber();
-        } else {
-            newestBlock = (BigInteger) newestBlockObj;
-        }
-
-        Object incrementObj = redisUtils.get(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM);
-        BigInteger toIncrement;
-        if (incrementObj == null) {
-            toIncrement = newestBlock;
-        } else {
-            BigInteger incrementBlock = (BigInteger) incrementObj;
-
-            // 最新区块小于增加区块
-            if (newestBlock.compareTo(incrementBlock) < 0) {
-                return;
-            }
-            toIncrement = incrementBlock.add(BigInteger.ONE);
-        }
-
-        redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM, toIncrement);
-    }
-
 }

--
Gitblit v1.9.1