Skip to content

Commit fd1eea7

Browse files
committed
update: deprecated on_event
1 parent 38c78ce commit fd1eea7

File tree

1 file changed

+51
-24
lines changed

1 file changed

+51
-24
lines changed

main.py

Lines changed: 51 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import asyncio
66

77
from fastapi import FastAPI
8+
89
from fastapi.middleware.cors import CORSMiddleware
910
from fastapi.responses import HTMLResponse
1011
from fastapi.staticfiles import StaticFiles
@@ -18,7 +19,49 @@
1819
from core.settings import data_root, settings, BASE_DIR, DEFAULT_CONFIG
1920
from core.tasks import delete_expire_files
2021

21-
app = FastAPI()
22+
from contextlib import asynccontextmanager
23+
from tortoise import Tortoise
24+
25+
26+
async def init_db():
27+
await Tortoise.init(
28+
db_url=f'sqlite://{data_root}/filecodebox.db',
29+
modules={'models': ['apps.base.models']},
30+
use_tz=False,
31+
timezone="Asia/Shanghai"
32+
)
33+
await Tortoise.generate_schemas()
34+
35+
36+
@asynccontextmanager
37+
async def lifespan(app: FastAPI):
38+
# 初始化数据库
39+
await init_db()
40+
41+
# 启动后台任务,不定时删除过期文件
42+
task = asyncio.create_task(delete_expire_files())
43+
# 读取用户配置
44+
user_config, created = await KeyValue.get_or_create(key='settings', defaults={'value': DEFAULT_CONFIG})
45+
settings.user_config = user_config.value
46+
ip_limit['error'].minutes = settings.errorMinute
47+
ip_limit['error'].count = settings.errorCount
48+
ip_limit['upload'].minutes = settings.uploadMinute
49+
ip_limit['upload'].count = settings.uploadCount
50+
51+
yield
52+
53+
# 清理操作
54+
task.cancel()
55+
try:
56+
await task
57+
except asyncio.CancelledError:
58+
pass
59+
60+
# 关闭数据库连接
61+
await Tortoise.close_connections()
62+
63+
64+
app = FastAPI(lifespan=lifespan)
2265

2366
app.add_middleware(
2467
CORSMiddleware,
@@ -30,42 +73,26 @@
3073

3174
app.mount('/assets', StaticFiles(directory='./fcb-fronted/dist/assets'), name="assets")
3275

76+
# 使用 register_tortoise 来添加异常处理器
3377
register_tortoise(
3478
app,
35-
generate_schemas=True,
36-
add_exception_handlers=True,
3779
config={
38-
'connections': {
39-
'default': f'sqlite://{data_root}/filecodebox.db'
40-
},
80+
'connections': {'default': f'sqlite://{data_root}/filecodebox.db'},
4181
'apps': {
4282
'models': {
43-
"models": ["apps.base.models"],
83+
'models': ['apps.base.models'],
4484
'default_connection': 'default',
45-
}
85+
},
4686
},
47-
"use_tz": False,
48-
"timezone": "Asia/Shanghai",
49-
}
87+
},
88+
generate_schemas=False, # 我们已经在 init_db 中生成了 schema
89+
add_exception_handlers=True,
5090
)
5191

5292
app.include_router(share_api)
5393
app.include_router(admin_api)
5494

5595

56-
@app.on_event("startup")
57-
async def startup_event():
58-
# 启动后台任务,不定时删除过期文件
59-
asyncio.create_task(delete_expire_files())
60-
# 读取用户配置
61-
user_config, created = await KeyValue.get_or_create(key='settings', defaults={'value': DEFAULT_CONFIG})
62-
settings.user_config = user_config.value
63-
ip_limit['error'].minutes = settings.errorMinute
64-
ip_limit['error'].count = settings.errorCount
65-
ip_limit['upload'].minutes = settings.uploadMinute
66-
ip_limit['upload'].count = settings.uploadCount
67-
68-
6996
@app.get('/')
7097
async def index():
7198
return HTMLResponse(

0 commit comments

Comments
 (0)