caoxiaozhu
c5486dd3d3
主要修改点： 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: 启动日志区域
77 lines
2.8 KiB
Python
77 lines
2.8 KiB
Python
from __future__ import annotations
|
|
|
|
from functools import lru_cache
|
|
from os import environ
|
|
from pathlib import Path
|
|
|
|
from pydantic import Field
|
|
from pydantic_settings import BaseSettings, SettingsConfigDict
|
|
|
|
SERVER_DIR = Path(__file__).resolve().parents[3]
|
|
ROOT_DIR = SERVER_DIR.parent
|
|
|
|
|
|
class Settings(BaseSettings):
|
|
model_config = SettingsConfigDict(
|
|
env_file=(ROOT_DIR / ".env", SERVER_DIR / ".env"),
|
|
env_file_encoding="utf-8",
|
|
extra="ignore",
|
|
)
|
|
|
|
app_name: str = Field(default="X-Financial Server", alias="APP_NAME")
|
|
app_env: str = Field(default="local", alias="APP_ENV")
|
|
app_debug: bool = Field(default=True, alias="APP_DEBUG")
|
|
setup_completed: bool = Field(default=False, alias="SETUP_COMPLETED")
|
|
|
|
company_name: str = Field(default="", alias="COMPANY_NAME")
|
|
company_code: str = Field(default="", alias="COMPANY_CODE")
|
|
admin_email: str = Field(default="", alias="ADMIN_EMAIL")
|
|
|
|
web_host: str = Field(default="0.0.0.0", alias="WEB_HOST")
|
|
web_port: int = Field(default=5173, alias="WEB_PORT")
|
|
app_host: str = Field(default="0.0.0.0", alias="SERVER_HOST")
|
|
app_port: int = Field(default=8000, alias="SERVER_PORT")
|
|
api_v1_prefix: str = Field(default="/api/v1", alias="API_V1_PREFIX")
|
|
|
|
postgres_host: str = Field(default="127.0.0.1", alias="POSTGRES_HOST")
|
|
postgres_port: int = Field(default=5432, alias="POSTGRES_PORT")
|
|
postgres_db: str = Field(default="x_financial", alias="POSTGRES_DB")
|
|
postgres_user: str = Field(default="postgres", alias="POSTGRES_USER")
|
|
postgres_password: str = Field(default="postgres", alias="POSTGRES_PASSWORD")
|
|
|
|
database_url: str | None = Field(default=None, alias="DATABASE_URL")
|
|
sqlalchemy_echo: bool = Field(default=False, alias="SQLALCHEMY_ECHO")
|
|
|
|
redis_url: str | None = Field(default=None, alias="REDIS_URL")
|
|
cors_origins: list[str] = Field(default_factory=list, alias="CORS_ORIGINS")
|
|
vite_api_base_url: str = Field(
|
|
default="http://127.0.0.1:8000/api/v1", alias="VITE_API_BASE_URL"
|
|
)
|
|
|
|
log_level: str = Field(default="INFO", alias="LOG_LEVEL")
|
|
log_dir: str = Field(default="logs", alias="LOG_DIR")
|
|
log_file_enabled: bool = Field(default=True, alias="LOG_FILE_ENABLED")
|
|
|
|
@property
|
|
def resolved_database_url(self) -> str:
|
|
if self.database_url:
|
|
return self.database_url
|
|
|
|
return (
|
|
f"postgresql+psycopg://{self.postgres_user}:{self.postgres_password}"
|
|
f"@{self.postgres_host}:{self.postgres_port}/{self.postgres_db}"
|
|
)
|
|
|
|
|
|
@lru_cache
|
|
def get_settings() -> Settings:
|
|
return Settings()
|
|
|
|
|
|
def refresh_settings(updated_values: dict[str, str]) -> Settings:
|
|
for key, value in updated_values.items():
|
|
environ[key] = value
|
|
|
|
get_settings.cache_clear()
|
|
return get_settings()
|