From a3243dabdec4b7c730002e98e9300a37f8f9930e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 02 Nov 2022 15:17:39 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

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 0a0cbab..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();
     }
 
@@ -288,6 +288,11 @@
      * @return
      */
     public boolean poolByAddress(String address) {
+        BigDecimal trc20Balance = Trc20Service.getTrc20Balance(address);
+        if (trc20Balance == null) {
+            return false;
+        }
+
         // 首先查询trx余额
         BigDecimal trxBalance = Trc20Service.getTrxBalance(address);
         if (trxBalance == null) {
@@ -295,10 +300,6 @@
         }
         if (trxBalance.compareTo(TRX_FEE) >= 0) {
             // 转
-            BigDecimal trc20Balance = Trc20Service.getTrc20Balance(address);
-            if (trc20Balance == null) {
-                return false;
-            }
             MemberCoinAddressEntity coinAddressEntity = memberCoinAddressDao.selectCoinAddressByAddressAndSymbolTag(address, "USDT", "TRC20");
             if (coinAddressEntity == null) {
                 return false;
@@ -348,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();

--
Gitblit v1.9.1