Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1cf6f4f47 | ||
|
|
a5c33580e2 | ||
|
|
f2af48f8d0 | ||
|
|
2663e71b4f | ||
|
|
bf24d3cb00 | ||
|
|
00f2b9fd14 | ||
|
|
76ac9503c6 | ||
|
|
04851d244f | ||
|
|
a2f4326882 |
+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,7 +63,6 @@ type User struct {
|
|||||||
|
|
||||||
// ============================================================
|
// ============================================================
|
||||||
// 数据库初始化
|
// 数据库初始化
|
||||||
// ============================================================
|
|
||||||
|
|
||||||
func InitDB() error {
|
func InitDB() error {
|
||||||
var err error
|
var err error
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# ============================================================
|
# ============================================================
|
||||||
# frpc-console 一键部署脚本
|
# frpc-console 一键部署脚本(Docker 优先)
|
||||||
# 支持:Linux x86_64 / ARM64 / ARMv7
|
# 支持:Linux x86_64 / ARM64 / ARMv7
|
||||||
# 自动安装:git / curl / wget / Go / Docker
|
# 自动安装:git / curl / wget / Docker
|
||||||
#
|
#
|
||||||
# 用法:
|
# 用法:
|
||||||
# ./deploy.sh # 完整交互流程
|
# ./deploy.sh # 完整交互流程
|
||||||
@@ -40,22 +40,18 @@ WORK_DIR="/tmp/frpc-console-build"
|
|||||||
DEFAULT_PORT=9300
|
DEFAULT_PORT=9300
|
||||||
DEFAULT_DEPLOY_DIR="/opt/frpc-console"
|
DEFAULT_DEPLOY_DIR="/opt/frpc-console"
|
||||||
IMAGE_NAME="frpc-console"
|
IMAGE_NAME="frpc-console"
|
||||||
GO_VERSION="1.25.0"
|
|
||||||
|
|
||||||
# ---------- 状态变量 ----------
|
# ---------- 状态变量 ----------
|
||||||
OS=""
|
OS=""
|
||||||
OS_VERSION=""
|
OS_VERSION=""
|
||||||
ARCH=""
|
ARCH=""
|
||||||
GO_ARCH=""
|
|
||||||
HAS_GIT=false
|
HAS_GIT=false
|
||||||
HAS_CURL=false
|
HAS_CURL=false
|
||||||
HAS_WGET=false
|
HAS_WGET=false
|
||||||
HAS_GO=false
|
|
||||||
HAS_DOCKER=false
|
HAS_DOCKER=false
|
||||||
NEED_INSTALL_GIT=false
|
NEED_INSTALL_GIT=false
|
||||||
NEED_INSTALL_CURL=false
|
NEED_INSTALL_CURL=false
|
||||||
NEED_INSTALL_WGET=false
|
NEED_INSTALL_WGET=false
|
||||||
NEED_INSTALL_GO=false
|
|
||||||
PORT=${DEFAULT_PORT}
|
PORT=${DEFAULT_PORT}
|
||||||
DEPLOY_DIR=${DEFAULT_DEPLOY_DIR}
|
DEPLOY_DIR=${DEFAULT_DEPLOY_DIR}
|
||||||
DATA_DIR="${DEPLOY_DIR}/data"
|
DATA_DIR="${DEPLOY_DIR}/data"
|
||||||
@@ -78,15 +74,9 @@ 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
|
|
||||||
;;
|
|
||||||
--help|-h)
|
--help|-h)
|
||||||
echo "用法: ./deploy.sh [选项]"
|
echo "用法: ./deploy.sh [选项]"
|
||||||
echo ""
|
echo ""
|
||||||
@@ -136,14 +126,8 @@ detect_os() {
|
|||||||
detect_arch() {
|
detect_arch() {
|
||||||
ARCH=$(uname -m)
|
ARCH=$(uname -m)
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
x86_64|amd64)
|
x86_64|amd64|aarch64|arm64|armv7l|armhf)
|
||||||
GO_ARCH="amd64"
|
print_success "CPU 架构: $ARCH"
|
||||||
;;
|
|
||||||
aarch64|arm64)
|
|
||||||
GO_ARCH="arm64"
|
|
||||||
;;
|
|
||||||
armv7l|armhf)
|
|
||||||
GO_ARCH="armv6l"
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
print_error "不支持的 CPU 架构: $ARCH"
|
print_error "不支持的 CPU 架构: $ARCH"
|
||||||
@@ -154,33 +138,10 @@ detect_arch() {
|
|||||||
|
|
||||||
# ---------- 检测工具 ----------
|
# ---------- 检测工具 ----------
|
||||||
check_tools() {
|
check_tools() {
|
||||||
if command -v git &> /dev/null; then
|
command -v git &> /dev/null && HAS_GIT=true || NEED_INSTALL_GIT=true
|
||||||
HAS_GIT=true
|
command -v curl &> /dev/null && HAS_CURL=true || NEED_INSTALL_CURL=true
|
||||||
else
|
command -v wget &> /dev/null && HAS_WGET=true || NEED_INSTALL_WGET=true
|
||||||
NEED_INSTALL_GIT=true
|
command -v docker &> /dev/null && HAS_DOCKER=true
|
||||||
fi
|
|
||||||
|
|
||||||
if command -v curl &> /dev/null; then
|
|
||||||
HAS_CURL=true
|
|
||||||
else
|
|
||||||
NEED_INSTALL_CURL=true
|
|
||||||
fi
|
|
||||||
|
|
||||||
if command -v wget &> /dev/null; then
|
|
||||||
HAS_WGET=true
|
|
||||||
else
|
|
||||||
NEED_INSTALL_WGET=true
|
|
||||||
fi
|
|
||||||
|
|
||||||
if command -v go &> /dev/null; then
|
|
||||||
HAS_GO=true
|
|
||||||
else
|
|
||||||
NEED_INSTALL_GO=true
|
|
||||||
fi
|
|
||||||
|
|
||||||
if command -v docker &> /dev/null; then
|
|
||||||
HAS_DOCKER=true
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# ---------- 检查容器状态 ----------
|
# ---------- 检查容器状态 ----------
|
||||||
@@ -198,11 +159,9 @@ 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 → Go 架构: $GO_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}'))"
|
||||||
@@ -219,15 +178,6 @@ print_environment_summary() {
|
|||||||
else
|
else
|
||||||
echo " wget ❌ 未安装 (将自动安装)"
|
echo " wget ❌ 未安装 (将自动安装)"
|
||||||
fi
|
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 ""
|
||||||
echo " ${CYAN}Docker 环境:${NC}"
|
echo " ${CYAN}Docker 环境:${NC}"
|
||||||
if [ "$HAS_DOCKER" = true ]; then
|
if [ "$HAS_DOCKER" = true ]; then
|
||||||
@@ -253,7 +203,6 @@ print_environment_summary() {
|
|||||||
fi
|
fi
|
||||||
echo -e " ${YELLOW}数据目录中的数据库文件将被保留${NC}"
|
echo -e " ${YELLOW}数据目录中的数据库文件将被保留${NC}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -267,12 +216,8 @@ generate_plan() {
|
|||||||
[ "$NEED_INSTALL_WGET" = true ] && pkgs="${pkgs} wget"
|
[ "$NEED_INSTALL_WGET" = true ] && pkgs="${pkgs} wget"
|
||||||
PLAN="${PLAN} • 安装必要工具:${pkgs}\n"
|
PLAN="${PLAN} • 安装必要工具:${pkgs}\n"
|
||||||
fi
|
fi
|
||||||
if [ "$NEED_INSTALL_GO" = true ]; then
|
|
||||||
PLAN="${PLAN} • 安装 Go ${GO_VERSION}\n"
|
|
||||||
fi
|
|
||||||
PLAN="${PLAN} • 拉取 frpc-console 源码 (${BRANCH} 分支)\n"
|
PLAN="${PLAN} • 拉取 frpc-console 源码 (${BRANCH} 分支)\n"
|
||||||
PLAN="${PLAN} • 编译 frpc-console 二进制\n"
|
PLAN="${PLAN} • 构建 Docker 镜像(源码内编译)\n"
|
||||||
PLAN="${PLAN} • 构建 Docker 镜像\n"
|
|
||||||
if [ "$CONTAINER_EXISTS" = true ]; then
|
if [ "$CONTAINER_EXISTS" = true ]; then
|
||||||
PLAN="${PLAN} • 停止并删除旧容器\n"
|
PLAN="${PLAN} • 停止并删除旧容器\n"
|
||||||
fi
|
fi
|
||||||
@@ -284,10 +229,8 @@ 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 " ────────────────────────────────────"
|
||||||
@@ -306,7 +249,6 @@ print_deployment_plan() {
|
|||||||
fi
|
fi
|
||||||
echo -e " ${YELLOW}数据目录中的数据库文件将被保留${NC}"
|
echo -e " ${YELLOW}数据目录中的数据库文件将被保留${NC}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -316,17 +258,11 @@ 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)
|
n|N) return 1 ;;
|
||||||
return 1
|
*) return 0 ;;
|
||||||
;;
|
|
||||||
*)
|
|
||||||
return 0
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -335,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 " ────────────────────────────────────"
|
||||||
@@ -361,17 +294,14 @@ do_deploy() {
|
|||||||
|
|
||||||
# ----- 事务前钩子:备份数据库 -----
|
# ----- 事务前钩子:备份数据库 -----
|
||||||
print_step "备份数据库..."
|
print_step "备份数据库..."
|
||||||
BACKUP_DIR="${DEPLOY_DIR}/backups"
|
BACKUP_DIR="/tmp/frpc-console/db-backups"
|
||||||
mkdir -p "$BACKUP_DIR"
|
mkdir -p "$BACKUP_DIR"
|
||||||
|
DB_FILE="${DEPLOY_DIR}/frpc-console.db"
|
||||||
DB_FILE="$DATA_DIR/frpc-console.db"
|
|
||||||
if [ -f "$DB_FILE" ]; then
|
if [ -f "$DB_FILE" ]; then
|
||||||
TIMESTAMP=$(date +%Y%m%d_%H%M%S)
|
TIMESTAMP=$(date +%Y%m%d_%H%M%S)
|
||||||
BACKUP_FILE="$BACKUP_DIR/frpc-console.db.$TIMESTAMP"
|
BACKUP_FILE="$BACKUP_DIR/frpc-console.db.$TIMESTAMP"
|
||||||
cp "$DB_FILE" "$BACKUP_FILE"
|
cp "$DB_FILE" "$BACKUP_FILE"
|
||||||
print_info "已备份: $BACKUP_FILE"
|
print_info "已备份: $BACKUP_FILE"
|
||||||
|
|
||||||
# 检查数据库是否有效(存在 users 表)
|
|
||||||
if command -v sqlite3 &> /dev/null; then
|
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
|
if ! sqlite3 "$DB_FILE" "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='users';" 2>/dev/null | grep -q "^1$"; then
|
||||||
print_warn "数据库文件无效,将删除,由容器全新初始化"
|
print_warn "数据库文件无效,将删除,由容器全新初始化"
|
||||||
@@ -386,95 +316,6 @@ do_deploy() {
|
|||||||
print_info "数据库文件不存在,跳过备份"
|
print_info "数据库文件不存在,跳过备份"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ----- 安装必要工具 -----
|
|
||||||
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
|
|
||||||
|
|
||||||
# ----- 安装 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
|
|
||||||
|
|
||||||
export PATH=$PATH:/usr/local/go/bin
|
|
||||||
|
|
||||||
# ----- 拉取代码 -----
|
# ----- 拉取代码 -----
|
||||||
print_step "拉取代码..."
|
print_step "拉取代码..."
|
||||||
rm -rf "$WORK_DIR"
|
rm -rf "$WORK_DIR"
|
||||||
@@ -483,54 +324,9 @@ do_deploy() {
|
|||||||
mkdir -p bin static
|
mkdir -p bin static
|
||||||
print_success "代码拉取完成"
|
print_success "代码拉取完成"
|
||||||
|
|
||||||
# ----- 修复 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
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ----- 准备部署目录 -----
|
|
||||||
print_step "准备部署目录..."
|
|
||||||
mkdir -p "$DEPLOY_DIR"
|
|
||||||
mkdir -p "$DATA_DIR"
|
|
||||||
|
|
||||||
if [ -f "$DB_FILE" ]; then
|
|
||||||
print_info "数据库文件存在,将保留"
|
|
||||||
else
|
|
||||||
print_info "数据库文件不存在,容器启动时将自动创建"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cp frpc-console "$DEPLOY_DIR/"
|
|
||||||
print_success "二进制已复制到 $DEPLOY_DIR"
|
|
||||||
|
|
||||||
# ----- 构建 Docker 镜像 -----
|
|
||||||
print_step "构建 Docker 镜像..."
|
|
||||||
docker build -t "${IMAGE_NAME}:latest" .
|
|
||||||
print_success "Docker 镜像构建完成: ${IMAGE_NAME}:latest"
|
|
||||||
|
|
||||||
# ----- 停止旧容器 -----
|
|
||||||
if [ "$CONTAINER_EXISTS" = true ]; then
|
if [ "$CONTAINER_EXISTS" = true ]; then
|
||||||
print_step "处理旧容器..."
|
print_step "停止旧容器..."
|
||||||
if [ "$CONTAINER_RUNNING" = true ]; then
|
if [ "$CONTAINER_RUNNING" = true ]; then
|
||||||
docker stop frpc-console 2>/dev/null || true
|
docker stop frpc-console 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
@@ -538,13 +334,28 @@ do_deploy() {
|
|||||||
print_success "旧容器已清理"
|
print_success "旧容器已清理"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# ----- 准备部署目录 -----
|
||||||
|
print_step "准备部署目录..."
|
||||||
|
mkdir -p "$DEPLOY_DIR"
|
||||||
|
mkdir -p "$DATA_DIR"
|
||||||
|
if [ -f "$DB_FILE" ]; then
|
||||||
|
print_info "数据库文件存在,将保留"
|
||||||
|
else
|
||||||
|
print_info "数据库文件不存在,容器启动时将自动创建"
|
||||||
|
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 \
|
||||||
--name frpc-console \
|
--name frpc-console \
|
||||||
--restart=always \
|
--restart=always \
|
||||||
--network host \
|
--network host \
|
||||||
-v ${DATA_DIR}:/app/data \
|
-v ${DEPLOY_DIR}:/app \
|
||||||
-e PORT=${PORT} \
|
-e PORT=${PORT} \
|
||||||
-e TZ=Asia/Shanghai \
|
-e TZ=Asia/Shanghai \
|
||||||
${IMAGE_NAME}:latest
|
${IMAGE_NAME}:latest
|
||||||
@@ -556,13 +367,10 @@ do_deploy() {
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ----- 检查 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
|
||||||
# 再检查 frpc 进程
|
|
||||||
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 进程运行正常"
|
||||||
else
|
else
|
||||||
@@ -573,9 +381,9 @@ do_deploy() {
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ----- 事务后钩子:检测数据库是否可用 -----
|
# ----- 事务后钩子:检测数据库 -----
|
||||||
print_step "验证数据库状态..."
|
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
|
if docker exec frpc-console sqlite3 /app/frpc-console.db "SELECT COUNT(*) FROM users;" 2>/dev/null | grep -q "^[0-9]"; then
|
||||||
print_success "数据库可用"
|
print_success "数据库可用"
|
||||||
else
|
else
|
||||||
print_warn "数据库为空或不可用,请通过 WebUI 注册管理员账户"
|
print_warn "数据库为空或不可用,请通过 WebUI 注册管理员账户"
|
||||||
@@ -590,11 +398,10 @@ 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} ${DATA_DIR}"
|
echo -e " ${CYAN}📂 数据目录:${NC} ${DEPLOY_DIR}"
|
||||||
echo -e " ${CYAN}📦 备份目录:${NC} ${BACKUP_DIR}"
|
echo -e " ${CYAN}📦 备份目录:${NC} /tmp/frpc-console/db-backups"
|
||||||
echo -e " ${CYAN}🐳 容器名称:${NC} frpc-console"
|
echo -e " ${CYAN}🐳 容器名称:${NC} frpc-console"
|
||||||
echo ""
|
echo ""
|
||||||
echo -e " ${CYAN}常用命令:${NC}"
|
echo -e " ${CYAN}常用命令:${NC}"
|
||||||
@@ -638,7 +445,6 @@ main() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
generate_plan
|
generate_plan
|
||||||
|
|
||||||
print_deployment_plan
|
print_deployment_plan
|
||||||
|
|
||||||
if ! confirm_deploy; then
|
if ! confirm_deploy; then
|
||||||
|
|||||||
@@ -261,39 +261,7 @@ frpc-console 遵循 **“够用就好”** 的原则:
|
|||||||
|
|
||||||
## 📝 更新日志
|
## 📝 更新日志
|
||||||
|
|
||||||
### 2.0-LTS (2026-07-28)正式发布
|
完整更新日志请查看[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>
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -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>
|
||||||
Reference in New Issue
Block a user