feat: openid 即可区分用户 — openid-login 降级建档(CRMEB 查不到也建档)+ 用户中心微信授权登录按钮

This commit is contained in:
2026-07-31 15:04:53 +08:00
parent dd4f922f95
commit 4e4df248ca
2 changed files with 45 additions and 22 deletions

View File

@@ -108,40 +108,46 @@ class OpenidRequest(BaseModel):
@router.post("/openid-login")
async def openid_login(req: OpenidRequest) -> TokenResponse:
"""仅传 openid → 调 CRMEB 获取用户信息 → 创建/更新 User → 返回 token"""
"""仅传 openid → 调 CRMEB 获取用户信息(查不到也降级建档)→ 创建/更新 User → 返回 token"""
if not settings.crmeb_base_url or not settings.crmeb_api_key:
raise HTTPException(status_code=500, detail="CRMEB 未配置")
async with httpx.AsyncClient() as client:
resp = await client.get(
f"{settings.crmeb_base_url}/api/internal/user-info",
params={"openid": req.openid},
headers={"X-Internal-Key": settings.crmeb_api_key},
timeout=10,
)
data = resp.json()
if data.get("code") != 200:
raise HTTPException(status_code=400, detail="获取用户信息失败")
info = data["data"]
# 尝试从 CRMEB 拉取用户资料;失败(新用户/网络)时降级为匿名建档,openid 即身份
nickname, phone, avatar = "", "", ""
try:
async with httpx.AsyncClient() as client:
resp = await client.get(
f"{settings.crmeb_base_url}/api/internal/user-info",
params={"openid": req.openid},
headers={"X-Internal-Key": settings.crmeb_api_key},
timeout=10,
)
data = resp.json()
if data.get("code") == 200:
info = data.get("data") or {}
nickname = (info.get("nickname") or "").strip()
phone = (info.get("phone") or "").strip()
avatar = (info.get("avatar") or "").strip()
except Exception:
pass # CRMEB 不可用时仍允许 openid 建档
# 查找或创建用户
user = await User.find_one(User.openid == req.openid)
if not user:
user = User(
openid=req.openid,
name=info.get("nickname", "") or "",
phone=info.get("phone") or None,
avatar_url=info.get("avatar") or None,
name=nickname,
phone=phone or None,
avatar_url=avatar or None,
)
await user.insert()
else:
user.name = info.get("nickname", "") or user.name
if info.get("phone"):
user.phone = info["phone"]
if info.get("avatar"):
user.avatar_url = info["avatar"]
if nickname:
user.name = nickname
if phone:
user.phone = phone
if avatar:
user.avatar_url = avatar
await user.save()
token = _build_token(user)