From 56dc23009bc9b8aeceb92c022d1b2bedbe51fc9d Mon Sep 17 00:00:00 2001 From: hotyue <52734432+hotyue@users.noreply.github.com> Date: Mon, 1 Jun 2026 12:27:00 +0000 Subject: [PATCH] =?UTF-8?q?fix(core):=20=E6=9B=BF=E6=8D=A2=E5=AE=B9?= =?UTF-8?q?=E7=81=BE=E5=A4=9A=E5=AE=BF=E4=B8=BB=20IP=20=E5=BC=B9=E5=8C=A3?= =?UTF-8?q?=E7=9A=84=E6=8B=BC=E6=8E=A5=E7=AC=A6=EF=BC=88=E4=BB=8E=E9=80=97?= =?UTF-8?q?=E5=8F=B7=E6=94=B9=E4=B8=BA=E4=B8=8B=E5=88=92=E7=BA=BF=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E5=BD=BB=E5=BA=95=E8=A7=A3=E5=86=B3=E5=9B=A0=20Telegr?= =?UTF-8?q?am=20=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=8F=8A=20API=20=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E5=AD=97=E7=AC=A6=E6=88=AA=E6=96=AD=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E5=A4=9A=20IP=20=E7=B2=98=E8=BF=9E=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/install.sh | 10 +++++----- master/tg_master.sh | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/install.sh b/core/install.sh index d045982..c3ae377 100755 --- a/core/install.sh +++ b/core/install.sh @@ -497,18 +497,18 @@ if [ "$UPGRADE_MODE" == "false" ]; then # 注入次发弹药 (可用 IPv4) if [[ -n "$DETECT_V4" ]] && [[ "$DETECT_V4" != "$PUBLIC_IP" ]]; then - COMM_IP="${COMM_IP},${DETECT_V4}" + COMM_IP="${COMM_IP}_${DETECT_V4}" fi # 注入保底弹药 (可用 IPv6,带括号保护) if [[ -n "$DETECT_V6" ]] && [[ "$DETECT_V6" != "$PUBLIC_IP" ]]; then [[ "$DETECT_V6" != *"["* ]] && SAFE_V6="[${DETECT_V6}]" || SAFE_V6="$DETECT_V6" - COMM_IP="${COMM_IP},${SAFE_V6}" + COMM_IP="${COMM_IP}_${SAFE_V6}" fi SAFE_COMM_IP="$COMM_IP" - if [[ "$COMM_IP" == *","* ]]; then + if [[ "$COMM_IP" == *"_"* ]]; then echo -e " \033[32m✅ 成功组装多宿主容灾通讯专线: $SAFE_COMM_IP\033[0m" else echo -e " \033[33m⚠️ 本机仅有单一出口,建立单轨通讯模式: $SAFE_COMM_IP\033[0m" @@ -659,14 +659,14 @@ if [ "$UPGRADE_MODE" == "true" ]; then # 追加 V4 容灾备弹 if [[ -n "$RAW_V4" ]] && [[ "$NEW_COMM_IP" != *"$RAW_V4"* ]]; then - NEW_COMM_IP="${NEW_COMM_IP},${RAW_V4}" + NEW_COMM_IP="${NEW_COMM_IP}_${RAW_V4}" fi # 追加 V6 容灾备弹 if [[ -n "$RAW_V6" ]]; then [[ "$RAW_V6" != *"["* ]] && SAFE_V6="[${RAW_V6}]" || SAFE_V6="$RAW_V6" if [[ "$NEW_COMM_IP" != *"$SAFE_V6"* ]]; then - NEW_COMM_IP="${NEW_COMM_IP},${SAFE_V6}" + NEW_COMM_IP="${NEW_COMM_IP}_${SAFE_V6}" fi fi diff --git a/master/tg_master.sh b/master/tg_master.sh index f425264..f58a4e2 100755 --- a/master/tg_master.sh +++ b/master/tg_master.sh @@ -92,8 +92,8 @@ call_agent() { local suffix="$4" local res="FAILED" - # 拆解逗号分隔的 IP 列阵 (例如: [2a0b:...],66.181.x.x) - IFS=',' read -r -a ip_array <<< "$ips" + # 拆解下划线分隔的 IP 列阵 (例如: [2a0b...]_66.181.x.x) + IFS='_' read -r -a ip_array <<< "$ips" for ip in "${ip_array[@]}"; do if [ -n "$ip" ]; then local url=$(generate_signed_url "$ip" "$port" "$path") @@ -266,8 +266,8 @@ while true; do 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';" # 动态人性化回执:在 TG 侧清晰地向管理者展示主备双通道的录入态势 - MAIN_SHOW_IP=$(echo "$AGENT_IP" | cut -d',' -f1) - BACKUP_SHOW_IP=$(echo "$AGENT_IP" | cut -d',' -f2-) + 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