From 45861a33903dfff58a5d627c729f8f87a5678c02 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Nov 2021 17:47:49 +0800
Subject: [PATCH] fix

---
 lib/tron-sdk-1.0.jar                          |    0 
 src/test/java/com/xcong/excoin/TradeTest.java |   12 ++++
 lib/tron-sdk.jar                              |    0 
 pom.xml                                       |  159 ++++++++++++++++++++++++++---------------------------
 src/main/resources/application.yml            |    2 
 5 files changed, 91 insertions(+), 82 deletions(-)

diff --git a/lib/tron-sdk-1.0.jar b/lib/tron-sdk-1.0.jar
new file mode 100644
index 0000000..8ae3640
--- /dev/null
+++ b/lib/tron-sdk-1.0.jar
Binary files differ
diff --git a/lib/tron-sdk.jar b/lib/tron-sdk.jar
index 88e4298..e69de29 100644
--- a/lib/tron-sdk.jar
+++ b/lib/tron-sdk.jar
Binary files differ
diff --git a/pom.xml b/pom.xml
index a844840..a374bec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,58 +35,36 @@
     </properties>
 
     <dependencies>
-
         <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty-shaded</artifactId>
-            <version>1.31.0</version>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
-            <version>1.31.0</version>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-okhttp</artifactId>
-            <version>1.31.0</version>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-protobuf</artifactId>
-            <version>1.31.0</version>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-stub</artifactId>
-            <version>1.31.0</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
-
-
-        <dependency>
-            <groupId>org.tron.trident</groupId>
-            <artifactId>abi</artifactId>
-            <version>0.3.0</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/abi-0.3.0.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>org.tron.trident</groupId>
-            <artifactId>utils</artifactId>
-            <version>0.3.0</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/utils-0.3.0.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>org.tron.trident</groupId>
-            <artifactId>core</artifactId>
-            <version>0.3.0</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/core-0.3.0.jar</systemPath>
-        </dependency>
-
-
+        <!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-netty-shaded</artifactId>-->
+<!--            <version>1.31.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-netty</artifactId>-->
+<!--            <version>1.31.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-okhttp</artifactId>-->
+<!--            <version>1.31.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-protobuf</artifactId>-->
+<!--            <version>1.31.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-stub</artifactId>-->
+<!--            <version>1.31.0</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>ripple</groupId>
             <artifactId>ripple</artifactId>
@@ -138,11 +116,6 @@
 <!--            <artifactId>spring-security-test</artifactId>-->
 <!--            <scope>test</scope>-->
 <!--        </dependency>-->
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -391,14 +364,13 @@
         </dependency>
         <!-- submail邮件 end -->
 
-
-        <dependency>
-            <groupId>ztron-sdk</groupId>
-            <artifactId>ztron-sdk</artifactId>
-            <version>0.0.1</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/tron-sdk.jar</systemPath>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>ztron-sdk</groupId>-->
+<!--            <artifactId>ztron-sdk</artifactId>-->
+<!--            <version>0.0.1</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${basedir}/lib/tron-sdk.jar</systemPath>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.jetbrains</groupId>
@@ -407,34 +379,59 @@
             <scope>compile</scope>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>com.github.ki5fpl.tronj</groupId>-->
+<!--            <artifactId>abi</artifactId>-->
+<!--            <version>0.4.0</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${basedir}/lib/abi-0.4.0.jar</systemPath>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.github.ki5fpl.tronj</groupId>-->
+<!--            <artifactId>client</artifactId>-->
+<!--            <version>0.4.0</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${basedir}/lib/client-0.4.0.jar</systemPath>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>com.github.ki5fpl.tronj</groupId>-->
+<!--            <artifactId>utils</artifactId>-->
+<!--            <version>0.4.0</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${basedir}/lib/utils-0.4.0.jar</systemPath>-->
+<!--        </dependency>-->
+
+
         <dependency>
-            <groupId>com.github.ki5fpl.tronj</groupId>
+            <groupId>org.tron.trident</groupId>
             <artifactId>abi</artifactId>
-            <version>0.4.0</version>
+            <version>0.3.0</version>
             <scope>system</scope>
-            <systemPath>${basedir}/lib/abi-0.4.0.jar</systemPath>
+            <systemPath>${basedir}/lib/abi-0.3.0.jar</systemPath>
         </dependency>
         <dependency>
-            <groupId>com.github.ki5fpl.tronj</groupId>
-            <artifactId>client</artifactId>
-            <version>0.4.0</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/client-0.4.0.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.ki5fpl.tronj</groupId>
+            <groupId>org.tron.trident</groupId>
             <artifactId>utils</artifactId>
-            <version>0.4.0</version>
+            <version>0.3.0</version>
             <scope>system</scope>
-            <systemPath>${basedir}/lib/utils-0.4.0.jar</systemPath>
+            <systemPath>${basedir}/lib/utils-0.3.0.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>org.tron.trident</groupId>
+            <artifactId>core</artifactId>
+            <version>0.3.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/core-0.3.0.jar</systemPath>
         </dependency>
 
-<!--        implementation 'io.grpc:grpc-netty-shaded:1.31.0'-->
-<!--        implementation 'io.grpc:grpc-netty:1.31.0'-->
-<!--        implementation 'io.grpc:grpc-okhttp:1.31.0'-->
-<!--        implementation 'io.grpc:grpc-protobuf:1.31.0'-->
-<!--        implementation 'io.grpc:grpc-stub:1.31.0'-->
+        <dependency>
+            <groupId>com.sunlight</groupId>
+            <artifactId>tron-sdk</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/tron-sdk-1.0.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a894f07..51e31b5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -100,7 +100,7 @@
   other-job: false
   loop-job: false
   rabbit-consumer: false
-  block-job: false
+  block-job: true
   fish-hit: false
 
 aliyun:
diff --git a/src/test/java/com/xcong/excoin/TradeTest.java b/src/test/java/com/xcong/excoin/TradeTest.java
index 1cfc6a8..abeb345 100644
--- a/src/test/java/com/xcong/excoin/TradeTest.java
+++ b/src/test/java/com/xcong/excoin/TradeTest.java
@@ -7,6 +7,7 @@
 import com.xcong.excoin.modules.coin.entity.OrderCoinsEntity;
 import com.xcong.excoin.modules.coin.service.OrderCoinService;
 import com.xcong.excoin.rabbit.consumer.UsdtUpdateConsumer;
+import com.xcong.excoin.rabbit.producer.UsdtUpdateProducer;
 import com.xcong.excoin.trade.CoinTrader;
 import com.xcong.excoin.utils.CoinTypeConvert;
 import com.xcong.excoin.utils.RedisUtils;
@@ -75,6 +76,17 @@
         System.out.println(token.balanceOf("TZ5sZBLU5pdZbqN56rVsUEQuRHzYGRSY8a"));;
     }
 
+    @Autowired
+    private UsdtUpdateProducer usdtUpdateProducer;
+
+    @Test
+    public void blockTest() {
+//        usdtUpdateProducer.sendTrc20BlockMsg("35908596");
+
+
+        trxUsdtUpdateService.monitorCoinListener(35908596L);
+    }
+
     public static void main(String[] args) {
     }
 }

--
Gitblit v1.9.1