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 | 169 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 113 insertions(+), 56 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 21885f0..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,89 +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.utils.RedisUtils;
+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 WebSocket 客户端和网格交易服务实例
+ * Gate 模块 Spring 入口，管理多个账号实例的生命周期。
+ *
+ * <h3>启动流程 ({@code @PostConstruct})</h3>
+ * <ol>
+ * <li>遍历 {@link #buildAccountConfigs()} 构建每个账号的 {@link GateConfig}</li>
+ * <li>每个账号创建独立的 {@link AccountInstance}（含 service + wsClient）</li>
+ * <li>逐个 init → startGrid</li>
+ * </ol>
+ *
+ * <h3>销毁流程 ({@code @PreDestroy})</h3>
+ * <ol>
+ * <li>遍历 instances：stopGrid + wsClient.destroy()</li>
+ * </ol>
+ *
+ * <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 RedisUtils redisUtils;
- @Autowired
- private WangGeListService wangGeListService;
- private GateKlineWebSocketClient klinePriceClient;
- private GateGridTradeService gridTradeService;
+ /** 所有账号实例列表 */
+ private final List<AccountInstance> instances = new ArrayList<>();
- private static final String API_KEY = "d90ca272391992b8e74f8f92cedb21ec";
- private static final String API_SECRET = "1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274";
+ /**
+ * 封装一个账号的完整运行时组件。
+ */
+ private static class AccountInstance {
+ final String label;
+ final GateConfig config;
+ final GateGridTradeService service;
+ final GateKlineWebSocketClient wsClient;
+
+ AccountInstance(GateConfig config) {
+ this.label = config.getLabel();
+ this.config = config;
+ this.service = new GateGridTradeService(config);
+ this.wsClient = new GateKlineWebSocketClient(config.getWsUrl());
+ }
+
+ 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();
+ }
+
+ void destroy() {
+ log.info("[{}] 开始销毁...", label);
+ service.stopGrid();
+ wsClient.destroy();
+ log.info("[{}] 销毁完成", label);
+ }
+ }
+
+ /**
+ * 在此方法中配置所有账号。
+ * <p>每个 {@link GateConfig} 对应一个账号，label 用于日志区分，
+ * isProduction 控制连接测试网(true=实盘)还是测试网(false=模拟盘)。
+ */
+ 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(),
+ };
+ }
@PostConstruct
public void init() {
- log.info("开始初始化GateWebSocketClientManager");
-
- try {
- gridTradeService = new GateGridTradeService(
- API_KEY, API_SECRET,
- "XAUT_USDT",
- "100",
- "cross",
- "dual",
- new BigDecimal("0.0035"),
- new BigDecimal("0.5"),
- 3,
- new BigDecimal("7.5"),
- "10"
- );
- gridTradeService.init();
-
- klinePriceClient = new GateKlineWebSocketClient(caoZuoService, this, wangGeListService);
- klinePriceClient.setGridTradeService(gridTradeService);
- klinePriceClient.init();
- log.info("已初始化GateKlineWebSocketClient");
-
- gridTradeService.startGrid();
- } catch (Exception e) {
- log.error("初始化GateWebSocketClientManager失败", e);
+ GateConfig[] configs = buildAccountConfigs();
+ log.info("[管理器] 开始初始化 {} 个账号...", configs.length);
+ for (GateConfig config : configs) {
+ try {
+ AccountInstance instance = new AccountInstance(config);
+ instance.init();
+ instances.add(instance);
+ } catch (Exception e) {
+ log.error("[管理器] 账号 {} 初始化失败", config.getLabel(), e);
+ }
}
+
+ log.info("[管理器] 初始化完成, 成功启动 {}/{} 个账号", instances.size(), configs.length);
}
@PreDestroy
public void destroy() {
- log.info("开始销毁GateWebSocketClientManager");
-
- if (gridTradeService != null) {
- gridTradeService.stopGrid();
- }
- if (klinePriceClient != null) {
+ log.info("[管理器] 开始销毁 {} 个账号...", instances.size());
+ for (AccountInstance instance : instances) {
try {
- klinePriceClient.destroy();
- log.info("已销毁GateKlineWebSocketClient");
+ instance.destroy();
} catch (Exception e) {
- log.error("销毁GateKlineWebSocketClient失败", e);
+ log.error("[管理器] 账号 {} 销毁失败", instance.label, e);
}
}
-
- log.info("GateWebSocketClientManager销毁完成");
+ log.info("[管理器] 销毁完成");
}
- public GateKlineWebSocketClient getKlineWebSocketClient() {
- return klinePriceClient;
+ /** 获取账号数量 */
+ public int getInstanceCount() {
+ return instances.size();
}
- public GateGridTradeService getGridTradeService() {
- return gridTradeService;
+ /** 获取指定索引的 GridTradeService（用于外部监控/查询） */
+ public GateGridTradeService getGridTradeService(int index) {
+ return instances.get(index).service;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1