's'

app/main.py

@@ -1,14 +1,10 @@
 """
-支付 API 主入口
-支持多支付渠道（XorPay、ZPAY），通过 PAYMENT_PROVIDER 环境变量切换
+salon API 主入口
+支付（ZPAY/XorPay）+ 报名、用户、小红书资料
 
-路由模块化，按项目拆分：
-- nomadvip: /nomadvip/*     - 固定 ZPAY
-- digital:  /digital/*      - 使用 PAYMENT_PROVIDER
-- cnomadcna: /cnomadcna/*   - 使用 PAYMENT_PROVIDER
-- nomadlms: /nomadlms/*     - 使用 PAYMENT_PROVIDER
-- legacy:   /payh5、/zpay_notify 等（向后兼容）
-- common:   /submit_meetup_application、/create_user
+路由：
+- /salon/*      支付（payh5、payh5/redirect、order_status、zpay_notify、xorpay_notify）
+- /api/salon/*  报名、check-user、ensure-user、complete-order、join、volunteers、xiaohongshu/profile
 
 本地调试：BASE_URL 需为 ZPAY 可访问地址（如 ngrok）
 线上部署：BASE_URL=https://api.nomadyt.com（必须为 ZPAY 可公网访问的地址）
@@ -22,21 +18,11 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 
 from .config import BASE_URL
-from .routers import (
-    nomadvip_router,
-    digital_router,
-    cnomadcna_router,
-    nomadlms_router,
-    salon_router,
-    legacy_router,
-    common_router,
-    meetup_router,
-    salon_meetup_router,
-)
+from .routers import salon_router, salon_meetup_router
 
 app = FastAPI(
-    title="PayJS API",
-    description="nomadvip / digital / cnomadcna / nomadlms 支付接口",
+    title="Salon API",
+    description="沙龙报名、支付、小红书资料",
     version="2.0",
 )
 
@@ -96,9 +82,7 @@ def _safe_stderr_write(message: str) -> None:
 
 
 def _should_trace_request(path: str) -> bool:
-    return any(
-        segment in path for segment in ("/nomadvip", "/digital", "/cnomadcna", "/nomadlms", "/salon")
-    )
+    return "/salon" in path or "/api/salon" in path
 
 # 启动时校验 BASE_URL（线上部署必须为公网可访问地址，否则 ZPAY 无法回调）
 def _check_base_url():
@@ -121,7 +105,7 @@ async def startup_event():
 @app.get("/health")
 async def health(check_zpay: str = ""):
     """健康检查。check_zpay=1 时额外检测 zpayz.cn 连通性（含 SSL、mapi 接口）"""
-    out = {"status": "ok", "service": "payjsapi", "base_url": BASE_URL}
+    out = {"status": "ok", "service": "salonapi", "base_url": BASE_URL}
     if str(check_zpay).lower() in ("1", "true", "yes"):
         # 1) 检测 zpayz.cn 首页
         try:
@@ -153,21 +137,14 @@ async def health(check_zpay: str = ""):
 async def log_requests(request, call_next):
     path = request.url.path
     if _should_trace_request(path):
-        _safe_stderr_write(f"[payjsapi] >>> {request.method} {path}\n")
+        _safe_stderr_write(f"[salonapi] >>> {request.method} {path}\n")
     resp = await call_next(request)
     if _should_trace_request(path):
-        _safe_stderr_write(f"[payjsapi] <<< {request.method} {path} {resp.status_code}\n")
+        _safe_stderr_write(f"[salonapi] <<< {request.method} {path} {resp.status_code}\n")
     return resp
 
 # 挂载路由
-app.include_router(nomadvip_router)
-app.include_router(digital_router)
-app.include_router(cnomadcna_router)
-app.include_router(nomadlms_router)
 app.include_router(salon_router)
-app.include_router(legacy_router)
-app.include_router(common_router)
-app.include_router(meetup_router)
 app.include_router(salon_meetup_router)
 
 
@@ -176,13 +153,9 @@ async def root():
     """健康检查"""
     return {
         "status": "ok",
-        "service": "payjsapi",
+        "service": "salonapi",
         "routes": {
-            "nomadvip": "/nomadvip/payh5, /nomadvip/payh5/redirect, /nomadvip/check_vip, /nomadvip/check_vip_by_email, /nomadvip/order_status, /nomadvip/zpay_order_status, /nomadvip/zpay_notify, /nomadvip/xorpay_notify",
-            "digital": "/digital/payh5, /digital/payh5/redirect, /digital/zpay_order_status, /digital/zpay_notify, /digital/xorpay_notify",
-            "cnomadcna": "/cnomadcna/payh5, ...",
-            "nomadlms": "/nomadlms/payh5, ...",
-            "legacy": "/payh5, /payh5/redirect, /zpay_notify, /xorpay_notify, /zpay_order_status",
-            "common": "/submit_meetup_application, /create_user",
+            "salon": "/salon/payh5, /salon/payh5/redirect, /salon/order_status, /salon/zpay_notify, /salon/xorpay_notify",
+            "api": "/api/salon/check-user, /api/salon/ensure-user, /api/salon/complete-order, /api/salon/join, /api/salon/join/by-wechat, /api/salon/join/status, /api/salon/join/volunteers, /api/salon/xiaohongshu/profile",
         },
     }