更新部署逻辑

api.go

@@ -6,11 +6,13 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
+	"net"
 	"net/http"
 	"os"
 	"strconv"
 	"strings"
 	"text/template"
+	"time"
 
 	"github.com/gin-gonic/gin"
 	"golang.org/x/crypto/bcrypt"
@@ -43,10 +45,13 @@ func SetupRouter() *gin.Engine {
 
 	api := r.Group("/api")
 	{
+		// ---- 公开路由（不需要认证） ----
 		api.GET("/check/users", checkUsersHandler)
 		api.POST("/register", registerHandler)
 		api.POST("/login", loginHandler)
+		api.GET("/ping", pingHandler)
 
+		// ---- 需要认证的路由 ----
 		auth := api.Group("/")
 		auth.Use(AuthMiddleware())
 		{
@@ -75,7 +80,7 @@ func SetupRouter() *gin.Engine {
 	return r
 }
 
-// ========== 所有 Handler ==========
+// ========== 认证 Handler ==========
 
 func checkUsersHandler(c *gin.Context) {
 	count, err := CountUsers()
@@ -223,6 +228,8 @@ func changePasswordHandler(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{"code": 0, "msg": "密码修改成功"})
 }
 
+// ========== 配置 Handler ==========
+
 func getConfigHandler(c *gin.Context) {
 	cfg, err := GetGlobalConfig()
 	if err != nil {
@@ -258,6 +265,8 @@ func updateConfigHandler(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{"code": 0, "msg": "配置更新成功"})
 }
 
+// ========== 隧道 Handler ==========
+
 func getProxiesHandler(c *gin.Context) {
 	proxies, err := GetProxies()
 	if err != nil {
@@ -348,6 +357,8 @@ func deleteProxyHandler(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{"code": 0, "msg": "隧道删除成功"})
 }
 
+// ========== frpc 进程管理 Handler ==========
+
 func reloadFrpcHandler(c *gin.Context) {
 	if err := GenerateFrpcConfig(); err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"code": 2, "msg": "生成配置失败: " + err.Error()})
@@ -385,6 +396,144 @@ func getFrpcStatusHandler(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{"code": 0, "data": gin.H{"running": running}})
 }
 
+// ========== 日志 Handler ==========
+
+func getFrpcLogHandler(c *gin.Context) {
+	lines, err := readTailLog("./frpc.log", 200)
+	if err != nil {
+		c.JSON(http.StatusOK, gin.H{
+			"code": 0,
+			"data": gin.H{
+				"lines": []string{},
+				"total": 0,
+				"error": err.Error(),
+			},
+		})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{
+		"code": 0,
+		"data": gin.H{
+			"lines": lines,
+			"total": len(lines),
+		},
+	})
+}
+
+// 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) {
+	target := c.Query("target")
+	if target == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"code": 1, "msg": "缺少 target 参数"})
+		return
+	}
+
+	cfg, err := GetGlobalConfig()
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"code": 2, "msg": "读取配置失败"})
+		return
+	}
+
+	port := cfg.ServerPort
+	address := net.JoinHostPort(target, strconv.Itoa(port))
+
+	start := time.Now()
+	conn, err := net.DialTimeout("tcp", address, 5*time.Second)
+	if err != nil {
+		c.JSON(http.StatusOK, gin.H{"code": 1, "msg": "ping 失败", "latency": -1})
+		return
+	}
+	conn.Close()
+
+	latency := time.Since(start).Milliseconds()
+	c.JSON(http.StatusOK, gin.H{"code": 0, "latency": latency})
+}
+
+// ========== 导入/导出 TOML ==========
+
 func importTomlHandler(c *gin.Context) {
 	file, err := c.FormFile("file")
 	if err != nil {
@@ -470,14 +619,22 @@ func ExportTomlHandler(c *gin.Context) {
 		}
 	}
 
+	// 构建与 GenerateFrpcConfig 一致的数据结构
 	data := struct {
 		*GlobalConfig
-		Proxies []Proxy
+		Proxies          []Proxy
+		WireProtocolLine string
 	}{
 		GlobalConfig: cfg,
 		Proxies:      activeProxies,
 	}
 
+	if cfg.WireProtocolV2 {
+		data.WireProtocolLine = `wireProtocol = "v2"`
+	} else {
+		data.WireProtocolLine = ""
+	}
+
 	tmpl, err := template.New("frpc").Parse(FrpcTemplateContent)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"code": 2, "msg": "解析模板失败: " + err.Error()})
@@ -495,114 +652,6 @@ func ExportTomlHandler(c *gin.Context) {
 	c.String(http.StatusOK, buf.String())
 }
 
