From b64e973372447a50059163016e3ce3fe56e19153 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 25 Nov 2021 16:01:24 +0800
Subject: [PATCH] Merge branch 'fish' of http://120.27.238.55:7000/r/exchange into fish
---
src/test/java/com/xcong/excoin/GuijiTest.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/test/java/com/xcong/excoin/GuijiTest.java b/src/test/java/com/xcong/excoin/GuijiTest.java
index 6b99989..baa9d9c 100644
--- a/src/test/java/com/xcong/excoin/GuijiTest.java
+++ b/src/test/java/com/xcong/excoin/GuijiTest.java
@@ -7,7 +7,9 @@
import javax.annotation.Resource;
+import com.xcong.excoin.modules.blackchain.service.TrxUsdtUpdateService;
import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
@@ -83,7 +85,7 @@
usdtStr = usdtStr.substring(0, usdtStr.lastIndexOf("."));
}
- String hash = ethService.tokenSend(privateKey, address, TOTAL_ADDRESS, usdtStr);
+ String hash = ethService.tokenSend(privateKey, address, TOTAL_ADDRESS, usdtStr,null);
System.out.println("归集："+hash);
if (StrUtil.isNotBlank(hash)) {
// 归集成功更新状态 先保存本次的hash值，待交易成功后再更新
@@ -91,7 +93,7 @@
memberCoinChargeDao.updateById(coinCharge);
}
} else {
- String hash = ethService.ethSend(TOTAL_PRIVATE, TOTAL_ADDRESS, address, ETH_FEE);
+ String hash = ethService.ethSend(TOTAL_PRIVATE, TOTAL_ADDRESS, address, ETH_FEE,null);
System.out.println("转手续费："+hash);
}
}
@@ -106,7 +108,7 @@
String toAddress = "0xbc6050a2898511bda406660267e6667448070552";
EthService ethService = new EthService();
try {
- String hash = ethService.ethSend(TOTAL_PRIVATE, TOTAL_ADDRESS, toAddress, "0.0032");
+ String hash = ethService.ethSend(TOTAL_PRIVATE, TOTAL_ADDRESS, toAddress, "0.0032",null);
System.out.println("转手续费："+hash);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
@@ -116,8 +118,18 @@
e.printStackTrace();
}
}
-
-
+
+ @Autowired
+ private TrxUsdtUpdateService trxUsdtUpdateService;
+
+ @Test
+ public void coinTest() {
+ List<String> address = new ArrayList<>();
+ address.add("TKcyw4igFYhNpTzyZv25j6uDwvTYzncnjp");
+ trxUsdtUpdateService.httpTransactionInfo(address, 20137024L);
+ }
+
+
}
--
Gitblit v1.9.1