fix db session

app/db/init.py

@@ -22,16 +22,15 @@ def init_db():
     # 全量建表
     Base.metadata.create_all(bind=Engine)
     # 初始化超级管理员
-    db = SessionFactory()
-    user = User.get_by_name(db=db, name=settings.SUPERUSER)
-    if not user:
-        user = User(
-            name=settings.SUPERUSER,
-            hashed_password=get_password_hash(settings.SUPERUSER_PASSWORD),
-            is_superuser=True,
-        )
-        user.create(db)
-    db.close()
+    with SessionFactory() as db:
+        user = User.get_by_name(db=db, name=settings.SUPERUSER)
+        if not user:
+            user = User(
+                name=settings.SUPERUSER,
+                hashed_password=get_password_hash(settings.SUPERUSER_PASSWORD),
+                is_superuser=True,
+            )
+            user.create(db)
 
 
 def update_db():

app/db/site_oper.py

@@ -31,6 +31,12 @@ class SiteOper(DbOper):
         """
         return Site.list(self._db)
 
+    def list_order_by_pri(self) -> List[Site]:
+        """
+        获取站点列表
+        """
+        return Site.list_order_by_pri(self._db)
+
     def list_active(self) -> List[Site]:
         """
         按状态获取站点列表

app/db/systemconfig_oper.py

@@ -1,7 +1,7 @@
 import json
 from typing import Any, Union
 
-from app.db import DbOper, SessionFactory
+from app.db import DbOper
 from app.db.models.systemconfig import SystemConfig
 from app.schemas.types import SystemConfigKey
 from app.utils.object import ObjectUtils
@@ -16,8 +16,7 @@ class SystemConfigOper(DbOper, metaclass=Singleton):
         """
         加载配置到内存
         """
-        self._db = SessionFactory()
-        super().__init__(self._db)
+        super().__init__()
         for item in SystemConfig.list(self._db):
             if ObjectUtils.is_obj(item.value):
                 self.__SYSTEMCONF[item.key] = json.loads(item.value)