From d92024a145129d639d7dfc4f4fec341a54165824 Mon Sep 17 00:00:00 2001 From: yarnom Date: Wed, 29 Oct 2025 18:10:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=20=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E9=80=9A=E9=81=932?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sideslope/rtkcluster/RtkClusterService.java | 11 ++--------- .../sideslope/rtkcluster/RtkrcvConfigService.java | 4 +--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/rtkcluster/RtkClusterService.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/rtkcluster/RtkClusterService.java index f9982554..f80e580a 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/rtkcluster/RtkClusterService.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/rtkcluster/RtkClusterService.java @@ -95,15 +95,8 @@ public class RtkClusterService implements ApplicationRunner { String localPath = "127.0.0.1:" + workPort; profile.setInpstr1Path(localPath); profile.setOutstr1Path(localPath); - // Also write outstr2_path from group if present - try { - if (profile.getGroupId() != null && groupMapper != null) { - RtkrcvGroup group = groupMapper.selectById(profile.getGroupId()); - if (group != null && group.getOutstr2Path() != null && !group.getOutstr2Path().trim().isEmpty()) { - profile.setOutstr2Path(group.getOutstr2Path().trim()); - } - } - } catch (Exception ignore) {} + // Set outstr2-path to the same local endpoint as requested + profile.setOutstr2Path(localPath); profileMapper.updateById(profile); // 3) Generate config and start rtkrcv diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/rtkcluster/RtkrcvConfigService.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/rtkcluster/RtkrcvConfigService.java index 96c94c49..b0d55885 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/rtkcluster/RtkrcvConfigService.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/rtkcluster/RtkrcvConfigService.java @@ -73,13 +73,11 @@ public class RtkrcvConfigService { replaced = replaceIfNotBlank(replaced, "outstr2-path", profile.getOutstr2Path()); // If local tcp endpoints are used (e.g., 127.0.0.1:port), force type to tcpcli if (looksLikeTcpEndpoint(profile.getInpstr1Path())) { - replaced = replaceValueLine(replaced, "inpstr1-type", "tcpcli"); - // relax timeouts to avoid frequent reconnects on local streams replaced = replaceValueLine(replaced, "misc-timeout", "300000"); replaced = replaceValueLine(replaced, "misc-reconnect", "3000"); } if (looksLikeTcpEndpoint(profile.getOutstr1Path())) { - replaced = replaceValueLine(replaced, "outstr1-type", "tcpcli"); + // Do not force outstr1-type; only relax timeouts for local tcp endpoints replaced = replaceValueLine(replaced, "misc-timeout", "300000"); replaced = replaceValueLine(replaced, "misc-reconnect", "3000"); }