diff --git a/jcloud/api/domain_west.py b/jcloud/api/domain_west.py index 25981b1..b7efc5d 100644 --- a/jcloud/api/domain_west.py +++ b/jcloud/api/domain_west.py @@ -86,7 +86,6 @@ class WestDomain: if method.upper() == 'POST': data = body_params or {} # 确保中文字符正确编码 - jingrow.log_error("西部数码API调试", f"发送POST请求，URL: {url}, 数据: {data}") response = requests.post(url, data=data, headers=headers, timeout=30) else: response = requests.get(url, headers=headers, timeout=30) @@ -96,13 +95,11 @@ class WestDomain: try: result = response.json() except json.JSONDecodeError: - jingrow.log_error("西部数码API响应解析失败", response_text=response.text) result = {"status": "error", "message": "无法解析API响应"} return result except requests.exceptions.RequestException as e: - jingrow.log_error("西部数码API请求失败", error=str(e), url=url) return {"status": "error", "message": f"API请求失败: {str(e)}"} def check_balance(self) -> Dict[str, Any]: @@ -562,7 +559,6 @@ class WestDomain: try: # 发送JSON格式的POST请求 - jingrow.log_error("西部数码实名上传调试", f"发送POST请求，URL: {upload_url}, 数据: {data}") response = requests.post(upload_url, json=data, headers=headers, timeout=30) response.raise_for_status() @@ -570,13 +566,11 @@ class WestDomain: try: result = response.json() except json.JSONDecodeError: - jingrow.log_error("西部数码实名上传响应解析失败", response_text=response.text) result = {"status": "error", "message": "无法解析API响应"} return result except requests.exceptions.RequestException as e: - jingrow.log_error("西部数码实名上传请求失败", error=str(e), url=upload_url) return {"status": "error", "message": f"API请求失败: {str(e)}"} def modify_dns_server(self, domain: str, dns1: str, dns2: str, @@ -640,13 +634,10 @@ def get_west_client() -> WestDomain: if username and password: return WestDomain(username, password) else: - jingrow.log_error("西部数码域名API: 缺少用户名或密码配置") return None else: - jingrow.log_error("西部数码域名API: Jcloud Settings 尚未配置") return None except Exception as e: - jingrow.log_error(f"西部数码域名API客户端初始化失败: {str(e)}") return None @@ -673,9 +664,6 @@ def check_domain(domain: str, suffix: str = '.com'): response = client.query_domain(domain, suffix) - # 添加调试日志 - jingrow.log_error("域名查询调试", f"domain={domain}, suffix={suffix}, response={response}") - if response.get("status") == "error": return response @@ -696,7 +684,6 @@ def check_domain(domain: str, suffix: str = '.com'): return {"status": "error", "message": f"未找到域名 {full_domain} 的查询结果"} except Exception as e: - jingrow.log_error("域名查询响应解析失败", error=str(e)) return {"status": "error", "message": "域名查询响应解析失败"} @@ -740,7 +727,6 @@ def get_west_domain_price(domain: str, year: int = 1): } except Exception as e: - jingrow.log_error("域名价格查询响应解析失败", error=str(e)) return {"status": "error", "message": "域名价格查询响应解析失败"} @@ -784,7 +770,6 @@ def get_west_domain_renew_price(domain: str, year: int = 1): } except Exception as e: - jingrow.log_error("域名续费价格查询响应解析失败", error=str(e)) return {"status": "error", "message": "域名续费价格查询响应解析失败"} @@ -915,7 +900,6 @@ def get_west_domain_dns_records(**data): } except Exception as e: - jingrow.log_error("域名解析记录查询响应解析失败", error=str(e)) return {"status": "error", "message": "域名解析记录查询响应解析失败"} @@ -1069,7 +1053,6 @@ def west_domain_add_dns_record(**data): } except Exception as e: - jingrow.log_error("添加DNS记录响应解析失败", error=str(e)) return {"status": "error", "message": "添加DNS记录响应解析失败"} @@ -1126,7 +1109,6 @@ def west_domain_delete_dns_record(**data): } except Exception as e: - jingrow.log_error("删除DNS记录响应解析失败", error=str(e)) return {"status": "error", "message": "删除DNS记录响应解析失败"} @@ -1225,9 +1207,6 @@ def create_domain_order(domain, period=1, payment_method='balance', domain_owner if price_result.get("status") == "error": return {"success": False, "message": "获取域名价格失败"} - # 添加调试日志 - jingrow.log_error("域名价格调试", f"域名 {domain} 的价格结果: {price_result}") - # 计算总价格 - 使用与前端一致的价格字段 yearly_price = price_result.get("data", {}).get("price", 0) # 使用前端一致的价格字段 total_amount = yearly_price * period @@ -1283,7 +1262,6 @@ def create_domain_order(domain, period=1, payment_method='balance', domain_owner } except Exception as e: - jingrow.log_error("域名订单", f"创建域名订单失败: {str(e)}") return {"success": False, "message": f"创建订单失败: {str(e)}"} @@ -1358,7 +1336,6 @@ def create_domain_renew_order(**kwargs): "order": order.as_dict() } except Exception as e: - jingrow.log_error("域名续费订单错误", f"创建域名续费订单失败: {str(e)}") return { "success": False, "message": f"创建续费订单失败: {str(e)}" @@ -1398,9 +1375,6 @@ def register_domain_from_order(order_name): client_price=biz_params.get("client_price") ) - # 打印result到后台日志 - jingrow.log_error("西部数码域名注册结果", f"订单 {order_name} 的注册结果: {result}") - if not result or result.get('result') != 200: error_msg = result.get('msg', result.get('message', '未知错误')) raise Exception(f"域名注册失败: {error_msg}") @@ -1431,7 +1405,6 @@ def register_domain_from_order(order_name): return True except Exception as e: - jingrow.log_error("域名注册失败", f"订单 {order_name}: {str(e)}") raise e @@ -1472,9 +1445,6 @@ def renew_domain_from_order(order_name): biz_params.get("client_price") ) - # 打印result到后台日志 - jingrow.log_error("西部数码域名续费结果", f"订单 {order_name} 的续费结果: {result}") - if not result or result.get('result') != 200: error_msg = result.get('msg', result.get('message', '未知错误')) raise Exception(f"域名续费失败: {error_msg}") @@ -1492,7 +1462,6 @@ def renew_domain_from_order(order_name): return True except Exception as e: - jingrow.log_error("域名续费失败", f"订单 {order_name}: {str(e)}") raise e @@ -1519,7 +1488,6 @@ def toggle_domain_auto_renew(pagetype, name, auto_renew): return {"success": True, "message": "自动续费状态更新成功"} except Exception as e: - jingrow.log_error("域名管理", f"切换自动续费状态失败: {str(e)}") return {"success": False, "message": f"操作失败: {str(e)}"} @@ -1546,7 +1514,6 @@ def toggle_domain_whois_protection(pagetype, name, whois_protection): return {"success": True, "message": "隐私保护状态更新成功"} except Exception as e: - jingrow.log_error("域名管理", f"切换隐私保护状态失败: {str(e)}") return {"success": False, "message": f"操作失败: {str(e)}"} @@ -1572,7 +1539,6 @@ def delete_domain(pagetype, name): return {"success": True, "message": "域名记录删除成功"} except Exception as e: - jingrow.log_error("域名管理", f"删除域名记录失败: {str(e)}") return {"success": False, "message": f"删除失败: {str(e)}"} @@ -1596,7 +1562,6 @@ def get_domain_owners(): "data": domain_owners } except Exception as e: - jingrow.log_error("获取域名所有者列表失败", str(e)) return {"status": "Error", "message": f"获取域名所有者列表失败: {str(e)}"} @jingrow.whitelist() @@ -1639,7 +1604,6 @@ def get_domain_owner(name): "data": owner_data } except Exception as e: - jingrow.log_error("获取域名所有者信息失败", str(e)) return {"status": "Error", "message": f"获取域名所有者信息失败: {str(e)}"} @jingrow.whitelist() @@ -1776,12 +1740,10 @@ def create_domain_template(**data): template_data['c_ph'] = data['c_ph'] try: - jingrow.log_error("西部模板API发送", f"模板数据: {template_data}") result = client.create_contact_template(template_data) if result.get('result') == 200: c_sysid = result.get('data', {}).get('c_sysid') - jingrow.log_error("西部模板API成功", f"模板ID: {c_sysid}") return { "status": "success", "message": "域名模板创建成功", @@ -1791,11 +1753,9 @@ def create_domain_template(**data): } else: error_msg = result.get('msg', result.get('message', '未知错误')) - jingrow.log_error("西部模板API失败", f"错误: {error_msg}") return {"status": "error", "message": f"创建域名模板失败: {error_msg}"} except Exception as e: - jingrow.log_error("西部模板API异常", str(e)) return {"status": "error", "message": f"创建域名模板失败: {str(e)}"} @@ -1888,7 +1848,6 @@ def create_domain_owner(**data): }) domain_owner.insert(ignore_permissions=True) - jingrow.log_error("域名所有者创建成功", f"名称: {domain_owner.name}, 标题: {domain_owner.title}") return { "status": "Success", "message": "域名所有者创建成功", @@ -1898,7 +1857,6 @@ def create_domain_owner(**data): } } except Exception as e: - jingrow.log_error("域名所有者创建失败", str(e)) return {"status": "Error", "message": f"创建域名所有者失败: {str(e)}"} @@ -1906,15 +1864,9 @@ def create_domain_owner(**data): def create_domain_owner_with_template(**data): """创建域名所有者（包含模板创建）""" try: - # 打印接收到的参数 - jingrow.log_error("create_domain_owner_with_template 接收到的参数", f"参数: {data}") - # 第一步：创建域名模板 template_result = create_domain_template(**data) - # 打印template_result - jingrow.log_error("create_domain_owner_with_template template_result", f"template_result: {template_result}") - if template_result.get("status") != "success": return template_result @@ -1940,11 +1892,9 @@ def create_domain_owner_with_template(**data): "owner_title": owner_result.get("data", {}).get("title") } } - jingrow.log_error("域名所有者完整创建成功", f"模板ID: {c_sysid}, 所有者: {owner_result.get('data', {}).get('name')}") return result except Exception as e: - jingrow.log_error("域名所有者完整创建失败", str(e)) return {"status": "Error", "message": f"创建域名所有者失败: {str(e)}"} @@ -1974,11 +1924,9 @@ def test_create_domain_owner_with_template(): # 调用create_domain_owner_with_template函数 result = create_domain_template(**test_data) - jingrow.log_error("测试API结果", f"结果: {result}") return result except Exception as e: - jingrow.log_error("测试API异常", str(e)) return {"status": "Error", "message": f"测试API调用失败: {str(e)}"} @@ -2105,7 +2053,6 @@ def get_west_domain_real_info(**data): } except Exception as e: - jingrow.log_error("域名实名信息查询响应解析失败", error=str(e)) return {"status": "error", "message": "域名实名信息查询响应解析失败"} @@ -2144,7 +2091,6 @@ def get_west_upload_token(**data): } except Exception as e: - jingrow.log_error("获取实名上传token响应解析失败", error=str(e)) return {"status": "error", "message": "获取实名上传token响应解析失败"} @@ -2189,7 +2135,6 @@ def west_upload_real_name_files(**data): } except Exception as e: - jingrow.log_error("实名资料上传响应解析失败", error=str(e)) return {"status": "error", "message": "实名资料上传响应解析失败"} @@ -2263,7 +2208,6 @@ def west_domain_modify_dns_record(**data): } except Exception as e: - jingrow.log_error("修改DNS记录响应解析失败", error=str(e)) return {"status": "error", "message": "修改DNS记录响应解析失败"} @@ -2282,7 +2226,6 @@ def test_dns_record_management(): return {"status": "error", "message": "API客户端初始化失败"} # 测试1: 添加DNS记录 - jingrow.log_error("DNS测试", "开始测试添加DNS记录") add_result = client.add_dns_record( domain=test_domain, record_type=test_record_type, @@ -2292,18 +2235,14 @@ def test_dns_record_management(): level=10, line="" ) - jingrow.log_error("DNS测试", f"添加DNS记录结果: {add_result}") # 测试2: 获取DNS记录列表 - jingrow.log_error("DNS测试", "开始测试获取DNS记录列表") list_result = client.get_dns_records_paginated(test_domain, 20, 1) - jingrow.log_error("DNS测试", f"获取DNS记录列表结果: {list_result}") # 测试3: 修改DNS记录（如果添加成功） if add_result.get("result") == 200: record_id = add_result.get("data", {}).get("id") if record_id: - jingrow.log_error("DNS测试", f"开始测试修改DNS记录，记录ID: {record_id}") modify_result = client.modify_dns_record( domain=test_domain, value="127.0.0.2", @@ -2312,15 +2251,12 @@ def test_dns_record_management(): record_id=record_id, line="" ) - jingrow.log_error("DNS测试", f"修改DNS记录结果: {modify_result}") # 测试4: 删除DNS记录 - jingrow.log_error("DNS测试", "开始测试删除DNS记录") delete_result = client.delete_dns_record( domain=test_domain, record_id=record_id ) - jingrow.log_error("DNS测试", f"删除DNS记录结果: {delete_result}") return { "status": "success", @@ -2332,7 +2268,6 @@ def test_dns_record_management(): } except Exception as e: - jingrow.log_error("DNS测试异常", str(e)) return {"status": "error", "message": f"DNS记录管理功能测试失败: {str(e)}"} @@ -2435,7 +2370,6 @@ def west_domain_modify_dns_server(**data): } except Exception as e: - jingrow.log_error("修改DNS服务器响应解析失败", error=str(e)) return {"status": "error", "message": "修改DNS服务器响应解析失败"}