-
通过 Z.AI 官方 OAuth 授权登录，授权成功后自动导入到账号池（含 Coding Plan 额度）。链接约 5 分钟内有效，换设备打开亦可。
+
通过官方 OAuth 授权登录，授权成功后自动导入到账号池（含 Coding Plan 额度）。链接约 5 分钟内有效，换设备打开亦可。
+
+ 账号区域
+
+
-
+
💡海外邮箱 / Google 账号登录说明
@@ -104,6 +115,12 @@
2. 登录成功后，点击上方「生成授权链接」并打开授权，即可秒级自动入池。
+
+
+ ✅国内版（智谱开放平台）登录说明
+
+
点击「生成授权链接」后，在浏览器里完成 bigmodel.cn 的手机号 / 微信扫码登录并授权，凭证（含 Coding Plan 额度）自动入池，无需其他操作。
+
在任意浏览器打开下面的链接完成授权（本页保持打开即自动入池）：
@@ -114,10 +131,14 @@
等待授权中…
-
+
⚠️ 提示：若打开后未见邮箱/Google登录选项
上游官方前端默认仅展示手机登录。若需海外邮箱/Google登录：请先打开
邮箱/Google 预登录入口 登录账号，再点击上方「打开授权」即可秒级入池。
+
+
✅ 国内版授权中
+
打开链接后若未登录，会先进入 bigmodel.cn 登录页（手机号 / 微信扫码），登录并确认授权后本页会自动检测并导入账号。
+
@@ -303,8 +324,9 @@
function credCell(a){
const isJwt=a.mode==='jwt';
+ const realm=realmLabel(a.realm||'intl');
return `
${esc(a.name)}${tierBadgeHtml(a)}
-
${esc(a.token_masked)}·${esc(a.provider)} / ${isJwt?'JWT':'API Key'}
`;
+
${esc(a.token_masked)}·${esc(a.provider)} / ${isJwt?'JWT':'API Key'}·${esc(realm||'—')}
`;
}
function statusCell(a){
@@ -439,19 +461,34 @@
}
/* ── Actions ── */
+function realmLabel(r){return r==='cn'?'国内版':(r==='intl'?'国际版':'');}
function openAdd(){
document.getElementById('add-tokens').value='';
switchAddTab('paste');
resetLoginPane();
+ onProviderChange();
openModal('modal-add');
}
+/* 粘贴凭证：bigmodel 提供商只收国内域 API Key，区域选择仅对 zai 有意义 */
+function onProviderChange(){
+ const isZai=document.getElementById('add-provider').value==='zai';
+ document.getElementById('add-realm-field').style.display=isZai?'':'none';
+}
+/* 授权登录：切换区域 = 更换授权出口，未完成的在途链接一并作废重置 */
+function onLoginRealmChange(){
+ const realm=document.getElementById('login-realm').value;
+ document.getElementById('login-help-intl').style.display=realm==='intl'?'':'none';
+ document.getElementById('login-help-cn').style.display=realm==='cn'?'':'none';
+ resetLoginPane();
+}
async function doAdd(){
const tokens=document.getElementById('add-tokens').value;
const provider=document.getElementById('add-provider').value;
+ const realm=provider==='zai'?document.getElementById('add-realm').value:'';
const list=tokens.split('\n').map(s=>s.trim()).filter(Boolean);
if(!list.length)return showToast('请输入至少一个 Token','error');
try{
- const d=await api('POST','/accounts',{provider,tokens:list});
+ const d=await api('POST','/accounts',{provider,tokens:list,...(realm?{realm}:{})});
closeModal('modal-add');
showToast(`新增 ${d.count} 个账号`,'success');
load();
@@ -480,10 +517,14 @@
btn.disabled=true;
try{
const label=document.getElementById('login-label').value.trim();
- const d=await api('POST','/login/start',label?{label}:{});
+ const realm=document.getElementById('login-realm').value;
+ const d=await api('POST','/login/start',{realm,...(label?{label}:{})});
_loginUrl=d.authorize_url;
_loginDeadline=Date.now()+(d.expires_in||300)*1000;
document.getElementById('login-url').value=_loginUrl;
+ // 激活态提示块随区域切换（intl 的邮箱/Google 预登录技巧不适用于 cn）
+ document.getElementById('login-active-tip-intl').style.display=realm==='intl'?'':'none';
+ document.getElementById('login-active-tip-cn').style.display=realm==='cn'?'':'none';
document.getElementById('login-idle').style.display='none';
document.getElementById('login-active').style.display='';
setLoginStatus('等待授权中…',false);
diff --git a/tests/conftest.py b/tests/conftest.py
index aacfe68..67a3c92 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -123,6 +123,8 @@ async def gateway_client(fresh_app, mock_server, monkeypatch, stub_captcha):
# OAuth（cli init/poll + api-key 兑换链）全部收敛到 Mock —— 测试永不打真网
monkeypatch.setattr(settings, "OAUTH_API_BASE", f"{base}/api/v1")
monkeypatch.setattr(settings, "ZAI_EXCHANGE_ORIGIN", base)
+ # 国内版（bigmodel.cn）兑换链业务域同样指向 Mock
+ monkeypatch.setattr(settings, "BIGMODEL_EXCHANGE_ORIGIN", base)
from app.routes import gateway as gateway_module
monkeypatch.setattr(gateway_module, "captcha_manager", stub_captcha)
diff --git a/tests/integration/test_oauth_login.py b/tests/integration/test_oauth_login.py
index 3070714..e1c5208 100644
--- a/tests/integration/test_oauth_login.py
+++ b/tests/integration/test_oauth_login.py
@@ -7,6 +7,7 @@
from __future__ import annotations
import asyncio
+import json
import pytest
@@ -273,3 +274,131 @@ async def test_exchange_api_key_chain_on_ready(self, gateway_client):
assert any(p.endswith("/api_keys/copy/mock-api-key-id") for p in paths)
# ready 后立即触发一次额度刷新（billing 三端点）
assert any(p.endswith("/billing/current") for p in paths)
+
+
+@pytest.mark.integration
+class TestOAuthCnRealm:
+ """国内版（bigmodel.cn）OAuth 双区域回归（对齐 codeapi providers/zcode 实证）：
+
+ - init 请求体 provider=bigmodel（国内版授权出口）
+ - poll 业务 token 在 data.bigmodel 块，且本身就是业务 token —— 不打 z/login
+ - 兑换链（getCustomerInfo → api_keys → copy）照走，Key 挂回 JWT 作回退
+ - 账号以 realm=cn 入池；非法 realm 400
+ """
+
+ @pytest.fixture(autouse=True)
+ async def _reset_mock(self, gateway_client):
+ _, mock = gateway_client
+ mock.state.oauth_state = "pending"
+ mock.state.oauth_poll_status = 200
+ mock.state.oauth_poll_realm = "cn"
+ yield
+ mock.state.oauth_poll_realm = None
+ await _drain_login_followup()
+
+ async def test_invalid_realm_rejected(self, gateway_client):
+ client, _ = gateway_client
+ res = await client.post("/admin/api/login/start", json={"realm": "xx"},
+ headers={"Authorization": "Bearer zcode"})
+ assert res.status_code == 400
+
+ async def test_cn_start_uses_bigmodel_provider(self, gateway_client):
+ client, mock = gateway_client
+ # mock 上游 session 级共享，calls 跨用例累积 —— 记录基线后只断言增量
+ base = len(mock.state.calls)
+ start = (await client.post("/admin/api/login/start", json={"realm": "cn"},
+ headers={"Authorization": "Bearer zcode"})).json()
+ assert start["realm"] == "cn"
+ init = next(c for c in mock.state.calls[base:] if c[1].endswith("/oauth/cli/init"))
+ assert json.loads(init[3])["provider"] == "bigmodel"
+ # 对照：缺省（intl）发起时 provider=zai
+ base2 = len(mock.state.calls)
+ await client.post("/admin/api/login/start",
+ headers={"Authorization": "Bearer zcode"})
+ init_intl = next(c for c in mock.state.calls[base2:]
+ if c[1].endswith("/oauth/cli/init"))
+ assert json.loads(init_intl[3])["provider"] == "zai"
+
+ async def test_cn_full_flow_skips_z_login_and_pools_cn_account(self, gateway_client):
+ client, mock = gateway_client
+ base = len(mock.state.calls)
+ start = (await client.post("/admin/api/login/start",
+ json={"label": "cn-1", "realm": "cn"},
+ headers={"Authorization": "Bearer zcode"})).json()
+ mock.state.oauth_state = "ready"
+ poll = (await client.get(f"/admin/api/login/poll/{start['flow_id']}",
+ headers={"Authorization": "Bearer zcode"})).json()
+ assert poll["status"] == "ready"
+ acc = poll["account"]
+ assert acc["provider"] == "zai"
+ assert acc["realm"] == "cn"
+ assert acc["mode"] == "jwt"
+
+ await _drain_login_followup()
+ paths = [c[1] for c in mock.state.calls[base:]]
+ # cn 的业务 token 即 access_token：绝不打国际版的 z/login 换取
+ assert "/api/auth/z/login" not in paths
+ # 兑换链照走，回退 Key 挂回同一 JWT 账号
+ assert "/api/biz/customer/getCustomerInfo" in paths
+ assert any(p.endswith("/api_keys/copy/mock-api-key-id") for p in paths)
+ accounts = (await client.get("/admin/api/accounts",
+ headers={"Authorization": "Bearer zcode"})).json()
+ stored = next(a for a in accounts["accounts"] if a["id"] == acc["id"])
+ assert stored["realm"] == "cn"
+ assert (stored["token_masked"] or "") != ""
+
+
+@pytest.mark.integration
+class TestPasteRealm:
+ """粘贴入池的区域语义：
+
+ - zai + realm=cn 的两段点 JWT → JWT 模式、realm=cn 入池
+ - bigmodel 提供商粘入两段点 JWT（zcodejwttoken）→ 自动归位 zai/cn
+ （bigmodel 通道只接受 open.bigmodel.cn 的 x-api-key，JWT 在该通道永不可用）
+ - 非法 realm 400
+ """
+
+ async def _post(self, client, payload):
+ return await client.post("/admin/api/accounts", json=payload,
+ headers={"Authorization": "Bearer zcode"})
+
+ async def test_zai_cn_jwt_pools_with_cn_realm(self, gateway_client):
+ client, _ = gateway_client
+ res = await self._post(client, {"provider": "zai", "realm": "cn",
+ "tokens": ["h.cnjwt.sig"]})
+ assert res.status_code == 200
+ accounts = (await client.get("/admin/api/accounts",
+ headers={"Authorization": "Bearer zcode"})).json()
+ acc = accounts["accounts"][0]
+ assert acc["realm"] == "cn"
+ assert acc["mode"] == "jwt"
+
+ async def test_bigmodel_jwt_auto_migrates_to_zai_cn(self, gateway_client):
+ client, _ = gateway_client
+ res = await self._post(client, {"provider": "bigmodel",
+ "tokens": ["h.migrated.sig"]})
+ assert res.status_code == 200
+ accounts = (await client.get("/admin/api/accounts",
+ headers={"Authorization": "Bearer zcode"})).json()
+ acc = accounts["accounts"][0]
+ assert acc["provider"] == "zai"
+ assert acc["realm"] == "cn"
+ assert acc["mode"] == "jwt"
+
+ async def test_bigmodel_apikey_defaults_cn(self, gateway_client):
+ client, _ = gateway_client
+ res = await self._post(client, {"provider": "bigmodel",
+ "tokens": ["mock-api-key-id.secret"]})
+ assert res.status_code == 200
+ accounts = (await client.get("/admin/api/accounts",
+ headers={"Authorization": "Bearer zcode"})).json()
+ acc = accounts["accounts"][0]
+ assert acc["provider"] == "bigmodel"
+ assert acc["realm"] == "cn"
+ assert acc["mode"] == "apiKey"
+
+ async def test_invalid_realm_rejected(self, gateway_client):
+ client, _ = gateway_client
+ res = await self._post(client, {"provider": "zai", "realm": "xx",
+ "tokens": ["abc"]})
+ assert res.status_code == 400
diff --git a/tests/mock_upstream/server.py b/tests/mock_upstream/server.py
index 050b144..a709f9b 100644
--- a/tests/mock_upstream/server.py
+++ b/tests/mock_upstream/server.py
@@ -412,11 +412,15 @@ async def oauth_poll(flow_id: str, request: Request) -> Response:
if state == "failed":
data["message"] = getattr(app.state, "oauth_fail_message", "user denied")
if state == "ready":
- data.update({
- "status": "ready",
- "token": "mock-gateway-jwt-header.eyJzdWIiOiJtb2NrIn0.sig",
- "zai": {"access_token": "mock-access-token"},
- })
+ data["status"] = "ready"
+ data["token"] = "mock-gateway-jwt-header.eyJzdWIiOiJtb2NrIn0.sig"
+ # 业务 token 块随区域（真实上游只下发与 init provider 匹配的块）：
+ # oauth_poll_realm="cn" → data.bigmodel（业务 token 即 access_token）；
+ # 缺省 intl → data.zai（OAuth 会话凭证，还需 z/login 换业务 token）
+ if str(getattr(app.state, "oauth_poll_realm", "") or "") == "cn":
+ data["bigmodel"] = {"access_token": "mock-cn-access-token"}
+ else:
+ data["zai"] = {"access_token": "mock-access-token"}
return Response(json.dumps({"data": data}), media_type="application/json")
@app.post("/api/auth/z/login")
diff --git a/tests/unit/test_constants.py b/tests/unit/test_constants.py
index 78bb687..756f9bb 100644
--- a/tests/unit/test_constants.py
+++ b/tests/unit/test_constants.py
@@ -21,6 +21,19 @@ def test_billing_base():
assert constants.BILLING_BASE == "https://zcode.z.ai/api/v1/zcode-plan"
+def test_oauth_realms():
+ """双区域表（对齐 codeapi providers/zcode/realms.py，官方客户端 3.14.x 实证）：
+ CLI init/poll 端点 intl/cn 共用，provider 参数、业务 token 块名与业务域随区域。"""
+ assert constants.BIGMODEL_BUSINESS_ORIGIN == "https://bigmodel.cn"
+ assert constants.OAUTH_REALMS["intl"] == {
+ "oauth_provider": "zai", "business_origin": "https://api.z.ai",
+ }
+ assert constants.OAUTH_REALMS["cn"] == {
+ "oauth_provider": "bigmodel", "business_origin": "https://bigmodel.cn",
+ }
+ assert constants.OAUTH_PROVIDER_BLOCKS == {"intl": "zai", "cn": "bigmodel"}
+
+
def test_client_configs():
assert constants.CLIENT_CONFIGS_URL == "https://zcode.z.ai/api/v1/client/configs"
# 实测带 platform 参数上游 3001，只允许 app_version
@@ -88,6 +101,9 @@ def test_settings_upstream_defaults_from_constants():
assert settings.UPSTREAM["zai_fallback"] == constants.MESSAGES_URLS["zai_fallback"]
assert settings.UPSTREAM["bigmodel"] == constants.MESSAGES_URLS["bigmodel"]
assert settings.ZCODE_BILLING_BASE == constants.BILLING_BASE
+ # 兑换链业务域随区域：intl=api.z.ai，cn=bigmodel.cn
+ assert settings.ZAI_EXCHANGE_ORIGIN == constants.ZAI_API_ORIGIN
+ assert settings.BIGMODEL_EXCHANGE_ORIGIN == constants.BIGMODEL_BUSINESS_ORIGIN
# 网关常量（底座原值，回归锁定）
diff --git a/tests/unit/test_models_realm.py b/tests/unit/test_models_realm.py
new file mode 100644
index 0000000..b069ddf
--- /dev/null
+++ b/tests/unit/test_models_realm.py
@@ -0,0 +1,65 @@
+"""账号区域（realm）单元测试：
+
+- Account.create 的区域默认与纠偏（bigmodel 提供商 → cn；非法值回退 intl）
+- realm 随 to_dict/from_dict 持久化往返
+- public_view 暴露 realm
+- agent.build_request 回退 Key 通道按区域分流（intl → api.z.ai，cn → open.bigmodel.cn）
+"""
+
+from __future__ import annotations
+
+from app import settings
+from app.agent import build_request
+from app.models import Account
+
+
+def test_create_zai_defaults_intl():
+ acc = Account.create("zai", "a1", "h.payload.sig")
+ assert acc.realm == "intl"
+ assert acc.mode == "jwt" # 两段点 + zai 提供商 → JWT
+
+
+def test_create_bigmodel_defaults_cn():
+ acc = Account.create("bigmodel", "a2", "keyid.secret")
+ assert acc.realm == "cn"
+ assert acc.mode == "apiKey"
+
+
+def test_create_invalid_realm_falls_back():
+ assert Account.create("zai", "a3", "k", realm="xx").realm == "intl"
+ assert Account.create("bigmodel", "a4", "k", realm="xx").realm == "cn"
+
+
+def test_create_explicit_cn_keeps_jwt_mode():
+ acc = Account.create("zai", "a5", "h.cn.sig", realm="cn")
+ assert acc.realm == "cn"
+ assert acc.mode == "jwt"
+
+
+def test_realm_roundtrip_persistence():
+ acc = Account.create("zai", "a6", "h.cn.sig", realm="cn")
+ restored = Account.from_dict(acc.to_dict())
+ assert restored.realm == "cn"
+ # 旧数据（无 realm 字段）加载后回退默认 intl
+ legacy = {k: v for k, v in acc.to_dict().items() if k != "realm"}
+ assert Account.from_dict(legacy).realm == "intl"
+
+
+def test_public_view_exposes_realm():
+ view = Account.create("zai", "a7", "h.cn.sig", realm="cn").public_view()
+ assert view["realm"] == "cn"
+
+
+def _fallback_url(realm: str) -> str:
+ acc = Account.create("zai", "n", "keyid.secret", realm=realm)
+ url, headers, _ = build_request(acc, {"model": "GLM-5.3-Flash"}, None)
+ assert headers.get("x-api-key") == "keyid.secret"
+ return url
+
+
+def test_fallback_channel_intl_routes_to_zai():
+ assert _fallback_url("intl") == settings.UPSTREAM["zai_fallback"]
+
+
+def test_fallback_channel_cn_routes_to_bigmodel():
+ assert _fallback_url("cn") == settings.UPSTREAM["bigmodel"]