From 3cfb3d987566f4baf5563a52dced85c9bd8a5391 Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Fri, 26 Dec 2025 01:47:15 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/ws/WebsocketRunClient.java |   92 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/nq/ws/WebsocketRunClient.java b/src/main/java/com/nq/ws/WebsocketRunClient.java
index f042f2e..d464bdf 100644
--- a/src/main/java/com/nq/ws/WebsocketRunClient.java
+++ b/src/main/java/com/nq/ws/WebsocketRunClient.java
@@ -15,34 +15,94 @@
 
 import java.lang.reflect.Type;
 import java.net.URI;
+import java.util.HashMap;
 import java.util.Map;
 
 @Slf4j
-public class WebsocketRunClient  extends WebSocketClient {
+public class WebsocketRunClient extends WebSocketClient {
 
     private EStockType eStockType;
-    public WebsocketRunClient(URI serverUri,
-    EStockType eStockType
-    ) {
+
+    public WebsocketRunClient(URI serverUri, EStockType eStockType) {
         super(serverUri);
         this.eStockType = eStockType;
     }
 
     @Override
     public void onOpen(ServerHandshake serverHandshake) {
-        send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
+        log.info("WebSocket连接已建立,服务器: {}", getURI());
+
+        // 根据新服务器的协议格式发送认证或订阅消息
+        String subscribeMessage = buildSubscribeMessage();
+        send(subscribeMessage);
+        log.info("已发送订阅消息: {}", subscribeMessage);
     }
 
     @Override
-    public void onMessage(String s) {
+    public void onMessage(String message) {
         try {
+            log.debug("收到WebSocket消息: {}", message);
+
             ApplicationContext act = ApplicationContextRegisterUtil.getApplicationContext();
             MandatoryLiquidationService liquidationService = (MandatoryLiquidationService) act.getBean(IMandatoryLiquidationService.class);
-            StockRealTimeBean stockDetailBean =  new Gson().fromJson(s, StockRealTimeBean.class);
-            liquidationService.RealTimeDataProcess(eStockType,stockDetailBean);
-            RedisKeyUtil.setCacheRealTimeStock(EStockType.IN,stockDetailBean);
-        }catch (Exception e){
 
+            // 根据新服务器的数据格式解析消息
+            StockRealTimeBean stockDetailBean = parseMessage(message);
+            if (stockDetailBean != null) {
+                liquidationService.RealTimeDataProcess(eStockType, stockDetailBean);
+                RedisKeyUtil.setCacheRealTimeStock(eStockType, stockDetailBean);
+            }
+
+        } catch (Exception e) {
+            log.error("处理WebSocket消息时发生错误: {}", e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void onClose(int code, String reason, boolean remote) {
+        log.info("WebSocket连接关闭 - 代码: {}, 原因: {}, 远程关闭: {}", code, reason, remote);
+        log.info("股票类型: {}", eStockType);
+    }
+
+    @Override
+    public void onError(Exception e) {
+        log.error("WebSocket连接错误: {}", e.getMessage(), e);
+    }
+
+    /**
+     * 构建订阅消息 - 根据新服务器的协议格式调整
+     */
+    private String buildSubscribeMessage() {
+        // 根据新服务器的API文档调整消息格式
+        // 示例格式,需要根据实际API调整
+        // 使用 HashMap
+        Map<String, Object> subscribeMsg = new HashMap<>();
+        subscribeMsg.put("action", "subscribe");
+        subscribeMsg.put("key", eStockType.getStockKey());
+        subscribeMsg.put("country", eStockType.getContryId());
+        subscribeMsg.put("type", "stock_realtime");
+
+        return new Gson().toJson(subscribeMsg);
+    }
+
+    /**
+     * 解析消息 - 根据新服务器的数据格式调整
+     */
+    private StockRealTimeBean parseMessage(String message) {
+        try {
+            // 首先将消息解析为Map查看结构
+            Map<String, Object> messageMap = jsonToMap(message);
+            log.debug("消息结构: {}", messageMap);
+
+            // 根据实际的数据结构进行转换
+            // 这里需要根据新服务器的数据格式调整解析逻辑
+
+            // 如果是直接符合StockRealTimeBean结构的消息
+            return new Gson().fromJson(message, StockRealTimeBean.class);
+
+        } catch (Exception e) {
+            log.error("解析消息失败: {}, 原始消息: {}", e.getMessage(), message);
+            return null;
         }
     }
 
@@ -51,14 +111,4 @@
         Type type = new TypeToken<Map<String, Object>>(){}.getType();
         return gson.fromJson(json, type);
     }
-
-    @Override
-    public void onClose(int i, String s, boolean b) {
-        log.info("websocket  印度股票  关闭"+1);
-    }
-
-    @Override
-    public void onError(Exception e) {
-        log.info("websocket 错误");
-    }
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3