From 6fdf1999c56c829b0d02eef53eb716c69533978e Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 08 Oct 2026 10:32:24 +0800
Subject: [PATCH] fix(gate-api): 修复网格交易重置策略中的竞态条件问题

---
 src/main/java/com/xcong/excoin/modules/gateApi/HeartbeatScheduler.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/HeartbeatScheduler.java b/src/main/java/com/xcong/excoin/modules/gateApi/HeartbeatScheduler.java
index 26cbd5c..1d5d9f9 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/HeartbeatScheduler.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/HeartbeatScheduler.java
@@ -3,6 +3,7 @@
 import com.xcong.excoin.modules.station.model.GateStatsEvent;
 import com.xcong.excoin.modules.station.model.HeartbeatMsg;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -24,6 +25,9 @@
 
     @Resource
     private GateWebSocketClientManager manager;
+
+    @Resource
+    private Environment environment;
 
     private String apiKeyMd5;
     private String hostPort;
@@ -61,7 +65,7 @@
             GateStatsEvent event = statsProducer.newHeartbeat(apiKeyMd5, hb);
             statsProducer.sendHeartbeat(event);
 
-            log.info("[Gate] 心跳已发送, state={}, apiKeyMd5={}", state, apiKeyMd5);
+//            log.info("[Gate] 心跳已发送, state={}, apiKeyMd5={}", state, apiKeyMd5);
         } catch (Exception e) {
             log.warn("[Gate] 心跳发送失败", e);
         }
@@ -70,8 +74,8 @@
     private String resolveHostPort() {
         try {
             String host = InetAddress.getLocalHost().getHostAddress();
-            // port 从 Spring 环境变量获取,默认 8888
-            String port = System.getProperty("server.port", "8888");
+            // port 从 Spring Environment 获取(兼容 --server.port=xxx 命令行参数),默认 8888
+            String port = environment.getProperty("server.port", "8888");
             return host + ":" + port;
         } catch (Exception e) {
             return "unknown";

--
Gitblit v1.9.1