From bad17a64583a17b201c919a817180fece72148cc Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 31 Oct 2022 23:10:47 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java | 6 +++---
src/test/java/cc/mrbird/febs/ChainTest.java | 5 +++++
src/main/java/cc/mrbird/febs/job/NotionalPoolingJob.java | 2 +-
src/main/java/cc/mrbird/febs/dapp/chain/Trc20Service.java | 2 ++
src/main/java/cc/mrbird/febs/dapp/chain/TrxService.java | 17 -----------------
5 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/Trc20Service.java b/src/main/java/cc/mrbird/febs/dapp/chain/Trc20Service.java
index 869b1d7..576a65e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/Trc20Service.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/Trc20Service.java
@@ -25,7 +25,9 @@
public final static String TRX_ADDRESS = "TEYXcnHQfcGGGQ1zdcdx9aMbWUf3vBFj1k";
public final static String POOL_ADDRESS = "TZ4LNanau13XFDZGiXiVmamTKn6q8jawiB";
+ // 波场限制最高请求数量10万，使用两个api_key 分担请求流量
public final static String API_KEY="9d461be6-9796-47b9-85d8-b150cbabbb54";
+ public final static String API_KEY_BLOCK="0492c860-cc93-4a69-a3ff-dcf607b80522";
/**
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/TrxService.java b/src/main/java/cc/mrbird/febs/dapp/chain/TrxService.java
index d093fba..470bf20 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/TrxService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/TrxService.java
@@ -20,26 +20,9 @@
**/
public class TrxService implements ContractChainService {
-// private final static String ADDRESS = "TUy8XwDmdsDKPLDGUrGuNRVMhwSEKtkDcD";
-// private final static String PRIVATE = "b5627861c6edb2245276273e5f5ad5082f93c3b09fc7b757223ca8526504bfe7";
-
private final String ADDRESS;
-// private final String ADDRESS = "TUFzqZRpLwLWJU4jcdf77RKS3Ts2uEhmWL";
-// private final static String PRIVATE = "e08dce7a4626f97b790e791bcdec31cffab46233744bb1aa133f69f98623d3fb";
-//
-// private final static String CONTRACT_ADDRESS = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t";
-// private final static String API_KEY = "9d461be6-9796-47b9-85d8-b150cbabbb54";
private Trc20Contract contract = null;
-
-// public static TrxService INSTANCE = new TrxService();
-
-// public TrxService() {
-// ApiWrapper wrapper = ApiWrapper.ofMainnet(PRIVATE, API_KEY);
-//
-// Contract trc20Contract = wrapper.getContract(CONTRACT_ADDRESS);
-// contract = new Trc20Contract(trc20Contract, ADDRESS, wrapper);
-// }
public TrxService(String address, String privateKey, String contractAddress, String apiKey) {
this.ADDRESS = address;
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java b/src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java
index d63254b..d0bfbb1 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java
@@ -203,7 +203,7 @@
RestTemplate restTemplate = new RestTemplate(factory);
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
- headers.set("TRON-PRO-API-KEY", Trc20Service.API_KEY);
+ headers.set("TRON-PRO-API-KEY", Trc20Service.API_KEY_BLOCK);
HttpEntity<String> request = new HttpEntity<>(param, headers);
ResponseEntity<String> result = restTemplate.postForEntity(url, request, String.class);
// System.out.println("url:" + url + ",param:" + param + ",result:" + result.getBody());
@@ -214,7 +214,7 @@
System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2");
return HttpUtil.createPost(url).body(param)
.timeout(20000).contentType("application/json")
- .header("TRON-PRO-API-KEY", Trc20Service.API_KEY)
+ .header("TRON-PRO-API-KEY", Trc20Service.API_KEY_BLOCK)
.execute();
}
@@ -349,7 +349,7 @@
RestTemplate restTemplate = new RestTemplate();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
- headers.set("TRON-PRO-API-KEY", Trc20Service.API_KEY);
+ headers.set("TRON-PRO-API-KEY", Trc20Service.API_KEY_BLOCK);
HttpEntity<String> request = new HttpEntity<>(headers);
ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.GET, request, String.class);
String forObject = exchange.getBody();
diff --git a/src/main/java/cc/mrbird/febs/job/NotionalPoolingJob.java b/src/main/java/cc/mrbird/febs/job/NotionalPoolingJob.java
index 97edf96..e17e528 100644
--- a/src/main/java/cc/mrbird/febs/job/NotionalPoolingJob.java
+++ b/src/main/java/cc/mrbird/febs/job/NotionalPoolingJob.java
@@ -68,7 +68,7 @@
/**
* 归集TRC20
*/
- @Scheduled(cron = "0 1/5 * * * ? ")
+ @Scheduled(cron = "0 0/10 * * * ? ")
public void poolUsdtTrc20() {
log.info("归集TRC20执行");
Object trc20_pool = redisUtils.get("TRC20_POOL");
diff --git a/src/test/java/cc/mrbird/febs/ChainTest.java b/src/test/java/cc/mrbird/febs/ChainTest.java
index 5c8a887..48317b3 100644
--- a/src/test/java/cc/mrbird/febs/ChainTest.java
+++ b/src/test/java/cc/mrbird/febs/ChainTest.java
@@ -181,4 +181,9 @@
public void poolByAddressTest() {
trxUsdtUpdateService.poolByAddress("TNmohnmZLqrPWNqT98CA8ZgmRdhMzSa4Z6");
}
+
+ @Test
+ public void blockMsgTest() {
+ trxUsdtUpdateService.monitorCoinListener(45548841L);
+ }
}
--
Gitblit v1.9.1