root
/
jiachenlong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge cangpin and resolve conflict

This commit is contained in:
longda 2026-03-24 22:31:29 +08:00
parent 3a2dd39df3
commit bb33d37087
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/app/core/database.py
View File

@ -11,8 +11,13 @@ DATABASE_URL = os.getenv(
engine = create_engine( engine = create_engine(
DATABASE_URL, DATABASE_URL,
pool_pre_ping=True, pool_pre_ping=True,
<<<<<<< Updated upstream
pool_size=20, pool_size=20,
max_overflow=40, max_overflow=40,
=======
pool_size=20,
max_overflow=40,
>>>>>>> Stashed changes
pool_recycle=3600, pool_recycle=3600,
pool_timeout=30, pool_timeout=30,
echo=False echo=False