!11 RuoYi-Vue3-FastAPI v1.2.0

Merge pull request !11 from insistence/async-database

Author: insistence

README.md

@@ -1,12 +1,12 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi-Vue3-FastAPI v1.1.3</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi-Vue3-FastAPI v1.2.0</h1>
 <h4 align="center">基于RuoYi-Vue3+FastAPI前后端分离的快速开发框架</h4>
 <p align="center">
 	<a href="https://gitee.com/insistence2022/RuoYi-Vue3-FastAPI/stargazers"><img src="https://gitee.com/insistence2022/RuoYi-Vue3-FastAPI/badge/star.svg?theme=dark"></a>
     <a href="https://github.com/insistence/RuoYi-Vue3-FastAPI"><img src="https://img.shields.io/github/stars/insistence/RuoYi-Vue3-FastAPI?style=social"></a>
-	<a href="https://gitee.com/insistence2022/RuoYi-Vue3-FastAPI"><img src="https://img.shields.io/badge/RuoYiVue3FastAPI-v1.1.3-brightgreen.svg"></a>
+	<a href="https://gitee.com/insistence2022/RuoYi-Vue3-FastAPI"><img src="https://img.shields.io/badge/RuoYiVue3FastAPI-v1.2.0-brightgreen.svg"></a>
 	<a href="https://gitee.com/insistence2022/RuoYi-Vue3-FastAPI/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
     <img src="https://img.shields.io/badge/python-≥3.8-blue">
     <img src="https://img.shields.io/badge/MySQL-≥5.7-blue">
@@ -18,7 +18,6 @@
 
 
 
-
 ## 平台简介
 
 RuoYi-Vue3-FastAPI是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。

ruoyi-fastapi-backend/.env.dev

@@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0'
 # 应用端口
 APP_PORT = 9099
 # 应用版本
-APP_VERSION= '1.1.3'
+APP_VERSION= '1.2.0'
 # 应用是否开启热重载
 APP_RELOAD = true
 # 应用是否开启IP归属区域查询

ruoyi-fastapi-backend/.env.prod

@@ -10,13 +10,13 @@ APP_HOST = '0.0.0.0'
 # 应用端口
 APP_PORT = 9099
 # 应用版本
-APP_VERSION= '1.1.3'
+APP_VERSION= '1.2.0'
 # 应用是否开启热重载
 APP_RELOAD = false
 # 应用是否开启IP归属区域查询
 APP_IP_LOCATION_QUERY = true
 # 应用是否允许账号同时登录
-APP_SAMETIME_LOGIN = true
+APP_SAME_TIME_LOGIN = true
 
 # -------- Jwt配置 --------
 # Jwt秘钥

ruoyi-fastapi-backend/config/database.py

@@ -1,19 +1,23 @@
-from sqlalchemy import create_engine
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.ext.asyncio import create_async_engine
+from sqlalchemy.ext.asyncio import async_sessionmaker
+from sqlalchemy.ext.asyncio import AsyncAttrs
+from sqlalchemy.orm import DeclarativeBase
 from urllib.parse import quote_plus
 from config.env import DataBaseConfig
 
-SQLALCHEMY_DATABASE_URL = f"mysql+pymysql://{DataBaseConfig.db_username}:{quote_plus(DataBaseConfig.db_password)}@" \
+ASYNC_SQLALCHEMY_DATABASE_URL = f"mysql+asyncmy://{DataBaseConfig.db_username}:{quote_plus(DataBaseConfig.db_password)}@" \
                           f"{DataBaseConfig.db_host}:{DataBaseConfig.db_port}/{DataBaseConfig.db_database}"
 
