From 1c5666b5908ede9bad5f3fa65a787ccd4ff623cc Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 08 Jun 2026 10:49:54 +0800
Subject: [PATCH] fix(gateApi): 修复网格交易中止盈检查逻辑

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java |   34 +++++++++++++++++++---------------
 1 files changed, 19 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 80b2e45..597ea23 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
@@ -58,39 +58,42 @@
         log.info("[管理器] 开始初始化...");
 
         try {
-            //测试盘
+            //实盘
             config = GateConfig.builder()
-                    .apiKey("d90ca272391992b8e74f8f92cedb21ec")
-                    .apiSecret("1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274")
+                    .apiKey("a2338398e00b7935104520e16be96918")
+                    .apiSecret("9111d897f2346d5217619f2da76536632715fef4d7eb304c6c61e869a2a74e98")
                     .contract("ETH_USDT")
                     .leverage("100")
                     .marginMode("CROSS")
                     .positionMode("dual")
-                    .gridRate(new BigDecimal("0.002"))
-                    .overallTp(new BigDecimal("5"))
-                    .maxLoss(new BigDecimal("15"))
+                    .gridRate(new BigDecimal("0.005"))
+                    .expectedProfit(new BigDecimal("0.5"))
+                    .maxLoss(new BigDecimal("1.5"))
+                    .baseQuantity("3")
                     .quantity("1")
-                    .priceScale(1)
+                    .maxPositionSize(9)
+                    .priceScale(2)
                     .contractMultiplier(new BigDecimal("0.01"))
                     .unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
-                    .isProduction(false)
+                    .isProduction(true)
                     .reopenMaxRetries(3)
                     .build();
-            //实盘
+//            //测试盘
 //            config = GateConfig.builder()
-//                    .apiKey("865371cdaccd5d238aceb06a55f0143a")
-//                    .apiSecret("49589c30dfdc3acba007eed445a94990c4b0aa5faac9843e32defdd7371f5a50")
+//                    .apiKey("d90ca272391992b8e74f8f92cedb21ec")
+//                    .apiSecret("1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274")
 //                    .contract("ETH_USDT")
 //                    .leverage("100")
 //                    .marginMode("CROSS")
 //                    .positionMode("dual")
-//                    .gridRate(new BigDecimal("0.005"))
-//                    .overallTp(new BigDecimal("5"))
+//                    .gridRate(new BigDecimal("0.002"))
+//                    .expectedProfit(new BigDecimal("1"))
 //                    .maxLoss(new BigDecimal("15"))
 //                    .quantity("1")
+//                    .priceScale(1)
 //                    .contractMultiplier(new BigDecimal("0.01"))
 //                    .unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
-//                    .isProduction(true)
+//                    .isProduction(false)
 //                    .reopenMaxRetries(3)
 //                    .build();
 
@@ -98,7 +101,7 @@
             gridTradeService = new GateGridTradeService(config);
             gridTradeService.init();
 
-            // 2. 创建 WS 客户端并注册 3 个频道处理器
+            // 2. 创建 WS 客户端并注册频道处理器
             wsClient = new GateKlineWebSocketClient(config.getWsUrl());
             wsClient.addChannelHandler(new CandlestickChannelHandler(config.getContract(), gridTradeService));
             wsClient.addChannelHandler(new PositionsChannelHandler(
@@ -111,6 +114,7 @@
                     config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
             wsClient.addChannelHandler(new AutoOrdersChannelHandler(
                     config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
+            gridTradeService.setWsClient(wsClient);
             wsClient.init();
             log.info("[管理器] WS已连接, 已注册 6 个频道处理器");
 

--
Gitblit v1.9.1