新增功能：frp v2 隧道支持（1.5版本下为灰标无法点击）

db.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"encoding/hex"
 	"log"
+	"strings"
 
 	_ "modernc.org/sqlite"
 )
@@ -24,6 +25,7 @@ type GlobalConfig struct {
 	HeartbeatInterval int    `json:"heartbeatInterval"`
 	HeartbeatTimeout  int    `json:"heartbeatTimeout"`
 	PoolCount         int    `json:"poolCount"`
+	WireProtocolV2    bool   `json:"wireProtocolV2"` // frp v2 协议开关 (v2.0 启用)
 }
 
 // ===== 隧道表（B表）=====
@@ -45,7 +47,10 @@ type User struct {
 	CreatedAt    string `json:"createdAt"`
 }
 
-// ===== 初始化数据库 =====
+// ============================================================
+// 数据库初始化
+// ============================================================
+
 func InitDB() error {
 	var err error
 	DB, err = sql.Open("sqlite", "./frpc-console.db")
@@ -53,7 +58,7 @@ func InitDB() error {
 		return err
 	}
 
-	// 用户表（C表）
+	// ---- 用户表 ----
 	_, err = DB.Exec(`
         CREATE TABLE IF NOT EXISTS users (
             id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -67,13 +72,13 @@ func InitDB() error {
 		return err
 	}
 
-	// 全局配置表（A表）
+	// ---- 全局配置表 ----
 	_, err = DB.Exec(`
         CREATE TABLE IF NOT EXISTS global_config (
             id INTEGER PRIMARY KEY CHECK (id = 1),
-            server_addr TEXT NOT NULL DEFAULT 'frp.whitetop.xyz',
+            server_addr TEXT NOT NULL DEFAULT 'frp.example.com',
-            server_port INTEGER NOT NULL DEFAULT 9358,
+            server_port INTEGER NOT NULL DEFAULT 7000,
-            token TEXT NOT NULL DEFAULT 'Lxh10020328',
+            token TEXT NOT NULL DEFAULT 'CHANGE_ME',
             log_level TEXT NOT NULL DEFAULT 'info',
             log_max_days INTEGER NOT NULL DEFAULT 3,
             tcp_mux INTEGER NOT NULL DEFAULT 1,
@@ -81,6 +86,7 @@ func InitDB() error {
             heartbeat_interval INTEGER NOT NULL DEFAULT 15,
             heartbeat_timeout INTEGER NOT NULL DEFAULT 70,
             pool_count INTEGER NOT NULL DEFAULT 8,
+            wire_protocol_v2 INTEGER NOT NULL DEFAULT 0,
             updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
         )
     `)
@@ -88,23 +94,29 @@ func InitDB() error {
 		return err
 	}
 
+	// ---- 迁移：自动补全缺失的字段 ----
+	if err := migrateGlobalConfigTable(); err != nil {
+		log.Printf("⚠️  迁移警告: %v", err)
+	}
+
+	// ---- 初始化默认配置（仅当表为空时） ----
 	var count int
 	DB.QueryRow("SELECT COUNT(*) FROM global_config").Scan(&count)
 	if count == 0 {
-		// 将默认值从个人硬编码改为通用占位符
 		_, err = DB.Exec(`
-    INSERT INTO global_config (
+            INSERT INTO global_config (
-        id, server_addr, server_port, token, log_level, log_max_days,
+                id, server_addr, server_port, token, log_level, log_max_days,
-        tcp_mux, tcp_mux_keepalive, heartbeat_interval, heartbeat_timeout, pool_count
+                tcp_mux, tcp_mux_keepalive, heartbeat_interval, heartbeat_timeout, pool_count,
-    ) VALUES (1, 'frp.example.com', 7000, 'CHANGE_ME', 'info', 3, 1, 30, 15, 70, 8)
+                wire_protocol_v2
-`)
+            ) VALUES (1, 'frp.example.com', 7000, 'CHANGE_ME', 'info', 3, 1, 30, 15, 70, 8, 0)
+        `)
 		if err != nil {
 			return err
 		}
 		log.Println("✅ 全局配置初始化完成")
 	}
 
-	// 隧道表（B表）
+	// ---- 隧道表 ----
 	_, err = DB.Exec(`
         CREATE TABLE IF NOT EXISTS proxies (
             id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -122,7 +134,7 @@ func InitDB() error {
 		return err
 	}
 
-	// 应用配置表（JWT密钥等）
+	// ---- 应用配置表 ----
 	_, err = DB.Exec(`
         CREATE TABLE IF NOT EXISTS app_config (
             key TEXT PRIMARY KEY,
@@ -142,7 +154,96 @@ func InitDB() error {
 	return nil
 }
 
-// ===== JWT 密钥管理 =====
+// ============================================================
+// Schema 迁移：自动补全缺失的字段
+// ============================================================
+
+// expectedColumns 定义所有期望的列，格式: 列名 => 完整定义
+// 新增字段时，在这里加一行即可
+var expectedColumns = map[string]string{
+	"id":                 "id INTEGER PRIMARY KEY CHECK (id = 1)",
+	"server_addr":        "server_addr TEXT NOT NULL DEFAULT 'frp.example.com'",
+	"server_port":        "server_port INTEGER NOT NULL DEFAULT 7000",
+	"token":              "token TEXT NOT NULL DEFAULT 'CHANGE_ME'",
+	"log_level":          "log_level TEXT NOT NULL DEFAULT 'info'",
+	"log_max_days":       "log_max_days INTEGER NOT NULL DEFAULT 3",
+	"tcp_mux":            "tcp_mux INTEGER NOT NULL DEFAULT 1",
+	"tcp_mux_keepalive":  "tcp_mux_keepalive INTEGER NOT NULL DEFAULT 30",
+	"heartbeat_interval": "heartbeat_interval INTEGER NOT NULL DEFAULT 15",
+	"heartbeat_timeout":  "heartbeat_timeout INTEGER NOT NULL DEFAULT 70",
+	"pool_count":         "pool_count INTEGER NOT NULL DEFAULT 8",
+	"wire_protocol_v2":   "wire_protocol_v2 INTEGER NOT NULL DEFAULT 0", // v1.5 新增
+	"updated_at":         "updated_at DATETIME DEFAULT CURRENT_TIMESTAMP",
+}
+
+func migrateGlobalConfigTable() error {
+	// 1. 获取当前表的列名
+	currentCols, err := getCurrentColumns("global_config")
+	if err != nil {
+		return err
+	}
+
+	// 2. 比对并补全缺失的列
+	var added []string
+	for colName, colDef := range expectedColumns {
+		if !contains(currentCols, colName) {
+			alterSQL := "ALTER TABLE global_config ADD COLUMN " + colDef
+			if _, err := DB.Exec(alterSQL); err != nil {
+				log.Printf("⚠️  添加列 %s 失败: %v", colName, err)
+				continue
+			}
+			added = append(added, colName)
+		}
+	}
+
+	if len(added) > 0 {
+		log.Printf("✅ 数据库迁移完成，新增字段: %v", added)
+	} else {
+		log.Println("✅ 数据库 Schema 已是最新")
+	}
+
+	return nil
+}
+
+// getCurrentColumns 查询指定表的所有列名
+func getCurrentColumns(tableName string) ([]string, error) {
+	rows, err := DB.Query("PRAGMA table_info(" + tableName + ")")
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	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)
+	}
+	return cols, rows.Err()
+}
+
+func contains(slice []string, item string) bool {
+	for _, s := range slice {
+		if strings.EqualFold(s, item) {
+			return true
+		}
+	}
+	return false
+}
+
+// ============================================================
+// JWT 密钥管理
+// ============================================================
+
 func ensureJwtSecret() error {
 	var value string
 	err := DB.QueryRow("SELECT value FROM app_config WHERE key = 'jwt_secret'").Scan(&value)
@@ -175,17 +276,22 @@ func GetJwtSecret() (string, error) {
 	return secret, nil
 }
 
-// ===== 全局配置 CRUD =====
+// ============================================================
+// 全局配置 CRUD
+// ============================================================
+
 func GetGlobalConfig() (*GlobalConfig, error) {
 	var cfg GlobalConfig
 	err := DB.QueryRow(`
         SELECT id, server_addr, server_port, token, log_level, log_max_days,
-               tcp_mux, tcp_mux_keepalive, heartbeat_interval, heartbeat_timeout, pool_count
+               tcp_mux, tcp_mux_keepalive, heartbeat_interval, heartbeat_timeout, pool_count,
+               wire_protocol_v2
         FROM global_config WHERE id = 1
     `).Scan(
 		&cfg.ID, &cfg.ServerAddr, &cfg.ServerPort, &cfg.Token,
 		&cfg.LogLevel, &cfg.LogMaxDays, &cfg.TcpMux, &cfg.TcpMuxKeepalive,
 		&cfg.HeartbeatInterval, &cfg.HeartbeatTimeout, &cfg.PoolCount,
+		&cfg.WireProtocolV2,
 	)
 	if err != nil {
 		return nil, err
@@ -200,14 +306,19 @@ func UpdateGlobalConfig(cfg *GlobalConfig) error {
             server_addr = ?, server_port = ?, token = ?, log_level = ?, log_max_days = ?,
             tcp_mux = 1,
             tcp_mux_keepalive = ?, heartbeat_interval = ?, heartbeat_timeout = ?, pool_count = ?,
+            wire_protocol_v2 = ?,
             updated_at = CURRENT_TIMESTAMP
         WHERE id = 1
     `, cfg.ServerAddr, cfg.ServerPort, cfg.Token, cfg.LogLevel, cfg.LogMaxDays,
-		cfg.TcpMuxKeepalive, cfg.HeartbeatInterval, cfg.HeartbeatTimeout, cfg.PoolCount)
+		cfg.TcpMuxKeepalive, cfg.HeartbeatInterval, cfg.HeartbeatTimeout, cfg.PoolCount,
+		cfg.WireProtocolV2)
 	return err
 }
 
-// ===== 隧道 CRUD =====
+// ============================================================
+// 隧道 CRUD
+// ============================================================
+
 func GetProxies() ([]Proxy, error) {
 	rows, err := DB.Query(`
         SELECT id, name, type, local_ip, local_port, remote_port, enabled
@@ -273,7 +384,10 @@ func DeleteProxy(id int) error {
 	return err
 }
 
-// ===== 用户 CRUD =====
+// ============================================================
+// 用户 CRUD
+// ============================================================
+
 func GetUserByUsername(username string) (*User, error) {
 	var u User
 	err := DB.QueryRow(`

static/app.js

@@ -95,6 +95,7 @@ const defaultConfig = {
     heartbeatInterval: 15,
     heartbeatTimeout: 70,
     poolCount: 8,
+    wireProtocolV2: false,
 };
 
 async function loadConfig() {
@@ -639,6 +640,12 @@ const app = createApp({
             filterProxies(proxies.value, searchKeyword.value)
         );
 
+        const showDefaultTip = computed(() => {
+            // 如果 serverAddr 还是默认值，或者为空，显示警告
+            const addr = globalConfig.serverAddr;
+            return !addr || addr === "frp.example.com" || addr.trim() === "";
+        });
+
         // ---- 返回 ----
         return {
             loggedIn,
@@ -685,6 +692,8 @@ const app = createApp({
             passwordChangeSuccess,
             changePassword,
 
+            showDefaultTip, 
+
             // 日志相关
             logLines,
             logTotal,

static/index.html

@@ -108,11 +108,11 @@
                 <!-- Tab 栏 -->
                 <div class="tab-bar">
                     <span class="tab-item" :class="{ active: activeTab === 'proxies' }"
-                        @click="activeTab = 'proxies'">📋 隧道列表</span>
+                        @click="activeTab = 'proxies'">隧道列表</span>
                     <span class="tab-item" :class="{ active: activeTab === 'config' }"
-                        @click="activeTab = 'config'">⚙️ 全局配置信息</span>
+                        @click="activeTab = 'config'">全局配置信息</span>
                     <span class="tab-item" :class="{ active: activeTab === 'logs' }"
-                        @click="activeTab = 'logs'">📄 运行日志</span>
+                        @click="activeTab = 'logs'">运行日志</span>
                 </div>
 
                 <!-- 内容区 -->
@@ -162,19 +162,19 @@
                     <div v-if="activeTab === 'config'" class="tab-content config-tab-content">
                         <!-- 页面标题 -->
                         <div class="config-page-header">
-                            <h2>⚙️ 全局配置信息</h2>
+                            <h2>全局配置信息</h2>
                             <p class="config-subtitle">管理 frpc 连接参数与传输设置</p>
                         </div>
 
                         <!-- 首次使用提示 -->
-                        <div class="config-tip">
+                        <div v-if="showDefaultTip" class="config-tip">
-                            ⚠️ 首次使用请修改「服务器地址」和「认证令牌」为您的真实 frps 配置
+                            首次使用请修改「服务器地址」和「认证令牌」为您的真实 frps 配置
                         </div>
 
                         <!-- ===== 账户管理 ===== -->
                         <div class="profile-section">
                             <div class="profile-header">
-                                <span>👤 账户管理</span>
+                                <span>账户管理</span>
                                 <span class="profile-username">{{ loginForm.username }}</span>
                             </div>
                             <div class="profile-form">
@@ -201,7 +201,6 @@
                         <!-- ===== 卡片1: 服务器连接 ===== -->
                         <div class="config-card">
                             <div class="config-card-header">
-                                <span class="card-icon">🌐</span>
                                 <span class="card-title">服务器连接</span>
                             </div>
                             <div class="config-card-body">
@@ -229,7 +228,6 @@
                         <!-- ===== 卡片2: 传输配置 ===== -->
                         <div class="config-card">
                             <div class="config-card-header">
-                                <span class="card-icon">🔀</span>
                                 <span class="card-title">传输配置</span>
                             </div>
                             <div class="config-card-body">
@@ -261,13 +259,26 @@
                                     <input type="number" v-model="globalConfig.poolCount" />
                                     <span class="unit-suffix">个</span>
                                 </div>
+                                <!-- v2 协议开关（v1.5 灰标禁用） -->
+                                <div class="form-row v2-switch-row">
+                                    <label>frp v2 隧道支持</label>
+                                    <div class="v2-switch-wrapper">
+                                        <label class="switch disabled">
+                                            <input type="checkbox" v-model="globalConfig.wireProtocolV2" disabled />
+                                            <span class="slider"></span>
+                                        </label>
+                                        <span class="v2-badge">即将推出</span>
+                                    </div>
+                                    <span class="hint-text v2-hint">
+                                        此功能为 frp 0.70.0 以上版本才能开启，若要打开必须搭配同版本 frps 使用，否则此功能不生效
+                                    </span>
+                                </div>
                             </div>
                         </div>
 
                         <!-- ===== 卡片3: 日志配置 ===== -->
                         <div class="config-card">
                             <div class="config-card-header">
-                                <span class="card-icon">📋</span>
                                 <span class="card-title">日志配置</span>
                             </div>
                             <div class="config-card-body">
@@ -290,7 +301,7 @@
                         </div>
 
                         <!-- 保存按钮 -->
-                        <button class="save-config-btn" @click="saveConfig">💾 保存配置并热加载</button>
+                        <button class="save-config-btn" @click="saveConfig">保存配置并热加载</button>
                     </div>
 
                     <!-- ====== 运行日志 ====== -->
@@ -298,15 +309,15 @@
                         <!-- 工具栏 -->
                         <div class="log-toolbar">
                             <div class="log-toolbar-left">
-                                <span class="log-info-badge">📊 共 {{ logTotal }} 行</span>
+                                <span class="log-info-badge">共 {{ logTotal }} 行</span>
-                                <span v-if="logError" class="log-error-badge">⚠️ {{ logError }}</span>
+                                <span v-if="logError" class="log-error-badge">{{ logError }}</span>
                             </div>
                             <div class="log-toolbar-right">
                                 <label class="log-auto-scroll-label">
                                     <input type="checkbox" v-model="logAutoScroll" />
                                     自动滚动
                                 </label>
-                                <button class="log-btn" @click="refreshLogs">🔄 刷新</button>
+                                <button class="log-btn" @click="refreshLogs">刷新</button>
                                 <button class="log-btn" @click="scrollLogToBottom">↓ 滚动到底部</button>
                             </div>
                         </div>
@@ -323,8 +334,8 @@
 
                         <!-- 底部状态 -->
                         <div class="log-footer">
-                            <span>🕐 上次更新: {{ logLastUpdate || '--:--:--' }}</span>
+                            <span>上次更新: {{ logLastUpdate || '--:--:--' }}</span>
-                            <span class="log-polling-status">🔄 自动刷新中 (8s)</span>
+                            <span class="log-polling-status">自动刷新中 (8s)</span>
                         </div>
                     </div>
 

static/style-3.css

@@ -1097,3 +1097,57 @@ select:disabled {
         flex-wrap: wrap;
     }
 }
+
+/* ============================================================
+   v2 协议开关（灰标禁用）
+   ============================================================ */
+
+.v2-switch-row {
+    grid-column: 1 / -1 !important;
+    padding-top: 4px;
+    border-top: 1px solid var(--border-subtle);
+    margin-top: 4px;
+}
+
+.v2-switch-wrapper {
+    display: flex;
+    align-items: center;
+    gap: 14px;
+    padding: 6px 0;
+}
+
+/* 禁用状态开关 - 灰标 */
+.switch.disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
+    pointer-events: none;
+}
+.switch.disabled .slider {
+    background: rgba(255, 255, 255, 0.08);
+}
+.switch.disabled input:checked + .slider {
+    background: rgba(74, 124, 255, 0.25);
+}
+.switch.disabled .slider::before {
+    background: #3a3a4a;
+}
+
+/* "即将推出" 徽章 */
+.v2-badge {
+    font-size: 11px;
+    padding: 2px 12px;
+    background: rgba(255, 200, 50, 0.12);
+    border: 1px solid rgba(255, 200, 50, 0.15);
+    border-radius: 12px;
+    color: #f0c040;
+    letter-spacing: 0.5px;
+    font-weight: 500;
+}
+
+.v2-hint {
+    font-size: 12px;
+    color: var(--text-dim);
+    line-height: 1.5;
+    padding: 2px 0 4px;
+    display: block;
+}