109 lines
3.2 KiB
Markdown
109 lines
3.2 KiB
Markdown
|
# v0.7.1+ hotfix step 5 部署指引
|
||
|
|
|
||
|
|
## 目标
|
||
|
|
修复 `/api/auth_qrcode/create` 返回的 `qrcode_url` 含相对路径(`/api/auth_qrcode/scan`),导致企微 App 扫码后 iOS 报 `NSURLErrorCannotFindHost`。
|
||
|
|
|
||
|
|
## 根因
|
||
|
|
`backend/app/config.py` 第 145 行新增的 `qrcode_oauth_callback` 字段,pydantic-settings 默认只做大小写转换,**不**剥环境变量前缀。
|
||
|
|
- 字段名:`qrcode_oauth_callback`
|
||
|
|
- pydantic-settings 期望 env:`QRCODE_OAUTH_CALLBACK`(大小写转换后)
|
||
|
|
- 实际 env:`WECOM_QRCODE_CALLBACK`(带前缀,匹配不上)
|
||
|
|
|
||
|
|
所以即使容器 env 里有 `WECOM_QRCODE_CALLBACK=https://...`,`settings.qrcode_oauth_callback` 仍然返回空字符串,fallback 走相对路径。
|
||
|
|
|
||
|
|
## 修复
|
||
|
|
1. `from pydantic import Field`
|
||
|
|
2. 字段加 `validation_alias="WECOM_QRCODE_CALLBACK"` 显式映射
|
||
|
|
|
||
|
|
修改文件:`backend/app/config.py` 第 9-12 行 / 第 138-149 行(已修改完毕)
|
||
|
|
|
||
|
|
---
|
||
|
|
|
||
|
|
## 堡垒机部署步骤(用户操作)
|
||
|
|
|
||
|
|
### Step 1: 打开堡垒机 → 跳到 backend 容器所在的服务器
|
||
|
|
|
||
|
|
### Step 2: 粘贴以下整段(把 config.py base64 写到 /tmp)
|
||
|
|
|
||
|
|
```bash
|
||
|
|
mkdir -p /tmp/hotfix-qrcode
|
||
|
|
```
|
||
|
|
|
||
|
|
(此时我会下一条消息给你一段 base64,你**整段复制粘贴**,然后按 Enter)
|
||
|
|
|
||
|
|
### Step 3: 解码 base64 → 写文件
|
||
|
|
|
||
|
|
```bash
|
||
|
|
# 假设上一条粘贴的 base64 内容在 /tmp/b64.txt
|
||
|
|
# 如果你直接粘贴到了终端,先按 Ctrl+C,然后:
|
||
|
|
base64 -d > /tmp/hotfix-qrcode/config.py << 'B64END'
|
||
|
|
# 我下一条消息会发
|
||
|
|
B64END
|
||
|
|
```
|
||
|
|
|
||
|
|
### Step 4: 验证文件写入正确
|
||
|
|
|
||
|
|
```bash
|
||
|
|
wc -l /tmp/hotfix-qrcode/config.py
|
||
|
|
# 应该是 215 行左右
|
||
|
|
|
||
|
|
grep -A2 "qrcode_oauth_callback" /tmp/hotfix-qrcode/config.py | head -5
|
||
|
|
# 应该看到:
|
||
|
|
# qrcode_oauth_callback: str = Field(
|
||
|
|
# default="",
|
||
|
|
# validation_alias="WECOM_QRCODE_CALLBACK",
|
||
|
|
|
||
|
|
grep "from pydantic import Field" /tmp/hotfix-qrcode/config.py
|
||
|
|
# 应该看到一行:from pydantic import Field
|
||
|
|
```
|
||
|
|
|
||
|
|
### Step 5: 执行 hotfix 主脚本
|
||
|
|
|
||
|
|
```bash
|
||
|
|
bash /tmp/hotfix-qrcode/step5.sh
|
||
|
|
# 如果没上传,先粘下面的脚本内容到 /tmp/hotfix-qrcode/step5.sh
|
||
|
|
```
|
||
|
|
|
||
|
|
(完整脚本内容见 `deploy-staging/hotfix-qrcode-step5.sh`,可直接复制粘贴)
|
||
|
|
|
||
|
|
### Step 6: 跑完报告输出
|
||
|
|
|
||
|
|
请把最后一段"=== 部署完成 ==="之前的输出完整贴回来给我。
|
||
|
|
|
||
|
|
## 预期结果
|
||
|
|
|
||
|
|
1. ✅ 容器 env 含 `WECOM_QRCODE_CALLBACK=https://itsupport.servyou.com.cn/api/auth_qrcode/scan`
|
||
|
|
2. ✅ `settings.qrcode_oauth_callback` 读到该 URL(不再是空)
|
||
|
|
3. ✅ `/api/auth_qrcode/create` 的 `qrcode_url` 含 `itsupport.servyou.com.cn` 绝对域名
|
||
|
|
|
||
|
|
## 验证 fix 生效(可选,你自己在企微 App 内扫码)
|
||
|
|
|
||
|
|
打开企微 → 访问 `https://itsupport.servyou.com.cn/itportal/` → 应能正常跳转,不再报 `NSURLErrorCannotFindHost`。
|
||
|
|
|
||
|
|
---
|
||
|
|
|
||
|
|
## 备用方案:如果 base64 太大粘贴失败
|
||
|
|
|
||
|
|
分段传:
|
||
|
|
```bash
|
||
|
|
# 分段 1/3
|
||
|
|
cat >> /tmp/hotfix-qrcode/config.py.b64.part << 'EOF1'
|
||
|
|
(第一段 base64)
|
||
|
|
EOF1
|
||
|
|
|
||
|
|
# 分段 2/3
|
||
|
|
cat >> /tmp/hotfix-qrcode/config.py.b64.part << 'EOF2'
|
||
|
|
(第二段 base64)
|
||
|
|
EOF2
|
||
|
|
|
||
|
|
# 分段 3/3
|
||
|
|
cat >> /tmp/hotfix-qrcode/config.py.b64.part << 'EOF3'
|
||
|
|
(第三段 base64)
|
||
|
|
EOF3
|
||
|
|
|
||
|
|
# 拼接 + 解码
|
||
|
|
cat /tmp/hotfix-qrcode/config.py.b64.part | tr -d '\n' > /tmp/hotfix-qrcode/config.py.b64
|
||
|
|
base64 -d /tmp/hotfix-qrcode/config.py.b64 > /tmp/hotfix-qrcode/config.py
|
||
|
|
wc -l /tmp/hotfix-qrcode/config.py
|
||
|
|
```
|