From 2a652e18746b7dc5e2a2c60e0da8261c7905d82d Mon Sep 17 00:00:00 2001 From: siyaqi Date: Tue, 18 Mar 2025 15:29:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=BB=E9=94=AE?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_admin/entity/vo/metasecurity_vo.py | 2 +- .../module_admin/service/metasecurity_service.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vue-fastapi-backend/module_admin/entity/vo/metasecurity_vo.py b/vue-fastapi-backend/module_admin/entity/vo/metasecurity_vo.py index 52a16e4..9b870d0 100644 --- a/vue-fastapi-backend/module_admin/entity/vo/metasecurity_vo.py +++ b/vue-fastapi-backend/module_admin/entity/vo/metasecurity_vo.py @@ -85,7 +85,7 @@ class MetaSecurityApiModel(BaseModel): 数据源行控制表对应Pydantic模型 """ model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) - dbRId: Optional[int] = None + dbRCode: Optional[str] = None username: Optional[str] = Field(default=None, description='用户名称') password: Optional[str] = Field(default=None, description='用户密码') sqlStr: Optional[str] = Field(default=None, description='sql') diff --git a/vue-fastapi-backend/module_admin/service/metasecurity_service.py b/vue-fastapi-backend/module_admin/service/metasecurity_service.py index ac9c18f..16e0c45 100644 --- a/vue-fastapi-backend/module_admin/service/metasecurity_service.py +++ b/vue-fastapi-backend/module_admin/service/metasecurity_service.py @@ -637,13 +637,13 @@ async def get_data_source_tree(request: Request, current_user: MetaSecurityApiMo total_list = data["data"]["totalList"] # 解析 connectionParams 字符串为字典 for item in total_list: - if item["id"]==current_user.dbRId: + if item["name"]==current_user.dbRId: item["connectionParams"] = json.loads(item["connectionParams"]) return item - raise Exception(f'根据数据源ID:{current_user.dbRId}获取数据源信息失败，状态: {response.reason}') + raise Exception(f'根据数据源ID:{current_user.dbRCode}获取数据源信息失败，状态: {response.reason}') else: - raise Exception(f'根据数据源ID:{current_user.dbRId}获取数据源信息失败，状态: {response.reason}') + raise Exception(f'根据数据源ID:{current_user.dbRCode}获取数据源信息失败，状态: {response.reason}') async def test_connection(db_content): try: # 尝试执行一个简单的查询来测试连接