From 228b5afd783068d1c018fe0879d19de4605c1694 Mon Sep 17 00:00:00 2001 From: jingrow Date: Wed, 6 Aug 2025 19:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=80=85=E6=A8=A1=E6=9D=BF=E5=A4=B1=E8=B4=A5=E6=97=B6?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dashboard/src2/components/DomainOwner.vue | 13 +++++++++++-- jcloud/api/domain_west.py | 14 +++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dashboard/src2/components/DomainOwner.vue b/dashboard/src2/components/DomainOwner.vue index 4b9f464..39c4070 100644 --- a/dashboard/src2/components/DomainOwner.vue +++ b/dashboard/src2/components/DomainOwner.vue @@ -805,7 +805,7 @@ export default { async deleteOwner(owner) { confirmDialog({ title: '确认删除', - message: `确定要删除域名所有者模板 "${this.getDisplayName(owner)}" 吗？

此操作将同时删除西部数码平台和本地的模板记录，且不可逆。`, + message: `确定要删除域名所有者模板 "${this.getDisplayName(owner)}" 吗？

此操作将不可逆。`, primaryAction: { label: '删除', variant: 'solid', @@ -824,7 +824,16 @@ export default { } }, onError: (error) => { - throw new Error(getToastErrorMessage(error)); + // 正确处理错误信息 + let errorMessage = '删除失败，请稍后重试'; + if (error && typeof error === 'object') { + if (error.messages && Array.isArray(error.messages)) { + errorMessage = error.messages.join('\n'); + } else if (error.message) { + errorMessage = error.message; + } + } + throw new Error(errorMessage); } }); diff --git a/jcloud/api/domain_west.py b/jcloud/api/domain_west.py index 104358d..d761f56 100644 --- a/jcloud/api/domain_west.py +++ b/jcloud/api/domain_west.py @@ -3023,7 +3023,7 @@ def upload_domain_real_name_files(**data): # 获取上传token c_sysid = owner_info.get('c_sysid') if not c_sysid: - return {"status": "error", "message": "域名所有者未关联西部数码ID"} + return {"status": "error", "message": "域名所有者未关联所有者模板ID"} # 证件类型映射到西部数码参数 id_type_map = { @@ -3362,11 +3362,11 @@ def update_domain_owner(name, **data): west_result = modify_west_contact_template(**template_data) if west_result.get('status') != 'success': - error_msg = west_result.get('message', '西部数码模板更新失败') - return {"status": "Error", "message": f"西部数码模板更新失败: {error_msg}"} + error_msg = west_result.get('message', '所有者模板更新失败') + return {"status": "Error", "message": f"所有者模板更新失败: {error_msg}"} except Exception as e: - return {"status": "Error", "message": f"西部数码模板更新失败: {str(e)}"} + return {"status": "Error", "message": f"所有者模板更新失败: {str(e)}"} # 西部数码模板更新成功后，更新本地记录 updated_fields = [] @@ -3427,11 +3427,11 @@ def delete_domain_owner(name): west_result = client.delete_contact_template(c_sysid) if west_result.get('result') != 200: - error_msg = west_result.get('msg', west_result.get('message', '西部数码模板删除失败')) - return {"status": "Error", "message": f"西部数码模板删除失败: {error_msg}"} + error_msg = west_result.get('msg', west_result.get('message', '所有者模板删除失败')) + return {"status": "Error", "message": f"所有者模板删除失败: {error_msg}"} except Exception as e: - return {"status": "Error", "message": f"西部数码模板删除失败: {str(e)}"} + return {"status": "Error", "message": f"所有者模板删除失败: {str(e)}"} # 西部数码模板删除成功后，删除本地记录 try: