fix bugs

Author: wu-clan

backend/app/admin/crud/crud_config.py

@@ -24,33 +24,38 @@ async def get(self, db: AsyncSession, pk: int) -> Config | None:
 
     async def get_by_type(self, db: AsyncSession, type: str) -> Sequence[Config]:
         """
-        通过 type 获取系统配置参数
+        通过 type 获取内置系统配置
 
         :param db:
         :param type:
         :return:
         """
         return await self.select_models(db, type=type)
 
-    async def get_by_name(self, db: AsyncSession, name: str) -> Config | None:
+    async def get_by_key_and_type(self, db: AsyncSession, key: str, type: str) -> Config | None:
         """
-        通过 name 获取系统配置参数
+        通过 name 和 type 获取内置系统配置
 
         :param db:
-        :param name:
+        :param key:
+        :param type:
         :return:
         """
-        return await self.select_model_by_column(db, name=name, type__not_in=admin_settings.CONFIG_BUILT_IN_TYPES)
+        return await self.select_model_by_column(db, key=key, type=type)
 
-    async def get_by_key(self, db: AsyncSession, key: str) -> Config | None:
+    async def get_by_key(self, db: AsyncSession, key: str, built_in: bool = False) -> Config | None:
         """
         通过 key 获取系统配置参数
 
         :param db:
         :param key:
+        :param built_in:
         :return:
         """
-        return await self.select_model_by_column(db, key=key, type__not_in=admin_settings.CONFIG_BUILT_IN_TYPES)
+        filters = {'key': key}
+        if not built_in:
+            filters.update({'type__not_in': admin_settings.CONFIG_BUILT_IN_TYPES})
+        return await self.select_model_by_column(db, **filters)
 
     async def get_list(self, name: str = None, type: str = None) -> Select:
         """
@@ -60,7 +65,7 @@ async def get_list(self, name: str = None, type: str = None) -> Select:
         :param type:
         :return:
         """
-        filters = {'name__not_in': admin_settings.CONFIG_BUILT_IN_TYPES}
+        filters = {'type__not_in': admin_settings.CONFIG_BUILT_IN_TYPES}
         if name is not None:
             filters.update(name__like=f'%{name}%')
         if type is not None:
@@ -96,7 +101,9 @@ async def delete(self, db: AsyncSession, pk: list[int]) -> int:
         :param pk:
         :return:
         """
-        return await self.delete_model_by_column(db, allow_multiple=True, id__in=pk)
+        return await self.delete_model_by_column(
+            db, allow_multiple=True, id__in=pk, type__not_in=admin_settings.CONFIG_BUILT_IN_TYPES
+        )
 
 
 config_dao: CRUDConfig = CRUDConfig(Config)

backend/app/admin/model/sys_config.py

@@ -13,7 +13,7 @@ class Config(Base):
     __tablename__ = 'sys_config'
 
     id: Mapped[id_key] = mapped_column(init=False)
-    name: Mapped[str] = mapped_column(String(20), unique=True, comment='名称')
+    name: Mapped[str] = mapped_column(String(20), comment='名称')
     type: Mapped[str | None] = mapped_column(String(20), server_default=None, comment='类型')
     key: Mapped[str] = mapped_column(String(50), unique=True, comment='键名')
     value: Mapped[str] = mapped_column(LONGTEXT, comment='键值')

backend/app/admin/schema/config.py

@@ -19,7 +19,7 @@ class AnyConfigSchemaBase(SchemaBase):
     key: str
     value: str
     is_frontend: bool
-    remark: str
+    remark: str | None
 
 
 class CreateAnyConfigParam(AnyConfigSchemaBase):

backend/app/admin/service/config_service.py

@@ -26,9 +26,11 @@ async def get_built_in_config(type: str) -> Sequence[Config]:
     async def save_built_in_config(objs: list[SaveConfigParam], type: str) -> None:
         async with async_db_session.begin() as db:
             for obj in objs:
-                config = await config_dao.get_by_name(db, obj.name)
+                config = await config_dao.get_by_key_and_type(db, obj.key, type)
                 if config is None:
-                    await config_dao.create_model(db, obj, type=type)
+                    if await config_dao.get_by_key(db, obj.key, built_in=True):
+                        raise errors.ForbiddenError(msg=f'参数配置 {obj.key} 已存在')
+                    await config_dao.create_model(db, obj, flush=True, type=type)
                 else:
                     await config_dao.update_model(db, config.id, obj, type=type)
 
@@ -47,11 +49,11 @@ async def get_select(*, name: str = None, type: str = None) -> Select:
     @staticmethod
     async def create(*, obj: CreateAnyConfigParam) -> None:
         async with async_db_session.begin() as db:
-            config = await config_dao.get_by_name(db, obj.name) or config_dao.get_by_key(db, obj.key)
-            if config:
-                raise errors.ForbiddenError(msg='参数配置已存在')
             if obj.type in admin_settings.CONFIG_BUILT_IN_TYPES:
                 raise errors.ForbiddenError(msg='非法类型参数')
+            config = await config_dao.get_by_key(db, obj.key)
+            if config:
+                raise errors.ForbiddenError(msg=f'参数配置 {obj.key} 已存在')
             await config_dao.create(db, obj)
 
     @staticmethod

backend/pyproject.toml

@@ -44,7 +44,7 @@ dependencies = [
     "XdbSearchIP==1.0.2",
     "fastapi_oauth20>=0.0.1a2",
     "flower==2.0.1",
-    "sqlalchemy-crud-plus==1.5.0",
+    "sqlalchemy-crud-plus==1.6.0",
     "jinja2==3.1.4",
     "aiofiles==24.1.0",
     # When celery version < 6.0.0

backend/requirements.txt

@@ -99,7 +99,7 @@ simpleeval==1.0.0
 six==1.16.0
 sniffio==1.3.1
 sqlalchemy==2.0.30
-sqlalchemy-crud-plus==1.5.0
+sqlalchemy-crud-plus==1.6.0
 starlette==0.37.2
 tomli==2.0.2 ; python_full_version < '3.11'
 tornado==6.4.1