lxh2875931338/frpc-console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

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

Browse Source
This commit is contained in:
不安的亡命樱
2026-07-25 22:42:16 +08:00
parent ce07f4f0f0
commit f49bc07f42
4 changed files with 224 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db.go
+134 -20
View File
@@ -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_port INTEGER NOT NULL DEFAULT 9358,
token TEXT NOT NULL DEFAULT 'Lxh10020328',
server_addr TEXT NOT NULL DEFAULT 'frp.example.com',
server_port INTEGER NOT NULL DEFAULT 7000,
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 (
id, server_addr, server_port, token, log_level, log_max_days,
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)
`)
INSERT INTO global_config (
id, server_addr, server_port, token, log_level, log_max_days,
tcp_mux, tcp_mux_keepalive, heartbeat_interval, heartbeat_timeout, pool_count,
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(`