From f6bd6d0ad7b21ed124afca7c30c8fcea93a56319 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 07 Aug 2024 18:35:34 +0800
Subject: [PATCH] 1
---
kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java | 67 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 21 deletions(-)
diff --git a/kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java b/kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java
index 18827f7..90b3d5c 100644
--- a/kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java
+++ b/kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java
@@ -5,14 +5,21 @@
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
-import com.sun.istack.internal.NotNull;
import lombok.extern.slf4j.Slf4j;
+import org.example.kucoinclient.KucoinClientApplication;
+import org.example.kucoinclient.comm.ApplicationContextProvider;
import org.example.kucoinclient.pojo.Currency;
import org.example.kucoinclient.util.RedisUtil;
import org.json.JSONException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.stereotype.Component;
import javax.websocket.*;
import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
import java.net.URI;
import java.net.URLEncoder;
import java.nio.ByteBuffer;
@@ -71,7 +78,7 @@
}
} catch (Exception e) {
- log.error("kucoin ws 连接过程中发生异常: ", e); // 捕获并记录异常
+ log.error("kucoin ws 连接过程中发生异常:" + e.getMessage(), e); // 记录连接过程中发生的异常
} finally {
executorService.shutdown(); // 关闭调度线程池
}
@@ -122,7 +129,11 @@
}
if (map.get("data") != null) {
Object object = map.get("data"); // 获取数据内容
- processData(map.get("topic").toString(), object); // 处理数据
+ if(null == map.get("topic")){
+ System.out.println("-------------------出错了："+map);
+ }else{
+ processData(map.get("topic").toString(), object); // 处理数据
+ }
}
}
@@ -144,19 +155,34 @@
ObjectMapper mapper = new ObjectMapper(); // 创建 ObjectMapper 实例
// 空值检查，避免存储 null 值到 Redis
- if (resultMap.get("bids") != null) {
- hashMap.put("bids", resultMap.get("bids")); // 存储 bids
- }
- if (resultMap.get("asks") != null) {
- hashMap.put("asks", resultMap.get("asks")); // 存储 asks
- }
+ if (resultMap.get("bids") != null && resultMap.get("asks") != null) {
+ Object asksObj = resultMap.get("bids");
+ Object bidsObj = resultMap.get("asks");
- String symbol = extractSymbolFromTopic(topic); // 从 topic 提取符号
- String key = PREFIX + symbol; // 创建 Redis 缓存键
- try {
- RedisUtil.set(key, mapper.writeValueAsString(hashMap)); // 存储到 Redis
- } catch (JsonProcessingException e) {
- log.error("将数据存入 Redis 时出错: {}", e.getMessage()); // 输出数据存储错误日志
+ if(bidsObj instanceof List && !((List<?>) bidsObj).isEmpty() && asksObj instanceof List && !((List<?>) asksObj).isEmpty()){
+ if (bidsObj instanceof List && !((List<?>) bidsObj).isEmpty()) {
+ List<String> bidsList = (List<String>) bidsObj;
+ HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks
+ pvMap.put("p", new BigDecimal(String.valueOf(bidsList.get(0))).toPlainString());
+ pvMap.put("v", new BigDecimal(String.valueOf(bidsList.get(1))).toPlainString());
+ hashMap.put("bids",pvMap);
+ }
+
+ if (asksObj instanceof List && !((List<?>) asksObj).isEmpty()) {
+ List<String> asksList = (List<String>) asksObj;
+ HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks
+ pvMap.put("p", new BigDecimal(String.valueOf(asksList.get(0))).toPlainString());
+ pvMap.put("v", new BigDecimal(String.valueOf(asksList.get(1))).toPlainString());
+ hashMap.put("asks",pvMap);
+ }
+ String symbol = extractSymbolFromTopic(topic); // 从 topic 提取符号
+ String key = PREFIX + symbol; // 创建 Redis 缓存键
+ try {
+ RedisUtil.set(key, mapper.writeValueAsString(hashMap)); // 存储到 Redis
+ } catch (JsonProcessingException e) {
+ log.error("将数据存入 Redis 时出错: {}", e.getMessage()); // 输出数据存储错误日志
+ }
+ }
}
} else {
log.error("topic--->存入redis失败"); // 输出处理失败日志
@@ -174,15 +200,15 @@
}
@OnClose
- public void onClose() {
+ public void onClose() throws Exception {
log.info("kucoin ws 连接已关闭，尝试重新连接..."); // 输出连接关闭日志
- handleConnectionClosedOrError(); // 处理连接关闭或错误
+ handleConnectionClosedOrError();
}
@OnError
- public void onError(Throwable throwable) {
+ public void onError(Throwable throwable) throws Exception {
log.error("kucoin ws 发生错误: ", throwable); // 输出错误日志
- handleConnectionClosedOrError(); // 处理连接关闭或错误
+ handleConnectionClosedOrError();
}
private void handleConnectionClosedOrError() {
@@ -232,7 +258,7 @@
Map<String, Object> jsonMap = new HashMap<>();
jsonMap.put("id", id); // 会话 ID
jsonMap.put("type", "subscribe"); // 订阅类型
- jsonMap.put("topic", "/spotMarket/level2Depth50:" + symbol); // 订阅的主题
+ jsonMap.put("topic", "/spotMarket/level1:" + symbol); // 订阅的主题
jsonMap.put("privateChannel", false); // 是否私有通道
jsonMap.put("response", true); // 是否返回响应
@@ -240,7 +266,6 @@
return mapper.writeValueAsString(jsonMap); // 返回 JSON 字符串
}
- @NotNull
private String getSymbol() {
List<String> symbolList = subscriptions.stream()
.map(currency -> currency.getSymbol().replaceAll("USDT", "-USDT")) // 替换符号
--
Gitblit v1.9.3