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 | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
index 7db3159..d59027c 100644
--- a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
+++ b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
@@ -21,12 +21,8 @@
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 websocketRunClient = new WebsocketRunClient(new URI(PropertiesUtil.getProperty("SGP_WS_URL")),EStockType.SGP);
websocketRunClient.connect();
websocketRunClient.setConnectionLostTimeout(0);
new Thread(() -> {
@@ -40,28 +36,37 @@
}
}
}).start();
- retMap.put(EStockType.IN.getStockKey(), websocketRunClient);
} catch (Exception e) {
}
-//
-// try {
-// USWebsocketRunClient usWebsocketRunClient = new USWebsocketRunClient(new URI(PropertiesUtil.getProperty("IN_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);
-// } catch (Exception e) {
-// }
+
+
+
+ return retMap;
+ }
+
+ @Bean
+ public Map<String, WebSocketClient> websocketInRunClientMap() {
+
+ Map<String, WebSocketClient> retMap = new HashMap<>(2);
+ try {
+ 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);
+ webSocketInClient.send("heartbeat".getBytes());
+ } catch (Exception e) {
+ webSocketInClient.reconnect();
+ webSocketInClient.setConnectionLostTimeout(0);
+ }
+ }
+ }).start();
+ } catch (Exception e) {
+ }
+
+
return retMap;
}
--
Gitblit v1.9.3