From 4e44897b61f831d9e49f66bb35f74a877b1966fe Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sat, 20 Feb 2021 15:26:16 +0800
Subject: [PATCH] TRC20版本提交
---
src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java | 10 +++++++---
src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java | 16 +++++++++++++++-
src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java | 8 ++++----
pom.xml | 10 +++++-----
src/main/resources/application.yml | 2 +-
5 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5b99909..f1078c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,11 +224,11 @@
<version>${netty.version}</version>
</dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>${okhttp.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.squareup.okhttp3</groupId>-->
+ <!--<artifactId>okhttp</artifactId>-->
+ <!--<version>${okhttp.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>com.aliyun.oss</groupId>
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
index ac95937..679c443 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
@@ -51,14 +51,18 @@
});
}
}
- if (CollectionUtils.isEmpty(addressList)) {
- return;
- }
Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
if(trc20BlockNum==null){
trc20BlockNum = 27805917L;
+
}
Long blockNum = Long.valueOf(trc20BlockNum.toString());
+ redisUtils.set("USDT_TRC20_BLOCK_NUM",blockNum);
+ if (CollectionUtils.isEmpty(addressList)) {
+ return;
+ }
+
+
// http 请求
// httpTransactionInfo(addressList, 26599313L);
//httpTransactionInfo(addressList, 26603621L);
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java
index 4373dc0..a7e99ec 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java
@@ -35,7 +35,7 @@
public final static List<String> ALL_ADDRESS_LIST = new ArrayList<>();
- public final static String USDT_BLOCK_NUM_GOLDEN = "USDT_BLOCK_NUM_GOLDEN";
+ public final static String ETH_USDT_BLOCK_NUM = "ETH_USDT_BLOCK_NUM";
private final static BigDecimal DIVIDE_USDT = new BigDecimal("1000000");
@@ -83,9 +83,9 @@
ALL_ADDRESS_LIST.addAll(tdCoinWallets);
}
// 获取最新区块
- String string = redisUtils.getString(USDT_BLOCK_NUM_GOLDEN);
+ String string = redisUtils.getString(ETH_USDT_BLOCK_NUM);
if(string==null){
- string = "11014249";
+ string = "11892420";
}
BigInteger blockNum = new BigInteger(string);
Credentials credentials = Credentials.create(privateKey);
@@ -109,7 +109,7 @@
usdtUpdateProducer.sendMsg(JSONObject.toJSONString(dto));
}
if(map.get("blockNum").compareTo(blockNumber1)!=0){
- redisUtils.set(USDT_BLOCK_NUM_GOLDEN,blockNumber1.toString());
+ redisUtils.set(ETH_USDT_BLOCK_NUM,blockNumber1.toString());
map.put("blockNum",blockNumber1);
}
}
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 8693651..7d2dbf0 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
@@ -30,12 +30,26 @@
@Resource
private TrxUsdtUpdateService trxUsdtUpdateService;
+ @Resource
+ RedisUtils redisUtils;
/**
* ETH_USDT 同步
*/
@Scheduled(cron = "0/3 * * * * ? ")
public void usdtTc20Update() {
- trxUsdtUpdateService.monitorCoinListener();
+ // 需要加锁
+ boolean lock = redisUtils.setNotExist("USDT_TRC20_UPDATE", 1, 30);
+ if(lock){
+ try{
+ trxUsdtUpdateService.monitorCoinListener();
+ } catch (Exception e){
+ e.printStackTrace();
+ }finally {
+ // 若异常 需要删除
+ redisUtils.del("USDT_TRC20_UPDATE");
+ }
+ }
+
}
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 87e6a8e..94d4b32 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,7 +5,7 @@
spring:
profiles:
- active: dev
+ active: test
datasource:
# url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
# username: ctcoin_data
--
Gitblit v1.9.1