From 58c08213bf6dac60fde9bc18c16fcbecc93cfe5d Mon Sep 17 00:00:00 2001 From: hotyue <52734432+hotyue@users.noreply.github.com> Date: Mon, 1 Jun 2026 08:05:12 +0000 Subject: [PATCH] =?UTF-8?q?fix(master):=20=E5=AE=8C=E5=96=84=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E8=A7=A3=E5=8C=85=E6=95=B0=E6=8D=AE=E9=93=BE=EF=BC=8C?= =?UTF-8?q?=E5=AE=8C=E7=BE=8E=E5=9B=BA=E5=8C=96=E9=80=97=E5=8F=B7=E5=88=86?= =?UTF-8?q?=E9=9A=94=E7=9A=84=E5=A4=9A=E5=AE=BF=E4=B8=BB=E9=80=9A=E8=AE=AF?= =?UTF-8?q?=E5=AF=BB=E5=9D=80=E6=B1=A0=EF=BC=8C=E5=AF=B9=E9=BD=90=20v4.2.2?= =?UTF-8?q?=20=E5=AE=B9=E7=81=BE=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- master/tg_master.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/master/tg_master.sh b/master/tg_master.sh index 4c65866..f425264 100755 --- a/master/tg_master.sh +++ b/master/tg_master.sh @@ -262,8 +262,18 @@ while true; do continue fi + # [v4.2.2 容灾对齐] 允许 agent_ip 字段以逗号分隔的形式完整固化多路由通道 db_exec "INSERT INTO nodes (chat_id, node_name, agent_ip, agent_port, last_seen, region, node_alias, enable_ota) VALUES ('$CHAT_ID', '$NODE_NAME', '$AGENT_IP', '$AGENT_PORT', CURRENT_TIMESTAMP, '$AGENT_REGION', '$NODE_ALIAS', '$AGENT_OTA') ON CONFLICT(chat_id, node_name) DO UPDATE SET agent_ip='$AGENT_IP', agent_port='$AGENT_PORT', last_seen=CURRENT_TIMESTAMP, region='$AGENT_REGION', node_alias='$NODE_ALIAS', enable_ota='$AGENT_OTA';" - send_msg "$CHAT_ID" "✅ **司令部确认 (v${MASTER_VERSION})**%0A节点 \`${NODE_ALIAS}\` 档案已录入!" + + # 动态人性化回执:在 TG 侧清晰地向管理者展示主备双通道的录入态势 + MAIN_SHOW_IP=$(echo "$AGENT_IP" | cut -d',' -f1) + BACKUP_SHOW_IP=$(echo "$AGENT_IP" | cut -d',' -f2-) + if [ -n "$BACKUP_SHOW_IP" ]; then + SHOW_MSG="✅ **司令部确认 (v${MASTER_VERSION})**%0A节点 \`${NODE_ALIAS}\` 档案已录入!%0A🌐 主通讯:\`${MAIN_SHOW_IP}\`%0A📡 容灾备用:\`${BACKUP_SHOW_IP}\`" + else + SHOW_MSG="✅ **司令部确认 (v${MASTER_VERSION})**%0A节点 \`${NODE_ALIAS}\` 档案已录入!%0A🌐 通讯 IP:\`${MAIN_SHOW_IP}\`" + fi + send_msg "$CHAT_ID" "$SHOW_MSG" REGION_DATA=$(db_exec "SELECT region, COUNT(*) FROM nodes WHERE chat_id='$CHAT_ID' GROUP BY region;") if [ -n "$REGION_DATA" ]; then