diff --git a/README.md b/README.md index 1ea32a4..0109199 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ## 已实现 - 公开收银台:必须传入有效用户 ID,支持充值套餐、积分展示和近六个月充值记录。 -- 支付通道:本地模拟支付、支付宝 `alipay.trade.precreate`、微信支付 APIv3 Native 下单。 +- 支付通道:本地模拟支付、支付宝电脑网站支付官方收银台二维码、可选当面付、微信支付 APIv3 Native 下单。 - 安全校验:支付宝/微信请求签名、平台回调验签、金额复核、幂等处理。 - 业务通知:HMAC-SHA256 签名、失败自动重试、手动重试、完整通知日志。 - 管理后台:数据概览、用户管理、充值套餐、充值记录、按渠道/状态/分类/时间查询、对账明细、网关配置。 @@ -120,7 +120,7 @@ sign = HMAC-SHA256(merchant_secret, content).hex() ### 支付宝 -后台新增支付宝网关,填写 AppID、商户 PID、应用 RSA2 私钥和支付宝公钥。沙箱模式默认使用沙箱网关,正式模式使用生产网关。应用需在支付宝开放平台开通“当面付”。 +后台新增支付宝网关,填写 AppID、商户 PID、应用 RSA2 私钥和支付宝公钥。使用电脑网站支付时,服务端会打开支付宝官方收银台并提取其真实付款二维码展示在本站扫码区,不向用户提供收银台跳转链接;二维码会定时刷新。正式应用需开通“电脑网站支付”,仅在选择 `precreate` 时需要开通“当面付”。 ### 微信支付 diff --git a/public/admin.html b/public/admin.html index cf150d6..12389bf 100644 --- a/public/admin.html +++ b/public/admin.html @@ -3,7 +3,7 @@ MultiPay 管理后台 - +
@@ -20,6 +20,6 @@
- + diff --git a/public/checkout.html b/public/checkout.html index 614b591..c5f768e 100644 --- a/public/checkout.html +++ b/public/checkout.html @@ -5,7 +5,7 @@ 安全收银台 - +
@@ -48,6 +48,6 @@
充值时间订单号支付渠道充值金额获得积分
- + diff --git a/public/checkout.js b/public/checkout.js index d131516..3c1b63b 100644 --- a/public/checkout.js +++ b/public/checkout.js @@ -2,6 +2,7 @@ const $ = (selector) => document.querySelector(selector); const query = new URLSearchParams(location.search); const state = { user: null, packages: [], selectedPackage: null, selectedGateway: null, currentOrder: null }; let pollTimer = null; +let qrRefreshTimer = null; const userId = query.get('user_id') || ''; const amountParam = query.get('amount') || ''; const orderNo = query.get('merchant_order_no') || `PAY${Date.now().toString().slice(-10)}`; @@ -80,15 +81,17 @@ function renderQr() { $('#chooseView').classList.add('hidden'); $('#qrView').classList.remove('hidden'); $('#qrImage').src = `/api/checkout/orders/${encodeURIComponent(state.currentOrder.id)}/qrcode?t=${Date.now()}`; const badge = $('#channelBadge'); badge.className = `channel-badge channel-${state.currentOrder.channel}`; badge.textContent = channelName(state.currentOrder.channel); const link = $('#paymentLink'); - if (state.currentOrder.paymentUrl) { link.href = state.currentOrder.paymentUrl; link.textContent = '打开支付宝官方收银台 →'; link.classList.remove('hidden'); $('.qr-copy h3').textContent = '打开官方收银台扫码'; $('.qr-copy p').textContent = '请在电脑上打开支付宝官方收银台,页面会展示付款二维码;支付完成后此页面会自动更新。'; } + link.classList.add('hidden'); + if (state.currentOrder.channel === 'alipay') { $('.qr-copy h3').textContent = '请使用支付宝扫码'; $('.qr-copy p').textContent = '当前显示支付宝官方收银台的真实付款码;支付完成后本页面会自动更新。'; } else if (state.currentOrder.channel === 'mock') { link.href = `/mock-pay/${encodeURIComponent(state.currentOrder.id)}`; link.textContent = '打开模拟支付页 →'; link.classList.remove('hidden'); } const expires = new Date(state.currentOrder.expiresAt).getTime(); const tick = () => { const left = Math.max(0, Math.floor((expires - Date.now()) / 1000)); $('#countdown').textContent = `${String(Math.floor(left / 60)).padStart(2, '0')}:${String(left % 60).padStart(2, '0')}`; if (left <= 0) { clearInterval(pollTimer); $('#statusLine').textContent = '二维码已过期,请重新发起充值'; } }; + if (state.currentOrder.channel === 'alipay') qrRefreshTimer = setInterval(() => { $('#qrImage').src = `/api/checkout/orders/${encodeURIComponent(state.currentOrder.id)}/qrcode?t=${Date.now()}`; }, 60_000); tick(); setInterval(tick, 1000); pollTimer = setInterval(checkStatus, 2000); } async function checkStatus() { - try { const data = await fetch(`/api/checkout/orders/${encodeURIComponent(state.currentOrder.id)}`).then((response) => response.json()); if (data.order?.status === 'paid') { clearInterval(pollTimer); showSuccess(data.order); } else if (['failed', 'closed'].includes(data.order?.status)) { clearInterval(pollTimer); showError('订单已关闭或支付失败'); } } catch { /* keep polling */ } + try { const data = await fetch(`/api/checkout/orders/${encodeURIComponent(state.currentOrder.id)}`).then((response) => response.json()); if (data.order?.status === 'paid') { clearInterval(pollTimer); clearInterval(qrRefreshTimer); showSuccess(data.order); } else if (['failed', 'closed'].includes(data.order?.status)) { clearInterval(pollTimer); clearInterval(qrRefreshTimer); showError('订单已关闭或支付失败'); } } catch { /* keep polling */ } } async function refreshUserBalance() { diff --git a/src/payments.ts b/src/payments.ts index 0f84a09..f28de1b 100644 --- a/src/payments.ts +++ b/src/payments.ts @@ -109,6 +109,34 @@ function extractJsonObject(raw: string, field: string): string | null { return null; } +function decodeHtmlAttribute(value: string): string { + return value.replace(/&/gi, "&").replace(/"/gi, '"').replace(/'/g, "'") + .replace(/&#x([0-9a-f]+);/gi, (_, hex) => String.fromCodePoint(Number.parseInt(hex, 16))) + .replace(/&#(\d+);/g, (_, number) => String.fromCodePoint(Number(number))); +} + +async function fetchAlipayCashierQr(paymentUrl: string): Promise { + const response = await fetch(paymentUrl, { + redirect: "follow", + headers: { "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 Chrome/130 Safari/537.36" }, + signal: AbortSignal.timeout(15_000) + }); + if (!response.ok) throw new Error(`支付宝官方收银台 HTTP ${response.status}`); + const finalUrl = new URL(response.url); + if (finalUrl.protocol !== "https:" || !(finalUrl.hostname.endsWith(".alipay.com") || finalUrl.hostname.endsWith(".alipaydev.com"))) { + throw new Error("支付宝官方收银台跳转地址不可信"); + } + const html = await response.text(); + const input = html.match(/]*\bid=["']J_qrCode["'][^>]*>/i)?.[0]; + const rawQr = input?.match(/\bvalue=["']([^"']+)["']/i)?.[1]; + if (!rawQr) throw new Error("支付宝官方收银台未返回可用付款二维码"); + const qr = new URL(decodeHtmlAttribute(rawQr)); + if (qr.protocol !== "https:" || !(qr.hostname === "qr.alipay.com" || qr.hostname.endsWith(".alipay.com"))) { + throw new Error("支付宝官方付款二维码地址不可信"); + } + return qr.toString(); +} + async function createAlipayPayment(gateway: GatewayRecord, order: PaymentOrderInput, baseUrl: string): Promise { const config = gateway.config; required(config, ["appId", "privateKey", "alipayPublicKey"]); @@ -139,9 +167,10 @@ async function createAlipayPayment(gateway: GatewayRecord, order: PaymentOrderIn }; pageParams.sign = alipaySign(pageParams, config.privateKey); const paymentUrl = `${gatewayUrl}?${new URLSearchParams(pageParams).toString()}`; + const qrContent = await fetchAlipayCashierQr(paymentUrl); return { - qrContent: paymentUrl, - providerPayload: { flow: "redirect", payment_product: "page", redirect_url: paymentUrl } + qrContent, + providerPayload: { flow: "cashier_qr", payment_product: "page", redirect_url: paymentUrl } }; } const params: Record = { @@ -180,7 +209,7 @@ async function createAlipayPayment(gateway: GatewayRecord, order: PaymentOrderIn if (!payload.sign || !signedContent || !alipayVerify(signedContent, payload.sign, config.alipayPublicKey)) { throw new Error("支付宝响应验签失败"); } - return { qrContent: result.qr_code, providerPayload: payload }; + return { qrContent: result.qr_code, providerPayload: { ...payload, payment_product: "precreate" } }; } async function queryAlipayPayment(gateway: GatewayRecord, merchantOrderNo: string): Promise { @@ -413,6 +442,13 @@ export async function createProviderPayment(gateway: GatewayRecord, order: Payme return createWechatPayment(gateway, order, baseUrl); } +export async function refreshProviderQrContent(gateway: GatewayRecord, providerPayload: unknown): Promise { + if (gateway.channel !== "alipay" || gateway.mode === "mock") return null; + const payload = providerPayload && typeof providerPayload === "object" ? providerPayload as Record : {}; + if (payload.payment_product !== "page" || typeof payload.redirect_url !== "string") return null; + return fetchAlipayCashierQr(payload.redirect_url); +} + export async function queryProviderPayment(gateway: GatewayRecord, merchantOrderNo: string): Promise { if (gateway.channel === "alipay" && gateway.mode !== "mock") { return queryAlipayPayment(gateway, merchantOrderNo); diff --git a/src/server.ts b/src/server.ts index d5ae63a..96ecfc8 100644 --- a/src/server.ts +++ b/src/server.ts @@ -3,6 +3,7 @@ import { db, getSetting, initializeDatabase, setSetting } from "./db"; import { decryptJson, encryptJson, hmacHex, randomId, safeEqual } from "./security"; import { createProviderPayment, createProviderRefund, parseAlipayCallback, parseWechatCallback, + refreshProviderQrContent, queryProviderPayment, queryProviderRefund, type GatewayRecord, type ProviderCallbackResult } from "./payments"; @@ -116,8 +117,6 @@ function normalizeUserId(value: unknown): string { } function publicOrder(row: Row) { - let provider: Record = {}; - try { provider = row.provider_payload ? JSON.parse(row.provider_payload) : {}; } catch { /* ignore malformed legacy payload */ } return { id: row.id, merchantOrderNo: row.merchant_order_no, @@ -129,7 +128,6 @@ function publicOrder(row: Row) { expiresAt: row.expires_at, paidAt: row.paid_at, returnUrl: row.return_url, - paymentUrl: provider.flow === "redirect" ? provider.redirect_url : null, userId: row.user_id, packageId: row.package_id, points: Number(row.points || 0), @@ -515,8 +513,22 @@ const server = Bun.serve({ const qrMatch = path.match(/^\/api\/checkout\/orders\/([^/]+)\/qrcode$/); if (qrMatch && request.method === "GET") { - const row = db.query("SELECT qr_content, status FROM orders WHERE id = ?").get(decodeURIComponent(qrMatch[1])) as Row | null; + const row = db.query("SELECT * FROM orders WHERE id = ?").get(decodeURIComponent(qrMatch[1])) as Row | null; if (!row?.qr_content) return new Response("QR code unavailable", { status: 404 }); + if (row.status === "pending" && row.channel === "alipay") { + try { + const gateway = getGateway(row.gateway_id); + const payload = JSON.parse(row.provider_payload || "{}"); + const refreshed = gateway ? await refreshProviderQrContent(gateway, payload) : null; + if (refreshed) { + row.qr_content = refreshed; + db.query("UPDATE orders SET qr_content=?, updated_at=? WHERE id=?") + .run(refreshed, new Date().toISOString(), row.id); + } + } catch (error) { + console.error(`[ALIPAY QR REFRESH] ${row.merchant_order_no}`, error); + } + } const svg = await QRCode.toString(row.qr_content, { type: "svg", margin: 2, width: 320, color: { dark: "#12212b", light: "#ffffff" } }); return new Response(svg, { headers: { "content-type": "image/svg+xml", "cache-control": "no-store" } }); }