Merge branch 'test'

2026-07-30 12:48:29 +08:00
parent 93d11d00a2 66fc634706
commit 5a28775f84
12 changed files with 735 additions and 292 deletions
@@ -1,48 +1,30 @@
-# ============================================================
-# 构建阶段
-# ============================================================
+# 多阶段构建
 FROM golang:alpine AS builder

 WORKDIR /app

-# 复制依赖文件
 COPY go.mod go.sum ./
+
+RUN sed -i 's/go 1.2[6-9].*/go 1.21/' go.mod && go mod tidy
 RUN go env -w GOPROXY=https://goproxy.cn,direct
 RUN go mod download

-# 复制源码（确保 bin/ 和 static/ 目录存在）
 COPY . .

-# 编译 Linux 版（CGO_ENABLED=0 保证静态编译）
+# 编译时不注入任何版本信息（纯净二进制）
 RUN CGO_ENABLED=0 GOOS=linux go build \
    -ldflags="-s -w" \
    -o frpc-console .

-# ============================================================
-# 运行阶段
-# ============================================================
 FROM alpine:latest

-# 安装 ca-certificates 和 tzdata（确保 HTTPS 和时区正常）
-RUN apk add --no-cache ca-certificates sqlite tzdata
+RUN apk --no-cache add ca-certificates tzdata sqlite

 WORKDIR /app

-# 从构建阶段复制编译好的二进制
 COPY --from=builder /app/frpc-console /app/frpc-console
+COPY static/ /app/static/

-# 创建数据目录（用于持久化 db 和日志）
-RUN mkdir -p /app/data
-
-# 暴露端口（默认 9300）
 EXPOSE 9300

-# 环境变量
-ENV PORT=9300
-ENV TZ=Asia/Shanghai
-
-# 数据卷（持久化数据库、配置、日志）
-VOLUME ["/app/data"]
-
-# 启动
 ENTRYPOINT ["/app/frpc-console"]
