From a4e2632242680c2af350af9ef4498413aa99dd92 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Mar 2023 16:28:50 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/chain/service/ChainService.java | 2 +-
src/test/java/cc/mrbird/febs/ProfitTest.java | 4 ++--
src/main/java/cc/mrbird/febs/mall/chain/service/BscUsdtContractEvent.java | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/chain/service/BscUsdtContractEvent.java b/src/main/java/cc/mrbird/febs/mall/chain/service/BscUsdtContractEvent.java
index 08ae3aa..cc60b74 100644
--- a/src/main/java/cc/mrbird/febs/mall/chain/service/BscUsdtContractEvent.java
+++ b/src/main/java/cc/mrbird/febs/mall/chain/service/BscUsdtContractEvent.java
@@ -55,10 +55,10 @@
String address = e.to;
String hash = e.log.getTransactionHash();
-
- Set<Object> addressList = redisUtils.sGet(ChainConstants.REDIS_KEY_SYSTEM_ADDRESS);
+ List<String> tdCoinWallets = memberCoinAddressDao.selectAllSymbolAddress(CoinTypeEnum.USDT.toString(),"ERC20");
+// Set<Object> addressList = redisUtils.sGet(ChainConstants.REDIS_KEY_SYSTEM_ADDRESS);
// 判断对方打款地址是否为源池地址
- if(CollUtil.isNotEmpty(addressList) && addressList.contains(address)){
+ if(CollUtil.isNotEmpty(tdCoinWallets) && tdCoinWallets.contains(address)){
log.info("触发USDT合约监听事件");
// redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM, e.log.getBlockNumber());
// hash没有用过
diff --git a/src/main/java/cc/mrbird/febs/mall/chain/service/ChainService.java b/src/main/java/cc/mrbird/febs/mall/chain/service/ChainService.java
index 295e271..04737bf 100644
--- a/src/main/java/cc/mrbird/febs/mall/chain/service/ChainService.java
+++ b/src/main/java/cc/mrbird/febs/mall/chain/service/ChainService.java
@@ -194,7 +194,7 @@
try{
// 等待订阅事件流的线程结束，然后关闭连接和释放资源
executor.schedule(ws::close, 1, TimeUnit.SECONDS);
- executor.awaitTermination(2, TimeUnit.SECONDS);
+ executor.awaitTermination(10, TimeUnit.SECONDS);
subscribe.dispose();
} catch (InterruptedException e) {
e.printStackTrace();
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index 882ede7..9ff78b3 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -509,8 +509,8 @@
} else {
block = newest;
}
- ChainService.wssBaseCoinEventListener(block, baseCoinService);
-// ChainService.wssContractEventListener2(block, bscUsdtContractEvent, ChainEnum.BSC_USDT.name());
+// ChainService.wssBaseCoinEventListener(BigInteger.valueOf(26737044), baseCoinService);
+ ChainService.wssContractEventListener2(BigInteger.valueOf(26737044), bscUsdtContractEvent, ChainEnum.BSC_USDT.name());
}
//
// @Test
--
Gitblit v1.9.1