mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-10-04 01:10:36 +00:00
这是一次综合性的项目迭代,包含以下核心变更:
1. **目录与模块重构**
- 调整工作流节点类型模块目录结构,迁移节点类型相关代码
- 重命名platform模块为system模块,更新插件配置信息
- 重构代码生成模块导入路径
2. **数据库与CRUD优化**
- 统一所有CRUD类构造函数,新增数据库会话参数
- 修复权限过滤器数据库会话使用问题
- 更新模板生成器的CRUD代码模板
3. **认证与安全改进**
- 重构JWT密钥配置,移除默认密钥强制要求环境变量
- 重命名密码工具类,统一密码加密校验逻辑
- 优化OAuth认证流程,修复匿名认证使用问题
4. **前端与静态资源**
- 重构前端挂载逻辑,增加目录存在性校验
- 使用标准StaticFiles替换自定义前端挂载实现
5. **工具类与依赖更新**
- 修复导入工具的表名重复检测逻辑
- 优化限流回调代码,移除冗余依赖
- 更新用户、租户等模块的响应模型字段
6. **数据与配置修正**
- 修复系统版本数据字段命名不统一问题
- 简化枚举类校验逻辑,移除冗余注释
- 修复测试用例中的密码工具类导入错误
142 lines
7.1 KiB
Python
142 lines
7.1 KiB
Python
from typing import Annotated
|
|
|
|
from fastapi import APIRouter, Body, Depends, Path, Query, Security
|
|
from fastapi.responses import JSONResponse
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.common.response import ResponseSchema, SuccessResponse
|
|
from app.core.ap_scheduler import SchedulerUtil
|
|
from app.core.base_schema import AuthSchema, PageResultSchema, PaginationQueryParam
|
|
from app.core.dependencies import AuthPermission, db_getter
|
|
from app.core.router_class import OperationLogRoute
|
|
|
|
from .schema import JobOutSchema, JobQueryParam
|
|
from .service import JobService
|
|
|
|
JobRouter = APIRouter(route_class=OperationLogRoute, prefix="/cronjob/job", tags=["定时任务管理"])
|
|
|
|
|
|
@JobRouter.get("/scheduler/status", summary="获取调度器状态", response_model=ResponseSchema[dict], dependencies=[Security(AuthPermission(["module_task:cronjob:job:query"]))])
|
|
async def get_scheduler_status_controller() -> JSONResponse:
|
|
data = JobService.get_scheduler_status()
|
|
return SuccessResponse(data=data, msg="获取调度器状态成功")
|
|
|
|
|
|
@JobRouter.get("/scheduler/jobs", summary="获取调度器任务列表", response_model=ResponseSchema[list[dict]], dependencies=[Security(AuthPermission(["module_task:cronjob:job:query"]))])
|
|
async def get_scheduler_jobs_controller() -> JSONResponse:
|
|
data = JobService.get_scheduler_jobs()
|
|
return SuccessResponse(data=data, msg="获取调度器任务列表成功")
|
|
|
|
|
|
@JobRouter.post("/scheduler/start", summary="启动调度器", response_model=ResponseSchema[None], dependencies=[Security(AuthPermission(["module_task:cronjob:job:scheduler"]))])
|
|
async def start_scheduler_controller() -> JSONResponse:
|
|
SchedulerUtil.start()
|
|
return SuccessResponse(msg="调度器已启动")
|
|
|
|
|
|
@JobRouter.post("/scheduler/pause", summary="暂停调度器", response_model=ResponseSchema[None], dependencies=[Security(AuthPermission(["module_task:cronjob:job:scheduler"]))])
|
|
async def pause_scheduler_controller() -> JSONResponse:
|
|
SchedulerUtil.pause()
|
|
return SuccessResponse(msg="调度器已暂停")
|
|
|
|
|
|
@JobRouter.post("/scheduler/resume", summary="恢复调度器", response_model=ResponseSchema[None], dependencies=[Security(AuthPermission(["module_task:cronjob:job:scheduler"]))])
|
|
async def resume_scheduler_controller() -> JSONResponse:
|
|
SchedulerUtil.resume()
|
|
return SuccessResponse(msg="调度器已恢复")
|
|
|
|
|
|
@JobRouter.post("/scheduler/shutdown", summary="关闭调度器", response_model=ResponseSchema[None], dependencies=[Security(AuthPermission(["module_task:cronjob:job:scheduler"]))])
|
|
async def shutdown_scheduler_controller() -> JSONResponse:
|
|
await SchedulerUtil.shutdown()
|
|
return SuccessResponse(msg="调度器已关闭")
|
|
|
|
|
|
@JobRouter.delete("/scheduler/jobs/clear", summary="清空所有任务", response_model=ResponseSchema[None], dependencies=[Security(AuthPermission(["module_task:cronjob:job:task"]))])
|
|
async def clear_jobs_controller() -> JSONResponse:
|
|
SchedulerUtil.clear_jobs()
|
|
return SuccessResponse(msg="已清空所有任务")
|
|
|
|
|
|
@JobRouter.get("/scheduler/console", summary="获取调度器控制台信息", response_model=ResponseSchema[str], dependencies=[Security(AuthPermission(["module_task:cronjob:job:query"]))])
|
|
async def get_scheduler_console_controller() -> JSONResponse:
|
|
console_output = SchedulerUtil.print_jobs()
|
|
return SuccessResponse(data=console_output, msg="获取控制台信息成功")
|
|
|
|
|
|
@JobRouter.post("/scheduler/sync", summary="同步调度器任务到数据库", response_model=ResponseSchema[int], dependencies=[Security(AuthPermission(["module_task:cronjob:job:update"]))])
|
|
async def sync_jobs_controller() -> JSONResponse:
|
|
sync_count = SchedulerUtil.sync_jobs_to_db()
|
|
return SuccessResponse(data=sync_count, msg=f"同步完成,共同步 {sync_count} 个任务")
|
|
|
|
|
|
@JobRouter.post("/task/pause/{job_id}", summary="暂停任务", response_model=ResponseSchema[None], dependencies=[Security(AuthPermission(["module_task:cronjob:job:task"]))])
|
|
async def pause_job_controller(
|
|
job_id: Annotated[str, Path(description="调度器任务ID")],
|
|
) -> JSONResponse:
|
|
SchedulerUtil.pause_job(job_id=job_id)
|
|
return SuccessResponse(msg="暂停任务成功")
|
|
|
|
|
|
@JobRouter.post("/task/resume/{job_id}", summary="恢复任务", response_model=ResponseSchema[None], dependencies=[Security(AuthPermission(["module_task:cronjob:job:task"]))])
|
|
async def resume_job_controller(
|
|
job_id: Annotated[str, Path(description="调度器任务ID")],
|
|
) -> JSONResponse:
|
|
SchedulerUtil.resume_job(job_id=job_id)
|
|
return SuccessResponse(msg="恢复任务成功")
|
|
|
|
|
|
@JobRouter.post("/task/run/{job_id}", summary="立即执行任务", response_model=ResponseSchema[None], dependencies=[Security(AuthPermission(["module_task:cronjob:job:task"]))])
|
|
async def run_job_controller(
|
|
job_id: Annotated[str, Path(description="调度器任务ID")],
|
|
) -> JSONResponse:
|
|
SchedulerUtil.run_job_now(job_id=job_id)
|
|
return SuccessResponse(msg="立即执行任务成功")
|
|
|
|
|
|
@JobRouter.delete("/task/remove/{job_id}", summary="移除任务", response_model=ResponseSchema[None], dependencies=[Security(AuthPermission(["module_task:cronjob:job:delete"]))])
|
|
async def remove_job_controller(
|
|
job_id: Annotated[str, Path(description="调度器任务ID")],
|
|
) -> JSONResponse:
|
|
SchedulerUtil.remove_job(job_id=job_id)
|
|
return SuccessResponse(msg="移除任务成功")
|
|
|
|
|
|
@JobRouter.get("/log/list", summary="查询执行日志列表", response_model=ResponseSchema[PageResultSchema[JobOutSchema]])
|
|
async def get_job_log_list_controller(
|
|
auth: Annotated[AuthSchema, Security(AuthPermission(["module_task:cronjob:job:query"]))],
|
|
page: Annotated[PaginationQueryParam, Query(description="分页参数")],
|
|
search: Annotated[JobQueryParam, Query(description="查询参数")],
|
|
db: Annotated[AsyncSession, Depends(db_getter)],
|
|
) -> JSONResponse:
|
|
order_by = [{"created_time": "desc"}]
|
|
if page.order_by:
|
|
order_by = page.order_by
|
|
result_dict = await JobService(auth, db).get_job_log_page(
|
|
page_no=page.page_no,
|
|
page_size=page.page_size,
|
|
search=search,
|
|
order_by=order_by,
|
|
)
|
|
return SuccessResponse(data=result_dict, msg="查询执行日志列表成功")
|
|
|
|
|
|
@JobRouter.get("/log/detail/{id}", summary="获取执行日志详情", response_model=ResponseSchema[JobOutSchema])
|
|
async def get_job_log_detail_controller(
|
|
auth: Annotated[AuthSchema, Security(AuthPermission(["module_task:cronjob:job:detail"]))],
|
|
id: Annotated[int, Path(description="日志ID")],
|
|
db: Annotated[AsyncSession, Depends(db_getter)],
|
|
) -> JSONResponse:
|
|
result_dict = await JobService(auth, db).get_job_log_detail(id=id)
|
|
return SuccessResponse(data=result_dict, msg="获取执行日志详情成功")
|
|
|
|
|
|
@JobRouter.delete("/log/delete", summary="删除执行日志", response_model=ResponseSchema[None])
|
|
async def delete_job_log_controller(
|
|
auth: Annotated[AuthSchema, Security(AuthPermission(["module_task:cronjob:job:delete"]))],
|
|
ids: Annotated[list[int], Body(description="ID列表")],
|
|
db: Annotated[AsyncSession, Depends(db_getter)],
|
|
) -> JSONResponse:
|
|
await JobService(auth, db).delete_job_log(ids=ids)
|
|
return SuccessResponse(msg="删除执行日志成功")
|