@@ -4,13 +4,10 @@ import (
 	"bytes"
 	"embed"
 	"fmt"
-	"io"
 	"io/fs"
 	"net"
 	"net/http"
-	"os"
 	"strconv"
-	"strings"
 	"text/template"
 	"time"

@@ -399,7 +396,8 @@ func getFrpcStatusHandler(c *gin.Context) {
 // ========== 日志 Handler ==========

 func getFrpcLogHandler(c *gin.Context) {
-	lines, err := readTailLog("./frpc.log", 200)
+	// readTailLog 在 frp.go 中定义，读取 ./data/frpc.log
+	lines, err := readTailLog("./data/frpc.log", 200)
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
 			"code": 0,
@@ -420,88 +418,6 @@ func getFrpcLogHandler(c *gin.Context) {
 	})
 }

-// readTailLog 读取文件末尾 n 行（倒序读取，返回正序）
-func readTailLog(filePath string, n int) ([]string, error) {
-	file, err := os.Open(filePath)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	// 获取文件大小
-	info, err := file.Stat()
-	if err != nil {
-		return nil, err
-	}
-	fileSize := info.Size()
-	if fileSize == 0 {
-		return []string{}, nil
-	}
-
-	// 从末尾开始读
-	const chunkSize = 4096
-	var lines []string
-	var leftover []byte
-	offset := fileSize
-
-	for len(lines) < n && offset > 0 {
-		// 计算读取起点
-		readSize := chunkSize
-		if offset < int64(chunkSize) {
-			readSize = int(offset)
-		}
-		offset -= int64(readSize)
-
-		// 读取这一块
-		buf := make([]byte, readSize)
-		_, err := file.ReadAt(buf, offset)
-		if err != nil && err != io.EOF {
-			return nil, err
-		}
-
-		// 将当前块与之前剩下的拼接
-		data := append(buf, leftover...)
-		leftover = nil
-
-		// 按行分割（从后往前）
-		start := 0
-		for i := len(data) - 1; i >= 0; i-- {
-			if data[i] == '\n' {
-				if i+1 < len(data) {
-					line := string(data[i+1:])
-					if line != "" {
-						lines = append([]string{line}, lines...)
-						if len(lines) >= n {
-							break
-						}
-					}
-				}
-				start = i
-			}
-		}
-
-		// 如果还没凑够，把未处理的部分留到下一轮
-		if len(lines) < n && start > 0 {
-			leftover = data[:start]
-		}
-	}
-
-	// 处理最后剩余部分（文件开头）
-	if len(lines) < n && len(leftover) > 0 {
-		parts := strings.Split(string(leftover), "\n")
-		for i := len(parts) - 1; i >= 0; i-- {
-			if parts[i] != "" {
-				lines = append([]string{parts[i]}, lines...)
-				if len(lines) >= n {
-					break
-				}
-			}
-		}
-	}
-
-	return lines, nil
-}
-
 // ========== Ping Handler ==========

 func pingHandler(c *gin.Context) {
@@ -619,7 +535,6 @@ func ExportTomlHandler(c *gin.Context) {
 		}
 	}

-	// 构建与 GenerateFrpcConfig 一致的数据结构
 	data := struct {
 		*GlobalConfig
 		Proxies          []Proxy
@@ -17,17 +17,7 @@ import (

 var DB *sql.DB

-// ============================================================
-// 数据库版本常量
-// ============================================================
-
-const (
-	SchemaVersion = "v2" // 当前数据库 Schema 版本
-)
-
-// ============================================================
-// 数据模型
-// ============================================================
+const SchemaVersion = "v2"

 type GlobalConfig struct {
 	ID                int    `json:"id"`
@@ -61,12 +51,21 @@ type User struct {
 	CreatedAt    string `json:"createdAt"`
 }

+<<<<<<< HEAD
 // ============================================================
 // 数据库初始化

+=======
+>>>>>>> test
 func InitDB() error {
+	// 确保 data 目录存在
+	if err := os.MkdirAll("./data", 0755); err != nil {
+		return fmt.Errorf("创建数据目录失败: %w", err)
+	}
+
+	dbPath := "./data/frpc-console.db"
 	var err error
-	DB, err = sql.Open("sqlite", "./frpc-console.db")
+	DB, err = sql.Open("sqlite", dbPath)
 	if err != nil {
 		return err
 	}
@@ -87,12 +86,7 @@ func InitDB() error {
 	return nil
 }

-// ============================================================
-// 建表
-// ============================================================
-
 func createTables() error {
-	// 用户表
 	_, err := DB.Exec(`
        CREATE TABLE IF NOT EXISTS users (
            id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -106,7 +100,6 @@ func createTables() error {
 		return err
 	}

-	// 全局配置表
 	_, err = DB.Exec(`
        CREATE TABLE IF NOT EXISTS global_config (
            id INTEGER PRIMARY KEY CHECK (id = 1),
@@ -128,7 +121,6 @@ func createTables() error {
 		return err
 	}

-	// 隧道表
 	_, err = DB.Exec(`
        CREATE TABLE IF NOT EXISTS proxies (
            id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -146,7 +138,6 @@ func createTables() error {
 		return err
 	}

-	// 应用配置表
 	_, err = DB.Exec(`
        CREATE TABLE IF NOT EXISTS app_config (
            key TEXT PRIMARY KEY,
@@ -158,7 +149,6 @@ func createTables() error {
 		return err
 	}

-	// 初始化默认配置
 	var count int
 	DB.QueryRow("SELECT COUNT(*) FROM global_config").Scan(&count)
 	if count == 0 {
@@ -178,10 +168,6 @@ func createTables() error {
 	return nil
 }

-// ============================================================
-// 迁移引擎
-// ============================================================
-
 func getCurrentSchemaVersion() string {
 	var version string
 	err := DB.QueryRow("SELECT value FROM app_config WHERE key = 'schema_version'").Scan(&version)
@@ -209,13 +195,13 @@ func setSchemaVersion(version string) error {
 }

 func backupDatabase() (string, error) {
-	src := "./frpc-console.db"
+	src := "./data/frpc-console.db"
 	if _, err := os.Stat(src); os.IsNotExist(err) {
 		return "", nil
 	}

 	timestamp := time.Now().Format("20060102_150405")
-	dst := fmt.Sprintf("./frpc-console.db.pre-%s.%s", SchemaVersion, timestamp)
+	dst := fmt.Sprintf("./data/frpc-console.db.pre-%s.%s", SchemaVersion, timestamp)

 	srcFile, err := os.Open(src)
 	if err != nil {
@@ -244,7 +230,7 @@ func restoreDatabase(backupPath string) error {
 	}
 	defer srcFile.Close()

-	dstFile, err := os.Create("./frpc-console.db")
+	dstFile, err := os.Create("./data/frpc-console.db")
 	if err != nil {
 		return err
 	}
@@ -265,7 +251,6 @@ func runMigrations() error {
 	log.Printf("📌 当前数据库 Schema: %s, 目标版本: %s", currentVer, targetVer)

 	if currentVer == targetVer {
-		// 检查数据库是否包含有效数据
 		var userCount int
 		err := DB.QueryRow("SELECT COUNT(*) FROM users").Scan(&userCount)
 		if err != nil || userCount == 0 {
@@ -295,7 +280,6 @@ func runMigrations() error {

 	if currentSchema == nil || schemaVersionsEqual(currentSchema, targetSchema) {
 		log.Println("  迁移类型: 轻量复制（Schema 无变更）")
-		// 验证数据库是否有效
 		var userCount int
 		err := DB.QueryRow("SELECT COUNT(*) FROM users").Scan(&userCount)
 		if err != nil || userCount == 0 {
@@ -441,10 +425,6 @@ func buildInsertSQL(oldTable, newTable string, oldDef, newDef *SchemaVersionDef)
 	), nil
 }

-// ============================================================
-// JWT 密钥管理
-// ============================================================
-
 func ensureJwtSecret() error {
 	var value string
 	err := DB.QueryRow("SELECT value FROM app_config WHERE key = 'jwt_secret'").Scan(&value)
@@ -477,10 +457,6 @@ func GetJwtSecret() (string, error) {
 	return secret, nil
 }

-// ============================================================
-// 全局配置 CRUD
-// ============================================================
-
 func GetGlobalConfig() (*GlobalConfig, error) {
 	var cfg GlobalConfig
 	err := DB.QueryRow(`
@@ -516,10 +492,6 @@ func UpdateGlobalConfig(cfg *GlobalConfig) error {
 	return err
 }

-// ============================================================
-// 隧道 CRUD
-// ============================================================
-
 func GetProxies() ([]Proxy, error) {
 	rows, err := DB.Query(`
        SELECT id, name, type, local_ip, local_port, remote_port, enabled
@@ -582,10 +554,6 @@ func DeleteProxy(id int) error {
 	return err
 }

-// ============================================================
-// 用户 CRUD
-// ============================================================
-
 func GetUserByUsername(username string) (*User, error) {
 	var u User
 	err := DB.QueryRow(`
@@ -1,45 +1,35 @@
 #!/bin/bash

 # ============================================================
+<<<<<<< HEAD
 # frpc-console 一键部署脚本（Docker 优先）
 # 支持：Linux x86_64 / ARM64 / ARMv7
 # 自动安装：git / curl / wget / Docker
 # 
+=======
+# frpc-console 一键部署脚本 (Docker 优先)
+>>>>>>> test
 # 用法:
-#   ./deploy.sh           # 完整交互流程
-#   ./deploy.sh --yes     # 跳过确认，直接执行
-#   ./deploy.sh --check   # 只检测环境，不执行
-#   ./deploy.sh --dry-run # 显示将执行的操作，不实际执行
+#   run-deploy.sh 引导后自动执行
 # ============================================================

 set -e

 # ---------- 颜色检测 ----------
 if [ -t 1 ]; then
-    RED='\033[0;31m'
-    GREEN='\033[0;32m'
-    YELLOW='\033[1;33m'
-    BLUE='\033[0;34m'
-    CYAN='\033[0;36m'
-    MAGENTA='\033[0;35m'
-    NC='\033[0m'
+    RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'
+    BLUE='\033[0;34m'; CYAN='\033[0;36m'; MAGENTA='\033[0;35m'; NC='\033[0m'
 else
-    RED=''
-    GREEN=''
-    YELLOW=''
-    BLUE=''
-    CYAN=''
-    MAGENTA=''
-    NC=''
+    RED=''; GREEN=''; YELLOW=''; BLUE=''; CYAN=''; MAGENTA=''; NC=''
 fi

 # ---------- 配置 ----------
 REPO_URL="https://git.whitetop.xyz/lxh2875931338/frpc-console.git"
-BRANCH="main"
 WORK_DIR="/tmp/frpc-console-build"
 DEFAULT_PORT=9300
 DEFAULT_DEPLOY_DIR="/opt/frpc-console"
 IMAGE_NAME="frpc-console"
+<<<<<<< HEAD

 # ---------- 状态变量 ----------
 OS=""
@@ -52,16 +42,22 @@ HAS_DOCKER=false
 NEED_INSTALL_GIT=false
 NEED_INSTALL_CURL=false
 NEED_INSTALL_WGET=false
+=======
+KEEP_IMAGES=3
+
+# ---------- 状态变量 ----------
+OS=""; OS_VERSION=""; ARCH=""
+HAS_GIT=false; HAS_CURL=false; HAS_WGET=false; HAS_DOCKER=false
+NEED_INSTALL_GIT=false; NEED_INSTALL_CURL=false; NEED_INSTALL_WGET=false
+>>>>>>> test
 PORT=${DEFAULT_PORT}
 DEPLOY_DIR=${DEFAULT_DEPLOY_DIR}
 DATA_DIR="${DEPLOY_DIR}/data"
-CONTAINER_EXISTS=false
-CONTAINER_RUNNING=false
-SKIP_CONFIRM=false
-CHECK_ONLY=false
-DRY_RUN=false
+CONTAINER_EXISTS=false; CONTAINER_RUNNING=false
+SKIP_CONFIRM=false; CHECK_ONLY=false; DRY_RUN=false
+CHANNEL=""; BRANCH=""; TARGET_VERSION=""; IMAGE_TAG=""
+CURRENT_VERSION=""

-# ---------- 打印函数 ----------
 print_info() { echo -e "${BLUE}[INFO]${NC} $1"; }
 print_success() { echo -e "${GREEN}[✓]${NC} $1"; }
 print_warn() { echo -e "${YELLOW}[⚠]${NC} $1"; }
@@ -79,29 +75,18 @@ parse_args() {
            --dry-run) DRY_RUN=true ;;
            --help|-h)
                echo "用法: ./deploy.sh [选项]"
-                echo ""
                echo "选项:"
-                echo "  --yes, -y     跳过所有确认提示，直接执行"
+                echo "  --yes, -y     跳过所有确认提示"
                echo "  --check       只检测环境，不执行部署"
                echo "  --dry-run     显示将执行的操作，不实际执行"
                echo "  --help, -h    显示帮助信息"
-                echo ""
-                echo "示例:"
-                echo "  ./deploy.sh           # 完整交互流程"
-                echo "  ./deploy.sh --yes     # 无人值守部署"
-                echo "  ./deploy.sh --check   # 只检测环境"
                exit 0
                ;;
-            *)
-                print_error "未知选项: $arg"
-                echo "使用 --help 查看帮助"
-                exit 1
-                ;;
+            *) print_error "未知选项: $arg"; exit 1 ;;
        esac
    done
 }

-# ---------- 检查 root ----------
 check_root() {
    if [ "$EUID" -ne 0 ]; then
        print_error "请使用 root 权限运行此脚本"
@@ -110,19 +95,16 @@ check_root() {
    fi
 }

-# ---------- 检测操作系统 ----------
 detect_os() {
    if [ -f /etc/os-release ]; then
        . /etc/os-release
-        OS=$ID
-        OS_VERSION=$VERSION_ID
+        OS=$ID; OS_VERSION=$VERSION_ID
    else
        print_error "无法识别操作系统"
        exit 1
    fi
 }

-# ---------- 检测 CPU 架构 ----------
 detect_arch() {
    ARCH=$(uname -m)
    case $ARCH in
@@ -136,7 +118,6 @@ detect_arch() {
    esac
 }

-# ---------- 检测工具 ----------
 check_tools() {
    command -v git &> /dev/null && HAS_GIT=true || NEED_INSTALL_GIT=true
    command -v curl &> /dev/null && HAS_CURL=true || NEED_INSTALL_CURL=true
@@ -144,7 +125,6 @@ check_tools() {
    command -v docker &> /dev/null && HAS_DOCKER=true
 }

-# ---------- 检查容器状态 ----------
 check_container() {
    if docker ps -a --format '{{.Names}}' 2>/dev/null | grep -q "^frpc-console$"; then
        CONTAINER_EXISTS=true
@@ -154,7 +134,89 @@ check_container() {
    fi
 }

-# ---------- 检测结果汇总 ----------
+# ---------- 版本管理 ----------
+read_version_from_remote() {
+    local branch="$1"
+    local version_url="https://git.whitetop.xyz/lxh2875931338/frpc-console/raw/${branch}/version.ini"
+    local content
+    content=$(curl -sSL "$version_url" 2>/dev/null)
+    if [ -z "$content" ]; then
+        print_error "无法从远程读取 version.ini: $version_url"
+        return 1
+    fi
+    SEMVER=$(echo "$content" | grep -v "^[;#]" | head -1 | awk '{print $1}')
+    echo "$SEMVER"
+}
+
+generate_target_version() {
+    local channel="$1"
+    local branch="${2:-$BRANCH}"
+    SEMVER=$(read_version_from_remote "$branch")
+    if [ -z "$SEMVER" ]; then
+        print_error "读取语义版本失败"
+        exit 1
+    fi
+    local minor="${SEMVER#*.}"
+    if [ "$minor" = "0" ] || [ "$minor" = "5" ]; then
+        CHANNEL_TYPE="lts"
+    else
+        CHANNEL_TYPE="preview"
+    fi
+    if [ "$channel" = "lts" ] || [ "$CHANNEL_TYPE" = "lts" ]; then
+        TARGET_VERSION="${SEMVER}-lts-$(date +%Y%m%d)"
+        IMAGE_TAG="${SEMVER}-lts-$(date +%Y%m%d)"
+    else
+        TIMESTAMP=$(date +%Y%m%d-%H%M%S)
+        TARGET_VERSION="${SEMVER}-preview-${TIMESTAMP}"
+        IMAGE_TAG="preview-${TIMESTAMP}"
+    fi
+}
+
+get_current_version() {
+    local version_file="${DEPLOY_DIR}/version.ini"
+    if [ -f "$version_file" ]; then
+        grep -v "^[;#]" "$version_file" | head -1 | tr -d '\n'
+    else
+        if [ "$CONTAINER_EXISTS" = true ]; then
+            docker exec frpc-console cat /app/version.ini 2>/dev/null | grep -v "^[;#]" | head -1 | tr -d '\n' || echo ""
+        else
+            echo ""
+        fi
+    fi
+}
+
+# ---------- 通道选择 ----------
+select_channel() {
+    if [ -n "$DEPLOY_CHANNEL" ] && [ -n "$DEPLOY_BRANCH" ]; then
+        CHANNEL="$DEPLOY_CHANNEL"
+        BRANCH="$DEPLOY_BRANCH"
+        print_info "使用环境变量: ${CHANNEL} 通道 (${BRANCH} 分支)"
+        return
+    fi
+    if [ -n "$CHANNEL" ]; then
+        if [ "$CHANNEL" != "lts" ] && [ "$CHANNEL" != "preview" ]; then
+            print_error "无效通道: $CHANNEL"
+            exit 1
+        fi
+        BRANCH="$([ "$CHANNEL" = "preview" ] && echo "test" || echo "main")"
+        return
+    fi
+    echo ""
+    echo -e "${CYAN}请选择部署通道:${NC}"
+    echo "  1. LTS (稳定版) [默认] → main 分支"
+    echo "  2. Preview (技术预览版) → test 分支"
+    echo ""
+    read -p "请选择 [1]: " CHANNEL_INPUT </dev/tty
+    CHANNEL_INPUT=${CHANNEL_INPUT:-1}
+    case $CHANNEL_INPUT in
+        1|"") CHANNEL="lts"; BRANCH="main" ;;
+        2) CHANNEL="preview"; BRANCH="test" ;;
+        *) print_error "无效选择"; exit 1 ;;
+    esac
+    print_info "已选择: ${CHANNEL} 通道 (${BRANCH} 分支)"
+}
+
+# ---------- 环境汇总 ----------
 print_environment_summary() {
    print_title
    print_subtitle "环境检测结果"
@@ -185,28 +247,23 @@ print_environment_summary() {
    else
        echo "    docker  ❌ 未安装"
        print_error "Docker 未安装，请先安装 Docker"
-        echo ""
-        echo "  快速安装:"
-        echo "    curl -fsSL https://get.docker.com | bash"
-        echo "    systemctl enable --now docker"
-        echo ""
        exit 1
    fi
-
    if [ "$CONTAINER_EXISTS" = true ]; then
        echo ""
        echo "  ${CYAN}容器状态:${NC}"
        if [ "$CONTAINER_RUNNING" = true ]; then
-            echo -e "    frpc-console  ✅ 运行中 (将停止并重建)"
+            echo -e "    frpc-console  ✅ 运行中"
        else
-            echo -e "    frpc-console  ⏸️  已停止 (将重建)"
+            echo -e "    frpc-console  ⏸️  已停止"
        fi
-        echo -e "    ${YELLOW}数据目录中的数据库文件将被保留${NC}"
+        CURRENT_VERSION=$(get_current_version)
+        [ -n "$CURRENT_VERSION" ] && echo -e "  ${CYAN}当前版本:${NC} $CURRENT_VERSION"
    fi
    echo ""
 }

-# ---------- 生成操作列表 ----------
+# ---------- 部署计划 ----------
 generate_plan() {
    PLAN=""
    if [ "$NEED_INSTALL_GIT" = true ] || [ "$NEED_INSTALL_CURL" = true ] || [ "$NEED_INSTALL_WGET" = true ]; then
@@ -217,14 +274,18 @@ generate_plan() {
        PLAN="${PLAN}  • 安装必要工具:${pkgs}\n"
    fi
    PLAN="${PLAN}  • 拉取 frpc-console 源码 (${BRANCH} 分支)\n"
+<<<<<<< HEAD
    PLAN="${PLAN}  • 构建 Docker 镜像（源码内编译）\n"
+=======
+    PLAN="${PLAN}  • 构建 Docker 镜像: ${IMAGE_NAME}:${IMAGE_TAG}\n"
+    PLAN="${PLAN}  • 目标版本: ${TARGET_VERSION}\n"
+>>>>>>> test
    if [ "$CONTAINER_EXISTS" = true ]; then
        PLAN="${PLAN}  • 停止并删除旧容器\n"
    fi
-    PLAN="${PLAN}  • 启动 frpc-console 容器"
+    PLAN="${PLAN}  • 启动 frpc-console 容器 (端口 ${PORT})"
 }

-# ---------- 展示部署计划 ----------
 print_deployment_plan() {
    print_title
    print_subtitle "部署计划"
@@ -236,23 +297,19 @@ print_deployment_plan() {
    echo -e "    ────────────────────────────────────"
    echo -e "    监听端口      : ${PORT}"
    echo -e "    部署目录      : ${DEPLOY_DIR}"
-    echo -e "    数据目录      : ${DATA_DIR}"
+    echo -e "    目标版本      : ${TARGET_VERSION}"
+    echo -e "    镜像标签      : ${IMAGE_TAG}"
+    echo -e "    源码分支      : ${BRANCH}"
    echo -e "    ────────────────────────────────────"
-
    if [ "$CONTAINER_EXISTS" = true ]; then
        echo ""
        echo -e "  ${YELLOW}⚠ 检测到已存在的 frpc-console 容器${NC}"
-        if [ "$CONTAINER_RUNNING" = true ]; then
-            echo -e "    状态: 运行中 → 将被停止并重新创建"
-        else
-            echo -e "    状态: 已停止 → 将被删除并重新创建"
-        fi
-        echo -e "    ${YELLOW}数据目录中的数据库文件将被保留${NC}"
+        echo -e "    当前版本: ${CURRENT_VERSION}"
+        echo -e "    目标版本: ${TARGET_VERSION}"
    fi
    echo ""
 }

-# ---------- 确认部署 ----------
 confirm_deploy() {
    if [ "$SKIP_CONFIRM" = true ]; then
        echo -e "${GREEN}▶ 已启用 --yes，自动确认${NC}"
@@ -266,7 +323,6 @@ confirm_deploy() {
    esac
 }

-# ---------- 自定义配置 ----------
 custom_config() {
    print_title
    print_subtitle "自定义配置"
@@ -292,6 +348,7 @@ do_deploy() {
    print_subtitle "开始部署"
    echo ""

+<<<<<<< HEAD
    # ----- 事务前钩子：备份数据库 -----
    print_step "备份数据库..."
    BACKUP_DIR="/tmp/frpc-console/db-backups"
@@ -306,25 +363,81 @@ do_deploy() {
            if ! sqlite3 "$DB_FILE" "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='users';" 2>/dev/null | grep -q "^1$"; then
                print_warn "数据库文件无效，将删除，由容器全新初始化"
                rm -f "$DB_FILE"
-            else
-                print_info "数据库有效，保留"
+=======
+    # ----- 事务前钩子：备份数据库（仅降级时） -----
+    BACKUP_DIR=""
+    if [ -n "$CURRENT_VERSION" ] && [ -n "$TARGET_VERSION" ]; then
+        # 提取语义版本比较
+        CUR_SEMVER=$(echo "$CURRENT_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*$/\1/')
+        TGT_SEMVER=$(echo "$TARGET_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*$/\1/')
+        if [ "$TGT_SEMVER" \< "$CUR_SEMVER" ] 2>/dev/null; then
+            print_warn "检测到降级操作: $CURRENT_VERSION → $TARGET_VERSION"
+            echo ""
+            echo -e "${YELLOW}⚠ 降级可能导致数据不兼容${NC}"
+            TIMESTAMP=$(date +%Y%m%d_%H%M%S)
+            BACKUP_DIR="/opt/frpc-console-backups/${TIMESTAMP}_${CHANNEL}"
+            echo -e "${CYAN}备份目录: ${BACKUP_DIR}${NC}"
+            read -p "确认执行降级? [y/N]: " CONFIRM_DOWNGRADE </dev/tty
+            if [[ ! "$CONFIRM_DOWNGRADE" =~ ^[Yy]$ ]]; then
+                print_info "已取消降级操作"
+                exit 0
+            fi
+            print_step "执行降级前备份..."
+            mkdir -p "$BACKUP_DIR"
+            if [ -d "$DEPLOY_DIR" ]; then
+                cp -r "$DEPLOY_DIR" "$BACKUP_DIR/frpc-console"
+                print_success "备份完成: $BACKUP_DIR"
+>>>>>>> test
+            else
+                print_warn "部署目录不存在，跳过备份"
            fi
-        else
-            print_warn "sqlite3 未安装，无法检查数据库有效性，保留原文件"
        fi
    else
-        print_info "数据库文件不存在，跳过备份"
+        print_info "首次部署，跳过版本比对"
    fi

+<<<<<<< HEAD
+=======
+    # ----- 安装必要工具 -----
+    if [ "$NEED_INSTALL_GIT" = true ] || [ "$NEED_INSTALL_CURL" = true ] || [ "$NEED_INSTALL_WGET" = true ]; then
+        print_step "安装必要工具..."
+        local pkgs=""
+        [ "$NEED_INSTALL_GIT" = true ] && pkgs="${pkgs} git"
+        [ "$NEED_INSTALL_CURL" = true ] && pkgs="${pkgs} curl"
+        [ "$NEED_INSTALL_WGET" = true ] && pkgs="${pkgs} wget"
+        case $OS in
+            opensuse*|suse*|opensuse-tumbleweed|opensuse-slowroll|opensuse-leap)
+                if [ "$NEED_INSTALL_GIT" = true ]; then
+                    zypper install -y git-core
+                    pkgs=$(echo "$pkgs" | sed -E 's/(^| )git( |$)/ /g' | sed 's/  */ /g' | sed 's/^ //;s/ $//')
+                fi
+                [ -n "$pkgs" ] && zypper install -y $pkgs
+                ;;
+            ubuntu|debian|linuxmint) apt update -qq && apt install -y $pkgs ;;
+            centos|rhel|fedora|rocky|almalinux) yum install -y $pkgs ;;
+            alpine) apk add $pkgs ;;
+            arch|manjaro|endeavouros) pacman -S --needed --noconfirm $pkgs ;;
+            *) print_error "无法识别包管理器"; exit 1 ;;
+        esac
+        print_success "必要工具安装完成"
+    fi
+
+>>>>>>> test
    # ----- 拉取代码 -----
    print_step "拉取代码..."
    rm -rf "$WORK_DIR"
    git clone --depth 1 --branch "$BRANCH" "$REPO_URL" "$WORK_DIR"
    cd "$WORK_DIR"
    mkdir -p bin static
+<<<<<<< HEAD
    print_success "代码拉取完成"

    # ----- 停止旧容器（拉取代码之后）-----
+=======
+    print_success "代码拉取完成 (分支: ${BRANCH})"
+
+    # ----- 停止旧容器 -----
+>>>>>>> test
    if [ "$CONTAINER_EXISTS" = true ]; then
        print_step "停止旧容器..."
        if [ "$CONTAINER_RUNNING" = true ]; then
@@ -335,6 +448,7 @@ do_deploy() {
    fi

    # ----- 准备部署目录 -----
+<<<<<<< HEAD
    print_step "准备部署目录..."
    mkdir -p "$DEPLOY_DIR"
    mkdir -p "$DATA_DIR"
@@ -348,17 +462,96 @@ do_deploy() {
    print_step "构建 Docker 镜像..."
    docker build -t "${IMAGE_NAME}:latest" .
    print_success "Docker 镜像构建完成: ${IMAGE_NAME}:latest"
+=======
+print_step "准备部署目录..."
+mkdir -p "$DEPLOY_DIR"
+mkdir -p "$DATA_DIR"
+
+# ----- 检测并迁移旧版本文件（从根目录迁移到 data/）-----
+print_step "检测旧版本文件..."
+
+OLD_DB="${DEPLOY_DIR}/frpc-console.db"
+OLD_TOML="${DEPLOY_DIR}/frpc.toml"
+OLD_LOG="${DEPLOY_DIR}/frpc.log"
+OLD_PID="${DEPLOY_DIR}/frpc.pid"
+OLD_VERSION="${DEPLOY_DIR}/version.ini"
+NEW_DB="${DATA_DIR}/frpc-console.db"
+
+# 如果根目录有旧数据库文件，但 data/ 目录没有，执行迁移
+if [ -f "$OLD_DB" ] && [ ! -f "$NEW_DB" ]; then
+    print_warn "检测到旧版本数据库文件在根目录，将迁移到 data/ 子目录"
+
+    # 备份旧文件
+    BACKUP_OLD_DIR="${DEPLOY_DIR}/.old_backup_$(date +%Y%m%d_%H%M%S)"
+    mkdir -p "$BACKUP_OLD_DIR"
+
+    for file in frpc-console.db frpc.toml frpc.log frpc.pid version.ini; do
+        if [ -f "${DEPLOY_DIR}/${file}" ]; then
+            cp "${DEPLOY_DIR}/${file}" "${BACKUP_OLD_DIR}/" 2>/dev/null || true
+            print_info "  已备份: ${file}"
+        fi
+    done
+
+    # 复制文件到 data/ 目录
+    for file in frpc-console.db frpc.toml frpc.log frpc.pid version.ini; do
+        if [ -f "${DEPLOY_DIR}/${file}" ]; then
+            cp "${DEPLOY_DIR}/${file}" "${DATA_DIR}/" 2>/dev/null || true
+            print_info "  已迁移: ${file} → data/"
+        fi
+    done
+
+    print_success "旧文件已迁移到 data/ 目录"
+    print_info "旧文件备份位置: ${BACKUP_OLD_DIR}"
+    print_info "确认服务正常后，可手动删除备份目录"
+else
+    print_info "未检测到需要迁移的旧文件"
+fi
+
+# ----- 构建 Docker 镜像 -----
+print_step "构建 Docker 镜像..."
+docker build --no-cache \
+    -t "${IMAGE_NAME}:${IMAGE_TAG}" \
+    .
+    if [ $? -ne 0 ]; then
+        print_error "Docker 构建失败"
+        exit 1
+    fi
+    print_success "Docker 镜像构建完成: ${IMAGE_NAME}:${IMAGE_TAG}"
+
+    # 验证镜像内容
+    print_step "验证镜像内容..."
+    if docker run --rm --entrypoint ls "${IMAGE_NAME}:${IMAGE_TAG}" -l /app/frpc-console 2>/dev/null; then
+        print_success "二进制文件存在于镜像中"
+    else
+        print_error "镜像中缺少 /app/frpc-console"
+        exit 1
+    fi
+
+    # 标记通道标签
+    if [ "$CHANNEL" = "lts" ]; then
+        docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:lts"
+        print_info "已标记 ${IMAGE_NAME}:lts"
+    else
+        docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:preview"
+        print_info "已标记 ${IMAGE_NAME}:preview"
+    fi
+>>>>>>> test

    # ----- 启动新容器 -----
    print_step "启动 frpc-console 容器..."
+# 启动容器（只挂载数据目录）
    docker run -d \
        --name frpc-console \
        --restart=always \
        --network host \
+<<<<<<< HEAD
        -v ${DEPLOY_DIR}:/app \
+=======
+        -v ${DEPLOY_DIR}/data:/app/data \
+>>>>>>> test
        -e PORT=${PORT} \
        -e TZ=Asia/Shanghai \
-        ${IMAGE_NAME}:latest
+        ${IMAGE_NAME}:${IMAGE_TAG}

    if docker ps | grep -q frpc-console; then
        print_success "容器启动成功！"
@@ -367,21 +560,41 @@ do_deploy() {
        exit 1
    fi

+<<<<<<< HEAD
    # ----- 检查 frpc 子进程 -----
    print_step "检查 frpc 状态..."
    sleep 3
    if docker ps --format '{{.Names}}' | grep -q "^frpc-console$"; then
        if docker exec frpc-console ps aux 2>/dev/null | grep -q "[f]rpc -c"; then
            print_success "frpc 进程运行正常"
+=======
+    # ----- 写入版本文件 -----
+    print_step "写入版本文件..."
+    echo "$TARGET_VERSION" > "${DEPLOY_DIR}/data/version.ini"
+    print_success "版本写入: ${TARGET_VERSION}"
+
+    # ----- 检查 frpc 子进程（基于 PID 文件）-----
+    print_step "检查 frpc 状态..."
+    sleep 3
+
+    PID_FILE="${DEPLOY_DIR}/data/frpc.pid"
+    if [ -f "$PID_FILE" ]; then
+        PID=$(cat "$PID_FILE" 2>/dev/null | tr -d ' \n')
+        if [ -n "$PID" ] && kill -0 "$PID" 2>/dev/null; then
+            print_success "frpc 进程运行正常 (PID: $PID)"
+>>>>>>> test
        else
-            print_warn "frpc 进程未运行（可能配置为空，请在 WebUI 中导入 TOML）"
+            print_warn "frpc 进程未运行（PID 文件存在但进程已退出，可能配置为空）"
        fi
    else
-        print_error "frpc-console 容器未运行，请检查日志"
-        exit 1
+        print_warn "frpc 进程未运行（PID 文件不存在，请导入 TOML 后重试）"
    fi

+<<<<<<< HEAD
    # ----- 事务后钩子：检测数据库 -----
+=======
+    # ----- 验证数据库 -----
+>>>>>>> test
    print_step "验证数据库状态..."
    if docker exec frpc-console sqlite3 /app/frpc-console.db "SELECT COUNT(*) FROM users;" 2>/dev/null | grep -q "^[0-9]"; then
        print_success "数据库可用"
@@ -389,26 +602,70 @@ do_deploy() {
        print_warn "数据库为空或不可用，请通过 WebUI 注册管理员账户"
    fi

+    # ----- 验证版本 -----
+    CONTAINER_VERSION=$(docker exec frpc-console cat /app/version.ini 2>/dev/null | tr -d '\n' || echo "")
+    if [ "$CONTAINER_VERSION" = "$TARGET_VERSION" ]; then
+        print_success "容器版本验证通过: ${CONTAINER_VERSION}"
+    else
+        print_warn "容器版本: ${CONTAINER_VERSION}, 目标版本: ${TARGET_VERSION}"
+    fi
+
+    # ----- 清理旧镜像 -----
+    print_step "清理旧镜像..."
+    CURRENT_IMAGE_ID=$(docker images -q "${IMAGE_NAME}:${IMAGE_TAG}" 2>/dev/null)
+    if [ -n "$CURRENT_IMAGE_ID" ]; then
+        ALL_IMAGES=$(docker images "${IMAGE_NAME}:*" --format "{{.ID}} {{.CreatedAt}}" 2>/dev/null | sort -k2 -r | awk '{print $1}')
+        COUNTER=0
+        TO_DELETE=""
+        for IMG_ID in $ALL_IMAGES; do
+            if [ "$IMG_ID" = "$CURRENT_IMAGE_ID" ]; then
+                continue
+            fi
+            COUNTER=$((COUNTER + 1))
+            if [ $COUNTER -le $KEEP_IMAGES ]; then
+                continue
+            fi
+            TO_DELETE="$TO_DELETE $IMG_ID"
+        done
+        if [ -n "$TO_DELETE" ]; then
+            docker rmi -f $TO_DELETE 2>/dev/null || true
+            print_info "已清理旧镜像"
+        else
+            print_info "无需清理，镜像数量未超过保留策略"
+        fi
+    fi
+
+    # ----- 备份目录提示 -----
+    if [ -n "$BACKUP_DIR" ]; then
+        echo ""
+        print_warn "降级前数据已备份到: $BACKUP_DIR"
+        echo "  如需回退: cp -r $BACKUP_DIR/frpc-console/* $DEPLOY_DIR/"
+    fi
+
    # ----- 清理临时文件 -----
    print_step "清理临时文件..."
    rm -rf "$WORK_DIR"
    print_success "临时文件已清理"

-    # ----- 输出信息 -----
+    # ----- 输出 -----
    print_title
    print_success "frpc-console 部署完成！"
    print_title
    echo ""
    echo -e "  ${CYAN}📍 访问地址:${NC} http://$(hostname -I | awk '{print $1}'):${PORT}"
    echo -e "  ${CYAN}📂 数据目录:${NC} ${DEPLOY_DIR}"
+<<<<<<< HEAD
    echo -e "  ${CYAN}📦 备份目录:${NC} /tmp/frpc-console/db-backups"
+=======
+>>>>>>> test
    echo -e "  ${CYAN}🐳 容器名称:${NC} frpc-console"
+    echo -e "  ${CYAN}🏷️  版本:${NC} ${TARGET_VERSION}"
+    echo -e "  ${CYAN}🌿  分支:${NC} ${BRANCH}"
    echo ""
    echo -e "  ${CYAN}常用命令:${NC}"
    echo "    docker logs frpc-console      # 查看日志"
    echo "    docker restart frpc-console   # 重启服务"
-    echo "    docker stop frpc-console      # 停止服务"
-    echo "    docker start frpc-console     # 启动服务"
+    echo "    cat ${DEPLOY_DIR}/version.ini # 查看当前版本"
    echo ""
    echo -e "  ${YELLOW}首次访问需要注册管理员账户${NC}"
    echo ""
@@ -427,20 +684,23 @@ main() {
    check_tools
    check_container

+    select_channel
+    generate_target_version "$CHANNEL" "$BRANCH"
+
+    CURRENT_VERSION=""
+    if [ "$CONTAINER_EXISTS" = true ]; then
+        CURRENT_VERSION=$(get_current_version)
+    fi
+
    print_environment_summary

    if [ "$CHECK_ONLY" = true ]; then
-        print_info "环境检测完成（--check 模式，不执行部署）"
+        print_info "环境检测完成（--check 模式）"
        exit 0
    fi

    if [ "$HAS_DOCKER" = false ]; then
-        print_error "Docker 未安装，请先安装 Docker"
-        echo ""
-        echo "  快速安装:"
-        echo "    curl -fsSL https://get.docker.com | bash"
-        echo "    systemctl enable --now docker"
-        echo ""
+        print_error "Docker 未安装"
        exit 1
    fi

@@ -449,6 +709,7 @@ main() {

    if ! confirm_deploy; then
        custom_config
+        generate_plan
        print_deployment_plan
        if ! confirm_deploy; then
            print_info "已取消部署"
@@ -457,7 +718,7 @@ main() {
    fi

    if [ "$DRY_RUN" = true ]; then
-        print_info "演练模式（--dry-run），不实际执行部署"
+        print_info "演练模式（--dry-run）"
        exit 0
    fi

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"embed"
 	"fmt"
+	"io"
 	"log"
 	"os"
 	"os/exec"
@@ -24,16 +25,12 @@ var FrpcTemplateContent string

 var (
 	cachedFrpcPath string
-	frpcPathMutex  sync.Mutex
+	frpsPathMutex  sync.Mutex
 )

-// ============================================================
-// 获取 frpc 路径
-// ============================================================
-
 func getFrpcPath() (string, error) {
-	frpcPathMutex.Lock()
-	defer frpcPathMutex.Unlock()
+	frpsPathMutex.Lock()
+	defer frpsPathMutex.Unlock()

 	if cachedFrpcPath != "" {
 		if _, err := os.Stat(cachedFrpcPath); err == nil {
@@ -61,14 +58,12 @@ func getFrpcPath() (string, error) {
 		return "", fmt.Errorf("不支持的平台: %s/%s", runtime.GOOS, runtime.GOARCH)
 	}

-	// 优先级1：本地 ./bin/
 	localPath := filepath.Join(".", "bin", fileName)
 	if _, err := os.Stat(localPath); err == nil {
 		cachedFrpcPath = localPath
 		return localPath, nil
 	}

-	// 优先级2：embed 解压
 	data, err := embeddedFrpc.ReadFile("bin/" + fileName)
 	if err == nil {
 		tmpPath := filepath.Join(os.TempDir(), "frpc")
@@ -85,7 +80,6 @@ func getFrpcPath() (string, error) {
 		}
 	}

-	// 优先级3：系统 PATH
 	path, err := exec.LookPath("frpc")
 	if err == nil {
 		cachedFrpcPath = path
@@ -95,10 +89,6 @@ func getFrpcPath() (string, error) {
 	return "", fmt.Errorf("未找到 frpc 文件")
 }

-// ============================================================
-// 生成 frpc.toml（v2.0 支持 wireProtocol）
-// ============================================================
-
 func GenerateFrpcConfig() error {
 	cfg, err := GetGlobalConfig()
 	if err != nil {
@@ -117,24 +107,21 @@ func GenerateFrpcConfig() error {
 		}
 	}

-	// 构建模板数据
 	data := struct {
 		*GlobalConfig
 		Proxies          []Proxy
-		WireProtocolLine string // v2 协议配置行（为空则不输出）
+		WireProtocolLine string
 	}{
 		GlobalConfig: cfg,
 		Proxies:      activeProxies,
 	}

-	// v2.0: 如果启用 v2 协议，生成配置行
 	if cfg.WireProtocolV2 {
 		data.WireProtocolLine = `wireProtocol = "v2"`
 	} else {
-		data.WireProtocolLine = "" // 不输出，使用默认 v1
+		data.WireProtocolLine = ""
 	}

-	// 读取模板
 	var tmplContent string
 	if _, err := os.Stat("frpc.tmpl"); err == nil {
 		content, readErr := os.ReadFile("frpc.tmpl")
@@ -157,19 +144,20 @@ func GenerateFrpcConfig() error {
 		return fmt.Errorf("渲染模板失败: %w", err)
 	}

-	if err := os.WriteFile("./frpc.toml", buf.Bytes(), 0644); err != nil {
+	// 所有文件写入 ./data/ 目录
+	if err := os.MkdirAll("./data", 0755); err != nil {
+		return fmt.Errorf("创建 data 目录失败: %w", err)
+	}
+
+	if err := os.WriteFile("./data/frpc.toml", buf.Bytes(), 0644); err != nil {
 		return fmt.Errorf("写入配置文件失败: %w", err)
 	}

 	return nil
 }

-// ============================================================
-// frpc 进程管理
-// ============================================================
-
 func isFrpcRunning() bool {
-	pidData, err := os.ReadFile("./frpc.pid")
+	pidData, err := os.ReadFile("./data/frpc.pid")
 	if err != nil {
 		return false
 	}
@@ -200,7 +188,11 @@ func StartFrpc() error {
 		return fmt.Errorf("获取 frpc 路径失败: %w", err)
 	}

-	if _, err := os.Stat("./frpc.toml"); os.IsNotExist(err) {
+	if err := os.MkdirAll("./data", 0755); err != nil {
+		return fmt.Errorf("创建 data 目录失败: %w", err)
+	}
+
+	if _, err := os.Stat("./data/frpc.toml"); os.IsNotExist(err) {
 		if err := GenerateFrpcConfig(); err != nil {
 			return fmt.Errorf("生成配置文件失败: %w", err)
 		}
@@ -210,13 +202,13 @@ func StartFrpc() error {
 		return nil
 	}

-	os.Remove("./frpc.pid")
+	os.Remove("./data/frpc.pid")

-	cmd := exec.Command(frpcPath, "-c", "./frpc.toml")
+	cmd := exec.Command(frpcPath, "-c", "./data/frpc.toml")
 	setWindowHide(cmd)
 	setSysProcAttr(cmd)

-	logFile, err := os.OpenFile("./frpc.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
+	logFile, err := os.OpenFile("./data/frpc.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
 	if err != nil {
 		return fmt.Errorf("打开日志文件失败: %w", err)
 	}
@@ -227,7 +219,7 @@ func StartFrpc() error {
 		return fmt.Errorf("启动 frpc 失败: %w", err)
 	}

-	if err := os.WriteFile("./frpc.pid", []byte(fmt.Sprintf("%d", cmd.Process.Pid)), 0644); err != nil {
+	if err := os.WriteFile("./data/frpc.pid", []byte(fmt.Sprintf("%d", cmd.Process.Pid)), 0644); err != nil {
 		return fmt.Errorf("保存 PID 失败: %w", err)
 	}

@@ -240,11 +232,11 @@ func StopFrpc() error {
 		if err := cmd.Run(); err != nil && !strings.Contains(err.Error(), "not found") {
 			return fmt.Errorf("停止 frpc 失败: %w", err)
 		}
-		os.Remove("./frpc.pid")
+		os.Remove("./data/frpc.pid")
 		return nil
 	}

-	pidData, err := os.ReadFile("./frpc.pid")
+	pidData, err := os.ReadFile("./data/frpc.pid")
 	if err != nil {
 		cmd := exec.Command("pkill", "-f", "frpc")
 		if err := cmd.Run(); err != nil && !strings.Contains(err.Error(), "no process") {
@@ -256,7 +248,7 @@ func StopFrpc() error {
 	pid, _ := strconv.Atoi(strings.TrimSpace(string(pidData)))
 	process, err := os.FindProcess(pid)
 	if err != nil {
-		os.Remove("./frpc.pid")
+		os.Remove("./data/frpc.pid")
 		return nil
 	}

@@ -264,7 +256,7 @@ func StopFrpc() error {
 		return fmt.Errorf("杀死进程失败: %w", err)
 	}

-	os.Remove("./frpc.pid")
+	os.Remove("./data/frpc.pid")
 	return nil
 }

@@ -283,7 +275,7 @@ func ReloadFrpc() error {
 		return fmt.Errorf("获取 frpc 路径失败: %w", err)
 	}

-	cmd := exec.Command(frpcPath, "reload", "-c", "./frpc.toml")
+	cmd := exec.Command(frpcPath, "reload", "-c", "./data/frpc.toml")
 	_, err = cmd.CombinedOutput()
 	if err != nil {
 		log.Printf("⚠️  热加载失败 (%v)，自动降级为重启 frpc", err)
@@ -297,3 +289,77 @@ func ReloadFrpc() error {
 	}
 	return nil
 }
+
+// readTailLog 读取文件末尾 n 行
+func readTailLog(filePath string, n int) ([]string, error) {
+	file, err := os.Open(filePath)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	info, err := file.Stat()
+	if err != nil {
+		return nil, err
+	}
+	fileSize := info.Size()
+	if fileSize == 0 {
+		return []string{}, nil
+	}
+
+	const chunkSize = 4096
+	var lines []string
+	var leftover []byte
+	offset := fileSize
+
+	for len(lines) < n && offset > 0 {
+		readSize := chunkSize
+		if offset < int64(chunkSize) {
+			readSize = int(offset)
+		}
+		offset -= int64(readSize)
+
+		buf := make([]byte, readSize)
+		_, err := file.ReadAt(buf, offset)
+		if err != nil && err != io.EOF {
+			return nil, err
+		}
+
+		data := append(buf, leftover...)
+		leftover = nil
+
+		start := 0
+		for i := len(data) - 1; i >= 0; i-- {
+			if data[i] == '\n' {
+				if i+1 < len(data) {
+					line := string(data[i+1:])
+					if line != "" {
+						lines = append([]string{line}, lines...)
+						if len(lines) >= n {
+							break
+						}
+					}
+				}
+				start = i
+			}
+		}
+
+		if len(lines) < n && start > 0 {
+			leftover = data[:start]
+		}
+	}
+
+	if len(lines) < n && len(leftover) > 0 {
+		parts := strings.Split(string(leftover), "\n")
+		for i := len(parts) - 1; i >= 0; i-- {
+			if parts[i] != "" {
+				lines = append([]string{parts[i]}, lines...)
+				if len(lines) >= n {
+					break
+				}
+			}
+		}
+	}
+
+	return lines, nil
+}
@@ -2,15 +2,29 @@ package main

 import (
 	"log"
+	"os"
+	"strings"
 	"time"
 )

 func main() {
+	// 确保 data 目录存在
+	if err := os.MkdirAll("./data", 0755); err != nil {
+		log.Printf("⚠️  创建 data 目录失败: %v", err)
+	}
+
+	// 读取 version.ini 显示版本
+	if data, err := os.ReadFile("./data/version.ini"); err == nil {
+		version := strings.TrimSpace(string(data))
+		log.Printf("📌 版本: %s", version)
+	} else {
+		log.Printf("📌 版本: (未记录)")
+	}
+
 	if err := InitDB(); err != nil {
 		log.Fatal("❌ 数据库初始化失败:", err)
 	}

-	// 启动时生成配置并启动 frpc
 	if err := GenerateFrpcConfig(); err != nil {
 		log.Println("⚠️  生成配置文件失败:", err)
 	}
@@ -19,7 +33,6 @@ func main() {
 		log.Println("⚠️  启动 frpc 失败:", err)
 	}

-	// ✅ 启动 Watchdog：每 30 秒检查一次 frpc 状态，挂了自动重启
 	go startWatchdog()

 	r := SetupRouter()
@@ -32,7 +45,6 @@ func main() {
 	}
 }

-// Watchdog 协程：定期检查 frpc 是否存活
 func startWatchdog() {
 	ticker := time.NewTicker(30 * time.Second)
 	defer ticker.Stop()
@@ -261,7 +261,14 @@ frpc-console 遵循 **“够用就好”** 的原则：

 ## 📝 更新日志

+<<<<<<< HEAD
 完整更新日志请查看[update-logs](https://git.whitetop.xyz/lxh2875931338/frpc-console/src/branch/main/update-logs.md)
+=======
+
+## 📝 更新日志
+
+####相关更新日志请查看[update-logs.md](https://git.whitetop.xyz/lxh2875931338/frpc-console/raw/main/update-logs.md)
+>>>>>>> test

 ---

@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# ============================================================
+# frpc-console 部署入口（前置引导脚本）
+# 此脚本固定在 main 分支，永不变化。
+# 职责：引导用户选择通道，拉取对应分支的 deploy.sh 并执行
+# 
+# 用法:
+#   curl -sSL https://git.whitetop.xyz/.../run-deploy.sh | sudo bash
+#   curl -sSL https://git.whitetop.xyz/.../run-deploy.sh | sudo bash -s -- --channel preview
+# ============================================================
+
+set -e
+
+if [ -t 1 ]; then
+    RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'
+    BLUE='\033[0;34m'; CYAN='\033[0;36m'; MAGENTA='\033[0;35m'; NC='\033[0m'
+else
+    RED=''; GREEN=''; YELLOW=''; BLUE=''; CYAN=''; MAGENTA=''; NC=''
+fi
+
+print_info() { echo -e "${BLUE}[INFO]${NC} $1"; }
+print_error() { echo -e "${RED}[✗]${NC} $1"; }
+
+REPO_URL="https://git.whitetop.xyz/lxh2875931338/frpc-console.git"
+WORK_DIR="/tmp/frpc-console-deploy"
+CHANNEL=""
+BRANCH=""
+
+parse_args() {
+    for arg in "$@"; do
+        case $arg in
+            --channel)
+                shift; CHANNEL="$1"
+                ;;
+            --channel=*)
+                CHANNEL="${arg#*=}"
+                ;;
+            --help|-h)
+                echo "用法: curl .../run-deploy.sh | sudo bash -s -- [选项]"
+                echo ""
+                echo "选项:"
+                echo "  --channel lts       使用 LTS 通道 (main 分支)"
+                echo "  --channel preview   使用 Preview 通道 (test 分支)"
+                echo "  --help, -h          显示帮助信息"
+                exit 0
+                ;;
+            *)
+                print_error "未知选项: $arg"
+                echo "使用 --help 查看帮助"
+                exit 1
+                ;;
+        esac
+    done
+}
+
+select_channel() {
+    if [ -n "$CHANNEL" ]; then
+        if [ "$CHANNEL" != "lts" ] && [ "$CHANNEL" != "preview" ]; then
+            print_error "无效通道: $CHANNEL (仅支持 lts / preview)"
+            exit 1
+        fi
+        BRANCH="$([ "$CHANNEL" = "preview" ] && echo "test" || echo "main")"
+        print_info "使用命令行参数: ${CHANNEL} 通道 (${BRANCH} 分支)"
+        return
+    fi
+
+    echo ""
+    echo -e "${CYAN}请选择部署通道:${NC}"
+    echo "  1. LTS (稳定版，生产推荐) [默认] → main 分支"
+    echo "  2. Preview (技术预览版，包含新特性) → test 分支"
+    echo ""
+    read -p "请选择 [1]: " CHANNEL_INPUT </dev/tty
+    CHANNEL_INPUT=${CHANNEL_INPUT:-1}
+    case $CHANNEL_INPUT in
+        1|"") CHANNEL="lts"; BRANCH="main" ;;
+        2) CHANNEL="preview"; BRANCH="test" ;;
+        *) print_error "无效选择"; exit 1 ;;
+    esac
+    print_info "已选择: ${CHANNEL} 通道 (${BRANCH} 分支)"
+}
+
+fetch_and_run() {
+    local deploy_url="https://git.whitetop.xyz/lxh2875931338/frpc-console/raw/${BRANCH}/deploy.sh"
+    echo ""
+    echo -e "${CYAN}▶ 从 ${BRANCH} 分支拉取 deploy.sh...${NC}"
+    rm -rf "$WORK_DIR"
+    mkdir -p "$WORK_DIR"
+    cd "$WORK_DIR"
+    if ! curl -sSL -o deploy.sh "$deploy_url"; then
+        print_error "无法下载 deploy.sh: $deploy_url"
+        exit 1
+    fi
+    chmod +x deploy.sh
+    echo -e "${GREEN}[✓] deploy.sh 已拉取${NC}"
+    echo ""
+    echo -e "${CYAN}▶ 执行部署脚本...${NC}"
+    echo ""
+    export DEPLOY_CHANNEL="$CHANNEL"
+    export DEPLOY_BRANCH="$BRANCH"
+    exec ./deploy.sh "$@"
+}
+
+main() {
+    clear 2>/dev/null || true
+    echo -e "${MAGENTA}════════════════════════════════════════════════════════${NC}"
+    echo -e "${MAGENTA}  frpc-console 部署入口${NC}"
+    echo -e "${MAGENTA}════════════════════════════════════════════════════════${NC}"
+    echo ""
+    parse_args "$@"
+    select_channel
+    fetch_and_run "$@"
+}
+
+main "$@"
@@ -9,6 +9,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"time"
 )

 type Platform struct {
@@ -22,15 +23,87 @@ var platforms = []Platform{
 	{"windows", "amd64", "Windows x86-64", ".exe"},
 	{"linux", "amd64", "Linux x86-64", ""},
 	{"linux", "arm64", "Linux ARM64", ""},
-	{"linux", "arm", "Linux ARMv7l", ""}, // GOARCH=arm, GOARM=7
+	{"linux", "arm", "Linux ARMv7l", ""},
 }

 const (
-	Version   = "2.0.0"
-	BuildTime = "2026-07-26"
+	BuildTime = "2026-07-29"
 	Binary    = "frpc-console"
 )

+// ============================================================
+// 版本管理核心
+// ============================================================
+
+func readVersion() (semver string, ltsDate string) {
+	data, err := os.ReadFile("./version.ini")
+	if err != nil {
+		return "0.0.0", ""
+	}
+	lines := strings.Split(string(data), "\n")
+	var content string
+	for _, line := range lines {
+		line = strings.TrimSpace(line)
+		if line == "" || strings.HasPrefix(line, ";") || strings.HasPrefix(line, "#") {
+			continue
+		}
+		content = line
+		break
+	}
+	parts := strings.Fields(content)
+	if len(parts) < 1 {
+		return "0.0.0", ""
+	}
+	semver = parts[0]
+	if len(parts) > 1 {
+		ltsDate = parts[1]
+	}
+	return semver, ltsDate
+}
+
+func getVersionType(semver string) string {
+	parts := strings.Split(semver, ".")
+	if len(parts) < 2 {
+		return "preview"
+	}
+	minor := parts[1]
+	if minor == "0" || minor == "5" {
+		return "lts"
+	}
+	return "preview"
+}
+
+func getFullVersion() string {
+	semver, ltsDate := readVersion()
+	vType := getVersionType(semver)
+
+	switch vType {
+	case "lts":
+		if ltsDate == "" {
+			ltsDate = time.Now().Format("20060102")
+		}
+		return semver + "-lts-" + ltsDate
+	default:
+		timestamp := time.Now().Format("20060102-150405")
+		return semver + "-preview-" + timestamp
+	}
+}
+
+func getImageTag() string {
+	semver, ltsDate := readVersion()
+	vType := getVersionType(semver)
+
+	switch vType {
+	case "lts":
+		if ltsDate == "" {
+			ltsDate = time.Now().Format("20060102")
+		}
+		return semver + "-lts-" + ltsDate
+	default:
+		return "preview-" + time.Now().Format("20060102-150405")
+	}
+}
+
 func main() {
 	if len(os.Args) > 1 {
 		target := os.Args[1]
@@ -44,6 +117,12 @@ func main() {
 		case "list":
 			listPlatforms()
 			return
+		case "version":
+			fmt.Println(getFullVersion())
+			return
+		case "image-tag":
+			fmt.Println(getImageTag())
+			return
 		}
 		for _, p := range platforms {
 			if target == p.OS+"/"+p.Arch {
@@ -52,8 +131,8 @@ func main() {
 			}
 		}
 		fmt.Println("❌ 不支持的平台:", target)
-		fmt.Println("   可用: windows/amd64, linux/amd64, linux/arm64, linux/armv7")
-		fmt.Println("   或: all, list, clean")
+		fmt.Println("   可用: windows/amd64, linux/amd64, linux/arm64, linux/arm")
+		fmt.Println("   或: all, list, clean, version, image-tag")
 		return
 	}
 	interactiveMenu()
@@ -68,15 +147,19 @@ func listPlatforms() {

 func interactiveMenu() {
 	fmt.Println("========================================")
-	fmt.Println("  frpc-console 多平台构建工具 v" + Version)
+	fmt.Println("  frpc-console 多平台构建工具")
 	fmt.Println("========================================")
 	fmt.Println()
+	fmt.Println("  当前版本:", getFullVersion())
+	fmt.Println("  镜像标签:", getImageTag())
+	fmt.Println()

 	for i, p := range platforms {
 		fmt.Printf("  %d. %s (%s/%s)\n", i+1, p.Name, p.OS, p.Arch)
 	}
 	fmt.Println("  a. 全部构建")
 	fmt.Println("  c. 清理构建产物")
+	fmt.Println("  v. 显示版本信息")
 	fmt.Println("  q. 退出")
 	fmt.Println()

@@ -96,6 +179,10 @@ func interactiveMenu() {
 	case "a":
 		buildAll()
 		return
+	case "v":
+		fmt.Println("版本:", getFullVersion())
+		fmt.Println("镜像标签:", getImageTag())
+		return
 	default:
 		var idx int
 		if n, err := fmt.Sscanf(input, "%d", &idx); n == 1 && err == nil && idx >= 1 && idx <= len(platforms) {
@@ -125,16 +212,22 @@ func build(p Platform, silent bool) {
 		return
 	}

-	// 构建输出文件名
+	fullVersion := getFullVersion()
+	imageTag := getImageTag()
+
 	outName := Binary + "-" + p.OS + "-" + p.Arch
 	if p.Arch == "arm" {
-		outName += "v7" // 标注 ARMv7 版本
+		outName += "v7"
 	}
 	outName += p.Ext
 	outPath := filepath.Join(outDir, outName)

 	cmd := exec.Command("go", "build",
-		"-ldflags=-s -w -X main.version="+Version,
+		"-ldflags="+
+			"-s -w "+
+			"-X main.buildVersion="+fullVersion+" "+
+			"-X main.buildImageTag="+imageTag+" "+
+			"-X main.buildTime="+BuildTime,
 		"-o", outPath,
 		".",
 	)
@@ -144,7 +237,6 @@ func build(p Platform, silent bool) {
 		"CGO_ENABLED=0",
 	)

-	// ARM 架构指定 GOARM=7
 	if p.Arch == "arm" {
 		cmd.Env = append(cmd.Env, "GOARM=7")
 	}
@@ -159,6 +251,7 @@ func build(p Platform, silent bool) {

 	if !silent {
 		fmt.Printf("✅ 构建完成: %s\n", outPath)
+		fmt.Printf("   版本: %s\n", fullVersion)
 		if info, err := os.Stat(outPath); err == nil {
 			size := float64(info.Size()) / 1024 / 1024
 			fmt.Printf("   📦 %.2f MB\n", size)
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # frpc-console 更新日志

 ## 📌 版本说明
@@ -46,6 +47,11 @@
 ---

 ### 2.0-LTS （2026-07-27）
+=======
+## 📝 更新日志
+
+### 2.0-Release（LTS，跟随上游提供支持，frps 端现已正式发布，frpc 端测试中，敬请期待……）
+>>>>>>> test

 > 本次 LTS 版本聚焦于**稳定性兜底与协议能力对齐**，是 frp 0.70.0 LTS 的下游管理工具。

@@ -54,7 +60,11 @@
 · 🧩 **配套工具 frps-console 同步发布** —— 同一套设计哲学，一个管理 frpc，一个管理 frps，版本号同步，LTS 同步


+<<<<<<< HEAD
 ### 1.5-Preview (2026-07-25)（non-LTS）
+=======
+### 1.5-Release (2026-07-25)（non-LTS）
+>>>>>>> test

 > 本次更新聚焦于**WebUI 交互体验与基础工程能力**，为 2.0 LTS 铺路。

@@ -66,7 +76,11 @@
 · 🎨 **样式拆分与优化** —— 按职责拆分为多个 CSS 文件，维护更清晰


+<<<<<<< HEAD
 ### 1.0-Preview (2026-07-24)（non-LTS）
+=======
+### 1.0-Release (2026-07-24)（non-LTS）
+>>>>>>> test

 > 首次发布，核心功能全部就绪。

@@ -77,4 +91,8 @@
 · 🔐 **首次启动 Web 注册** —— 无需命令行交互</br>
 · 🖥️ **多平台支持** —— Windows / Linux / ARM 全平台兼容</br>
 · 🐳 **容器化就绪** —— Docker 镜像，开箱即用</br>
+<<<<<<< HEAD
 · 🎨 **深色磨砂玻璃 UI** —— 现代化视觉体验</br>
+=======
+· 🎨 **深色磨砂玻璃 UI** —— 现代化视觉体验</br>
+>>>>>>> test
@@ -0,0 +1,6 @@
+; frpc-console 版本声明文件
+; 格式: {语义版本号} [{LTS发布日期}]
+; 示例:
+;   2.4              # Preview 版本，无日期
+;   2.5 20260729     # LTS 版本，带发布日期
+2.4