-engine = create_engine(
-    SQLALCHEMY_DATABASE_URL,
+async_engine = create_async_engine(
+    ASYNC_SQLALCHEMY_DATABASE_URL,
     echo=DataBaseConfig.db_echo,
     max_overflow=DataBaseConfig.db_max_overflow,
     pool_size=DataBaseConfig.db_pool_size,
     pool_recycle=DataBaseConfig.db_pool_recycle,
     pool_timeout=DataBaseConfig.db_pool_timeout
 )
-SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
-Base = declarative_base()
+AsyncSessionLocal = async_sessionmaker(autocommit=False, autoflush=False, bind=async_engine)
+
+
+class Base(AsyncAttrs, DeclarativeBase):
+    pass

ruoyi-fastapi-backend/config/get_db.py

@@ -2,16 +2,13 @@
 from utils.log_util import logger
 
 
-def get_db_pro():
+async def get_db():
     """
     每一个请求处理完毕后会关闭当前连接，不同的请求使用不同的连接
     :return:
     """
-    current_db = SessionLocal()
-    try:
+    async with AsyncSessionLocal() as current_db:
         yield current_db
-    finally:
-        current_db.close()
 
 
 async def init_create_table():
@@ -20,8 +17,6 @@ async def init_create_table():
     :return:
     """
     logger.info("初始化数据库连接...")
-    Base.metadata.create_all(bind=engine)
+    async with async_engine.begin() as conn:
+        await conn.run_sync(Base.metadata.create_all)
     logger.info("数据库连接成功")
-
-
-get_db = get_db_pro

ruoyi-fastapi-backend/config/get_redis.py

@@ -3,7 +3,7 @@
 from module_admin.service.dict_service import DictDataService
 from module_admin.service.config_service import ConfigService
 from config.env import RedisConfig
-from config.database import SessionLocal
+from config.database import AsyncSessionLocal
 from utils.log_util import logger
 
 
@@ -59,10 +59,8 @@ async def init_sys_dict(cls, redis):
         :param redis: redis对象
         :return:
         """
-        session = SessionLocal()
-        await DictDataService.init_cache_sys_dict_services(session, redis)
-
-        session.close()
+        async with AsyncSessionLocal() as session:
+            await DictDataService.init_cache_sys_dict_services(session, redis)
 
     @classmethod
     async def init_sys_config(cls, redis):
@@ -71,7 +69,5 @@ async def init_sys_config(cls, redis):
         :param redis: redis对象
         :return:
         """
-        session = SessionLocal()
-        await ConfigService.init_cache_sys_config_services(session, redis)
-
-        session.close()
+        async with AsyncSessionLocal() as session:
+            await ConfigService.init_cache_sys_config_services(session, redis)

ruoyi-fastapi-backend/config/get_scheduler.py

@@ -1,16 +1,18 @@
+import json
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
 from apscheduler.jobstores.memory import MemoryJobStore
 from apscheduler.jobstores.redis import RedisJobStore
 from apscheduler.executors.pool import ThreadPoolExecutor, ProcessPoolExecutor
 from apscheduler.triggers.cron import CronTrigger
 from apscheduler.events import EVENT_ALL
-import json
+from sqlalchemy.engine import create_engine
+from sqlalchemy.orm import sessionmaker
 from datetime import datetime, timedelta
-from config.database import engine, SQLALCHEMY_DATABASE_URL, SessionLocal
-from config.env import RedisConfig
+from config.database import quote_plus, AsyncSessionLocal
+from config.env import DataBaseConfig, RedisConfig
 from module_admin.service.job_log_service import JobLogService, JobLogModel
-from module_admin.dao.job_dao import Session, JobDao
+from module_admin.dao.job_dao import JobDao
 from utils.log_util import logger
 import module_task
 
@@ -65,6 +67,17 @@ def __find_recent_workday(cls, day):
                     diff += 1
 
 
+SQLALCHEMY_DATABASE_URL = f"mysql+pymysql://{DataBaseConfig.db_username}:{quote_plus(DataBaseConfig.db_password)}@" \
+                          f"{DataBaseConfig.db_host}:{DataBaseConfig.db_port}/{DataBaseConfig.db_database}"
+engine = create_engine(
+    SQLALCHEMY_DATABASE_URL,
+    echo=DataBaseConfig.db_echo,
+    max_overflow=DataBaseConfig.db_max_overflow,
+    pool_size=DataBaseConfig.db_pool_size,
+    pool_recycle=DataBaseConfig.db_pool_recycle,
+    pool_timeout=DataBaseConfig.db_pool_timeout
+)
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 job_stores = {
     'default': MemoryJobStore(),
     'sqlalchemy': SQLAlchemyJobStore(url=SQLALCHEMY_DATABASE_URL, engine=engine),
@@ -96,20 +109,20 @@ class SchedulerUtil:
     """
 
     @classmethod
-    async def init_system_scheduler(cls, query_db: Session = SessionLocal()):
+    async def init_system_scheduler(cls):
         """
         应用启动时初始化定时任务
         :return:
         """
         logger.info("开始启动定时任务...")
         scheduler.start()
-        job_list = JobDao.get_job_list_for_scheduler(query_db)
-        for item in job_list:
-            query_job = cls.get_scheduler_job(job_id=str(item.job_id))
-            if query_job:
-                cls.remove_scheduler_job(job_id=str(item.job_id))
-            cls.add_scheduler_job(item)
-        query_db.close()
+        async with AsyncSessionLocal() as session:
+            job_list = await JobDao.get_job_list_for_scheduler(session)
+            for item in job_list:
+                query_job = cls.get_scheduler_job(job_id=str(item.job_id))
+                if query_job:
+                    cls.remove_scheduler_job(job_id=str(item.job_id))
+                cls.add_scheduler_job(item)
         scheduler.add_listener(cls.scheduler_event_listener, EVENT_ALL)
         logger.info("系统初始定时任务加载成功")
 
@@ -225,7 +238,8 @@ def scheduler_event_listener(cls, event):
                 jobTrigger=job_trigger,
                 jobMessage=job_message,
                 status=status,
-                exceptionInfo=exception_info
+                exceptionInfo=exception_info,
+                createTime=datetime.now()
             )
             session = SessionLocal()
             JobLogService.add_job_log_services(session, job_log)

ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py

