将 aioredis 依赖包替换为 redis 依赖包，当前最新版 redis 包已支持异步操作

kinit-api/application/settings.py

@@ -11,7 +11,7 @@ from fastapi.security import OAuth2PasswordBearer
 """
 系统版本
 """
-VERSION = "2.1.1"
+VERSION = "2.2.0"
 
 """安全警告: 不要在生产中打开调试运行!"""
 DEBUG = False

kinit-api/apps/vadmin/auth/crud.py

@@ -7,7 +7,7 @@
 # @desc           : 增删改查
 
 from typing import Any
-from aioredis import Redis
+from redis.asyncio import Redis
 from fastapi import UploadFile
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.strategy_options import _AbstractLoad

kinit-api/apps/vadmin/auth/utils/login.py

@@ -20,7 +20,7 @@ PassLib 是一个用于处理哈希密码的很棒的 Python 包。它支持许
 """
 
 from datetime import timedelta
-from aioredis import Redis
+from redis.asyncio import Redis
 from fastapi import APIRouter, Depends, Request, Body
 from fastapi.security import OAuth2PasswordRequestForm
 from sqlalchemy.ext.asyncio import AsyncSession

kinit-api/apps/vadmin/auth/views.py

@@ -6,7 +6,7 @@
 # @IDE            : PyCharm
 # @desc           : 简要说明
 
-from aioredis import Redis
+from redis.asyncio import Redis
 from fastapi import APIRouter, Depends, Body, UploadFile, Request
 from sqlalchemy.orm import joinedload
 from core.database import redis_getter

kinit-api/apps/vadmin/system/crud.py

@@ -10,7 +10,7 @@ import json
 import os
 from enum import Enum
 from typing import Any
-from aioredis import Redis
+from redis.asyncio import Redis
 from fastapi.encoders import jsonable_encoder
 from motor.motor_asyncio import AsyncIOMotorDatabase
 from sqlalchemy import select, update

kinit-api/apps/vadmin/system/views.py

@@ -5,7 +5,7 @@
 # @IDE            : PyCharm
 # @desc           : 主要接口文件
 
-from aioredis import Redis
+from redis.asyncio import Redis
 from fastapi import APIRouter, Depends, Body, UploadFile, Form, Request
 from motor.motor_asyncio import AsyncIOMotorDatabase
 from sqlalchemy.ext.asyncio import AsyncSession

kinit-api/core/database.py

@@ -11,7 +11,7 @@
 官方文档：https://docs.sqlalchemy.org/en/20/intro.html#installation
 """
 from typing import AsyncGenerator
-from aioredis import Redis
+from redis.asyncio import Redis
 from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession, async_sessionmaker, AsyncAttrs
 from sqlalchemy.orm import DeclarativeBase, declared_attr
 from application.settings import SQLALCHEMY_DATABASE_URL, REDIS_DB_ENABLE, MONGO_DB_ENABLE

kinit-api/core/event.py

@@ -11,7 +11,7 @@ from fastapi import FastAPI
 from motor.motor_asyncio import AsyncIOMotorClient
 from application.settings import REDIS_DB_URL, MONGO_DB_URL, MONGO_DB_NAME, EVENTS
 from utils.cache import Cache
-import aioredis
+from redis import asyncio as aioredis
 from contextlib import asynccontextmanager
 from utils.tools import import_modules_async
 

kinit-api/utils/cache.py

@@ -13,7 +13,7 @@ from core.logger import logger  # 注意：报错就在这里，如果只写 cor
 from core.database import db_getter
 from apps.vadmin.system.models import VadminSystemSettingsTab
 import json
-from aioredis.client import Redis
+from redis.asyncio.client import Redis
 from core.exception import CustomException
 from utils import status
 

kinit-api/utils/count.py

@@ -7,7 +7,7 @@
 # @desc           : 计数
 
 
-from aioredis.client import Redis
+from redis.asyncio.client import Redis
 
 
 class Count:

kinit-api/utils/send_email.py

@@ -12,7 +12,7 @@ from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from email.mime.application import MIMEApplication
 from typing import List
-from aioredis import Redis
+from redis.asyncio import Redis
 
 from core.exception import CustomException
 from utils.cache import Cache

kinit-api/utils/sms/aliyun.py

@@ -27,7 +27,7 @@ from alibabacloud_dysmsapi20170525 import models as dysmsapi_20170525_models
 from alibabacloud_tea_util import models as util_models
 from core.logger import logger
 import datetime
-from aioredis.client import Redis
+from redis.asyncio.client import Redis
 from utils.cache import Cache
 from utils.db_getter import DBGetter
 

kinit-api/utils/sms/code.py

@@ -8,7 +8,7 @@
 
 import datetime
 import warnings
-from aioredis import Redis
+from redis.asyncio import Redis
 from .aliyun import AliyunSMS
 from core.logger import logger
 from core.exception import CustomException

kinit-api/utils/sms/reset_passwd.py

@@ -7,7 +7,7 @@
 # @desc           : 重置密码
 
 from typing import List
-from aioredis import Redis
+from redis.asyncio import Redis
 from .aliyun import AliyunSMS
 
 
@@ -24,7 +24,7 @@ class ResetPasswordSMS(AliyunSMS):
         主程序入口，异步方式
 
         redis 对象必填
-        @params password: 新密码
+        :param password: 新密码
         """
         return await super().main_async(password=password)
 
@@ -32,7 +32,7 @@ class ResetPasswordSMS(AliyunSMS):
         """
         主程序入口，同步方式
 
-        @params password: 新密码
+        :param password: 新密码
         """
         return super().main(password=password)
 

kinit-api/utils/wx/oauth.py

@@ -10,7 +10,7 @@ import requests
 from core.logger import logger
 from utils.cache import Cache
 from utils.wx.wx_access_token import WxAccessToken
-from aioredis import Redis
+from redis.asyncio import Redis
 
 
 class WXOAuth:

kinit-api/utils/wx/wx_access_token.py

@@ -7,7 +7,7 @@
 # @desc           : 获取小程序全局唯一后台接口调用凭据
 
 import requests
-from aioredis import Redis
+from redis.asyncio import Redis
 from core.logger import logger