From 4143a4a7be962a580eae94e530293c9eb19b4de1 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Dec 2025 17:16:03 +0800
Subject: [PATCH] feat(okxWs): 调整账户和持仓 WebSocket 配置
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java | 31 ++++---------------------------
1 files changed, 4 insertions(+), 27 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 1fb12fb..e79cd49 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,6 @@
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;
/**
* 订阅频道指令
@@ -122,7 +123,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);
@@ -267,32 +268,8 @@
AccountWs.handleEvent(response, redisUtils);
} 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);
- }
+ TradeOrderWs.orderEvent(webSocketClient, redisUtils, side);
} else if (BalanceAndPositionWs.CHANNEL_NAME.equals(channel)) {
BalanceAndPositionWs.handleEvent(response);
}
--
Gitblit v1.9.1