From 60d0e9bd70f87de69b378ab63bac60394e3ff696 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 11 May 2026 11:31:52 +0800
Subject: [PATCH] feat(gate): 添加多账号支持和日志标签区分功能
---
src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java | 180 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 103 insertions(+), 77 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 63f478c..f0cd365 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
@@ -1,120 +1,146 @@
package com.xcong.excoin.modules.gateApi;
-import com.xcong.excoin.modules.okxNewPrice.celue.CaoZuoService;
-import com.xcong.excoin.modules.okxNewPrice.okxWs.wanggeList.WangGeListService;
+import com.xcong.excoin.modules.gateApi.wsHandler.handler.CandlestickChannelHandler;
+import com.xcong.excoin.modules.gateApi.wsHandler.handler.PositionClosesChannelHandler;
+import com.xcong.excoin.modules.gateApi.wsHandler.handler.PositionsChannelHandler;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
/**
- * Gate 模块入口管理类，作为 Spring Bean 负责组件的生命周期。
+ * Gate 模块 Spring 入口，管理多个账号实例的生命周期。
*
- * <h3>启动流程</h3>
- * <pre>
- * @PostConstruct init():
- * 1. new GateGridTradeService(参数) → init() // 设杠杆、查余额、切双向持仓
- * 2. new GateKlineWebSocketClient → init() // 连接 WebSocket，订阅 K 线 + 仓位
- * 3. gridTradeService.startGrid() // 激活策略，等待 K 线触发首次双开
- * </pre>
+ * <h3>启动流程 ({@code @PostConstruct})</h3>
+ * <ol>
+ * <li>遍历 {@link #buildAccountConfigs()} 构建每个账号的 {@link GateConfig}</li>
+ * <li>每个账号创建独立的 {@link AccountInstance}（含 service + wsClient）</li>
+ * <li>逐个 init → startGrid</li>
+ * </ol>
*
- * <h3>销毁流程</h3>
- * <pre>
- * @PreDestroy destroy():
- * 1. gridTradeService.stopGrid() // 停止策略
- * 2. klinePriceClient.destroy() // 取消订阅 → 关闭 WS → 关闭线程池
- * </pre>
+ * <h3>销毁流程 ({@code @PreDestroy})</h3>
+ * <ol>
+ * <li>遍历 instances：stopGrid + wsClient.destroy()</li>
+ * </ol>
*
- * <h3>配置参数</h3>
- * 当前配置在代码中硬编码：
- * <ul>
- * <li>合约: XAU_USDT, 杠杆: 30x, 全仓, 双向持仓</li>
- * <li>网格间距: 0.35%, 整体止盈: 0.5 USDT, 最大亏损: 7.5 USDT</li>
- * <li>数量: 10 张</li>
- * </ul>
+ * <h3>添加新账号</h3>
+ * 在 {@link #buildAccountConfigs()} 方法中添加新的 {@link GateConfig} 即可。
+ * 通过 {@link GateConfig#getLabel()} 区分日志输出，
+ * 通过 {@link GateConfig#isProduction()} 控制模拟盘/实盘环境。
*
* @author Administrator
*/
@Slf4j
@Component
public class GateWebSocketClientManager {
- @Autowired
- private CaoZuoService caoZuoService;
- @Autowired
- private WangGeListService wangGeListService;
- /** K 线 WebSocket 客户端 */
- private GateKlineWebSocketClient klinePriceClient;
- /** 网格交易服务 */
- private GateGridTradeService gridTradeService;
-
- /** Gate 测试网 API Key */
- private static final String API_KEY = "d90ca272391992b8e74f8f92cedb21ec";
- /** Gate 测试网 API Secret */
- private static final String API_SECRET = "1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274";
+ /** 所有账号实例列表 */
+ private final List<AccountInstance> instances = new ArrayList<>();
/**
- * Spring 容器启动后自动调用。初始化网格交易服务和 WebSocket 客户端。
+ * 封装一个账号的完整运行时组件。
*/
- @PostConstruct
- public void init() {
- log.info("开始初始化GateWebSocketClientManager");
+ private static class AccountInstance {
+ final String label;
+ final GateConfig config;
+ final GateGridTradeService service;
+ final GateKlineWebSocketClient wsClient;
- try {
- gridTradeService = new GateGridTradeService(
- API_KEY, API_SECRET,
- "XAUT_USDT",
- "30",
- "cross",
- "dual",
- new BigDecimal("0.0035"),
- new BigDecimal("0.5"),
- 3,
- new BigDecimal("7.5"),
- "10"
- );
- gridTradeService.init();
+ AccountInstance(GateConfig config) {
+ this.label = config.getLabel();
+ this.config = config;
+ this.service = new GateGridTradeService(config);
+ this.wsClient = new GateKlineWebSocketClient(config.getWsUrl());
+ }
- klinePriceClient = new GateKlineWebSocketClient(caoZuoService, this, wangGeListService, gridTradeService, API_KEY, API_SECRET);
- klinePriceClient.init();
- log.info("已初始化GateKlineWebSocketClient");
+ void init() {
+ service.init();
+ wsClient.addChannelHandler(new CandlestickChannelHandler(config.getContract(), service));
+ wsClient.addChannelHandler(new PositionsChannelHandler(
+ config.getApiKey(), config.getApiSecret(), config.getContract(), service));
+ wsClient.addChannelHandler(new PositionClosesChannelHandler(
+ config.getApiKey(), config.getApiSecret(), config.getContract(), service));
+ wsClient.init();
+ log.info("[{}] WS已连接, 已注册 3 个频道处理器", label);
+ service.startGrid();
+ }
- gridTradeService.startGrid();
- } catch (Exception e) {
- log.error("初始化GateWebSocketClientManager失败", e);
+ void destroy() {
+ log.info("[{}] 开始销毁...", label);
+ service.stopGrid();
+ wsClient.destroy();
+ log.info("[{}] 销毁完成", label);
}
}
/**
- * Spring 容器销毁前自动调用。停止策略并关闭所有连接。
+ * 在此方法中配置所有账号。
+ * <p>每个 {@link GateConfig} 对应一个账号，label 用于日志区分，
+ * isProduction 控制连接测试网(true=实盘)还是测试网(false=模拟盘)。
*/
- @PreDestroy
- public void destroy() {
- log.info("开始销毁GateWebSocketClientManager");
+ private static GateConfig[] buildAccountConfigs() {
+ return new GateConfig[]{
+ GateConfig.builder()
+ .label("模拟盘1")
+ .apiKey("d90ca272391992b8e74f8f92cedb21ec")
+ .apiSecret("1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274")
+ .contract("ETH_USDT")
+ .leverage("100")
+ .marginMode("CROSS")
+ .positionMode("dual")
+ .gridRate(new BigDecimal("0.0015"))
+ .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(),
+ };
+ }
- if (gridTradeService != null) {
- gridTradeService.stopGrid();
- }
- if (klinePriceClient != null) {
+ @PostConstruct
+ public void init() {
+ GateConfig[] configs = buildAccountConfigs();
+ log.info("[管理器] 开始初始化 {} 个账号...", configs.length);
+ for (GateConfig config : configs) {
try {
- klinePriceClient.destroy();
- log.info("已销毁GateKlineWebSocketClient");
+ AccountInstance instance = new AccountInstance(config);
+ instance.init();
+ instances.add(instance);
} catch (Exception e) {
- log.error("销毁GateKlineWebSocketClient失败", e);
+ log.error("[管理器] 账号 {} 初始化失败", config.getLabel(), e);
}
}
- log.info("GateWebSocketClientManager销毁完成");
+ log.info("[管理器] 初始化完成, 成功启动 {}/{} 个账号", instances.size(), configs.length);
}
- public GateKlineWebSocketClient getKlineWebSocketClient() {
- return klinePriceClient;
+ @PreDestroy
+ public void destroy() {
+ log.info("[管理器] 开始销毁 {} 个账号...", instances.size());
+ for (AccountInstance instance : instances) {
+ try {
+ instance.destroy();
+ } catch (Exception e) {
+ log.error("[管理器] 账号 {} 销毁失败", instance.label, e);
+ }
+ }
+ log.info("[管理器] 销毁完成");
}
- public GateGridTradeService getGridTradeService() {
- return gridTradeService;
+ /** 获取账号数量 */
+ public int getInstanceCount() {
+ return instances.size();
+ }
+
+ /** 获取指定索引的 GridTradeService（用于外部监控/查询） */
+ public GateGridTradeService getGridTradeService(int index) {
+ return instances.get(index).service;
}
}
--
Gitblit v1.9.1