feat: 启用后端自动启动与 Setup 引导流程增强
主要修改点： 1. 网络绑定扩展至 Server - .env.example: SERVER_HOST/VITE_SERVER_HOST 从 127.0.0.1 改为 0.0.0.0 - server/src/app/core/config.py: 默认 app_host 从 127.0.0.1 改为 0.0.0.0 2. 启动脚本重构（重命名以区分职责） - server/start.sh → server/server_start.sh - web/start.sh → web/web_start.sh - 根目录 start.sh: 更新调用路径（./start.sh → ./server_start.sh, ./web_start.sh） - 根目录 start.sh: 新增 setup_ready() 检测函数 - 根目录 start.sh: server_probe_host() 支持 0.0.0.0 探测转换为 127.0.0.1 - 根目录 start.sh: start_setup_web() 新增 X_FINANCIAL_FORCE_SETUP=true 3. API URL 动态化 (web/src/services/api.js) - 从 localStorage 持久化读取 API Base URL - 新增 setRuntimeApiBaseUrl() / getRuntimeApiBaseUrl() 导出函数 - buildUrl() 改用运行时 runtimeApiBaseUrl 4. 浏览器 Host 智能解析 (web/vite.config.js) - 新增 resolveBrowserApiHost(): 根据 server_host/web_host 配置决定浏览器端使用的 API Host - buildApiBaseUrl() 改用 resolveBrowserApiHost() - 新增后端启动状态管理: backendStartState / cloneBackendStartState() / updateBackendStep() - 后端启动分 5 步追踪: config → deps → server → health → done - 新增 backendStartPromise 避免重复启动 5. Setup 表单逻辑增强 (web/src/composables/useSetupView.js) - 新增 shouldExposeServerHost(): 判断浏览器 host 是否非本地 - 新增 resolveInitialServerHost(): 当浏览器访问且 server_host 为本地时暴露 0.0.0.0 - buildPayload(): 根据 shouldExposeServerHost() 自动将 127.0.0.1/localhost 转为 0.0.0.0 6. Bootstrap API 扩展 (web/src/services/bootstrap.js) - 新增 startBootstrapBackend(): POST /bootstrap/backend 触发后端启动 - 新增 fetchBootstrapBackendStatus(): GET /bootstrap/backend 查询后端状态 7. Session 导航增强 (web/src/composables/useSystemState.js) - 新增 resolveBrowserApiBaseUrl(): 智能解析浏览器端 API Base URL - installSessionNavigation(): 调用 fetchBootstrapState() 同步引导状态 - 新增 reconcileEntryRoute(): 根据引导状态协调路由 - VITE_SERVER_HOST 默认值从 127.0.0.1 改为 0.0.0.0 8. Setup 视图增强 (web/src/views/SetupRouteView.vue) - 向 SetupView 传递启动进度相关 props: startupCountdownSeconds, startupLog, startupSteps, startupVisible, progressMessage 9. CSS 新增 (web/src/assets/styles/views/setup-view.css) - .setup-complete-progress: 进度文字样式 - .setup-modal-backdrop: 模态框遮罩 - .setup-startup-modal: 启动模态框容器 - .setup-startup-head / .setup-startup-body / .setup-startup-spinner: 模态框头部/内容/加载动画 - .setup-startup-steps / .setup-startup-step: 步骤列表及单个步骤 - .setup-startup-step.is-running / .is-success / .is-failed: 步骤状态样式 - .setup-startup-log: 启动日志区域
This commit is contained in:
182
web/web_start.sh
Executable file
182
web/web_start.sh
Executable file
@@ -0,0 +1,182 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
export MSYS_NO_PATHCONV=1
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
cd "$SCRIPT_DIR"
|
||||
ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||
ROOT_ENV_FILE="$ROOT_DIR/.env"
|
||||
MODE="${1:-start}"
|
||||
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
NC='\033[0m'
|
||||
|
||||
info() { echo -e "${GREEN}[INFO]${NC} $*"; }
|
||||
warn() { echo -e "${YELLOW}[WARN]${NC} $*"; }
|
||||
error() { echo -e "${RED}[ERROR]${NC} $*"; exit 1; }
|
||||
|
||||
if [ -f "$ROOT_ENV_FILE" ]; then
|
||||
set -a
|
||||
. "$ROOT_ENV_FILE"
|
||||
set +a
|
||||
fi
|
||||
|
||||
if [ "${X_FINANCIAL_FORCE_SETUP:-false}" = "true" ]; then
|
||||
SETUP_COMPLETED=false
|
||||
VITE_SETUP_COMPLETED=false
|
||||
fi
|
||||
|
||||
WEB_HOST="${WEB_HOST:-0.0.0.0}"
|
||||
WEB_PORT="${WEB_PORT:-5173}"
|
||||
|
||||
export VITE_SETUP_COMPLETED="${SETUP_COMPLETED:-false}"
|
||||
export VITE_COMPANY_NAME="${COMPANY_NAME:-}"
|
||||
export VITE_COMPANY_CODE="${COMPANY_CODE:-}"
|
||||
export VITE_ADMIN_EMAIL="${ADMIN_EMAIL:-}"
|
||||
export VITE_WEB_HOST="${WEB_HOST}"
|
||||
export VITE_WEB_PORT="${WEB_PORT}"
|
||||
export VITE_SERVER_HOST="${SERVER_HOST:-127.0.0.1}"
|
||||
export VITE_SERVER_PORT="${SERVER_PORT:-8000}"
|
||||
export VITE_POSTGRES_HOST="${POSTGRES_HOST:-127.0.0.1}"
|
||||
export VITE_POSTGRES_PORT="${POSTGRES_PORT:-5432}"
|
||||
export VITE_POSTGRES_DB="${POSTGRES_DB:-x_financial}"
|
||||
export VITE_POSTGRES_USER="${POSTGRES_USER:-postgres}"
|
||||
export VITE_REDIS_URL="${REDIS_URL:-}"
|
||||
|
||||
is_wsl() {
|
||||
grep -qi microsoft /proc/version 2>/dev/null
|
||||
}
|
||||
|
||||
is_windows_path() {
|
||||
case "$SCRIPT_DIR" in
|
||||
/mnt/*) return 0 ;;
|
||||
/d/*|/c/*|/e/*|/f/*) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
use_windows_npm() {
|
||||
is_wsl && is_windows_path && command -v powershell.exe >/dev/null 2>&1 && command -v wslpath >/dev/null 2>&1
|
||||
}
|
||||
|
||||
windows_project_path() {
|
||||
wslpath -w "$SCRIPT_DIR"
|
||||
}
|
||||
|
||||
run_windows_powershell() {
|
||||
local command="$1"
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "$command"
|
||||
}
|
||||
|
||||
run_windows_npm_install() {
|
||||
local win_path
|
||||
local win_path_ps
|
||||
|
||||
win_path="$(windows_project_path)"
|
||||
win_path_ps="${win_path//\'/\'\'}"
|
||||
run_windows_powershell "Set-Location -LiteralPath '$win_path_ps'; npm install"
|
||||
}
|
||||
|
||||
run_windows_npm_start() {
|
||||
local win_path
|
||||
local win_path_ps
|
||||
|
||||
win_path="$(windows_project_path)"
|
||||
win_path_ps="${win_path//\'/\'\'}"
|
||||
exec powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "Set-Location -LiteralPath '$win_path_ps'; npm start -- --host $WEB_HOST --port $WEB_PORT"
|
||||
}
|
||||
|
||||
dependencies_ready() {
|
||||
[ -d "node_modules" ] || return 1
|
||||
[ -f "node_modules/vite/bin/vite.js" ] || return 1
|
||||
[ -f "node_modules/pg/package.json" ] || return 1
|
||||
[ -f "node_modules/vue-router/package.json" ] || return 1
|
||||
|
||||
if use_windows_npm; then
|
||||
local win_path
|
||||
local win_path_ps
|
||||
|
||||
win_path="$(windows_project_path)"
|
||||
win_path_ps="${win_path//\'/\'\'}"
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "Set-Location -LiteralPath '$win_path_ps'; node -e \"require('rollup'); require('pg'); require('vue-router')\"" >/dev/null 2>&1
|
||||
return $?
|
||||
fi
|
||||
|
||||
[ -e "node_modules/.bin/vite" ] || [ -e "node_modules/.bin/vite.cmd" ] || return 1
|
||||
node -e "require('rollup'); require('pg'); require('vue-router')" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
ensure_runtime_tools() {
|
||||
if use_windows_npm; then
|
||||
info "Detected WSL on a Windows-mounted project"
|
||||
info "Using Windows npm to manage web dependencies"
|
||||
|
||||
if ! run_windows_powershell "node -v > \$null; npm -v > \$null" >/dev/null 2>&1; then
|
||||
error "Windows Node.js/npm is not available in PATH. Install Node.js on Windows first."
|
||||
fi
|
||||
|
||||
return 0
|
||||
fi
|
||||
|
||||
if ! command -v node >/dev/null 2>&1; then
|
||||
error "Node.js is not installed. Install it first: https://nodejs.org"
|
||||
fi
|
||||
|
||||
if ! command -v npm >/dev/null 2>&1; then
|
||||
error "npm is not installed. It should come with Node.js."
|
||||
fi
|
||||
|
||||
info "Node.js $(node -v) | npm $(npm -v)"
|
||||
}
|
||||
|
||||
ensure_dependencies() {
|
||||
ensure_runtime_tools
|
||||
|
||||
if dependencies_ready; then
|
||||
info "Web dependencies are ready."
|
||||
return 0
|
||||
fi
|
||||
|
||||
warn "Web dependencies are missing or incomplete"
|
||||
info "Installing web dependencies..."
|
||||
|
||||
if use_windows_npm; then
|
||||
run_windows_npm_install
|
||||
else
|
||||
npm install
|
||||
fi
|
||||
|
||||
if ! dependencies_ready; then
|
||||
error "Web dependencies are still incomplete after installation. Try deleting web/node_modules and running npm install manually."
|
||||
fi
|
||||
|
||||
info "Web dependencies are ready."
|
||||
}
|
||||
|
||||
start_dev_server() {
|
||||
info "Starting X-Financial Reimbursement Admin..."
|
||||
info "Access: http://$WEB_HOST:$WEB_PORT"
|
||||
echo ""
|
||||
|
||||
if use_windows_npm; then
|
||||
run_windows_npm_start
|
||||
fi
|
||||
|
||||
exec npm start -- --host "$WEB_HOST" --port "$WEB_PORT"
|
||||
}
|
||||
|
||||
case "$MODE" in
|
||||
deps)
|
||||
ensure_dependencies
|
||||
;;
|
||||
start)
|
||||
ensure_dependencies
|
||||
start_dev_server
|
||||
;;
|
||||
*)
|
||||
error "Unknown mode: $MODE. Use one of: deps, start"
|
||||
;;
|
||||
esac
|
||||
Reference in New Issue
Block a user