diff --git a/kinit-admin/src/config/axios/service.ts b/kinit-admin/src/config/axios/service.ts index 5409517..677baf1 100644 --- a/kinit-admin/src/config/axios/service.ts +++ b/kinit-admin/src/config/axios/service.ts @@ -114,7 +114,7 @@ service.interceptors.response.use( // 强制要求重新登录，因账号已冻结，账号已过期，手机号码错误，刷新token无效等问题导致 const authStore = useAuthStore() authStore.logout() - message = '未认证，请登录' + message = '认证已过期，请重新登录' break case 403: message = '拒绝访问' diff --git a/kinit-api/application/config/development.py b/kinit-api/application/config/development.py index d61463d..0519f35 100644 --- a/kinit-api/application/config/development.py +++ b/kinit-api/application/config/development.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/19 15:47 +# @Create Time : 2021/10/19 15:47 # @File : development.py # @IDE : PyCharm # @desc : 数据库生产配置文件 @@ -12,7 +12,6 @@ Mysql 数据库配置项 数据库链接配置说明：mysql+asyncmy://数据库用户名:数据库密码@数据库地址:数据库端口/数据库名称 """ SQLALCHEMY_DATABASE_URL = "mysql+asyncmy://数据库用户名:数据库密码@数据库地址:数据库端口/数据库名称" -SQLALCHEMY_DATABASE_TYPE = "mysql" """ diff --git a/kinit-api/application/config/production.py b/kinit-api/application/config/production.py index 8ac1d75..0b3c745 100644 --- a/kinit-api/application/config/production.py +++ b/kinit-api/application/config/production.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/19 15:47 +# @Create Time : 2021/10/19 15:47 # @File : production.py # @IDE : PyCharm # @desc : 数据库开发配置文件 @@ -12,7 +12,6 @@ Mysql 数据库配置项 数据库链接配置说明：mysql+asyncmy://数据库用户名:数据库密码@数据库地址:数据库端口/数据库名称 """ SQLALCHEMY_DATABASE_URL = "mysql+asyncmy://数据库用户名:数据库密码@数据库地址:数据库端口/数据库名称" -SQLALCHEMY_DATABASE_TYPE = "mysql" """ diff --git a/kinit-api/application/settings.py b/kinit-api/application/settings.py index b2a1a0b..308d4b6 100644 --- a/kinit-api/application/settings.py +++ b/kinit-api/application/settings.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/19 15:47 +# @Create Time : 2021/10/19 15:47 # @File : settings.py # @IDE : PyCharm # @desc : 主配置文件 @@ -11,7 +11,7 @@ from fastapi.security import OAuth2PasswordBearer """ 系统版本 """ -VERSION = "1.7.7" +VERSION = "1.7.8" """安全警告: 不要在生产中打开调试运行!""" DEBUG = True @@ -55,7 +55,7 @@ ACCESS_TOKEN_EXPIRE_MINUTES = 1440 """refresh_token 过期时间，用于刷新token使用，两天""" REFRESH_TOKEN_EXPIRE_MINUTES = 1440 * 2 """access_token 缓存时间，用于刷新token使用，30分钟""" -ACCESS_TOKEN_CACHE_MINUTES = 30 +ACCESS_TOKEN_CACHE_MINUTES = 60 * 2 """ 挂载临时文件目录，并添加路由访问，此路由不会在接口文档中显示 diff --git a/kinit-api/application/urls.py b/kinit-api/application/urls.py index 934f910..38af090 100644 --- a/kinit-api/application/urls.py +++ b/kinit-api/application/urls.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/19 15:47 +# @Create Time : 2021/10/19 15:47 # @File : urls.py # @IDE : PyCharm # @desc : 路由文件 diff --git a/kinit-api/apps/__init__.py b/kinit-api/apps/__init__.py index 71eb92b..39b4bf5 100644 --- a/kinit-api/apps/__init__.py +++ b/kinit-api/apps/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/2/24 10:19 +# @Create Time : 2022/2/24 10:19 # @File : __init__.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/apps/vadmin/analysis/views.py b/kinit-api/apps/vadmin/analysis/views.py index ea46918..3700c21 100644 --- a/kinit-api/apps/vadmin/analysis/views.py +++ b/kinit-api/apps/vadmin/analysis/views.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/10/19 15:41 +# @Create Time : 2022/10/19 15:41 # @File : views.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/apps/vadmin/auth/crud.py b/kinit-api/apps/vadmin/auth/crud.py index 7b19de5..6005934 100644 --- a/kinit-api/apps/vadmin/auth/crud.py +++ b/kinit-api/apps/vadmin/auth/crud.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/2/24 10:21 +# @Create Time : 2022/2/24 10:21 # @File : crud.py # @IDE : PyCharm # @desc : 增删改查 diff --git a/kinit-api/apps/vadmin/auth/models/__init__.py b/kinit-api/apps/vadmin/auth/models/__init__.py index 50f99be..425867d 100644 --- a/kinit-api/apps/vadmin/auth/models/__init__.py +++ b/kinit-api/apps/vadmin/auth/models/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : __init__.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/apps/vadmin/auth/models/m2m.py b/kinit-api/apps/vadmin/auth/models/m2m.py index 91da2ad..7da5e4a 100644 --- a/kinit-api/apps/vadmin/auth/models/m2m.py +++ b/kinit-api/apps/vadmin/auth/models/m2m.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : m2m.py # @IDE : PyCharm # @desc : 关联中间表 diff --git a/kinit-api/apps/vadmin/auth/models/menu.py b/kinit-api/apps/vadmin/auth/models/menu.py index 4b2caa6..a85dec8 100644 --- a/kinit-api/apps/vadmin/auth/models/menu.py +++ b/kinit-api/apps/vadmin/auth/models/menu.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : menu.py # @IDE : PyCharm # @desc : 菜单模型 diff --git a/kinit-api/apps/vadmin/auth/models/role.py b/kinit-api/apps/vadmin/auth/models/role.py index 5fd55a8..a957117 100644 --- a/kinit-api/apps/vadmin/auth/models/role.py +++ b/kinit-api/apps/vadmin/auth/models/role.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : role.py # @IDE : PyCharm # @desc : 角色模型 diff --git a/kinit-api/apps/vadmin/auth/models/user.py b/kinit-api/apps/vadmin/auth/models/user.py index 9eebdd4..f09080b 100644 --- a/kinit-api/apps/vadmin/auth/models/user.py +++ b/kinit-api/apps/vadmin/auth/models/user.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : user.py # @IDE : PyCharm # @desc : 用户模型 diff --git a/kinit-api/apps/vadmin/auth/params/role.py b/kinit-api/apps/vadmin/auth/params/role.py index c8890a6..0d1b00e 100644 --- a/kinit-api/apps/vadmin/auth/params/role.py +++ b/kinit-api/apps/vadmin/auth/params/role.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : role.py # @IDE : PyCharm # @desc : 查询参数-类依赖项 diff --git a/kinit-api/apps/vadmin/auth/params/user.py b/kinit-api/apps/vadmin/auth/params/user.py index b622978..b3ca398 100644 --- a/kinit-api/apps/vadmin/auth/params/user.py +++ b/kinit-api/apps/vadmin/auth/params/user.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : user.py # @IDE : PyCharm # @desc : 查询参数-类依赖项 diff --git a/kinit-api/apps/vadmin/auth/schemas/menu.py b/kinit-api/apps/vadmin/auth/schemas/menu.py index c614616..8b63793 100644 --- a/kinit-api/apps/vadmin/auth/schemas/menu.py +++ b/kinit-api/apps/vadmin/auth/schemas/menu.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : role.py # @IDE : PyCharm # @desc : pydantic 模型，用于数据库序列化操作 diff --git a/kinit-api/apps/vadmin/auth/schemas/role.py b/kinit-api/apps/vadmin/auth/schemas/role.py index affc002..b261058 100644 --- a/kinit-api/apps/vadmin/auth/schemas/role.py +++ b/kinit-api/apps/vadmin/auth/schemas/role.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : role.py # @IDE : PyCharm # @desc : pydantic 模型，用于数据库序列化操作 diff --git a/kinit-api/apps/vadmin/auth/schemas/user.py b/kinit-api/apps/vadmin/auth/schemas/user.py index dd61d43..1ddb728 100644 --- a/kinit-api/apps/vadmin/auth/schemas/user.py +++ b/kinit-api/apps/vadmin/auth/schemas/user.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : user.py # @IDE : PyCharm # @desc : pydantic 模型，用于数据库序列化操作 diff --git a/kinit-api/apps/vadmin/auth/utils/__init__.py b/kinit-api/apps/vadmin/auth/utils/__init__.py index 11b947c..28a9f31 100644 --- a/kinit-api/apps/vadmin/auth/utils/__init__.py +++ b/kinit-api/apps/vadmin/auth/utils/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/8/8 11:02 +# @Create Time : 2022/8/8 11:02 # @File : __init__.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/apps/vadmin/auth/utils/current.py b/kinit-api/apps/vadmin/auth/utils/current.py index 8c11a56..a29dc18 100644 --- a/kinit-api/apps/vadmin/auth/utils/current.py +++ b/kinit-api/apps/vadmin/auth/utils/current.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/24 16:44 +# @Create Time : 2021/10/24 16:44 # @File : current.py # @IDE : PyCharm # @desc : 获取认证后的信息工具 diff --git a/kinit-api/apps/vadmin/auth/utils/login.py b/kinit-api/apps/vadmin/auth/utils/login.py index ca4418a..f5bddf0 100644 --- a/kinit-api/apps/vadmin/auth/utils/login.py +++ b/kinit-api/apps/vadmin/auth/utils/login.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/24 16:44 +# @Create Time : 2021/10/24 16:44 # @File : views.py # @IDE : PyCharm # @desc : 安全认证视图 @@ -21,9 +21,10 @@ PassLib 是一个用于处理哈希密码的很棒的 Python 包。它支持许 from datetime import timedelta import jwt +from aioredis import Redis from fastapi import APIRouter, Depends, Request, Body from sqlalchemy.ext.asyncio import AsyncSession -from core.database import db_getter +from core.database import db_getter, redis_getter from utils import status from utils.response import SuccessResponse, ErrorResponse from application import settings @@ -74,11 +75,11 @@ async def login_for_access_token( @app.post("/wx/login/", summary="微信服务端一键登录", description="员工登录通道") -async def wx_login_for_access_token(request: Request, data: WXLoginForm, db: AsyncSession = Depends(db_getter)): +async def wx_login_for_access_token(data: WXLoginForm, db: AsyncSession = Depends(db_getter), rd: Redis = Depends(redis_getter)): try: if data.platform != "1" or data.method != "2": raise ValueError("无效参数") - wx = WXOAuth(request.app.state.redis, 0) + wx = WXOAuth(rd, 0) telephone = await wx.parsing_phone_number(data.code) if not telephone: raise ValueError("无效Code") diff --git a/kinit-api/apps/vadmin/auth/utils/login_manage.py b/kinit-api/apps/vadmin/auth/utils/login_manage.py index a52541a..3b5e09e 100644 --- a/kinit-api/apps/vadmin/auth/utils/login_manage.py +++ b/kinit-api/apps/vadmin/auth/utils/login_manage.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/8/8 11:02 +# @Create Time : 2022/8/8 11:02 # @File : auth_util.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/apps/vadmin/auth/utils/validation/__init__.py b/kinit-api/apps/vadmin/auth/utils/validation/__init__.py index 54310b4..b11f789 100644 --- a/kinit-api/apps/vadmin/auth/utils/validation/__init__.py +++ b/kinit-api/apps/vadmin/auth/utils/validation/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/11/9 10:14 +# @Create Time : 2022/11/9 10:14 # @File : __init__.py.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/apps/vadmin/auth/utils/validation/auth.py b/kinit-api/apps/vadmin/auth/utils/validation/auth.py index 0890543..1e515f8 100644 --- a/kinit-api/apps/vadmin/auth/utils/validation/auth.py +++ b/kinit-api/apps/vadmin/auth/utils/validation/auth.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/24 16:44 +# @Create Time : 2021/10/24 16:44 # @File : auth.py # @IDE : PyCharm # @desc : 用户凭证验证装饰器 diff --git a/kinit-api/apps/vadmin/auth/utils/validation/login.py b/kinit-api/apps/vadmin/auth/utils/validation/login.py index 654e348..8d7932e 100644 --- a/kinit-api/apps/vadmin/auth/utils/validation/login.py +++ b/kinit-api/apps/vadmin/auth/utils/validation/login.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/11/9 10:15 +# @Create Time : 2022/11/9 10:15 # @File : login.py # @IDE : PyCharm # @desc : 登录验证装饰器 diff --git a/kinit-api/apps/vadmin/auth/views.py b/kinit-api/apps/vadmin/auth/views.py index f8dc020..5925aa4 100644 --- a/kinit-api/apps/vadmin/auth/views.py +++ b/kinit-api/apps/vadmin/auth/views.py @@ -1,13 +1,15 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/2/24 17:02 +# @Create Time : 2022/2/24 17:02 # @File : views.py # @IDE : PyCharm # @desc : 简要说明 - +from aioredis import Redis from fastapi import APIRouter, Depends, Body, UploadFile, Request from sqlalchemy.orm import joinedload + +from core.database import redis_getter from utils.response import SuccessResponse, ErrorResponse from . import schemas, crud, models from core.dependencies import IdList @@ -114,23 +116,25 @@ async def post_import_users(file: UploadFile, auth: Auth = Depends(FullAdminAuth async def post_users_init_password( request: Request, ids: IdList = Depends(), - auth: Auth = Depends(FullAdminAuth(permissions=["auth.user.reset"])) + auth: Auth = Depends(FullAdminAuth(permissions=["auth.user.reset"])), + rd: Redis = Depends(redis_getter) ): - return SuccessResponse(await crud.UserDal(auth.db).init_password_send_sms(ids.ids, request.app.state.redis)) + return SuccessResponse(await crud.UserDal(auth.db).init_password_send_sms(ids.ids, rd)) @app.post("/users/init/password/send/email/", summary="初始化所选用户密码并发送通知邮件") async def post_users_init_password_send_email( request: Request, ids: IdList = Depends(), - auth: Auth = Depends(FullAdminAuth(permissions=["auth.user.reset"])) + auth: Auth = Depends(FullAdminAuth(permissions=["auth.user.reset"])), + rd: Redis = Depends(redis_getter) ): - return SuccessResponse(await crud.UserDal(auth.db).init_password_send_email(ids.ids, request.app.state.redis)) + return SuccessResponse(await crud.UserDal(auth.db).init_password_send_email(ids.ids, rd)) @app.put("/users/wx/server/openid/", summary="更新当前用户服务端微信平台openid") -async def put_user_wx_server_openid(request: Request, code: str, auth: Auth = Depends(AllUserAuth())): - result = await crud.UserDal(auth.db).update_wx_server_openid(code, auth.user, request.app.state.redis) +async def put_user_wx_server_openid(code: str, auth: Auth = Depends(AllUserAuth()), rd: Redis = Depends(redis_getter)): + result = await crud.UserDal(auth.db).update_wx_server_openid(code, auth.user, rd) return SuccessResponse(result) diff --git a/kinit-api/apps/vadmin/help/__init__.py b/kinit-api/apps/vadmin/help/__init__.py index 5ea4db5..188f261 100644 --- a/kinit-api/apps/vadmin/help/__init__.py +++ b/kinit-api/apps/vadmin/help/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2023-02-15 20:03:49 +# @Create Time : 2023-02-15 20:03:49 # @File : __init__.py # @IDE : PyCharm # @desc : 帮助中心 diff --git a/kinit-api/apps/vadmin/help/crud.py b/kinit-api/apps/vadmin/help/crud.py index 54b7d96..5863c5b 100644 --- a/kinit-api/apps/vadmin/help/crud.py +++ b/kinit-api/apps/vadmin/help/crud.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2023-02-15 20:03:49 +# @Create Time : 2023-02-15 20:03:49 # @File : crud.py # @IDE : PyCharm # @desc : 帮助中心 - 增删改查 diff --git a/kinit-api/apps/vadmin/help/models/__init__.py b/kinit-api/apps/vadmin/help/models/__init__.py index 4a79392..4eff4ee 100644 --- a/kinit-api/apps/vadmin/help/models/__init__.py +++ b/kinit-api/apps/vadmin/help/models/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2023-02-15 20:03:49 +# @Create Time : 2023-02-15 20:03:49 # @File : __init__.py # @IDE : PyCharm # @desc : 初始化文件 diff --git a/kinit-api/apps/vadmin/help/models/issue.py b/kinit-api/apps/vadmin/help/models/issue.py index ba495a0..9b0c1c5 100644 --- a/kinit-api/apps/vadmin/help/models/issue.py +++ b/kinit-api/apps/vadmin/help/models/issue.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : issue.py # @IDE : PyCharm # @desc : 常见问题 diff --git a/kinit-api/apps/vadmin/help/params/__init__.py b/kinit-api/apps/vadmin/help/params/__init__.py index 5ed4d5d..9731b73 100644 --- a/kinit-api/apps/vadmin/help/params/__init__.py +++ b/kinit-api/apps/vadmin/help/params/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2023-02-15 20:03:49 +# @Create Time : 2023-02-15 20:03:49 # @File : __init__.py # @IDE : PyCharm # @desc : 初始化文件 diff --git a/kinit-api/apps/vadmin/help/params/issue.py b/kinit-api/apps/vadmin/help/params/issue.py index 3c84972..9acb945 100644 --- a/kinit-api/apps/vadmin/help/params/issue.py +++ b/kinit-api/apps/vadmin/help/params/issue.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : issue.py # @IDE : PyCharm # @desc : 常见问题 diff --git a/kinit-api/apps/vadmin/help/schemas/__init__.py b/kinit-api/apps/vadmin/help/schemas/__init__.py index b1ad4ff..1ca0a09 100644 --- a/kinit-api/apps/vadmin/help/schemas/__init__.py +++ b/kinit-api/apps/vadmin/help/schemas/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2023-02-15 20:03:49 +# @Create Time : 2023-02-15 20:03:49 # @File : __init__.py # @IDE : PyCharm # @desc : 初始化文件 diff --git a/kinit-api/apps/vadmin/help/schemas/issue.py b/kinit-api/apps/vadmin/help/schemas/issue.py index df92f94..f20e765 100644 --- a/kinit-api/apps/vadmin/help/schemas/issue.py +++ b/kinit-api/apps/vadmin/help/schemas/issue.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : issue.py # @IDE : PyCharm # @desc : 常见问题 diff --git a/kinit-api/apps/vadmin/help/schemas/issue_category.py b/kinit-api/apps/vadmin/help/schemas/issue_category.py index 5107f14..c9c8420 100644 --- a/kinit-api/apps/vadmin/help/schemas/issue_category.py +++ b/kinit-api/apps/vadmin/help/schemas/issue_category.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : issue_category.py # @IDE : PyCharm # @desc : 常见问题类别 diff --git a/kinit-api/apps/vadmin/help/schemas/issue_m2m.py b/kinit-api/apps/vadmin/help/schemas/issue_m2m.py index e1b3603..181f75f 100644 --- a/kinit-api/apps/vadmin/help/schemas/issue_m2m.py +++ b/kinit-api/apps/vadmin/help/schemas/issue_m2m.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2023/2/17 15:18 +# @Create Time : 2023/2/17 15:18 # @File : issue_m2m.py.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/apps/vadmin/help/views.py b/kinit-api/apps/vadmin/help/views.py index 665827a..7380ee7 100644 --- a/kinit-api/apps/vadmin/help/views.py +++ b/kinit-api/apps/vadmin/help/views.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2023-02-15 20:03:49 +# @Create Time : 2023-02-15 20:03:49 # @File : views.py # @IDE : PyCharm # @desc : 帮助中心视图 diff --git a/kinit-api/apps/vadmin/record/crud.py b/kinit-api/apps/vadmin/record/crud.py index 217f4ff..8e8544e 100644 --- a/kinit-api/apps/vadmin/record/crud.py +++ b/kinit-api/apps/vadmin/record/crud.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:18 +# @Create Time : 2021/10/18 22:18 # @File : crud.py # @IDE : PyCharm # @desc : 数据库 增删改查操作 diff --git a/kinit-api/apps/vadmin/record/models/__init__.py b/kinit-api/apps/vadmin/record/models/__init__.py index 99b95aa..d8058df 100644 --- a/kinit-api/apps/vadmin/record/models/__init__.py +++ b/kinit-api/apps/vadmin/record/models/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/2/14 21:11 +# @Create Time : 2022/2/14 21:11 # @File : __init__.py.py # @IDE : PyCharm # @desc : xpath例子 diff --git a/kinit-api/apps/vadmin/record/models/login.py b/kinit-api/apps/vadmin/record/models/login.py index b1d883d..1d1b189 100644 --- a/kinit-api/apps/vadmin/record/models/login.py +++ b/kinit-api/apps/vadmin/record/models/login.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : login.py # @IDE : PyCharm # @desc : 登录记录模型 diff --git a/kinit-api/apps/vadmin/record/models/sms.py b/kinit-api/apps/vadmin/record/models/sms.py index f7d911e..a75a8c7 100644 --- a/kinit-api/apps/vadmin/record/models/sms.py +++ b/kinit-api/apps/vadmin/record/models/sms.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/3/21 17:36 +# @Create Time : 2022/3/21 17:36 # @File : sms.py # @IDE : PyCharm # @desc : 短信发送记录模型 diff --git a/kinit-api/apps/vadmin/record/params/login.py b/kinit-api/apps/vadmin/record/params/login.py index e8794ce..020cd27 100644 --- a/kinit-api/apps/vadmin/record/params/login.py +++ b/kinit-api/apps/vadmin/record/params/login.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : login.py # @IDE : PyCharm # @desc : 查询参数-类依赖项 diff --git a/kinit-api/apps/vadmin/record/params/operation.py b/kinit-api/apps/vadmin/record/params/operation.py index 5587136..ea17d1e 100644 --- a/kinit-api/apps/vadmin/record/params/operation.py +++ b/kinit-api/apps/vadmin/record/params/operation.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : operation.py # @IDE : PyCharm # @desc : 查询参数-类依赖项 diff --git a/kinit-api/apps/vadmin/record/params/sms.py b/kinit-api/apps/vadmin/record/params/sms.py index 7ec6e15..80e3aa2 100644 --- a/kinit-api/apps/vadmin/record/params/sms.py +++ b/kinit-api/apps/vadmin/record/params/sms.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : sms.py # @IDE : PyCharm # @desc : 查询参数-类依赖项 diff --git a/kinit-api/apps/vadmin/record/schemas/login.py b/kinit-api/apps/vadmin/record/schemas/login.py index e2b6c0d..cdf409f 100644 --- a/kinit-api/apps/vadmin/record/schemas/login.py +++ b/kinit-api/apps/vadmin/record/schemas/login.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : login.py # @IDE : PyCharm # @desc : pydantic 模型，用于数据库序列化操作 diff --git a/kinit-api/apps/vadmin/record/schemas/operation.py b/kinit-api/apps/vadmin/record/schemas/operation.py index d6bc203..76b46fc 100644 --- a/kinit-api/apps/vadmin/record/schemas/operation.py +++ b/kinit-api/apps/vadmin/record/schemas/operation.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : operation.py # @IDE : PyCharm # @desc : pydantic 模型，用于数据库序列化操作 diff --git a/kinit-api/apps/vadmin/record/schemas/sms.py b/kinit-api/apps/vadmin/record/schemas/sms.py index 8131bc5..4ea03f4 100644 --- a/kinit-api/apps/vadmin/record/schemas/sms.py +++ b/kinit-api/apps/vadmin/record/schemas/sms.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/3/21 17:54 +# @Create Time : 2022/3/21 17:54 # @File : sms.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/apps/vadmin/record/views.py b/kinit-api/apps/vadmin/record/views.py index a99b944..ec5f5b2 100644 --- a/kinit-api/apps/vadmin/record/views.py +++ b/kinit-api/apps/vadmin/record/views.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/24 16:44 +# @Create Time : 2021/10/24 16:44 # @File : views.py # @IDE : PyCharm # @desc : 主要接口文件 diff --git a/kinit-api/apps/vadmin/system/crud.py b/kinit-api/apps/vadmin/system/crud.py index 604ac81..5fb0603 100644 --- a/kinit-api/apps/vadmin/system/crud.py +++ b/kinit-api/apps/vadmin/system/crud.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:18 +# @Create Time : 2021/10/18 22:18 # @File : crud.py # @IDE : PyCharm # @desc : 数据库 增删改查操作 diff --git a/kinit-api/apps/vadmin/system/models/dict.py b/kinit-api/apps/vadmin/system/models/dict.py index 1ee397f..dddae87 100644 --- a/kinit-api/apps/vadmin/system/models/dict.py +++ b/kinit-api/apps/vadmin/system/models/dict.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : user.py # @IDE : PyCharm # @desc : 系统字典模型 diff --git a/kinit-api/apps/vadmin/system/models/settings.py b/kinit-api/apps/vadmin/system/models/settings.py index 6cc98c3..0590f6c 100644 --- a/kinit-api/apps/vadmin/system/models/settings.py +++ b/kinit-api/apps/vadmin/system/models/settings.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : settings.py # @IDE : PyCharm # @desc : 系统字典模型 diff --git a/kinit-api/apps/vadmin/system/models/settings_tab.py b/kinit-api/apps/vadmin/system/models/settings_tab.py index e45bfbd..1807912 100644 --- a/kinit-api/apps/vadmin/system/models/settings_tab.py +++ b/kinit-api/apps/vadmin/system/models/settings_tab.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/7/7 13:41 +# @Create Time : 2022/7/7 13:41 # @File : settings_tab.py # @IDE : PyCharm # @desc : 系统配置分类模型 diff --git a/kinit-api/apps/vadmin/system/params/dict_detail.py b/kinit-api/apps/vadmin/system/params/dict_detail.py index 3dcf10d..6dc250a 100644 --- a/kinit-api/apps/vadmin/system/params/dict_detail.py +++ b/kinit-api/apps/vadmin/system/params/dict_detail.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : dict_type.py # @IDE : PyCharm # @desc : 查询参数-类依赖项 diff --git a/kinit-api/apps/vadmin/system/params/dict_type.py b/kinit-api/apps/vadmin/system/params/dict_type.py index 4962cd5..5ea632e 100644 --- a/kinit-api/apps/vadmin/system/params/dict_type.py +++ b/kinit-api/apps/vadmin/system/params/dict_type.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : dict_type.py # @IDE : PyCharm # @desc : 查询参数-类依赖项 diff --git a/kinit-api/apps/vadmin/system/schemas/dict.py b/kinit-api/apps/vadmin/system/schemas/dict.py index 1a0167a..10c5f9f 100644 --- a/kinit-api/apps/vadmin/system/schemas/dict.py +++ b/kinit-api/apps/vadmin/system/schemas/dict.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : dict.py # @IDE : PyCharm # @desc : pydantic 模型，用于数据库序列化操作 diff --git a/kinit-api/apps/vadmin/system/schemas/settings.py b/kinit-api/apps/vadmin/system/schemas/settings.py index d93ad0b..e94d55e 100644 --- a/kinit-api/apps/vadmin/system/schemas/settings.py +++ b/kinit-api/apps/vadmin/system/schemas/settings.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : settings.py # @IDE : PyCharm # @desc : pydantic 模型，用于数据库序列化操作 diff --git a/kinit-api/apps/vadmin/system/schemas/settings_tab.py b/kinit-api/apps/vadmin/system/schemas/settings_tab.py index 6d32462..2c15d87 100644 --- a/kinit-api/apps/vadmin/system/schemas/settings_tab.py +++ b/kinit-api/apps/vadmin/system/schemas/settings_tab.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : settings_tab.py # @IDE : PyCharm # @desc : pydantic 模型，用于数据库序列化操作 diff --git a/kinit-api/apps/vadmin/system/views.py b/kinit-api/apps/vadmin/system/views.py index fd3d14f..25ee25c 100644 --- a/kinit-api/apps/vadmin/system/views.py +++ b/kinit-api/apps/vadmin/system/views.py @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/24 16:44 +# @Create Time : 2021/10/24 16:44 # @File : views.py # @IDE : PyCharm # @desc : 主要接口文件 # UploadFile 库依赖：pip install python-multipart from typing import List +from aioredis import Redis from fastapi import APIRouter, Depends, Body, UploadFile, Request, Form from sqlalchemy.ext.asyncio import AsyncSession from application.settings import ALIYUN_OSS -from core.database import db_getter +from core.database import db_getter, redis_getter from utils.file.aliyun_oss import AliyunOSS, BucketConf from utils.aliyun_sms import AliyunSMS from utils.file.file_manage import FileManage @@ -126,8 +127,8 @@ async def upload_image_to_local(file: UploadFile, path: str = Form(...)): # 短信服务管理 ########################################################### @app.post("/sms/send/", summary="发送短信验证码（阿里云服务）") -async def sms_send(request: Request, telephone: str): - sms = AliyunSMS(request.app.state.redis, telephone) +async def sms_send(telephone: str, rd: Redis = Depends(redis_getter)): + sms = AliyunSMS(rd, telephone) return SuccessResponse(await sms.main_async(AliyunSMS.Scene.login)) @@ -145,8 +146,8 @@ async def get_settings_tabs_values(tab_id: int, auth: Auth = Depends(FullAdminAu @app.put("/settings/tabs/values/", summary="更新系统配置信息") -async def put_settings_tabs_values(request: Request, datas: dict = Body(...), auth: Auth = Depends(FullAdminAuth())): - return SuccessResponse(await crud.SettingsDal(auth.db).update_datas(datas, request.app.state.redis)) +async def put_settings_tabs_values(datas: dict = Body(...), auth: Auth = Depends(FullAdminAuth()), rd: Redis = Depends(redis_getter)): + return SuccessResponse(await crud.SettingsDal(auth.db).update_datas(datas, rd)) @app.get("/settings/base/config/", summary="获取系统基础配置", description="每次进入系统中时使用") diff --git a/kinit-api/apps/vadmin/workplace/__init__.py b/kinit-api/apps/vadmin/workplace/__init__.py index 6b9785a..457f603 100644 --- a/kinit-api/apps/vadmin/workplace/__init__.py +++ b/kinit-api/apps/vadmin/workplace/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/10/19 15:41 +# @Create Time : 2022/10/19 15:41 # @File : __init__.py.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/apps/vadmin/workplace/views.py b/kinit-api/apps/vadmin/workplace/views.py index c23bddd..c5255a4 100644 --- a/kinit-api/apps/vadmin/workplace/views.py +++ b/kinit-api/apps/vadmin/workplace/views.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/10/19 15:41 +# @Create Time : 2022/10/19 15:41 # @File : views.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/core/crud.py b/kinit-api/core/crud.py index eb3ca76..3a2057e 100644 --- a/kinit-api/core/crud.py +++ b/kinit-api/core/crud.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:18 +# @Create Time : 2021/10/18 22:18 # @File : crud.py # @IDE : PyCharm # @desc : 数据库 增删改查操作 diff --git a/kinit-api/core/data_types.py b/kinit-api/core/data_types.py index edd12e1..9fa83c0 100644 --- a/kinit-api/core/data_types.py +++ b/kinit-api/core/data_types.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/11/14 12:42 +# @Create Time : 2022/11/14 12:42 # @File : data_types.py # @IDE : PyCharm # @desc : 自定义数据类型 diff --git a/kinit-api/core/database.py b/kinit-api/core/database.py index adc1d14..c7899e8 100644 --- a/kinit-api/core/database.py +++ b/kinit-api/core/database.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : database.py # @IDE : PyCharm # @desc : SQLAlchemy 部分 @@ -10,13 +10,16 @@ 安装： pip install sqlalchemy 中文文档：https://www.osgeo.cn/sqlalchemy/ """ +from aioredis import Redis from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession from sqlalchemy.ext.declarative import declared_attr, declarative_base from sqlalchemy.orm import sessionmaker -from application.settings import SQLALCHEMY_DATABASE_URL, DEBUG, SQLALCHEMY_DATABASE_TYPE +from application.settings import SQLALCHEMY_DATABASE_URL, REDIS_DB_ENABLE +from fastapi import Request +from core.exception import CustomException -def create_async_engine_session(database_url: str, database_type: str = "mysql"): +def create_async_engine_session(database_url: str): """ 创建数据库会话 @@ -33,13 +36,13 @@ def create_async_engine_session(database_url: str, database_type: str = "mysql") :return: """ engine = create_async_engine( - database_url - , echo=False - , pool_pre_ping=True - , pool_recycle=3600 - , future=True - , max_overflow=5 - , connect_args={"check_same_thread": False, "timeout": 30} if database_type == "sqlite3" else {} + database_url, + echo=False, + pool_pre_ping=True, + pool_recycle=3600, + future=True, + max_overflow=5, + connect_args={} ) return sessionmaker(autocommit=False, autoflush=False, bind=engine, expire_on_commit=True, class_=AsyncSession) @@ -84,6 +87,17 @@ async def db_getter(): 数据库依赖项，它将在单个请求中使用，然后在请求完成后将其关闭。 """ - async with create_async_engine_session(SQLALCHEMY_DATABASE_URL, SQLALCHEMY_DATABASE_TYPE)() as session: + async with create_async_engine_session(SQLALCHEMY_DATABASE_URL)() as session: async with session.begin(): yield session + + +def redis_getter(request: Request) -> Redis: + """ + 获取关系数据库 + + 数据库依赖项，它将在单个请求中使用，然后在请求完成后将其关闭。 + """ + if not REDIS_DB_ENABLE: + raise CustomException("请先配置Redis数据库链接并启用！", desc="请启用 application/settings.py: REDIS_DB_ENABLE") + return request.app.state.redis diff --git a/kinit-api/core/dependencies.py b/kinit-api/core/dependencies.py index e3cd5d1..6fa137b 100644 --- a/kinit-api/core/dependencies.py +++ b/kinit-api/core/dependencies.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/8/8 14:18 +# @Create Time : 2022/8/8 14:18 # @File : dependencies.py # @IDE : PyCharm # @desc : 常用依赖项 diff --git a/kinit-api/core/enum.py b/kinit-api/core/enum.py index 6454cb4..8fac768 100644 --- a/kinit-api/core/enum.py +++ b/kinit-api/core/enum.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2023/02/12 22:18 +# @Create Time : 2023/02/12 22:18 # @File : enum.py # @IDE : PyCharm # @desc : 增加枚举类方法 diff --git a/kinit-api/core/event.py b/kinit-api/core/event.py index 20a322b..737a948 100644 --- a/kinit-api/core/event.py +++ b/kinit-api/core/event.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/3/21 11:03 +# @Create Time : 2022/3/21 11:03 # @File : event.py # @IDE : PyCharm # @desc : 全局事件 @@ -63,7 +63,6 @@ async def connect_redis(app: FastAPI, status: bool): """ if status: print("Connecting to Redis") - assert isinstance(app, FastAPI) app.state.redis = aioredis.from_url(REDIS_DB_URL, decode_responses=True, health_check_interval=1) await Cache(app.state.redis).cache_tab_names() else: diff --git a/kinit-api/core/exception.py b/kinit-api/core/exception.py index 773a6cf..bb9c36c 100644 --- a/kinit-api/core/exception.py +++ b/kinit-api/core/exception.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/19 15:47 +# @Create Time : 2021/10/19 15:47 # @File : exception.py # @IDE : PyCharm # @desc : 全局异常处理 @@ -17,10 +17,17 @@ from core.logger import logger class CustomException(Exception): - def __init__(self, msg: str, code: int = status.HTTP_400_BAD_REQUEST, status_code: int = status.HTTP_200_OK): + def __init__( + self, + msg: str, + code: int = status.HTTP_400_BAD_REQUEST, + status_code: int = status.HTTP_200_OK, + desc: str = None + ): self.msg = msg self.code = code self.status_code = status_code + self.desc = desc def register_exception(app: FastAPI): @@ -33,8 +40,14 @@ def register_exception(app: FastAPI): """ 自定义异常 """ + print("请求地址", request.url.__str__()) + print("捕捉到重写CustomException异常异常：custom_exception_handler") + logger.error(exc.desc) + logger.error(exc.msg) + print(exc.desc) + print(exc.msg) return JSONResponse( - status_code=exc.status_code, + status_code=200, content={"message": exc.msg, "code": exc.code}, ) @@ -43,6 +56,7 @@ def register_exception(app: FastAPI): """ 重写HTTPException异常处理器 """ + print("请求地址", request.url.__str__()) print("捕捉到重写HTTPException异常异常：unicorn_exception_handler") logger.error(exc.detail) print(exc.detail) @@ -59,6 +73,7 @@ def register_exception(app: FastAPI): """ 重写请求验证异常处理器 """ + print("请求地址", request.url.__str__()) print("捕捉到重写请求验证异常异常：validation_exception_handler") logger.error(exc.errors()) print(exc.errors()) @@ -88,6 +103,7 @@ def register_exception(app: FastAPI): """ 捕获值异常 """ + print("请求地址", request.url.__str__()) print("捕捉到值异常：value_exception_handler") logger.error(exc.__str__()) print(exc.__str__()) @@ -106,6 +122,7 @@ def register_exception(app: FastAPI): """ 捕获全部异常 """ + print("请求地址", request.url.__str__()) print("捕捉到全局异常：all_exception_handler") logger.error(exc.__str__()) return JSONResponse( diff --git a/kinit-api/core/logger.py b/kinit-api/core/logger.py index 4e0d9df..12000a1 100644 --- a/kinit-api/core/logger.py +++ b/kinit-api/core/logger.py @@ -20,10 +20,3 @@ log_path_error = os.path.join(log_path, f'error_{time.strftime("%Y-%m-%d")}.log' info = logger.add(log_path_info, rotation="00:00", retention="3 days", enqueue=True, encoding="UTF-8", level="INFO") error = logger.add(log_path_error, rotation="00:00", retention="3 days", enqueue=True, encoding="UTF-8", level="ERROR") - - -if __name__ == '__main__': - print(BASE_DIR) - # logger.info("1") - retry: int = 1 - logger.error("未从Redis中获取到配置信息，正在重新更新配置信息，重试次数：{}。".format(retry)) diff --git a/kinit-api/core/middleware.py b/kinit-api/core/middleware.py index 79c7fe0..43ecf8b 100644 --- a/kinit-api/core/middleware.py +++ b/kinit-api/core/middleware.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/19 15:47 +# @Create Time : 2021/10/19 15:47 # @File : middleware.py # @IDE : PyCharm # @desc : 中间件 diff --git a/kinit-api/core/validator.py b/kinit-api/core/validator.py index 59c1f49..49d157a 100644 --- a/kinit-api/core/validator.py +++ b/kinit-api/core/validator.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : validator.py # @IDE : PyCharm # @desc : pydantic 模型重用验证器 diff --git a/kinit-api/db/db_base.py b/kinit-api/db/db_base.py index e43fe01..4ee9fbf 100644 --- a/kinit-api/db/db_base.py +++ b/kinit-api/db/db_base.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/18 22:19 +# @Create Time : 2021/10/18 22:19 # @File : db_base.py # @IDE : PyCharm # @desc : 数据库公共 ORM 模型 diff --git a/kinit-api/main.py b/kinit-api/main.py index e7a2c37..88f1c01 100644 --- a/kinit-api/main.py +++ b/kinit-api/main.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/19 15:47 +# @Create Time : 2021/10/19 15:47 # @File : main.py # @IDE : PyCharm # @desc : 主程序入口 diff --git a/kinit-api/scripts/create_app/__init__.py b/kinit-api/scripts/create_app/__init__.py index 3ddce18..4c32334 100644 --- a/kinit-api/scripts/create_app/__init__.py +++ b/kinit-api/scripts/create_app/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/12/9 15:26 +# @Create Time : 2022/12/9 15:26 # @File : __init__.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/scripts/create_app/main.py b/kinit-api/scripts/create_app/main.py index 1771bd5..85b99eb 100644 --- a/kinit-api/scripts/create_app/main.py +++ b/kinit-api/scripts/create_app/main.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/12/9 15:27 +# @Create Time : 2022/12/9 15:27 # @File : main.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/scripts/create_app/template/crud.py b/kinit-api/scripts/create_app/template/crud.py index 97bfb18..4f1f413 100644 --- a/kinit-api/scripts/create_app/template/crud.py +++ b/kinit-api/scripts/create_app/template/crud.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : {create_datetime} +# @Create Time : {create_datetime} # @File : crud.py # @IDE : PyCharm # @desc : diff --git a/kinit-api/scripts/create_app/template/init.py b/kinit-api/scripts/create_app/template/init.py index 966f0aa..b839c61 100644 --- a/kinit-api/scripts/create_app/template/init.py +++ b/kinit-api/scripts/create_app/template/init.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : {create_datetime} +# @Create Time : {create_datetime} # @File : {filename} # @IDE : PyCharm # @desc : {desc} diff --git a/kinit-api/scripts/create_app/template/views.py b/kinit-api/scripts/create_app/template/views.py index ca0a259..fe272d0 100644 --- a/kinit-api/scripts/create_app/template/views.py +++ b/kinit-api/scripts/create_app/template/views.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : {create_datetime} +# @Create Time : {create_datetime} # @File : views.py # @IDE : PyCharm # @desc : diff --git a/kinit-api/scripts/initialize/__init__.py b/kinit-api/scripts/initialize/__init__.py index 042b075..d42d374 100644 --- a/kinit-api/scripts/initialize/__init__.py +++ b/kinit-api/scripts/initialize/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/10/19 15:47 +# @Create Time : 2021/10/19 15:47 # @File : initialize.py # @IDE : PyCharm # @desc : 初始化数据 diff --git a/kinit-api/scripts/initialize/initialize.py b/kinit-api/scripts/initialize/initialize.py index 765faa1..1686b29 100644 --- a/kinit-api/scripts/initialize/initialize.py +++ b/kinit-api/scripts/initialize/initialize.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/11/23 11:21 +# @Create Time : 2022/11/23 11:21 # @File : initialize.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/utils/aliyun_sms.py b/kinit-api/utils/aliyun_sms.py index b014b7c..2681a1b 100644 --- a/kinit-api/utils/aliyun_sms.py +++ b/kinit-api/utils/aliyun_sms.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.3 -# @Creaet Time : 2021/3/15 +# @Create Time : 2021/3/15 # @Author : LZK # @File : aliyun_sms.py # @Software : PyCharm diff --git a/kinit-api/utils/cache.py b/kinit-api/utils/cache.py index 01a443f..2aa2889 100644 --- a/kinit-api/utils/cache.py +++ b/kinit-api/utils/cache.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/3/21 11:03 +# @Create Time : 2022/3/21 11:03 # @File : cache.py # @IDE : PyCharm # @desc : 缓存 diff --git a/kinit-api/utils/count.py b/kinit-api/utils/count.py index 395a364..c1f9609 100644 --- a/kinit-api/utils/count.py +++ b/kinit-api/utils/count.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/11/3 17:23 +# @Create Time : 2022/11/3 17:23 # @File : count.py # @IDE : PyCharm # @desc : 计数 diff --git a/kinit-api/utils/excel/__init__.py b/kinit-api/utils/excel/__init__.py index b464681..5321bf3 100644 --- a/kinit-api/utils/excel/__init__.py +++ b/kinit-api/utils/excel/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/11/14 9:56 +# @Create Time : 2022/11/14 9:56 # @File : __init__.py.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/utils/excel/excel_manage.py b/kinit-api/utils/excel/excel_manage.py index 6d50bb0..4d9974e 100644 --- a/kinit-api/utils/excel/excel_manage.py +++ b/kinit-api/utils/excel/excel_manage.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/5/6 17:25 +# @Create Time : 2022/5/6 17:25 # @File : excel_manage.py # @IDE : PyCharm # @desc : EXCEL 文件操作 diff --git a/kinit-api/utils/excel/import_manage.py b/kinit-api/utils/excel/import_manage.py index be56ac4..957d73a 100644 --- a/kinit-api/utils/excel/import_manage.py +++ b/kinit-api/utils/excel/import_manage.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/12/5 8:45 +# @Create Time : 2021/12/5 8:45 # @File : import_manage.py # @IDE : PyCharm # @desc : 数据导入管理 diff --git a/kinit-api/utils/excel/write_xlsx.py b/kinit-api/utils/excel/write_xlsx.py index a6ddede..6a561f6 100644 --- a/kinit-api/utils/excel/write_xlsx.py +++ b/kinit-api/utils/excel/write_xlsx.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/11/11 12:01 +# @Create Time : 2022/11/11 12:01 # @File : write_xlsx.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/utils/file/__init__.py b/kinit-api/utils/file/__init__.py index 927cc69..8e23adb 100644 --- a/kinit-api/utils/file/__init__.py +++ b/kinit-api/utils/file/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/12/12 14:30 +# @Create Time : 2022/12/12 14:30 # @File : __init__.py.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/utils/file/aliyun_oss.py b/kinit-api/utils/file/aliyun_oss.py index d3e0de5..9d67fc0 100644 --- a/kinit-api/utils/file/aliyun_oss.py +++ b/kinit-api/utils/file/aliyun_oss.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/4/28 22:32 +# @Create Time : 2022/4/28 22:32 # @File : aliyun_oss.py # @IDE : PyCharm # @desc : 阿里云对象存储 diff --git a/kinit-api/utils/file/file_base.py b/kinit-api/utils/file/file_base.py index 5a94e98..eb89838 100644 --- a/kinit-api/utils/file/file_base.py +++ b/kinit-api/utils/file/file_base.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/12/12 14:31 +# @Create Time : 2022/12/12 14:31 # @File : file_base.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/utils/file/file_manage.py b/kinit-api/utils/file/file_manage.py index ad04b80..86e452a 100644 --- a/kinit-api/utils/file/file_manage.py +++ b/kinit-api/utils/file/file_manage.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/12/5 8:45 +# @Create Time : 2021/12/5 8:45 # @File : file_manage.py # @IDE : PyCharm # @desc : 保存图片到本地 diff --git a/kinit-api/utils/ip_manage.py b/kinit-api/utils/ip_manage.py index 57a8804..3dc80a3 100644 --- a/kinit-api/utils/ip_manage.py +++ b/kinit-api/utils/ip_manage.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/11/3 17:23 +# @Create Time : 2022/11/3 17:23 # @File : ip_manage.py # @IDE : PyCharm # @desc : 获取IP地址归属地 diff --git a/kinit-api/utils/send_email.py b/kinit-api/utils/send_email.py index 1365b8a..14d9c49 100644 --- a/kinit-api/utils/send_email.py +++ b/kinit-api/utils/send_email.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2023/3/27 9:48 +# @Create Time : 2023/3/27 9:48 # @File : send_email.py # @IDE : PyCharm # @desc : 发送邮件封装类 diff --git a/kinit-api/utils/status.py b/kinit-api/utils/status.py index b8674b9..3b18fe4 100644 --- a/kinit-api/utils/status.py +++ b/kinit-api/utils/status.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/8/10 22:20 +# @Create Time : 2022/8/10 22:20 # @File : status.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/utils/tools.py b/kinit-api/utils/tools.py index 93e0066..52889ca 100644 --- a/kinit-api/utils/tools.py +++ b/kinit-api/utils/tools.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/10/9 17:09 +# @Create Time : 2022/10/9 17:09 # @File : tools.py # @IDE : PyCharm # @desc : 工具类 diff --git a/kinit-api/utils/wx/__init__.py b/kinit-api/utils/wx/__init__.py index ffebf0b..019a7ad 100644 --- a/kinit-api/utils/wx/__init__.py +++ b/kinit-api/utils/wx/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/3/15 20:18 +# @Create Time : 2022/3/15 20:18 # @File : __init__.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/utils/wx/oauth.py b/kinit-api/utils/wx/oauth.py index 7f503c1..29ee77c 100644 --- a/kinit-api/utils/wx/oauth.py +++ b/kinit-api/utils/wx/oauth.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2022/3/15 20:44 +# @Create Time : 2022/3/15 20:44 # @File : oauth.py # @IDE : PyCharm # @desc : 简要说明 diff --git a/kinit-api/utils/wx/wx_access_token.py b/kinit-api/utils/wx/wx_access_token.py index 419d484..f6095be 100644 --- a/kinit-api/utils/wx/wx_access_token.py +++ b/kinit-api/utils/wx/wx_access_token.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # @version : 1.0 -# @Creaet Time : 2021/11/27 18:37 +# @Create Time : 2021/11/27 18:37 # @File : wx_access_token.py # @IDE : PyCharm # @desc : 获取小程序全局唯一后台接口调用凭据