From 3214215032e66b90da6e29c4db6b5260cd0ba3df Mon Sep 17 00:00:00 2001 From: lxh2875931338 Date: Sat, 1 Aug 2026 19:31:03 +0800 Subject: [PATCH] =?UTF-8?q?frps=E7=AB=AF=E5=90=8C=E6=AD=A5frpc2.4-LTS?= =?UTF-8?q?=E7=9A=84=E5=85=A8=E5=A5=97=E4=BB=A3=E7=A0=81=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 38 +++- api.go | 207 ++++++++----------- auth.go | 17 +- db-history.go | 87 ++++++++ db.go | 287 +++++++++++++++++++------- deploy.sh | 545 +++++++++++++++++++++++++++++++------------------ frps.go | 120 ++++++++--- main.go | 15 ++ run-deploy.sh | 115 +++++++++++ toml_parser.go | 12 +- 10 files changed, 988 insertions(+), 455 deletions(-) create mode 100644 db-history.go create mode 100644 run-deploy.sh diff --git a/Dockerfile b/Dockerfile index e221694..b9aca4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,38 +1,54 @@ # ============================================================ -# 构建阶段 +# 多阶段构建 # ============================================================ + +# ---------- 构建阶段 ---------- FROM golang:alpine AS builder WORKDIR /app -# 复制依赖文件（如果存在 go.sum 则一并复制） +# 复制依赖文件（兼容 go.sum 可能不存在的情况） COPY go.mod go.sum* ./ + +# 修复 go.mod 版本过高问题（frpc 用 1.26.5，容器内 go 版本可能较低） +# 将 go 1.2x 降级为 go 1.21，确保兼容性 +RUN sed -i 's/go 1.2[6-9].*/go 1.21/' go.mod && go mod tidy 2>/dev/null || true + +# 设置 Go 代理（国内加速） RUN go env -w GOPROXY=https://goproxy.cn,direct + +# 下载依赖 RUN go mod download # 复制全部源码（包含 bin/ 和 static/） COPY . . -# 编译 Linux 版（CGO_ENABLED=0 静态编译，-p 1 降低内存峰值） +# 静态编译 Linux 版本 +# -p 1 降低并发编译内存峰值（适合低配机器） +# -s -w 去除调试信息，减小二进制体积 RUN CGO_ENABLED=0 GOOS=linux go build -p 1 -ldflags="-s -w" -o frps-console . -# ============================================================ -# 运行阶段 -# ============================================================ +# ---------- 运行阶段 ---------- FROM alpine:latest -# 安装 ca-certificates 和 tzdata（确保 HTTPS 和时区正常） -RUN apk --no-cache add ca-certificates tzdata +# 安装必要工具 +# - ca-certificates: HTTPS 请求（frps 需要调用 Dashboard API） +# - tzdata: 时区支持 +# - sqlite: 用于 deploy.sh 中检查数据库状态 +RUN apk --no-cache add ca-certificates tzdata sqlite WORKDIR /app # 从构建阶段复制编译好的二进制 COPY --from=builder /app/frps-console /app/frps-console -# 创建数据目录（用于持久化 db 和日志） +# 复制前端静态文件（从构建阶段） +COPY --from=builder /app/static/ /app/static/ + +# 创建数据目录（用于持久化 db、配置、日志、pid） RUN mkdir -p /app/data -# 暴露端口（与 deploy.sh 中默认端口一致） +# 暴露端口（与 deploy.sh 中 DEFAULT_PORT 保持一致） EXPOSE 9365 # 环境变量（可被 docker run -e 覆盖） @@ -42,5 +58,5 @@ ENV TZ=Asia/Shanghai # 数据卷（持久化数据库、配置、日志） VOLUME ["/app/data"] -# 启动 +# 启动（使用 exec 确保信号正确传递） ENTRYPOINT ["/app/frps-console"] \ No newline at end of file diff --git a/api.go b/api.go index 13ea49e..b0f8856 100644 --- a/api.go +++ b/api.go @@ -4,12 +4,12 @@ import ( "bytes" "embed" "encoding/json" - "io" - "io/fs" // 新增 + "io/fs" + "net" "net/http" - "os" - "strings" + "strconv" "text/template" + "time" "github.com/gin-gonic/gin" "golang.org/x/crypto/bcrypt" @@ -21,9 +21,11 @@ var staticFS embed.FS func SetupRouter() *gin.Engine { r := gin.Default() + // 从 embed 读取前端静态文件 staticSubFS, _ := fs.Sub(staticFS, "static") r.StaticFS("/static", http.FS(staticSubFS)) + // 根路由 r.GET("/", func(c *gin.Context) { content, err := staticFS.ReadFile("static/index.html") if err != nil { @@ -33,25 +35,27 @@ func SetupRouter() *gin.Engine { c.Data(http.StatusOK, "text/html; charset=utf-8", content) }) + // 健康检查 r.GET("/ping", func(c *gin.Context) { c.String(200, "frps-console 后端已启动 🎉") }) api := r.Group("/api") { + // ---- 公开路由（不需要认证） ---- api.GET("/check/users", checkUsersHandler) api.POST("/register", registerHandler) api.POST("/login", loginHandler) + api.GET("/ping", pingHandler) // 新增：frps 延迟检测 + // ---- 需要认证的路由 ---- auth := api.Group("/") auth.Use(AuthMiddleware()) { auth.GET("/config", getConfigHandler) auth.PUT("/config", updateConfigHandler) - auth.GET("/frps/log", getFrpsLogHandler) - - // frps 特有：客户端列表（从 Dashboard API 读取） + // frps 特有：从 Dashboard API 读取客户端和代理列表 auth.GET("/clients", getClientsHandler) auth.GET("/proxies", getProxiesHandler) @@ -59,6 +63,7 @@ func SetupRouter() *gin.Engine { auth.POST("/frps/start", startFrpsHandler) auth.POST("/frps/stop", stopFrpsHandler) auth.GET("/frps/status", getFrpsStatusHandler) + auth.GET("/frps/log", getFrpsLogHandler) auth.POST("/import/toml", importTomlHandler) auth.GET("/export/toml", ExportTomlHandler) @@ -70,9 +75,7 @@ func SetupRouter() *gin.Engine { return r } -// ============================================================ -// 认证 Handler（与 frpc-console 相同，略） -// ============================================================ +// ========== 认证 Handler（与 frpc 相同） ========== func checkUsersHandler(c *gin.Context) { count, err := CountUsers() @@ -220,9 +223,7 @@ func changePasswordHandler(c *gin.Context) { c.JSON(http.StatusOK, gin.H{"code": 0, "msg": "密码修改成功"}) } -// ============================================================ -// 配置 Handler -// ============================================================ +// ========== 配置 Handler（frps 专用） ========== func getConfigHandler(c *gin.Context) { cfg, err := GetGlobalConfig() @@ -239,6 +240,8 @@ func updateConfigHandler(c *gin.Context) { c.JSON(http.StatusBadRequest, gin.H{"code": 1, "msg": "请求参数错误"}) return } + // 强制 tcpMux = true（frps 推荐） + cfg.TcpMux = true if err := UpdateGlobalConfig(&cfg); err != nil { c.JSON(http.StatusInternalServerError, gin.H{"code": 2, "msg": "更新配置失败: " + err.Error()}) @@ -258,11 +261,8 @@ func updateConfigHandler(c *gin.Context) { c.JSON(http.StatusOK, gin.H{"code": 0, "msg": "配置更新成功"}) } -// ============================================================ -// 客户端/代理列表（从 frps Dashboard API 读取） -// ============================================================ +// ========== frps Dashboard API 读取 ========== -// FrpsDashboardClient frps Dashboard API 返回的客户端信息 type FrpsDashboardClient struct { ID int `json:"id"` Name string `json:"name"` @@ -273,7 +273,6 @@ type FrpsDashboardClient struct { ConnTime string `json:"connTime"` } -// FrpsDashboardProxy frps Dashboard API 返回的代理信息 type FrpsDashboardProxy struct { Name string `json:"name"` Type string `json:"type"` @@ -300,9 +299,8 @@ func getProxiesHandler(c *gin.Context) { c.JSON(http.StatusOK, gin.H{"code": 0, "data": proxies}) } -// fetchClientsFromDashboard 从 frps Dashboard API 读取客户端列表 func fetchClientsFromDashboard() ([]FrpsDashboardClient, error) { - // frps Dashboard 默认在 127.0.0.1:7500，后续可配置 + // TODO: 从配置读取 Dashboard 地址（当前硬编码） resp, err := http.Get("http://127.0.0.1:7500/api/v2/clients") if err != nil { return nil, err @@ -318,7 +316,6 @@ func fetchClientsFromDashboard() ([]FrpsDashboardClient, error) { return result.Data, nil } -// fetchProxiesFromDashboard 从 frps Dashboard API 读取代理列表 func fetchProxiesFromDashboard() ([]FrpsDashboardProxy, error) { resp, err := http.Get("http://127.0.0.1:7500/api/v2/proxies") if err != nil { @@ -335,9 +332,7 @@ func fetchProxiesFromDashboard() ([]FrpsDashboardProxy, error) { return result.Data, nil } -// ============================================================ -// frps 进程管理 Handler -// ============================================================ +// ========== frps 进程管理 Handler ========== func reloadFrpsHandler(c *gin.Context) { if err := GenerateFrpsConfig(); err != nil { @@ -376,9 +371,62 @@ func getFrpsStatusHandler(c *gin.Context) { c.JSON(http.StatusOK, gin.H{"code": 0, "data": gin.H{"running": running}}) } -// ============================================================ -// 导入/导出 TOML -// ============================================================ +// ========== 日志 Handler ========== + +func getFrpsLogHandler(c *gin.Context) { + // readTailLog 在 frps.go 中定义，读取 ./data/frps.log + lines, err := readTailLog("./data/frps.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), + }, + }) +} + +// ========== Ping Handler（检测 frps 服务连通性） ========== + +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.BindPort // frps 使用 bindPort + 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") @@ -407,11 +455,15 @@ func importTomlHandler(c *gin.Context) { } cfg := parsed.ToGlobalConfig() + cfg.TcpMux = true if err := UpdateGlobalConfig(cfg); err != nil { c.JSON(http.StatusInternalServerError, gin.H{"code": 2, "msg": "更新配置失败: " + err.Error()}) return } + // frps 没有隧道表，无需清空 proxies，但可以清空 clients 表（如果有） + // 目前 clients 表只做记录，可忽略 + if err := GenerateFrpsConfig(); err != nil { c.JSON(http.StatusInternalServerError, gin.H{"code": 2, "msg": "生成配置失败: " + err.Error()}) return @@ -435,6 +487,7 @@ func ExportTomlHandler(c *gin.Context) { return } + // 使用 frps 模板 tmpl, err := template.New("frps").Parse(FrpsTemplateContent) if err != nil { c.JSON(http.StatusInternalServerError, gin.H{"code": 2, "msg": "解析模板失败: " + err.Error()}) @@ -451,103 +504,3 @@ func ExportTomlHandler(c *gin.Context) { c.Header("Content-Disposition", "attachment; filename=frps.toml") c.String(http.StatusOK, buf.String()) } - -// ============================================================ -// 日志读取 -// ============================================================ - -func getFrpsLogHandler(c *gin.Context) { - lines, err := readTailLog("./frps.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 -} diff --git a/auth.go b/auth.go index de90383..5b46007 100644 --- a/auth.go +++ b/auth.go @@ -61,18 +61,19 @@ func ValidatePassword(pwd string) bool { if len(pwd) < 8 { return false } - var hasUpper, hasLower, hasDigit bool + var hasUpper, hasLower, hasDigit, hasSpecial bool for _, ch := range pwd { - switch { - case ch >= 'A' && ch <= 'Z': + if ch >= 'A' && ch <= 'Z' { hasUpper = true - case ch >= 'a' && ch <= 'z': + } else if ch >= 'a' && ch <= 'z' { hasLower = true - case ch >= '0' && ch <= '9': + } else if ch >= '0' && ch <= '9' { hasDigit = true + } else if strings.ContainsAny(string(ch), "!@#$%^&*()_+-=[]{}|;:,.<>?") { + hasSpecial = true } } - return hasUpper && hasLower && hasDigit + return hasUpper && hasLower && hasDigit && hasSpecial } func InitAdminUser() { @@ -92,7 +93,7 @@ func InitAdminUser() { username = "admin" } for { - log.Print("密码 (至少8位，含大小写、数字): ") + log.Print("密码 (至少8位，含大小写、数字、特殊字符): ") var password string fmt.Scanln(&password) if ValidatePassword(password) { @@ -110,7 +111,7 @@ func InitAdminUser() { break } else { log.Println("❌ 密码不符合复杂度要求，请重新输入") - log.Println(" 要求: 至少8位，包含大小写字母、数字") + log.Println(" 要求: 至少8位，包含大小写字母、数字和特殊字符") } } } diff --git a/db-history.go b/db-history.go new file mode 100644 index 0000000..3ba80ef --- /dev/null +++ b/db-history.go @@ -0,0 +1,87 @@ +package main + +// ============================================================ +// db-history.go - Schema 版本声明与字段映射（frps 版） +// ============================================================ + +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：frps 初始版本（与 2.0-lts 兼容） + { + Version: "v1", + TableName: "global_config", + Columns: map[string]ColumnDef{ + "id": {Type: "INTEGER", Primary: true}, + "bind_port": {Type: "INTEGER", NotNull: true, Default: "9358"}, + "token": {Type: "TEXT", NotNull: true, Default: "'CHANGE_ME'"}, + "log_level": {Type: "TEXT", NotNull: true, Default: "'info'"}, + "log_max_days": {Type: "INTEGER", NotNull: true, Default: "3"}, + "tcp_mux": {Type: "INTEGER", NotNull: true, Default: "1"}, + "updated_at": {Type: "DATETIME", Default: "CURRENT_TIMESTAMP"}, + }, + }, + // v2：当前版本（与 v1 相同，保留扩展） + { + Version: "v2", + TableName: "global_config", + Columns: map[string]ColumnDef{ + "id": {Type: "INTEGER", Primary: true}, + "bind_port": {Type: "INTEGER", NotNull: true, Default: "9358"}, + "token": {Type: "TEXT", NotNull: true, Default: "'CHANGE_ME'"}, + "log_level": {Type: "TEXT", NotNull: true, Default: "'info'"}, + "log_max_days": {Type: "INTEGER", NotNull: true, Default: "3"}, + "tcp_mux": {Type: "INTEGER", NotNull: true, Default: "1"}, + "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 +} diff --git a/db.go b/db.go index c9fce2d..bc29833 100644 --- a/db.go +++ b/db.go @@ -8,6 +8,8 @@ import ( "io" "log" "os" + "sort" + "strings" "time" _ "modernc.org/sqlite" @@ -15,17 +17,9 @@ import ( var DB *sql.DB -// ============================================================ -// 数据库版本常量 -// ============================================================ +const SchemaVersion = "v2" -const SchemaVersion = "2.0.0" - -// ============================================================ -// 数据模型 -// ============================================================ - -// GlobalConfig frps 全局配置 +// GlobalConfig 对应 frps 配置 type GlobalConfig struct { ID int `json:"id"` BindPort int `json:"bindPort"` @@ -35,7 +29,15 @@ type GlobalConfig struct { TcpMux bool `json:"tcpMux"` } -// Client 客户端连接记录 +// User 保持不变 +type User struct { + ID int `json:"id"` + Username string `json:"username"` + PasswordHash string `json:"-"` + CreatedAt string `json:"createdAt"` +} + +// Client 记录（从 Dashboard 同步，可选） type Client struct { ID int `json:"id"` Name string `json:"name"` @@ -47,21 +49,15 @@ type Client struct { UpdatedAt string `json:"updatedAt"` } -// User 用户表 -type User struct { - ID int `json:"id"` - Username string `json:"username"` - PasswordHash string `json:"-"` - CreatedAt string `json:"createdAt"` -} - -// ============================================================ -// 数据库初始化 -// ============================================================ - func InitDB() error { + // 确保 data 目录存在 + if err := os.MkdirAll("./data", 0755); err != nil { + return fmt.Errorf("创建数据目录失败: %w", err) + } + + dbPath := "./data/frps-console.db" var err error - DB, err = sql.Open("sqlite", "./frps-console.db") + DB, err = sql.Open("sqlite", dbPath) if err != nil { return err } @@ -78,16 +74,12 @@ func InitDB() error { return err } - log.Println("✅ 数据库初始化完成 (Schema v" + SchemaVersion + ")") + log.Println("✅ 数据库初始化完成 (Schema " + SchemaVersion + ")") return nil } -// ============================================================ -// 建表 -// ============================================================ - func createTables() error { - // 用户表 + // users 表 _, err := DB.Exec(` CREATE TABLE IF NOT EXISTS users ( id INTEGER PRIMARY KEY AUTOINCREMENT, @@ -101,7 +93,7 @@ func createTables() error { return err } - // 全局配置表（frps 专用） + // global_config 表（frps 专用） _, err = DB.Exec(` CREATE TABLE IF NOT EXISTS global_config ( id INTEGER PRIMARY KEY CHECK (id = 1), @@ -117,7 +109,7 @@ func createTables() error { return err } - // 客户端记录表 + // clients 表（用于存储从 Dashboard 拉取的客户端，可选） _, err = DB.Exec(` CREATE TABLE IF NOT EXISTS clients ( id INTEGER PRIMARY KEY AUTOINCREMENT, @@ -134,7 +126,7 @@ func createTables() error { return err } - // 应用配置表 + // app_config 表 _, err = DB.Exec(` CREATE TABLE IF NOT EXISTS app_config ( key TEXT PRIMARY KEY, @@ -151,9 +143,8 @@ func createTables() error { DB.QueryRow("SELECT COUNT(*) FROM global_config").Scan(&count) if count == 0 { _, err = DB.Exec(` - INSERT INTO global_config ( - id, bind_port, token, log_level, log_max_days, tcp_mux - ) VALUES (1, 9358, 'CHANGE_ME', 'info', 3, 1) + INSERT INTO global_config (id, bind_port, token, log_level, log_max_days, tcp_mux) + VALUES (1, 9358, 'CHANGE_ME', 'info', 3, 1) `) if err != nil { return err @@ -164,23 +155,23 @@ func createTables() error { return nil } -// ============================================================ -// 迁移引擎 -// ============================================================ +// ========== 迁移引擎（复用 frpc 的 db-history.go） ========== -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 { + // 尝试判断是否为旧版本 var count int DB.QueryRow("SELECT COUNT(*) FROM users").Scan(&count) if count > 0 { - return "1.0.0" + return "v1" } return SchemaVersion } - return "1.0.0" + log.Printf("⚠️ 读取 Schema 版本失败: %v", err) + return "v1" } return version } @@ -194,13 +185,13 @@ func setSchemaVersion(version string) error { } func backupDatabase() (string, error) { - src := "./frps-console.db" + src := "./data/frps-console.db" if _, err := os.Stat(src); os.IsNotExist(err) { return "", nil } timestamp := time.Now().Format("20060102_150405") - dst := fmt.Sprintf("./frps-console.db.pre-v%s.%s", SchemaVersion, timestamp) + dst := fmt.Sprintf("./data/frps-console.db.pre-%s.%s", SchemaVersion, timestamp) srcFile, err := os.Open(src) if err != nil { @@ -229,7 +220,7 @@ func restoreDatabase(backupPath string) error { } defer srcFile.Close() - dstFile, err := os.Create("./frps-console.db") + dstFile, err := os.Create("./data/frps-console.db") if err != nil { return err } @@ -244,35 +235,187 @@ func restoreDatabase(backupPath string) error { } func runMigrations() error { - currentVersion := getSchemaVersion() - log.Printf("📌 当前数据库 Schema: %s, 目标版本: %s", currentVersion, SchemaVersion) + currentVer := getCurrentSchemaVersion() + targetVer := SchemaVersion - if currentVersion != SchemaVersion { - log.Printf("🔄 检测到版本变更 (%s → %s)，开始迁移...", currentVersion, SchemaVersion) + log.Printf("📌 当前数据库 Schema: %s, 目标版本: %s", currentVer, targetVer) - backupPath, err := backupDatabase() - 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 } - if backupPath != "" { - log.Printf("📦 备份文件: %s", backupPath) - } - - if err := setSchemaVersion(SchemaVersion); err != nil { - return fmt.Errorf("更新 Schema 版本失败: %w", err) - } - - log.Printf("✅ 版本迁移完成") - } else { - log.Println("✅ Schema 已是最新，无需迁移") + log.Println("✅ Schema 已是最新，数据库有效") + return nil } + 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) + } + } + + if err := setSchemaVersion(targetVer); err != nil { + return fmt.Errorf("更新 Schema 版本失败: %w", err) + } + + log.Printf("✅ 迁移完成，当前 Schema: %s", targetVer) return nil } -// ============================================================ -// JWT 密钥管理 -// ============================================================ +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 + var primaryKey string + + names := make([]string, 0, len(def.Columns)) + for name := range def.Columns { + names = append(names, name) + } + 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 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 fmt.Sprintf( + "INSERT INTO %s (%s) SELECT %s FROM %s", + newTable, + strings.Join(colNames, ", "), + strings.Join(selectParts, ", "), + oldTable, + ), nil +} + +// ========== JWT 密钥 ========== func ensureJwtSecret() error { var value string @@ -306,9 +449,7 @@ func GetJwtSecret() (string, error) { return secret, nil } -// ============================================================ -// 全局配置 CRUD -// ============================================================ +// ========== GlobalConfig CRUD ========== func GetGlobalConfig() (*GlobalConfig, error) { var cfg GlobalConfig @@ -338,9 +479,7 @@ func UpdateGlobalConfig(cfg *GlobalConfig) error { return err } -// ============================================================ -// 客户端记录 CRUD -// ============================================================ +// ========== Clients CRUD（用于同步 Dashboard） ========== func SaveClient(client *Client) error { _, err := DB.Exec(` @@ -372,9 +511,7 @@ func GetClients() ([]Client, error) { return clients, rows.Err() } -// ============================================================ -// 用户 CRUD -// ============================================================ +// ========== User CRUD ========== func GetUserByUsername(username string) (*User, error) { var u User diff --git a/deploy.sh b/deploy.sh index fff8922..c939f0e 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,59 +1,41 @@ #!/bin/bash # ============================================================ -# frps-console 一键部署脚本 -# 支持：Linux x86_64 / ARM64 / ARMv7 -# 自动安装：git / curl / wget / Go / Docker -# +# frpc-console 一键部署脚本 (Docker 优先) # 用法: -# ./deploy.sh # 完整交互流程 -# ./deploy.sh --yes # 跳过确认，直接执行 -# ./deploy.sh --check # 只检测环境，不执行 -# ./deploy.sh --dry-run # 显示将执行的操作，不实际执行 +# run-deploy.sh 引导后自动执行 # ============================================================ 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/frps-console.git" -BRANCH="main" WORK_DIR="/tmp/frps-console-build" DEFAULT_PORT=9365 DEFAULT_DEPLOY_DIR="/opt/frps-console" IMAGE_NAME="frps-console" -GO_VERSION="1.25.0" +KEEP_IMAGES=3 -# 状态变量 -OS="" -OS_VERSION="" -ARCH="" -GO_ARCH="" -HAS_GIT=false -HAS_CURL=false -HAS_WGET=false -HAS_GO=false -HAS_DOCKER=false -NEED_INSTALL_GIT=false -NEED_INSTALL_CURL=false -NEED_INSTALL_WGET=false -NEED_INSTALL_GO=false +# ---------- 状态变量 ---------- +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 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"; } @@ -62,7 +44,7 @@ print_step() { echo -e "\n${CYAN}▶${NC} $1"; } print_title() { echo -e "\n${MAGENTA}════════════════════════════════════════════════════════${NC}"; } print_subtitle() { echo -e "${MAGENTA} $1${NC}"; } -# ---------- 解析参数 ---------- +# ---------- 解析命令行参数 ---------- parse_args() { for arg in "$@"; do case $arg in @@ -71,9 +53,8 @@ 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 显示帮助信息" @@ -84,7 +65,6 @@ parse_args() { done } -# ---------- 检查 root ---------- check_root() { if [ "$EUID" -ne 0 ]; then print_error "请使用 root 权限运行此脚本" @@ -93,12 +73,10 @@ 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 @@ -108,10 +86,13 @@ detect_os() { detect_arch() { ARCH=$(uname -m) case $ARCH in - x86_64|amd64) GO_ARCH="amd64" ;; - aarch64|arm64) GO_ARCH="arm64" ;; - armv7l|armhf) GO_ARCH="armv6l" ;; - *) print_error "不支持的 CPU 架构: $ARCH"; exit 1 ;; + x86_64|amd64|aarch64|arm64|armv7l|armhf) + print_success "CPU 架构: $ARCH" + ;; + *) + print_error "不支持的 CPU 架构: $ARCH" + exit 1 + ;; esac } @@ -119,7 +100,6 @@ 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 command -v wget &> /dev/null && HAS_WGET=true || NEED_INSTALL_WGET=true - command -v go &> /dev/null && HAS_GO=true || NEED_INSTALL_GO=true command -v docker &> /dev/null && HAS_DOCKER=true } @@ -132,13 +112,95 @@ check_container() { fi } -# ---------- 打印环境摘要 ---------- +# ---------- 版本管理 ---------- +read_version_from_remote() { + local branch="$1" + local version_url="https://git.whitetop.xyz/lxh2875931338/frps-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}/data/version.ini" + if [ -f "$version_file" ]; then + grep -v "^[;#]" "$version_file" | head -1 | tr -d '\n' + else + if [ "$CONTAINER_EXISTS" = true ]; then + docker exec frps-console cat /app/data/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/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 /etc/profile.d/go.sh - /usr/local/go/bin/go env -w GOPROXY=https://goproxy.cn,direct - /usr/local/go/bin/go env -w GOPRIVATE=git.whitetop.xyz - print_success "Go ${GO_VERSION} 安装完成" - fi - - export PATH=$PATH:/usr/local/go/bin - - # 拉取代码 + # ----- 拉取代码 ----- print_step "拉取代码..." rm -rf "$WORK_DIR" git clone --depth 1 --branch "$BRANCH" "$REPO_URL" "$WORK_DIR" cd "$WORK_DIR" mkdir -p bin static - print_success "代码拉取完成" + print_success "代码拉取完成 (分支: ${BRANCH})" - # 修复 go.mod - if grep -q "go 1.2[6-9]" go.mod 2>/dev/null; then - print_warn "检测到 go.mod 版本过高，自动降级到 go 1.21" - sed -i 's/go 1.2[6-9].*/go 1.21/' go.mod - fi - - # 下载依赖 - print_step "下载 Go 依赖..." - go mod download - print_success "依赖下载完成" - - # 编译 - print_step "编译 frps-console..." - CGO_ENABLED=0 GOOS=linux go build -p 1 -ldflags="-s -w" -o frps-console . - if [ -f "frps-console" ]; then - SIZE=$(du -h frps-console | cut -f1) - print_success "编译完成 ($SIZE)" - else - print_error "编译失败" - exit 1 - fi - - # 准备目录 - print_step "准备部署目录..." - mkdir -p "$DEPLOY_DIR" - mkdir -p "$DATA_DIR" - if [ ! -f "$DATA_DIR/frps-console.db" ]; then - touch "$DATA_DIR/frps-console.db" - print_info "新数据目录已创建" - else - print_info "已有数据目录，保留现有数据" - fi - cp frps-console "$DEPLOY_DIR/" - print_success "二进制已复制到 $DEPLOY_DIR" - - # 构建镜像 - print_step "构建 Docker 镜像..." - docker build -t "${IMAGE_NAME}:latest" . - print_success "Docker 镜像构建完成" - - # 处理旧容器 + # ----- 停止旧容器 ----- if [ "$CONTAINER_EXISTS" = true ]; then - print_step "处理旧容器..." + print_step "停止旧容器..." if [ "$CONTAINER_RUNNING" = true ]; then - docker stop frps-console 2>/dev/null || true + docker stop frpc-console 2>/dev/null || true fi - docker rm frps-console 2>/dev/null || true + docker rm frpc-console 2>/dev/null || true print_success "旧容器已清理" fi - # 启动容器 - print_step "启动 frps-console 容器..." - docker run -d \ - --name frps-console \ - --restart=always \ - --network host \ - -v ${DATA_DIR}:/app/data \ - -e PORT=${PORT} \ - -e TZ=Asia/Shanghai \ - ${IMAGE_NAME}:latest + # ----- 准备部署目录 ----- + print_step "准备部署目录..." + mkdir -p "$DEPLOY_DIR" + mkdir -p "$DATA_DIR" - if docker ps | grep -q frps-console; then - print_success "容器启动成功！" + # ----- 检测并迁移旧版本文件（从根目录迁移到 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" + + 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 + + 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_error "容器启动失败，请检查日志: docker logs frps-console" + 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 - # 检查 frps 子进程 - print_step "检查 frps 状态..." - sleep 3 - if docker exec frps-console ps aux 2>/dev/null | grep -q "[f]rps -c"; then - print_success "frps 进程运行正常" + # 标记通道标签 + if [ "$CHANNEL" = "lts" ]; then + docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:lts" + print_info "已标记 ${IMAGE_NAME}:lts" else - print_warn "frps 进程未运行（可能配置为空，请在 WebUI 中导入 TOML）" + docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:preview" + print_info "已标记 ${IMAGE_NAME}:preview" fi - # 清理 + # ----- 启动新容器 ----- + print_step "启动 frpc-console 容器..." + docker run -d \ + --name frpc-console \ + --restart=always \ + --network host \ + -v ${DEPLOY_DIR}/data:/app/data \ + -e PORT=${PORT} \ + -e TZ=Asia/Shanghai \ + ${IMAGE_NAME}:${IMAGE_TAG} + + if docker ps | grep -q frpc-console; then + print_success "容器启动成功！" + else + print_error "容器启动失败，请检查日志: docker logs frpc-console" + exit 1 + fi + + # ----- 写入版本文件 ----- + 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)" + else + print_warn "frpc 进程未运行（PID 文件存在但进程已退出，可能配置为空）" + fi + else + print_warn "frpc 进程未运行（PID 文件不存在，请导入 TOML 后重试）" + 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 + + # ----- 验证版本 ----- + print_step "验证版本..." + sleep 1 + CONTAINER_VERSION=$(docker exec frpc-console cat /app/data/version.ini 2>/dev/null | grep -v "^[;#]" | head -1 | tr -d '\n' || echo "unknown") + echo -e " 容器版本: ${CONTAINER_VERSION}" + echo -e " 目标版本: ${TARGET_VERSION}" + if [ "$CONTAINER_VERSION" = "$TARGET_VERSION" ]; then + print_success "版本写入成功" + else + print_warn "版本不匹配，请检查" + 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 "frps-console 部署完成！" + print_success "frpc-console 部署完成！" print_title echo "" echo -e " ${CYAN}📍 访问地址:${NC} http://$(hostname -I | awk '{print $1}'):${PORT}" - echo -e " ${CYAN}📂 数据目录:${NC} ${DATA_DIR}" - echo -e " ${CYAN}🐳 容器名称:${NC} frps-console" + echo -e " ${CYAN}📂 数据目录:${NC} ${DEPLOY_DIR}" + 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 frps-console # 查看日志" - echo " docker restart frps-console # 重启服务" - echo " docker stop frps-console # 停止服务" - echo " docker start frps-console # 启动服务" + echo " docker logs frpc-console # 查看日志" + echo " docker restart frpc-console # 重启服务" + echo " cat ${DEPLOY_DIR}/data/version.ini # 查看当前版本" echo "" echo -e " ${YELLOW}首次访问需要注册管理员账户${NC}" echo "" @@ -454,6 +594,14 @@ 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 @@ -462,11 +610,7 @@ main() { 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" + print_error "Docker 未安装" exit 1 fi @@ -475,6 +619,7 @@ main() { if ! confirm_deploy; then custom_config + generate_plan print_deployment_plan if ! confirm_deploy; then print_info "已取消部署" @@ -483,7 +628,7 @@ main() { fi if [ "$DRY_RUN" = true ]; then - print_info "演练模式（--dry-run），不实际执行部署" + print_info "演练模式（--dry-run）" exit 0 fi diff --git a/frps.go b/frps.go index fc89bb6..4160102 100644 --- a/frps.go +++ b/frps.go @@ -4,6 +4,7 @@ import ( "bytes" "embed" "fmt" + "io" "log" "os" "os/exec" @@ -27,10 +28,6 @@ var ( frpsPathMutex sync.Mutex ) -// ============================================================ -// 获取 frps 路径 -// ============================================================ - func getFrpsPath() (string, error) { frpsPathMutex.Lock() defer frpsPathMutex.Unlock() @@ -92,17 +89,13 @@ func getFrpsPath() (string, error) { return "", fmt.Errorf("未找到 frps 文件") } -// ============================================================ -// 生成 frps.toml -// ============================================================ - func GenerateFrpsConfig() error { cfg, err := GetGlobalConfig() if err != nil { return fmt.Errorf("读取全局配置失败: %w", err) } - // 直接传递 cfg 即可，模板里能读到 .WireProtocolV2 + // 直接使用 cfg，模板使用 frps.tmpl var tmplContent string if _, err := os.Stat("frps.tmpl"); err == nil { content, readErr := os.ReadFile("frps.tmpl") @@ -125,19 +118,18 @@ func GenerateFrpsConfig() error { return fmt.Errorf("渲染模板失败: %w", err) } - if err := os.WriteFile("./frps.toml", buf.Bytes(), 0644); err != nil { + if err := os.MkdirAll("./data", 0755); err != nil { + return fmt.Errorf("创建 data 目录失败: %w", err) + } + if err := os.WriteFile("./data/frps.toml", buf.Bytes(), 0644); err != nil { return fmt.Errorf("写入配置文件失败: %w", err) } return nil } -// ============================================================ -// frps 进程管理 -// ============================================================ - func isFrpsRunning() bool { - pidData, err := os.ReadFile("./frps.pid") + pidData, err := os.ReadFile("./data/frps.pid") if err != nil { return false } @@ -168,7 +160,11 @@ func StartFrps() error { return fmt.Errorf("获取 frps 路径失败: %w", err) } - if _, err := os.Stat("./frps.toml"); os.IsNotExist(err) { + if err := os.MkdirAll("./data", 0755); err != nil { + return fmt.Errorf("创建 data 目录失败: %w", err) + } + + if _, err := os.Stat("./data/frps.toml"); os.IsNotExist(err) { if err := GenerateFrpsConfig(); err != nil { return fmt.Errorf("生成配置文件失败: %w", err) } @@ -178,13 +174,13 @@ func StartFrps() error { return nil } - os.Remove("./frps.pid") + os.Remove("./data/frps.pid") - cmd := exec.Command(frpsPath, "-c", "./frps.toml") + cmd := exec.Command(frpsPath, "-c", "./data/frps.toml") setWindowHide(cmd) setSysProcAttr(cmd) - logFile, err := os.OpenFile("./frps.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644) + logFile, err := os.OpenFile("./data/frps.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644) if err != nil { return fmt.Errorf("打开日志文件失败: %w", err) } @@ -195,7 +191,7 @@ func StartFrps() error { return fmt.Errorf("启动 frps 失败: %w", err) } - if err := os.WriteFile("./frps.pid", []byte(fmt.Sprintf("%d", cmd.Process.Pid)), 0644); err != nil { + if err := os.WriteFile("./data/frps.pid", []byte(fmt.Sprintf("%d", cmd.Process.Pid)), 0644); err != nil { return fmt.Errorf("保存 PID 失败: %w", err) } @@ -208,11 +204,11 @@ func StopFrps() error { if err := cmd.Run(); err != nil && !strings.Contains(err.Error(), "not found") { return fmt.Errorf("停止 frps 失败: %w", err) } - os.Remove("./frps.pid") + os.Remove("./data/frps.pid") return nil } - pidData, err := os.ReadFile("./frps.pid") + pidData, err := os.ReadFile("./data/frps.pid") if err != nil { cmd := exec.Command("pkill", "-f", "frps") if err := cmd.Run(); err != nil && !strings.Contains(err.Error(), "no process") { @@ -224,7 +220,7 @@ func StopFrps() error { pid, _ := strconv.Atoi(strings.TrimSpace(string(pidData))) process, err := os.FindProcess(pid) if err != nil { - os.Remove("./frps.pid") + os.Remove("./data/frps.pid") return nil } @@ -232,7 +228,7 @@ func StopFrps() error { return fmt.Errorf("杀死进程失败: %w", err) } - os.Remove("./frps.pid") + os.Remove("./data/frps.pid") return nil } @@ -251,7 +247,7 @@ func ReloadFrps() error { return fmt.Errorf("获取 frps 路径失败: %w", err) } - cmd := exec.Command(frpsPath, "reload", "-c", "./frps.toml") + cmd := exec.Command(frpsPath, "reload", "-c", "./data/frps.toml") _, err = cmd.CombinedOutput() if err != nil { log.Printf("⚠️ 热加载失败 (%v)，自动降级为重启 frps", err) @@ -265,3 +261,77 @@ func ReloadFrps() error { } return nil } + +// readTailLog 通用 +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 +} diff --git a/main.go b/main.go index a1165f4..16c9776 100644 --- a/main.go +++ b/main.go @@ -2,10 +2,25 @@ 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) } diff --git a/run-deploy.sh b/run-deploy.sh new file mode 100644 index 0000000..48885a4 --- /dev/null +++ b/run-deploy.sh @@ -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/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 "$@" \ No newline at end of file diff --git a/toml_parser.go b/toml_parser.go index 7d9f393..81fea7a 100644 --- a/toml_parser.go +++ b/toml_parser.go @@ -13,13 +13,11 @@ type FrpsToml struct { Token string `json:"token"` } `json:"auth"` Log struct { - To string `json:"to"` Level string `json:"level"` MaxDays int `json:"maxDays"` } `json:"log"` Transport struct { - TcpMux bool `json:"tcpMux"` - WireProtocolV2 bool `json:"wireProtocolV2"` + TcpMux bool `json:"tcpMux"` } `json:"transport"` } @@ -27,11 +25,9 @@ func ParseToml(content string) (*FrpsToml, error) { lines := strings.Split(content, "\n") result := &FrpsToml{ Transport: struct { - TcpMux bool `json:"tcpMux"` - WireProtocolV2 bool `json:"wireProtocolV2"` + TcpMux bool `json:"tcpMux"` }{ - TcpMux: true, - WireProtocolV2: false, + TcpMux: true, }, } @@ -63,8 +59,6 @@ func ParseToml(content string) (*FrpsToml, error) { result.Log.MaxDays, _ = strconv.Atoi(value) case "tcpMux": result.Transport.TcpMux = value == "true" - case "wireProtocol": - result.Transport.WireProtocolV2 = value == "v2" } }