diff --git a/backend/app/api/routers.py b/backend/app/api/routers.py index f23a5248..fcc423bb 100644 --- a/backend/app/api/routers.py +++ b/backend/app/api/routers.py @@ -2,33 +2,21 @@ # -*- coding: utf-8 -*- from fastapi import APIRouter -from backend.app.api.v1.api import router as api_router from backend.app.api.v1.auth import router as auth_router -from backend.app.api.v1.casbin import router as casbin_router -from backend.app.api.v1.dept import router as dept_router -from backend.app.api.v1.dict_data import router as dict_data_router -from backend.app.api.v1.dict_type import router as dict_type_router from backend.app.api.v1.log import router as log_router -from backend.app.api.v1.menu import router as menu_router from backend.app.api.v1.mixed import router as mixed_router from backend.app.api.v1.monitor import router as monitor_router -from backend.app.api.v1.role import router as role_router +from backend.app.api.v1.sys import router as sys_router from backend.app.api.v1.task import router as task_router -from backend.app.api.v1.user import router as user_router from backend.app.core.conf import settings v1 = APIRouter(prefix=settings.API_V1_STR) -v1.include_router(auth_router, prefix='/auth', tags=['认证']) -v1.include_router(user_router, prefix='/users', tags=['用户管理']) -v1.include_router(casbin_router, prefix='/casbin', tags=['权限管理']) -v1.include_router(dept_router, prefix='/depts', tags=['部门管理']) -v1.include_router(role_router, prefix='/roles', tags=['角色管理']) -v1.include_router(menu_router, prefix='/menus', tags=['菜单管理']) -v1.include_router(api_router, prefix='/apis', tags=['API管理']) -v1.include_router(dict_type_router, prefix='/dict-types', tags=['字典类型管理']) -v1.include_router(dict_data_router, prefix='/dict-datas', tags=['字典数据管理']) -v1.include_router(log_router, prefix='/logs', tags=['日志管理']) -v1.include_router(monitor_router, prefix='/monitors', tags=['监控管理']) +# 集合 +v1.include_router(auth_router) +v1.include_router(sys_router) +v1.include_router(log_router) +v1.include_router(monitor_router) +v1.include_router(mixed_router) +# 独立 v1.include_router(task_router, prefix='/tasks', tags=['任务管理']) -v1.include_router(mixed_router, prefix='/mixes', tags=['杂项']) diff --git a/backend/app/api/v1/auth/__init__.py b/backend/app/api/v1/auth/__init__.py index e08b54e8..77d13530 100644 --- a/backend/app/api/v1/auth/__init__.py +++ b/backend/app/api/v1/auth/__init__.py @@ -5,7 +5,7 @@ from fastapi import APIRouter from backend.app.api.v1.auth.auth import router as auth_router from backend.app.api.v1.auth.captcha import router as captcha_router -router = APIRouter() +router = APIRouter(prefix='/auth', tags=['授权管理']) router.include_router(auth_router) router.include_router(captcha_router) diff --git a/backend/app/api/v1/log/__init__.py b/backend/app/api/v1/log/__init__.py index 49bbdcd6..315ba11d 100644 --- a/backend/app/api/v1/log/__init__.py +++ b/backend/app/api/v1/log/__init__.py @@ -5,7 +5,7 @@ from fastapi import APIRouter from backend.app.api.v1.log.login_log import router as login_log from backend.app.api.v1.log.opera_log import router as opera_log -router = APIRouter() +router = APIRouter(prefix='/logs') -router.include_router(login_log, prefix='/login') -router.include_router(opera_log, prefix='/opera') +router.include_router(login_log, prefix='/login', tags=['登录日志管理']) +router.include_router(opera_log, prefix='/opera', tags=['操作日志管理']) diff --git a/backend/app/api/v1/mixed/__init__.py b/backend/app/api/v1/mixed/__init__.py index a7b00c19..f84e40ea 100644 --- a/backend/app/api/v1/mixed/__init__.py +++ b/backend/app/api/v1/mixed/__init__.py @@ -5,7 +5,7 @@ from fastapi import APIRouter from backend.app.api.v1.mixed.config import router as config_router from backend.app.api.v1.mixed.tests import router as upload_router -router = APIRouter() +router = APIRouter(prefix='/mixes', tags=['杂项']) router.include_router(config_router) router.include_router(upload_router) diff --git a/backend/app/api/v1/monitor/__init__.py b/backend/app/api/v1/monitor/__init__.py index c2daddcf..8bb3ae62 100644 --- a/backend/app/api/v1/monitor/__init__.py +++ b/backend/app/api/v1/monitor/__init__.py @@ -5,7 +5,7 @@ from fastapi import APIRouter from backend.app.api.v1.monitor.redis import router as redis_router from backend.app.api.v1.monitor.server import router as server_router -router = APIRouter() +router = APIRouter(prefix='/monitors', tags=['监控管理']) router.include_router(redis_router) router.include_router(server_router) diff --git a/backend/app/api/v1/sys/__init__.py b/backend/app/api/v1/sys/__init__.py new file mode 100644 index 00000000..939f1d08 --- /dev/null +++ b/backend/app/api/v1/sys/__init__.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +from fastapi import APIRouter + +from backend.app.api.v1.sys.api import router as api_router +from backend.app.api.v1.sys.casbin import router as casbin_router +from backend.app.api.v1.sys.dept import router as dept_router +from backend.app.api.v1.sys.dict_data import router as dict_data_router +from backend.app.api.v1.sys.dict_type import router as dict_type_router +from backend.app.api.v1.sys.menu import router as menu_router +from backend.app.api.v1.sys.role import router as role_router +from backend.app.api.v1.sys.user import router as user_router + +router = APIRouter(prefix='/sys') + +router.include_router(api_router, prefix='/apis', tags=['API管理']) +router.include_router(casbin_router, prefix='/casbin', tags=['Casbin权限管理']) +router.include_router(dept_router, prefix='/depts', tags=['部门管理']) +router.include_router(dict_data_router, prefix='/dict_datas', tags=['字典数据管理']) +router.include_router(dict_type_router, prefix='/dict_types', tags=['字典类型管理']) +router.include_router(menu_router, prefix='/menus', tags=['目录管理']) +router.include_router(role_router, prefix='/roles', tags=['角色管理']) +router.include_router(user_router, prefix='/users', tags=['用户管理']) diff --git a/backend/app/api/v1/api.py b/backend/app/api/v1/sys/api.py similarity index 100% rename from backend/app/api/v1/api.py rename to backend/app/api/v1/sys/api.py diff --git a/backend/app/api/v1/casbin.py b/backend/app/api/v1/sys/casbin.py similarity index 100% rename from backend/app/api/v1/casbin.py rename to backend/app/api/v1/sys/casbin.py diff --git a/backend/app/api/v1/dept.py b/backend/app/api/v1/sys/dept.py similarity index 100% rename from backend/app/api/v1/dept.py rename to backend/app/api/v1/sys/dept.py diff --git a/backend/app/api/v1/dict_data.py b/backend/app/api/v1/sys/dict_data.py similarity index 100% rename from backend/app/api/v1/dict_data.py rename to backend/app/api/v1/sys/dict_data.py diff --git a/backend/app/api/v1/dict_type.py b/backend/app/api/v1/sys/dict_type.py similarity index 100% rename from backend/app/api/v1/dict_type.py rename to backend/app/api/v1/sys/dict_type.py diff --git a/backend/app/api/v1/menu.py b/backend/app/api/v1/sys/menu.py similarity index 100% rename from backend/app/api/v1/menu.py rename to backend/app/api/v1/sys/menu.py diff --git a/backend/app/api/v1/role.py b/backend/app/api/v1/sys/role.py similarity index 100% rename from backend/app/api/v1/role.py rename to backend/app/api/v1/sys/role.py diff --git a/backend/app/api/v1/user.py b/backend/app/api/v1/sys/user.py similarity index 100% rename from backend/app/api/v1/user.py rename to backend/app/api/v1/sys/user.py