From 5a05b804f2fc97f4c62f2c795a501765b17f5719 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Fri, 26 Jun 2026 18:37:58 +0800 Subject: [PATCH] =?UTF-8?q?P3-1:=20database.py=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=20config.py=20=E4=B8=AD=E7=9A=84=20Settings?= =?UTF-8?q?=EF=BC=8C=E6=B6=88=E9=99=A4=E9=85=8D=E7=BD=AE=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/api/app/core/database.py | 40 ++++++++--------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/apps/api/app/core/database.py b/apps/api/app/core/database.py index 7caa3821c..fe4dc13a7 100644 --- a/apps/api/app/core/database.py +++ b/apps/api/app/core/database.py @@ -1,34 +1,12 @@ -import os -from typing import Optional +""" +数据库连接管理 -from pydantic_settings import BaseSettings, SettingsConfigDict +P3-1 Fix: 统一使用 config.py 中的 Settings 类，消除配置重复定义。 +""" + +from app.config import settings +from packages.adapters.sqlalchemy_impl.session import build_session_factory -class DatabaseSettings(BaseSettings): - database_url: str = "postgresql+psycopg://postgres:postgres@postgres:5432/xiaoxia_saas" - pool_size: int = 20 - max_overflow: int = 40 - pool_timeout: int = 30 - pool_recycle: int = 3600 - - model_config = SettingsConfigDict( - env_file=".env", - env_file_encoding="utf-8", - case_sensitive=False, - extra="ignore", - ) - - -_settings: Optional[DatabaseSettings] = None - - -def get_database_settings() -> DatabaseSettings: - global _settings - if _settings is None: - env = os.getenv("APP_ENV", "development") - env_file = f".env.{env}" if env != "development" else ".env" - if os.path.exists(env_file): - _settings = DatabaseSettings(_env_file=env_file) - else: - _settings = DatabaseSettings() - return _settings +# P3-1 Fix: 直接使用 settings 中的配置，而不是重复定义 +_engine, _SessionLocal = build_session_factory(settings.DATABASE_URL)