Merge remote-tracking branch 'origin/master'

routers/api/__init__.py

@@ -18,9 +18,15 @@ from . import spatialAnalysis
 from . import taskRegistration
 from . import pattern
 from . import rainfall
+from routers.prod_api import system
+from routers.prod_api import auth
 
 router = APIRouter()
 
+router.include_router(auth.router, prefix="/auth")
+
+router.include_router(system.router, prefix="/system")#, dependencies=[Depends(valid_access_token)])
+
 router.include_router(login_router)
 
 router.include_router(gateway.router, prefix="/gateway") #, dependencies=[Depends(valid_access_token)]

routers/prod_api/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from fastapi import APIRouter, Depends
 from common.security import valid_access_token
-
+from routers.api import upload_file
 from . import system
 from . import auth
 
@@ -12,3 +12,4 @@ router.include_router(auth.router, prefix="/auth")
 
 router.include_router(system.router, prefix="/system")#, dependencies=[Depends(valid_access_token)])
 
+router.include_router(upload_file.router, prefix="/file")

routers/prod_api/system/menu/__init__.py

@@ -516,7 +516,7 @@ async def update(
             e = detail
         raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
 
-@router.delete('/delete/{menu_id}')
+@router.delete('/{menu_id}')
 async def delete(
     menu_id: int,
     db: Session = Depends(get_db),