From 9cf8530b118a1261710f961ab87f00099e72ec40 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 04 Jun 2026 13:50:50 +0800
Subject: [PATCH] refactor(gateApi): 重构ApiClient创建逻辑以优化HTTP客户端配置
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 70 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
index 1f1dd41..d190e26 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -11,6 +11,9 @@
import io.gate.gateapi.models.*;
import lombok.extern.slf4j.Slf4j;
+import okhttp3.ConnectionPool;
+import okhttp3.OkHttpClient;
+
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -19,6 +22,7 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
import com.xcong.excoin.modules.gateApi.wsHandler.handler.CandlestickChannelHandler;
import com.xcong.excoin.modules.gateApi.wsHandler.handler.PositionClosesChannelHandler;
@@ -149,11 +153,24 @@
public GateGridTradeService(GateConfig config) {
this.config = config;
- ApiClient apiClient = new ApiClient();
- apiClient.setBasePath(config.getRestBasePath());
- apiClient.setApiKeySecret(config.getApiKey(), config.getApiSecret());
+ ApiClient apiClient = createApiClient(config);
this.futuresApi = new FuturesApi(apiClient);
this.executor = new GateTradeExecutor(apiClient, config.getContract());
+ }
+
+ private static ApiClient createApiClient(GateConfig config) {
+ OkHttpClient httpClient = new OkHttpClient.Builder()
+ .connectTimeout(30, TimeUnit.SECONDS)
+ .readTimeout(60, TimeUnit.SECONDS)
+ .writeTimeout(20, TimeUnit.SECONDS)
+ .connectionPool(new ConnectionPool(5, 5, TimeUnit.SECONDS))
+ .retryOnConnectionFailure(true)
+ .build();
+ ApiClient client = new ApiClient();
+ client.setBasePath(config.getRestBasePath());
+ client.setApiKeySecret(config.getApiKey(), config.getApiSecret());
+ client.setHttpClient(httpClient);
+ return client;
}
// ---- 初始化 ----
@@ -174,9 +191,7 @@
*/
public void init() {
try {
- ApiClient detailClient = new ApiClient();
- detailClient.setBasePath(config.getRestBasePath());
- detailClient.setApiKeySecret(config.getApiKey(), config.getApiSecret());
+ ApiClient detailClient = createApiClient(config);
AccountDetail detail = new AccountApi(detailClient).getAccountDetail();
this.userId = detail.getUserId();
log.info("[Gate] 用户ID: {}", userId);
@@ -305,7 +320,23 @@
longPriceQueue.clear();
currentLongOrderIds.clear();
currentShortOrderIds.clear();
- log.info("[Gate] 网格策略已启动");
+
+ // 每次重启重新获取当前本金
+ refreshInitialPrincipal();
+
+ log.info("[Gate] 网格策略已启动, 当前本金: {} USDT", initialPrincipal);
+ }
+
+ /**
+ * 重新获取当前账户权益作为初始本金。
+ */
+ private void refreshInitialPrincipal() {
+ try {
+ FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
+ this.initialPrincipal = new BigDecimal(account.getTotal());
+ } catch (Exception e) {
+ log.warn("[Gate] 获取初始化本金失败，使用旧值: {}", initialPrincipal);
+ }
}
/**
@@ -353,6 +384,8 @@
BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
cumulativePnl, unrealizedPnl, totalPnl);
+
+ startGrid();
return;
}
@@ -559,19 +592,12 @@
BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
cumulativePnl, unrealizedPnl, totalPnl);
-
- if (totalPnl.compareTo(config.getOverallTp()) >= 0) {
- log.info("[Gate] 已达止盈目标(合计{})→已停止, 已实现:{}, 未实现:{}",
- totalPnl, cumulativePnl, unrealizedPnl);
- state = StrategyState.STOPPED;
- } else if (totalPnl.compareTo(config.getMaxLoss().negate()) <= 0) {
+ if(totalPnl.compareTo(config.getMaxLoss().negate()) <= 0) {
String logMessage = StrUtil.format("[Gate] 已达亏损风险值(合计{}), 已实现:{}, 未实现:{}",
totalPnl, cumulativePnl, unrealizedPnl);
log.info(logMessage);
-
DingTalkUtils.getDefault().sendActionCard("风险提醒", logMessage, config.getApiKey(), "");
-// state = StrategyState.STOPPED;
}
}
@@ -913,7 +939,7 @@
triggerPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_1,
ORDER_TYPE_CLOSE_SHORT,
- "1",
+ config.getQuantity(),
profitId -> {
elem.setShortStopLossOrderId(profitId);
GridElement.refreshIndices();
@@ -933,7 +959,7 @@
triggerPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_2,
ORDER_TYPE_CLOSE_LONG,
- "-1",
+ negate(config.getQuantity()),
profitId -> {
elem.setLongStopLossOrderId(profitId);
GridElement.refreshIndices();
@@ -1380,7 +1406,7 @@
BigDecimal priceDiff = longEntryPrice.subtract(triggerPrice).abs();
int entryQty = priceDiff.divide(config.getStep(), 0, RoundingMode.DOWN).intValue();
entryQty = Math.max(1, entryQty);
- String size = String.valueOf(entryQty);
+ String size = new BigDecimal(String.valueOf(entryQty)).multiply(new BigDecimal(config.getQuantity())).toString();
log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}张多单, 均价:{}, 价差:{}, 步长:{}",
gridId, newEntryGridId, entryQty, longEntryPrice, priceDiff, config.getStep());
newEntryGrid.getLongTraderParam().setQuantity(size);
@@ -1420,7 +1446,7 @@
BigDecimal priceDiff = shortEntryPrice.subtract(triggerPrice).abs();
int entryQty = priceDiff.divide(config.getStep(), 0, RoundingMode.DOWN).intValue();
entryQty = Math.max(1, entryQty);
- String size = String.valueOf(entryQty);
+ String size = new BigDecimal(String.valueOf(entryQty)).multiply(new BigDecimal(config.getQuantity())).toString();
log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}张空单, 均价:{}, 价差:{}, 步长:{}",
gridId, newEntryGridId, entryQty, shortEntryPrice, priceDiff, config.getStep());
newEntryGrid.getShortTraderParam().setQuantity(size);
@@ -1451,7 +1477,7 @@
triggerPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_2,
ORDER_TYPE_CLOSE_LONG,
- "-1",
+ negate(config.getQuantity()),
profitId -> {
elem.setLongStopLossOrderId(profitId);
GridElement.refreshIndices();
@@ -1484,7 +1510,7 @@
triggerPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_1,
ORDER_TYPE_CLOSE_SHORT,
- "1",
+ config.getQuantity(),
profitId -> {
elem.setShortStopLossOrderId(profitId);
GridElement.refreshIndices();
@@ -1505,6 +1531,7 @@
unrealisedPnl, available, totalEquity, target);
if (totalEquity.compareTo(target) > 0) {
log.info("[Gate] 盈亏达标({}>{})，重置策略", totalEquity, target);
+ state = StrategyState.STOPPED;
closeExistingPositions();
futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
startGrid();
@@ -1515,6 +1542,7 @@
}
private void handlePositionZeroAndReset(String direction) {
+ state = StrategyState.STOPPED;
try {
futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
} catch (Exception e) {
--
Gitblit v1.9.1