no message

common/security.py

@@ -13,11 +13,8 @@ from extensions import logger
 # https://fastapi.tiangolo.com/tutorial/security/oauth2-jwt/
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-#="Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxIiwiZXhwIjoyMDM5Njk2ODMzfQ.Rhd38oo_S1odjg0xnT4n31cCWCAAPXGb8y_V2XcgqzQ")->int:#
-def valid_access_token(Authorization: str = Header(..., alias="Authorization")) -> int:
 
-# 目前小屏测试还不能用登录功能，暂时先这样 2024/11/03
-# def valid_access_token(Authorization: str = Header("Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxIiwiZXhwIjoyMDM5Njk2ODMzfQ.Rhd38oo_S1odjg0xnT4n31cCWCAAPXGb8y_V2XcgqzQ"))->int:
+def valid_access_token(Authorization: str = Header(..., alias="Authorization")) -> int:
     try:
         access_token = Authorization.removeprefix("Bearer ")
 
@@ -27,8 +24,7 @@ def valid_access_token(Authorization: str = Header(..., alias="Authorization"))
         user_id: str = payload.get("sub")
         logger.info('sub user_id: {}', user_id)
     except Exception:
-        return -1
-        #raise token_exception
+        raise token_exception
     
     return int(user_id)
 

routers/api/__init__.py

@@ -48,48 +48,45 @@ async def callback(request: Request, code: str, state: str):
     return RedirectResponse(url)
 
 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)]
-router.include_router(dataAnalysis.router, prefix="/dataAnalysis")
-router.include_router(resourceMonitoring.router, prefix="/resource")
-router.include_router(jobs.router, prefix="/jobs")
-router.include_router(OneShareProxyHandler.router, prefix="/oneShare")
-router.include_router(upload_file.router, prefix="/file")
-router.include_router(videoResource.router, prefix="/videoResource")
-router.include_router(Knowledge.router, prefix="/knowledge")
-router.include_router(taskRegistration.router, prefix="/taskRegistration")
-router.include_router(emergencyPlans.router, prefix="/emergency_plan")
-router.include_router(riskMonitor.router, prefix="/risk_monitor")
-router.include_router(temperaturePrecipitation.router, prefix="/temperature_precipitation")
-router.include_router(layerConfiguration.router, prefix="/layerConfiguration", tags=["图层配置"])
-router.include_router(dataFilling.router, prefix="/dataFilling")
-router.include_router(resourceProvison.router, prefix="/resource_provison")
-router.include_router(hazardStandards.router, prefix="/hazardStandards")
-
-router.include_router(eventManagement.router, prefix="/event_management", tags=["事件管理"])
-router.include_router(spatialAnalysis.router, prefix="/spatial_analysis", tags=["空间分析"])
-router.include_router(pattern.router, prefix="/pattern", tags=["实时测绘"])
+router.include_router(system.router, prefix="/system", dependencies=[Depends(valid_access_token)])
 
-router.include_router(rainfall.router, prefix="/rainfall", tags=["雨情分析"])
+router.include_router(gateway.router, prefix="/gateway", dependencies=[Depends(valid_access_token)])
+router.include_router(dataAnalysis.router, prefix="/dataAnalysis", dependencies=[Depends(valid_access_token)])
+router.include_router(resourceMonitoring.router, prefix="/resource", dependencies=[Depends(valid_access_token)])
+router.include_router(jobs.router, prefix="/jobs", dependencies=[Depends(valid_access_token)])
+router.include_router(OneShareProxyHandler.router, prefix="/oneShare", dependencies=[Depends(valid_access_token)])
+router.include_router(upload_file.router, prefix="/file", dependencies=[Depends(valid_access_token)])
+router.include_router(videoResource.router, prefix="/videoResource", dependencies=[Depends(valid_access_token)])
+router.include_router(Knowledge.router, prefix="/knowledge", dependencies=[Depends(valid_access_token)])
+router.include_router(taskRegistration.router, prefix="/taskRegistration", dependencies=[Depends(valid_access_token)])
+router.include_router(emergencyPlans.router, prefix="/emergency_plan", dependencies=[Depends(valid_access_token)])
+router.include_router(riskMonitor.router, prefix="/risk_monitor", dependencies=[Depends(valid_access_token)])
+router.include_router(temperaturePrecipitation.router, prefix="/temperature_precipitation", dependencies=[Depends(valid_access_token)])
+router.include_router(layerConfiguration.router, prefix="/layerConfiguration", tags=["图层配置"], dependencies=[Depends(valid_access_token)])
+router.include_router(dataFilling.router, prefix="/dataFilling", dependencies=[Depends(valid_access_token)])
+router.include_router(resourceProvison.router, prefix="/resource_provison", dependencies=[Depends(valid_access_token)])
+router.include_router(hazardStandards.router, prefix="/hazardStandards", dependencies=[Depends(valid_access_token)])
 
-router.include_router(infoPublish.router, prefix="/info_publish")
+router.include_router(eventManagement.router, prefix="/event_management", tags=["事件管理"], dependencies=[Depends(valid_access_token)])
+router.include_router(spatialAnalysis.router, prefix="/spatial_analysis", tags=["空间分析"], dependencies=[Depends(valid_access_token)])
+router.include_router(pattern.router, prefix="/pattern", tags=["实时测绘"], dependencies=[Depends(valid_access_token)])
 
-router.include_router(riskManagement.router, prefix="/riskManagement", tags=["风险防控"])
+router.include_router(rainfall.router, prefix="/rainfall", tags=["雨情分析"], dependencies=[Depends(valid_access_token)])
 
-router.include_router(onlineRollCall.router, prefix="/online_roll_call", tags=["在线点名"])
+router.include_router(infoPublish.router, prefix="/info_publish", dependencies=[Depends(valid_access_token)])
 
-router.include_router(dutyManagement.router, prefix="/duty_management", tags=["值班管理"])
+router.include_router(riskManagement.router, prefix="/riskManagement", tags=["风险防控"], dependencies=[Depends(valid_access_token)])
 
-router.include_router(companyManagement.router, prefix="/companyManagement", tags=["企业管理"]) #企业画像
+router.include_router(onlineRollCall.router, prefix="/online_roll_call", tags=["在线点名"], dependencies=[Depends(valid_access_token)])
 
-router.include_router(yst.router, prefix="/yst", tags=["粤商通"])
+router.include_router(dutyManagement.router, prefix="/duty_management", tags=["值班管理"], dependencies=[Depends(valid_access_token)])
 
-router.include_router(comprehensive_search.router, prefix="/comprehensive/search", tags=["全局搜索"])
-router.include_router(ThreeProofingResponsible.router, prefix="/ThreeProofingResponsible", tags=["三防责任人管理"])
-router.include_router(city.router, prefix="/city", tags=["区划"])
+router.include_router(companyManagement.router, prefix="/companyManagement", tags=["企业管理"], dependencies=[Depends(valid_access_token)]) #企业画像
 
+router.include_router(comprehensive_search.router, prefix="/comprehensive/search", tags=["全局搜索"], dependencies=[Depends(valid_access_token)])
+router.include_router(ThreeProofingResponsible.router, prefix="/ThreeProofingResponsible", tags=["三防责任人管理"], dependencies=[Depends(valid_access_token)])
+router.include_router(city.router, prefix="/city", tags=["区划"], dependencies=[Depends(valid_access_token)])
 
+router.include_router(yst.router, prefix="/yst", tags=["粤商通"], dependencies=[Depends(valid_access_token)])