From 24e72cd8d36a6b2c49dc8fa1b65325e692c1adea Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 12 Nov 2026 19:03:05 +0800 Subject: [PATCH] =?UTF-8?q?docs+deploy:=20=E5=A4=96=E9=83=A8=E5=85=A5?= =?UTF-8?q?=E5=8F=A3=E7=BB=9F=E4=B8=80=20:88=EF=BC=88:188=20=E7=9A=84=20NA?= =?UTF-8?q?T=20=E5=B7=B2=E5=81=9C=E7=94=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - OAUTH_ISSUER / IDP_BASE / REDIRECT_URI 全部由 :188 改 :88 - 同步层退役后账号表走共享 accounts/ 子目录(IPASS_USERS_PATH),本清单已含该挂载 Co-Authored-By: Claude --- CLAUDE.md | 10 ++++++---- deploy/demo/app.py | 2 +- deploy/k8s/iap-demo.yaml | 8 ++++---- deploy/k8s/ipass-sso.yaml | 8 ++++---- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 4cb9c21..48d2c51 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -113,12 +113,14 @@ runtime 用 `COPY --from=builder /out/libipass_sso_gateway.so`。完整理由与 ## 生产入口与企微回调(K8s) -- 外部入口 `https://i28868828dm.mayishangshu.cn:188`(路由器 :188 → 192.168.1.26:30089 → +- 外部入口 `https://i28868828dm.mayishangshu.cn:88`(路由器 :88 → 192.168.1.26:30089 → pod 18098);NodePort 本身明文,TLS 由上游终结。 -- `OAUTH_ISSUER` 必须与浏览器/第三方实际访问地址**逐字一致**(清单里写死 `:188`)。 + ⚠️ **:188 的 NAT 已于 2026-11 在路由器停用**(:188 会被直接 RST ⇒ 客户端报 + ECONNREFUSED),清单/issuer/文档里一律写 :88。 +- `OAUTH_ISSUER` 必须与浏览器/第三方实际访问地址**逐字一致**(清单里写死 `:88`)。 - ⚠️ `WXWORK_REDIRECT` 必须是 `https://i28868828dm.mayishangshu.cn:88/portal/wxwork/callback` - ——企微后台该应用(agentid 1000017)的可信域名按 **:88** 配置,改成 `:188` 会被 authorize - 页拒(redirect_uri 与可信域名不一致)。 + ——企微后台该应用(agentid 1000017)的可信域名按 **:88** 配置,改成其他端口(含 + 已停用的 `:188`)会被 authorize 页拒(redirect_uri 与可信域名不一致)。 - **同步层已退役**:manifest **不再设** `IPASS_SYNC_*` 三条(nginx.conf 里仍留着放行, 只为回滚方便)⇒ 账号表改为与 ipass-all **共用** `accounts/users.json` (挂 PVC `nginx-data` 的 `accounts/` subPath,env `IPASS_USERS_PATH` 指定)。 diff --git a/deploy/demo/app.py b/deploy/demo/app.py index 9bd8ecb..8658ac9 100644 --- a/deploy/demo/app.py +++ b/deploy/demo/app.py @@ -13,7 +13,7 @@ 参考 docs/integrate-with-iap.md §3.5 完整 OAuth dance 模板, 真实业务 app 应照抄. 环境变量 (K8s Deployment env 注入): - IDP_BASE = https://i28868828dm.mayishangshu.cn:188 + IDP_BASE = https://i28868828dm.mayishangshu.cn:88 REDIRECT_URI = https://.../proxy//callback (oauth_clients.json 注册的) BASE = /proxy/app-crm (HTML href 用; redirect() 不加) PORT = 8000 diff --git a/deploy/k8s/iap-demo.yaml b/deploy/k8s/iap-demo.yaml index 5423a4f..2dc5079 100644 --- a/deploy/k8s/iap-demo.yaml +++ b/deploy/k8s/iap-demo.yaml @@ -44,9 +44,9 @@ spec: containerPort: 8000 env: - name: IDP_BASE - value: "https://i28868828dm.mayishangshu.cn:188" + value: "https://i28868828dm.mayishangshu.cn:88" - name: REDIRECT_URI - value: "https://i28868828dm.mayishangshu.cn:188/proxy/app-crm/callback" + value: "https://i28868828dm.mayishangshu.cn:88/proxy/app-crm/callback" - name: BASE value: "/proxy/app-crm" - name: PORT @@ -126,9 +126,9 @@ spec: containerPort: 8000 env: - name: IDP_BASE - value: "https://i28868828dm.mayishangshu.cn:188" + value: "https://i28868828dm.mayishangshu.cn:88" - name: REDIRECT_URI - value: "https://i28868828dm.mayishangshu.cn:188/proxy/app-mobile/callback" + value: "https://i28868828dm.mayishangshu.cn:88/proxy/app-mobile/callback" - name: BASE value: "/proxy/app-mobile" - name: PORT diff --git a/deploy/k8s/ipass-sso.yaml b/deploy/k8s/ipass-sso.yaml index 9abc8a4..4595f97 100644 --- a/deploy/k8s/ipass-sso.yaml +++ b/deploy/k8s/ipass-sso.yaml @@ -101,11 +101,11 @@ spec: containerPort: 18098 env: # issuer 必须与浏览器/第三方实际访问地址逐字一致 - # iPhone 走 i28868828dm.mayishangshu.cn:188 → 路由器 :188 NAT + # iPhone 走 i28868828dm.mayishangshu.cn:88 → 路由器 :88 NAT # → 192.168.1.26:30089(K8s control plane NodePort)→ pod:18098 - # (旧 i96772757dm.mayishangshu.cn:88 + Mac socat 链路 2026-10-12 废弃) + # (:188 NAT 已于 2026-11 在路由器停用,全站统一 :88) - name: OAUTH_ISSUER - value: "https://i28868828dm.mayishangshu.cn:188" + value: "https://i28868828dm.mayishangshu.cn:88" - name: OAUTH_COOKIE_DOMAIN value: "mayishangshu.cn" # 固定签名密钥:保证 docker → K8s 迁移后已签发 token 仍能验签 @@ -128,7 +128,7 @@ spec: key: wxwork-secret # 回调端口必须与企微后台该应用配置的「网页授权可信域名」一致—— # 新应用(尚数网工作台, agentid 1000017)后台配的是 :88(校验文件也按 :88 过的), - # :188 会被企微 authorize 页拒(redirect_uri 与可信域名不一致) + # 其他端口(含已停用的 :188)会被企微 authorize 页拒(redirect_uri 与可信域名不一致) - name: WXWORK_REDIRECT value: "https://i28868828dm.mayishangshu.cn:88/portal/wxwork/callback" # ---- 共享账号表(ipass-sso 与 ipass-all 共用同一份 users.json)----