From 87c31b6e2c11a82d92389194e190d6b2eefd939a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Dec 2025 16:01:34 +0800
Subject: [PATCH] fix(okx): 调整账户状态与保证金计算逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java
index 5dd4c16..4b5ebdf 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java
@@ -1,11 +1,13 @@
package com.xcong.excoin.modules.okxNewPrice;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.modules.okxNewPrice.celue.CaoZuoService;
import com.xcong.excoin.modules.okxNewPrice.okxWs.*;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
+import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.ExchangeInfoEnum;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.OrderParamEnums;
import com.xcong.excoin.modules.okxNewPrice.utils.SSLConfig;
import com.xcong.excoin.modules.okxNewPrice.wangge.WangGeService;
@@ -49,7 +51,10 @@
private static final String WS_URL_MONIPAN = "wss://wspap.okx.com:8443/ws/v5/private";
private static final String WS_URL_SHIPAN = "wss://ws.okx.com:8443/ws/v5/private";
- private static final boolean INTERNET = false;
+
+ private ScheduledExecutorService reconnectScheduler;
+ private final AtomicReference<Long> lastReconnectTime = new AtomicReference<>(System.currentTimeMillis());
+
/**
* 订阅频道指令
@@ -94,6 +99,10 @@
pongTimeoutFuture.cancel(true);
}
shutdownExecutorGracefully(sharedExecutor);
+
+// if (reconnectScheduler != null) {
+// reconnectScheduler.shutdownNow();
+// }
}
private void shutdownExecutorGracefully(ExecutorService executor) {
@@ -122,7 +131,7 @@
SSLConfig.configureSSL();
System.setProperty("https.protocols", "TLSv1.2,TLSv1.3");
String WS_URL = WS_URL_MONIPAN;
- if (INTERNET){
+ if (ExchangeInfoEnum.OKX_UAT.isAccountType()){
WS_URL = WS_URL_SHIPAN;
}
URI uri = new URI(WS_URL);
@@ -130,8 +139,13 @@
@Override
public void onOpen(ServerHandshake handshake) {
log.info("OKX account-order WebSocket连接成功");
- resetHeartbeatTimer();
- websocketLogin();
+ // 检查应用是否正在关闭
+ if (!sharedExecutor.isShutdown()) {
+ resetHeartbeatTimer();
+ websocketLogin();
+ } else {
+ log.warn("应用正在关闭，忽略WebSocket连接成功回调");
+ }
}
@Override
@@ -260,34 +274,10 @@
OrderInfoWs.handleEvent(response, redisUtils);
}else if (AccountWs.ACCOUNTWS_CHANNEL.equals(channel)) {
AccountWs.handleEvent(response, redisUtils);
+ String side = caoZuoService.caoZuo();
+ TradeOrderWs.orderEvent(webSocketClient, redisUtils, side);
} else if (PositionsWs.POSITIONSWS_CHANNEL.equals(channel)) {
PositionsWs.handleEvent(response, redisUtils);
-
- String posKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":pos";
- String pos = (String) redisUtils.get(posKey);
- if (StrUtil.isBlank(pos)) {
- log.error("未获取到持仓数量");
- TradeOrderWs.orderEvent(webSocketClient, redisUtils, OrderParamEnums.INIT.getValue());
- return;
- }
-
- String uplKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":upl";
- String totalOrderUsdtKey = AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":totalOrderUsdt";
-
- String upl = (String) redisUtils.get(uplKey);
- String totalOrderUsdt = (String) redisUtils.get(totalOrderUsdtKey);
- BigDecimal multiply = new BigDecimal(upl).multiply(new BigDecimal("-1"));
-
- if (new BigDecimal(totalOrderUsdt).compareTo(multiply) < 0) {
- log.error("持仓盈亏超过下单总保证金，止损冷静一天......");
- TradeOrderWs.orderEvent(webSocketClient, redisUtils, OrderParamEnums.OUT.getValue());
- return;
- }
-
- String side = caoZuoService.caoZuo();
- if (StrUtil.isNotBlank(pos)) {
- TradeOrderWs.orderEvent(webSocketClient, redisUtils, side);
- }
} else if (BalanceAndPositionWs.CHANNEL_NAME.equals(channel)) {
BalanceAndPositionWs.handleEvent(response);
}
@@ -309,6 +299,19 @@
});
heartbeatExecutor.scheduleWithFixedDelay(this::checkHeartbeatTimeout, 25, 25, TimeUnit.SECONDS);
+// // 添加每小时重连的定时任务
+// if (reconnectScheduler != null && !reconnectScheduler.isTerminated()) {
+// reconnectScheduler.shutdownNow();
+// }
+//
+// reconnectScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
+// Thread t = new Thread(r, "okx-scheduled-reconnect");
+// t.setDaemon(true);
+// return t;
+// });
+//
+// // 每小时执行一次重连
+// reconnectScheduler.scheduleWithFixedDelay(this::performScheduledReconnect, 60, 60, TimeUnit.MINUTES);
}
/**
@@ -318,12 +321,22 @@
private void resetHeartbeatTimer() {
cancelPongTimeout();
- if (heartbeatExecutor != null) {
+ // 检查线程池状态，避免在关闭过程中提交任务
+ if (heartbeatExecutor != null && !heartbeatExecutor.isShutdown()) {
pongTimeoutFuture = heartbeatExecutor.schedule(this::checkHeartbeatTimeout,
HEARTBEAT_TIMEOUT, TimeUnit.SECONDS);
}
}
+ private void performScheduledReconnect() {
+ if (webSocketClient != null && webSocketClient.isOpen()) {
+ log.info("关闭当前连接准备重连");
+ webSocketClient.close();
+ }
+ // 更新最后重连时间
+ lastReconnectTime.set(System.currentTimeMillis());
+ }
+
/**
* 检查心跳超时情况。
* 若长时间未收到任何消息则主动发送 ping 请求保持连接活跃。
--
Gitblit v1.9.1