From 33dd08d7f43932e9c79e97cb73484ba10003ec59 Mon Sep 17 00:00:00 2001 From: Jet Li Date: Fri, 8 Nov 2024 05:59:23 +0000 Subject: [PATCH] Update routes for all micro-service for reverse proxy purpose --- .../webapi/routes/auth/__init__.py | 4 ++-- .../webapi/routes/signin/__init__.py | 16 ++++++++-------- .../webapi/routes/tokens/__init__.py | 2 +- apps/central_storage/webapi/routes/__init__.py | 2 +- apps/notification/webapi/routes/__init__.py | 4 ++-- sites/notification/deploy/dev/.env | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/authentication/webapi/routes/auth/__init__.py b/apps/authentication/webapi/routes/auth/__init__.py index 355e2b6..546b8eb 100644 --- a/apps/authentication/webapi/routes/auth/__init__.py +++ b/apps/authentication/webapi/routes/auth/__init__.py @@ -5,5 +5,5 @@ from .send_mobile_code import router as smc_router router = APIRouter(prefix="/auth") -router.include_router(sec_router, tags=["authentication"]) -router.include_router(smc_router, tags=["authentication"]) +router.include_router(sec_router, prefix="/code", tags=["authentication"]) +router.include_router(smc_router, prefix="/code", tags=["authentication"]) diff --git a/apps/authentication/webapi/routes/signin/__init__.py b/apps/authentication/webapi/routes/signin/__init__.py index 6cee2d0..a3fc374 100644 --- a/apps/authentication/webapi/routes/signin/__init__.py +++ b/apps/authentication/webapi/routes/signin/__init__.py @@ -8,12 +8,12 @@ from .reset_password_through_email import router as rp_router from .sign_out import router as so_router -router = APIRouter(prefix="/signin") +router = APIRouter(prefix="/auth") -router.include_router(ts_router, tags=["signin"]) -router.include_router(sw_router, tags=["signin"]) -router.include_router(up_router, tags=["signin"]) -router.include_router(se_router, tags=["signin"]) -router.include_router(so_router, tags=["signin"]) -router.include_router(rp_router, tags=["signin"]) -router.include_router(uu_router, tags=["signin"]) +router.include_router(ts_router, prefix="/signin", tags=["signin"]) +router.include_router(sw_router, prefix="/signin", tags=["signin"]) +router.include_router(up_router, prefix="/signin", tags=["signin"]) +router.include_router(se_router, prefix="/signin", tags=["signin"]) +router.include_router(so_router, prefix="/signin", tags=["signin"]) +router.include_router(rp_router, prefix="/signin", tags=["signin"]) +router.include_router(uu_router, prefix="/signin", tags=["signin"]) diff --git a/apps/authentication/webapi/routes/tokens/__init__.py b/apps/authentication/webapi/routes/tokens/__init__.py index 853d847..1daca01 100644 --- a/apps/authentication/webapi/routes/tokens/__init__.py +++ b/apps/authentication/webapi/routes/tokens/__init__.py @@ -3,7 +3,7 @@ from .generate_tokens import router as generate_tokens_router from .refresh_token import router as refresh_token_router from .verify_token import router as verify_token_router -router = APIRouter() +router = APIRouter(prefix="/auth") router.include_router( generate_tokens_router, prefix="/token", tags=["Token Management"] diff --git a/apps/central_storage/webapi/routes/__init__.py b/apps/central_storage/webapi/routes/__init__.py index 66c5947..7b9d3b8 100644 --- a/apps/central_storage/webapi/routes/__init__.py +++ b/apps/central_storage/webapi/routes/__init__.py @@ -3,7 +3,7 @@ from .retrieve_document_info import router as ri_router from .upload_file import router as ud_router from .read_document_as_http_media import router as rd_router -api_router = APIRouter() +api_router = APIRouter(prefix="/central_storage") api_router.include_router(ri_router, tags=["document"]) api_router.include_router(ud_router, tags=["document"]) api_router.include_router(rd_router, tags=["document"]) diff --git a/apps/notification/webapi/routes/__init__.py b/apps/notification/webapi/routes/__init__.py index 24b738a..a42270f 100644 --- a/apps/notification/webapi/routes/__init__.py +++ b/apps/notification/webapi/routes/__init__.py @@ -2,8 +2,8 @@ from fastapi import APIRouter from .send_notification import router as sn_router from .online_platform_notification import router as ws_router -api_router = APIRouter() -api_router.include_router(sn_router, tags=["notification"]) +api_router = APIRouter(prefix="/content") +api_router.include_router(sn_router, prefix="/notification", tags=["notification"]) websocket_router = APIRouter() websocket_router.include_router(ws_router, prefix="/downstream", tags=["downstream"]) diff --git a/sites/notification/deploy/dev/.env b/sites/notification/deploy/dev/.env index 683d0a8..32ec4bd 100755 --- a/sites/notification/deploy/dev/.env +++ b/sites/notification/deploy/dev/.env @@ -1,4 +1,4 @@ -export RABBITMQ_HOST=freeleaps2-rabbitmq +export RABBITMQ_HOST=freeleaps-rabbitmq export RABBITMQ_PORT=5672 export FREELEAPS_ENV=dev