From 2553e482a9e2608b5cc34a2f5f8ac8b31ef6c078 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 2 Nov 2026 23:49:28 +0800 Subject: [PATCH] feat: update service port and points display --- .env | 2 +- .env.example | 4 ++-- README.md | 6 +++--- public/checkout.html | 2 +- public/checkout.js | 8 ++++++-- src/server.ts | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.env b/.env index dfe045f..67bf3fb 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -PORT=3000 +PORT=9000 HOST=127.0.0.1 EXTERNAL_POSTGRES_HOST=localhost EXTERNAL_POSTGRES_PORT=5432 diff --git a/.env.example b/.env.example index bb29b60..ff655d3 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,6 @@ -PORT=3000 +PORT=9000 HOST=0.0.0.0 -APP_BASE_URL=http://localhost:3000 +APP_BASE_URL=http://localhost:9000 ADMIN_USERNAME=admin ADMIN_PASSWORD=admin123456 # 首次启动后,管理员密码以数据库中的值为准。 diff --git a/README.md b/README.md index 0109199..842f345 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ bun run start & 'C:\Users\11937\.bun\bin\bun.exe' run start ``` -- 收银台: -- 管理后台: +- 收银台: +- 管理后台: - 初始账户:`admin` - 初始密码:`admin123456` @@ -41,7 +41,7 @@ bun run start 把用户重定向到: ```text -http://localhost:3000/pay?user_id=USER10001&merchant_order_no=ORDER202610310001&subject=账户充值¬ify_url=https%3A%2F%2Fmerchant.example.com%2Fpayment%2Fnotify&return_url=https%3A%2F%2Fmerchant.example.com%2Fresult +http://localhost:9000/pay?user_id=USER10001&merchant_order_no=ORDER202610310001&subject=账户充值¬ify_url=https%3A%2F%2Fmerchant.example.com%2Fpayment%2Fnotify&return_url=https%3A%2F%2Fmerchant.example.com%2Fresult ``` 参数: diff --git a/public/checkout.html b/public/checkout.html index c5f768e..bcfac05 100644 --- a/public/checkout.html +++ b/public/checkout.html @@ -48,6 +48,6 @@
充值时间订单号支付渠道充值金额获得积分
支付过程受签名验证与金额校验保护如有疑问请联系商户
- + diff --git a/public/checkout.js b/public/checkout.js index 3c1b63b..0afaff3 100644 --- a/public/checkout.js +++ b/public/checkout.js @@ -14,6 +14,10 @@ function showInvalidUser(value) { $('#userGate').classList.add('hidden'); $('#ch function channelName(channel) { return ({ alipay: '支付宝', wechat: '微信支付', mock: '本地模拟' })[channel] || channel; } function channelIcon(channel) { return channel === 'alipay' ? '支' : channel === 'wechat' ? '微' : 'M'; } function formatTime(value) { return new Date(value).toLocaleString('zh-CN', { hour12: false }); } +function formatAvailablePoints(value) { + const quota = Number(value ?? 0); + return Math.ceil((Number.isFinite(quota) ? quota : 0) / 5000).toLocaleString('zh-CN'); +} function syncAmount() { const amount = state.selectedPackage ? (state.selectedPackage.amount_cents / 100).toFixed(2) : '0.00'; @@ -59,7 +63,7 @@ async function init() { const response = await fetch(`/api/checkout/users/${encodeURIComponent(userId)}`); const data = await response.json(); if (!response.ok) return showInvalidUser(userId); state.user = data.user; state.packages = data.packages; - $('#userName').textContent = data.user.username || data.user.displayName; $('#userAvatar').textContent = (data.user.username || data.user.displayName || data.user.id).slice(0, 1).toUpperCase(); $('#pointsBalance').textContent = Number(data.user.quota ?? 0).toLocaleString('zh-CN'); + $('#userName').textContent = data.user.username || data.user.displayName; $('#userAvatar').textContent = (data.user.username || data.user.displayName || data.user.id).slice(0, 1).toUpperCase(); $('#pointsBalance').textContent = formatAvailablePoints(data.user.quota); renderPackages(); renderHistory(data.history); await loadGateways(); syncAmount(); $('#userGate').classList.add('hidden'); $('#checkoutMain').classList.remove('hidden'); $('#historyPanel').classList.remove('hidden'); } catch { showInvalidUser(userId); } @@ -97,7 +101,7 @@ async function checkStatus() { async function refreshUserBalance() { try { const data = await fetch(`/api/checkout/users/${encodeURIComponent(state.user.id)}`).then((response) => response.json()); - if (data.user) { state.user = { ...state.user, ...data.user }; $('#pointsBalance').textContent = Number(data.user.quota ?? 0).toLocaleString('zh-CN'); } + if (data.user) { state.user = { ...state.user, ...data.user }; $('#pointsBalance').textContent = formatAvailablePoints(data.user.quota); } } catch { /* 保留最后一次已加载的额度 */ } } diff --git a/src/server.ts b/src/server.ts index 96ecfc8..0c7c314 100644 --- a/src/server.ts +++ b/src/server.ts @@ -14,7 +14,7 @@ import { creditExternalUserQuota, getExternalUser, refundExternalUserQuota, sear await initializeDatabase(); const host = process.env.HOST || "0.0.0.0"; -const port = Number(process.env.PORT || 3000); +const port = Number(process.env.PORT || 9000); const appBaseUrl = (process.env.APP_BASE_URL || `http://localhost:${port}`).replace(/\/$/, ""); const publicDir = `${process.cwd()}\\public`; const providerQueryTimes = new Map();