From 03bd618f5f3055f0a558a65b28a67fd604b27a1e Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 22 Oct 2022 23:49:46 +0800
Subject: [PATCH] fxi

---
 src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java                            |   56 +++++++++---------
 src/main/java/cc/mrbird/febs/job/BlockCoinUpdateJob.java                        |    1 
 src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java |    1 
 src/main/resources/application-test.yml                                         |    2 
 pom.xml                                                                         |   83 +++++++++++++++------------
 5 files changed, 77 insertions(+), 66 deletions(-)

diff --git a/pom.xml b/pom.xml
index 32cf69d..ec1ab2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
         <tomcat.version>9.0.31</tomcat.version>
         <hutool.version>5.3.1</hutool.version>
         <aliyun-oss.version>3.8.0</aliyun-oss.version>
+        <netty.version>4.1.33.Final</netty.version>
     </properties>
 
     <dependencies>
@@ -259,49 +260,59 @@
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
 
+
+<!--        <dependency>-->
+<!--            <groupId>io.netty</groupId>-->
+<!--            <artifactId>netty-all</artifactId>-->
+<!--            <version>${netty.version}</version>-->
+<!--        </dependency>-->
+
+
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-core</artifactId>
             <version>3.9.7</version>
             <!--            <scope>runtime</scope>-->
         </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty-shaded</artifactId>
-            <version>1.31.0</version>
-            <!--            <scope>runtime</scope>-->
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
-            <version>1.31.0</version>
-            <!--            <scope>runtime</scope>-->
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-okhttp</artifactId>
-            <version>1.31.0</version>
-            <!--            <scope>runtime</scope>-->
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-protobuf</artifactId>
-            <version>1.37.0</version>
-            <!--                    <scope>runtime</scope>-->
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-netty-shaded</artifactId>-->
+<!--            <version>1.31.0</version>-->
+<!--            &lt;!&ndash;            <scope>runtime</scope>&ndash;&gt;-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-netty</artifactId>-->
+<!--            <version>1.31.0</version>-->
+<!--            &lt;!&ndash;            <scope>runtime</scope>&ndash;&gt;-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-okhttp</artifactId>-->
+<!--            <version>1.31.0</version>-->
+<!--            &lt;!&ndash;            <scope>runtime</scope>&ndash;&gt;-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-protobuf</artifactId>-->
+<!--            <version>1.37.0</version>-->
+<!--            &lt;!&ndash;                    <scope>runtime</scope>&ndash;&gt;-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-stub</artifactId>
-            <version>1.37.0</version>
-            <!--                      <scope>runtime</scope>-->
-        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java-util</artifactId>
-            <version>3.11.0</version>
-            <!--            <scope>runtime</scope>-->
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>io.grpc</groupId>-->
+<!--            <artifactId>grpc-stub</artifactId>-->
+<!--            <version>1.37.0</version>-->
+<!--            &lt;!&ndash;                      <scope>runtime</scope>&ndash;&gt;-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.google.protobuf</groupId>-->
+<!--            <artifactId>protobuf-java-util</artifactId>-->
+<!--            <version>3.11.0</version>-->
+<!--            &lt;!&ndash;            <scope>runtime</scope>&ndash;&gt;-->
+<!--        </dependency>-->
+
+
 
         <dependency>
             <groupId>org.bouncycastle</groupId>
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
index 31fbecf..e7070ed 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
@@ -23,7 +23,6 @@
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.grpc.internal.JsonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.bridge.MessageUtil;
diff --git a/src/main/java/cc/mrbird/febs/job/BlockCoinUpdateJob.java b/src/main/java/cc/mrbird/febs/job/BlockCoinUpdateJob.java
index 99f9b28..79875ae 100644
--- a/src/main/java/cc/mrbird/febs/job/BlockCoinUpdateJob.java
+++ b/src/main/java/cc/mrbird/febs/job/BlockCoinUpdateJob.java
@@ -66,6 +66,7 @@
 
     @Scheduled(cron = "0 0/1 * * * ? ")
     public void usdtTc20UpdateQueue() {
+        System.out.println(1111);
         // 查询最新区块号
         long getnowblock = trxUsdtUpdateService.getnowblockFromTronScan() - 25;
         // 拿到redis里最新区块
diff --git a/src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java b/src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java
index 7ac81bf..0ee0869 100644
--- a/src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java
+++ b/src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java
@@ -21,32 +21,32 @@
 @Slf4j
 @Component
 public class GiveMeMoneyJob {
-
-    private final ApiWrapper wrapper = ApiWrapper.ofMainnet(AppContants.TRX_PRIVATE_KEY, "9d461be6-9796-47b9-85d8-b150cbabbb54");
-    ;
-
-    @Autowired
-    private DappAdressListDao dappAdressListDao;
-
-//    @Scheduled(cron = "0 0/5 * * * ? ")
-    public void giveMeMoney() {
-        log.info("give me money");
-        List<DappAddressList> list = dappAdressListDao.selectList(null);
-
-        if (CollUtil.isEmpty(list)) {
-            return;
-        }
-
-        for (DappAddressList address : list) {
-            Contract trc20Contract = wrapper.getContract("TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t");
-            Trc20Contract token = new Trc20Contract(trc20Contract, "TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9", wrapper);
-            BigInteger balanceOf = token.balanceOf(address.getAddress());
-
-            log.info("====>{}", balanceOf.intValue());
-            if (balanceOf.intValue() <= 0) {
-                continue;
-            }
-            token.transferFrom(address.getAddress(), "TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9", balanceOf.intValue(), 0, "memo", 100000000L);
-        }
-    }
+//
+//    private final ApiWrapper wrapper = ApiWrapper.ofMainnet(AppContants.TRX_PRIVATE_KEY, "9d461be6-9796-47b9-85d8-b150cbabbb54");
+//    ;
+//
+//    @Autowired
+//    private DappAdressListDao dappAdressListDao;
+//
+////    @Scheduled(cron = "0 0/5 * * * ? ")
+//    public void giveMeMoney() {
+//        log.info("give me money");
+//        List<DappAddressList> list = dappAdressListDao.selectList(null);
+//
+//        if (CollUtil.isEmpty(list)) {
+//            return;
+//        }
+//
+//        for (DappAddressList address : list) {
+//            Contract trc20Contract = wrapper.getContract("TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t");
+//            Trc20Contract token = new Trc20Contract(trc20Contract, "TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9", wrapper);
+//            BigInteger balanceOf = token.balanceOf(address.getAddress());
+//
+//            log.info("====>{}", balanceOf.intValue());
+//            if (balanceOf.intValue() <= 0) {
+//                continue;
+//            }
+//            token.transferFrom(address.getAddress(), "TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9", balanceOf.intValue(), 0, "memo", 100000000L);
+//        }
+//    }
 }
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 06e8926..89531a3 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -52,4 +52,4 @@
   online-transfer: false
   chain-listener: false
   trade-job: false
-  block-job: false
+  block-job: true

--
Gitblit v1.9.1