@@ -131,7 +131,7 @@ async def wrapper(*args, **kwargs):
                     login_log['status'] = str(status)
                     login_log['msg'] = result_dict.get('msg')
 
-                    LoginLogService.add_login_log_services(query_db, LogininforModel(**login_log))
+                    await LoginLogService.add_login_log_services(query_db, LogininforModel(**login_log))
             else:
                 current_user = await LoginService.get_current_user(request, token, query_db)
                 oper_name = current_user.user.user_name
@@ -154,7 +154,7 @@ async def wrapper(*args, **kwargs):
                     operTime=oper_time,
                     costTime=int(cost_time)
                 )
-                OperationLogService.add_operation_log_services(query_db, operation_log)
+                await OperationLogService.add_operation_log_services(query_db, operation_log)
 
             return result
 

ruoyi-fastapi-backend/module_admin/aspect/data_scope.py

@@ -24,11 +24,11 @@ def __call__(self, current_user: CurrentUserModel = Depends(LoginService.get_cur
         if self.query_alias == '' or max_data_scope == 1 or user_id == 1:
             param_sql = '1 == 1'
         elif max_data_scope == 2:
-            param_sql = f"{self.query_alias}.{self.dept_alias}.in_({self.db_alias}.query(SysRoleDept.dept_id).filter(SysRoleDept.role_id == {max_role_id})) if hasattr({self.query_alias}, '{self.dept_alias}') else 1 == 1"
+            param_sql = f"{self.query_alias}.{self.dept_alias}.in_(select(SysRoleDept.dept_id).where(SysRoleDept.role_id == {max_role_id})) if hasattr({self.query_alias}, '{self.dept_alias}') else 1 == 1"
         elif max_data_scope == 3:
             param_sql = f"{self.query_alias}.{self.dept_alias} == {dept_id} if hasattr({self.query_alias}, '{self.dept_alias}') else 1 == 1"
         elif max_data_scope == 4:
-            param_sql = f"{self.query_alias}.{self.dept_alias}.in_({self.db_alias}.query(SysDept.dept_id).filter(or_(SysDept.dept_id == {dept_id}, func.find_in_set({dept_id}, SysDept.ancestors)))) if hasattr({self.query_alias}, '{self.dept_alias}') else 1 == 1"
+            param_sql = f"{self.query_alias}.{self.dept_alias}.in_(select(SysDept.dept_id).where(or_(SysDept.dept_id == {dept_id}, func.find_in_set({dept_id}, SysDept.ancestors)))) if hasattr({self.query_alias}, '{self.dept_alias}') else 1 == 1"
         elif max_data_scope == 5:
             param_sql = f"{self.query_alias}.{self.user_alias} == {user_id} if hasattr({self.query_alias}, '{self.user_alias}') else 1 == 1"
         else:

ruoyi-fastapi-backend/module_admin/controller/cache_controller.py

@@ -26,7 +26,7 @@ async def get_monitor_cache_info(request: Request):
 async def get_monitor_cache_name(request: Request):
     try:
         # 获取全量数据
-        cache_name_list_result = CacheService.get_cache_monitor_cache_name_services()
+        cache_name_list_result = await CacheService.get_cache_monitor_cache_name_services()
         logger.info('获取成功')
         return ResponseUtil.success(data=cache_name_list_result)
     except Exception as e: