From 32a4abb5705499f49dfc4508aae0c4aa63a4e59d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 17 Jun 2026 10:32:14 +0800
Subject: [PATCH] fix(gateApi): 修复网格交易追加止损单ID计算逻辑
---
src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/AbstractPrivateChannelHandler.java | 106 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 83 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/AbstractPrivateChannelHandler.java b/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/AbstractPrivateChannelHandler.java
index 9cf12e9..f5dac39 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/AbstractPrivateChannelHandler.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/AbstractPrivateChannelHandler.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.modules.gateApi.GateGridTradeService;
-import com.xcong.excoin.modules.gateApi.wsHandler.GateChannelHandler;
import lombok.extern.slf4j.Slf4j;
import org.java_websocket.client.WebSocketClient;
@@ -12,7 +11,7 @@
import java.nio.charset.StandardCharsets;
/**
- * 私有频道的抽象基类，封装 HMAC-SHA512 签名和认证请求构建。
+ * 私有频道 WS 处理器的抽象基类，封装 HMAC-SHA512 签名认证与订阅/取消订阅逻辑。
*
* @author Administrator
*/
@@ -22,10 +21,12 @@
private static final char[] HEX_ARRAY = "0123456789abcdef".toCharArray();
private final String channelName;
- private final String apiKey;
- private final String apiSecret;
+ protected final String apiKey;
+ protected final String apiSecret;
private final String contract;
private final GateGridTradeService gridTradeService;
+
+ private volatile boolean subscribed = false;
public AbstractPrivateChannelHandler(String channelName,
String apiKey, String apiSecret,
@@ -38,45 +39,81 @@
this.gridTradeService = gridTradeService;
}
+ /** @return 频道名称（如 "futures.positions"） */
@Override
- public String getChannelName() {
- return channelName;
- }
+ public String getChannelName() { return channelName; }
+ /**
+ * 发送带签名的订阅请求。
+ *
+ * <h3>请求格式</h3>
+ * <pre>
+ * {
+ * "id": <唯一请求ID>,
+ * "time": <unix时间戳(秒)>,
+ * "channel":"futures.positions",
+ * "event": "subscribe",
+ * "payload":[userId, contract],
+ * "auth": {"method":"api_key", "KEY":<APIKEY>, "SIGN":<HMAC-SHA512签名>}
+ * }
+ * </pre>
+ */
@Override
public void subscribe(WebSocketClient ws) {
long timeSec = System.currentTimeMillis() / 1000;
JSONObject msg = buildAuthRequest("subscribe", buildUid(), timeSec);
ws.send(msg.toJSONString());
- log.info("[{}] 已发送订阅请求（含认证），合约: {}", channelName, contract);
+ log.info("[{}] 订阅成功, 合约:{}", channelName, contract);
}
+ /**
+ * 发送带签名的取消订阅请求，与 subscribe 结构一致。
+ * payload: [contract]，无 userId（取消订阅不需要用户ID）。
+ */
@Override
public void unsubscribe(WebSocketClient ws) {
- JSONObject unsubscribeMsg = new JSONObject();
- unsubscribeMsg.put("time", System.currentTimeMillis() / 1000);
- unsubscribeMsg.put("channel", channelName);
- unsubscribeMsg.put("event", "unsubscribe");
+ long timeSec = System.currentTimeMillis() / 1000;
+ JSONObject msg = new JSONObject();
+ msg.put("id", timeSec * 1000000 + (System.currentTimeMillis() % 1000));
+ msg.put("time", timeSec);
+ msg.put("channel", channelName);
+ msg.put("event", "unsubscribe");
JSONArray payload = new JSONArray();
payload.add(contract);
- unsubscribeMsg.put("payload", payload);
- ws.send(unsubscribeMsg.toJSONString());
- log.info("[{}] 已发送取消订阅请求，合约: {}", channelName, contract);
+ msg.put("payload", payload);
+ JSONObject auth = new JSONObject();
+ auth.put("method", "api_key");
+ auth.put("KEY", apiKey);
+ auth.put("SIGN", hs512Sign("unsubscribe", timeSec));
+ msg.put("auth", auth);
+ ws.send(msg.toJSONString());
+ log.info("[{}] 取消订阅成功, 合约:{}", channelName, contract);
}
- protected GateGridTradeService getGridTradeService() {
- return gridTradeService;
- }
+ /** @return 网格交易服务实例 */
+ protected GateGridTradeService getGridTradeService() { return gridTradeService; }
+ /** @return 当前订阅的合约名称 */
+ protected String getContract() { return contract; }
- protected String getContract() {
- return contract;
- }
-
+ /**
+ * 从策略服务获取用户 ID，用于私有频道订阅的 payload[0]。
+ *
+ * @return 用户 ID 字符串，获取失败返回空字符串
+ */
private String buildUid() {
return gridTradeService != null && gridTradeService.getUserId() != null
? String.valueOf(gridTradeService.getUserId()) : "";
}
+ /**
+ * 构建认证请求 JSON。
+ * 包含 id、time、channel、event、payload[userId, contract]、auth 字段。
+ *
+ * @param event 事件类型（"subscribe" / "unsubscribe"）
+ * @param uid 认证用户 ID
+ * @param timeSec unix 时间戳（秒）
+ * @return 完整的认证请求 JSONObject
+ */
private JSONObject buildAuthRequest(String event, String uid, long timeSec) {
JSONObject msg = new JSONObject();
msg.put("id", timeSec * 1000000 + (System.currentTimeMillis() % 1000));
@@ -95,7 +132,24 @@
return msg;
}
- private String hs512Sign(String event, long timeSec) {
+ /**
+ * HMAC-SHA512 签名计算。
+ *
+ * <h3>签名算法</h3>
+ * <pre>
+ * message = "channel={channelName}&event={event}&time={timeSec}"
+ * SIGN = Hex(HmacSHA512(apiSecret(UTF-8), message(UTF-8)))
+ * </pre>
+ *
+ * <h3>错误处理</h3>
+ * 签名计算失败时返回空字符串（日志记录错误），不抛异常，
+ * 避免阻塞 WebSocket 回调线程。
+ *
+ * @param event 事件类型
+ * @param timeSec unix 时间戳（秒）
+ * @return 十六进制签名字符串，失败返回 ""
+ */
+ protected String hs512Sign(String event, long timeSec) {
try {
String message = "channel=" + channelName + "&event=" + event + "&time=" + timeSec;
Mac mac = Mac.getInstance("HmacSHA512");
@@ -113,4 +167,10 @@
return "";
}
}
+
+ @Override
+ public boolean isSubscribed() { return subscribed; }
+
+ @Override
+ public void setSubscribed(boolean subscribed) { this.subscribed = subscribed; }
}
--
Gitblit v1.9.1