From 6cc49e252929c182f0e47e4b79089cd51e1465ab Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 15 Nov 2022 11:29:33 +0800
Subject: [PATCH] Merge branch 'IGT-dev' of http://120.27.238.55:7000/r/sys-dapp into IGT-dev
---
src/main/java/cc/mrbird/febs/dapp/chain/ChainConstants.java | 1 +
src/main/java/cc/mrbird/febs/rabbit/consumer/UsdtUpdateConsumer.java | 11 +++++++----
src/test/java/cc/mrbird/febs/ChainTest.java | 8 ++++----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainConstants.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainConstants.java
index 6747f49..84f97c1 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainConstants.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainConstants.java
@@ -3,4 +3,5 @@
public interface ChainConstants {
public static final String REDIS_KEY_POOL_ADDRESS = "TRC20_POOL";
+ String REDIS_KEY_ADDRESS_LIST = "TRC20_ADDRESS_LIST";
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/consumer/UsdtUpdateConsumer.java b/src/main/java/cc/mrbird/febs/rabbit/consumer/UsdtUpdateConsumer.java
index f5d613c..eff7ad4 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/consumer/UsdtUpdateConsumer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/consumer/UsdtUpdateConsumer.java
@@ -1,9 +1,7 @@
package cc.mrbird.febs.rabbit.consumer;
-import cc.mrbird.febs.dapp.chain.BlockCoinService;
-import cc.mrbird.febs.dapp.chain.Trc20Service;
-import cc.mrbird.febs.dapp.chain.TrxUsdtUpdateService;
-import cc.mrbird.febs.dapp.chain.UsdtErc20UpdateService;
+import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.dapp.chain.*;
import cc.mrbird.febs.dapp.chain.entity.EthUsdtChargeDto;
import cc.mrbird.febs.dapp.service.ApiIgtOnHookPlanService;
import cc.mrbird.febs.job.BlockCoinUpdateJob;
@@ -39,6 +37,9 @@
@Resource
TrxUsdtUpdateService trxUsdtUpdateService;
+
+ @Resource
+ private RedisUtils redisUtils;
@RabbitListener(queues = RabbitMqConfig.MEMBER_COIN_INSIDE_QUEUE)
public void memberCoinInside(Long withdrawId) {
@@ -80,7 +81,9 @@
String address = split[0];
String tag = split[1];
if("TRC20".equals(tag)){
+ log.info("添加地址成功:{}", address);
TrxUsdtUpdateService.addressList.add(address);
+ redisUtils.lSet(ChainConstants.REDIS_KEY_ADDRESS_LIST, TrxUsdtUpdateService.addressList);
// 此时还需要给这个地址转账用于激活及后续手续费
Trc20Service.sendTrx(Trc20Service.TRX_PRIVATE_KEY,address,new BigDecimal(10));
}
diff --git a/src/test/java/cc/mrbird/febs/ChainTest.java b/src/test/java/cc/mrbird/febs/ChainTest.java
index 11b245f..8a3870f 100644
--- a/src/test/java/cc/mrbird/febs/ChainTest.java
+++ b/src/test/java/cc/mrbird/febs/ChainTest.java
@@ -189,16 +189,16 @@
// trxUsdtUpdateService.monitorCoinListener(45548841L);
// }
- @Autowired
- NotionalPoolingJob notionalPoolingJob;
+// @Autowired
+// NotionalPoolingJob notionalPoolingJob;
// @Test
// public void poolTest() {
// notionalPoolingJob.poolUsdtTrc20();
// }
- @Autowired
- RedisUtils redisUtils;
+// @Autowired
+// RedisUtils redisUtils;
// @Test
// public void redisTest() {
--
Gitblit v1.9.1