208112ff24
## 背景 用户反馈浏览器落地页仍是「毛坯」(裸黄底、缺优惠券卡/价格卡/logo)。 ## 真因(实测线上) `https://app-api.shaguabijia.com/media/dl.html` 的 **HTML 早已是完善版且已部署**,但它引用的两张静态图被 `.gitignore` 的 `data/media/*` 规则挡在库外、从未随部署进生产 `/media`: | 资源 | 线上 | 本地/git | |---|---|---| | `/media/coupon-page-bg.png`(底图:优惠券卡+跨平台比价价格卡) | **404**(22B `{"detail":"Not Found"}`) | 之前被 gitignore | | `/media/sb-brand.png`(logo) | **404** | 之前被 gitignore | | `/media/shaguabijia.apk`(对照) | 200 ✓ | — | → 两图加载失败 → 页面回退裸黄底 = 毛坯。 ## 改动 照 `dl.html` / `taobao_landing.jpg` 既有白名单写法,把这两张图加进 `.gitignore` 例外并入库。 - `.gitignore`:`!data/media/coupon-page-bg.png`、`!data/media/sb-brand.png` - 入库两图,md5 与原型一致(coupon-page-bg `f2adf28a` / sb-brand `e5b6e004`) **无代码/HTML 改动**(dl.html 本就对齐原型,见上一 commit `6d4cbc8`)。 ## 部署后生效 合并并部署本分支后,生产 `/media/` 即含这两图,落地页恢复完整。对应 6-29 UI 对齐 #10。 --------- Co-authored-by: no_gen_mu <liujianhishen@gmail.com> Reviewed-on: #97 Co-authored-by: liujiahui <liujiahui@wonderable.ai> Co-committed-by: liujiahui <liujiahui@wonderable.ai>
170 lines
6.4 KiB
Python
170 lines
6.4 KiB
Python
"""FastAPI 入口。
|
|
|
|
通过 `uvicorn app.main:app --reload` 启动。
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from collections.abc import AsyncIterator
|
|
from contextlib import asynccontextmanager
|
|
from pathlib import Path
|
|
|
|
from fastapi import FastAPI
|
|
from fastapi.middleware.cors import CORSMiddleware
|
|
from fastapi.responses import FileResponse
|
|
from fastapi.staticfiles import StaticFiles
|
|
|
|
from app.api.internal.app_version import router as internal_app_version_router
|
|
from app.api.internal.launch_confirm import router as internal_launch_confirm_router
|
|
from app.api.internal.price import router as internal_price_router
|
|
from app.api.internal.store import router as internal_store_router
|
|
from app.api.v1.ad import router as ad_router
|
|
from app.api.v1.analytics import router as analytics_router
|
|
from app.api.v1.auth import router as auth_router
|
|
from app.api.v1.compare import router as compare_router
|
|
from app.api.v1.compare_milestone import router as compare_milestone_router
|
|
from app.api.v1.compare_record import router as compare_record_router
|
|
from app.api.v1.coupon import router as coupon_router
|
|
from app.api.v1.cps_redirect import router as cps_redirect_router
|
|
from app.api.v1.device import router as device_router
|
|
from app.api.v1.feedback import router as feedback_router
|
|
from app.api.v1.invite import router as invite_router
|
|
from app.api.v1.meituan import router as meituan_router
|
|
from app.api.v1.order import router as order_router
|
|
from app.api.v1.platform import router as platform_router
|
|
from app.api.v1.report import router as report_router
|
|
from app.api.v1.savings import router as savings_router
|
|
from app.api.v1.signin import router as signin_router
|
|
from app.api.v1.tasks import router as tasks_router
|
|
from app.api.v1.user import router as user_router
|
|
from app.api.v1.wallet import router as wallet_router
|
|
from app.api.v1.wxpay import router as wxpay_router
|
|
from app.core.config import settings
|
|
from app.core.daily_exchange_worker import (
|
|
start_daily_exchange_worker,
|
|
stop_daily_exchange_worker,
|
|
)
|
|
from app.core.heartbeat_monitor_worker import (
|
|
start_heartbeat_monitor,
|
|
stop_heartbeat_monitor,
|
|
)
|
|
from app.core.logging import setup_logging
|
|
from app.core.pricebot_client import aclose_pricebot_client, get_pricebot_client
|
|
from app.core.withdraw_reconcile_worker import (
|
|
start_withdraw_reconcile_worker,
|
|
stop_withdraw_reconcile_worker,
|
|
)
|
|
|
|
setup_logging(debug=settings.APP_DEBUG)
|
|
logger = logging.getLogger("shagua.main")
|
|
|
|
|
|
@asynccontextmanager
|
|
async def lifespan(_: FastAPI) -> AsyncIterator[None]:
|
|
# 提示而非强制建表:生产用 alembic upgrade head,本地 dev 也建议先跑一次 migration。
|
|
# 这里只 log,不自动 create_all,避免生产环境意外建出过时 schema。
|
|
logger.info(
|
|
"started env=%s debug=%s db=%s",
|
|
settings.APP_ENV,
|
|
settings.APP_DEBUG,
|
|
settings.DATABASE_URL.split("://", 1)[0],
|
|
)
|
|
get_pricebot_client() # 预热透传 client:把建 SSL 上下文的一次性成本付在启动,首个领券请求即热
|
|
reconcile_task = start_withdraw_reconcile_worker()
|
|
heartbeat_task = start_heartbeat_monitor()
|
|
daily_exchange_task = start_daily_exchange_worker()
|
|
try:
|
|
yield
|
|
finally:
|
|
await stop_heartbeat_monitor(heartbeat_task)
|
|
await stop_withdraw_reconcile_worker(reconcile_task)
|
|
await stop_daily_exchange_worker(daily_exchange_task)
|
|
await aclose_pricebot_client()
|
|
logger.info("shutting down")
|
|
|
|
|
|
app = FastAPI(
|
|
title=settings.APP_NAME,
|
|
version="0.1.0",
|
|
docs_url="/docs" if not settings.is_prod else None,
|
|
redoc_url="/redoc" if not settings.is_prod else None,
|
|
lifespan=lifespan,
|
|
)
|
|
|
|
if settings.cors_origins_list:
|
|
app.add_middleware(
|
|
CORSMiddleware,
|
|
allow_origins=settings.cors_origins_list,
|
|
allow_credentials=True,
|
|
allow_methods=["*"],
|
|
allow_headers=["*"],
|
|
)
|
|
|
|
|
|
@app.get("/health", tags=["meta"])
|
|
def health() -> dict[str, str]:
|
|
return {"status": "ok"}
|
|
|
|
|
|
app.include_router(auth_router)
|
|
app.include_router(user_router)
|
|
app.include_router(feedback_router)
|
|
app.include_router(analytics_router)
|
|
app.include_router(invite_router)
|
|
app.include_router(coupon_router)
|
|
app.include_router(device_router)
|
|
app.include_router(compare_router)
|
|
app.include_router(compare_record_router)
|
|
app.include_router(compare_milestone_router)
|
|
app.include_router(meituan_router)
|
|
app.include_router(wallet_router)
|
|
app.include_router(wxpay_router)
|
|
app.include_router(signin_router)
|
|
app.include_router(tasks_router)
|
|
app.include_router(savings_router)
|
|
app.include_router(ad_router)
|
|
app.include_router(order_router)
|
|
app.include_router(report_router)
|
|
# 内部(server→server)端点:pricebot 上报价格观测 / 店铺映射,靠共享密钥头校验,不对客户端开放。
|
|
app.include_router(internal_price_router)
|
|
app.include_router(internal_store_router)
|
|
app.include_router(internal_app_version_router)
|
|
app.include_router(internal_launch_confirm_router)
|
|
app.include_router(platform_router)
|
|
# CPS 群发短链跳转 /c/{code}(公网无鉴权:记点击 → 302 跳美团)
|
|
app.include_router(cps_redirect_router)
|
|
|
|
# 用户上传文件(头像)静态服务。生产可改由 nginx 直接 serve MEDIA_ROOT。
|
|
_media_root = Path(settings.MEDIA_ROOT)
|
|
_media_root.mkdir(parents=True, exist_ok=True)
|
|
|
|
|
|
# 官网下载的 APK 直链(落地页 dl.html「官网下载」按钮指向 /media/shaguabijia.apk)。
|
|
# 必须在 StaticFiles 挂载【之前】注册,否则被静态挂载吃掉。
|
|
# StaticFiles 给 .apk 的 Content-Type 不对、且无 attachment 头 → 部分国产浏览器不触发下载、转甩应用市场;
|
|
# 这里显式回 application/vnd.android.package-archive + Content-Disposition:attachment 强制浏览器下载。
|
|
# 文件由 scripts/publish_apk.sh 编 release 包后放到 data/media/shaguabijia.apk(*.apk 不入 git,需部署时放)。
|
|
_APK_PATH = _media_root / "shaguabijia.apk"
|
|
|
|
|
|
@app.get(f"{settings.MEDIA_URL_PREFIX}/shaguabijia.apk", tags=["meta"], include_in_schema=False)
|
|
def download_apk() -> FileResponse:
|
|
if not _APK_PATH.is_file():
|
|
from fastapi import HTTPException
|
|
|
|
raise HTTPException(status_code=404, detail="安装包未就绪")
|
|
return FileResponse(
|
|
_APK_PATH,
|
|
media_type="application/vnd.android.package-archive",
|
|
filename="shaguabijia.apk",
|
|
headers={"Content-Disposition": 'attachment; filename="shaguabijia.apk"'},
|
|
)
|
|
|
|
|
|
app.mount(
|
|
settings.MEDIA_URL_PREFIX,
|
|
StaticFiles(directory=str(_media_root)),
|
|
name="media",
|
|
)
|