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:
@@ -1,11 +1,16 @@
|
||||
import { computed, ref } from 'vue'
|
||||
|
||||
import {
|
||||
fetchBootstrapBackendStatus,
|
||||
fetchBootstrapState,
|
||||
saveBootstrapConfig,
|
||||
startBootstrapBackend,
|
||||
testBootstrapDatabase,
|
||||
testBootstrapRuntime
|
||||
} from '../services/bootstrap.js'
|
||||
import { login as loginByAccount } from '../services/auth.js'
|
||||
import { setRuntimeApiBaseUrl } from '../services/api.js'
|
||||
import { checkBackendHealth } from './useBackendHealth.js'
|
||||
import { resolveDefaultAuthorizedRoute } from '../utils/accessControl.js'
|
||||
import { useToast } from './useToast.js'
|
||||
|
||||
@@ -22,6 +27,28 @@ const authIdleTimeoutMs =
|
||||
? authIdleTimeoutMinutes * 60 * 1000
|
||||
: 30 * 60 * 1000
|
||||
|
||||
function resolveBrowserApiBaseUrl(state) {
|
||||
const server = state?.server || {}
|
||||
const configuredHost = String(server.host || '127.0.0.1').trim()
|
||||
const port = Number(server.port || 8000)
|
||||
const apiPrefix = String(import.meta.env.VITE_API_BASE_PREFIX || '/api/v1').replace(/\/$/, '') || '/api/v1'
|
||||
|
||||
if (typeof window === 'undefined') {
|
||||
return `http://${configuredHost}:${port}${apiPrefix}`
|
||||
}
|
||||
|
||||
const browserHost = window.location.hostname
|
||||
const normalizedHost = configuredHost.toLowerCase()
|
||||
const host =
|
||||
normalizedHost === '0.0.0.0' ||
|
||||
normalizedHost === '::' ||
|
||||
(normalizedHost === '127.0.0.1' && browserHost && browserHost !== '127.0.0.1' && browserHost !== 'localhost')
|
||||
? browserHost
|
||||
: configuredHost
|
||||
|
||||
return `http://${host}:${port}${apiPrefix}`
|
||||
}
|
||||
|
||||
let sessionRouter = null
|
||||
let sessionTimeoutHandle = 0
|
||||
let sessionMonitoringInstalled = false
|
||||
@@ -42,7 +69,7 @@ function readClientBootstrapState() {
|
||||
port: Number(env.VITE_WEB_PORT || 5173)
|
||||
},
|
||||
server: {
|
||||
host: env.VITE_SERVER_HOST || '127.0.0.1',
|
||||
host: env.VITE_SERVER_HOST || '0.0.0.0',
|
||||
port: Number(env.VITE_SERVER_PORT || 8000)
|
||||
},
|
||||
database: {
|
||||
@@ -284,6 +311,15 @@ function syncAuthSession(options = {}) {
|
||||
return true
|
||||
}
|
||||
|
||||
function reconcileEntryRoute(router) {
|
||||
const target = resolveEntryRoute()
|
||||
const current = router.currentRoute.value
|
||||
|
||||
if (!current.name || current.name === 'root' || current.name === 'setup' || target.name === 'setup') {
|
||||
router.replace(target)
|
||||
}
|
||||
}
|
||||
|
||||
export function installSessionNavigation(router) {
|
||||
sessionRouter = router
|
||||
installSessionMonitoring()
|
||||
@@ -291,11 +327,29 @@ export function installSessionNavigation(router) {
|
||||
if (readAuthState() && !isSessionExpired()) {
|
||||
scheduleSessionTimeout()
|
||||
}
|
||||
|
||||
fetchBootstrapState()
|
||||
.then((state) => {
|
||||
applyBootstrapState(state)
|
||||
router.isReady().then(() => reconcileEntryRoute(router))
|
||||
})
|
||||
.catch(() => {
|
||||
router.isReady().then(() => {
|
||||
if (!isInitialized.value && router.currentRoute.value.name !== 'setup') {
|
||||
router.replace({ name: 'setup' })
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
const bootstrapState = ref(readClientBootstrapState())
|
||||
const setupSubmitting = ref(false)
|
||||
const setupError = ref('')
|
||||
const setupProgressMessage = ref('')
|
||||
const setupStartupVisible = ref(false)
|
||||
const setupStartupSteps = ref([])
|
||||
const setupStartupLog = ref('')
|
||||
const setupCountdownSeconds = ref(0)
|
||||
const runtimeTesting = ref(false)
|
||||
const databaseTesting = ref(false)
|
||||
const runtimeTestPassed = ref(false)
|
||||
@@ -351,6 +405,11 @@ function clearSetupRuntimeState() {
|
||||
runtimeTestMessage.value = ''
|
||||
databaseTestMessage.value = ''
|
||||
setupError.value = ''
|
||||
setupProgressMessage.value = ''
|
||||
setupStartupVisible.value = false
|
||||
setupStartupSteps.value = []
|
||||
setupStartupLog.value = ''
|
||||
setupCountdownSeconds.value = 0
|
||||
}
|
||||
|
||||
function resetFromClientEnv() {
|
||||
@@ -360,6 +419,45 @@ function resetFromClientEnv() {
|
||||
currentUser.value = readStoredUser()
|
||||
}
|
||||
|
||||
function sleep(ms) {
|
||||
return new Promise((resolve) => setTimeout(resolve, ms))
|
||||
}
|
||||
|
||||
function applyBackendStartupStatus(status) {
|
||||
setupStartupVisible.value = true
|
||||
setupStartupSteps.value = Array.isArray(status?.steps) ? status.steps : []
|
||||
setupStartupLog.value = status?.logTail || ''
|
||||
setupProgressMessage.value = status?.detail || setupProgressMessage.value
|
||||
}
|
||||
|
||||
async function waitForBackendStartup() {
|
||||
const started = await startBootstrapBackend()
|
||||
applyBackendStartupStatus(started)
|
||||
|
||||
while (true) {
|
||||
const status = await fetchBootstrapBackendStatus()
|
||||
applyBackendStartupStatus(status)
|
||||
|
||||
if (status?.completed) {
|
||||
return status
|
||||
}
|
||||
|
||||
if (status?.failed) {
|
||||
throw new Error(status.detail || 'FastAPI 后端启动失败。')
|
||||
}
|
||||
|
||||
await sleep(1000)
|
||||
}
|
||||
}
|
||||
|
||||
async function runLoginCountdown() {
|
||||
for (let second = 5; second > 0; second -= 1) {
|
||||
setupCountdownSeconds.value = second
|
||||
setupProgressMessage.value = `配置成功,${second} 秒后进入登录页...`
|
||||
await sleep(1000)
|
||||
}
|
||||
}
|
||||
|
||||
async function handleSetupSubmit(payload) {
|
||||
if (!runtimeTestPassed.value) {
|
||||
setupError.value = '请先完成运行端口检测。'
|
||||
@@ -375,14 +473,54 @@ async function handleSetupSubmit(payload) {
|
||||
|
||||
setupSubmitting.value = true
|
||||
setupError.value = ''
|
||||
setupProgressMessage.value = '正在写入初始化配置...'
|
||||
setupStartupVisible.value = true
|
||||
setupStartupSteps.value = [
|
||||
{ id: 'config', label: '第一步:写入初始化配置', status: 'running', detail: '正在保存企业、管理员、端口和数据库配置。' },
|
||||
{ id: 'deps', label: '第二步:安装/检查后端虚拟环境', status: 'pending', detail: '等待后端启动任务开始。' },
|
||||
{ id: 'server', label: '第三步:启动 FastAPI 服务', status: 'pending', detail: '等待启动 uvicorn。' },
|
||||
{ id: 'health', label: '第四步:检测后端健康状态', status: 'pending', detail: '等待 /api/v1/health。' },
|
||||
{ id: 'done', label: '第五步:配置完成', status: 'pending', detail: '后端就绪后进入登录页。' }
|
||||
]
|
||||
setupStartupLog.value = ''
|
||||
setupCountdownSeconds.value = 0
|
||||
|
||||
try {
|
||||
const state = await saveBootstrapConfig(payload)
|
||||
setupStartupSteps.value = setupStartupSteps.value.map((step) =>
|
||||
step.id === 'config'
|
||||
? { ...step, status: 'success', detail: '初始化配置已写入。' }
|
||||
: step
|
||||
)
|
||||
setupProgressMessage.value = '配置已写入,正在启动 FastAPI 后端...'
|
||||
await waitForBackendStartup()
|
||||
setRuntimeApiBaseUrl(resolveBrowserApiBaseUrl(state))
|
||||
setupProgressMessage.value = '后端已启动,正在检测服务连通性...'
|
||||
|
||||
const backendReady = await checkBackendHealth({ force: true })
|
||||
|
||||
if (!backendReady) {
|
||||
throw new Error('FastAPI 后端已启动,但浏览器暂时无法连接后端接口。请确认 Server Host 使用 0.0.0.0,且防火墙允许访问后端端口。')
|
||||
}
|
||||
|
||||
setupStartupSteps.value = setupStartupSteps.value.map((step) =>
|
||||
step.id === 'done'
|
||||
? { ...step, status: 'success', detail: '配置成功,准备进入登录页。' }
|
||||
: step
|
||||
)
|
||||
setupProgressMessage.value = '配置成功,准备进入登录页...'
|
||||
applyBootstrapState(state)
|
||||
toast('初始化配置已写入。现在可以进入登录页。')
|
||||
toast('初始化完成,后端已启动。')
|
||||
await runLoginCountdown()
|
||||
return true
|
||||
} catch (error) {
|
||||
setupError.value = error.message || '初始化配置写入失败,请稍后重试。'
|
||||
setupError.value = error.message || '初始化配置写入或后端启动失败,请稍后重试。'
|
||||
setupStartupVisible.value = true
|
||||
setupStartupSteps.value = setupStartupSteps.value.map((step) =>
|
||||
step.id === 'done'
|
||||
? { ...step, status: 'error', detail: setupError.value }
|
||||
: step
|
||||
)
|
||||
toast(setupError.value)
|
||||
return false
|
||||
} finally {
|
||||
@@ -540,6 +678,11 @@ export function useSystemState() {
|
||||
runtimeTestPassed,
|
||||
runtimeTesting,
|
||||
setupError,
|
||||
setupCountdownSeconds,
|
||||
setupProgressMessage,
|
||||
setupStartupLog,
|
||||
setupStartupSteps,
|
||||
setupStartupVisible,
|
||||
setupSubmitting,
|
||||
syncAuthSession,
|
||||
updateCompanyProfilePreview
|
||||
|
||||
Reference in New Issue
Block a user