From 76fbd70e13d9500f82b72c9db265450169097d22 Mon Sep 17 00:00:00 2001
From: shy3130 <shy3130@users.noreply.github.com>
Date: Sat, 11 Jul 2026 13:17:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(ext-data):=20=E8=A1=8C=E4=B8=9A/=E6=A6=82?=
 =?UTF-8?q?=E5=BF=B5=E9=A1=B5=E6=8B=89=E5=8F=96=E5=85=BC=E5=AE=B9=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E4=BF=A1=E5=B0=81,=20=E4=BF=AE=E5=A4=8D=E6=96=B0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E3=80=8C=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AF=E6=95=B0=E7=BB=84=E3=80=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

_fetch_json 原硬性要求上游返回裸数组 [{...}], 部分用户网络环境
(CDN/WAF/网关) 会把数组包成 {data:[...]} 信封或返回错误 dict,
导致新用户首次「获取数据」必现 HTTP 400 弹窗。

- 兼容 {data/list/rows/result/results} 等常见信封键, 兜底遍历取首个数组
- 真不是数组时, 错误信息附带响应预览(截断200字)便于排查
- 通用拉取引擎已有 response_path 解包, 预设路径此前绕过了它
---
 backend/app/services/ext_presets.py | 34 +++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/backend/app/services/ext_presets.py b/backend/app/services/ext_presets.py
index c8ec7f5..d3d118e 100644
--- a/backend/app/services/ext_presets.py
+++ b/backend/app/services/ext_presets.py
@@ -155,17 +155,43 @@ def _flatten_industry_rows(raw_rows: list[dict]) -> list[dict]:
 # 拉取执行 (复用 httpx, 不依赖 fetch_and_ingest 的 PullConfig 路径)
 # ---------------------------------------------------------------------------
 
+# 部分网络环境 (CDN/WAF/网关) 会把数组包成 {data: [...]}/{list: [...]}/{rows: [...]} 信封。
+# 这里做一次兼容解包, 避免误判为「接口返回不是数组」。
+_ENVELOPE_KEYS = ("data", "list", "rows", "result", "results")
+
+
 async def _fetch_json(url: str) -> list[dict]:
-    """请求 JSON 接口, 返回行数组。超时 30s, 失败抛异常由调用方兜底。"""
+    """请求 JSON 接口, 返回行数组。超时 30s, 失败抛异常由调用方兜底。
+
+    兼容两种上游返回形态:
+      - 直接是数组: [{...}, ...]          → 原样返回
+      - 信封包裹: {data: [{...}]} 等       → 自动解包
+    """
     import httpx
 
     async with httpx.AsyncClient(timeout=30) as client:
         resp = await client.get(url)
         resp.raise_for_status()
         data = resp.json()
-    if not isinstance(data, list):
-        raise ValueError(f"接口返回不是数组: {type(data)}")
-    return data
+
+    if isinstance(data, list):
+        return data
+
+    # 信封解包: 在常见键里找第一个值为数组的
+    if isinstance(data, dict):
+        for key in _ENVELOPE_KEYS:
+            inner = data.get(key)
+            if isinstance(inner, list):
+                return inner
+        # 兜底: 遍历所有值, 取第一个数组
+        for v in data.values():
+            if isinstance(v, list):
+                return v
+
+    raise ValueError(
+        f"接口返回不是数组 (type={type(data).__name__}), "
+        f"响应预览: {str(data)[:200]}"
+    )
 
 
 async def _seed_one(config: ExtConfig, flatten, data_dir: Path) -> int: