From 6404cb07e5281cfd901267c4fd560ba89bd5e2fd Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Sep 2024 16:49:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ysz' into ysz
---
src/main/java/com/nq/ws/WebSocketClientBeanConfig.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
index e7ae59b..d59027c 100644
--- a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
+++ b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
@@ -22,7 +22,7 @@
Map<String, WebSocketClient> retMap = new HashMap<>(2);
try {
- WebsocketRunClient websocketRunClient = new WebsocketRunClient(new URI(PropertiesUtil.getProperty("MAS_WS_URL")));
+ WebsocketRunClient websocketRunClient = new WebsocketRunClient(new URI(PropertiesUtil.getProperty("SGP_WS_URL")),EStockType.SGP);
websocketRunClient.connect();
websocketRunClient.setConnectionLostTimeout(0);
new Thread(() -> {
@@ -36,29 +36,38 @@
}
}
}).start();
- retMap.put(EStockType.IN.getStockKey(), websocketRunClient);
} catch (Exception e) {
}
+
+
+ return retMap;
+ }
+
+ @Bean
+ public Map<String, WebSocketClient> websocketInRunClientMap() {
+
+ Map<String, WebSocketClient> retMap = new HashMap<>(2);
try {
- USWebsocketRunClient usWebsocketRunClient = new USWebsocketRunClient(new URI(PropertiesUtil.getProperty("US_WS_URL")));
- usWebsocketRunClient.connect();
- usWebsocketRunClient.setConnectionLostTimeout(0);
+ WebSocketInClient webSocketInClient = new WebSocketInClient(new URI(PropertiesUtil.getProperty("MY_WS_URL")),EStockType.MAS);
+ webSocketInClient.connect();
+ webSocketInClient.setConnectionLostTimeout(0);
new Thread(() -> {
while (true) {
try {
Thread.sleep(8000);
- usWebsocketRunClient.send("heartbeat".getBytes());
+ webSocketInClient.send("heartbeat".getBytes());
} catch (Exception e) {
- usWebsocketRunClient.reconnect();
- usWebsocketRunClient.setConnectionLostTimeout(0);
+ webSocketInClient.reconnect();
+ webSocketInClient.setConnectionLostTimeout(0);
}
}
}).start();
- retMap.put(EStockType.US.getStockKey(), usWebsocketRunClient);
} catch (Exception e) {
}
+
+
return retMap;
}
--
Gitblit v1.9.3