mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-22 05:02:57 +00:00
chore: 完成项目多批次优化与功能迭代
本次提交包含多项改进: 1. 国际化补充:新增通知空状态文案中英文支持 2. 启动优化:重构banner输出、移除环境参数依赖,简化启动日志 3. 配置清理:移除冗余的REDIS_ENABLE/SQL_DB_ENABLE配置项,同步更新env示例与测试配置 4. 接口分页改造:将全局分页参数从Query改为Depends自动解析,统一排序逻辑 5. 菜单权限优化:调整菜单可见范围默认值、修复平台菜单路由路径错误 6. 异常处理增强:完善数据库异常捕获逻辑,新增连接失败专项处理 7. API令牌重构:重命名API令牌路由与权限标识,拆分前端API文件 8. 定时任务整合:将系统任务注册移入调度器初始化逻辑 9. 数据库连接优化:新增连接检查,简化建表/删表逻辑 10. 控制台美化:重构启动控制台面板,优化信息展示格式 11. 租户/角色服务优化:移除不必要的超级管理员装饰器,统一分页排序逻辑 12. 用户菜单适配:修复超级用户菜单过滤逻辑,移除scope强制校验
This commit is contained in:
+25
-67
@@ -20,73 +20,39 @@ from .utils.console import console_end, console_start
|
||||
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI) -> AsyncGenerator[Any, Any]:
|
||||
from app.api.v1.module_platform.order.service import OrderService
|
||||
from app.api.v1.module_platform.tenant.service import TenantService
|
||||
from app.api.v1.module_system.dict.service import DictDataService
|
||||
from app.api.v1.module_system.log.service import OperationLogService
|
||||
from app.api.v1.module_system.params.service import ParamsService
|
||||
from app.core.ap_scheduler import SchedulerUtil
|
||||
from app.core.database import async_engine, redis_connect
|
||||
from app.scripts.initialize import InitializeData
|
||||
|
||||
async def _init_system_caches() -> None:
|
||||
"""Redis 缓存初始化(参数/数据字典/租户配置)。"""
|
||||
await ParamsService.init_cache(redis=app.state.redis)
|
||||
logger.info("✅ Redis系统参数初始化完成")
|
||||
await DictDataService.init_cache(redis=app.state.redis)
|
||||
logger.info("✅ Redis数据字典初始化完成")
|
||||
await TenantService.init_cache(redis=app.state.redis)
|
||||
logger.info("✅ Redis租户配置初始化完成")
|
||||
await InitializeData().init_db()
|
||||
logger.info("✅ {}数据库初始化完成", settings.DATABASE_TYPE)
|
||||
await redis_connect(app, status=True)
|
||||
logger.info("✅ Redis 连接初始化完成")
|
||||
await ParamsService.init_cache(redis=app.state.redis)
|
||||
logger.info("✅ Redis系统参数初始化完成")
|
||||
await DictDataService.init_cache(redis=app.state.redis)
|
||||
logger.info("✅ Redis数据字典初始化完成")
|
||||
await TenantService.init_cache(redis=app.state.redis)
|
||||
logger.info("✅ Redis租户配置初始化完成")
|
||||
await SchedulerUtil.init_scheduler(redis=app.state.redis)
|
||||
logger.info("✅ 定时任务调度器初始化完成")
|
||||
FastAPICache.init(RedisBackend(app.state.redis), prefix="fastapi-admin-cache")
|
||||
logger.info("✅ fastapi-admin-cache 初始化完成")
|
||||
app.state.limiter = limiter
|
||||
logger.info("✅ 请求限流器初始化完成")
|
||||
|
||||
def _register_system_jobs() -> None:
|
||||
"""注册系统级定时任务(拆分自 SchedulerUtil._register_system_jobs)。"""
|
||||
from apscheduler.triggers.cron import CronTrigger
|
||||
from apscheduler.triggers.interval import IntervalTrigger
|
||||
|
||||
SchedulerUtil.register_system_job(
|
||||
"system_tenant_expiry_check", TenantService.check_tenant_expiry,
|
||||
trigger=IntervalTrigger(hours=1), name="租户到期检查",
|
||||
)
|
||||
SchedulerUtil.register_system_job(
|
||||
"system_clean_expired", TenantService.clean_expired_tenants,
|
||||
trigger=CronTrigger(day=1, hour=2, minute=0), name="过期租户归档清理",
|
||||
)
|
||||
SchedulerUtil.register_system_job(
|
||||
"system_cancel_expired_orders", OrderService.cancel_expired_orders,
|
||||
trigger=IntervalTrigger(minutes=30), name="超时订单取消",
|
||||
)
|
||||
SchedulerUtil.register_system_job(
|
||||
"system_cleanup_operation_log", OperationLogService.cleanup_operation_log,
|
||||
trigger=CronTrigger(day_of_week="sun", hour=3, minute=0), name="操作日志清理",
|
||||
)
|
||||
logger.info("✅ 4 个系统周期任务已注册(租户到期检查/归档清理/订单取消/日志清理)")
|
||||
|
||||
try:
|
||||
await InitializeData().init_db()
|
||||
logger.info("✅ {}数据库初始化完成", settings.DATABASE_TYPE)
|
||||
await redis_connect(app, status=True)
|
||||
logger.info("✅ Redis 连接初始化完成")
|
||||
await _init_system_caches()
|
||||
await SchedulerUtil.init_scheduler(redis=app.state.redis)
|
||||
logger.info("✅ 定时任务调度器初始化完成")
|
||||
_register_system_jobs()
|
||||
FastAPICache.init(RedisBackend(app.state.redis), prefix="fastapi-admin-cache")
|
||||
logger.info("✅ fastapi-admin-cache 初始化完成")
|
||||
app.state.limiter = limiter
|
||||
logger.info("✅ 请求限流器初始化完成")
|
||||
|
||||
console_start(
|
||||
host=settings.SERVER_HOST,
|
||||
port=settings.SERVER_PORT,
|
||||
reload=settings.DEBUG,
|
||||
database_ready=True,
|
||||
redis_ready=True,
|
||||
scheduler_ready=SchedulerUtil.is_running(),
|
||||
limiter_ready=True,
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error("❌ 应用初始化失败: {}", e)
|
||||
raise SystemExit(1)
|
||||
console_start(
|
||||
host=settings.SERVER_HOST,
|
||||
port=settings.SERVER_PORT,
|
||||
reload=settings.DEBUG,
|
||||
database_ready=True,
|
||||
redis_ready=True,
|
||||
scheduler_ready=SchedulerUtil.is_running(),
|
||||
limiter_ready=True,
|
||||
)
|
||||
|
||||
yield
|
||||
|
||||
@@ -152,14 +118,10 @@ def register_docs(app: FastAPI) -> None:
|
||||
swagger_ui_redirect_url = str(app.swagger_ui_oauth2_redirect_url)
|
||||
root_openapi_url = str(app.root_path) + str(app.openapi_url)
|
||||
|
||||
# 为文档路由标记 __slower_exempt__ 以跳过 slowapi 中间件限流
|
||||
|
||||
@app.get(swagger_ui_redirect_url, include_in_schema=False)
|
||||
async def swagger_ui_redirect():
|
||||
return get_swagger_ui_oauth2_redirect_html()
|
||||
|
||||
swagger_ui_redirect.__slower_exempt__ = True
|
||||
|
||||
@app.get(settings.DOCS_URL, include_in_schema=False)
|
||||
async def custom_swagger_ui_html() -> HTMLResponse:
|
||||
return get_swagger_ui_html(
|
||||
@@ -171,8 +133,6 @@ def register_docs(app: FastAPI) -> None:
|
||||
swagger_favicon_url=settings.FAVICON_URL,
|
||||
)
|
||||
|
||||
custom_swagger_ui_html.__slower_exempt__ = True
|
||||
|
||||
@app.get(settings.REDOC_URL, include_in_schema=False)
|
||||
async def custom_redoc_html():
|
||||
return get_redoc_html(
|
||||
@@ -182,8 +142,6 @@ def register_docs(app: FastAPI) -> None:
|
||||
redoc_favicon_url=settings.FAVICON_URL,
|
||||
)
|
||||
|
||||
custom_redoc_html.__slower_exempt__ = True
|
||||
|
||||
|
||||
def register_frontend(app: FastAPI) -> None:
|
||||
if path_conf.FRONTEND_DIST_DIR.exists():
|
||||
|
||||
Reference in New Issue
Block a user