From 0cfd84ebe2adf4a4616ba72078b135a1797e8cfe Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 12 May 2026 17:50:38 +0800
Subject: [PATCH] fix(trade): 修复网格交易逻辑并更新生产配置
---
src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
index 58deb72..c154490 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
@@ -48,26 +48,46 @@
log.info("[管理器] 开始初始化...");
try {
+ //测试盘
+// config = GateConfig.builder()
+// .apiKey("d90ca272391992b8e74f8f92cedb21ec")
+// .apiSecret("1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274")
+// .contract("ETH_USDT")
+// .leverage("100")
+// .marginMode("CROSS")
+// .positionMode("dual")
+// .gridRate(new BigDecimal("0.003"))
+// .overallTp(new BigDecimal("5"))
+// .maxLoss(new BigDecimal("15"))
+// .quantity("1")
+// .contractMultiplier(new BigDecimal("0.01"))
+// .unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
+// .isProduction(false)
+// .reopenMaxRetries(3)
+// .build();
+ //实盘
config = GateConfig.builder()
- .apiKey("d90ca272391992b8e74f8f92cedb21ec")
- .apiSecret("1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274")
+ .apiKey("865371cdaccd5d238aceb06a55f0143a")
+ .apiSecret("49589c30dfdc3acba007eed445a94990c4b0aa5faac9843e32defdd7371f5a50")
.contract("ETH_USDT")
.leverage("100")
- .marginMode("cross")
+ .marginMode("CROSS")
.positionMode("dual")
- .gridRate(new BigDecimal("0.004"))
- .overallTp(new BigDecimal("0.5"))
- .maxLoss(new BigDecimal("7.5"))
+ .gridRate(new BigDecimal("0.005"))
+ .overallTp(new BigDecimal("5"))
+ .maxLoss(new BigDecimal("15"))
.quantity("1")
.contractMultiplier(new BigDecimal("0.01"))
.unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
- .isProduction(false)
+ .isProduction(true)
.reopenMaxRetries(3)
.build();
+ // 1. 初始化交易服务：查用户ID → 切持仓模式 → 清条件单 → 平已有仓位 → 设杠杆
gridTradeService = new GateGridTradeService(config);
gridTradeService.init();
+ // 2. 创建 WS 客户端并注册 3 个频道处理器
wsClient = new GateKlineWebSocketClient(config.getWsUrl());
wsClient.addChannelHandler(new CandlestickChannelHandler(config.getContract(), gridTradeService));
wsClient.addChannelHandler(new PositionsChannelHandler(
@@ -77,12 +97,16 @@
wsClient.init();
log.info("[管理器] WS已连接, 已注册 3 个频道处理器");
+ // 3. 激活策略，等待首根 K 线触发基底双开
gridTradeService.startGrid();
} catch (Exception e) {
log.error("[管理器] 初始化失败", e);
}
}
+ /**
+ * 销毁：停止策略 → 关闭交易线程池 → 取消 WS 订阅 → 断开连接 → 关闭 WS 线程池。
+ */
@PreDestroy
public void destroy() {
log.info("[管理器] 开始销毁...");
--
Gitblit v1.9.1