From 059a4aa7b69b040b2c837b4bfb900955a38000f9 Mon Sep 17 00:00:00 2001 From: jingrow Date: Tue, 5 Aug 2025 06:48:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8C=E6=AD=A5=E5=9F=9F?= =?UTF-8?q?=E5=90=8D=E4=BF=A1=E6=81=AF=E5=87=BD=E6=95=B0=E7=9A=84=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jcloud/api/domain_west.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/jcloud/api/domain_west.py b/jcloud/api/domain_west.py index 195ed8a..923206b 100644 --- a/jcloud/api/domain_west.py +++ b/jcloud/api/domain_west.py @@ -2629,9 +2629,7 @@ def sync_domain_info_from_west(**data): c_sysid = real_data.get("c_sysid") owner_info = real_data.get("owner", {}) - # 添加调试日志 - jingrow.log_error(f"Domain Owner同步调试", f"域名: {domain}, c_sysid: {c_sysid}, owner_info: {owner_info}") - jingrow.log_error(f"real_data完整信息", f"real_data: {real_data}") + if c_sysid: # 如果owner_info为空，使用real_data中的所有者字段 @@ -2646,25 +2644,17 @@ def sync_domain_info_from_west(**data): ["name", "team"] ) - # 添加调试日志 - jingrow.log_error(f"Domain Owner查找结果", f"c_sysid: {c_sysid}, 域名团队: {team.name}, 找到记录数: {len(existing_owners)}") - if existing_owners: - jingrow.log_error(f"找到的Domain Owner", f"名称: {existing_owners[0].name}, 原团队: {existing_owners[0].team or '空'}") - else: - jingrow.log_error(f"未找到Domain Owner", f"将创建新的") + if existing_owners: # 更新已存在的Domain Owner domain_owner_name = existing_owners[0].name existing_team = existing_owners[0].team - jingrow.log_error(f"Domain Owner更新逻辑", f"找到现有记录: {domain_owner_name}, 原团队: {existing_team}, 当前团队: {team.name}") try: domain_owner_pg = jingrow.get_pg("Domain Owner", domain_owner_name) if domain_owner_pg: # 更新团队信息（如果不同或为空） if not domain_owner_pg.team or domain_owner_pg.team != team.name: - old_team = domain_owner_pg.team or "空" - jingrow.log_error(f"Domain Owner团队更新", f"从 {old_team} 更新为 {team.name}") domain_owner_pg.team = team.name # 更新所有者信息 @@ -2715,12 +2705,10 @@ def sync_domain_info_from_west(**data): domain_owner_pg.c_idtype_gswl = str(orgfile.get("f_type")) domain_owner_pg.save(ignore_permissions=True) - jingrow.log_error(f"Domain Owner更新成功", f"名称: {domain_owner_name}") except Exception as e: jingrow.log_error(f"更新Domain Owner失败", f"域名: {domain}, c_sysid: {c_sysid}, 错误: {str(e)}") else: # 创建新的Domain Owner - jingrow.log_error(f"Domain Owner创建逻辑", f"未找到现有记录，将创建新记录，c_sysid: {c_sysid}, 域名团队: {team.name}") try: # 判断所有者类型（个人或企业） c_regtype = "E" if owner_info.get("dom_org_m") else "I" @@ -2787,7 +2775,6 @@ def sync_domain_info_from_west(**data): domain_owner_pg = jingrow.get_pg(owner_data) domain_owner_pg.insert(ignore_permissions=True) domain_owner_name = domain_owner_pg.name - jingrow.log_error(f"Domain Owner创建成功", f"名称: {domain_owner_name}, c_sysid: {c_sysid}") except Exception as e: jingrow.log_error(f"创建Domain Owner失败", f"域名: {domain}, c_sysid: {c_sysid}, 错误: {str(e)}")