finish

Author: wu-clan

backend/app/admin/api/v1/sys/config.py

@@ -23,7 +23,7 @@
 
 @router.get('/website', summary='获取网站配置信息', dependencies=[DependsJwtAuth])
 async def get_website_config() -> ResponseModel:
-    config = await config_service.get_website()
+    config = await config_service.get_built_in_config('website')
     return response_base.success(data=config)
 
 
@@ -35,14 +35,14 @@ async def get_website_config() -> ResponseModel:
         DependsRBAC,
     ],
 )
-async def save_website_config(obj: SaveConfigParam) -> ResponseModel:
-    await config_service.save_website(obj)
+async def save_website_config(objs: list[SaveConfigParam]) -> ResponseModel:
+    await config_service.save_built_in_config(objs, 'website')
     return response_base.success()
 
 
 @router.get('/protocol', summary='获取用户协议', dependencies=[DependsJwtAuth])
 async def get_protocol_config() -> ResponseModel:
-    config = await config_service.get_protocol()
+    config = await config_service.get_built_in_config('protocol')
     return response_base.success(data=config)
 
 
@@ -54,14 +54,14 @@ async def get_protocol_config() -> ResponseModel:
         DependsRBAC,
     ],
 )
-async def save_protocol_config(obj: SaveConfigParam) -> ResponseModel:
-    await config_service.save_protocol(obj)
+async def save_protocol_config(objs: list[SaveConfigParam]) -> ResponseModel:
+    await config_service.save_built_in_config(objs, 'protocol')
     return response_base.success()
 
 
 @router.get('/policy', summary='获取用户政策', dependencies=[DependsJwtAuth])
 async def get_policy_config() -> ResponseModel:
-    config = await config_service.get_policy()
+    config = await config_service.get_built_in_config('policy')
     return response_base.success(data=config)
 
 
@@ -73,8 +73,8 @@ async def get_policy_config() -> ResponseModel:
         DependsRBAC,
     ],
 )
-async def save_policy_config(obj: SaveConfigParam) -> ResponseModel:
-    await config_service.save_policy(obj)
+async def save_policy_config(objs: list[SaveConfigParam]) -> ResponseModel:
+    await config_service.save_built_in_config(objs, 'policy')
     return response_base.success()
 
 

backend/app/admin/crud/crud_config.py

@@ -42,6 +42,16 @@ async def get_by_name(self, db: AsyncSession, name: str) -> Config | None:
         """
         return await self.select_model_by_column(db, name=name, type__not_in=admin_settings.CONFIG_BUILT_IN_TYPES)
 
+    async def get_by_key(self, db: AsyncSession, key: str) -> Config | None:
+        """
+        通过 key 获取系统配置参数
+
+        :param db:
+        :param key:
+        :return:
+        """
+        return await self.select_model_by_column(db, key=key, type__not_in=admin_settings.CONFIG_BUILT_IN_TYPES)
+
     async def get_list(self, name: str = None, type: str = None) -> Select:
         """
         获取系统参数配置列表

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), comment='名称')
+    name: Mapped[str] = mapped_column(String(20), unique=True, 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/service/config_service.py

@@ -18,34 +18,19 @@
 
 class ConfigService:
     @staticmethod
-    async def get_website() -> Sequence[Config]:
+    async def get_built_in_config(type: str) -> Sequence[Config]:
         async with async_db_session() as db:
-            return await config_dao.get_by_type(db, 'website')
+            return await config_dao.get_by_type(db, type)
 
     @staticmethod
-    async def save_website(obj: SaveConfigParam):
+    async def save_built_in_config(objs: list[SaveConfigParam], type: str) -> None:
         async with async_db_session.begin() as db:
-            config = await config_dao.get_by_name(db, obj.name)
-            if config is None:
-                await config_dao.create_models()
-
-    @staticmethod
-    async def get_protocol() -> Sequence[Config]:
-        async with async_db_session() as db:
-            return await config_dao.get_by_type(db, 'protocol')
-
-    @staticmethod
-    async def save_protocol(obj: SaveConfigParam):
-        pass
-
-    @staticmethod
-    async def get_policy() -> Sequence[Config]:
-        async with async_db_session() as db:
-            return await config_dao.get_by_type(db, 'policy')
-
-    @staticmethod
-    async def save_policy(obj: SaveConfigParam):
-        pass
+            for obj in objs:
+                config = await config_dao.get_by_name(db, obj.name)
+                if config is None:
+                    await config_dao.create_model(db, obj, type=type)
+                else:
+                    await config_dao.update_model(db, config.id, obj, type=type)
 
     @staticmethod
     async def get(pk) -> Config | dict:
@@ -62,7 +47,7 @@ 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)
+            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: