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

优化部分设置逻辑

Browse Source
This commit is contained in:
不安的亡命樱
2026-07-23 19:23:09 +08:00
parent 8c3d7246c2
commit 4cfb684f86
9 changed files with 467 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db.go
+95 -18
View File
@@ -1,15 +1,19 @@
package main
import (
"crypto/rand"
"database/sql"
"encoding/hex"
"log"
"sync"
_ "modernc.org/sqlite"
)
var DB *sql.DB
var dbInitOnce sync.Once
// 全局配置表（A表）
// ===== 全局配置表（A表）=====
type GlobalConfig struct {
ID int `json:"id"`
ServerAddr string `json:"serverAddr"`
@@ -24,7 +28,7 @@ type GlobalConfig struct {
PoolCount int `json:"poolCount"`
}
// 隧道表（B表）
// ===== 隧道表（B表）=====
type Proxy struct {
ID int `json:"id"`
Name string `json:"name"`
@@ -35,7 +39,7 @@ type Proxy struct {
Enabled bool `json:"enabled"`
}
// 用户表（C表）
// ===== 用户表（C表）=====
type User struct {
ID int `json:"id"`
Username string `json:"username"`
@@ -43,6 +47,7 @@ type User struct {
CreatedAt string `json:"createdAt"`
}
// ===== 初始化数据库 =====
func InitDB() error {
var err error
DB, err = sql.Open("sqlite", "./frpc-console.db")
@@ -50,7 +55,7 @@ func InitDB() error {
return err
}
// 创建用户表
// 用户表（C表）
_, err = DB.Exec(`
CREATE TABLE IF NOT EXISTS users (
id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -64,7 +69,7 @@ func InitDB() error {
return err
}
// 创建全局配置表（只有一行数据）
// 全局配置表（A表）
_, err = DB.Exec(`
CREATE TABLE IF NOT EXISTS global_config (
id INTEGER PRIMARY KEY CHECK (id = 1),
@@ -85,13 +90,15 @@ func InitDB() error {
return 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.whitetop.xyz', 9358, 'Lxh10020328', '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
) VALUES (1, 'frp.whitetop.xyz', 9358, 'Lxh10020328', 'info', 3, 1, 30, 15, 70, 8)
`)
if err != nil {
return err
@@ -99,7 +106,7 @@ func InitDB() error {
log.Println("✅ 全局配置初始化完成")
}
// 创建隧道表
// 隧道表（B表）
_, err = DB.Exec(`
CREATE TABLE IF NOT EXISTS proxies (
id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -117,36 +124,101 @@ func InitDB() error {
return err
}
// 🟢 新增：应用配置表（用于存储 JWT 密钥等全局配置）
_, err = DB.Exec(`
CREATE TABLE IF NOT EXISTS app_config (
key TEXT PRIMARY KEY,
value TEXT NOT NULL,
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
)
`)
if err != nil {
return err
}
// 🟢 确保 JWT 密钥存在
if err := ensureJwtSecret(); err != nil {
return err
}
log.Println("✅ 数据库初始化完成")
return nil
}
// ========== 全局配置 CRUD ==========
// ===== 🟢 新增：JWT 密钥管理 =====
// ensureJwtSecret 检查 app_config 表里是否有 jwt_secret，没有则生成一个
func ensureJwtSecret() error {
var value string
err := DB.QueryRow("SELECT value FROM app_config WHERE key = 'jwt_secret'").Scan(&value)
if err == nil && value != "" {
// 密钥已存在
return nil
}
// 生成 32 字节随机密钥
bytes := make([]byte, 32)
if _, err := rand.Read(bytes); err != nil {
return err
}
secret := hex.EncodeToString(bytes)
// 存入数据库
_, err = DB.Exec(`
INSERT INTO app_config (key, value) VALUES ('jwt_secret', ?)
`, secret)
if err != nil {
return err
}
log.Printf("✅ JWT 密钥已生成并保存到数据库")
return nil
}
// GetJwtSecret 从数据库读取 JWT 密钥
func GetJwtSecret() (string, error) {
var secret string
err := DB.QueryRow("SELECT value FROM app_config WHERE key = 'jwt_secret'").Scan(&secret)
if err != nil {
return "", err
}
return secret, nil
}
// ===== 全局配置 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
SELECT id, server_addr, server_port, token, log_level, log_max_days,
tcp_mux, tcp_mux_keepalive, heartbeat_interval, heartbeat_timeout, pool_count
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)
`).Scan(
&cfg.ID, &cfg.ServerAddr, &cfg.ServerPort, &cfg.Token,
&cfg.LogLevel, &cfg.LogMaxDays, &cfg.TcpMux, &cfg.TcpMuxKeepalive,
&cfg.HeartbeatInterval, &cfg.HeartbeatTimeout, &cfg.PoolCount,
)
if err != nil {
return nil, err
}
// 🟢 强制开启 tcpMux，忽略数据库中存储的值
cfg.TcpMux = true
return &cfg, nil
}
func UpdateGlobalConfig(cfg *GlobalConfig) error {
// 忽略前端传过来的 TcpMux，强制保持为 true
_, err := DB.Exec(`
UPDATE global_config SET
server_addr = ?, server_port = ?, token = ?, log_level = ?, log_max_days = ?,
tcp_mux = ?, tcp_mux_keepalive = ?, heartbeat_interval = ?, heartbeat_timeout = ?, pool_count = ?,
tcp_mux = 1, -- 🟢 强制写死为 1
tcp_mux_keepalive = ?, heartbeat_interval = ?, heartbeat_timeout = ?, pool_count = ?,
updated_at = CURRENT_TIMESTAMP
WHERE id = 1
`, cfg.ServerAddr, cfg.ServerPort, cfg.Token, cfg.LogLevel, cfg.LogMaxDays,
cfg.TcpMux, cfg.TcpMuxKeepalive, cfg.HeartbeatInterval, cfg.HeartbeatTimeout, cfg.PoolCount)
cfg.TcpMuxKeepalive, cfg.HeartbeatInterval, cfg.HeartbeatTimeout, cfg.PoolCount)
return err
}
// ========== 隧道 CRUD ==========
// ===== 隧道 CRUD =====
func GetProxies() ([]Proxy, error) {
rows, err := DB.Query(`
SELECT id, name, type, local_ip, local_port, remote_port, enabled
@@ -182,11 +254,16 @@ func GetProxy(id int) (*Proxy, error) {
}
func CreateProxy(p *Proxy) error {
_, err := DB.Exec(`
result, err := DB.Exec(`
INSERT INTO proxies (name, type, local_ip, local_port, remote_port, enabled)
VALUES (?, ?, ?, ?, ?, ?)
`, p.Name, p.Type, p.LocalIP, p.LocalPort, p.RemotePort, p.Enabled)
return err
if err != nil {
return err
}
id, _ := result.LastInsertId()
p.ID = int(id)
return nil
}
func UpdateProxy(p *Proxy) error {
@@ -204,7 +281,7 @@ func DeleteProxy(id int) error {
return err
}
// ========== 用户 CRUD ==========
// ===== 用户 CRUD =====
func GetUserByUsername(username string) (*User, error) {
var u User
err := DB.QueryRow(`