diff --git a/Router/AppManageRouter.py b/Router/AppManageRouter.py index 9ba51d9..e778da5 100644 --- a/Router/AppManageRouter.py +++ b/Router/AppManageRouter.py @@ -9,7 +9,7 @@ from Utils.SqlAlchemyUtils import get_db router = APIRouter( tags=["应用管理"], prefix="/api/app_manage", - # dependencies=[Depends(admin_auth_token_depend)] + dependencies=[Depends(admin_auth_token_depend)] ) diff --git a/Router/AuthRuleRouter.py b/Router/AuthRuleRouter.py index 25bef64..4933036 100644 --- a/Router/AuthRuleRouter.py +++ b/Router/AuthRuleRouter.py @@ -8,7 +8,7 @@ from Utils.SqlAlchemyUtils import get_db router = APIRouter( tags=["权限规则"], prefix="/api/auth_rule", - # dependencies=[Depends(admin_auth_token_depend)] + dependencies=[Depends(admin_auth_token_depend)] ) diff --git a/Router/PostRouter.py b/Router/PostRouter.py index 0a70c15..2cd7584 100644 --- a/Router/PostRouter.py +++ b/Router/PostRouter.py @@ -9,7 +9,7 @@ from Utils.SqlAlchemyUtils import get_db router = APIRouter( tags=["职务操作"], prefix="/api/post", - # dependencies=[Depends(admin_auth_token_depend)] + dependencies=[Depends(admin_auth_token_depend)] ) diff --git a/Utils/AuthUtils.py b/Utils/AuthUtils.py index a108cf5..fdfbce2 100644 --- a/Utils/AuthUtils.py +++ b/Utils/AuthUtils.py @@ -12,8 +12,9 @@ def create_token(data: dict, secret_key, algorithm, expires_delta: timedelta = t to_encode_body = dict() to_encode_body.update(data.copy()) # 设置过期时间 - expire = datetime.utcnow() + expires_delta - to_encode_body.update({"exp": expire}) + if timedelta: + expire = datetime.utcnow() + expires_delta + to_encode_body.update({"exp": expire}) # Token编码 encoded_jwt = jwt.encode(to_encode_body, secret_key, algorithm=algorithm) return encoded_jwt diff --git a/main.py b/main.py index a60de09..c87d053 100644 --- a/main.py +++ b/main.py @@ -2,15 +2,17 @@ import uvicorn from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware from Router import UserRouter, UserRegisterRouter, DepartmentRouter, PostRouter, AppRouter, UserManageRouter, \ - AppManageRouter,AuthRuleRouter + AppManageRouter, AuthRuleRouter from Utils.ConfigUtils import init_common_config from Utils.RedisUtils import init_redis_pool from Utils.SqlAlchemyUtils import Base, init_database from Context.common import ctx +from Utils.TestUtils import init_test_env init_common_config() init_database() init_redis_pool() +init_test_env() app = FastAPI( title="用户模块",