root/Neo-ZQYY
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: 累积功能变更 — 聊天集成、租户管理、小程序更新、ETL 增强、迁移脚本

Browse Source 
包含多个会话的累积代码变更：
- backend: AI 聊天服务、触发器调度、认证增强、WebSocket、调度器最小间隔
- admin-web: ETL 状态页、任务管理、调度配置、登录优化
- miniprogram: 看板页面、聊天集成、UI 组件、导航更新
- etl: DWS 新任务（finance_area_daily/board_cache）、连接器增强
- tenant-admin: 项目初始化
- db: 19 个迁移脚本（etl_feiqiu 11 + zqyy_app 8）
- packages/shared: 枚举和工具函数更新
- tools: 数据库工具、报表生成、健康检查
- docs: PRD/架构/部署/合约文档更新

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Neo
2026-04-06 00:03:48 +08:00
parent 70324d8542
commit 6f8f12314f
515 changed files with 76604 additions and 7456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

216
apps/backend/app/routers/xcx_auth.py
View File

@@ -1,3 +1,9 @@
# AI_CHANGELOG
# | 日期 | Prompt | 变更 |
# |------|--------|------|
# | 2026-03-23 | P20260323-190012 禁用→移除+鉴权两层模型 | login/refresh 移除 disabled 403 拦截；disabled 签发受限令牌由前端路由；cancel-application 接口；角色列表更新 |
# | 2026-03-23 | 角色路由+页面权限守卫 | /api/xcx/me、/api/xcx/login、/api/xcx/dev-login 返回用户角色 |
# -*- coding: utf-8 -*-
"""
小程序认证路由 —— 微信登录、申请提交、状态查询、店铺切换、令牌刷新。
@@ -37,17 +43,20 @@ from app.auth.jwt import (
from app import config
from app.database import get_connection
from app.services.application import (
cancel_application,
create_application,
get_user_applications,
)
from app.schemas.xcx_auth import (
ApplicationRequest,
ApplicationResponse,
CancelApplicationResponse,
DevLoginRequest,
DevSwitchBindingRequest,
DevSwitchRoleRequest,
DevSwitchStatusRequest,
DevContextResponse,
LatestApplicationDetail,
RefreshTokenRequest,
SiteInfo,
SwitchSiteRequest,
@@ -57,6 +66,7 @@ from app.schemas.xcx_auth import (
)
from app.services.wechat import WeChatAuthError, code2session
from app.services.role import get_user_permissions
from app.trace.decorators import trace_service
logger = logging.getLogger(__name__)
@@ -74,6 +84,7 @@ def _get_user_roles_at_site(conn, user_id: int, site_id: int) -> list[str]:
FROM auth.user_site_roles usr
JOIN auth.roles r ON usr.role_id = r.id
WHERE usr.user_id = %s AND usr.site_id = %s
AND usr.is_removed = false
""",
(user_id, site_id),
)
@@ -88,6 +99,7 @@ def _get_user_default_site(conn, user_id: int) -> int | None:
SELECT DISTINCT site_id
FROM auth.user_site_roles
WHERE user_id = %s
AND is_removed = false
ORDER BY site_id
LIMIT 1
""",
@@ -100,12 +112,13 @@ def _get_user_default_site(conn, user_id: int) -> int | None:
# ── POST /api/xcx/login ──────────────────────────────────
@router.post("/login", response_model=WxLoginResponse)
@trace_service("微信登录", "WeChat login")
async def wx_login(body: WxLoginRequest):
"""
微信登录。
流程：code → code2session(openid) → 查找/创建 auth.users → 签发 JWT。
- disabled 用户返回 403
- disabled 用户签发受限令牌，由前端状态路由处理
- 新用户自动创建（status=new），前端引导至申请页
- approved 用户签发包含 site_id + roles 的完整令牌
- new/pending/rejected 用户签发受限令牌
@@ -157,23 +170,38 @@ async def wx_login(body: WxLoginRequest):
(openid,),
)
row = cur.fetchone()
else:
# CHANGE 2026-03-22 | #8: 已有用户登录时更新 wx_union_id（幂等保护）
# intent: unionid 可能在首次登录时为空（未绑定开放平台），后续登录补全
if unionid:
cur.execute(
"""
UPDATE auth.users
SET wx_union_id = %s
WHERE id = %s
AND (wx_union_id IS NULL OR wx_union_id <> %s)
""",
(unionid, row[0], unionid),
)
if cur.rowcount > 0:
conn.commit()
user_id, user_status = row
# 3. disabled 用户拒绝登录
if user_status == "disabled":
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN,
detail="账号已被禁用",
)
# CHANGE 2026-03-23 | disabled 不再拒绝登录
# 第一层（微信身份）始终有效，disabled 只影响第二层（业务状态路由）
# disabled/new/pending/rejected 统一签发受限令牌，由前端状态路由处理
# 4. 签发令牌
# CHANGE 2026-03-23 | 角色路由：登录时查询角色并返回
login_role: str | None = None
if user_status == "approved":
# 查找默认 site_id 和角色
default_site_id = _get_user_default_site(conn, user_id)
if default_site_id is not None:
roles = _get_user_roles_at_site(conn, user_id, default_site_id)
tokens = create_token_pair(user_id, default_site_id, roles=roles)
login_role = roles[0] if roles else None
else:
# approved 但无 site 绑定（异常边界），签发受限令牌
tokens = create_limited_token_pair(user_id)
@@ -190,12 +218,14 @@ async def wx_login(body: WxLoginRequest):
token_type=tokens["token_type"],
user_status=user_status,
user_id=user_id,
role=login_role,
)
# ── POST /api/xcx/apply ──────────────────────────────────
@router.post("/apply", response_model=ApplicationResponse)
@trace_service("提交入驻申请", "Submit application")
async def submit_application(
body: ApplicationRequest,
user: CurrentUser = Depends(get_current_user_or_limited),
@@ -217,9 +247,27 @@ async def submit_application(
return ApplicationResponse(**result)
# ── POST /api/xcx/cancel-application ─────────────────────
@router.post("/cancel-application", response_model=CancelApplicationResponse)
@trace_service("取消申请", "Cancel application")
async def cancel_my_application(
user: CurrentUser = Depends(get_current_user_or_limited),
):
"""
用户主动取消当前 pending 申请。
将申请 status 改为 cancelled，用户 status 回退 new。
返回被取消申请的信息（用于前端预填重新申请表单）。
"""
result = await cancel_application(user_id=user.user_id)
return CancelApplicationResponse(**result)
# ── GET /api/xcx/me ───────────────────────────────────────
@router.get("/me", response_model=UserStatusResponse)
@trace_service("查询自身状态", "Get my status")
async def get_my_status(
user: CurrentUser = Depends(get_current_user_or_limited),
):
@@ -232,8 +280,9 @@ async def get_my_status(
try:
with conn.cursor() as cur:
# 查询用户基本信息
# CHANGE 2026-03-24 | 头像：新增 avatar_url 字段查询
cur.execute(
"SELECT id, status, nickname FROM auth.users WHERE id = %s",
"SELECT id, status, nickname, avatar_url FROM auth.users WHERE id = %s",
(user.user_id,),
)
user_row = cur.fetchone()
@@ -243,25 +292,110 @@ async def get_my_status(
detail="用户不存在",
)
user_id, user_status, nickname = user_row
user_id, user_status, nickname, avatar_url = user_row
# CHANGE 2026-03-23 | 角色路由：approved 用户查询当前门店角色
role: str | None = None
store_name: str | None = None
coach_level: str | None = None
if user_status == "approved":
site_id = getattr(user, "site_id", None)
# CHANGE 2026-03-24 | 受限 token 兼容：token 无 site_id 时从数据库查默认 site
# 场景：用户从 pending→approved，旧的受限 token 不含 site_id
if not site_id:
site_id = _get_user_default_site(conn, user_id)
if site_id:
roles = _get_user_roles_at_site(conn, user_id, site_id)
# 用户在一个门店下仅一个角色
role = roles[0] if roles else None
# CHANGE 2026-03-23 | banner 数据修复：查询门店名
cur.execute(
"SELECT site_name FROM biz.sites WHERE site_id = %s",
(site_id,),
)
sn_row = cur.fetchone()
store_name = sn_row[0] if sn_row else None
# CHANGE 2026-03-23 | banner 数据修复：查询助教等级（coach_level）
cur.execute(
"""
SELECT assistant_id
FROM auth.user_assistant_binding
WHERE user_id = %s AND site_id = %s AND assistant_id IS NOT NULL
AND is_removed = false
LIMIT 1
""",
(user_id, site_id),
)
bind_row = cur.fetchone()
if bind_row:
try:
from datetime import datetime as _dt
from app.services import fdw_queries
_now = _dt.now()
# CHANGE 2026-03-24 | coach_level 回退链：salary_calc → monthly_summary
# salary_calc 月初结算前可能无数据，monthly_summary 每日更新更可靠
salary = fdw_queries.get_salary_calc(
conn, site_id, bind_row[0], _now.year, _now.month,
)
if salary:
coach_level = salary.get("coach_level") or None
if not coach_level:
ms = fdw_queries.get_monthly_summary(
conn, site_id, bind_row[0], _now.year, _now.month,
)
if ms:
coach_level = ms.get("coach_level") or None
except Exception:
pass # 优雅降级：FDW 查询失败不影响主流程
finally:
conn.close()
# 委托 service 查询申请列表
# CHANGE 2026-03-27 | 权限改造 W2：查询权限码列表
# get_user_permissions 内部自行获取连接，无需外部 conn
permissions: list[str] = []
if user_status == "approved" and role:
_perm_site_id = getattr(user, "site_id", None) or site_id
if _perm_site_id:
permissions = await get_user_permissions(user_id, _perm_site_id)
# 委托 service 查询申请列表（排除 cancelled）
app_list = await get_user_applications(user_id)
applications = [ApplicationResponse(**a) for a in app_list]
applications = [ApplicationResponse(**a) for a in app_list if a["status"] != "cancelled"]
# 最新申请（含 phone/employee_number，用于前端展示和预填）
latest = None
if app_list:
la = app_list[0] # 已按 created_at DESC 排序
latest = LatestApplicationDetail(
id=la["id"],
site_code=la["site_code"],
applied_role_text=la["applied_role_text"],
phone=la.get("phone", ""),
employee_number=la.get("employee_number"),
status=la["status"],
review_note=la.get("review_note"),
created_at=la["created_at"],
reviewed_at=la.get("reviewed_at"),
)
return UserStatusResponse(
user_id=user_id,
status=user_status,
nickname=nickname,
avatar_url=avatar_url,
role=role,
permissions=permissions,
store_name=store_name,
coach_level=coach_level,
applications=applications,
latest_application=latest,
)
# ── GET /api/xcx/me/sites ────────────────────────────────
@router.get("/me/sites", response_model=list[SiteInfo])
@trace_service("查询关联店铺", "Get my sites")
async def get_my_sites(
user: CurrentUser = Depends(get_current_user),
):
@@ -281,8 +415,9 @@ async def get_my_sites(
r.name AS role_name
FROM auth.user_site_roles usr
JOIN auth.roles r ON usr.role_id = r.id
LEFT JOIN auth.site_code_mapping scm ON usr.site_id = scm.site_id
LEFT JOIN biz.sites scm ON scm.site_id = usr.site_id
WHERE usr.user_id = %s
AND usr.is_removed = false
ORDER BY usr.site_id, r.code
""",
(user.user_id,),
@@ -306,6 +441,7 @@ async def get_my_sites(
# ── POST /api/xcx/switch-site ────────────────────────────
@router.post("/switch-site", response_model=WxLoginResponse)
@trace_service("切换当前店铺", "Switch site")
async def switch_site(
body: SwitchSiteRequest,
user: CurrentUser = Depends(get_current_user),
@@ -323,6 +459,7 @@ async def switch_site(
"""
SELECT 1 FROM auth.user_site_roles
WHERE user_id = %s AND site_id = %s
AND is_removed = false
LIMIT 1
""",
(user.user_id, body.site_id),
@@ -360,13 +497,14 @@ async def switch_site(
# ── POST /api/xcx/refresh ────────────────────────────────
@router.post("/refresh", response_model=WxLoginResponse)
@trace_service("刷新令牌", "Refresh token")
async def refresh_token(body: RefreshTokenRequest):
"""
刷新令牌。
解码 refresh_token → 根据用户当前状态签发新的令牌对。
- 受限 refresh_token（limited=True）→ 签发新的受限令牌对
- 完整 refresh_token → 签发新的完整令牌对（保持原 site_id）
解码 refresh_token → 根据用户当前数据库状态签发新的令牌对。
- approved 用户 → 签发完整令牌（即使旧 token 是受限的，也自动升级）
- 其他状态 → 签发受限令牌
"""
try:
payload = decode_refresh_token(body.refresh_token)
@@ -396,26 +534,28 @@ async def refresh_token(body: RefreshTokenRequest):
_, user_status = user_row
if user_status == "disabled":
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN,
detail="账号已被禁用",
)
if is_limited or user_status != "approved":
# 受限令牌刷新 → 仍签发受限令牌
tokens = create_limited_token_pair(user_id)
else:
# 完整令牌刷新 → 使用原 site_id 签发
site_id = payload.get("site_id")
if site_id is None:
# 回退到默认 site
# CHANGE 2026-03-23 | 令牌升级：根据数据库当前状态决定签发类型
# 旧的受限 token 不应锁死用户——审核通过后 refresh 应自动升级为完整 token
if user_status == "approved":
# approved 用户：签发完整令牌（无论旧 token 是否 limited）
if is_limited:
# 受限 token 升级：查默认 site
site_id = _get_user_default_site(conn, user_id)
else:
# 完整 token 刷新：优先保持原 site_id
site_id = payload.get("site_id")
if site_id is None:
site_id = _get_user_default_site(conn, user_id)
if site_id is not None:
roles = _get_user_roles_at_site(conn, user_id, site_id)
tokens = create_token_pair(user_id, site_id, roles=roles)
else:
# approved 但无 site 绑定（异常边界）
tokens = create_limited_token_pair(user_id)
else:
# new / pending / rejected / disabled → 受限令牌
tokens = create_limited_token_pair(user_id)
finally:
conn.close()
@@ -433,6 +573,7 @@ async def refresh_token(body: RefreshTokenRequest):
if config.WX_DEV_MODE:
@router.post("/dev-login", response_model=WxLoginResponse)
@trace_service("开发模式登录", "Dev mode login")
async def dev_login(body: DevLoginRequest):
"""
开发模式 mock 登录。
@@ -482,11 +623,14 @@ if config.WX_DEV_MODE:
user_id, user_status = row
# 签发令牌（逻辑与正常登录一致）
# CHANGE 2026-03-23 | 角色路由：dev-login 也返回角色
dev_login_role: str | None = None
if user_status == "approved":
default_site_id = _get_user_default_site(conn, user_id)
if default_site_id is not None:
roles = _get_user_roles_at_site(conn, user_id, default_site_id)
tokens = create_token_pair(user_id, default_site_id, roles=roles)
dev_login_role = roles[0] if roles else None
else:
tokens = create_limited_token_pair(user_id)
else:
@@ -501,11 +645,13 @@ if config.WX_DEV_MODE:
token_type=tokens["token_type"],
user_status=user_status,
user_id=user_id,
role=dev_login_role,
)
# ── GET /api/xcx/dev-context（仅开发模式） ────────────────
@router.get("/dev-context", response_model=DevContextResponse)
@trace_service("查询调试上下文", "Get dev context")
async def dev_context(
user: CurrentUser = Depends(get_current_user_or_limited),
):
@@ -532,7 +678,7 @@ if config.WX_DEV_MODE:
site_name = None
if user.site_id:
cur.execute(
"SELECT site_name FROM auth.site_code_mapping WHERE site_id = %s",
"SELECT site_name FROM biz.sites WHERE site_id = %s",
(user.site_id,),
)
sn_row = cur.fetchone()
@@ -552,6 +698,7 @@ if config.WX_DEV_MODE:
SELECT assistant_id, staff_id, binding_type
FROM auth.user_assistant_binding
WHERE user_id = %s AND site_id = %s
AND is_removed = false
LIMIT 1
""",
(user.user_id, user.site_id),
@@ -572,8 +719,9 @@ if config.WX_DEV_MODE:
r.code, r.name
FROM auth.user_site_roles usr
JOIN auth.roles r ON usr.role_id = r.id
LEFT JOIN auth.site_code_mapping scm ON usr.site_id = scm.site_id
LEFT JOIN biz.sites scm ON scm.site_id = usr.site_id
WHERE usr.user_id = %s
AND usr.is_removed = false
ORDER BY usr.site_id, r.code
""",
(user.user_id,),
@@ -604,6 +752,7 @@ if config.WX_DEV_MODE:
# ── POST /api/xcx/dev-switch-role（仅开发模式） ───────────
@router.post("/dev-switch-role", response_model=WxLoginResponse)
@trace_service("切换角色", "Dev switch role")
async def dev_switch_role(
body: DevSwitchRoleRequest,
user: CurrentUser = Depends(get_current_user),
@@ -613,7 +762,8 @@ if config.WX_DEV_MODE:
删除旧角色绑定，插入新角色绑定，重签 token。
"""
valid_roles = ("coach", "staff", "site_admin", "tenant_admin")
# CHANGE 2026-03-23 | 角色体系隔离：小程序端只有 4 个角色，site_admin/tenant_admin 已移至租户管理后台
valid_roles = ("coach", "staff", "head_coach", "manager")
if body.role_code not in valid_roles:
raise HTTPException(
status_code=400,
@@ -669,6 +819,7 @@ if config.WX_DEV_MODE:
# ── POST /api/xcx/dev-switch-status（仅开发模式） ─────────
@router.post("/dev-switch-status", response_model=WxLoginResponse)
@trace_service("切换用户状态", "Dev switch status")
async def dev_switch_status(
body: DevSwitchStatusRequest,
user: CurrentUser = Depends(get_current_user_or_limited),
@@ -718,6 +869,7 @@ if config.WX_DEV_MODE:
# ── POST /api/xcx/dev-switch-binding（仅开发模式） ────────
@router.post("/dev-switch-binding")
@trace_service("切换人员绑定", "Dev switch binding")
async def dev_switch_binding(
body: DevSwitchBindingRequest,
user: CurrentUser = Depends(get_current_user),