From e9a397babbbfa9cff8a5ed026447d585e739c37f Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 12 May 2026 21:47:21 +0800
Subject: [PATCH] refactor(gateApi): 将网格交易策略从限价单改为条件单

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java |   62 +++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 15 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 cb24977..f9c2c35 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
@@ -45,27 +45,49 @@
 
     @PostConstruct
     public void init() {
-        log.info("[GateMgr] init...");
+        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")
-                    .contract("XAUT_USDT")
-                    .leverage("30")
-                    .marginMode("cross")
+                    .apiKey("865371cdaccd5d238aceb06a55f0143a")
+                    .apiSecret("49589c30dfdc3acba007eed445a94990c4b0aa5faac9843e32defdd7371f5a50")
+                    .contract("ETH_USDT")
+                    .leverage("100")
+                    .marginMode("CROSS")
                     .positionMode("dual")
-                    .gridRate(new BigDecimal("0.0035"))
-                    .overallTp(new BigDecimal("0.5"))
-                    .maxLoss(new BigDecimal("7.5"))
-                    .quantity("10")
-                    .isProduction(false)
+                    .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(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(
@@ -73,26 +95,36 @@
             wsClient.addChannelHandler(new PositionClosesChannelHandler(
                     config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
             wsClient.init();
-            log.info("[GateMgr] ws connected, 3 handlers registered");
+            log.info("[管理器] WS已连接, 已注册 3 个频道处理器");
 
+            // 3. 激活策略,等待首根 K 线触发基底双开
             gridTradeService.startGrid();
         } catch (Exception e) {
-            log.error("[GateMgr] init fail", e);
+            log.error("[管理器] 初始化失败", e);
         }
     }
 
+    /**
+     * 销毁:停止策略 → 关闭交易线程池 → 取消 WS 订阅 → 断开连接 → 关闭 WS 线程池。
+     */
     @PreDestroy
     public void destroy() {
-        log.info("[GateMgr] destroy...");
+        log.info("[管理器] 开始销毁...");
         if (gridTradeService != null) {
             gridTradeService.stopGrid();
         }
         if (wsClient != null) {
             wsClient.destroy();
         }
-        log.info("[GateMgr] destroyed");
+        log.info("[管理器] 销毁完成");
     }
 
+    /**
+     * @return WebSocket 连接管理器实例
+     */
     public GateKlineWebSocketClient getKlineWebSocketClient() { return wsClient; }
+    /**
+     * @return 网格交易策略服务实例
+     */
     public GateGridTradeService getGridTradeService() { return gridTradeService; }
 }

--
Gitblit v1.9.1