-// ========== 日志读取 ==========
-
-func getFrpcLogHandler(c *gin.Context) {
-	// 读取 ./frpc.log，最多返回 200 行（最新的 200 行）
-	lines, err := readTailLog("./frpc.log", 200)
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
-			"code": 0,
-			"data": gin.H{
-				"lines": []string{},
-				"total": 0,
-				"error": err.Error(),
-			},
-		})
-		return
-	}
-	c.JSON(http.StatusOK, gin.H{
-		"code": 0,
-		"data": gin.H{
-			"lines": lines,
-			"total": len(lines),
-		},
-	})
-}
-
-// 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 {
-		// 从 leftover 中提取行
-		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
-}
-
 func generateAndReload() error {
 	if err := GenerateFrpcConfig(); err != nil {
 		return err

db-history.go

@@ -0,0 +1,91 @@
+package main
+
+// ============================================================
+// db-history.go - Schema 版本声明与字段映射
+// ============================================================
+
+type SchemaVersionDef struct {
+	Version   string
+	TableName string
+	Columns   map[string]ColumnDef
+}
+
+type ColumnDef struct {
+	Type    string
+	NotNull bool
+	Default string
+	Primary bool
+}
+
+var schemaHistory = []SchemaVersionDef{
+	// v1：初始版本
+	{
+		Version:   "v1",
+		TableName: "proxies",
+		Columns: map[string]ColumnDef{
+			"id":          {Type: "INTEGER", Primary: true},
+			"name":        {Type: "TEXT", NotNull: true},
+			"type":        {Type: "TEXT", NotNull: true, Default: "'tcp'"},
+			"local_ip":    {Type: "TEXT", NotNull: true},
+			"local_port":  {Type: "INTEGER", NotNull: true},
+			"remote_port": {Type: "INTEGER", NotNull: true},
+			"enabled":     {Type: "INTEGER", NotNull: true, Default: "1"},
+			"created_at":  {Type: "DATETIME", Default: "CURRENT_TIMESTAMP"},
+			"updated_at":  {Type: "DATETIME", Default: "CURRENT_TIMESTAMP"},
+		},
+	},
+	// v2：当前版本（frpc-console 2.0 LTS）
+	{
+		Version:   "v2",
+		TableName: "proxies",
+		Columns: map[string]ColumnDef{
+			"id":          {Type: "INTEGER", Primary: true},
+			"name":        {Type: "TEXT", NotNull: true},
+			"type":        {Type: "TEXT", NotNull: true, Default: "'tcp'"},
+			"local_ip":    {Type: "TEXT", NotNull: true},
+			"local_port":  {Type: "INTEGER", NotNull: true},
+			"remote_port": {Type: "INTEGER", NotNull: true},
+			"enabled":     {Type: "INTEGER", NotNull: true, Default: "1"},
+			"created_at":  {Type: "DATETIME", Default: "CURRENT_TIMESTAMP"},
+			"updated_at":  {Type: "DATETIME", Default: "CURRENT_TIMESTAMP"},
+		},
+	},
+}
+
+func getSchemaDef(version string) *SchemaVersionDef {
+	for _, def := range schemaHistory {
+		if def.Version == version {
+			return &def
+		}
+	}
+	return nil
+}
+
+func getLatestSchemaDef() *SchemaVersionDef {
+	if len(schemaHistory) == 0 {
+		return nil
+	}
+	return &schemaHistory[len(schemaHistory)-1]
+}
+
+func schemaVersionsEqual(v1, v2 *SchemaVersionDef) bool {
+	if v1 == nil || v2 == nil {
+		return false
+	}
+	if v1.TableName != v2.TableName {
+		return false
+	}
+	if len(v1.Columns) != len(v2.Columns) {
+		return false
+	}
+	for name, col1 := range v1.Columns {
+		col2, ok := v2.Columns[name]
+		if !ok {
+			return false
+		}
+		if col1.Type != col2.Type || col1.NotNull != col2.NotNull || col1.Default != col2.Default {
+			return false
+		}
+	}
+	return true
+}

db.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"log"
 	"os"
+	"sort"
 	"strings"
 	"time"
 
@@ -21,14 +22,13 @@ var DB *sql.DB
 // ============================================================
 
 const (
-	SchemaVersion = "2.0.0" // 当前数据库 Schema 版本，与项目版本同步
+	SchemaVersion = "v2" // 当前数据库 Schema 版本
 )
 
 // ============================================================
 // 数据模型
 // ============================================================
 
-// GlobalConfig 全局配置表
 type GlobalConfig struct {
 	ID                int    `json:"id"`
 	ServerAddr        string `json:"serverAddr"`
@@ -41,10 +41,9 @@ type GlobalConfig struct {
 	HeartbeatInterval int    `json:"heartbeatInterval"`
 	HeartbeatTimeout  int    `json:"heartbeatTimeout"`
 	PoolCount         int    `json:"poolCount"`
-	WireProtocolV2    bool   `json:"wireProtocolV2"` // v2.0 正式启用
+	WireProtocolV2    bool   `json:"wireProtocolV2"`
 }
 
-// Proxy 隧道表
 type Proxy struct {
 	ID         int    `json:"id"`
 	Name       string `json:"name"`
@@ -55,7 +54,6 @@ type Proxy struct {
 	Enabled    bool   `json:"enabled"`
 }
 
-// User 用户表
 type User struct {
 	ID           int    `json:"id"`
 	Username     string `json:"username"`
@@ -74,22 +72,19 @@ func InitDB() error {
 		return err
 	}
 
-	// ---- 创建所有表 ----
 	if err := createTables(); err != nil {
 		return err
 	}
 
-	// ---- 执行版本迁移 ----
 	if err := runMigrations(); err != nil {
 		return err
 	}
 
-	// ---- 确保 JWT 密钥存在 ----
 	if err := ensureJwtSecret(); err != nil {
 		return err
 	}
 
-	log.Println("✅ 数据库初始化完成 (Schema v" + SchemaVersion + ")")
+	log.Println("✅ 数据库初始化完成 (Schema " + SchemaVersion + ")")
 	return nil
 }
 
@@ -152,7 +147,7 @@ func createTables() error {
 		return err
 	}
 
-	// 应用配置表（存储 JWT 密钥、Schema 版本等）
+	// 应用配置表
 	_, err = DB.Exec(`
         CREATE TABLE IF NOT EXISTS app_config (
             key TEXT PRIMARY KEY,
@@ -164,7 +159,7 @@ func createTables() error {
 		return err
 	}
 
-	// 初始化默认配置（仅当表为空时）
+	// 初始化默认配置
 	var count int
 	DB.QueryRow("SELECT COUNT(*) FROM global_config").Scan(&count)
 	if count == 0 {
@@ -188,30 +183,24 @@ func createTables() error {
 // 迁移引擎
 // ============================================================
 
-// getSchemaVersion 读取当前数据库的 Schema 版本
-func getSchemaVersion() string {
+func getCurrentSchemaVersion() string {
 	var version string
 	err := DB.QueryRow("SELECT value FROM app_config WHERE key = 'schema_version'").Scan(&version)
 	if err != nil {
 		if err == sql.ErrNoRows {
-			// 没有版本记录 → 首次启动或 v1.x 升级
-			// 检查是否已有数据（通过 users 表判断）
 			var count int
 			DB.QueryRow("SELECT COUNT(*) FROM users").Scan(&count)
 			if count > 0 {
-				// 有用户数据 → 这是 v1.x 升级，标记为 1.5
-				return "1.5.0"
+				return "v1"
 			}
-			// 全新安装 → 直接标记为当前版本
 			return SchemaVersion
 		}
 		log.Printf("⚠️  读取 Schema 版本失败: %v", err)
-		return "1.5.0" // 保守降级
+		return "v1"
 	}
 	return version
 }
 
-// setSchemaVersion 更新 Schema 版本
 func setSchemaVersion(version string) error {
 	_, err := DB.Exec(`
         INSERT INTO app_config (key, value) VALUES ('schema_version', ?)
@@ -220,15 +209,14 @@ func setSchemaVersion(version string) error {
 	return err
 }
 
-// backupDatabase 备份数据库文件
 func backupDatabase() (string, error) {
 	src := "./frpc-console.db"
 	if _, err := os.Stat(src); os.IsNotExist(err) {
-		return "", nil // 数据库不存在，无需备份
+		return "", nil
 	}
 
 	timestamp := time.Now().Format("20060102_150405")
-	dst := fmt.Sprintf("./frpc-console.db.pre-v%s.%s", SchemaVersion, timestamp)
+	dst := fmt.Sprintf("./frpc-console.db.pre-%s.%s", SchemaVersion, timestamp)
 
 	srcFile, err := os.Open(src)
 	if err != nil {
@@ -250,69 +238,6 @@ func backupDatabase() (string, error) {
 	return dst, nil
 }
 
-// runMigrations 执行版本迁移
-func runMigrations() error {
-	currentVersion := getSchemaVersion()
-	log.Printf("📌 当前数据库 Schema: %s, 目标版本: %s", currentVersion, SchemaVersion)
-
-	if currentVersion == SchemaVersion {
-		log.Println("✅ Schema 已是最新，无需迁移")
-		return nil
-	}
-
-	log.Printf("🔄 检测到版本变更 (%s → %s)，开始迁移...", currentVersion, SchemaVersion)
-
-	// ---- 1. 备份数据库 ----
-	backupPath, err := backupDatabase()
-	if err != nil {
-		return fmt.Errorf("备份数据库失败: %w", err)
-	}
-	if backupPath != "" {
-		log.Printf("📦 备份文件: %s", backupPath)
-	} else {
-		log.Println("📦 数据库为空，跳过备份")
-	}
-
-	// ---- 2. 执行迁移 ----
-	// 按照版本号逐个升级
-	migrations := []struct {
-		from    string
-		upgrade func() error
-	}{
-		{"1.5.0", migrateFrom1_5_0},
-		{"2.0.0", migrateFrom2_0_0}, // 预留，实际无操作
-	}
-
-	applied := 0
-	for _, m := range migrations {
-		if currentVersion == m.from {
-			log.Printf("  执行迁移: %s → %s", m.from, SchemaVersion)
-			if err := m.upgrade(); err != nil {
-				// 迁移失败，尝试恢复备份
-				if backupPath != "" {
-					log.Printf("❌ 迁移失败，尝试恢复备份: %s", backupPath)
-					if restoreErr := restoreDatabase(backupPath); restoreErr != nil {
-						log.Printf("⚠️  恢复备份失败: %v", restoreErr)
-					}
-				}
-				return fmt.Errorf("迁移失败: %w", err)
-			}
-			applied++
-			currentVersion = SchemaVersion
-			break
-		}
-	}
-
-	// ---- 3. 更新 Schema 版本 ----
-	if err := setSchemaVersion(SchemaVersion); err != nil {
-		return fmt.Errorf("更新 Schema 版本失败: %w", err)
-	}
-
-	log.Printf("✅ 迁移完成，应用了 %d 个迁移", applied)
-	return nil
-}
-
-// restoreDatabase 从备份恢复数据库
 func restoreDatabase(backupPath string) error {
 	srcFile, err := os.Open(backupPath)
 	if err != nil {
@@ -334,76 +259,187 @@ func restoreDatabase(backupPath string) error {
 	return nil
 }
 
-// ============================================================
-// 迁移函数（各版本）
-// ============================================================
+func runMigrations() error {
+	currentVer := getCurrentSchemaVersion()
+	targetVer := SchemaVersion
 
-// migrateFrom1_5_0: v1.5 → v2.0
-// v1.5 已经有 wire_protocol_v2 字段（灰标占位），v2.0 无需新增字段
-// 但需要确保字段存在（兼容从 v1.0 直接升级的场景）
-func migrateFrom1_5_0() error {
-	log.Println("  迁移: v1.5.0 → v2.0.0")
+	log.Printf("📌 当前数据库 Schema: %s, 目标版本: %s", currentVer, targetVer)
 
-	// 检查并补全 wire_protocol_v2 字段（兼容从 v1.0 直接升级的场景）
-	cols, err := getCurrentColumns("global_config")
-	if err != nil {
-		return fmt.Errorf("获取列信息失败: %w", err)
+	if currentVer == targetVer {
+		// 检查数据库是否包含有效数据
+		var userCount int
+		err := DB.QueryRow("SELECT COUNT(*) FROM users").Scan(&userCount)
+		if err != nil || userCount == 0 {
+			log.Println("  数据库为空或无效，无需迁移，直接初始化")
+			return nil
+		}
+		log.Println("✅ Schema 已是最新，数据库有效")
+		return nil
 	}
 
-	if !contains(cols, "wire_protocol_v2") {
-		log.Println("  添加字段: wire_protocol_v2")
-		_, err := DB.Exec("ALTER TABLE global_config ADD COLUMN wire_protocol_v2 INTEGER NOT NULL DEFAULT 0")
-		if err != nil {
-			return fmt.Errorf("添加 wire_protocol_v2 字段失败: %w", err)
+	log.Printf("🔄 检测到版本变更 (%s → %s)，开始迁移...", currentVer, targetVer)
+
+	backupPath, err := backupDatabase()
+	if err != nil {
+		return fmt.Errorf("备份数据库失败: %w", err)
+	}
+	if backupPath != "" {
+		log.Printf("📦 备份文件: %s", backupPath)
+	}
+
+	currentSchema := getSchemaDef(currentVer)
+	targetSchema := getSchemaDef(targetVer)
+
+	if targetSchema == nil {
+		return fmt.Errorf("目标 Schema 版本 %s 未在 schemaHistory 中定义", targetVer)
+	}
+
+	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 {
+			log.Println("  数据库为空或无效，跳过迁移，直接初始化")
+			return nil
+		}
+		log.Println("  数据库有效，继续使用")
+	} else {
+		log.Println("  迁移类型: 重型迁移（Schema 有变更，新建表 + 搬数据）")
+		if err := heavyMigration(currentSchema, targetSchema); err != nil {
+			if backupPath != "" {
+				log.Printf("❌ 迁移失败，尝试恢复备份: %s", backupPath)
+				if restoreErr := restoreDatabase(backupPath); restoreErr != nil {
+					log.Printf("⚠️  恢复备份失败: %v", restoreErr)
+				}
+			}
+			return fmt.Errorf("重型迁移失败: %w", err)
 		}
 	}
 
-	log.Println("  ✅ v1.5.0 → v2.0.0 迁移完成")
-	return nil
-}
-
-// migrateFrom2_0_0: 预留，v2.0 → 未来版本
-func migrateFrom2_0_0() error {
-	log.Println("  v2.0.0 已是当前版本，无需迁移")
-	return nil
-}
-
-// ============================================================
-// 辅助函数
-// ============================================================
-
-func getCurrentColumns(tableName string) ([]string, error) {
-	rows, err := DB.Query("PRAGMA table_info(" + tableName + ")")
-	if err != nil {
-		return nil, err
+	if err := setSchemaVersion(targetVer); err != nil {
+		return fmt.Errorf("更新 Schema 版本失败: %w", err)
 	}
-	defer rows.Close()
 
+	log.Printf("✅ 迁移完成，当前 Schema: %s", targetVer)
+	return nil
+}
+
+func heavyMigration(oldDef, newDef *SchemaVersionDef) error {
+	if oldDef == nil {
+		return fmt.Errorf("旧 Schema 定义为空，无法执行重型迁移")
+	}
+
+	oldTable := oldDef.TableName
+	newTable := oldTable + "_new"
+
+	createSQL := buildCreateTableSQL(newTable, newDef)
+	log.Printf("  创建新表: %s", newTable)
+	if _, err := DB.Exec(createSQL); err != nil {
+		return fmt.Errorf("创建新表失败: %w", err)
+	}
+
+	insertSQL, err := buildInsertSQL(oldTable, newTable, oldDef, newDef)
+	if err != nil {
+		return fmt.Errorf("构建数据迁移 SQL 失败: %w", err)
+	}
+	log.Printf("  迁移数据: %s → %s", oldTable, newTable)
+	if _, err := DB.Exec(insertSQL); err != nil {
+		return fmt.Errorf("数据迁移失败: %w", err)
+	}
+
+	var oldCount, newCount int
+	DB.QueryRow(fmt.Sprintf("SELECT COUNT(*) FROM %s", oldTable)).Scan(&oldCount)
+	DB.QueryRow(fmt.Sprintf("SELECT COUNT(*) FROM %s", newTable)).Scan(&newCount)
+	if oldCount != newCount {
+		return fmt.Errorf("数据迁移不完整: 旧表 %d 行，新表 %d 行", oldCount, newCount)
+	}
+	log.Printf("  数据迁移验证通过: %d 行", newCount)
+
+	tempTable := oldTable + "_old_temp"
+	if _, err := DB.Exec(fmt.Sprintf("ALTER TABLE %s RENAME TO %s", oldTable, tempTable)); err != nil {
+		return fmt.Errorf("重命名旧表失败: %w", err)
+	}
+	if _, err := DB.Exec(fmt.Sprintf("ALTER TABLE %s RENAME TO %s", newTable, oldTable)); err != nil {
+		DB.Exec(fmt.Sprintf("ALTER TABLE %s RENAME TO %s", tempTable, oldTable))
+		return fmt.Errorf("重命名新表失败: %w", err)
+	}
+	if _, err := DB.Exec(fmt.Sprintf("DROP TABLE %s", tempTable)); err != nil {
+		log.Printf("⚠️  删除临时表失败（不影响使用）: %v", err)
+	}
+
+	log.Printf("  表交换完成: %s (新表已生效)", oldTable)
+	return nil
+}
+
+func buildCreateTableSQL(tableName string, def *SchemaVersionDef) string {
 	var cols []string
-	for rows.Next() {
-		var (
-			cid     int
-			name    string
-			typ     string
-			notNull int
-			dfltVal sql.NullString
-			pk      int
-		)
-		if err := rows.Scan(&cid, &name, &typ, &notNull, &dfltVal, &pk); err != nil {
-			return nil, err
-		}
-		cols = append(cols, name)
+	var primaryKey string
+
+	names := make([]string, 0, len(def.Columns))
+	for name := range def.Columns {
+		names = append(names, name)
 	}
-	return cols, rows.Err()
+	sort.Strings(names)
+
+	for _, name := range names {
+		col := def.Columns[name]
+		parts := []string{name, col.Type}
+		if col.NotNull {
+			parts = append(parts, "NOT NULL")
+		}
+		if col.Default != "" {
+			parts = append(parts, "DEFAULT "+col.Default)
+		}
+		if col.Primary {
+			primaryKey = "PRIMARY KEY (" + name + ")"
+		} else {
+			cols = append(cols, strings.Join(parts, " "))
+		}
+	}
+
+	if primaryKey != "" {
+		cols = append(cols, primaryKey)
+	}
+
+	return fmt.Sprintf("CREATE TABLE %s (\n    %s\n)", tableName, strings.Join(cols, ",\n    "))
 }
 
-func contains(slice []string, item string) bool {
-	for _, s := range slice {
-		if strings.EqualFold(s, item) {
-			return true
+func buildInsertSQL(oldTable, newTable string, oldDef, newDef *SchemaVersionDef) (string, error) {
+	newCols := make([]string, 0, len(newDef.Columns))
+	for name := range newDef.Columns {
+		newCols = append(newCols, name)
+	}
+	sort.Strings(newCols)
+
+	var selectParts []string
+	var colNames []string
+
+	for _, name := range newCols {
+		colNames = append(colNames, name)
+		if _, ok := oldDef.Columns[name]; ok {
+			selectParts = append(selectParts, name)
+		} else {
+			colDef := newDef.Columns[name]
+			if colDef.Default != "" {
+				selectParts = append(selectParts, colDef.Default+" AS "+name)
+			} else if colDef.Type == "INTEGER" {
+				selectParts = append(selectParts, "0 AS "+name)
+			} else if colDef.Type == "TEXT" {
+				selectParts = append(selectParts, "'' AS "+name)
+			} else {
+				selectParts = append(selectParts, "NULL AS "+name)
+			}
 		}
 	}
-	return false
+
+	return fmt.Sprintf(
+		"INSERT INTO %s (%s) SELECT %s FROM %s",
+		newTable,
+		strings.Join(colNames, ", "),
+		strings.Join(selectParts, ", "),
+		oldTable,
+	), nil
 }
 
 // ============================================================
@@ -504,10 +540,7 @@ func GetProxies() ([]Proxy, error) {
 		}
 		proxies = append(proxies, p)
 	}
-	if err = rows.Err(); err != nil {
-		return nil, err
-	}
-	return proxies, nil
+	return proxies, rows.Err()
 }
 
 func GetProxy(id int) (*Proxy, error) {

deploy.sh

@@ -14,14 +14,24 @@
 
 set -e
 
-# ---------- 颜色输出 ----------
-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'
+# ---------- 颜色检测 ----------
+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
 
 # ---------- 配置 ----------
 REPO_URL="https://git.whitetop.xyz/lxh2875931338/frpc-console.git"
@@ -144,35 +154,30 @@ detect_arch() {
 
 # ---------- 检测工具 ----------
 check_tools() {
-    # git
     if command -v git &> /dev/null; then
         HAS_GIT=true
     else
         NEED_INSTALL_GIT=true
     fi
 
-    # curl
     if command -v curl &> /dev/null; then
         HAS_CURL=true
     else
         NEED_INSTALL_CURL=true
     fi
 
-    # wget
     if command -v wget &> /dev/null; then
         HAS_WGET=true
     else
         NEED_INSTALL_WGET=true
     fi
 
-    # Go
     if command -v go &> /dev/null; then
         HAS_GO=true
     else
         NEED_INSTALL_GO=true
     fi
 
-    # Docker
     if command -v docker &> /dev/null; then
         HAS_DOCKER=true
     fi
@@ -188,30 +193,6 @@ check_container() {
     fi
 }
 
-# ---------- 获取系统包管理器 ----------
-get_package_manager() {
-    case $OS in
-        opensuse*|suse*|opensuse-tumbleweed|opensuse-slowroll|opensuse-leap)
-            echo "zypper"
-            ;;
-        ubuntu|debian|linuxmint)
-            echo "apt"
-            ;;
-        centos|rhel|fedora|rocky|almalinux)
-            echo "yum"
-            ;;
-        alpine)
-            echo "apk"
-            ;;
-        arch|manjaro|endeavouros)
-            echo "pacman"
-            ;;
-        *)
-            echo "unknown"
-            ;;
-    esac
-}
-
 # ---------- 检测结果汇总 ----------
 print_environment_summary() {
     print_title
@@ -226,7 +207,7 @@ print_environment_summary() {
     if [ "$HAS_GIT" = true ]; then
         echo -e "    git     ✅ 已安装 ($(git --version | awk '{print $3}'))"
     else
-        echo -e "    git     ❌ 未安装 (将自动安装)"
+        echo "    git     ❌ 未安装 (将自动安装)"
     fi
     if [ "$HAS_CURL" = true ]; then
         echo "    curl    ✅ 已安装"
@@ -262,15 +243,15 @@ print_environment_summary() {
         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}"
     fi
 
     echo ""
@@ -335,12 +316,17 @@ confirm_deploy() {
         echo -e "${GREEN}▶ 已启用 --yes，自动确认${NC}"
         return 0
     fi
+
     echo -e -n "${CYAN}确认执行? 输入 Y 继续，输入 n 自定义配置 [Y/n]: ${NC}"
-    # 强制从 /dev/tty 读取，而不是继承 stdin
     read -r CONFIRM </dev/tty
+
     case $CONFIRM in
-        n|N) return 1 ;;
-        *) return 0 ;;
+        n|N)
+            return 1
+            ;;
+        *)
+            return 0
+            ;;
     esac
 }
 
@@ -367,12 +353,39 @@ custom_config() {
     echo ""
 }
 
-# ---------- 实际执行部署 ----------
+# ---------- 执行部署 ----------
 do_deploy() {
     print_title
     print_subtitle "开始部署"
     echo ""
 
+    # ----- 事务前钩子：备份数据库 -----
+    print_step "备份数据库..."
+    BACKUP_DIR="${DEPLOY_DIR}/backups"
+    mkdir -p "$BACKUP_DIR"
+
+    DB_FILE="$DATA_DIR/frpc-console.db"
+    if [ -f "$DB_FILE" ]; then
+        TIMESTAMP=$(date +%Y%m%d_%H%M%S)
+        BACKUP_FILE="$BACKUP_DIR/frpc-console.db.$TIMESTAMP"
+        cp "$DB_FILE" "$BACKUP_FILE"
+        print_info "已备份: $BACKUP_FILE"
+
+        # 检查数据库是否有效（存在 users 表）
+        if command -v sqlite3 &> /dev/null; then
+            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 "数据库有效，保留"
+            fi
+        else
+            print_warn "sqlite3 未安装，无法检查数据库有效性，保留原文件"
+        fi
+    else
+        print_info "数据库文件不存在，跳过备份"
+    fi
+
     # ----- 安装必要工具 -----
     if [ "$NEED_INSTALL_GIT" = true ] || [ "$NEED_INSTALL_CURL" = true ] || [ "$NEED_INSTALL_WGET" = true ]; then
         print_step "安装必要工具..."
@@ -383,7 +396,13 @@ do_deploy() {
 
         case $OS in
             opensuse*|suse*|opensuse-tumbleweed|opensuse-slowroll|opensuse-leap)
-                zypper install -y $pkgs-core
+                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
+                if [ -n "$pkgs" ]; then
+                    zypper install -y $pkgs
+                fi
                 ;;
             ubuntu|debian|linuxmint)
                 apt update -qq && apt install -y $pkgs
@@ -454,7 +473,6 @@ do_deploy() {
         print_success "Go ${GO_VERSION} (${GO_ARCH}) 安装完成"
     fi
 
-    # 确保 go 在 PATH 中
     export PATH=$PATH:/usr/local/go/bin
 
     # ----- 拉取代码 -----
@@ -496,11 +514,10 @@ do_deploy() {
     mkdir -p "$DEPLOY_DIR"
     mkdir -p "$DATA_DIR"
 
-    if [ ! -f "$DATA_DIR/frpc-console.db" ]; then
-        touch "$DATA_DIR/frpc-console.db"
-        print_info "新数据目录已创建"
+    if [ -f "$DB_FILE" ]; then
+        print_info "数据库文件存在，将保留"
     else
-        print_info "已有数据目录，保留现有数据"
+        print_info "数据库文件不存在，容器启动时将自动创建"
     fi
 
     cp frpc-console "$DEPLOY_DIR/"
@@ -539,13 +556,29 @@ do_deploy() {
         exit 1
     fi
 
-    # ----- 检查 frpc 子进程 -----
+    # ----- 检查 frpc 子进程（增强版） -----
     print_step "检查 frpc 状态..."
     sleep 3
-    if docker exec frpc-console ps aux 2>/dev/null | grep -q "[f]rpc -c"; then
-        print_success "frpc 进程运行正常"
+
+    # 先确认容器在运行
+    if docker ps --format '{{.Names}}' | grep -q "^frpc-console$"; then
+        # 再检查 frpc 进程
+        if docker exec frpc-console ps aux 2>/dev/null | grep -q "[f]rpc -c"; then
+            print_success "frpc 进程运行正常"
+        else
+            print_warn "frpc 进程未运行（可能配置为空，请在 WebUI 中导入 TOML）"
+        fi
     else
-        print_warn "frpc 进程未运行（可能配置为空，请在 WebUI 中导入 TOML）"
+        print_error "frpc-console 容器未运行，请检查日志"
+        exit 1
+    fi
+
+    # ----- 事务后钩子：检测数据库是否可用 -----
+    print_step "验证数据库状态..."
+    if docker exec frpc-console sqlite3 /app/data/frpc-console.db "SELECT COUNT(*) FROM users;" 2>/dev/null | grep -q "^[0-9]"; then
+        print_success "数据库可用"
+    else
+        print_warn "数据库为空或不可用，请通过 WebUI 注册管理员账户"
     fi
 
     # ----- 清理临时文件 -----
@@ -561,6 +594,7 @@ do_deploy() {
     echo ""
     echo -e "  ${CYAN}📍 访问地址:${NC} http://$(hostname -I | awk '{print $1}'):${PORT}"
     echo -e "  ${CYAN}📂 数据目录:${NC} ${DATA_DIR}"
+    echo -e "  ${CYAN}📦 备份目录:${NC} ${BACKUP_DIR}"
     echo -e "  ${CYAN}🐳 容器名称:${NC} frpc-console"
     echo ""
     echo -e "  ${CYAN}常用命令:${NC}"
@@ -574,32 +608,25 @@ do_deploy() {
     print_title
 }
 
-# ---------- 主流程 ----------
 # ---------- 主流程 ----------
 main() {
-    # 清屏，让输出从头开始
     clear 2>/dev/null || true
-
     parse_args "$@"
     check_root
 
-    # ---- 环境检测 ----
-    print_step "正在检测环境..."
+    print_step "检测环境..."
     detect_os
     detect_arch
     check_tools
     check_container
 
-    # ---- 展示检测结果 ----
     print_environment_summary
 
-    # ---- 如果只检测 ----
     if [ "$CHECK_ONLY" = true ]; then
         print_info "环境检测完成（--check 模式，不执行部署）"
         exit 0
     fi
 
-    # ---- 如果 Docker 未安装 ----
     if [ "$HAS_DOCKER" = false ]; then
         print_error "Docker 未安装，请先安装 Docker"
         echo ""
@@ -610,13 +637,10 @@ main() {
         exit 1
     fi
 
-    # ---- 生成部署计划 ----
     generate_plan
 
-    # ---- 展示部署计划 ----
     print_deployment_plan
 
-    # ---- 确认或自定义 ----
     if ! confirm_deploy; then
         custom_config
         print_deployment_plan
@@ -626,15 +650,12 @@ main() {
         fi
     fi
 
-    # ---- 如果只是演练 ----
     if [ "$DRY_RUN" = true ]; then
         print_info "演练模式（--dry-run），不实际执行部署"
         exit 0
     fi
 
-    # ---- 执行部署 ----
     do_deploy
 }
 
-# ---------- 入口 ----------
 main "$@"

readme.md

@@ -142,7 +142,14 @@ go build -ldflags="-s -w" -o frpc-console .
 
 #### Q: frpc 启动失败怎么办？
 
-检查 frpc.toml 配置是否正确，或查看 ./frpc.log 日志文件。
+如果是首次启动，console 会自动生成一份符合官方规范的 `frps.toml` 配置文件，通常不需要额外操作。
+
+如果在使用过程中遇到启动失败，可以按以下步骤排查：
+
+1. **检查配置是否正确** —— 在「全局配置」页面重新配置一次服务端参数，或导入已有的 `frpc.toml` 配置文件，console 会自动应用并尝试重启
+2. **查看日志定位问题** —— 若上述操作后仍然失败，请查看 `./frpc.log` 日志文件，定位具体报错原因
+
+> 日志文件的位置：与 `frpc-console` 二进制同级目录下的 `frpc.log`。Docker 部署时，可通过 `docker logs frpc-console` 查看容器输出。
 
 #### Q: 支持哪些 frp 版本？
 
@@ -289,7 +296,7 @@ frpc-console 遵循 **“够用就好”** 的原则：
 
 ## 📄 许可证
 
-MIT License © 2026 Gitea:lxh2875931338/Github:XHLiang0
+MIT License © 2026 lxh2875931338（XHLiang0）
 
 ---
 

static/app.js

@@ -28,6 +28,13 @@ async function apiFetch(endpoint, options = {}) {
         ...options,
         headers: { ...headers, ...(options.headers || {}) },
     });
+
+    if (res.status === 401) {
+        clearAuthState();
+        window.dispatchEvent(new CustomEvent("auth:expired"));
+        return { code: 401, msg: "认证已过期，请重新登录" };
+    }
+
     return res.json();
 }
 
@@ -163,7 +170,7 @@ function filterProxies(list, keyword) {
         (p) =>
             p.name.toLowerCase().includes(kw) ||
             p.localIP.includes(kw) ||
-            String(p.remotePort).includes(kw)
+            String(p.remotePort).includes(kw),
     );
 }
 
@@ -189,7 +196,11 @@ async function fetchLogsApi() {
     try {
         const data = await apiFetch("/frpc/log");
         if (data.code === 0) {
-            return { lines: data.data.lines || [], total: data.data.total || 0, error: data.data.error || "" };
+            return {
+                lines: data.data.lines || [],
+                total: data.data.total || 0,
+                error: data.data.error || "",
+            };
         }
         return { lines: [], total: 0, error: "加载失败" };
     } catch (e) {
@@ -286,8 +297,83 @@ const app = createApp({
         let logTimer = null;
         let logFetching = false;
 
+        // ---- Ping 延迟检测 ----
+        const pingLatency = ref(null);
+        let pingTimer = null;
+        const PING_INTERVAL_MS = 30000;
+        const PING_TIMEOUT_MS = 5000;
+
+        const pingStatusClass = computed(() => {
+            if (pingLatency.value === null) return "ping-fail";
+            if (pingLatency.value < 1000) return "ping-good";
+            if (pingLatency.value < 5000) return "ping-slow";
+            return "ping-fail";
+        });
+
+        const pingIcon = computed(() => {
+            if (pingLatency.value === null) {
+                return `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 256 256">
+                    <path d="M0 0h256v256H0z" fill="none"/>
+                    <g fill="currentColor">
+                        <path d="m224.39 104.34-90.24 108.78a8 8 0 0 1-12.3 0L17.8 87.69a7.79 7.79 0 0 1 1.31-11.21A179.58 179.58 0 0 1 128 40a182 182 0 0 1 33.06 3a7.94 7.94 0 0 1 4.17 2.21L224 104Z" opacity=".2"/>
+                        <path d="M229.66 98.34a8 8 0 0 1-11.32 11.32L200 91.31l-18.34 18.35a8 8 0 0 1-11.32-11.32L188.69 80l-18.35-18.34a8 8 0 0 1 11.32-11.32L200 68.69l18.34-18.35a8 8 0 0 1 11.32 11.32L211.31 80Zm-33.06 39.5a8 8 0 0 0-11.27 1L128 208L24.09 82.74A170.76 170.76 0 0 1 128 48c2.54 0 5.11.06 7.65.17a8 8 0 0 0 .7-16c-2.77-.12-5.58-.18-8.35-.18A186.67 186.67 0 0 0 14.28 70.1a15.93 15.93 0 0 0-6.17 10.81a15.65 15.65 0 0 0 3.54 11.89l104 125.43A15.93 15.93 0 0 0 128 224a15.93 15.93 0 0 0 12.31-5.77l57.34-69.12a8 8 0 0 0-1.05-11.27"/>
+                    </g>
+                </svg>`;
+            }
+            if (pingLatency.value < 1000) {
+                return `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 25 24">
+                    <path d="M0 0h25v24H0z" fill="none"/>
+                    <path fill="currentColor" d="M2.046 6.725c6.192-4.967 15.05-4.967 21.243 0l.779.625l-11.4 14.25L1.265 7.35z"/>
+                </svg>`;
+            }
+            return `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
+                <path d="M0 0h24v24H0z" fill="none"/>
+                <path fill="none" stroke="currentColor" stroke-width="2" d="M21.996 7.505L12 20L2.004 7.505c5.827-4.673 14.165-4.673 19.992 0Z"/>
+            </svg>`;
+        });
+
+        async function doPing() {
+            if (!frpcRunning.value) {
+                pingLatency.value = null;
+                return;
+            }
+            const addr = globalConfig.serverAddr || "frp.example.com";
+            const start = performance.now();
+            try {
+                const res = await fetch(
+                    `/api/ping?target=${encodeURIComponent(addr)}`,
+                    { signal: AbortSignal.timeout(PING_TIMEOUT_MS) },
+                );
+                if (!res.ok) throw new Error("Ping failed");
+                const end = performance.now();
+                pingLatency.value = Math.round(end - start);
+            } catch {
+                pingLatency.value = null;
+            }
+        }
+
+        function startPingPolling() {
+            if (pingTimer) return;
+            doPing();
+            pingTimer = setInterval(doPing, PING_INTERVAL_MS);
+        }
+
+        function stopPingPolling() {
+            if (pingTimer) {
+                clearInterval(pingTimer);
+                pingTimer = null;
+            }
+        }
+
+        // ---- 认证过期处理 ----
+        const handleAuthExpired = () => {
+            doLogout();
+        };
+
         // ---- 初始化 ----
         onMounted(() => {
+            window.addEventListener("auth:expired", handleAuthExpired);
+
             const saved = loadAuthState();
             if (saved.valid) {
                 token.value = saved.token;
@@ -312,6 +398,15 @@ const app = createApp({
             }
         });
 
+        watch(frpcRunning, (running) => {
+            if (!running) {
+                stopPingPolling();
+                pingLatency.value = null;
+            } else if (loggedIn.value) {
+                startPingPolling();
+            }
+        });
+
         async function checkUsers() {
             try {
                 const res = await fetch("/api/check/users");
@@ -351,6 +446,10 @@ const app = createApp({
             logFetching = true;
             try {
                 const result = await fetchLogsApi();
+                if (result.code === 401) {
+                    logFetching = false;
+                    return;
+                }
                 logLines.value = result.lines;
                 logTotal.value = result.total;
                 logError.value = result.error;
@@ -478,6 +577,7 @@ const app = createApp({
         const doLogout = () => {
             if (expireTimer) clearInterval(expireTimer);
             stopLogPolling();
+            stopPingPolling();
             contentVisible.value = false;
             loggedIn.value = false;
             token.value = "";
@@ -637,11 +737,10 @@ const app = createApp({
 
         // ---- 计算属性 ----
         const filteredProxies = computed(() =>
-            filterProxies(proxies.value, searchKeyword.value)
+            filterProxies(proxies.value, searchKeyword.value),
         );
 
         const showDefaultTip = computed(() => {
-            // 如果 serverAddr 还是默认值，或者为空，显示警告
             const addr = globalConfig.serverAddr;
             return !addr || addr === "frp.example.com" || addr.trim() === "";
         });
@@ -692,9 +791,8 @@ const app = createApp({
             passwordChangeSuccess,
             changePassword,
 
-            showDefaultTip, 
+            showDefaultTip,
 
-            // 日志相关
             logLines,
             logTotal,
             logError,
@@ -703,8 +801,11 @@ const app = createApp({
             refreshLogs,
             scrollLogToBottom,
 
-            // Token 显示切换
             showToken,
+
+            pingLatency,
+            pingStatusClass,
+            pingIcon,
         };
     },
 });

static/index.html

@@ -97,11 +97,15 @@
                             <span class="status-wrapper">
                                 <span class="status-dot" :class="{ active: frpcRunning }"></span>
                                 <span class="status-text">{{ frpcRunning ? 'frpc 运行中' : 'frpc 已停止' }}</span>
+                                <!-- Ping 延迟显示 -->
+                                <span class="ping-display" :class="pingStatusClass">
+                                    <span class="ping-icon" v-html="pingIcon"></span>
+                                    <span class="ping-value">{{ pingLatency !== null ? pingLatency + 'ms' : '--ms' }}</span>
+                                </span>
                             </span>
                         </div>
                     </div>
                     <div class="top-right">
-                        <span class="user-name">{{ loginForm.username }}</span>
                         <button class="logout-btn" @click="doLogout">退出</button>
                     </div>
                 </div>
@@ -114,6 +118,8 @@
                         @click="activeTab = 'config'">全局配置信息</span>
                     <span class="tab-item" :class="{ active: activeTab === 'logs' }"
                         @click="activeTab = 'logs'">运行日志</span>
+                    <span class="tab-item" :class="{ active: activeTab === 'user' }"
+                        @click="activeTab = 'user'">用户配置：{{loginForm.username }}</span>
                 </div>
 
                 <!-- 内容区 -->
@@ -159,48 +165,18 @@
                         </div>
                     </div>
 
-                    <!-- ====== 全局配置信息 ====== -->
                     <!-- ====== 全局配置信息 ====== -->
                     <div v-if="activeTab === 'config'" class="tab-content config-tab-content">
-                        <!-- 页面标题 -->
                         <div class="config-page-header">
                             <h2>全局配置信息</h2>
                             <p class="config-subtitle">管理 frpc 连接参数与传输设置</p>
                         </div>
 
-                        <!-- 首次使用提示 -->
                         <div v-if="showDefaultTip" class="config-tip">
-                            首次使用请修改「服务器地址」和「认证令牌」为您的真实 frpc 配置
+                            首次使用请修改「服务器地址」和「认证令牌」为您的真实 frps 配置
                         </div>
 
-                        <!-- ===== 账户管理 ===== -->
-                        <div class="profile-section">
-                            <div class="profile-header">
-                                <span>账户管理</span>
-                                <span class="profile-username">{{ loginForm.username }}</span>
-                            </div>
-                            <div class="profile-form">
-                                <div class="form-row">
-                                    <label>当前密码</label>
-                                    <input v-model="passwordChange.oldPassword" type="password" placeholder="输入当前密码" />
-                                </div>
-                                <div class="form-row">
-                                    <label>新密码</label>
-                                    <input v-model="passwordChange.newPassword" type="password"
-                                        placeholder="至少8位，含大小写/数字/特殊字符" />
-                                </div>
-                                <div class="form-row">
-                                    <label>确认新密码</label>
-                                    <input v-model="passwordChange.confirmPassword" type="password"
-                                        placeholder="再次输入新密码" />
-                                </div>
-                                <button class="save-btn" @click="changePassword">修改密码</button>
-                                <p v-if="passwordChangeError" class="login-error">{{ passwordChangeError }}</p>
-                                <p v-if="passwordChangeSuccess" class="login-success">{{ passwordChangeSuccess }}</p>
-                            </div>
-                        </div>
-
-                        <!-- ===== 卡片1: 服务器连接 ===== -->
+                        <!-- 卡片1: 服务器连接 -->
                         <div class="config-card">
                             <div class="config-card-header">
                                 <span class="card-title">服务器连接</span>
@@ -227,13 +203,12 @@
                             </div>
                         </div>
 
-                        <!-- ===== 卡片2: 传输配置 ===== -->
+                        <!-- 卡片2: 传输配置 -->
                         <div class="config-card">
                             <div class="config-card-header">
                                 <span class="card-title">传输配置</span>
                             </div>
                             <div class="config-card-body">
-                                <!-- TCP 多路复用（只读，占满一行） -->
                                 <div class="form-row" style="grid-column: 1 / -1;">
                                     <label>TCP 多路复用</label>
                                     <div class="readonly-value">
@@ -242,31 +217,26 @@
                                         <span class="hint-text">优化连接性能，减少延迟，frp 官方推荐开启</span>
                                     </div>
                                 </div>
-                                <!-- 保活间隔 -->
                                 <div class="form-row">
                                     <label>保活间隔（秒）</label>
                                     <input type="number" v-model="globalConfig.tcpMuxKeepalive" />
                                 </div>
-                                <!-- 心跳间隔 -->
                                 <div class="form-row">
                                     <label>心跳间隔（秒）</label>
                                     <input type="number" v-model="globalConfig.heartbeatInterval" />
                                 </div>
-                                <!-- 心跳超时 -->
                                 <div class="form-row">
                                     <label>心跳超时（秒）</label>
                                     <input type="number" v-model="globalConfig.heartbeatTimeout" />
                                 </div>
-                                <!-- 连接池大小 -->
                                 <div class="form-row">
                                     <label>连接池大小（个）</label>
                                     <input type="number" v-model="globalConfig.poolCount" />
                                 </div>
-                                <!-- v2 协议开关（v1.5 灰标禁用） -->
                                 <div class="form-row v2-switch-row">
                                     <label>frp v2 隧道支持</label>
                                     <div class="v2-switch-wrapper">
-                                        <label class="switch disabled">
+                                        <label class="switch">
                                             <input type="checkbox" v-model="globalConfig.wireProtocolV2" />
                                             <span class="slider"></span>
                                         </label>
@@ -278,7 +248,7 @@
                             </div>
                         </div>
 
-                        <!-- ===== 卡片3: 日志配置 ===== -->
+                        <!-- 卡片3: 日志配置 -->
                         <div class="config-card">
                             <div class="config-card-header">
                                 <span class="card-title">日志配置</span>
@@ -301,12 +271,11 @@
                             </div>
                         </div>
 
-                        <!-- 保存按钮 -->
                         <button class="save-config-btn" @click="saveConfig">保存配置并热加载</button>
                     </div>
+
                     <!-- ====== 运行日志 ====== -->
                     <div v-else-if="activeTab === 'logs'" class="tab-content log-tab-content">
-                        <!-- 工具栏 -->
                         <div class="log-toolbar">
                             <div class="log-toolbar-left">
                                 <span class="log-info-badge">共 {{ logTotal }} 行</span>
@@ -322,7 +291,6 @@
                             </div>
                         </div>
 
-                        <!-- 日志显示区域 -->
                         <div class="log-terminal" id="logContainer">
                             <div v-if="logLines.length === 0 && !logError" class="log-empty">
                                 暂无日志，frpc 尚未产生输出
@@ -332,50 +300,85 @@
                             </div>
                         </div>
 
-                        <!-- 底部状态 -->
                         <div class="log-footer">
                             <span>上次更新: {{ logLastUpdate || '--:--:--' }}</span>
                             <span class="log-polling-status">自动刷新中 (8s)</span>
                         </div>
                     </div>
 
-                </div>
-            </div>
-        </div>
+                    <!-- ====== 用户配置 ====== -->
+                    <div v-if="activeTab === 'user'" class="tab-content config-tab-content">
+                        <div class="config-page-header">
+                            <h2>用户配置：{{ loginForm.username }}</h2>
+                            <p class="config-subtitle">修改当前账户的登录密码</p>
+                        </div>
 
-        <!-- ====== 弹窗 ====== -->
-        <Transition name="dialog">
-            <div v-if="dialogVisible" class="dialog-overlay" @click.self="dialogVisible = false">
-                <div class="dialog-card">
-                    <h3>{{ dialogMode === 'add' ? '新增隧道' : '编辑隧道' }}</h3>
-                    <div class="dialog-form">
-                        <div class="form-row"><label>名称</label><input v-model="dialogForm.name" /></div>
-                        <div class="form-row">
-                            <label>类型</label>
-                            <select v-model="dialogForm.type">
-                                <option value="tcp">tcp</option>
-                                <option value="udp">udp</option>
-                                <option value="http">http</option>
-                                <option value="https">https</option>
-                            </select>
-                        </div>
-                        <div class="form-row"><label>本地 IP</label><input v-model="dialogForm.localIP" /></div>
-                        <div class="form-row"><label>本地端口</label><input type="number" v-model="dialogForm.localPort" />
-                        </div>
-                        <div class="form-row"><label>远程端口</label><input type="number" v-model="dialogForm.remotePort" />
+                        <div class="profile-section">
+                            <div class="profile-header">
+                                <span>账户管理</span>
+                                <span class="profile-username">{{ loginForm.username }}</span>
+                            </div>
+                            <div class="profile-form">
+                                <div class="form-row">
+                                    <label>当前密码</label>
+                                    <input v-model="passwordChange.oldPassword" type="password" placeholder="输入当前密码" />
+                                </div>
+                                <div class="form-row">
+                                    <label>新密码</label>
+                                    <input v-model="passwordChange.newPassword" type="password"
+                                        placeholder="至少8位，含大小写/数字/特殊字符" />
+                                </div>
+                                <div class="form-row">
+                                    <label>确认新密码</label>
+                                    <input v-model="passwordChange.confirmPassword" type="password"
+                                        placeholder="再次输入新密码" />
+                                </div>
+                                <button class="save-btn" @click="changePassword">修改密码</button>
+                                <p v-if="passwordChangeError" class="login-error">{{ passwordChangeError }}</p>
+                                <p v-if="passwordChangeSuccess" class="login-success">{{ passwordChangeSuccess }}</p>
+                            </div>
                         </div>
                     </div>
-                    <div class="dialog-actions">
-                        <button class="btn-cancel" @click="dialogVisible = false">取消</button>
-                        <button class="btn-confirm" @click="confirmDialog">确认</button>
+
+                </div> <!-- /content-area -->
+
+                <!-- ====== 弹窗 ====== -->
+                <Transition name="dialog">
+                    <div v-if="dialogVisible" class="dialog-overlay" @click.self="dialogVisible = false">
+                        <div class="dialog-card">
+                            <h3>{{ dialogMode === 'add' ? '新增隧道' : '编辑隧道' }}</h3>
+                            <div class="dialog-form">
+                                <div class="form-row"><label>名称</label><input v-model="dialogForm.name" /></div>
+                                <div class="form-row">
+                                    <label>类型</label>
+                                    <select v-model="dialogForm.type">
+                                        <option value="tcp">tcp</option>
+                                        <option value="udp">udp</option>
+                                        <option value="http">http</option>
+                                        <option value="https">https</option>
+                                    </select>
+                                </div>
+                                <div class="form-row"><label>本地 IP</label><input v-model="dialogForm.localIP" /></div>
+                                <div class="form-row"><label>本地端口</label><input type="number" v-model="dialogForm.localPort" />
+                                </div>
+                                <div class="form-row"><label>远程端口</label><input type="number" v-model="dialogForm.remotePort" />
+                                </div>
+                            </div>
+                            <div class="dialog-actions">
+                                <button class="btn-cancel" @click="dialogVisible = false">取消</button>
+                                <button class="btn-confirm" @click="confirmDialog">确认</button>
+                            </div>
+                        </div>
                     </div>
-                </div>
-            </div>
-        </Transition>
+                </Transition>
+
+            </div> <!-- /main-panel -->
+        </div> <!-- /app-container -->
 
         <!-- 隐藏文件选择器 -->
         <input type="file" id="tomlFileInput" accept=".toml" style="display:none" @change="handleImport" />
-    </div>
+
+    </div> <!-- /#app -->
 
     <script src="/static/app.js"></script>
 </body>

static/style-3.css

@@ -734,4 +734,70 @@ select:disabled {
     .dialog-card {
         padding: 20px;
     }
+}
+
+/* ---------- Ping 延迟显示 ---------- */
+.status-wrapper {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+}
+
+.ping-display {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    font-size: 12px;
+    font-weight: 500;
+    padding: 2px 8px 2px 4px;
+    border-radius: 12px;
+    background: rgba(255, 255, 255, 0.04);
+    transition: background 0.3s;
+}
+
+.ping-display .ping-icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 16px;
+    height: 16px;
+}
+
+.ping-display .ping-icon svg {
+    width: 100%;
+    height: 100%;
+}
+
+/* 状态颜色 */
+.ping-good .ping-icon {
+    color: #63e2b7;
+}
+.ping-good .ping-value {
+    color: #63e2b7;
+}
+
+.ping-slow .ping-icon {
+    color: #f0c040;
+}
+.ping-slow .ping-value {
+    color: #f0c040;
+}
+
+.ping-fail .ping-icon {
+    color: #f87171;
+}
+.ping-fail .ping-value {
+    color: #f87171;
+}
+
+/* 响应式调整 */
+@media (max-width: 768px) {
+    .ping-display {
+        font-size: 11px;
+        padding: 1px 6px 1px 2px;
+    }
+    .ping-display .ping-icon {
+        width: 14px;
+        height: 14px;
+    }
 }