From 43f2e9845912968b5d4a4e19a8bc9af6b4017793 Mon Sep 17 00:00:00 2001
From: hotyue <52734432+hotyue@users.noreply.github.com>
Date: Wed, 15 Apr 2026 03:56:55 +0000
Subject: [PATCH] =?UTF-8?q?refactor(master):=20=E5=89=A5=E7=A6=BB=E5=86=99?=
 =?UTF-8?q?=E6=AD=BB=E7=89=88=E6=9C=AC=EF=BC=8C=E4=B8=A5=E6=A0=BC=E8=90=BD?=
 =?UTF-8?q?=E5=AE=9E=E8=BF=90=E8=A1=8C=E6=80=81=E9=85=8D=E7=BD=AE=E7=BB=A7?=
 =?UTF-8?q?=E6=89=BF=EF=BC=8C=E4=BC=98=E5=8C=96=E5=8D=B8=E8=BD=BD=E8=BF=9B?=
 =?UTF-8?q?=E7=A8=8B=E7=BB=9E=E6=9D=80=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 master/tg_master.sh        | 8 +++++---
 master/uninstall_master.sh | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/master/tg_master.sh b/master/tg_master.sh
index 196c431..93e5d82 100755
--- a/master/tg_master.sh
+++ b/master/tg_master.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # ==========================================================
-# 脚本名称: tg_master.sh (Master 端调度枢纽 V3.3.2 动态签名版)
+# 脚本名称: tg_master.sh (Master 端调度枢纽 - 动态锚点版)
 # 核心功能: 监听 TG、操作 SQLite、Webhook 精准调度、403权限拦截、僵尸节点清理
 # ==========================================================
 
@@ -9,9 +9,11 @@ CONF="/opt/ip_sentinel_master/master.conf"
 [ ! -f "$CONF" ] && exit 1
 source "$CONF"
 
-# [v3.4.0 核心: 主控版本锚点与云通信地址]
-MASTER_VERSION="3.4.0"
+# [核心: 运行态版本继承与云通信地址]
 REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/main"
+# MASTER_VERSION 已经在上方的 source "$CONF" 中被载入
+# 如果本地极度陈旧没有该变量，才给定一个基础兜底值，避免变量为空导致崩溃
+MASTER_VERSION=${MASTER_VERSION:-"3.5.0"}
 
 OFFSET_FILE="${MASTER_DIR}/.tg_offset"
 [[ -f $OFFSET_FILE ]] || echo "0" > $OFFSET_FILE
diff --git a/master/uninstall_master.sh b/master/uninstall_master.sh
index 631ea07..f391a36 100644
--- a/master/uninstall_master.sh
+++ b/master/uninstall_master.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # ==========================================================
-# 脚本名称: uninstall_master.sh (IP-Sentinel Master 一键卸载脚本 v3.4.0)
+# 脚本名称: uninstall_master.sh (IP-Sentinel Master 一键卸载脚本 - 动态锚点版)
 # 核心功能: 终止调度进程、清理看门狗定时任务、抹除数据库与配置
 # ==========================================================
 
@@ -27,7 +27,8 @@ fi
 
 # 1. 停止运行中的 Master 守护进程
 echo "[1/3] 正在终止后台中枢调度进程..."
-pgrep -f tg_master.sh | xargs -r kill -9 >/dev/null 2>&1
+# [优化] 使用 pkill 替代 pgrep | xargs，指令更短、容错率更高
+pkill -9 -f "tg_master.sh" >/dev/null 2>&1 || true
 
 # 2. 清除看门狗定时任务 (Cron)
 echo "[2/3] 正在清理系统定时任务 (Cron)..."