From c8d9e7d9456d8363e45a9fc1896a2d81d137f03a Mon Sep 17 00:00:00 2001 From: jim Date: Fri, 11 Jun 2021 21:43:57 +0800 Subject: [PATCH 1/2] latest --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 863f5c234..67e7af532 100755 --- a/pom.xml +++ b/pom.xml @@ -32,17 +32,17 @@ commons-codec commons-codec - 1.10 + 1.15 org.apache.commons commons-lang3 - 3.6 + 3.12.0 junit junit - 4.12 + 4.13.2 test From d3262e19b84a2a0f53fd78f50896b36a1e692d91 Mon Sep 17 00:00:00 2001 From: jim Date: Sat, 19 Jun 2021 20:24:46 +0800 Subject: [PATCH 2/2] attempting to improve testnet streaming --- .../java/com/binance/api/client/config/BinanceApiConfig.java | 2 +- .../binance/api/client/impl/BinanceApiServiceGenerator.java | 4 ++-- .../api/client/impl/BinanceApiWebSocketClientImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/binance/api/client/config/BinanceApiConfig.java b/src/main/java/com/binance/api/client/config/BinanceApiConfig.java index 276d94838..f4875297b 100755 --- a/src/main/java/com/binance/api/client/config/BinanceApiConfig.java +++ b/src/main/java/com/binance/api/client/config/BinanceApiConfig.java @@ -77,6 +77,6 @@ public static String getTestNetBaseUrl() { * Streaming Spot Test Network base URL. */ public static String getStreamTestNetBaseUrl() { - return String.format("wss://%s", TESTNET_DOMAIN); + return String.format("wss://%s/ws", TESTNET_DOMAIN); } } diff --git a/src/main/java/com/binance/api/client/impl/BinanceApiServiceGenerator.java b/src/main/java/com/binance/api/client/impl/BinanceApiServiceGenerator.java index 7d28ff877..dec8d3047 100755 --- a/src/main/java/com/binance/api/client/impl/BinanceApiServiceGenerator.java +++ b/src/main/java/com/binance/api/client/impl/BinanceApiServiceGenerator.java @@ -58,8 +58,8 @@ public static S createService(Class serviceClass, String apiKey, String s String baseUrl = null; if (!BinanceApiConfig.useTestnet) { baseUrl = BinanceApiConfig.getApiBaseUrl(); } else { - baseUrl = BinanceApiConfig.useTestnetStreaming ? - BinanceApiConfig.getStreamTestNetBaseUrl() : + baseUrl = /*BinanceApiConfig.useTestnetStreaming ? + BinanceApiConfig.getStreamTestNetBaseUrl() :*/ BinanceApiConfig.getTestNetBaseUrl(); } diff --git a/src/main/java/com/binance/api/client/impl/BinanceApiWebSocketClientImpl.java b/src/main/java/com/binance/api/client/impl/BinanceApiWebSocketClientImpl.java index be0dcf518..4d68fb436 100755 --- a/src/main/java/com/binance/api/client/impl/BinanceApiWebSocketClientImpl.java +++ b/src/main/java/com/binance/api/client/impl/BinanceApiWebSocketClientImpl.java @@ -93,7 +93,7 @@ public void close() { } private Closeable createNewWebSocket(String channel, BinanceApiWebSocketListener listener) { - String streamingUrl = String.format("%s/%s", BinanceApiConfig.getStreamApiBaseUrl(), channel); + String streamingUrl = String.format("%s/%s", BinanceApiConfig.useTestnetStreaming?BinanceApiConfig.getStreamTestNetBaseUrl():BinanceApiConfig.getStreamApiBaseUrl(), channel); Request request = new Request.Builder().url(streamingUrl).build(); final WebSocket webSocket = client.newWebSocket(request, listener); return () -> {