diff --git a/backend/app/admin/api/router.py b/backend/app/admin/api/router.py index 5f7a84e4..1efa57cb 100644 --- a/backend/app/admin/api/router.py +++ b/backend/app/admin/api/router.py @@ -7,8 +7,9 @@ from backend.app.admin.api.v1.log import router as log_router from backend.app.admin.api.v1.monitor import router as monitor_router from backend.app.admin.api.v1.oauth2 import router as oauth2_router from backend.app.admin.api.v1.sys import router as sys_router +from backend.core.conf import settings -v1 = APIRouter() +v1 = APIRouter(prefix=settings.FASTAPI_API_V1_PATH) v1.include_router(auth_router) v1.include_router(oauth2_router) diff --git a/backend/app/generator/api/router.py b/backend/app/generator/api/router.py index b128445d..fb568bda 100644 --- a/backend/app/generator/api/router.py +++ b/backend/app/generator/api/router.py @@ -5,9 +5,10 @@ from fastapi import APIRouter from backend.app.generator.api.v1.gen import router as gen_router from backend.app.generator.api.v1.gen_business import router as gen_business_router from backend.app.generator.api.v1.gen_model import router as gen_model_router +from backend.core.conf import settings -v1 = APIRouter(prefix='/gen', tags=['代码生成']) +v1 = APIRouter(prefix=f'{settings.FASTAPI_API_V1_PATH}/gen', tags=['代码生成']) +v1.include_router(gen_router) v1.include_router(gen_business_router, prefix='/businesses') v1.include_router(gen_model_router, prefix='/models') -v1.include_router(gen_router) diff --git a/backend/app/router.py b/backend/app/router.py index 3fb1cfe6..cf9cb598 100644 --- a/backend/app/router.py +++ b/backend/app/router.py @@ -5,9 +5,8 @@ from fastapi import APIRouter from backend.app.admin.api.router import v1 as admin_v1 from backend.app.generator.api.router import v1 as generator_v1 from backend.app.task.api.router import v1 as task_v1 -from backend.core.conf import settings -route = APIRouter(prefix=settings.FASTAPI_API_V1_PATH) +route = APIRouter() route.include_router(admin_v1) route.include_router(generator_v1) diff --git a/backend/app/task/api/router.py b/backend/app/task/api/router.py index e7ec4fcb..18cb9ba6 100644 --- a/backend/app/task/api/router.py +++ b/backend/app/task/api/router.py @@ -3,7 +3,8 @@ from fastapi import APIRouter from backend.app.task.api.v1.task import router as task_router +from backend.core.conf import settings -v1 = APIRouter() +v1 = APIRouter(prefix=settings.FASTAPI_API_V1_PATH) v1.include_router(task_router, prefix='/tasks', tags=['任务']) diff --git a/backend/core/conf.py b/backend/core/conf.py index e38971f4..7baf18c4 100644 --- a/backend/core/conf.py +++ b/backend/core/conf.py @@ -43,9 +43,9 @@ class Settings(BaseSettings): FASTAPI_TITLE: str = 'FastAPI' FASTAPI_VERSION: str = '0.0.1' FASTAPI_DESCRIPTION: str = 'FastAPI Best Architecture' - FASTAPI_DOCS_URL: str | None = f'{FASTAPI_API_V1_PATH}/docs' - FASTAPI_REDOCS_URL: str | None = f'{FASTAPI_API_V1_PATH}/redocs' - FASTAPI_OPENAPI_URL: str | None = f'{FASTAPI_API_V1_PATH}/openapi' + FASTAPI_DOCS_URL: str | None = '/docs' + FASTAPI_REDOCS_URL: str | None = '/redocs' + FASTAPI_OPENAPI_URL: str | None = '/openapi' FASTAPI_STATIC_FILES: bool = True # Database