From 28701d9c708089cd64e3dc813ad1d9079de6528a Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 11 Jan 2026 19:43:51 +0800
Subject: [PATCH] 日股,美股

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

diff --git a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
index 8d731e5..6534221 100644
--- a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
+++ b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
@@ -1,8 +1,7 @@
 package com.nq.ws;
 
-
-import com.nq.constant.StockConstant;
 import com.nq.enums.EStockType;
+import com.nq.utils.PropertiesUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.java_websocket.client.WebSocketClient;
 import org.springframework.context.annotation.Bean;
@@ -21,50 +20,51 @@
     public Map<String, WebSocketClient> websocketRunClientMap() {
 
         Map<String, WebSocketClient> retMap = new HashMap<>(2);
-
-
-
-
         try {
-            WebsocketRunClient websocketRunClient = new WebsocketRunClient(new URI(StockConstant.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);
+            JPWebsocketRunClient jpWebsocketRunClient = new JPWebsocketRunClient(new URI(PropertiesUtil.getProperty("JP_WS_URL")), EStockType.JP);
+            jpWebsocketRunClient.connect();
+            jpWebsocketRunClient.setConnectionLostTimeout(0);
+            startHeartbeatThread(jpWebsocketRunClient);
+            retMap.put(EStockType.JP.getStockKey(), jpWebsocketRunClient);
         } catch (Exception e) {
+            log.error("jpWebsocketRunClient 异常: {}", e.getMessage());
         }
-
         try {
-            USWebsocketRunClient usWebsocketRunClient = new USWebsocketRunClient(new URI(StockConstant.US_WS_URL));
+            USWebsocketRunClient usWebsocketRunClient = new USWebsocketRunClient(new URI(PropertiesUtil.getProperty("US_WS_URL")), EStockType.US);
             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();
+            startHeartbeatThread(usWebsocketRunClient);
             retMap.put(EStockType.US.getStockKey(), usWebsocketRunClient);
         } catch (Exception e) {
+            log.error("usWebsocketRunClient 异常: {}", 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