From d6c6e59b3fdca48babede3eca75bcd403eedce57 Mon Sep 17 00:00:00 2001 From: 3970260761 <3970260761@qq.com> Date: Mon, 9 Nov 2026 10:22:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A3=80=E6=B5=8B=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=8F=AA=E8=AE=B0=E8=BF=9E=E9=80=9A=E6=80=A7=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89DNS=E6=9B=B4=E6=96=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.py | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/app.py b/app.py index 1327c7e..1003df1 100644 --- a/app.py +++ b/app.py @@ -339,18 +339,14 @@ def run_check(): STATUS["ipv6"] = {"ok": ok6, "ip": ip6} if not ok6: s.append("✗ IPv6 不支持") - elif not domains: - s.append(f"✓ IPv6 {ip6} (未配置域名)") else: - done, bad = [], [] - for d in domains: - (done if update_dns(cfg, d, ip6) else bad).append(d) - line = f"✓ IPv6 {ip6} → {', '.join(done)}" if done else f"✗ IPv6 {ip6} DNS更新失败" - if bad: - line += f" (失败: {', '.join(bad)})" - s.append(line) - if done: - connected.append({"type": "ipv6", "target": ip6, "domain": ", ".join(done)}) + if not domains: + s.append(f"✓ IPv6 {ip6} (未配置域名)") + else: + s.append(f"✓ IPv6 {ip6}") + for d in domains: + if update_dns(cfg, d, ip6): + connected.append({"type": "ipv6", "target": ip6, "domain": d}) # 2. EasyTier / group network (ping 检测,无需端口) — 支持多个地址,任一可达即用 raw_et = cfg.get("easytier_host") or cfg.get("easytier_hosts") or "" @@ -369,22 +365,10 @@ def run_check(): else: et_host = reachable[0] warn_suffix = (f" ✗ 不可达: {', '.join(unreachable)}" if unreachable else "") - if not domains: - connected.append({"type": "easytier", "target": et_host, "domain": None}) - s.append(f"✓ 组网 {et_host} 可达" + (f" (共{len(reachable)}/{len(et_hosts)}可达)" if len(et_hosts) > 1 else "") + warn_suffix) - else: - done, bad = [], [] - for d in domains: - (done if update_dns(cfg, d, et_host) else bad).append(d) - line = f"✓ 组网 {et_host} → {', '.join(done)}" if done else f"✗ 组网 {et_host} DNS更新失败" - if bad: - line += f" (失败: {', '.join(bad)})" - if len(et_hosts) > 1: - line += f" [可达 {len(reachable)}/{len(et_hosts)}]" - line += warn_suffix - s.append(line) - if done: - connected.append({"type": "easytier", "target": et_host, "domain": ", ".join(done)}) + s.append(f"✓ 组网 {et_host} 可达" + (f" (共{len(reachable)}/{len(et_hosts)}可达)" if len(et_hosts) > 1 else "") + warn_suffix) + for d in domains: + if update_dns(cfg, d, et_host): + connected.append({"type": "easytier", "target": et_host, "domain": d}) # 3. NPS nps_server = cfg.get("nps_server")