From 76388afc59b66335dcf630e5ed30beccbe7aeb5b Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 28 Aug 2025 17:29:05 +0800
Subject: [PATCH] 新股修改

---
 src/main/java/com/nq/ws/WebSocketClientBeanConfig.java |   73 ++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
index 720492e..c702380 100644
--- a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
+++ b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
@@ -1,6 +1,5 @@
 package com.nq.ws;
 
-
 import com.nq.enums.EStockType;
 import com.nq.utils.PropertiesUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -21,50 +20,50 @@
     public Map<String, WebSocketClient> websocketRunClientMap() {
 
         Map<String, WebSocketClient> retMap = new HashMap<>(2);
-
-
-
-
         try {
-            WebsocketRunClient websocketRunClient = new WebsocketRunClient(new URI(PropertiesUtil.getProperty("US_WS_URL")));
-            websocketRunClient.connect();
-            websocketRunClient.setConnectionLostTimeout(0);
-            new Thread(() -> {
-                while (true) {
-                    try {
-                        Thread.sleep(8000);
-                        websocketRunClient.send("heartbeat".getBytes());
-                    } catch (Exception e) {
-                        websocketRunClient.reconnect();
-                        websocketRunClient.setConnectionLostTimeout(0);
-                    }
-                }
-            }).start();
-            retMap.put(EStockType.IN.getStockKey(), websocketRunClient);
+            WebsocketRunClient hkWebsocketRunClient = new WebsocketRunClient(new URI(PropertiesUtil.getProperty("HK_WS_URL")), EStockType.HK);
+            hkWebsocketRunClient.connect();
+            hkWebsocketRunClient.setConnectionLostTimeout(0);
+            startHeartbeatThread(hkWebsocketRunClient);
+            retMap.put(EStockType.HK.getStockKey(), hkWebsocketRunClient);
         } catch (Exception e) {
+            log.error("hkWebsocketRunClient 异常: {}", e.getMessage());
         }
-
         try {
-            USWebsocketRunClient usWebsocketRunClient = new USWebsocketRunClient(new URI(PropertiesUtil.getProperty("MAS_WS_URL")));
-            usWebsocketRunClient.connect();
-            usWebsocketRunClient.setConnectionLostTimeout(0);
-            new Thread(() -> {
-                while (true) {
-                    try {
-                        Thread.sleep(8000);
-                        usWebsocketRunClient.send("heartbeat".getBytes());
-                    } catch (Exception e) {
-                        usWebsocketRunClient.reconnect();
-                        usWebsocketRunClient.setConnectionLostTimeout(0);
-                    }
-                }
-            }).start();
-            retMap.put(EStockType.US.getStockKey(), usWebsocketRunClient);
+            TWWebsocketRunClient twWebsocketRunClient = new TWWebsocketRunClient(new URI(PropertiesUtil.getProperty("TW_WS_URL")), EStockType.TW);
+            twWebsocketRunClient.connect();
+            twWebsocketRunClient.setConnectionLostTimeout(0);
+            startHeartbeatThread(twWebsocketRunClient);
+            retMap.put(EStockType.TW.getStockKey(), twWebsocketRunClient);
         } catch (Exception e) {
+            log.error("twWebsocketRunClient 异常: {}", e.getMessage());
         }
-
         return retMap;
     }
 
+    private void startHeartbeatThread(WebSocketClient client) {
+        new Thread(() -> {
+            while (true) {
+                try {
+                    Thread.sleep(8000);
+                    if (client.isOpen()) { // 先检查连接状态
+                        client.send("heartbeat".getBytes());
+                    } else {
+                        client.reconnect();
+                        client.setConnectionLostTimeout(0);
+                    }
+                } catch (Exception e) {
+                    log.error("心跳线程异常, 尝试重连: {}", e.getMessage());
+                    try {
+                        client.reconnect();
+                        client.setConnectionLostTimeout(0);
+                    } catch (Exception re) {
+                        log.error("重连失败: {}", re.getMessage());
+                    }
+                }
+            }
+        }).start();
+    }
+
 
 }

--
Gitblit v1.9.3