Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1cf6f4f47 | ||
|
|
a5c33580e2 | ||
|
|
f2af48f8d0 | ||
|
|
2663e71b4f | ||
|
|
bf24d3cb00 | ||
|
|
00f2b9fd14 | ||
|
|
76ac9503c6 | ||
|
|
04851d244f | ||
|
|
a2f4326882 | ||
|
|
4cd438ed3e | ||
|
|
1bfa2383c1 | ||
|
|
b13f2d5047 | ||
|
|
7a2737bc83 | ||
|
|
1fd845a981 | ||
|
|
f9a97a0af5 | ||
|
|
ab73a38f06 | ||
|
|
21c9c9556b | ||
|
|
509de72d10 | ||
|
|
74a054d90c |
+1
-1
@@ -24,7 +24,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build \
|
|||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
|
|
||||||
# 安装 ca-certificates 和 tzdata(确保 HTTPS 和时区正常)
|
# 安装 ca-certificates 和 tzdata(确保 HTTPS 和时区正常)
|
||||||
RUN apk --no-cache add ca-certificates tzdata
|
RUN apk add --no-cache ca-certificates sqlite tzdata
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
|||||||
@@ -63,17 +63,10 @@ type User struct {
|
|||||||
|
|
||||||
// ============================================================
|
// ============================================================
|
||||||
// 数据库初始化
|
// 数据库初始化
|
||||||
// ============================================================
|
|
||||||
|
|
||||||
func InitDB() error {
|
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
|
var err error
|
||||||
DB, err = sql.Open("sqlite", dbPath)
|
DB, err = sql.Open("sqlite", "./frpc-console.db")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -216,13 +209,13 @@ func setSchemaVersion(version string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func backupDatabase() (string, error) {
|
func backupDatabase() (string, error) {
|
||||||
src := "./data/frpc-console.db"
|
src := "./frpc-console.db"
|
||||||
if _, err := os.Stat(src); os.IsNotExist(err) {
|
if _, err := os.Stat(src); os.IsNotExist(err) {
|
||||||
return "", nil
|
return "", nil
|
||||||
}
|
}
|
||||||
|
|
||||||
timestamp := time.Now().Format("20060102_150405")
|
timestamp := time.Now().Format("20060102_150405")
|
||||||
dst := fmt.Sprintf("./data/frpc-console.db.pre-%s.%s", SchemaVersion, timestamp)
|
dst := fmt.Sprintf("./frpc-console.db.pre-%s.%s", SchemaVersion, timestamp)
|
||||||
|
|
||||||
srcFile, err := os.Open(src)
|
srcFile, err := os.Open(src)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -251,7 +244,7 @@ func restoreDatabase(backupPath string) error {
|
|||||||
}
|
}
|
||||||
defer srcFile.Close()
|
defer srcFile.Close()
|
||||||
|
|
||||||
dstFile, err := os.Create("./data/frpc-console.db")
|
dstFile, err := os.Create("./frpc-console.db")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# ============================================================
|
# ============================================================
|
||||||
# frpc-console 一键部署脚本 (Docker 优先)
|
# frpc-console 一键部署脚本(Docker 优先)
|
||||||
# 支持:Linux x86_64 / ARM64 / ARMv7
|
# 支持:Linux x86_64 / ARM64 / ARMv7
|
||||||
# 自动安装:git / curl / wget / Docker
|
# 自动安装:git / curl / wget / Docker
|
||||||
#
|
#
|
||||||
# 用法:
|
# 用法:
|
||||||
# ./deploy.sh # 交互式选择通道
|
# ./deploy.sh # 完整交互流程
|
||||||
# ./deploy.sh --channel lts # 指定 LTS 通道
|
# ./deploy.sh --yes # 跳过确认,直接执行
|
||||||
# ./deploy.sh --channel preview # 指定 Preview 通道
|
# ./deploy.sh --check # 只检测环境,不执行
|
||||||
# ./deploy.sh --yes # 跳过确认
|
# ./deploy.sh --dry-run # 显示将执行的操作,不实际执行
|
||||||
# ./deploy.sh --check # 只检测环境
|
|
||||||
# ============================================================
|
# ============================================================
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
@@ -61,10 +60,6 @@ CONTAINER_RUNNING=false
|
|||||||
SKIP_CONFIRM=false
|
SKIP_CONFIRM=false
|
||||||
CHECK_ONLY=false
|
CHECK_ONLY=false
|
||||||
DRY_RUN=false
|
DRY_RUN=false
|
||||||
CHANNEL=""
|
|
||||||
CURRENT_VERSION=""
|
|
||||||
TARGET_VERSION=""
|
|
||||||
IMAGE_TAG=""
|
|
||||||
|
|
||||||
# ---------- 打印函数 ----------
|
# ---------- 打印函数 ----------
|
||||||
print_info() { echo -e "${BLUE}[INFO]${NC} $1"; }
|
print_info() { echo -e "${BLUE}[INFO]${NC} $1"; }
|
||||||
@@ -79,37 +74,22 @@ print_subtitle() { echo -e "${MAGENTA} $1${NC}"; }
|
|||||||
parse_args() {
|
parse_args() {
|
||||||
for arg in "$@"; do
|
for arg in "$@"; do
|
||||||
case $arg in
|
case $arg in
|
||||||
--yes|-y)
|
--yes|-y) SKIP_CONFIRM=true ;;
|
||||||
SKIP_CONFIRM=true
|
--check) CHECK_ONLY=true ;;
|
||||||
;;
|
--dry-run) DRY_RUN=true ;;
|
||||||
--check)
|
|
||||||
CHECK_ONLY=true
|
|
||||||
;;
|
|
||||||
--dry-run)
|
|
||||||
DRY_RUN=true
|
|
||||||
;;
|
|
||||||
--channel)
|
|
||||||
shift
|
|
||||||
CHANNEL="$1"
|
|
||||||
;;
|
|
||||||
--channel=*)
|
|
||||||
CHANNEL="${arg#*=}"
|
|
||||||
;;
|
|
||||||
--help|-h)
|
--help|-h)
|
||||||
echo "用法: ./deploy.sh [选项]"
|
echo "用法: ./deploy.sh [选项]"
|
||||||
echo ""
|
echo ""
|
||||||
echo "选项:"
|
echo "选项:"
|
||||||
echo " --channel lts 使用 LTS 通道"
|
echo " --yes, -y 跳过所有确认提示,直接执行"
|
||||||
echo " --channel preview 使用 Preview 通道"
|
|
||||||
echo " --yes, -y 跳过所有确认提示"
|
|
||||||
echo " --check 只检测环境,不执行部署"
|
echo " --check 只检测环境,不执行部署"
|
||||||
echo " --dry-run 显示将执行的操作,不实际执行"
|
echo " --dry-run 显示将执行的操作,不实际执行"
|
||||||
echo " --help, -h 显示帮助信息"
|
echo " --help, -h 显示帮助信息"
|
||||||
echo ""
|
echo ""
|
||||||
echo "示例:"
|
echo "示例:"
|
||||||
echo " ./deploy.sh # 交互式选择通道"
|
echo " ./deploy.sh # 完整交互流程"
|
||||||
echo " ./deploy.sh --channel lts # 部署 LTS 版本"
|
|
||||||
echo " ./deploy.sh --yes # 无人值守部署"
|
echo " ./deploy.sh --yes # 无人值守部署"
|
||||||
|
echo " ./deploy.sh --check # 只检测环境"
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
@@ -174,162 +154,14 @@ check_container() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# ---------- 版本管理函数 ----------
|
|
||||||
|
|
||||||
# read_version_file 读取仓库的 VERSION.ini 文件
|
|
||||||
read_version_file() {
|
|
||||||
local version_file="./VERSION.ini"
|
|
||||||
if [ ! -f "$version_file" ]; then
|
|
||||||
print_error "VERSION.ini 文件不存在: $version_file"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
# 去掉注释行(以 ; 或 # 开头),读取第一列为语义版本
|
|
||||||
SEMVER=$(grep -v "^[;#]" "$version_file" | head -1 | awk '{print $1}')
|
|
||||||
LTS_DATE=$(grep -v "^[;#]" "$version_file" | head -1 | awk '{print $2}')
|
|
||||||
echo "$SEMVER $LTS_DATE"
|
|
||||||
}
|
|
||||||
|
|
||||||
# get_version_type 判断版本类型
|
|
||||||
get_version_type() {
|
|
||||||
local semver="$1"
|
|
||||||
local minor="${semver#*.}"
|
|
||||||
if [ "$minor" = "0" ] || [ "$minor" = "5" ]; then
|
|
||||||
echo "lts"
|
|
||||||
else
|
|
||||||
echo "preview"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# generate_target_version 生成目标版本字符串
|
|
||||||
generate_target_version() {
|
|
||||||
local channel="$1"
|
|
||||||
local semver_lts_date
|
|
||||||
semver_lts_date=$(read_version_file)
|
|
||||||
SEMVER=$(echo "$semver_lts_date" | awk '{print $1}')
|
|
||||||
LTS_DATE=$(echo "$semver_lts_date" | awk '{print $2}')
|
|
||||||
|
|
||||||
if [ -z "$SEMVER" ]; then
|
|
||||||
print_error "无法从 VERSION.ini 读取语义版本"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
local vtype
|
|
||||||
vtype=$(get_version_type "$SEMVER")
|
|
||||||
|
|
||||||
if [ "$channel" = "lts" ] || [ "$vtype" = "lts" ]; then
|
|
||||||
# LTS 版本必须有日期
|
|
||||||
if [ -z "$LTS_DATE" ]; then
|
|
||||||
LTS_DATE=$(date +%Y%m%d)
|
|
||||||
print_warn "LTS 版本未指定日期,使用今天: $LTS_DATE"
|
|
||||||
fi
|
|
||||||
TARGET_VERSION="${SEMVER}-lts-${LTS_DATE}"
|
|
||||||
IMAGE_TAG="${SEMVER}-lts-${LTS_DATE}"
|
|
||||||
else
|
|
||||||
# Preview 版本使用编译时间戳
|
|
||||||
TIMESTAMP=$(date +%Y%m%d-%H%M%S)
|
|
||||||
TARGET_VERSION="${SEMVER}-preview-${TIMESTAMP}"
|
|
||||||
IMAGE_TAG="preview-${TIMESTAMP}"
|
|
||||||
fi
|
|
||||||
echo "$TARGET_VERSION $IMAGE_TAG"
|
|
||||||
}
|
|
||||||
|
|
||||||
# get_current_version 获取当前运行的版本
|
|
||||||
get_current_version() {
|
|
||||||
local version_file="${DEPLOY_DIR}/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/VERSION.ini 2>/dev/null | grep -v "^[;#]" | head -1 | tr -d '\n' || echo "0.0.0-dev"
|
|
||||||
else
|
|
||||||
echo "0.0.0-dev"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# extract_semver 提取语义版本
|
|
||||||
extract_semver() {
|
|
||||||
local version="$1"
|
|
||||||
echo "$version" | sed -E 's/^([0-9]+\.[0-9]+).*$/\1/'
|
|
||||||
}
|
|
||||||
|
|
||||||
# extract_timestamp 提取时间戳
|
|
||||||
extract_timestamp() {
|
|
||||||
local version="$1"
|
|
||||||
echo "$version" | sed -E 's/^[0-9]+\.[0-9]+-(lts|preview)-//'
|
|
||||||
}
|
|
||||||
|
|
||||||
# compare_version 比较两个版本
|
|
||||||
# 返回: 0=相等, 1=目标更新, 2=目标更旧
|
|
||||||
compare_version() {
|
|
||||||
local current="$1"
|
|
||||||
local target="$2"
|
|
||||||
|
|
||||||
local cur_semver=$(extract_semver "$current")
|
|
||||||
local tgt_semver=$(extract_semver "$target")
|
|
||||||
|
|
||||||
if [ "$tgt_semver" -gt "$cur_semver" ] 2>/dev/null; then
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
if [ "$tgt_semver" -lt "$cur_semver" ] 2>/dev/null; then
|
|
||||||
return 2
|
|
||||||
fi
|
|
||||||
|
|
||||||
local cur_ts=$(extract_timestamp "$current")
|
|
||||||
local tgt_ts=$(extract_timestamp "$target")
|
|
||||||
|
|
||||||
if [ -z "$cur_ts" ]; then
|
|
||||||
cur_ts="0"
|
|
||||||
fi
|
|
||||||
if [ -z "$tgt_ts" ]; then
|
|
||||||
tgt_ts="0"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$tgt_ts" -gt "$cur_ts" ] 2>/dev/null; then
|
|
||||||
return 1
|
|
||||||
elif [ "$tgt_ts" -eq "$cur_ts" ] 2>/dev/null; then
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return 2
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# ---------- 通道选择 ----------
|
|
||||||
select_channel() {
|
|
||||||
if [ -n "$CHANNEL" ]; then
|
|
||||||
if [ "$CHANNEL" != "lts" ] && [ "$CHANNEL" != "preview" ]; then
|
|
||||||
print_error "无效通道: $CHANNEL (仅支持 lts / preview)"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo -e "${CYAN}请选择部署通道:${NC}"
|
|
||||||
echo " 1. LTS (稳定版,生产推荐) [默认]"
|
|
||||||
echo " 2. Preview (技术预览版,包含新特性)"
|
|
||||||
echo ""
|
|
||||||
read -p "请选择 [1]: " CHANNEL_INPUT </dev/tty
|
|
||||||
CHANNEL_INPUT=${CHANNEL_INPUT:-1}
|
|
||||||
case $CHANNEL_INPUT in
|
|
||||||
1|"") CHANNEL="lts" ;;
|
|
||||||
2) CHANNEL="preview" ;;
|
|
||||||
*) print_error "无效选择"; exit 1 ;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
# ---------- 检测结果汇总 ----------
|
# ---------- 检测结果汇总 ----------
|
||||||
print_environment_summary() {
|
print_environment_summary() {
|
||||||
print_title
|
print_title
|
||||||
print_subtitle "环境检测结果"
|
print_subtitle "环境检测结果"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
echo -e " ${CYAN}操作系统:${NC} $OS $OS_VERSION"
|
echo -e " ${CYAN}操作系统:${NC} $OS $OS_VERSION"
|
||||||
echo -e " ${CYAN}CPU 架构:${NC} $ARCH"
|
echo -e " ${CYAN}CPU 架构:${NC} $ARCH"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
echo " ${CYAN}必要工具:${NC}"
|
echo " ${CYAN}必要工具:${NC}"
|
||||||
if [ "$HAS_GIT" = true ]; then
|
if [ "$HAS_GIT" = true ]; then
|
||||||
echo -e " git ✅ 已安装 ($(git --version | awk '{print $3}'))"
|
echo -e " git ✅ 已安装 ($(git --version | awk '{print $3}'))"
|
||||||
@@ -346,7 +178,6 @@ print_environment_summary() {
|
|||||||
else
|
else
|
||||||
echo " wget ❌ 未安装 (将自动安装)"
|
echo " wget ❌ 未安装 (将自动安装)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo " ${CYAN}Docker 环境:${NC}"
|
echo " ${CYAN}Docker 环境:${NC}"
|
||||||
if [ "$HAS_DOCKER" = true ]; then
|
if [ "$HAS_DOCKER" = true ]; then
|
||||||
@@ -366,14 +197,12 @@ print_environment_summary() {
|
|||||||
echo ""
|
echo ""
|
||||||
echo " ${CYAN}容器状态:${NC}"
|
echo " ${CYAN}容器状态:${NC}"
|
||||||
if [ "$CONTAINER_RUNNING" = true ]; then
|
if [ "$CONTAINER_RUNNING" = true ]; then
|
||||||
echo -e " frpc-console ✅ 运行中"
|
echo -e " frpc-console ✅ 运行中 (将停止并重建)"
|
||||||
else
|
else
|
||||||
echo -e " frpc-console ⏸️ 已停止"
|
echo -e " frpc-console ⏸️ 已停止 (将重建)"
|
||||||
fi
|
fi
|
||||||
CURRENT_VERSION=$(get_current_version)
|
echo -e " ${YELLOW}数据目录中的数据库文件将被保留${NC}"
|
||||||
echo -e " ${CYAN}当前版本:${NC} $CURRENT_VERSION"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -388,12 +217,11 @@ generate_plan() {
|
|||||||
PLAN="${PLAN} • 安装必要工具:${pkgs}\n"
|
PLAN="${PLAN} • 安装必要工具:${pkgs}\n"
|
||||||
fi
|
fi
|
||||||
PLAN="${PLAN} • 拉取 frpc-console 源码 (${BRANCH} 分支)\n"
|
PLAN="${PLAN} • 拉取 frpc-console 源码 (${BRANCH} 分支)\n"
|
||||||
PLAN="${PLAN} • 构建 Docker 镜像: ${IMAGE_NAME}:${IMAGE_TAG}\n"
|
PLAN="${PLAN} • 构建 Docker 镜像(源码内编译)\n"
|
||||||
PLAN="${PLAN} • 目标版本: ${TARGET_VERSION}\n"
|
|
||||||
if [ "$CONTAINER_EXISTS" = true ]; then
|
if [ "$CONTAINER_EXISTS" = true ]; then
|
||||||
PLAN="${PLAN} • 停止并删除旧容器\n"
|
PLAN="${PLAN} • 停止并删除旧容器\n"
|
||||||
fi
|
fi
|
||||||
PLAN="${PLAN} • 启动 frpc-console 容器 (端口 ${PORT})"
|
PLAN="${PLAN} • 启动 frpc-console 容器"
|
||||||
}
|
}
|
||||||
|
|
||||||
# ---------- 展示部署计划 ----------
|
# ---------- 展示部署计划 ----------
|
||||||
@@ -401,26 +229,26 @@ print_deployment_plan() {
|
|||||||
print_title
|
print_title
|
||||||
print_subtitle "部署计划"
|
print_subtitle "部署计划"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
echo -e " ${CYAN}将执行以下操作:${NC}"
|
echo -e " ${CYAN}将执行以下操作:${NC}"
|
||||||
echo -e "$(echo -e "$PLAN")"
|
echo -e "$(echo -e "$PLAN")"
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo -e " ${CYAN}配置信息:${NC}"
|
echo -e " ${CYAN}配置信息:${NC}"
|
||||||
echo -e " ────────────────────────────────────"
|
echo -e " ────────────────────────────────────"
|
||||||
echo -e " 监听端口 : ${PORT}"
|
echo -e " 监听端口 : ${PORT}"
|
||||||
echo -e " 部署目录 : ${DEPLOY_DIR}"
|
echo -e " 部署目录 : ${DEPLOY_DIR}"
|
||||||
echo -e " 目标版本 : ${TARGET_VERSION}"
|
echo -e " 数据目录 : ${DATA_DIR}"
|
||||||
echo -e " 镜像标签 : ${IMAGE_TAG}"
|
|
||||||
echo -e " ────────────────────────────────────"
|
echo -e " ────────────────────────────────────"
|
||||||
|
|
||||||
if [ "$CONTAINER_EXISTS" = true ]; then
|
if [ "$CONTAINER_EXISTS" = true ]; then
|
||||||
echo ""
|
echo ""
|
||||||
echo -e " ${YELLOW}⚠ 检测到已存在的 frpc-console 容器${NC}"
|
echo -e " ${YELLOW}⚠ 检测到已存在的 frpc-console 容器${NC}"
|
||||||
echo -e " 当前版本: ${CURRENT_VERSION}"
|
if [ "$CONTAINER_RUNNING" = true ]; then
|
||||||
echo -e " 目标版本: ${TARGET_VERSION}"
|
echo -e " 状态: 运行中 → 将被停止并重新创建"
|
||||||
|
else
|
||||||
|
echo -e " 状态: 已停止 → 将被删除并重新创建"
|
||||||
|
fi
|
||||||
|
echo -e " ${YELLOW}数据目录中的数据库文件将被保留${NC}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -430,10 +258,8 @@ confirm_deploy() {
|
|||||||
echo -e "${GREEN}▶ 已启用 --yes,自动确认${NC}"
|
echo -e "${GREEN}▶ 已启用 --yes,自动确认${NC}"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -e -n "${CYAN}确认执行? 输入 Y 继续,输入 n 自定义配置 [Y/n]: ${NC}"
|
echo -e -n "${CYAN}确认执行? 输入 Y 继续,输入 n 自定义配置 [Y/n]: ${NC}"
|
||||||
read -r CONFIRM </dev/tty
|
read -r CONFIRM </dev/tty
|
||||||
|
|
||||||
case $CONFIRM in
|
case $CONFIRM in
|
||||||
n|N) return 1 ;;
|
n|N) return 1 ;;
|
||||||
*) return 0 ;;
|
*) return 0 ;;
|
||||||
@@ -445,14 +271,11 @@ custom_config() {
|
|||||||
print_title
|
print_title
|
||||||
print_subtitle "自定义配置"
|
print_subtitle "自定义配置"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
read -p "请输入监听端口 [${DEFAULT_PORT}]: " INPUT_PORT </dev/tty
|
read -p "请输入监听端口 [${DEFAULT_PORT}]: " INPUT_PORT </dev/tty
|
||||||
PORT=${INPUT_PORT:-$DEFAULT_PORT}
|
PORT=${INPUT_PORT:-$DEFAULT_PORT}
|
||||||
|
|
||||||
read -p "请输入部署目录 [${DEFAULT_DEPLOY_DIR}]: " INPUT_DEPLOY_DIR </dev/tty
|
read -p "请输入部署目录 [${DEFAULT_DEPLOY_DIR}]: " INPUT_DEPLOY_DIR </dev/tty
|
||||||
DEPLOY_DIR=${INPUT_DEPLOY_DIR:-$DEFAULT_DEPLOY_DIR}
|
DEPLOY_DIR=${INPUT_DEPLOY_DIR:-$DEFAULT_DEPLOY_DIR}
|
||||||
DATA_DIR="${DEPLOY_DIR}/data"
|
DATA_DIR="${DEPLOY_DIR}/data"
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo -e " ${CYAN}更新后的配置:${NC}"
|
echo -e " ${CYAN}更新后的配置:${NC}"
|
||||||
echo -e " ────────────────────────────────────"
|
echo -e " ────────────────────────────────────"
|
||||||
@@ -469,77 +292,28 @@ do_deploy() {
|
|||||||
print_subtitle "开始部署"
|
print_subtitle "开始部署"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# ----- 事务前钩子:备份数据库(仅降级时备份) -----
|
# ----- 事务前钩子:备份数据库 -----
|
||||||
BACKUP_DIR=""
|
print_step "备份数据库..."
|
||||||
if [ -n "$CURRENT_VERSION" ] && [ "$CURRENT_VERSION" != "0.0.0-dev" ]; then
|
BACKUP_DIR="/tmp/frpc-console/db-backups"
|
||||||
compare_version "$CURRENT_VERSION" "$TARGET_VERSION"
|
|
||||||
COMPARE_RESULT=$?
|
|
||||||
if [ $COMPARE_RESULT -eq 2 ]; then
|
|
||||||
print_warn "检测到降级操作: $CURRENT_VERSION → $TARGET_VERSION"
|
|
||||||
echo ""
|
|
||||||
echo -e "${YELLOW}⚠ 降级可能导致数据不兼容${NC}"
|
|
||||||
echo " 当前版本: $CURRENT_VERSION"
|
|
||||||
echo " 目标版本: $TARGET_VERSION"
|
|
||||||
echo ""
|
|
||||||
echo -e "${CYAN}将备份完整数据目录到:${NC}"
|
|
||||||
TIMESTAMP=$(date +%Y%m%d_%H%M%S)
|
|
||||||
BACKUP_DIR="/opt/frpc-console-backups/${TIMESTAMP}_${CHANNEL}"
|
|
||||||
echo " $BACKUP_DIR"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
read -p "确认执行降级? [y/N]: " CONFIRM_DOWNGRADE </dev/tty
|
|
||||||
if [[ ! "$CONFIRM_DOWNGRADE" =~ ^[Yy]$ ]]; then
|
|
||||||
print_info "已取消降级操作"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
print_step "执行降级前备份..."
|
|
||||||
mkdir -p "$BACKUP_DIR"
|
mkdir -p "$BACKUP_DIR"
|
||||||
if [ -d "$DEPLOY_DIR" ]; then
|
DB_FILE="${DEPLOY_DIR}/frpc-console.db"
|
||||||
cp -r "$DEPLOY_DIR" "$BACKUP_DIR/frpc-console"
|
if [ -f "$DB_FILE" ]; then
|
||||||
print_success "备份完成: $BACKUP_DIR"
|
TIMESTAMP=$(date +%Y%m%d_%H%M%S)
|
||||||
|
BACKUP_FILE="$BACKUP_DIR/frpc-console.db.$TIMESTAMP"
|
||||||
|
cp "$DB_FILE" "$BACKUP_FILE"
|
||||||
|
print_info "已备份: $BACKUP_FILE"
|
||||||
|
if command -v sqlite3 &> /dev/null; then
|
||||||
|
if ! sqlite3 "$DB_FILE" "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='users';" 2>/dev/null | grep -q "^1$"; then
|
||||||
|
print_warn "数据库文件无效,将删除,由容器全新初始化"
|
||||||
|
rm -f "$DB_FILE"
|
||||||
else
|
else
|
||||||
print_warn "部署目录不存在,跳过备份"
|
print_info "数据库有效,保留"
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
print_warn "sqlite3 未安装,无法检查数据库有效性,保留原文件"
|
||||||
fi
|
fi
|
||||||
fi
|
else
|
||||||
|
print_info "数据库文件不存在,跳过备份"
|
||||||
# ----- 安装必要工具 -----
|
|
||||||
if [ "$NEED_INSTALL_GIT" = true ] || [ "$NEED_INSTALL_CURL" = true ] || [ "$NEED_INSTALL_WGET" = true ]; then
|
|
||||||
print_step "安装必要工具..."
|
|
||||||
local pkgs=""
|
|
||||||
[ "$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)
|
|
||||||
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
|
|
||||||
if [ -n "$pkgs" ]; then
|
|
||||||
zypper install -y $pkgs
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
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
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
print_success "必要工具安装完成"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ----- 拉取代码 -----
|
# ----- 拉取代码 -----
|
||||||
@@ -564,24 +338,17 @@ do_deploy() {
|
|||||||
print_step "准备部署目录..."
|
print_step "准备部署目录..."
|
||||||
mkdir -p "$DEPLOY_DIR"
|
mkdir -p "$DEPLOY_DIR"
|
||||||
mkdir -p "$DATA_DIR"
|
mkdir -p "$DATA_DIR"
|
||||||
|
if [ -f "$DB_FILE" ]; then
|
||||||
# ----- 构建 Docker 镜像 -----
|
print_info "数据库文件存在,将保留"
|
||||||
print_step "构建 Docker 镜像..."
|
|
||||||
docker build -t "${IMAGE_NAME}:${IMAGE_TAG}" \
|
|
||||||
--build-arg VERSION="${TARGET_VERSION}" \
|
|
||||||
--build-arg IMAGE_TAG="${IMAGE_TAG}" \
|
|
||||||
.
|
|
||||||
|
|
||||||
print_success "Docker 镜像构建完成: ${IMAGE_NAME}:${IMAGE_TAG}"
|
|
||||||
|
|
||||||
if [ "$CHANNEL" = "lts" ]; then
|
|
||||||
docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:lts"
|
|
||||||
print_info "已标记 ${IMAGE_NAME}:lts"
|
|
||||||
else
|
else
|
||||||
docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:preview"
|
print_info "数据库文件不存在,容器启动时将自动创建"
|
||||||
print_info "已标记 ${IMAGE_NAME}:preview"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# ----- 构建 Docker 镜像(内部自动处理 go.mod 降级)-----
|
||||||
|
print_step "构建 Docker 镜像..."
|
||||||
|
docker build -t "${IMAGE_NAME}:latest" .
|
||||||
|
print_success "Docker 镜像构建完成: ${IMAGE_NAME}:latest"
|
||||||
|
|
||||||
# ----- 启动新容器 -----
|
# ----- 启动新容器 -----
|
||||||
print_step "启动 frpc-console 容器..."
|
print_step "启动 frpc-console 容器..."
|
||||||
docker run -d \
|
docker run -d \
|
||||||
@@ -591,7 +358,7 @@ do_deploy() {
|
|||||||
-v ${DEPLOY_DIR}:/app \
|
-v ${DEPLOY_DIR}:/app \
|
||||||
-e PORT=${PORT} \
|
-e PORT=${PORT} \
|
||||||
-e TZ=Asia/Shanghai \
|
-e TZ=Asia/Shanghai \
|
||||||
${IMAGE_NAME}:${IMAGE_TAG}
|
${IMAGE_NAME}:latest
|
||||||
|
|
||||||
if docker ps | grep -q frpc-console; then
|
if docker ps | grep -q frpc-console; then
|
||||||
print_success "容器启动成功!"
|
print_success "容器启动成功!"
|
||||||
@@ -603,7 +370,6 @@ do_deploy() {
|
|||||||
# ----- 检查 frpc 子进程 -----
|
# ----- 检查 frpc 子进程 -----
|
||||||
print_step "检查 frpc 状态..."
|
print_step "检查 frpc 状态..."
|
||||||
sleep 3
|
sleep 3
|
||||||
|
|
||||||
if docker ps --format '{{.Names}}' | grep -q "^frpc-console$"; then
|
if docker ps --format '{{.Names}}' | grep -q "^frpc-console$"; then
|
||||||
if docker exec frpc-console ps aux 2>/dev/null | grep -q "[f]rpc -c"; then
|
if docker exec frpc-console ps aux 2>/dev/null | grep -q "[f]rpc -c"; then
|
||||||
print_success "frpc 进程运行正常"
|
print_success "frpc 进程运行正常"
|
||||||
@@ -623,24 +389,6 @@ do_deploy() {
|
|||||||
print_warn "数据库为空或不可用,请通过 WebUI 注册管理员账户"
|
print_warn "数据库为空或不可用,请通过 WebUI 注册管理员账户"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ----- 验证版本写入 -----
|
|
||||||
print_step "验证版本..."
|
|
||||||
sleep 1
|
|
||||||
CONTAINER_VERSION=$(docker exec frpc-console cat /app/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
|
|
||||||
|
|
||||||
if [ -n "$BACKUP_DIR" ]; then
|
|
||||||
echo ""
|
|
||||||
print_warn "降级前数据已备份到: $BACKUP_DIR"
|
|
||||||
echo " 如需回退,请恢复: cp -r $BACKUP_DIR/frpc-console/* $DEPLOY_DIR/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ----- 清理临时文件 -----
|
# ----- 清理临时文件 -----
|
||||||
print_step "清理临时文件..."
|
print_step "清理临时文件..."
|
||||||
rm -rf "$WORK_DIR"
|
rm -rf "$WORK_DIR"
|
||||||
@@ -650,20 +398,17 @@ do_deploy() {
|
|||||||
print_title
|
print_title
|
||||||
print_success "frpc-console 部署完成!"
|
print_success "frpc-console 部署完成!"
|
||||||
print_title
|
print_title
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo -e " ${CYAN}📍 访问地址:${NC} http://$(hostname -I | awk '{print $1}'):${PORT}"
|
echo -e " ${CYAN}📍 访问地址:${NC} http://$(hostname -I | awk '{print $1}'):${PORT}"
|
||||||
echo -e " ${CYAN}📂 数据目录:${NC} ${DEPLOY_DIR}"
|
echo -e " ${CYAN}📂 数据目录:${NC} ${DEPLOY_DIR}"
|
||||||
echo -e " ${CYAN}📦 备份目录:${NC} /tmp/frpc-console/db-backups"
|
echo -e " ${CYAN}📦 备份目录:${NC} /tmp/frpc-console/db-backups"
|
||||||
echo -e " ${CYAN}🐳 容器名称:${NC} frpc-console"
|
echo -e " ${CYAN}🐳 容器名称:${NC} frpc-console"
|
||||||
echo -e " ${CYAN}🏷️ 版本:${NC} ${TARGET_VERSION}"
|
|
||||||
echo ""
|
echo ""
|
||||||
echo -e " ${CYAN}常用命令:${NC}"
|
echo -e " ${CYAN}常用命令:${NC}"
|
||||||
echo " docker logs frpc-console # 查看日志"
|
echo " docker logs frpc-console # 查看日志"
|
||||||
echo " docker restart frpc-console # 重启服务"
|
echo " docker restart frpc-console # 重启服务"
|
||||||
echo " docker stop frpc-console # 停止服务"
|
echo " docker stop frpc-console # 停止服务"
|
||||||
echo " docker start frpc-console # 启动服务"
|
echo " docker start frpc-console # 启动服务"
|
||||||
echo " cat ${DEPLOY_DIR}/VERSION.ini # 查看当前版本"
|
|
||||||
echo ""
|
echo ""
|
||||||
echo -e " ${YELLOW}首次访问需要注册管理员账户${NC}"
|
echo -e " ${YELLOW}首次访问需要注册管理员账户${NC}"
|
||||||
echo ""
|
echo ""
|
||||||
@@ -682,16 +427,6 @@ main() {
|
|||||||
check_tools
|
check_tools
|
||||||
check_container
|
check_container
|
||||||
|
|
||||||
select_channel
|
|
||||||
|
|
||||||
generate_target_version "$CHANNEL"
|
|
||||||
|
|
||||||
if [ "$CONTAINER_EXISTS" = true ]; then
|
|
||||||
CURRENT_VERSION=$(get_current_version)
|
|
||||||
else
|
|
||||||
CURRENT_VERSION="(首次部署)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
print_environment_summary
|
print_environment_summary
|
||||||
|
|
||||||
if [ "$CHECK_ONLY" = true ]; then
|
if [ "$CHECK_ONLY" = true ]; then
|
||||||
@@ -714,7 +449,6 @@ main() {
|
|||||||
|
|
||||||
if ! confirm_deploy; then
|
if ! confirm_deploy; then
|
||||||
custom_config
|
custom_config
|
||||||
generate_plan
|
|
||||||
print_deployment_plan
|
print_deployment_plan
|
||||||
if ! confirm_deploy; then
|
if ! confirm_deploy; then
|
||||||
print_info "已取消部署"
|
print_info "已取消部署"
|
||||||
|
|||||||
+4
-2
@@ -1,13 +1,15 @@
|
|||||||
## 🐳 Docker 版安装指南
|
## 🐳 Docker 版安装指南
|
||||||
|
|
||||||
> 推荐方式:一键脚本自动部署,无需手动编译,无需安装 Go 环境。
|
> 推荐方式:一键脚本自动部署,无需手动编译,无需安装 Go 环境。</br>
|
||||||
|
|
||||||
|
> ⚠️ **注意**:Docker 版直接从源码构建,使用的是当前 `main` 分支的最新代码,更新进度会远快于 Release 版本。⚠️</br>
|
||||||
|
> 如需使用特定版本(如 LTS),请查看 [Releases](https://git.whitetop.xyz/lxh2875931338/frpc-console/releases) 确认版本号,并通过二进制方式部署指定版本。
|
||||||
|
|
||||||
### 一、📥 前置条件
|
### 一、📥 前置条件
|
||||||
|
|
||||||
- 已安装 Docker(必须)
|
- 已安装 Docker(必须)
|
||||||
- 已安装 curl / wget(脚本会自动检查并安装)
|
- 已安装 curl / wget(脚本会自动检查并安装)
|
||||||
- 操作系统:Linux(x86_64 / ARM64 均可,ARMv7 将在不久的未来得到支持)
|
- 操作系统:Linux(x86_64 / ARM64 / ARMv7 均可)
|
||||||
|
|
||||||
|
|
||||||
### 二、🚀 一键部署(推荐)
|
### 二、🚀 一键部署(推荐)
|
||||||
|
|||||||
@@ -2,29 +2,15 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
"os"
|
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
// 由 build.go 通过 -ldflags 注入
|
|
||||||
var (
|
|
||||||
buildVersion = "0.0.0-dev"
|
|
||||||
buildImageTag = "dev"
|
|
||||||
buildTime = "unknown"
|
|
||||||
)
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
// ---- 写入 VERSION.ini 文件到持久化目录 ----
|
|
||||||
if err := os.WriteFile("./VERSION.ini", []byte(buildVersion+"\n"), 0644); err != nil {
|
|
||||||
log.Printf("⚠️ 写入 VERSION.ini 文件失败: %v", err)
|
|
||||||
} else {
|
|
||||||
log.Printf("📌 版本: %s", buildVersion)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := InitDB(); err != nil {
|
if err := InitDB(); err != nil {
|
||||||
log.Fatal("❌ 数据库初始化失败:", err)
|
log.Fatal("❌ 数据库初始化失败:", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 启动时生成配置并启动 frpc
|
||||||
if err := GenerateFrpcConfig(); err != nil {
|
if err := GenerateFrpcConfig(); err != nil {
|
||||||
log.Println("⚠️ 生成配置文件失败:", err)
|
log.Println("⚠️ 生成配置文件失败:", err)
|
||||||
}
|
}
|
||||||
@@ -33,6 +19,7 @@ func main() {
|
|||||||
log.Println("⚠️ 启动 frpc 失败:", err)
|
log.Println("⚠️ 启动 frpc 失败:", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ✅ 启动 Watchdog:每 30 秒检查一次 frpc 状态,挂了自动重启
|
||||||
go startWatchdog()
|
go startWatchdog()
|
||||||
|
|
||||||
r := SetupRouter()
|
r := SetupRouter()
|
||||||
@@ -45,6 +32,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Watchdog 协程:定期检查 frpc 是否存活
|
||||||
func startWatchdog() {
|
func startWatchdog() {
|
||||||
ticker := time.NewTicker(30 * time.Second)
|
ticker := time.NewTicker(30 * time.Second)
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
|||||||
@@ -35,17 +35,20 @@
|
|||||||
|
|
||||||
适用于 Linux / Windows,无需 Docker,单文件运行。
|
适用于 Linux / Windows,无需 Docker,单文件运行。
|
||||||
|
|
||||||
👉 详见:[二进制安装指南](./INSTALL_BINARY.md)
|
👉 详见:([二进制安装指南](https://git.whitetop.xyz/lxh2875931338/frpc-console/src/branch/main/install_binary.md))
|
||||||
|
|
||||||
### 🐳 Docker 部署(一键脚本)
|
### 🐳 Docker 部署(一键脚本)
|
||||||
|
|
||||||
适用于 Linux 服务器,自动编译 + 自动部署。
|
适用于 Linux 服务器,自动编译 + 自动部署。
|
||||||
|
|
||||||
|
> ⚠️ **注意**:Docker 版直接从源码构建,使用的是当前 `main` 分支的最新代码,更新进度会远快于 Release 版本。⚠️</br>
|
||||||
|
> 如需使用特定版本(如 LTS),请查看 [Releases](https://git.whitetop.xyz/lxh2875931338/frpc-console/releases) 确认版本号,并通过二进制方式部署指定版本。
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
curl -sSL https://git.whitetop.xyz/lxh2875931338/frpc-console/raw/main/deploy.sh | sudo bash
|
curl -sSL https://git.whitetop.xyz/lxh2875931338/frpc-console/raw/main/deploy.sh | sudo bash
|
||||||
```
|
```
|
||||||
|
|
||||||
👉 详见:[Docker 安装指南](./INSTALL_DOCKER.md)
|
👉 详见:([Docker 安装指南](https://git.whitetop.xyz/lxh2875931338/frpc-console/src/branch/main/install_docker.md))
|
||||||
|
|
||||||
### 🔧 源码编译
|
### 🔧 源码编译
|
||||||
|
|
||||||
@@ -258,39 +261,7 @@ frpc-console 遵循 **“够用就好”** 的原则:
|
|||||||
|
|
||||||
## 📝 更新日志
|
## 📝 更新日志
|
||||||
|
|
||||||
### 2.0-Release(LTS,跟随上游提供支持,frps 端现已正式发布,frpc 端测试中,敬请期待……)
|
完整更新日志请查看[update-logs](https://git.whitetop.xyz/lxh2875931338/frpc-console/src/branch/main/update-logs.md)
|
||||||
|
|
||||||
> 本次 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>
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
+10
-119
@@ -9,7 +9,6 @@ import (
|
|||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type Platform struct {
|
type Platform struct {
|
||||||
@@ -23,99 +22,15 @@ var platforms = []Platform{
|
|||||||
{"windows", "amd64", "Windows x86-64", ".exe"},
|
{"windows", "amd64", "Windows x86-64", ".exe"},
|
||||||
{"linux", "amd64", "Linux x86-64", ""},
|
{"linux", "amd64", "Linux x86-64", ""},
|
||||||
{"linux", "arm64", "Linux ARM64", ""},
|
{"linux", "arm64", "Linux ARM64", ""},
|
||||||
{"linux", "arm", "Linux ARMv7l", ""},
|
{"linux", "arm", "Linux ARMv7l", ""}, // GOARCH=arm, GOARM=7
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
BuildTime = "2026-07-29"
|
Version = "2.0.0"
|
||||||
|
BuildTime = "2026-07-26"
|
||||||
Binary = "frpc-console"
|
Binary = "frpc-console"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// 版本管理核心
|
|
||||||
// ============================================================
|
|
||||||
|
|
||||||
// readVersion 读取仓库根目录的 VERSION.ini 文件
|
|
||||||
// Preview 格式: "2.4"
|
|
||||||
// LTS 格式: "2.5 20260729"
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
// getVersionType 判断版本类型
|
|
||||||
// 规则: X.0 或 X.5 → LTS,其他 → Preview
|
|
||||||
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"
|
|
||||||
}
|
|
||||||
|
|
||||||
// getFullVersion 生成完整版本字符串
|
|
||||||
// LTS (X.0/X.5): {semver}-lts-{ltsDate} (必须有日期)
|
|
||||||
// Preview (其他): {semver}-preview-{buildTimestamp}
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// getImageTag 生成镜像标签
|
|
||||||
// LTS: {semver}-lts-{ltsDate}
|
|
||||||
// Preview: preview-{buildTimestamp}
|
|
||||||
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() {
|
func main() {
|
||||||
if len(os.Args) > 1 {
|
if len(os.Args) > 1 {
|
||||||
target := os.Args[1]
|
target := os.Args[1]
|
||||||
@@ -129,12 +44,6 @@ func main() {
|
|||||||
case "list":
|
case "list":
|
||||||
listPlatforms()
|
listPlatforms()
|
||||||
return
|
return
|
||||||
case "version":
|
|
||||||
fmt.Println(getFullVersion())
|
|
||||||
return
|
|
||||||
case "image-tag":
|
|
||||||
fmt.Println(getImageTag())
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
for _, p := range platforms {
|
for _, p := range platforms {
|
||||||
if target == p.OS+"/"+p.Arch {
|
if target == p.OS+"/"+p.Arch {
|
||||||
@@ -143,17 +52,13 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
fmt.Println("❌ 不支持的平台:", target)
|
fmt.Println("❌ 不支持的平台:", target)
|
||||||
fmt.Println(" 可用: windows/amd64, linux/amd64, linux/arm64, linux/arm")
|
fmt.Println(" 可用: windows/amd64, linux/amd64, linux/arm64, linux/armv7")
|
||||||
fmt.Println(" 或: all, list, clean, version, image-tag")
|
fmt.Println(" 或: all, list, clean")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
interactiveMenu()
|
interactiveMenu()
|
||||||
}
|
}
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// 构建函数
|
|
||||||
// ============================================================
|
|
||||||
|
|
||||||
func listPlatforms() {
|
func listPlatforms() {
|
||||||
fmt.Println("可用平台:")
|
fmt.Println("可用平台:")
|
||||||
for i, p := range platforms {
|
for i, p := range platforms {
|
||||||
@@ -163,19 +68,15 @@ func listPlatforms() {
|
|||||||
|
|
||||||
func interactiveMenu() {
|
func interactiveMenu() {
|
||||||
fmt.Println("========================================")
|
fmt.Println("========================================")
|
||||||
fmt.Println(" frpc-console 多平台构建工具")
|
fmt.Println(" frpc-console 多平台构建工具 v" + Version)
|
||||||
fmt.Println("========================================")
|
fmt.Println("========================================")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
fmt.Println(" 当前版本:", getFullVersion())
|
|
||||||
fmt.Println(" 镜像标签:", getImageTag())
|
|
||||||
fmt.Println()
|
|
||||||
|
|
||||||
for i, p := range platforms {
|
for i, p := range platforms {
|
||||||
fmt.Printf(" %d. %s (%s/%s)\n", i+1, p.Name, p.OS, p.Arch)
|
fmt.Printf(" %d. %s (%s/%s)\n", i+1, p.Name, p.OS, p.Arch)
|
||||||
}
|
}
|
||||||
fmt.Println(" a. 全部构建")
|
fmt.Println(" a. 全部构建")
|
||||||
fmt.Println(" c. 清理构建产物")
|
fmt.Println(" c. 清理构建产物")
|
||||||
fmt.Println(" v. 显示版本信息")
|
|
||||||
fmt.Println(" q. 退出")
|
fmt.Println(" q. 退出")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
@@ -195,10 +96,6 @@ func interactiveMenu() {
|
|||||||
case "a":
|
case "a":
|
||||||
buildAll()
|
buildAll()
|
||||||
return
|
return
|
||||||
case "v":
|
|
||||||
fmt.Println("版本:", getFullVersion())
|
|
||||||
fmt.Println("镜像标签:", getImageTag())
|
|
||||||
return
|
|
||||||
default:
|
default:
|
||||||
var idx int
|
var idx int
|
||||||
if n, err := fmt.Sscanf(input, "%d", &idx); n == 1 && err == nil && idx >= 1 && idx <= len(platforms) {
|
if n, err := fmt.Sscanf(input, "%d", &idx); n == 1 && err == nil && idx >= 1 && idx <= len(platforms) {
|
||||||
@@ -228,22 +125,16 @@ func build(p Platform, silent bool) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
fullVersion := getFullVersion()
|
// 构建输出文件名
|
||||||
imageTag := getImageTag()
|
|
||||||
|
|
||||||
outName := Binary + "-" + p.OS + "-" + p.Arch
|
outName := Binary + "-" + p.OS + "-" + p.Arch
|
||||||
if p.Arch == "arm" {
|
if p.Arch == "arm" {
|
||||||
outName += "v7"
|
outName += "v7" // 标注 ARMv7 版本
|
||||||
}
|
}
|
||||||
outName += p.Ext
|
outName += p.Ext
|
||||||
outPath := filepath.Join(outDir, outName)
|
outPath := filepath.Join(outDir, outName)
|
||||||
|
|
||||||
cmd := exec.Command("go", "build",
|
cmd := exec.Command("go", "build",
|
||||||
"-ldflags="+
|
"-ldflags=-s -w -X main.version="+Version,
|
||||||
"-s -w "+
|
|
||||||
"-X main.buildVersion="+fullVersion+" "+
|
|
||||||
"-X main.buildImageTag="+imageTag+" "+
|
|
||||||
"-X main.buildTime="+BuildTime,
|
|
||||||
"-o", outPath,
|
"-o", outPath,
|
||||||
".",
|
".",
|
||||||
)
|
)
|
||||||
@@ -253,6 +144,7 @@ func build(p Platform, silent bool) {
|
|||||||
"CGO_ENABLED=0",
|
"CGO_ENABLED=0",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// ARM 架构指定 GOARM=7
|
||||||
if p.Arch == "arm" {
|
if p.Arch == "arm" {
|
||||||
cmd.Env = append(cmd.Env, "GOARM=7")
|
cmd.Env = append(cmd.Env, "GOARM=7")
|
||||||
}
|
}
|
||||||
@@ -267,7 +159,6 @@ func build(p Platform, silent bool) {
|
|||||||
|
|
||||||
if !silent {
|
if !silent {
|
||||||
fmt.Printf("✅ 构建完成: %s\n", outPath)
|
fmt.Printf("✅ 构建完成: %s\n", outPath)
|
||||||
fmt.Printf(" 版本: %s\n", fullVersion)
|
|
||||||
if info, err := os.Stat(outPath); err == nil {
|
if info, err := os.Stat(outPath); err == nil {
|
||||||
size := float64(info.Size()) / 1024 / 1024
|
size := float64(info.Size()) / 1024 / 1024
|
||||||
fmt.Printf(" 📦 %.2f MB\n", size)
|
fmt.Printf(" 📦 %.2f MB\n", size)
|
||||||
|
|||||||
+1
-1
@@ -170,7 +170,7 @@ function filterProxies(list, keyword) {
|
|||||||
(p) =>
|
(p) =>
|
||||||
p.name.toLowerCase().includes(kw) ||
|
p.name.toLowerCase().includes(kw) ||
|
||||||
p.localIP.includes(kw) ||
|
p.localIP.includes(kw) ||
|
||||||
String(p.remotePort).includes(kw),
|
String(p.remotePort).includes(kw)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
### 2.3 (2026-07-28)(non-LTS)
|
||||||
|
|
||||||
|
|
||||||
|
### 2.0-LTS (2026-07-27)
|
||||||
|
|
||||||
|
> 本次 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>
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
; frpc-console 版本声明文件
|
|
||||||
; 格式: {语义版本号} [{LTS发布日期}]
|
|
||||||
; 示例:
|
|
||||||
; 2.4 # Preview 版本,无日期
|
|
||||||
; 2.5 20260729 # LTS 版本,带发布日期
|
|
||||||
2.4
|
|
||||||
Reference in New Issue
Block a user