From 40b92f25cd9ccdf07d714001376dc425c15e31e3 Mon Sep 17 00:00:00 2001
From: 1186 <13640910284@163.com>
Date: Wed, 29 May 2024 13:57:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=AF=BB=E5=8F=96=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/alive/server/api/TestController.java   | 18 ------------------
 .../server/service/CrowdfundingService.java    |  9 +++++++--
 .../server/service/NodeSettingService.java     |  7 -------
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/alive-api/src/main/java/com/alive/server/api/TestController.java b/alive-api/src/main/java/com/alive/server/api/TestController.java
index 8bf0f9e..c9faeec 100644
--- a/alive-api/src/main/java/com/alive/server/api/TestController.java
+++ b/alive-api/src/main/java/com/alive/server/api/TestController.java
@@ -1,27 +1,14 @@
 package com.alive.server.api;
 
-import com.alive.db.entity.Vo.RecommendVo;
-import com.alive.server.config.TwitterConfig;
 import com.alive.server.oss.AliyunOssUtils;
-import com.alive.server.oss.MultipartFileToFileUtil;
-import com.alive.server.service.TwitterService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
-import java.util.Base64;
 import java.util.Date;
 import java.util.UUID;
 
@@ -38,14 +25,9 @@ import java.util.UUID;
 @Transactional(isolation = Isolation.READ_COMMITTED)
 public class TestController
 {
-    @Autowired
-    private TwitterService twitterService;
-
 
     /**
      * 上传文件（阿里OSS）
-     *
-     * @param file 文件对象
      * @return
      */
     @ApiOperation("上传文件")
diff --git a/alive-api/src/main/java/com/alive/server/service/CrowdfundingService.java b/alive-api/src/main/java/com/alive/server/service/CrowdfundingService.java
index 2cb58a2..9dee436 100644
--- a/alive-api/src/main/java/com/alive/server/service/CrowdfundingService.java
+++ b/alive-api/src/main/java/com/alive/server/service/CrowdfundingService.java
@@ -291,8 +291,13 @@ public class CrowdfundingService extends BaseComponent {
         try {
             send = this.getBscWsWeb3j().ethGetLogs(filter).send();
         } catch (IOException e) {
-            e.printStackTrace();
-            throw new RuntimeException(e.getMessage());
+            String msg = e.getMessage();
+            if(msg.equals("timeout")){
+                log.error("节点读取超时------------------");
+            }else{
+                e.printStackTrace();
+                throw new RuntimeException(e.getMessage());
+            }
         }
         if(send.getError() != null && send.getError().getMessage() != null){
             log.info("扫描块失败(检查节点是否被限制) out {} ,{}, {}", startBlock, endBlock, send.getError().getMessage());
diff --git a/alive-api/src/main/java/com/alive/server/service/NodeSettingService.java b/alive-api/src/main/java/com/alive/server/service/NodeSettingService.java
index 7067141..9ec38b3 100644
--- a/alive-api/src/main/java/com/alive/server/service/NodeSettingService.java
+++ b/alive-api/src/main/java/com/alive/server/service/NodeSettingService.java
@@ -50,13 +50,6 @@ public class NodeSettingService extends BaseComponent {
     @Autowired
     private DSLContext dslContext;
 
-    @Resource
-    private MemberService tMemberService;
-
-    @Autowired
-    private Web3jServer web3jServer;
-
-
     public boolean buyNode() {
         int memberId = Integer.parseInt(RequestUtil.getCurrentAccount());
         Integer code = dslContext.selectCount().from(NODE_BUY_LOG).where(NODE_BUY_LOG.USER_ID.eq(memberId).and(NODE_BUY_LOG.STATUS.eq(3))).fetchAnyInto(Integer.class);