From 2720d8d8e2ea1a03e6dd42809d75f788349f66c8 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 12 May 2021 16:34:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/activity' into activity
---
src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java | 13 ++++++
src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java | 3 +
src/test/java/com/xcong/excoin/TrcTest.java | 48 ++++++++++++++++++++++++
3 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java b/src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java
index 2a39a9f..1aaa265 100644
--- a/src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java
+++ b/src/main/java/com/xcong/excoin/common/aop/ExceptionCatchAspect.java
@@ -17,6 +17,7 @@
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.client.ResourceAccessException;
import javax.net.ssl.SSLException;
import javax.validation.ValidationException;
@@ -51,7 +52,7 @@
@AfterThrowing(pointcut = "exceptionCatch()", throwing = "ex")
public void afterThrows(JoinPoint jp, Exception ex) throws Exception {
- if (ex instanceof GlobalException || ex instanceof MethodArgumentNotValidException || ex instanceof ValidationException || ex instanceof DuplicateKeyException || ex instanceof BadCredentialsException || ex instanceof UsernameNotFoundException || ex instanceof SSLException) {
+ if (ex instanceof ResourceAccessException || ex instanceof GlobalException || ex instanceof MethodArgumentNotValidException || ex instanceof ValidationException || ex instanceof DuplicateKeyException || ex instanceof BadCredentialsException || ex instanceof UsernameNotFoundException || ex instanceof SSLException) {
throw ex;
}
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 7393792..fbe30a5 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
@@ -1,6 +1,8 @@
package com.xcong.excoin.modules.blackchain.service;
import cn.hutool.core.math.MathUtil;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -167,7 +169,8 @@
Map<String, Object> map = new HashMap<>();
map.put("num", num);
String param = JSON.toJSONString(map);
- return postForEntity(url, param).getBody();
+// return postForEntity(url, param).getBody();
+ return postForEntityHuTool(url, param).body();
}
@@ -208,6 +211,14 @@
return result;
}
+ private static HttpResponse postForEntityHuTool(String url, String param) {
+ 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)
+ .execute();
+ }
+
/**
* 比对本地地址 同步充值USDT-TRC20
*
diff --git a/src/test/java/com/xcong/excoin/TrcTest.java b/src/test/java/com/xcong/excoin/TrcTest.java
new file mode 100644
index 0000000..85ae927
--- /dev/null
+++ b/src/test/java/com/xcong/excoin/TrcTest.java
@@ -0,0 +1,48 @@
+package com.xcong.excoin;
+
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.xcong.excoin.modules.blackchain.service.Trc20Service;
+import com.xcong.excoin.utils.RedisUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author wzy
+ * @date 2021-05-04
+ **/
+@Slf4j
+@SpringBootTest
+public class TrcTest {
+
+ @Autowired
+ private RedisUtils redisUtils;
+
+ @Test
+ public void trc20Test() {
+ String url = "https://api.trongrid.io/wallet/getblockbynum";
+
+ while(true) {
+ Object current = redisUtils.get("USDT_TRC20_CURRENT_BLOCK_NUM");
+ Map<String, Object> map = new HashMap<>();
+ map.put("num", current);
+ String param = JSON.toJSONString(map);
+ System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2");
+ HttpResponse response = HttpUtil.createPost(url).body(param).contentType("application/json").header("TRON-PRO-API-KEY", Trc20Service.API_KEY).execute();
+// log.info(response.body());
+
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
--
Gitblit v1.9.1