Compare commits
62 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a069c30906 | |||
| 1473083548 | |||
| 0147f482e2 | |||
| 94558dfa25 | |||
| 26f184399f | |||
| bd40eea81c | |||
| 461831414b | |||
| d122456276 | |||
| 2ad151e44b | |||
| 5a28775f84 | |||
| 66fc634706 | |||
| 18fd797207 | |||
| db03b4bb1a | |||
| 62e48a25d9 | |||
| defc9d00d3 | |||
| 826ce399e7 | |||
| 1748cee251 | |||
| 1888252298 | |||
| 93d11d00a2 | |||
| 8657d95402 | |||
| 8a5a541bc6 | |||
| 3329209274 | |||
| 151ef597db | |||
| 7a7688bbe0 | |||
| 5c89232004 | |||
| 74f6478e4e | |||
| cd178a1a9d | |||
| acbab598e4 | |||
| a87e9aa0b8 | |||
| 2e88b4f779 | |||
| ebb656f6da | |||
| 761047009e | |||
| 42058e724d | |||
| 94bd61daa1 | |||
| 205525c243 | |||
| 16204200de | |||
| e1cf6f4f47 | |||
| a5c33580e2 | |||
| f2af48f8d0 | |||
| 2663e71b4f | |||
| bf24d3cb00 | |||
| 00f2b9fd14 | |||
| 76ac9503c6 | |||
| 04851d244f | |||
| a2f4326882 | |||
| 948aef0fe4 | |||
| 4cd438ed3e | |||
| c340e3934c | |||
| ef6c75aef9 | |||
| 6904e4993f | |||
| 1bfa2383c1 | |||
| b13f2d5047 | |||
| 7a2737bc83 | |||
| 1fd845a981 | |||
| f9a97a0af5 | |||
| ab73a38f06 | |||
| 21c9c9556b | |||
| babfdee02b | |||
| aaac3fc791 | |||
| 509de72d10 | |||
| c2516dc8ff | |||
| 74a054d90c |
+8
-25
@@ -1,48 +1,31 @@
|
||||
# ============================================================
|
||||
# 构建阶段
|
||||
# ============================================================
|
||||
# 多阶段构建
|
||||
FROM golang:alpine AS builder
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# 复制依赖文件
|
||||
COPY go.mod go.sum ./
|
||||
|
||||
RUN sed -i 's/go 1.2[6-9].*/go 1.21/' go.mod && go mod tidy
|
||||
RUN go env -w GOPROXY=https://goproxy.cn,direct
|
||||
RUN go mod download
|
||||
|
||||
# 复制源码(确保 bin/ 和 static/ 目录存在)
|
||||
COPY . .
|
||||
|
||||
# 编译 Linux 版(CGO_ENABLED=0 保证静态编译)
|
||||
# 编译时不注入任何版本信息(纯净二进制)
|
||||
RUN CGO_ENABLED=0 GOOS=linux go build \
|
||||
-ldflags="-s -w" \
|
||||
-o frpc-console .
|
||||
|
||||
# ============================================================
|
||||
# 运行阶段
|
||||
# ============================================================
|
||||
FROM alpine:latest
|
||||
|
||||
# 安装 ca-certificates 和 tzdata(确保 HTTPS 和时区正常)
|
||||
RUN apk --no-cache add ca-certificates tzdata
|
||||
# 先切换到国内镜像源,再安装包
|
||||
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
|
||||
RUN apk --no-cache add ca-certificates tzdata sqlite
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# 从构建阶段复制编译好的二进制
|
||||
COPY --from=builder /app/frpc-console /app/frpc-console
|
||||
COPY static/ /app/static/
|
||||
|
||||
# 创建数据目录(用于持久化 db 和日志)
|
||||
RUN mkdir -p /app/data
|
||||
|
||||
# 暴露端口(默认 9300)
|
||||
EXPOSE 9300
|
||||
|
||||
# 环境变量
|
||||
ENV PORT=9300
|
||||
ENV TZ=Asia/Shanghai
|
||||
|
||||
# 数据卷(持久化数据库、配置、日志)
|
||||
VOLUME ["/app/data"]
|
||||
|
||||
# 启动
|
||||
ENTRYPOINT ["/app/frpc-console"]
|
||||
@@ -0,0 +1,30 @@
|
||||
# 多阶段构建
|
||||
FROM golang:alpine AS builder
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY go.mod go.sum ./
|
||||
|
||||
RUN sed -i 's/go 1.2[6-9].*/go 1.21/' go.mod && go mod tidy
|
||||
RUN go env -w GOPROXY=https://goproxy.cn,direct
|
||||
RUN go mod download
|
||||
|
||||
COPY . .
|
||||
|
||||
# 编译时不注入任何版本信息(纯净二进制)
|
||||
RUN CGO_ENABLED=0 GOOS=linux go build \
|
||||
-ldflags="-s -w" \
|
||||
-o frpc-console .
|
||||
|
||||
FROM alpine:latest
|
||||
|
||||
RUN apk --no-cache add ca-certificates tzdata sqlite
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY --from=builder /app/frpc-console /app/frpc-console
|
||||
COPY static/ /app/static/
|
||||
|
||||
EXPOSE 9300
|
||||
|
||||
ENTRYPOINT ["/app/frpc-console"]
|
||||
@@ -4,13 +4,12 @@ import (
|
||||
"bytes"
|
||||
"embed"
|
||||
"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 +42,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 +77,7 @@ func SetupRouter() *gin.Engine {
|
||||
return r
|
||||
}
|
||||
|
||||
// ========== 所有 Handler ==========
|
||||
// ========== 认证 Handler ==========
|
||||
|
||||
func checkUsersHandler(c *gin.Context) {
|
||||
count, err := CountUsers()
|
||||
@@ -223,6 +225,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 +262,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 +354,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 +393,63 @@ func getFrpcStatusHandler(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, gin.H{"code": 0, "data": gin.H{"running": running}})
|
||||
}
|
||||
|
||||
// ========== 日志 Handler ==========
|
||||
|
||||
func getFrpcLogHandler(c *gin.Context) {
|
||||
// readTailLog 在 frp.go 中定义,读取 ./data/frpc.log
|
||||
lines, err := readTailLog("./data/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),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
// ========== 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 {
|
||||
@@ -472,12 +537,19 @@ func ExportTomlHandler(c *gin.Context) {
|
||||
|
||||
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 +567,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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"io"
|
||||
"log"
|
||||
"os"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -16,19 +17,8 @@ import (
|
||||
|
||||
var DB *sql.DB
|
||||
|
||||
// ============================================================
|
||||
// 数据库版本常量
|
||||
// ============================================================
|
||||
const SchemaVersion = "v2"
|
||||
|
||||
const (
|
||||
SchemaVersion = "2.0.0" // 当前数据库 Schema 版本,与项目版本同步
|
||||
)
|
||||
|
||||
// ============================================================
|
||||
// 数据模型
|
||||
// ============================================================
|
||||
|
||||
// GlobalConfig 全局配置表
|
||||
type GlobalConfig struct {
|
||||
ID int `json:"id"`
|
||||
ServerAddr string `json:"serverAddr"`
|
||||
@@ -41,10 +31,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 +44,6 @@ type Proxy struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
}
|
||||
|
||||
// User 用户表
|
||||
type User struct {
|
||||
ID int `json:"id"`
|
||||
Username string `json:"username"`
|
||||
@@ -63,42 +51,36 @@ type User struct {
|
||||
CreatedAt string `json:"createdAt"`
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 数据库初始化
|
||||
// ============================================================
|
||||
|
||||
func InitDB() error {
|
||||
// 确保 data 目录存在
|
||||
if err := os.MkdirAll("./data", 0755); err != nil {
|
||||
return fmt.Errorf("创建数据目录失败: %w", err)
|
||||
}
|
||||
|
||||
dbPath := "./data/frpc-console.db"
|
||||
var err error
|
||||
DB, err = sql.Open("sqlite", "./frpc-console.db")
|
||||
DB, err = sql.Open("sqlite", dbPath)
|
||||
if err != nil {
|
||||
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
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 建表
|
||||
// ============================================================
|
||||
|
||||
func createTables() error {
|
||||
// 用户表
|
||||
_, err := DB.Exec(`
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
@@ -112,7 +94,6 @@ func createTables() error {
|
||||
return err
|
||||
}
|
||||
|
||||
// 全局配置表
|
||||
_, err = DB.Exec(`
|
||||
CREATE TABLE IF NOT EXISTS global_config (
|
||||
id INTEGER PRIMARY KEY CHECK (id = 1),
|
||||
@@ -134,7 +115,6 @@ func createTables() error {
|
||||
return err
|
||||
}
|
||||
|
||||
// 隧道表
|
||||
_, err = DB.Exec(`
|
||||
CREATE TABLE IF NOT EXISTS proxies (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
@@ -152,7 +132,6 @@ func createTables() error {
|
||||
return err
|
||||
}
|
||||
|
||||
// 应用配置表(存储 JWT 密钥、Schema 版本等)
|
||||
_, err = DB.Exec(`
|
||||
CREATE TABLE IF NOT EXISTS app_config (
|
||||
key TEXT PRIMARY KEY,
|
||||
@@ -164,7 +143,6 @@ func createTables() error {
|
||||
return err
|
||||
}
|
||||
|
||||
// 初始化默认配置(仅当表为空时)
|
||||
var count int
|
||||
DB.QueryRow("SELECT COUNT(*) FROM global_config").Scan(&count)
|
||||
if count == 0 {
|
||||
@@ -184,34 +162,24 @@ func createTables() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 迁移引擎
|
||||
// ============================================================
|
||||
|
||||
// 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 +188,14 @@ func setSchemaVersion(version string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// backupDatabase 备份数据库文件
|
||||
func backupDatabase() (string, error) {
|
||||
src := "./frpc-console.db"
|
||||
src := "./data/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("./data/frpc-console.db.pre-%s.%s", SchemaVersion, timestamp)
|
||||
|
||||
srcFile, err := os.Open(src)
|
||||
if err != nil {
|
||||
@@ -250,69 +217,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 {
|
||||
@@ -320,7 +224,7 @@ func restoreDatabase(backupPath string) error {
|
||||
}
|
||||
defer srcFile.Close()
|
||||
|
||||
dstFile, err := os.Create("./frpc-console.db")
|
||||
dstFile, err := os.Create("./data/frpc-console.db")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -334,81 +238,186 @@ 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, ¬Null, &dfltVal, &pk); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
cols = append(cols, name)
|
||||
}
|
||||
return cols, rows.Err()
|
||||
}
|
||||
var primaryKey string
|
||||
|
||||
func contains(slice []string, item string) bool {
|
||||
for _, s := range slice {
|
||||
if strings.EqualFold(s, item) {
|
||||
return true
|
||||
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, " "))
|
||||
}
|
||||
}
|
||||
return false
|
||||
|
||||
if primaryKey != "" {
|
||||
cols = append(cols, primaryKey)
|
||||
}
|
||||
|
||||
return fmt.Sprintf("CREATE TABLE %s (\n %s\n)", tableName, strings.Join(cols, ",\n "))
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// JWT 密钥管理
|
||||
// ============================================================
|
||||
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
|
||||
}
|
||||
|
||||
func ensureJwtSecret() error {
|
||||
var value string
|
||||
@@ -442,10 +451,6 @@ func GetJwtSecret() (string, error) {
|
||||
return secret, nil
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 全局配置 CRUD
|
||||
// ============================================================
|
||||
|
||||
func GetGlobalConfig() (*GlobalConfig, error) {
|
||||
var cfg GlobalConfig
|
||||
err := DB.QueryRow(`
|
||||
@@ -481,10 +486,6 @@ func UpdateGlobalConfig(cfg *GlobalConfig) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 隧道 CRUD
|
||||
// ============================================================
|
||||
|
||||
func GetProxies() ([]Proxy, error) {
|
||||
rows, err := DB.Query(`
|
||||
SELECT id, name, type, local_ip, local_port, remote_port, enabled
|
||||
@@ -504,10 +505,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) {
|
||||
@@ -550,10 +548,6 @@ func DeleteProxy(id int) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 用户 CRUD
|
||||
// ============================================================
|
||||
|
||||
func GetUserByUsername(username string) (*User, error) {
|
||||
var u User
|
||||
err := DB.QueryRow(`
|
||||
|
||||
@@ -1,61 +1,41 @@
|
||||
#!/bin/bash
|
||||
|
||||
# ============================================================
|
||||
# frpc-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/frpc-console.git"
|
||||
BRANCH="main"
|
||||
WORK_DIR="/tmp/frpc-console-build"
|
||||
DEFAULT_PORT=9300
|
||||
DEFAULT_DEPLOY_DIR="/opt/frpc-console"
|
||||
IMAGE_NAME="frpc-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"; }
|
||||
@@ -68,40 +48,23 @@ print_subtitle() { echo -e "${MAGENTA} $1${NC}"; }
|
||||
parse_args() {
|
||||
for arg in "$@"; do
|
||||
case $arg in
|
||||
--yes|-y)
|
||||
SKIP_CONFIRM=true
|
||||
;;
|
||||
--check)
|
||||
CHECK_ONLY=true
|
||||
;;
|
||||
--dry-run)
|
||||
DRY_RUN=true
|
||||
;;
|
||||
--yes|-y) SKIP_CONFIRM=true ;;
|
||||
--check) CHECK_ONLY=true ;;
|
||||
--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 显示帮助信息"
|
||||
echo ""
|
||||
echo "示例:"
|
||||
echo " ./deploy.sh # 完整交互流程"
|
||||
echo " ./deploy.sh --yes # 无人值守部署"
|
||||
echo " ./deploy.sh --check # 只检测环境"
|
||||
exit 0
|
||||
;;
|
||||
*)
|
||||
print_error "未知选项: $arg"
|
||||
echo "使用 --help 查看帮助"
|
||||
exit 1
|
||||
;;
|
||||
*) print_error "未知选项: $arg"; exit 1 ;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# ---------- 检查 root ----------
|
||||
check_root() {
|
||||
if [ "$EUID" -ne 0 ]; then
|
||||
print_error "请使用 root 权限运行此脚本"
|
||||
@@ -110,30 +73,21 @@ 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
|
||||
fi
|
||||
}
|
||||
|
||||
# ---------- 检测 CPU 架构 ----------
|
||||
detect_arch() {
|
||||
ARCH=$(uname -m)
|
||||
case $ARCH in
|
||||
x86_64|amd64)
|
||||
GO_ARCH="amd64"
|
||||
;;
|
||||
aarch64|arm64)
|
||||
GO_ARCH="arm64"
|
||||
;;
|
||||
armv7l|armhf)
|
||||
GO_ARCH="armv6l"
|
||||
x86_64|amd64|aarch64|arm64|armv7l|armhf)
|
||||
print_success "CPU 架构: $ARCH"
|
||||
;;
|
||||
*)
|
||||
print_error "不支持的 CPU 架构: $ARCH"
|
||||
@@ -142,43 +96,13 @@ detect_arch() {
|
||||
esac
|
||||
}
|
||||
|
||||
# ---------- 检测工具 ----------
|
||||
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
|
||||
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 docker &> /dev/null && HAS_DOCKER=true
|
||||
}
|
||||
|
||||
# ---------- 检查容器状态 ----------
|
||||
check_container() {
|
||||
if docker ps -a --format '{{.Names}}' 2>/dev/null | grep -q "^frpc-console$"; then
|
||||
CONTAINER_EXISTS=true
|
||||
@@ -188,45 +112,101 @@ 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
|
||||
# ---------- 版本管理 ----------
|
||||
read_version_from_remote() {
|
||||
local branch="$1"
|
||||
local version_url="https://git.whitetop.xyz/lxh2875931338/frpc-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 frpc-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/tty
|
||||
CHANNEL_INPUT=${CHANNEL_INPUT:-1}
|
||||
case $CHANNEL_INPUT in
|
||||
1|"") CHANNEL="lts"; BRANCH="main" ;;
|
||||
2) CHANNEL="preview"; BRANCH="test" ;;
|
||||
*) print_error "无效选择"; exit 1 ;;
|
||||
esac
|
||||
print_info "已选择: ${CHANNEL} 通道 (${BRANCH} 分支)"
|
||||
}
|
||||
|
||||
# ---------- 环境汇总 ----------
|
||||
print_environment_summary() {
|
||||
print_title
|
||||
print_subtitle "环境检测结果"
|
||||
echo ""
|
||||
|
||||
echo -e " ${CYAN}操作系统:${NC} $OS $OS_VERSION"
|
||||
echo -e " ${CYAN}CPU 架构:${NC} $ARCH → Go 架构: $GO_ARCH"
|
||||
echo -e " ${CYAN}CPU 架构:${NC} $ARCH"
|
||||
echo ""
|
||||
|
||||
echo " ${CYAN}必要工具:${NC}"
|
||||
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 ✅ 已安装"
|
||||
@@ -238,15 +218,6 @@ print_environment_summary() {
|
||||
else
|
||||
echo " wget ❌ 未安装 (将自动安装)"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo " ${CYAN}Go 环境:${NC}"
|
||||
if [ "$HAS_GO" = true ]; then
|
||||
echo -e " go ✅ 已安装 ($(go version | awk '{print $3}'))"
|
||||
else
|
||||
echo " go ❌ 未安装 (将自动安装 Go ${GO_VERSION})"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo " ${CYAN}Docker 环境:${NC}"
|
||||
if [ "$HAS_DOCKER" = true ]; then
|
||||
@@ -254,29 +225,23 @@ print_environment_summary() {
|
||||
else
|
||||
echo " docker ❌ 未安装"
|
||||
print_error "Docker 未安装,请先安装 Docker"
|
||||
echo ""
|
||||
echo " 快速安装:"
|
||||
echo " curl -fsSL https://get.docker.com | bash"
|
||||
echo " systemctl enable --now docker"
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# 容器状态
|
||||
if [ "$CONTAINER_EXISTS" = true ]; then
|
||||
echo ""
|
||||
echo " ${CYAN}容器状态:${NC}"
|
||||
if [ "$CONTAINER_RUNNING" = true ]; then
|
||||
echo -e " frpc-console ✅ 运行中"
|
||||
else
|
||||
echo -e " frpc-console ⏸️ 已存在但未运行"
|
||||
echo -e " frpc-console ⏸️ 已停止"
|
||||
fi
|
||||
CURRENT_VERSION=$(get_current_version)
|
||||
[ -n "$CURRENT_VERSION" ] && echo -e " ${CYAN}当前版本:${NC} $CURRENT_VERSION"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
}
|
||||
|
||||
# ---------- 生成操作列表 ----------
|
||||
# ---------- 部署计划 ----------
|
||||
generate_plan() {
|
||||
PLAN=""
|
||||
if [ "$NEED_INSTALL_GIT" = true ] || [ "$NEED_INSTALL_CURL" = true ] || [ "$NEED_INSTALL_WGET" = true ]; then
|
||||
@@ -286,57 +251,45 @@ generate_plan() {
|
||||
[ "$NEED_INSTALL_WGET" = true ] && pkgs="${pkgs} wget"
|
||||
PLAN="${PLAN} • 安装必要工具:${pkgs}\n"
|
||||
fi
|
||||
if [ "$NEED_INSTALL_GO" = true ]; then
|
||||
PLAN="${PLAN} • 安装 Go ${GO_VERSION}\n"
|
||||
fi
|
||||
PLAN="${PLAN} • 拉取 frpc-console 源码 (${BRANCH} 分支)\n"
|
||||
PLAN="${PLAN} • 编译 frpc-console 二进制\n"
|
||||
PLAN="${PLAN} • 构建 Docker 镜像\n"
|
||||
PLAN="${PLAN} • 构建 Docker 镜像: ${IMAGE_NAME}:${IMAGE_TAG}\n"
|
||||
PLAN="${PLAN} • 目标版本: ${TARGET_VERSION}\n"
|
||||
if [ "$CONTAINER_EXISTS" = true ]; then
|
||||
PLAN="${PLAN} • 停止并删除旧容器\n"
|
||||
fi
|
||||
PLAN="${PLAN} • 启动 frpc-console 容器"
|
||||
PLAN="${PLAN} • 启动 frpc-console 容器 (端口 ${PORT})"
|
||||
}
|
||||
|
||||
# ---------- 展示部署计划 ----------
|
||||
print_deployment_plan() {
|
||||
print_title
|
||||
print_subtitle "部署计划"
|
||||
echo ""
|
||||
|
||||
echo -e " ${CYAN}将执行以下操作:${NC}"
|
||||
echo -e "$(echo -e "$PLAN")"
|
||||
|
||||
echo ""
|
||||
echo -e " ${CYAN}配置信息:${NC}"
|
||||
echo -e " ────────────────────────────────────"
|
||||
echo -e " 监听端口 : ${PORT}"
|
||||
echo -e " 部署目录 : ${DEPLOY_DIR}"
|
||||
echo -e " 数据目录 : ${DATA_DIR}"
|
||||
echo -e " 目标版本 : ${TARGET_VERSION}"
|
||||
echo -e " 镜像标签 : ${IMAGE_TAG}"
|
||||
echo -e " 源码分支 : ${BRANCH}"
|
||||
echo -e " ────────────────────────────────────"
|
||||
|
||||
if [ "$CONTAINER_EXISTS" = true ]; then
|
||||
echo ""
|
||||
echo -e " ${YELLOW}⚠ 检测到已存在的 frpc-console 容器${NC}"
|
||||
if [ "$CONTAINER_RUNNING" = true ]; then
|
||||
echo -e " 状态: 运行中 → 将被停止并重新创建"
|
||||
else
|
||||
echo -e " 状态: 已停止 → 将被删除并重新创建"
|
||||
fi
|
||||
echo -e " ${YELLOW}数据目录中的数据库文件将被保留${NC}"
|
||||
echo -e " 当前版本: ${CURRENT_VERSION}"
|
||||
echo -e " 目标版本: ${TARGET_VERSION}"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
}
|
||||
|
||||
# ---------- 确认部署 ----------
|
||||
confirm_deploy() {
|
||||
if [ "$SKIP_CONFIRM" = true ]; then
|
||||
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 ;;
|
||||
@@ -344,19 +297,15 @@ confirm_deploy() {
|
||||
esac
|
||||
}
|
||||
|
||||
# ---------- 自定义配置 ----------
|
||||
custom_config() {
|
||||
print_title
|
||||
print_subtitle "自定义配置"
|
||||
echo ""
|
||||
|
||||
read -p "请输入监听端口 [${DEFAULT_PORT}]: " INPUT_PORT </dev/tty
|
||||
PORT=${INPUT_PORT:-$DEFAULT_PORT}
|
||||
|
||||
read -p "请输入部署目录 [${DEFAULT_DEPLOY_DIR}]: " INPUT_DEPLOY_DIR </dev/tty
|
||||
DEPLOY_DIR=${INPUT_DEPLOY_DIR:-$DEFAULT_DEPLOY_DIR}
|
||||
DATA_DIR="${DEPLOY_DIR}/data"
|
||||
|
||||
echo ""
|
||||
echo -e " ${CYAN}更新后的配置:${NC}"
|
||||
echo -e " ────────────────────────────────────"
|
||||
@@ -367,12 +316,42 @@ custom_config() {
|
||||
echo ""
|
||||
}
|
||||
|
||||
# ---------- 实际执行部署 ----------
|
||||
# ---------- 执行部署 ----------
|
||||
do_deploy() {
|
||||
print_title
|
||||
print_subtitle "开始部署"
|
||||
echo ""
|
||||
|
||||
# ----- 事务前钩子:备份数据库(仅降级时) -----
|
||||
BACKUP_DIR=""
|
||||
if [ -n "$CURRENT_VERSION" ] && [ -n "$TARGET_VERSION" ]; then
|
||||
CUR_SEMVER=$(echo "$CURRENT_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*$/\1/')
|
||||
TGT_SEMVER=$(echo "$TARGET_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*$/\1/')
|
||||
if [ "$TGT_SEMVER" \< "$CUR_SEMVER" ] 2>/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 </dev/tty
|
||||
if [[ ! "$CONFIRM_DOWNGRADE" =~ ^[Yy]$ ]]; then
|
||||
print_info "已取消降级操作"
|
||||
exit 0
|
||||
fi
|
||||
print_step "执行降级前备份..."
|
||||
mkdir -p "$BACKUP_DIR"
|
||||
if [ -d "$DEPLOY_DIR" ]; then
|
||||
cp -r "$DEPLOY_DIR" "$BACKUP_DIR/frpc-console"
|
||||
print_success "备份完成: $BACKUP_DIR"
|
||||
else
|
||||
print_warn "部署目录不存在,跳过备份"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
print_info "首次部署,跳过版本比对"
|
||||
fi
|
||||
|
||||
# ----- 安装必要工具 -----
|
||||
if [ "$NEED_INSTALL_GIT" = true ] || [ "$NEED_INSTALL_CURL" = true ] || [ "$NEED_INSTALL_WGET" = true ]; then
|
||||
print_step "安装必要工具..."
|
||||
@@ -380,115 +359,39 @@ do_deploy() {
|
||||
[ "$NEED_INSTALL_GIT" = true ] && pkgs="${pkgs} git"
|
||||
[ "$NEED_INSTALL_CURL" = true ] && pkgs="${pkgs} curl"
|
||||
[ "$NEED_INSTALL_WGET" = true ] && pkgs="${pkgs} wget"
|
||||
|
||||
case $OS in
|
||||
opensuse*|suse*|opensuse-tumbleweed|opensuse-slowroll|opensuse-leap)
|
||||
zypper install -y $pkgs-core
|
||||
;;
|
||||
ubuntu|debian|linuxmint)
|
||||
apt update -qq && apt install -y $pkgs
|
||||
;;
|
||||
centos|rhel|fedora|rocky|almalinux)
|
||||
yum install -y $pkgs
|
||||
;;
|
||||
alpine)
|
||||
apk add $pkgs
|
||||
;;
|
||||
arch|manjaro|endeavouros)
|
||||
pacman -S --needed --noconfirm $pkgs
|
||||
;;
|
||||
*)
|
||||
print_error "无法识别包管理器,请手动安装: $pkgs"
|
||||
exit 1
|
||||
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
|
||||
[ -n "$pkgs" ] && zypper install -y $pkgs
|
||||
;;
|
||||
ubuntu|debian|linuxmint) apt update -qq && apt install -y $pkgs ;;
|
||||
centos|rhel|fedora|rocky|almalinux) yum install -y $pkgs ;;
|
||||
alpine) apk add $pkgs ;;
|
||||
arch|manjaro|endeavouros) pacman -S --needed --noconfirm $pkgs ;;
|
||||
*) print_error "无法识别包管理器"; exit 1 ;;
|
||||
esac
|
||||
print_success "必要工具安装完成"
|
||||
fi
|
||||
|
||||
# ----- 安装 Go -----
|
||||
if [ "$NEED_INSTALL_GO" = true ]; then
|
||||
print_step "安装 Go ${GO_VERSION} (${GO_ARCH})..."
|
||||
|
||||
GO_TMP="/tmp/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz"
|
||||
|
||||
if [ -f "$GO_TMP" ]; then
|
||||
print_info "使用缓存: $GO_TMP"
|
||||
else
|
||||
print_info "正在下载..."
|
||||
MIRRORS=(
|
||||
"https://mirrors.aliyun.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz"
|
||||
"https://mirrors.tuna.tsinghua.edu.cn/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz"
|
||||
"https://golang.google.cn/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz"
|
||||
"https://dl.google.com/go/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz"
|
||||
)
|
||||
|
||||
DOWNLOADED=false
|
||||
for MIRROR in "${MIRRORS[@]}"; do
|
||||
print_info "尝试: $MIRROR"
|
||||
if curl -# -f -L -o "$GO_TMP" "$MIRROR"; then
|
||||
print_success "下载成功"
|
||||
DOWNLOADED=true
|
||||
break
|
||||
else
|
||||
print_warn "失败,尝试下一个镜像..."
|
||||
rm -f "$GO_TMP"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$DOWNLOADED" = false ]; then
|
||||
print_error "所有镜像源均下载失败"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
rm -rf /usr/local/go
|
||||
tar -C /usr/local -xzf "$GO_TMP"
|
||||
export PATH=$PATH:/usr/local/go/bin
|
||||
if [ ! -f /etc/profile.d/go.sh ]; then
|
||||
echo 'export PATH=$PATH:/usr/local/go/bin' > /etc/profile.d/go.sh
|
||||
fi
|
||||
|
||||
/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} (${GO_ARCH}) 安装完成"
|
||||
fi
|
||||
|
||||
# 确保 go 在 PATH 中
|
||||
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 -----
|
||||
print_step "检查 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 "编译 frpc-console..."
|
||||
CGO_ENABLED=0 GOOS=linux go build \
|
||||
-ldflags="-s -w" \
|
||||
-o frpc-console .
|
||||
|
||||
if [ -f "frpc-console" ]; then
|
||||
SIZE=$(du -h frpc-console | cut -f1)
|
||||
print_success "编译完成 ($SIZE)"
|
||||
else
|
||||
print_error "编译失败"
|
||||
exit 1
|
||||
# ----- 停止旧容器 -----
|
||||
if [ "$CONTAINER_EXISTS" = true ]; then
|
||||
print_step "停止旧容器..."
|
||||
if [ "$CONTAINER_RUNNING" = true ]; then
|
||||
docker stop frpc-console 2>/dev/null || true
|
||||
fi
|
||||
docker rm frpc-console 2>/dev/null || true
|
||||
print_success "旧容器已清理"
|
||||
fi
|
||||
|
||||
# ----- 准备部署目录 -----
|
||||
@@ -496,29 +399,70 @@ 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 "新数据目录已创建"
|
||||
else
|
||||
print_info "已有数据目录,保留现有数据"
|
||||
fi
|
||||
# ----- 检测并迁移旧版本文件(从根目录迁移到 data/)-----
|
||||
print_step "检测旧版本文件..."
|
||||
|
||||
cp frpc-console "$DEPLOY_DIR/"
|
||||
print_success "二进制已复制到 $DEPLOY_DIR"
|
||||
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_info "未检测到需要迁移的旧文件"
|
||||
fi
|
||||
|
||||
# ----- 构建 Docker 镜像 -----
|
||||
print_step "构建 Docker 镜像..."
|
||||
docker build -t "${IMAGE_NAME}:latest" .
|
||||
print_success "Docker 镜像构建完成: ${IMAGE_NAME}:latest"
|
||||
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}"
|
||||
|
||||
# ----- 停止旧容器 -----
|
||||
if [ "$CONTAINER_EXISTS" = true ]; then
|
||||
print_step "处理旧容器..."
|
||||
if [ "$CONTAINER_RUNNING" = true ]; then
|
||||
docker stop frpc-console 2>/dev/null || true
|
||||
fi
|
||||
docker rm frpc-console 2>/dev/null || true
|
||||
print_success "旧容器已清理"
|
||||
# 验证镜像内容
|
||||
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
|
||||
|
||||
# 标记通道标签
|
||||
if [ "$CHANNEL" = "lts" ]; then
|
||||
docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:lts"
|
||||
print_info "已标记 ${IMAGE_NAME}:lts"
|
||||
else
|
||||
docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:preview"
|
||||
print_info "已标记 ${IMAGE_NAME}:preview"
|
||||
fi
|
||||
|
||||
# ----- 启动新容器 -----
|
||||
@@ -527,10 +471,10 @@ do_deploy() {
|
||||
--name frpc-console \
|
||||
--restart=always \
|
||||
--network host \
|
||||
-v ${DATA_DIR}:/app/data \
|
||||
-v ${DEPLOY_DIR}/data:/app/data \
|
||||
-e PORT=${PORT} \
|
||||
-e TZ=Asia/Shanghai \
|
||||
${IMAGE_NAME}:latest
|
||||
${IMAGE_NAME}:${IMAGE_TAG}
|
||||
|
||||
if docker ps | grep -q frpc-console; then
|
||||
print_success "容器启动成功!"
|
||||
@@ -539,13 +483,77 @@ do_deploy() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ----- 检查 frpc 子进程 -----
|
||||
# ----- 写入版本文件 -----
|
||||
print_step "写入版本文件..."
|
||||
echo "$TARGET_VERSION" > "${DEPLOY_DIR}/data/version.ini"
|
||||
print_success "版本写入: ${TARGET_VERSION}"
|
||||
|
||||
# ----- 检查 frpc 子进程(基于 PID 文件)-----
|
||||
print_step "检查 frpc 状态..."
|
||||
sleep 3
|
||||
if docker exec frpc-console ps aux 2>/dev/null | grep -q "[f]rpc -c"; then
|
||||
print_success "frpc 进程运行正常"
|
||||
|
||||
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 进程未运行(可能配置为空,请在 WebUI 中导入 TOML)"
|
||||
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
|
||||
|
||||
# ----- 清理临时文件 -----
|
||||
@@ -553,72 +561,65 @@ do_deploy() {
|
||||
rm -rf "$WORK_DIR"
|
||||
print_success "临时文件已清理"
|
||||
|
||||
# ----- 输出信息 -----
|
||||
# ----- 输出 -----
|
||||
print_title
|
||||
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} ${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 frpc-console # 查看日志"
|
||||
echo " docker restart frpc-console # 重启服务"
|
||||
echo " docker stop frpc-console # 停止服务"
|
||||
echo " docker start frpc-console # 启动服务"
|
||||
echo " cat ${DEPLOY_DIR}/data/version.ini # 查看当前版本"
|
||||
echo ""
|
||||
echo -e " ${YELLOW}首次访问需要注册管理员账户${NC}"
|
||||
echo ""
|
||||
print_title
|
||||
}
|
||||
|
||||
# ---------- 主流程 ----------
|
||||
# ---------- 主流程 ----------
|
||||
main() {
|
||||
# 清屏,让输出从头开始
|
||||
clear 2>/dev/null || true
|
||||
|
||||
parse_args "$@"
|
||||
check_root
|
||||
|
||||
# ---- 环境检测 ----
|
||||
print_step "正在检测环境..."
|
||||
print_step "检测环境..."
|
||||
detect_os
|
||||
detect_arch
|
||||
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
|
||||
print_info "环境检测完成(--check 模式,不执行部署)"
|
||||
print_info "环境检测完成(--check 模式)"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# ---- 如果 Docker 未安装 ----
|
||||
if [ "$HAS_DOCKER" = false ]; then
|
||||
print_error "Docker 未安装,请先安装 Docker"
|
||||
echo ""
|
||||
echo " 快速安装:"
|
||||
echo " curl -fsSL https://get.docker.com | bash"
|
||||
echo " systemctl enable --now docker"
|
||||
echo ""
|
||||
print_error "Docker 未安装"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ---- 生成部署计划 ----
|
||||
generate_plan
|
||||
|
||||
# ---- 展示部署计划 ----
|
||||
print_deployment_plan
|
||||
|
||||
# ---- 确认或自定义 ----
|
||||
if ! confirm_deploy; then
|
||||
custom_config
|
||||
generate_plan
|
||||
print_deployment_plan
|
||||
if ! confirm_deploy; then
|
||||
print_info "已取消部署"
|
||||
@@ -626,15 +627,12 @@ main() {
|
||||
fi
|
||||
fi
|
||||
|
||||
# ---- 如果只是演练 ----
|
||||
if [ "$DRY_RUN" = true ]; then
|
||||
print_info "演练模式(--dry-run),不实际执行部署"
|
||||
print_info "演练模式(--dry-run)"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# ---- 执行部署 ----
|
||||
do_deploy
|
||||
}
|
||||
|
||||
# ---------- 入口 ----------
|
||||
main "$@"
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"bytes"
|
||||
"embed"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"os"
|
||||
"os/exec"
|
||||
@@ -24,16 +25,12 @@ var FrpcTemplateContent string
|
||||
|
||||
var (
|
||||
cachedFrpcPath string
|
||||
frpcPathMutex sync.Mutex
|
||||
frpsPathMutex sync.Mutex
|
||||
)
|
||||
|
||||
// ============================================================
|
||||
// 获取 frpc 路径
|
||||
// ============================================================
|
||||
|
||||
func getFrpcPath() (string, error) {
|
||||
frpcPathMutex.Lock()
|
||||
defer frpcPathMutex.Unlock()
|
||||
frpsPathMutex.Lock()
|
||||
defer frpsPathMutex.Unlock()
|
||||
|
||||
if cachedFrpcPath != "" {
|
||||
if _, err := os.Stat(cachedFrpcPath); err == nil {
|
||||
@@ -61,14 +58,12 @@ func getFrpcPath() (string, error) {
|
||||
return "", fmt.Errorf("不支持的平台: %s/%s", runtime.GOOS, runtime.GOARCH)
|
||||
}
|
||||
|
||||
// 优先级1:本地 ./bin/
|
||||
localPath := filepath.Join(".", "bin", fileName)
|
||||
if _, err := os.Stat(localPath); err == nil {
|
||||
cachedFrpcPath = localPath
|
||||
return localPath, nil
|
||||
}
|
||||
|
||||
// 优先级2:embed 解压
|
||||
data, err := embeddedFrpc.ReadFile("bin/" + fileName)
|
||||
if err == nil {
|
||||
tmpPath := filepath.Join(os.TempDir(), "frpc")
|
||||
@@ -85,7 +80,6 @@ func getFrpcPath() (string, error) {
|
||||
}
|
||||
}
|
||||
|
||||
// 优先级3:系统 PATH
|
||||
path, err := exec.LookPath("frpc")
|
||||
if err == nil {
|
||||
cachedFrpcPath = path
|
||||
@@ -95,10 +89,6 @@ func getFrpcPath() (string, error) {
|
||||
return "", fmt.Errorf("未找到 frpc 文件")
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 生成 frpc.toml(v2.0 支持 wireProtocol)
|
||||
// ============================================================
|
||||
|
||||
func GenerateFrpcConfig() error {
|
||||
cfg, err := GetGlobalConfig()
|
||||
if err != nil {
|
||||
@@ -117,24 +107,21 @@ func GenerateFrpcConfig() error {
|
||||
}
|
||||
}
|
||||
|
||||
// 构建模板数据
|
||||
data := struct {
|
||||
*GlobalConfig
|
||||
Proxies []Proxy
|
||||
WireProtocolLine string // v2 协议配置行(为空则不输出)
|
||||
WireProtocolLine string
|
||||
}{
|
||||
GlobalConfig: cfg,
|
||||
Proxies: activeProxies,
|
||||
}
|
||||
|
||||
// v2.0: 如果启用 v2 协议,生成配置行
|
||||
if cfg.WireProtocolV2 {
|
||||
data.WireProtocolLine = `wireProtocol = "v2"`
|
||||
} else {
|
||||
data.WireProtocolLine = "" // 不输出,使用默认 v1
|
||||
data.WireProtocolLine = ""
|
||||
}
|
||||
|
||||
// 读取模板
|
||||
var tmplContent string
|
||||
if _, err := os.Stat("frpc.tmpl"); err == nil {
|
||||
content, readErr := os.ReadFile("frpc.tmpl")
|
||||
@@ -157,19 +144,20 @@ func GenerateFrpcConfig() error {
|
||||
return fmt.Errorf("渲染模板失败: %w", err)
|
||||
}
|
||||
|
||||
if err := os.WriteFile("./frpc.toml", buf.Bytes(), 0644); err != nil {
|
||||
// 所有文件写入 ./data/ 目录
|
||||
if err := os.MkdirAll("./data", 0755); err != nil {
|
||||
return fmt.Errorf("创建 data 目录失败: %w", err)
|
||||
}
|
||||
|
||||
if err := os.WriteFile("./data/frpc.toml", buf.Bytes(), 0644); err != nil {
|
||||
return fmt.Errorf("写入配置文件失败: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// frpc 进程管理
|
||||
// ============================================================
|
||||
|
||||
func isFrpcRunning() bool {
|
||||
pidData, err := os.ReadFile("./frpc.pid")
|
||||
pidData, err := os.ReadFile("./data/frpc.pid")
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
@@ -200,7 +188,11 @@ func StartFrpc() error {
|
||||
return fmt.Errorf("获取 frpc 路径失败: %w", err)
|
||||
}
|
||||
|
||||
if _, err := os.Stat("./frpc.toml"); os.IsNotExist(err) {
|
||||
if err := os.MkdirAll("./data", 0755); err != nil {
|
||||
return fmt.Errorf("创建 data 目录失败: %w", err)
|
||||
}
|
||||
|
||||
if _, err := os.Stat("./data/frpc.toml"); os.IsNotExist(err) {
|
||||
if err := GenerateFrpcConfig(); err != nil {
|
||||
return fmt.Errorf("生成配置文件失败: %w", err)
|
||||
}
|
||||
@@ -210,13 +202,13 @@ func StartFrpc() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
os.Remove("./frpc.pid")
|
||||
os.Remove("./data/frpc.pid")
|
||||
|
||||
cmd := exec.Command(frpcPath, "-c", "./frpc.toml")
|
||||
cmd := exec.Command(frpcPath, "-c", "./data/frpc.toml")
|
||||
setWindowHide(cmd)
|
||||
setSysProcAttr(cmd)
|
||||
|
||||
logFile, err := os.OpenFile("./frpc.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
|
||||
logFile, err := os.OpenFile("./data/frpc.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
|
||||
if err != nil {
|
||||
return fmt.Errorf("打开日志文件失败: %w", err)
|
||||
}
|
||||
@@ -227,7 +219,7 @@ func StartFrpc() error {
|
||||
return fmt.Errorf("启动 frpc 失败: %w", err)
|
||||
}
|
||||
|
||||
if err := os.WriteFile("./frpc.pid", []byte(fmt.Sprintf("%d", cmd.Process.Pid)), 0644); err != nil {
|
||||
if err := os.WriteFile("./data/frpc.pid", []byte(fmt.Sprintf("%d", cmd.Process.Pid)), 0644); err != nil {
|
||||
return fmt.Errorf("保存 PID 失败: %w", err)
|
||||
}
|
||||
|
||||
@@ -240,11 +232,11 @@ func StopFrpc() error {
|
||||
if err := cmd.Run(); err != nil && !strings.Contains(err.Error(), "not found") {
|
||||
return fmt.Errorf("停止 frpc 失败: %w", err)
|
||||
}
|
||||
os.Remove("./frpc.pid")
|
||||
os.Remove("./data/frpc.pid")
|
||||
return nil
|
||||
}
|
||||
|
||||
pidData, err := os.ReadFile("./frpc.pid")
|
||||
pidData, err := os.ReadFile("./data/frpc.pid")
|
||||
if err != nil {
|
||||
cmd := exec.Command("pkill", "-f", "frpc")
|
||||
if err := cmd.Run(); err != nil && !strings.Contains(err.Error(), "no process") {
|
||||
@@ -256,7 +248,7 @@ func StopFrpc() error {
|
||||
pid, _ := strconv.Atoi(strings.TrimSpace(string(pidData)))
|
||||
process, err := os.FindProcess(pid)
|
||||
if err != nil {
|
||||
os.Remove("./frpc.pid")
|
||||
os.Remove("./data/frpc.pid")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -264,7 +256,7 @@ func StopFrpc() error {
|
||||
return fmt.Errorf("杀死进程失败: %w", err)
|
||||
}
|
||||
|
||||
os.Remove("./frpc.pid")
|
||||
os.Remove("./data/frpc.pid")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -283,7 +275,7 @@ func ReloadFrpc() error {
|
||||
return fmt.Errorf("获取 frpc 路径失败: %w", err)
|
||||
}
|
||||
|
||||
cmd := exec.Command(frpcPath, "reload", "-c", "./frpc.toml")
|
||||
cmd := exec.Command(frpcPath, "reload", "-c", "./data/frpc.toml")
|
||||
_, err = cmd.CombinedOutput()
|
||||
if err != nil {
|
||||
log.Printf("⚠️ 热加载失败 (%v),自动降级为重启 frpc", err)
|
||||
@@ -297,3 +289,77 @@ func ReloadFrpc() error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// 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
|
||||
}
|
||||
|
||||
+5
-3
@@ -1,13 +1,15 @@
|
||||
## 🐳 Docker 版安装指南
|
||||
|
||||
> 推荐方式:一键脚本自动部署,无需手动编译,无需安装 Go 环境。
|
||||
> 推荐方式:一键脚本自动部署,无需手动编译,无需安装 Go 环境。</br>
|
||||
|
||||
> ⚠️ **注意**:Docker 版直接从源码构建,使用的是当前 `main` 分支的最新代码,更新进度会远快于 Release 版本。⚠️</br>
|
||||
> 如需使用特定版本(如 LTS),请查看 [Releases](https://git.whitetop.xyz/lxh2875931338/frpc-console/releases) 确认版本号,并通过二进制方式部署指定版本。
|
||||
|
||||
### 一、📥 前置条件
|
||||
|
||||
- 已安装 Docker(必须)
|
||||
- 已安装 curl / wget(脚本会自动检查并安装)
|
||||
- 操作系统:Linux(x86_64 / ARM64 均可,ARMv7 将在不久的未来得到支持)
|
||||
- 操作系统:Linux(x86_64 / ARM64 / ARMv7 均可)
|
||||
|
||||
|
||||
### 二、🚀 一键部署(推荐)
|
||||
@@ -130,7 +132,7 @@ docker run -d \
|
||||
--name frpc-console \
|
||||
--restart=always \
|
||||
--network host \
|
||||
-v /opt/frpc-console/data:/app/data \
|
||||
-v /opt/frpc-console/data:/app\
|
||||
-e PORT=9300 \
|
||||
-e TZ=Asia/Shanghai \
|
||||
frpc-console:latest
|
||||
|
||||
@@ -2,15 +2,29 @@ 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)
|
||||
}
|
||||
|
||||
// 启动时生成配置并启动 frpc
|
||||
if err := GenerateFrpcConfig(); err != nil {
|
||||
log.Println("⚠️ 生成配置文件失败:", err)
|
||||
}
|
||||
@@ -19,7 +33,6 @@ func main() {
|
||||
log.Println("⚠️ 启动 frpc 失败:", err)
|
||||
}
|
||||
|
||||
// ✅ 启动 Watchdog:每 30 秒检查一次 frpc 状态,挂了自动重启
|
||||
go startWatchdog()
|
||||
|
||||
r := SetupRouter()
|
||||
@@ -32,7 +45,6 @@ func main() {
|
||||
}
|
||||
}
|
||||
|
||||
// Watchdog 协程:定期检查 frpc 是否存活
|
||||
func startWatchdog() {
|
||||
ticker := time.NewTicker(30 * time.Second)
|
||||
defer ticker.Stop()
|
||||
|
||||
@@ -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 版本?
|
||||
|
||||
@@ -251,45 +258,13 @@ frpc-console 遵循 **“够用就好”** 的原则:
|
||||
|
||||
## 📝 更新日志
|
||||
|
||||
### 2.0-Release(LTS,跟随上游提供支持,frps 端现已正式发布,frpc 端测试中,敬请期待……)
|
||||
|
||||
> 本次 LTS 版本聚焦于**稳定性兜底与协议能力对齐**,是 frp 0.70.0 LTS 的下游管理工具。
|
||||
|
||||
· 🚀 **frp v2 协议正式启用** —— `wireProtocol = "v2"` 配置项可用,灰标状态解除,实测稳定</br>
|
||||
· 🔒 **数据库迁移引擎完整实现** —— 版本驱动的增量迁移 + 迁移前自动全量备份 + 失败可回滚,升级不再提心吊胆</br>
|
||||
· 🧩 **配套工具 frps-console 同步发布** —— 同一套设计哲学,一个管理 frpc,一个管理 frps,版本号同步,LTS 同步
|
||||
|
||||
|
||||
### 1.5-Release (2026-07-25)(non-LTS)
|
||||
|
||||
> 本次更新聚焦于**WebUI 交互体验与基础工程能力**,为 2.0 LTS 铺路。
|
||||
|
||||
· ✨ **全局配置页面卡片式重构** —— 按“服务器连接 / 传输配置 / 日志配置”分组,告别折叠面板</br>
|
||||
· ✨ **新增运行日志面板** —— WebUI 内实时查看 frpc 日志,8 秒自动轮询,最大 200 行,调试方便不少</br>
|
||||
· ✨ **frp v2 配置占位** —— UI 开关已就绪(灰标禁用),为 2.0 的正式启用做好铺垫</br>
|
||||
· 🔩 **数据库 Schema 迁移框架** —— 启动时自动检测并补全缺失列,升级不再依赖手动改表(2.0 在此基础上升级为完整备份 + 回滚)</br>
|
||||
· 🔐 **默认配置脱敏** —— 移除个人服务端地址与令牌,改为通用占位符,避免开箱即连别人的服务器</br>
|
||||
· 🎨 **样式拆分与优化** —— 按职责拆分为多个 CSS 文件,维护更清晰
|
||||
|
||||
|
||||
### 1.0-Release (2026-07-24)(non-LTS)
|
||||
|
||||
> 首次发布,核心功能全部就绪。
|
||||
|
||||
· 🎉 **首次发布**</br>
|
||||
· 📋 **隧道全生命周期管理** —— 增删改查 + 一键启用/禁用</br>
|
||||
· 📦 **TOML 导入/导出** —— 无缝迁移现有 frpc 配置</br>
|
||||
· 🔄 **配置热加载** —— 修改即生效,无需重启 frpc</br>
|
||||
· 🔐 **首次启动 Web 注册** —— 无需命令行交互</br>
|
||||
· 🖥️ **多平台支持** —— Windows / Linux / ARM 全平台兼容</br>
|
||||
· 🐳 **容器化就绪** —— Docker 镜像,开箱即用</br>
|
||||
· 🎨 **深色磨砂玻璃 UI** —— 现代化视觉体验</br>
|
||||
#### 相关更新日志请查看[update-logs.md](./update-logs.md)
|
||||
|
||||
---
|
||||
|
||||
## 📄 许可证
|
||||
|
||||
MIT License © 2026 Gitea:lxh2875931338/Github:XHLiang0
|
||||
MIT License © 2026 lxh2875931338(XHLiang0)
|
||||
|
||||
---
|
||||
|
||||
|
||||
+115
@@ -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/tty
|
||||
CHANNEL_INPUT=${CHANNEL_INPUT:-1}
|
||||
case $CHANNEL_INPUT in
|
||||
1|"") CHANNEL="lts"; BRANCH="main" ;;
|
||||
2) CHANNEL="preview"; BRANCH="test" ;;
|
||||
*) print_error "无效选择"; exit 1 ;;
|
||||
esac
|
||||
print_info "已选择: ${CHANNEL} 通道 (${BRANCH} 分支)"
|
||||
}
|
||||
|
||||
fetch_and_run() {
|
||||
local deploy_url="https://git.whitetop.xyz/lxh2875931338/frpc-console/raw/${BRANCH}/deploy.sh"
|
||||
echo ""
|
||||
echo -e "${CYAN}▶ 从 ${BRANCH} 分支拉取 deploy.sh...${NC}"
|
||||
rm -rf "$WORK_DIR"
|
||||
mkdir -p "$WORK_DIR"
|
||||
cd "$WORK_DIR"
|
||||
if ! curl -sSL -o deploy.sh "$deploy_url"; then
|
||||
print_error "无法下载 deploy.sh: $deploy_url"
|
||||
exit 1
|
||||
fi
|
||||
chmod +x deploy.sh
|
||||
echo -e "${GREEN}[✓] deploy.sh 已拉取${NC}"
|
||||
echo ""
|
||||
echo -e "${CYAN}▶ 执行部署脚本...${NC}"
|
||||
echo ""
|
||||
export DEPLOY_CHANNEL="$CHANNEL"
|
||||
export DEPLOY_BRANCH="$BRANCH"
|
||||
exec ./deploy.sh "$@"
|
||||
}
|
||||
|
||||
main() {
|
||||
clear 2>/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 "$@"
|
||||
+103
-10
@@ -9,6 +9,7 @@ import (
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
type Platform struct {
|
||||
@@ -22,15 +23,87 @@ var platforms = []Platform{
|
||||
{"windows", "amd64", "Windows x86-64", ".exe"},
|
||||
{"linux", "amd64", "Linux x86-64", ""},
|
||||
{"linux", "arm64", "Linux ARM64", ""},
|
||||
{"linux", "arm", "Linux ARMv7l", ""}, // GOARCH=arm, GOARM=7
|
||||
{"linux", "arm", "Linux ARMv7l", ""},
|
||||
}
|
||||
|
||||
const (
|
||||
Version = "2.0.0"
|
||||
BuildTime = "2026-07-26"
|
||||
BuildTime = "2026-07-29"
|
||||
Binary = "frpc-console"
|
||||
)
|
||||
|
||||
// ============================================================
|
||||
// 版本管理核心
|
||||
// ============================================================
|
||||
|
||||
func readVersion() (semver string, ltsDate string) {
|
||||
data, err := os.ReadFile("./version.ini")
|
||||
if err != nil {
|
||||
return "0.0.0", ""
|
||||
}
|
||||
lines := strings.Split(string(data), "\n")
|
||||
var content string
|
||||
for _, line := range lines {
|
||||
line = strings.TrimSpace(line)
|
||||
if line == "" || strings.HasPrefix(line, ";") || strings.HasPrefix(line, "#") {
|
||||
continue
|
||||
}
|
||||
content = line
|
||||
break
|
||||
}
|
||||
parts := strings.Fields(content)
|
||||
if len(parts) < 1 {
|
||||
return "0.0.0", ""
|
||||
}
|
||||
semver = parts[0]
|
||||
if len(parts) > 1 {
|
||||
ltsDate = parts[1]
|
||||
}
|
||||
return semver, ltsDate
|
||||
}
|
||||
|
||||
func getVersionType(semver string) string {
|
||||
parts := strings.Split(semver, ".")
|
||||
if len(parts) < 2 {
|
||||
return "preview"
|
||||
}
|
||||
minor := parts[1]
|
||||
if minor == "0" || minor == "5" {
|
||||
return "lts"
|
||||
}
|
||||
return "preview"
|
||||
}
|
||||
|
||||
func getFullVersion() string {
|
||||
semver, ltsDate := readVersion()
|
||||
vType := getVersionType(semver)
|
||||
|
||||
switch vType {
|
||||
case "lts":
|
||||
if ltsDate == "" {
|
||||
ltsDate = time.Now().Format("20060102")
|
||||
}
|
||||
return semver + "-lts-" + ltsDate
|
||||
default:
|
||||
timestamp := time.Now().Format("20060102-150405")
|
||||
return semver + "-preview-" + timestamp
|
||||
}
|
||||
}
|
||||
|
||||
func getImageTag() string {
|
||||
semver, ltsDate := readVersion()
|
||||
vType := getVersionType(semver)
|
||||
|
||||
switch vType {
|
||||
case "lts":
|
||||
if ltsDate == "" {
|
||||
ltsDate = time.Now().Format("20060102")
|
||||
}
|
||||
return semver + "-lts-" + ltsDate
|
||||
default:
|
||||
return "preview-" + time.Now().Format("20060102-150405")
|
||||
}
|
||||
}
|
||||
|
||||
func main() {
|
||||
if len(os.Args) > 1 {
|
||||
target := os.Args[1]
|
||||
@@ -44,6 +117,12 @@ func main() {
|
||||
case "list":
|
||||
listPlatforms()
|
||||
return
|
||||
case "version":
|
||||
fmt.Println(getFullVersion())
|
||||
return
|
||||
case "image-tag":
|
||||
fmt.Println(getImageTag())
|
||||
return
|
||||
}
|
||||
for _, p := range platforms {
|
||||
if target == p.OS+"/"+p.Arch {
|
||||
@@ -52,8 +131,8 @@ func main() {
|
||||
}
|
||||
}
|
||||
fmt.Println("❌ 不支持的平台:", target)
|
||||
fmt.Println(" 可用: windows/amd64, linux/amd64, linux/arm64, linux/armv7")
|
||||
fmt.Println(" 或: all, list, clean")
|
||||
fmt.Println(" 可用: windows/amd64, linux/amd64, linux/arm64, linux/arm")
|
||||
fmt.Println(" 或: all, list, clean, version, image-tag")
|
||||
return
|
||||
}
|
||||
interactiveMenu()
|
||||
@@ -68,15 +147,19 @@ func listPlatforms() {
|
||||
|
||||
func interactiveMenu() {
|
||||
fmt.Println("========================================")
|
||||
fmt.Println(" frpc-console 多平台构建工具 v" + Version)
|
||||
fmt.Println(" frpc-console 多平台构建工具")
|
||||
fmt.Println("========================================")
|
||||
fmt.Println()
|
||||
fmt.Println(" 当前版本:", getFullVersion())
|
||||
fmt.Println(" 镜像标签:", getImageTag())
|
||||
fmt.Println()
|
||||
|
||||
for i, p := range platforms {
|
||||
fmt.Printf(" %d. %s (%s/%s)\n", i+1, p.Name, p.OS, p.Arch)
|
||||
}
|
||||
fmt.Println(" a. 全部构建")
|
||||
fmt.Println(" c. 清理构建产物")
|
||||
fmt.Println(" v. 显示版本信息")
|
||||
fmt.Println(" q. 退出")
|
||||
fmt.Println()
|
||||
|
||||
@@ -96,6 +179,10 @@ func interactiveMenu() {
|
||||
case "a":
|
||||
buildAll()
|
||||
return
|
||||
case "v":
|
||||
fmt.Println("版本:", getFullVersion())
|
||||
fmt.Println("镜像标签:", getImageTag())
|
||||
return
|
||||
default:
|
||||
var idx int
|
||||
if n, err := fmt.Sscanf(input, "%d", &idx); n == 1 && err == nil && idx >= 1 && idx <= len(platforms) {
|
||||
@@ -125,16 +212,22 @@ func build(p Platform, silent bool) {
|
||||
return
|
||||
}
|
||||
|
||||
// 构建输出文件名
|
||||
fullVersion := getFullVersion()
|
||||
imageTag := getImageTag()
|
||||
|
||||
outName := Binary + "-" + p.OS + "-" + p.Arch
|
||||
if p.Arch == "arm" {
|
||||
outName += "v7" // 标注 ARMv7 版本
|
||||
outName += "v7"
|
||||
}
|
||||
outName += p.Ext
|
||||
outPath := filepath.Join(outDir, outName)
|
||||
|
||||
cmd := exec.Command("go", "build",
|
||||
"-ldflags=-s -w -X main.version="+Version,
|
||||
"-ldflags="+
|
||||
"-s -w "+
|
||||
"-X main.buildVersion="+fullVersion+" "+
|
||||
"-X main.buildImageTag="+imageTag+" "+
|
||||
"-X main.buildTime="+BuildTime,
|
||||
"-o", outPath,
|
||||
".",
|
||||
)
|
||||
@@ -144,7 +237,6 @@ func build(p Platform, silent bool) {
|
||||
"CGO_ENABLED=0",
|
||||
)
|
||||
|
||||
// ARM 架构指定 GOARM=7
|
||||
if p.Arch == "arm" {
|
||||
cmd.Env = append(cmd.Env, "GOARM=7")
|
||||
}
|
||||
@@ -159,6 +251,7 @@ func build(p Platform, silent bool) {
|
||||
|
||||
if !silent {
|
||||
fmt.Printf("✅ 构建完成: %s\n", outPath)
|
||||
fmt.Printf(" 版本: %s\n", fullVersion)
|
||||
if info, err := os.Stat(outPath); err == nil {
|
||||
size := float64(info.Size()) / 1024 / 1024
|
||||
fmt.Printf(" 📦 %.2f MB\n", size)
|
||||
|
||||
+106
-5
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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() === "";
|
||||
});
|
||||
@@ -694,7 +793,6 @@ const app = createApp({
|
||||
|
||||
showDefaultTip,
|
||||
|
||||
// 日志相关
|
||||
logLines,
|
||||
logTotal,
|
||||
logError,
|
||||
@@ -703,8 +801,11 @@ const app = createApp({
|
||||
refreshLogs,
|
||||
scrollLogToBottom,
|
||||
|
||||
// Token 显示切换
|
||||
showToken,
|
||||
|
||||
pingLatency,
|
||||
pingStatusClass,
|
||||
pingIcon,
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
+79
-76
@@ -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>
|
||||
|
||||
@@ -735,3 +735,69 @@ select:disabled {
|
||||
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;
|
||||
}
|
||||
}
|
||||
+118
@@ -0,0 +1,118 @@
|
||||
## 📌 版本说明
|
||||
|
||||
| 版本类型 | 标记 | 适用场景 |
|
||||
|----------|------|----------|
|
||||
| LTS 正式版 | `-lts` | 生产环境,长期维护 |
|
||||
| 技术预览版 | `-preview` | 功能前瞻,建议测试环境验证 |
|
||||
|
||||
|
||||
## 🚀 2.4-lts (2026-07-30)
|
||||
|
||||
> **紧急修复版 —— 架构升级与部署流程重构**
|
||||
>
|
||||
> 本次版本为 **非正统 LTS 版本**(2.4 在语义版本中不属于 LTS 序列),因 `main` 分支在新架构迁移过程中出现编译阻塞,为快速恢复 LTS 通道可用性而发布。**2.5-lts 将回归正常语义版本规则。**
|
||||
|
||||
### 🔧 核心变更
|
||||
|
||||
- **部署架构重构** —— 引入 `run-deploy.sh` 独立入口,实现部署脚本与项目分支解耦
|
||||
- **数据目录规范化** —— 所有运行时文件(数据库、配置、日志、PID)统一迁移至 `/app/data` 子目录,挂载点从 `/app` 收窄至 `/app/data`,彻底解决挂载覆盖二进制文件的问题
|
||||
- **版本管理解耦** —— 二进制不再注入版本信息,版本由 `deploy.sh` 在部署时写入 `version.ini` 文件
|
||||
- **PID 文件进程检测** —— frpc 状态检测从 `ps | grep` 改为基于 PID 文件,更加可靠
|
||||
- **旧版本自动迁移** —— 检测到根目录存在旧数据文件时,自动迁移至 `data/` 子目录,并保留备份
|
||||
|
||||
### ✨ 功能完整
|
||||
|
||||
- Ping 延迟检测(顶部导航实时显示)
|
||||
- 用户配置页独立(账户管理与全局配置分离)
|
||||
- 401 统一拦截(认证过期自动跳转登录)
|
||||
- 声明式数据库迁移引擎(基于 `db-history.go`)
|
||||
- frp v2 协议正式启用(`wireProtocol = "v2"`)
|
||||
|
||||
### 📦 部署变更
|
||||
|
||||
| 变更项 | 旧方案 | 新方案 |
|
||||
|--------|--------|--------|
|
||||
| 挂载点 | `-v ${DEPLOY_DIR}:/app` | `-v ${DEPLOY_DIR}/data:/app/data` |
|
||||
| 数据库路径 | `/app/frpc-console.db` | `/app/data/frpc-console.db` |
|
||||
| 配置文件 | `/app/frpc.toml` | `/app/data/frpc.toml` |
|
||||
| 版本文件 | 编译时注入 `-ldflags` | 部署时写入 `version.ini` |
|
||||
|
||||
### 🐛 修复
|
||||
|
||||
- 修复 `main` 分支因挂载覆盖导致二进制文件不可用的问题
|
||||
- 修复 `ps | grep` 进程检测在容器环境不可靠的问题
|
||||
- 修复旧版本升级时数据库路径不兼容的问题
|
||||
|
||||
---
|
||||
|
||||
## 🚀 2.3-preview (2026-07-28)
|
||||
|
||||
> **技术预览版** —— 在 LTS 稳定核心(2.0)基础上,集成 2.1 与 2.2 的新特性,并完成基础设施层的全面加固。
|
||||
|
||||
### ✨ 新增特性
|
||||
|
||||
- **Ping 延迟检测** —— 顶部导航实时显示 frpc 到 frps 的延迟,状态图标 + ms 值,直观反映网络质量(2.1)
|
||||
- **用户配置页独立** —— 账户管理与全局配置分离,用户信息与 frpc 配置各自独立管理(2.1)
|
||||
- **声明式数据库迁移引擎** —— 基于 `db-history.go` 的 Schema 版本声明,对比新旧差异自动决定迁移路径(2.2)
|
||||
|
||||
### 🔧 改进与优化
|
||||
|
||||
- **401 统一拦截** —— API 请求返回 401 时自动清除认证状态并跳转登录页,避免页面卡死(2.1)
|
||||
- **数据库路径统一** —— 数据库文件固定为 `./frpc-console.db`,Docker 部署时挂载整个 `/app` 目录,所有运行时文件(db / toml / log / pid)完整持久化
|
||||
- **`deploy.sh` 部署逻辑重构** —— 备份 → 拉代码 → 停容器 → 构建 → 启动,顺序闭环;移除宿主机编译,全部交由 Docker 多阶段构建处理
|
||||
- **Dockerfile 多阶段构建** —— 自动处理 `go.mod` 降级兼容,安装 `sqlite` 辅助工具,便于部署脚本验证数据库状态
|
||||
- **前端加载状态管理** —— 新增 `authLoading` 状态,首次访问时先完成用户检查再渲染页面,彻底解决刷新后登录/注册页状态错乱的竞态问题
|
||||
- **`schema_version` 兜底写入** —— `InitDB()` 末尾强制补写 Schema 版本,确保每次启动都能识别已有数据,彻底解决升级后反复跳转注册页的问题
|
||||
- **`docker-compose.yml` 配套工具** —— 简化开发调试流程,支持快速重建容器
|
||||
|
||||
### 🐛 修复
|
||||
|
||||
- 修复 `ExportTomlHandler` 模板渲染时缺少 `WireProtocolLine` 字段的问题
|
||||
- 修复 `deploy.sh` 升级时用空文件覆盖旧数据库的问题
|
||||
- 修复 Docker 镜像中 `sqlite3` 包名错误导致 `deploy.sh` 无法验证数据库的问题
|
||||
- 修复首次访问刷新时登录/注册页显示异常的前端竞态问题
|
||||
|
||||
### 📦 部署变更
|
||||
|
||||
- 挂载方式:`-v ${DEPLOY_DIR}:/app`(整个 `/app` 目录)
|
||||
- 数据库位置:`/opt/frpc-console/frpc-console.db`
|
||||
- 备份目录:`/tmp/frpc-console/db-backups`
|
||||
- 容器内工具:`sqlite` 已预装,便于调试
|
||||
|
||||
---
|
||||
|
||||
## ✅ 2.0-lts (2026-07-27)
|
||||
|
||||
> **首个 LTS 正式版** —— 与 frps-console 2.0-lts 同步发布,共享版本号与 LTS 维护周期。
|
||||
|
||||
- 🚀 **frp v2 协议正式启用** —— `wireProtocol = "v2"` 配置项可用,实测稳定
|
||||
- 🔒 **数据库迁移引擎完整实现** —— 版本驱动的增量迁移 + 迁移前自动全量备份 + 失败可回滚
|
||||
- 🧩 **frps-console 同步发布** —— 同一套设计哲学,一个管理 frpc,一个管理 frps
|
||||
|
||||
---
|
||||
|
||||
## 🧪 1.5-release (2026-07-25) (non-LTS)
|
||||
|
||||
> 非长期支持版本,建议用于尝鲜测试,生产环境请使用 2.0-lts 及后续 LTS 版本。
|
||||
|
||||
- ✨ 全局配置页面卡片式重构(服务器连接 / 传输配置 / 日志配置)
|
||||
- ✨ 新增运行日志面板(8 秒轮询,最大 200 行)
|
||||
- ✨ frp v2 配置占位(UI 灰标禁用,为 2.0 铺路)
|
||||
- 🔩 数据库 Schema 迁移框架(启动时自动补全缺失列)
|
||||
- 🔐 默认配置脱敏(通用占位符,避免开箱即连他人服务器)
|
||||
- 🎨 样式拆分与优化(style-3.css / style-4.css)
|
||||
|
||||
---
|
||||
|
||||
## 🎉 1.0-release (2026-07-24) (non-LTS)
|
||||
|
||||
> 首次公开发布,核心功能全部就绪。
|
||||
|
||||
- 🎉 首次发布
|
||||
- 📋 隧道全生命周期管理(增删改查 + 启用/禁用)
|
||||
- 📦 TOML 导入/导出(无缝迁移现有 frpc 配置)
|
||||
- 🔄 配置热加载(修改即生效,无需重启 frpc)
|
||||
- 🔐 首次启动 Web 注册(无需命令行交互)
|
||||
- 🖥️ 多平台支持(Windows / Linux / ARM 全平台)
|
||||
- 🐳 容器化就绪(Docker 镜像,开箱即用)
|
||||
- 🎨 深色磨砂玻璃 UI
|
||||
@@ -0,0 +1,6 @@
|
||||
; frpc-console 版本声明文件
|
||||
; 格式: {语义版本号} [{LTS发布日期}]
|
||||
; 示例:
|
||||
; 2.4 # Preview 版本,无日期
|
||||
; 2.5 20260729 # LTS 版本,带发布日期
|
||||
2.4
|
||||
Reference in New Issue
Block a user