From dedaaf738a1d483b4594d46622eaa9791f7e5bcd Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 14 Aug 2024 19:48:36 +0800
Subject: [PATCH] 1

---
 kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java b/kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java
index aca5da9..90b3d5c 100644
--- a/kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java
+++ b/kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java
@@ -6,9 +6,16 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import lombok.extern.slf4j.Slf4j;
+import org.example.kucoinclient.KucoinClientApplication;
+import org.example.kucoinclient.comm.ApplicationContextProvider;
 import org.example.kucoinclient.pojo.Currency;
 import org.example.kucoinclient.util.RedisUtil;
 import org.json.JSONException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.stereotype.Component;
 
 import javax.websocket.*;
 import java.io.UnsupportedEncodingException;
@@ -71,7 +78,7 @@
             }
 
         } catch (Exception e) {
-            log.error("kucoin ws 连接过程中发生异常: ", e); // 捕获并记录异常
+            log.error("kucoin ws 连接过程中发生异常:" + e.getMessage(), e); // 记录连接过程中发生的异常
         } finally {
             executorService.shutdown(); // 关闭调度线程池
         }
@@ -122,7 +129,11 @@
         }
         if (map.get("data") != null) {
             Object object = map.get("data"); // 获取数据内容
-            processData(map.get("topic").toString(), object); // 处理数据
+            if(null == map.get("topic")){
+                System.out.println("-------------------出错了:"+map);
+            }else{
+                processData(map.get("topic").toString(), object); // 处理数据
+            }
         }
     }
 
@@ -145,8 +156,8 @@
 
             // 空值检查,避免存储 null 值到 Redis
             if (resultMap.get("bids") != null && resultMap.get("asks") != null) {
-                Object bidsObj = resultMap.get("bids");
-                Object asksObj = resultMap.get("asks");
+                Object asksObj = resultMap.get("bids");
+                Object bidsObj = resultMap.get("asks");
 
                 if(bidsObj instanceof List && !((List<?>) bidsObj).isEmpty() && asksObj instanceof List && !((List<?>) asksObj).isEmpty()){
                     if (bidsObj instanceof List && !((List<?>) bidsObj).isEmpty()) {
@@ -189,15 +200,15 @@
     }
 
     @OnClose
-    public void onClose() {
+    public void onClose() throws Exception {
         log.info("kucoin ws 连接已关闭,尝试重新连接..."); // 输出连接关闭日志
-        handleConnectionClosedOrError(); // 处理连接关闭或错误
+        handleConnectionClosedOrError();
     }
 
     @OnError
-    public void onError(Throwable throwable) {
+    public void onError(Throwable throwable) throws Exception {
         log.error("kucoin ws 发生错误: ", throwable); // 输出错误日志
-        handleConnectionClosedOrError(); // 处理连接关闭或错误
+        handleConnectionClosedOrError();
     }
 
     private void handleConnectionClosedOrError() {

--
Gitblit v1.9.3