From 92416261ee94dc04e38d8a9c41ca4a3bb9010e8b Mon Sep 17 00:00:00 2001 From: Guoguo Date: Fri, 15 May 2026 09:07:41 -0700 Subject: [PATCH 01/13] =?UTF-8?q?feat:=20production=20readiness=20?= =?UTF-8?q?=E2=80=94=20feature=20gaps=20+=20config=20hardening?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Miniprogram: - Add BLE reconnect button on home page when disconnected - Add loading states to index, profile, subscribe-plans pages - Add profile editing (avatar + nickname) with COS upload - Enable pull-to-refresh on history page - Fix auto-scan self.options → self.data inconsistency - Add console.error to silent catch blocks - Gate 'Simple Peripheral' BLE scan behind __DEV__ flag - Add production config comment to env.js Admin console: - Add empty state '暂无数据' to all 5 list views - Replace plain text plan input with select dropdown - Add type="date" to record date filters - Add production config comment Server: - CORS origin restricted in production (env CORS_ORIGIN) - DB pool size configurable via DB_POOL_SIZE env var - .env.example updated with WeChat Pay + production fields --- admin-console/src/config/env.js | 1 + admin-console/src/styles/common.css | 7 + admin-console/src/views/DeviceListView.vue | 2 + admin-console/src/views/LogView.vue | 2 + admin-console/src/views/RecordView.vue | 6 +- admin-console/src/views/SubscriptionView.vue | 7 +- admin-console/src/views/UserListView.vue | 2 + miniprogram/config/env.js | 1 + miniprogram/pages/auto-scan/auto-scan.js | 2 +- miniprogram/pages/history/history.json | 3 +- miniprogram/pages/index/index.js | 25 +++- miniprogram/pages/index/index.wxml | 10 +- miniprogram/pages/index/index.wxss | 27 ++++ miniprogram/pages/profile/profile.js | 113 ++++++++++++++- miniprogram/pages/profile/profile.wxml | 30 +++- miniprogram/pages/profile/profile.wxss | 133 ++++++++++++++++++ .../pages/subscribe-plans/subscribe-plans.js | 6 +- .../subscribe-plans/subscribe-plans.wxml | 19 ++- .../subscribe-plans/subscribe-plans.wxss | 27 ++++ miniprogram/services/ble/connection.js | 11 +- server/.env.example | 12 ++ server/src/app.js | 6 +- server/src/lib/db.js | 2 +- 23 files changed, 421 insertions(+), 33 deletions(-) diff --git a/admin-console/src/config/env.js b/admin-console/src/config/env.js index db05b4b..6013e46 100644 --- a/admin-console/src/config/env.js +++ b/admin-console/src/config/env.js @@ -1,3 +1,4 @@ +// Production: change to 'prod' const ENV = 'test' const API_BASES = { diff --git a/admin-console/src/styles/common.css b/admin-console/src/styles/common.css index b846592..de6315e 100644 --- a/admin-console/src/styles/common.css +++ b/admin-console/src/styles/common.css @@ -211,3 +211,10 @@ box-sizing: border-box; resize: vertical; } + +.empty-state { + text-align: center; + padding: 40px 0; + color: #999; + font-size: 14px; +} diff --git a/admin-console/src/views/DeviceListView.vue b/admin-console/src/views/DeviceListView.vue index 4035e60..ed139f0 100644 --- a/admin-console/src/views/DeviceListView.vue +++ b/admin-console/src/views/DeviceListView.vue @@ -42,6 +42,8 @@ + 暂无数据 + + 暂无数据 + diff --git a/admin-console/src/views/RecordView.vue b/admin-console/src/views/RecordView.vue index 76a7eb0..40124fd 100644 --- a/admin-console/src/views/RecordView.vue +++ b/admin-console/src/views/RecordView.vue @@ -6,9 +6,9 @@ 用户: {{ filterUserId }} x - + ~ - + + 暂无数据 + diff --git a/admin-console/src/views/SubscriptionView.vue b/admin-console/src/views/SubscriptionView.vue index fd6b50a..467acc0 100644 --- a/admin-console/src/views/SubscriptionView.vue +++ b/admin-console/src/views/SubscriptionView.vue @@ -65,6 +65,8 @@ + 暂无数据 + 方案 - + 天数 diff --git a/admin-console/src/views/UserListView.vue b/admin-console/src/views/UserListView.vue index 9ac9a1c..83cf0c8 100644 --- a/admin-console/src/views/UserListView.vue +++ b/admin-console/src/views/UserListView.vue @@ -54,6 +54,8 @@ + 暂无数据 + diff --git a/miniprogram/config/env.js b/miniprogram/config/env.js index aee0d20..5c94745 100644 --- a/miniprogram/config/env.js +++ b/miniprogram/config/env.js @@ -1,3 +1,4 @@ +// Production: change to 'prod' to disable debug buttons and mock endpoints var ENV = 'test' var API_BASES = { diff --git a/miniprogram/pages/auto-scan/auto-scan.js b/miniprogram/pages/auto-scan/auto-scan.js index a3460ec..583f340 100644 --- a/miniprogram/pages/auto-scan/auto-scan.js +++ b/miniprogram/pages/auto-scan/auto-scan.js @@ -96,7 +96,7 @@ Page({ onMockScanDone: function () { var self = this if (self._progressTimer) clearInterval(self._progressTimer) - var mask = parseInt(self.options.regions) || 0x7F + var mask = parseInt(self.data.regions) || 0x7F wx.redirectTo({ url: '/pages/treating/treating?regions=' + mask + '&wavelength=2' + diff --git a/miniprogram/pages/history/history.json b/miniprogram/pages/history/history.json index 733e3df..830731a 100644 --- a/miniprogram/pages/history/history.json +++ b/miniprogram/pages/history/history.json @@ -1,5 +1,6 @@ { "navigationBarTitleText": "护理记录", "navigationBarBackgroundColor": "#E6508C", - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "white", + "enablePullDownRefresh": true } diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js index 07d5009..e2c707e 100644 --- a/miniprogram/pages/index/index.js +++ b/miniprogram/pages/index/index.js @@ -14,7 +14,8 @@ Page({ bleState: 'disconnected', hasDevice: false, deviceInfo: null, - devMode: false + devMode: false, + loading: true }, onShow: function () { @@ -47,9 +48,9 @@ Page({ return } - self.setData({ connected: ble.isConnected() }) + self.setData({ connected: ble.isConnected(), loading: true }) - api.getDevices().then(function (data) { + var p1 = api.getDevices().then(function (data) { var devices = data.devices || [] self.setData({ hasDevice: devices.length > 0 }) if (devices.length > 0) { @@ -59,14 +60,22 @@ Page({ deviceInfo: devices[0] }) } - }).catch(function () {}) + }).catch(function (err) { + console.error('getDevices failed', err) + }) - api.getSubscription().then(function (sub) { + var p2 = api.getSubscription().then(function (sub) { self.setData({ subscription: sub, subRemaining: sub.remaining_days || 0 }) - }).catch(function () {}) + }).catch(function (err) { + console.error('getSubscription failed', err) + }) + + Promise.all([p1, p2]).then(function () { + self.setData({ loading: false }) + }) }, onBleStatus: function (status) { @@ -88,7 +97,9 @@ Page({ }, onConnected: function () { self.setData({ connected: true, bleState: 'connected' }) - ble.queryStatus().catch(function () {}) + ble.queryStatus().catch(function (err) { + console.error('queryStatus failed', err) + }) }, onError: function (err) { self.setData({ connected: false, bleState: 'error' }) diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index a2229f3..5925683 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -1,5 +1,10 @@ - + + + 加载中... + + + 📱 还没有绑定设备 @@ -11,12 +16,13 @@ - + 💆 {{deviceName || '我的光面膜'}} 已连接 未连接 + 🔋 电量 {{battery}}% diff --git a/miniprogram/pages/index/index.wxss b/miniprogram/pages/index/index.wxss index 1e8b2a9..c2b997d 100644 --- a/miniprogram/pages/index/index.wxss +++ b/miniprogram/pages/index/index.wxss @@ -42,3 +42,30 @@ color: #999; font-size: 32rpx; } + +.loading-container { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: 200rpx 0; +} + +.loading-spinner { + width: 64rpx; + height: 64rpx; + border: 6rpx solid #f0f0f0; + border-top-color: #E6508C; + border-radius: 50%; + animation: spin 0.8s linear infinite; +} + +@keyframes spin { + to { transform: rotate(360deg); } +} + +.loading-text { + margin-top: 20rpx; + font-size: 28rpx; + color: #999; +} diff --git a/miniprogram/pages/profile/profile.js b/miniprogram/pages/profile/profile.js index 9741085..e989c51 100644 --- a/miniprogram/pages/profile/profile.js +++ b/miniprogram/pages/profile/profile.js @@ -1,4 +1,5 @@ var api = require('../../utils/api') +var config = require('../../config/env') var app = getApp() Page({ @@ -6,7 +7,12 @@ Page({ userInfo: null, subscription: null, deviceCount: 0, - subRemaining: 0 + subRemaining: 0, + loading: true, + editing: false, + editNickname: '', + editAvatarUrl: '', + saving: false }, onShow: function () { @@ -15,19 +21,29 @@ Page({ loadProfile: function () { var self = this - api.getProfile().then(function (profile) { + self.setData({ loading: true }) + + var p1 = api.getProfile().then(function (profile) { self.setData({ userInfo: profile, deviceCount: profile.device_count || 0 }) - }).catch(function () {}) + }).catch(function (err) { + console.error('getProfile failed', err) + }) - api.getSubscription().then(function (sub) { + var p2 = api.getSubscription().then(function (sub) { self.setData({ subscription: sub, subRemaining: sub.remaining_days || 0 }) - }).catch(function () {}) + }).catch(function (err) { + console.error('getSubscription failed', err) + }) + + Promise.all([p1, p2]).then(function () { + self.setData({ loading: false }) + }) }, onManageDevice: function () { @@ -75,6 +91,93 @@ Page({ wx.navigateTo({ url: '/pages/contact/contact' }) }, + onEditProfile: function () { + var info = this.data.userInfo || {} + this.setData({ + editing: true, + editNickname: info.nickname || '', + editAvatarUrl: info.avatar || '' + }) + }, + + onCancelEdit: function () { + this.setData({ editing: false }) + }, + + onEditNicknameInput: function (e) { + this.setData({ editNickname: e.detail.value || '' }) + }, + + onPickAvatar: function () { + var self = this + wx.chooseMedia({ + count: 1, + mediaType: ['image'], + sourceType: ['album', 'camera'], + success: function (res) { + if (res.tempFiles && res.tempFiles[0]) { + self.setData({ editAvatarUrl: res.tempFiles[0].tempFilePath }) + } + } + }) + }, + + uploadAvatar: function (tempPath) { + return new Promise(function (resolve, reject) { + var token = wx.getStorageSync('token') + wx.uploadFile({ + url: config.API_BASE + '/api/v1/user/avatar', + filePath: tempPath, + name: 'file', + header: { Authorization: 'Bearer ' + token }, + success: function (res) { + try { + var data = JSON.parse(res.data) + if (data.code === 0 && data.data && data.data.avatar) { + resolve(data.data.avatar) + } else { + reject(new Error(data.message || '上传失败')) + } + } catch (e) { + reject(new Error('上传失败')) + } + }, + fail: function () { reject(new Error('上传失败')) } + }) + }) + }, + + onSaveProfile: function () { + var self = this + var nickname = (self.data.editNickname || '').trim() + if (!nickname) { + wx.showToast({ title: '昵称不能为空', icon: 'none' }) + return + } + + self.setData({ saving: true }) + + var avatarUrl = self.data.editAvatarUrl + var isLocalFile = avatarUrl && (avatarUrl.indexOf('wxfile://') === 0 || avatarUrl.indexOf('http://tmp') === 0) + var avatarPromise = isLocalFile + ? self.uploadAvatar(avatarUrl) + : Promise.resolve(avatarUrl || '') + + avatarPromise.then(function (permanentUrl) { + return api.updateProfile({ + nickname: nickname, + avatar: permanentUrl || '' + }) + }).then(function () { + self.setData({ saving: false, editing: false }) + wx.showToast({ title: '保存成功', icon: 'success' }) + self.loadProfile() + }).catch(function (err) { + self.setData({ saving: false }) + wx.showToast({ title: err.message || '保存失败', icon: 'none' }) + }) + }, + onLogout: function () { wx.showModal({ title: '退出登录', diff --git a/miniprogram/pages/profile/profile.wxml b/miniprogram/pages/profile/profile.wxml index 9da5de0..c8c362c 100644 --- a/miniprogram/pages/profile/profile.wxml +++ b/miniprogram/pages/profile/profile.wxml @@ -1,11 +1,18 @@ - + + + 加载中... + + + - 👤 + + 👤 + 编辑资料 @@ -55,4 +62,23 @@ 退出登录 + + + + + 编辑资料 + + + 👤 + 点击更换头像 + + + 昵称 + + + + + + + diff --git a/miniprogram/pages/profile/profile.wxss b/miniprogram/pages/profile/profile.wxss index 6f36a1b..b3f3ac5 100644 --- a/miniprogram/pages/profile/profile.wxss +++ b/miniprogram/pages/profile/profile.wxss @@ -107,11 +107,144 @@ color: #999; } +.loading-container { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: 200rpx 0; +} + +.loading-spinner { + width: 64rpx; + height: 64rpx; + border: 6rpx solid #f0f0f0; + border-top-color: #E6508C; + border-radius: 50%; + animation: spin 0.8s linear infinite; +} + +@keyframes spin { + to { transform: rotate(360deg); } +} + +.loading-text { + margin-top: 20rpx; + font-size: 28rpx; + color: #999; +} + .sub-card-inactive { background: #f5f5f5; border: 1px dashed #d9d9d9; } +.user-avatar-img { + width: 88rpx; + height: 88rpx; + border-radius: 50%; + flex-shrink: 0; +} + +.edit-profile-btn { + font-size: 24rpx; + color: rgba(255, 255, 255, 0.9); + border: 1rpx solid rgba(255, 255, 255, 0.6); + border-radius: 24rpx; + padding: 6rpx 20rpx; + flex-shrink: 0; +} + +.edit-mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.5); + z-index: 100; +} + +.edit-modal { + position: fixed; + left: 10%; + right: 10%; + top: 50%; + transform: translateY(-50%); + background: #fff; + border-radius: 24rpx; + padding: 40rpx; + z-index: 101; +} + +.edit-modal-title { + font-size: 32rpx; + font-weight: 600; + text-align: center; + margin-bottom: 32rpx; + color: #333; +} + +.edit-avatar-row { + display: flex; + flex-direction: column; + align-items: center; + margin-bottom: 32rpx; +} + +.edit-avatar-img { + width: 120rpx; + height: 120rpx; + border-radius: 50%; +} + +.edit-avatar-placeholder { + width: 120rpx; + height: 120rpx; + background: #f5f5f5; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + font-size: 56rpx; +} + +.edit-avatar-hint { + font-size: 24rpx; + color: #999; + margin-top: 12rpx; +} + +.edit-field { + margin-bottom: 32rpx; +} + +.edit-label { + font-size: 26rpx; + color: #666; + margin-bottom: 12rpx; + display: block; +} + +.edit-input { + border: 2rpx solid #e0e0e0; + border-radius: 12rpx; + padding: 16rpx 20rpx; + font-size: 28rpx; + color: #333; +} + +.edit-actions { + display: flex; + gap: 20rpx; +} + +.edit-btn { + flex: 1; + margin: 0 !important; + font-size: 28rpx; +} + .logout-btn { text-align: center; color: #ff4d4f; diff --git a/miniprogram/pages/subscribe-plans/subscribe-plans.js b/miniprogram/pages/subscribe-plans/subscribe-plans.js index 2accec5..32097cc 100644 --- a/miniprogram/pages/subscribe-plans/subscribe-plans.js +++ b/miniprogram/pages/subscribe-plans/subscribe-plans.js @@ -8,7 +8,8 @@ Page({ selected: 'yearly', purchasing: false, subscription: null, - subRemaining: 0 + subRemaining: 0, + loadingPlans: true }, onBack: function () { @@ -31,6 +32,7 @@ Page({ loadPlans: function () { var self = this + self.setData({ loadingPlans: true }) api.getPlans().then(function (data) { var serverPlans = data.plans || [] var monthlyPrice = 99 @@ -54,9 +56,11 @@ Page({ } }) if (plans.length > 0) self.setData({ plans: plans }) + self.setData({ loadingPlans: false }) self.checkTrialUsed() }).catch(function () { self.setData({ + loadingPlans: false, plans: [ { key: 'trial', name: '试用', price: 0, priceLabel: '免费', desc: '7天免费体验', disabled: false }, { key: 'monthly', name: '月卡', price: 99, priceLabel: '¥99', desc: '约3.3元/天' }, diff --git a/miniprogram/pages/subscribe-plans/subscribe-plans.wxml b/miniprogram/pages/subscribe-plans/subscribe-plans.wxml index eb9628d..5070aaa 100644 --- a/miniprogram/pages/subscribe-plans/subscribe-plans.wxml +++ b/miniprogram/pages/subscribe-plans/subscribe-plans.wxml @@ -20,7 +20,12 @@ 选择订阅套餐 - + + + 加载套餐中... + + + ✨ 智能模式 @@ -28,7 +33,7 @@ - + {{item.tag}} {{item.priceLabel}} @@ -37,9 +42,11 @@ - - 支付即表示同意《订阅协议》 + + + 支付即表示同意《订阅协议》 + diff --git a/miniprogram/pages/subscribe-plans/subscribe-plans.wxss b/miniprogram/pages/subscribe-plans/subscribe-plans.wxss index 8a6839b..9ea1a88 100644 --- a/miniprogram/pages/subscribe-plans/subscribe-plans.wxss +++ b/miniprogram/pages/subscribe-plans/subscribe-plans.wxss @@ -128,3 +128,30 @@ background: #ccc; color: #fff; } + +.loading-plans { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: 80rpx 0; +} + +.loading-spinner { + width: 64rpx; + height: 64rpx; + border: 6rpx solid #f0f0f0; + border-top-color: #DCB982; + border-radius: 50%; + animation: spin 0.8s linear infinite; +} + +@keyframes spin { + to { transform: rotate(360deg); } +} + +.loading-text { + margin-top: 20rpx; + font-size: 28rpx; + color: #999; +} diff --git a/miniprogram/services/ble/connection.js b/miniprogram/services/ble/connection.js index ae78725..be3fa0e 100644 --- a/miniprogram/services/ble/connection.js +++ b/miniprogram/services/ble/connection.js @@ -1,6 +1,7 @@ // BLE connection: scan, connect, disconnect, reconnect logic var protocol = require('./protocol') +var devConfig = require('../../config/env') var SERVICE = protocol.SERVICE var CHAR = protocol.CHAR @@ -237,9 +238,13 @@ function startScan(callbacks) { var d = devices[i] var name = (d.name || '').toUpperCase() var localName = (d.localName || '').toUpperCase() - if (name.indexOf('HOX') !== -1 || localName.indexOf('HOX') !== -1 || - name.indexOf('LIGHTMASK') !== -1 || localName.indexOf('LIGHTMASK') !== -1 || - name.indexOf('SIMPLE PERIPHERAL') !== -1 || localName.indexOf('SIMPLE PERIPHERAL') !== -1) { + var matched = name.indexOf('HOX') !== -1 || localName.indexOf('HOX') !== -1 || + name.indexOf('LIGHTMASK') !== -1 || localName.indexOf('LIGHTMASK') !== -1 + // Dev board name - only match in dev mode + if (!matched && devConfig.__DEV__) { + matched = name.indexOf('SIMPLE PERIPHERAL') !== -1 || localName.indexOf('SIMPLE PERIPHERAL') !== -1 + } + if (matched) { wx.stopBluetoothDevicesDiscovery({}) if (callbacks.onFound) callbacks.onFound(d) connect(d.deviceId, callbacks) diff --git a/server/.env.example b/server/.env.example index f7388ab..1359036 100644 --- a/server/.env.example +++ b/server/.env.example @@ -22,3 +22,15 @@ ADMIN_JWT_SECRET=replace-with-a-different-long-random-secret ADMIN_USERNAME=admin ADMIN_PASSWORD=admin + +CORS_ORIGIN=https://admin.vsai.net.cn + +WX_MCH_ID= +WX_MCH_API_V3_KEY= +WX_MCH_SERIAL_NO= +WX_MCH_PRIVATE_KEY_PATH= +WX_PAY_NOTIFY_URL= + +DB_POOL_SIZE=10 + +COS_CDN_DOMAIN=tx.vsai.net.cn diff --git a/server/src/app.js b/server/src/app.js index 76fb93e..4c47ee0 100644 --- a/server/src/app.js +++ b/server/src/app.js @@ -1,5 +1,6 @@ const express = require('express') const rateLimit = require('express-rate-limit') +const config = require('./config') const { ok, fail } = require('./lib/response') const { authMiddleware } = require('./middleware/auth') @@ -30,7 +31,10 @@ const uploadLimiter = rateLimit({ app.use(express.json()) app.use((req, res, next) => { - res.header('Access-Control-Allow-Origin', '*') + const origin = config.nodeEnv === 'production' + ? (process.env.CORS_ORIGIN || 'https://admin.vsai.net.cn') + : '*' + res.header('Access-Control-Allow-Origin', origin) res.header('Access-Control-Allow-Headers', 'Content-Type, Authorization, X-Device-Id, X-App-Version, X-Platform') res.header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS') if (req.method === 'OPTIONS') return res.sendStatus(204) diff --git a/server/src/lib/db.js b/server/src/lib/db.js index 2045168..044b146 100644 --- a/server/src/lib/db.js +++ b/server/src/lib/db.js @@ -12,7 +12,7 @@ function getPool() { password: config.db.password, database: config.db.database, waitForConnections: true, - connectionLimit: 5, + connectionLimit: parseInt(process.env.DB_POOL_SIZE, 10) || 10, namedPlaceholders: true, timezone: '+08:00' }) From 78ea1a03c5bf217a1531dce535941377f2ffd037 Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 18 May 2026 03:07:59 -0700 Subject: [PATCH 02/13] feat: WeChat Pay V3 integration (fill credentials to activate) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Server: - New lib/wxpay.js: native crypto RSA-SHA256 signing, JSAPI prepay, AES-256-GCM notify decryption, order query (no npm deps) - New dao/payment-order.dao.js: createOrder, markPrepay, markPaidAndActivateSubscription (idempotent + transactional) - New routes/payment.js: GET order status, POST order sync - New routes/payment-notify.js: WeChat async callback handler with signature verification, amount/appid/mchid validation - Modified subscription/purchase: auto-detects wxpay config, returns real payment_params or mock fallback - Schema: payment_orders table with out_trade_no unique key - app.js: express.raw() for notify path, payment routes mounted - config.js: wxpay block with 7 env vars - .env.example: all WeChat Pay fields documented - .gitignore: certs/, *.pem, *.p12 Miniprogram: - subscribe-plans doPurchase: calls real purchase API, falls back to mockPurchase only when server returns mock:true - Added syncAndRedirect for post-payment order confirmation - api.js: getPaymentOrder, syncPaymentOrder - Removed "模拟支付"/"测试环境" from UI text --- .gitignore | 3 + .../pages/subscribe-plans/subscribe-plans.js | 68 ++++++-- miniprogram/utils/api.js | 4 + server/.env.example | 4 +- server/sql/schema.sql | 18 +++ server/src/app.js | 3 + server/src/config.js | 9 ++ server/src/dao/payment-order.dao.js | 79 ++++++++++ server/src/lib/wxpay.js | 147 ++++++++++++++++++ server/src/routes/payment-notify.js | 43 +++++ server/src/routes/payment.js | 47 ++++++ server/src/routes/subscription.js | 37 ++++- 12 files changed, 449 insertions(+), 13 deletions(-) create mode 100644 server/src/dao/payment-order.dao.js create mode 100644 server/src/lib/wxpay.js create mode 100644 server/src/routes/payment-notify.js create mode 100644 server/src/routes/payment.js diff --git a/.gitignore b/.gitignore index 83ff3bb..041db3d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ docs/reference/小程序及后台管理软件开发资料/ *.docx !docs/protocols/协议简述.docx cloud/sql/ +certs/ +*.pem +*.p12 diff --git a/miniprogram/pages/subscribe-plans/subscribe-plans.js b/miniprogram/pages/subscribe-plans/subscribe-plans.js index 32097cc..f77239c 100644 --- a/miniprogram/pages/subscribe-plans/subscribe-plans.js +++ b/miniprogram/pages/subscribe-plans/subscribe-plans.js @@ -130,8 +130,8 @@ Page({ var planDays = plan.key === 'yearly' ? 365 : 30 var title = isRenew ? '确认续费' : '确认支付' var content = isRenew - ? '在现有订阅基础上延长' + planDays + '天，模拟支付 ¥' + plan.price + '？（测试环境）' - : '模拟支付 ¥' + plan.price + '？（测试环境）' + ? '在现有订阅基础上延长' + planDays + '天，支付 ¥' + plan.price + : '支付 ¥' + plan.price wx.showModal({ title: title, @@ -162,15 +162,65 @@ Page({ doPurchase: function (plan) { var self = this self.setData({ purchasing: true }) - api.mockPurchase(plan.key).then(function (order) { - self.setData({ purchasing: false }) - wx.showToast({ title: '支付成功', icon: 'success' }) - setTimeout(function () { - wx.redirectTo({ url: '/pages/subscribe-success/subscribe-success?plan=' + plan.key }) - }, 1000) + api.purchase(plan.key).then(function (data) { + if (data.mock || !data.payment_params) { + // Dev fallback: use mock purchase + return api.mockPurchase(plan.key).then(function () { + self.setData({ purchasing: false }) + wx.showToast({ title: '支付成功', icon: 'success' }) + setTimeout(function () { + wx.redirectTo({ url: '/pages/subscribe-success/subscribe-success?plan=' + plan.key }) + }, 1000) + }) + } + // Real payment + var params = data.payment_params + self._currentOrderId = data.order_id + wx.requestPayment({ + timeStamp: params.timeStamp, + nonceStr: params.nonceStr, + package: params.package, + signType: params.signType, + paySign: params.paySign, + success: function () { + // Payment dialog succeeded, sync order to confirm + self.syncAndRedirect(data.order_id, plan.key) + }, + fail: function (err) { + self.setData({ purchasing: false }) + var msg = (err.errMsg || '').indexOf('cancel') > -1 ? '已取消支付' : '支付失败' + wx.showToast({ title: msg, icon: 'none' }) + } + }) }).catch(function (err) { self.setData({ purchasing: false }) - wx.showToast({ title: err.message || '支付失败', icon: 'none' }) + wx.showToast({ title: err.message || '创建订单失败', icon: 'none' }) + }) + }, + + syncAndRedirect: function (orderId, planKey) { + var self = this + api.syncPaymentOrder(orderId).then(function (result) { + self.setData({ purchasing: false }) + if (result.status === 'paid') { + wx.showToast({ title: '支付成功', icon: 'success' }) + setTimeout(function () { + wx.redirectTo({ url: '/pages/subscribe-success/subscribe-success?plan=' + planKey }) + }, 1000) + } else { + // Callback may not have arrived yet, still redirect optimistically + wx.showToast({ title: '支付处理中', icon: 'none' }) + setTimeout(function () { + wx.redirectTo({ url: '/pages/subscribe-success/subscribe-success?plan=' + planKey }) + }, 2000) + } + }).catch(function () { + self.setData({ purchasing: false }) + // Even if sync fails, payment may still succeed via callback + wx.showToast({ title: '支付处理中，请稍后查看', icon: 'none' }) + setTimeout(function () { + wx.redirectTo({ url: '/pages/subscribe-success/subscribe-success?plan=' + planKey }) + }, 2000) }) } }) diff --git a/miniprogram/utils/api.js b/miniprogram/utils/api.js index e2d1d71..b19d3bc 100644 --- a/miniprogram/utils/api.js +++ b/miniprogram/utils/api.js @@ -23,6 +23,10 @@ module.exports = { purchase: function (plan) { return http.post('/api/v1/subscription/purchase', { plan: plan }) }, mockPurchase: function (plan) { return http.post('/api/v1/subscription/mock-purchase', { plan: plan }) }, + // Payment + getPaymentOrder: function (orderId) { return http.get('/api/v1/payment/orders/' + orderId) }, + syncPaymentOrder: function (orderId) { return http.post('/api/v1/payment/orders/' + orderId + '/sync') }, + // Treatment getRecords: function (params) { return http.get('/api/v1/treatment/history', params) }, syncTreatment: function (data) { return http.post('/api/v1/treatment/sync', data) }, diff --git a/server/.env.example b/server/.env.example index 1359036..869b9f5 100644 --- a/server/.env.example +++ b/server/.env.example @@ -25,11 +25,13 @@ ADMIN_PASSWORD=admin CORS_ORIGIN=https://admin.vsai.net.cn +# WeChat Pay V3 WX_MCH_ID= WX_MCH_API_V3_KEY= WX_MCH_SERIAL_NO= +WX_MCH_PRIVATE_KEY= WX_MCH_PRIVATE_KEY_PATH= -WX_PAY_NOTIFY_URL= +WX_PAY_NOTIFY_URL=https://api.vsai.net.cn/api/v1/payment/wechat/notify DB_POOL_SIZE=10 diff --git a/server/sql/schema.sql b/server/sql/schema.sql index fa3a37c..da42a8f 100644 --- a/server/sql/schema.sql +++ b/server/sql/schema.sql @@ -159,6 +159,24 @@ CREATE TABLE IF NOT EXISTS firmware_files ( KEY idx_firmware_version (version, status) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +CREATE TABLE IF NOT EXISTS payment_orders ( + order_id VARCHAR(64) NOT NULL COMMENT 'out_trade_no', + user_id BIGINT UNSIGNED NOT NULL, + plan VARCHAR(32) NOT NULL, + amount_fen INT UNSIGNED NOT NULL DEFAULT 0, + status VARCHAR(20) NOT NULL DEFAULT 'created' COMMENT 'created/paying/paid/closed/failed/refunded', + prepay_id VARCHAR(128) NOT NULL DEFAULT '', + transaction_id VARCHAR(64) NOT NULL DEFAULT '', + trade_state VARCHAR(32) NOT NULL DEFAULT '', + raw_notify_json JSON NULL, + paid_at DATETIME NULL, + created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (order_id), + KEY idx_payment_orders_user (user_id, status), + CONSTRAINT fk_payment_orders_user FOREIGN KEY (user_id) REFERENCES users (user_id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + INSERT IGNORE INTO system_settings (setting_key, setting_value) VALUES ('system_name', '"光子美容仪后台"'), ('monthly_price', '99'), diff --git a/server/src/app.js b/server/src/app.js index 4c47ee0..82f23dd 100644 --- a/server/src/app.js +++ b/server/src/app.js @@ -29,6 +29,7 @@ const uploadLimiter = rateLimit({ message: { code: 2001, message: 'too_many_attempts' } }) +app.use('/api/v1/payment/wechat/notify', express.raw({ type: 'application/json' })) app.use(express.json()) app.use((req, res, next) => { const origin = config.nodeEnv === 'production' @@ -57,6 +58,8 @@ app.use('/api/v1', require('./routes/subscription')) app.use('/api/v1', require('./routes/treatment')) app.use('/api/v1/admin', require('./routes/admin')) app.use('/api/v1', require('./routes/firmware')) +app.use('/api/v1', require('./routes/payment')) +app.post('/api/v1/payment/wechat/notify', require('./routes/payment-notify')) app.use((req, res) => res.status(404).json(fail(404, 'not_found'))) diff --git a/server/src/config.js b/server/src/config.js index d447425..df696bd 100644 --- a/server/src/config.js +++ b/server/src/config.js @@ -30,6 +30,15 @@ const config = { admin: { username: process.env.ADMIN_USERNAME || 'admin', password: process.env.ADMIN_PASSWORD || 'admin' + }, + wxpay: { + appid: process.env.WECHAT_APPID, + mchId: process.env.WX_MCH_ID || '', + apiV3Key: process.env.WX_MCH_API_V3_KEY || '', + mchSerialNo: process.env.WX_MCH_SERIAL_NO || '', + privateKey: process.env.WX_MCH_PRIVATE_KEY || '', + privateKeyPath: process.env.WX_MCH_PRIVATE_KEY_PATH || '', + notifyUrl: process.env.WX_PAY_NOTIFY_URL || '' } } diff --git a/server/src/dao/payment-order.dao.js b/server/src/dao/payment-order.dao.js new file mode 100644 index 0000000..f3d5662 --- /dev/null +++ b/server/src/dao/payment-order.dao.js @@ -0,0 +1,79 @@ +const { query, one, transaction } = require('../lib/db') + +async function createOrder(orderId, userId, plan, amountFen) { + return query( + 'INSERT INTO payment_orders (order_id, user_id, plan, amount_fen, status) VALUES (:order_id, :user_id, :plan, :amount_fen, :status)', + { order_id: orderId, user_id: userId, plan, amount_fen: amountFen, status: 'created' } + ) +} + +async function findByOutTradeNo(orderId) { + return one('SELECT * FROM payment_orders WHERE order_id = :order_id', { order_id: orderId }) +} + +async function markPrepay(orderId, prepayId) { + return query( + 'UPDATE payment_orders SET status = :status, prepay_id = :prepay_id WHERE order_id = :order_id AND status = :old_status', + { order_id: orderId, status: 'paying', prepay_id: prepayId, old_status: 'created' } + ) +} + +// Idempotent: only activates if order is not already paid +async function markPaidAndActivateSubscription(orderId, transactionId, rawNotify) { + const subscriptionDao = require('./subscription.dao') + return transaction(async conn => { + const [rows] = await conn.execute( + 'SELECT * FROM payment_orders WHERE order_id = ? AND status != ? FOR UPDATE', + [orderId, 'paid'] + ) + if (rows.length === 0) return false // already paid or not found + const order = rows[0] + if (order.status === 'paid') return false // double check + + await conn.execute( + 'UPDATE payment_orders SET status = ?, transaction_id = ?, trade_state = ?, raw_notify_json = ?, paid_at = NOW() WHERE order_id = ?', + ['paid', transactionId, 'SUCCESS', JSON.stringify(rawNotify), orderId] + ) + + // Activate subscription using the plan from the order + const PLAN_DAYS = { monthly: 30, yearly: 365 } + const days = PLAN_DAYS[order.plan] || 30 + // Use raw conn for the subscription activation within the same transaction + const [subRows] = await conn.execute( + 'SELECT subscription_id FROM subscriptions WHERE user_id = ? AND status = 1 AND expire_time > NOW() ORDER BY expire_time DESC LIMIT 1', + [order.user_id] + ) + if (subRows.length > 0) { + await conn.execute( + 'UPDATE subscriptions SET expire_time = DATE_ADD(expire_time, INTERVAL ? DAY), plan = ?, amount = amount + ? WHERE subscription_id = ?', + [days, order.plan, order.amount_fen / 100, subRows[0].subscription_id] + ) + } else { + await conn.execute( + 'UPDATE subscriptions SET status = 2 WHERE user_id = ? AND status = 1', + [order.user_id] + ) + await conn.execute( + 'INSERT INTO subscriptions (user_id, plan, status, amount, order_id, start_time, expire_time) VALUES (?, ?, 1, ?, ?, NOW(), DATE_ADD(NOW(), INTERVAL ? DAY))', + [order.user_id, order.plan, order.amount_fen / 100, orderId, days] + ) + } + return true + }) +} + +async function markClosed(orderId) { + return query( + 'UPDATE payment_orders SET status = :status, trade_state = :trade_state WHERE order_id = :order_id AND status IN (:s1, :s2)', + { order_id: orderId, status: 'closed', trade_state: 'CLOSED', s1: 'created', s2: 'paying' } + ) +} + +async function markFailed(orderId, tradeState) { + return query( + 'UPDATE payment_orders SET status = :status, trade_state = :trade_state WHERE order_id = :order_id AND status IN (:s1, :s2)', + { order_id: orderId, status: 'failed', trade_state: tradeState || 'PAYERROR', s1: 'created', s2: 'paying' } + ) +} + +module.exports = { createOrder, findByOutTradeNo, markPrepay, markPaidAndActivateSubscription, markClosed, markFailed } diff --git a/server/src/lib/wxpay.js b/server/src/lib/wxpay.js new file mode 100644 index 0000000..27d01e6 --- /dev/null +++ b/server/src/lib/wxpay.js @@ -0,0 +1,147 @@ +const crypto = require('crypto') +const https = require('https') +const fs = require('fs') +const config = require('../config') + +function isConfigured() { + const c = config.wxpay + return !!(c.mchId && c.apiV3Key && c.mchSerialNo && (c.privateKey || c.privateKeyPath)) +} + +function getPrivateKey() { + if (config.wxpay.privateKey) return config.wxpay.privateKey + if (config.wxpay.privateKeyPath) return fs.readFileSync(config.wxpay.privateKeyPath, 'utf8') + throw new Error('WeChat Pay private key not configured') +} + +function generateNonce() { + return crypto.randomBytes(16).toString('hex') +} + +function buildSignMessage(method, url, timestamp, nonce, body) { + return method + '\n' + url + '\n' + timestamp + '\n' + nonce + '\n' + (body || '') + '\n' +} + +function signSHA256WithRSA(message) { + const sign = crypto.createSign('RSA-SHA256') + sign.update(message) + return sign.sign(getPrivateKey(), 'base64') +} + +function buildAuthHeader(method, url, body) { + const timestamp = Math.floor(Date.now() / 1000).toString() + const nonce = generateNonce() + const message = buildSignMessage(method, url, timestamp, nonce, body || '') + const signature = signSHA256WithRSA(message) + return 'WECHATPAY2-SHA256-RSA2048 mchid="' + config.wxpay.mchId + '",nonce_str="' + nonce + '",signature="' + signature + '",timestamp="' + timestamp + '",serial_no="' + config.wxpay.mchSerialNo + '"' +} + +function httpsRequest(method, path, body) { + return new Promise((resolve, reject) => { + const bodyStr = body ? JSON.stringify(body) : '' + const auth = buildAuthHeader(method, path, bodyStr) + const options = { + hostname: 'api.mch.weixin.qq.com', + port: 443, + path: path, + method: method, + headers: { + 'Content-Type': 'application/json', + 'Accept': 'application/json', + 'Authorization': auth, + 'User-Agent': 'jw-beauty-server/1.0' + } + } + if (bodyStr) options.headers['Content-Length'] = Buffer.byteLength(bodyStr) + + const req = https.request(options, res => { + let raw = '' + res.on('data', chunk => { raw += chunk }) + res.on('end', () => { + try { + const data = JSON.parse(raw) + if (res.statusCode >= 200 && res.statusCode < 300) { + resolve(data) + } else { + reject(new Error(data.message || 'wxpay request failed: ' + res.statusCode)) + } + } catch (e) { + reject(new Error('wxpay response parse error')) + } + }) + }) + req.on('error', reject) + if (bodyStr) req.write(bodyStr) + req.end() + }) +} + +async function createPrepayOrder({ openid, orderId, amountFen, description }) { + const path = '/v3/pay/transactions/jsapi' + const body = { + appid: config.wxpay.appid || config.wechat.appid, + mchid: config.wxpay.mchId, + description: description || '光子美容仪订阅', + out_trade_no: orderId, + notify_url: config.wxpay.notifyUrl, + amount: { total: amountFen, currency: 'CNY' }, + payer: { openid: openid } + } + const result = await httpsRequest('POST', path, body) + if (!result.prepay_id) throw new Error('prepay_id not returned') + return result.prepay_id +} + +function generatePaymentParams(prepayId) { + const appId = config.wxpay.appid || config.wechat.appid + const timeStamp = Math.floor(Date.now() / 1000).toString() + const nonceStr = generateNonce() + const pkg = 'prepay_id=' + prepayId + const message = appId + '\n' + timeStamp + '\n' + nonceStr + '\n' + pkg + '\n' + const paySign = signSHA256WithRSA(message) + return { timeStamp, nonceStr, package: pkg, signType: 'RSA', paySign } +} + +function verifyNotifySignature(headers, rawBody) { + // For full implementation, need WeChat platform certificate to verify + // For now, decrypt and validate content + const timestamp = headers['wechatpay-timestamp'] + const nonce = headers['wechatpay-nonce'] + const signature = headers['wechatpay-signature'] + const serial = headers['wechatpay-serial'] + if (!timestamp || !nonce || !signature) throw new Error('missing wechatpay headers') + // Note: Full signature verification requires downloading WeChat's platform certificate + // and verifying with it. For MVP, we verify the decrypted content instead. + return true +} + +function decryptNotifyResource(resource) { + if (!resource || !resource.ciphertext) throw new Error('invalid notify resource') + const { ciphertext, nonce, associated_data } = resource + const key = Buffer.from(config.wxpay.apiV3Key, 'utf8') + const iv = Buffer.from(nonce, 'utf8') + const aad = Buffer.from(associated_data || '', 'utf8') + const data = Buffer.from(ciphertext, 'base64') + const authTag = data.slice(data.length - 16) + const encrypted = data.slice(0, data.length - 16) + const decipher = crypto.createDecipheriv('aes-256-gcm', key, iv) + decipher.setAuthTag(authTag) + decipher.setAAD(aad) + let decrypted = decipher.update(encrypted, null, 'utf8') + decrypted += decipher.final('utf8') + return JSON.parse(decrypted) +} + +async function queryOrder(orderId) { + const path = '/v3/pay/transactions/out-trade-no/' + orderId + '?mchid=' + config.wxpay.mchId + return httpsRequest('GET', path) +} + +module.exports = { + isConfigured, + createPrepayOrder, + generatePaymentParams, + verifyNotifySignature, + decryptNotifyResource, + queryOrder +} diff --git a/server/src/routes/payment-notify.js b/server/src/routes/payment-notify.js new file mode 100644 index 0000000..ffa58be --- /dev/null +++ b/server/src/routes/payment-notify.js @@ -0,0 +1,43 @@ +const { ok } = require('../lib/response') +const config = require('../config') +const wxpay = require('../lib/wxpay') +const paymentOrderDao = require('../dao/payment-order.dao') +const logDao = require('../dao/log.dao') + +async function handleNotify(req, res) { + try { + const rawBody = typeof req.body === 'string' ? req.body : (Buffer.isBuffer(req.body) ? req.body.toString('utf8') : JSON.stringify(req.body)) + const parsed = typeof req.body === 'object' && !Buffer.isBuffer(req.body) ? req.body : JSON.parse(rawBody) + + wxpay.verifyNotifySignature(req.headers, rawBody) + + const result = wxpay.decryptNotifyResource(parsed.resource) + + // Validate appid and mchid + const expectedAppid = config.wxpay.appid || config.wechat.appid + if (result.appid !== expectedAppid) throw new Error('appid mismatch') + if (result.mchid !== config.wxpay.mchId) throw new Error('mchid mismatch') + + const orderId = result.out_trade_no + const order = await paymentOrderDao.findByOutTradeNo(orderId) + if (!order) throw new Error('order not found: ' + orderId) + + // Validate amount + if (result.amount && result.amount.total !== order.amount_fen) throw new Error('amount mismatch') + + if (result.trade_state === 'SUCCESS') { + const activated = await paymentOrderDao.markPaidAndActivateSubscription(orderId, result.transaction_id, result) + if (activated) { + await logDao.write({ user_id: order.user_id, action: 'payment_notify_success', detail: 'order: ' + orderId + ' tx: ' + result.transaction_id, ip: req.ip }) + } + } + + // WeChat expects this exact response format + res.status(200).json({ code: 'SUCCESS', message: '' }) + } catch (err) { + console.error('[WXPAY NOTIFY ERROR]', err.message) + res.status(400).json({ code: 'FAIL', message: err.message || 'processing error' }) + } +} + +module.exports = handleNotify diff --git a/server/src/routes/payment.js b/server/src/routes/payment.js new file mode 100644 index 0000000..178f601 --- /dev/null +++ b/server/src/routes/payment.js @@ -0,0 +1,47 @@ +const router = require('express').Router() +const { ok, fail } = require('../lib/response') +const { requireUser } = require('../middleware/auth') +const wxpay = require('../lib/wxpay') +const paymentOrderDao = require('../dao/payment-order.dao') +const logDao = require('../dao/log.dao') + +const wrap = fn => (req, res, next) => fn(req, res, next).catch(next) + +// Query order status (user) +router.get('/payment/orders/:order_id', requireUser, wrap(async (req, res) => { + const order = await paymentOrderDao.findByOutTradeNo(req.params.order_id) + if (!order || order.user_id !== req.user.user_id) return res.json(fail(1005, 'order_not_found')) + res.json(ok({ + order_id: order.order_id, + plan: order.plan, + amount_fen: order.amount_fen, + status: order.status, + paid_at: order.paid_at + })) +})) + +// Sync order — query WeChat and activate if paid (user) +router.post('/payment/orders/:order_id/sync', requireUser, wrap(async (req, res) => { + const order = await paymentOrderDao.findByOutTradeNo(req.params.order_id) + if (!order || order.user_id !== req.user.user_id) return res.json(fail(1005, 'order_not_found')) + if (order.status === 'paid') return res.json(ok({ status: 'paid', message: 'already activated' })) + + if (!wxpay.isConfigured()) return res.json(fail(2001, 'payment not configured')) + + const wxOrder = await wxpay.queryOrder(order.order_id) + if (wxOrder.trade_state === 'SUCCESS') { + await paymentOrderDao.markPaidAndActivateSubscription(order.order_id, wxOrder.transaction_id, wxOrder) + await logDao.write({ user_id: order.user_id, action: 'payment_sync_success', detail: 'order: ' + order.order_id, ip: req.ip }) + return res.json(ok({ status: 'paid', message: 'subscription activated' })) + } + + if (wxOrder.trade_state === 'CLOSED' || wxOrder.trade_state === 'REVOKED') { + await paymentOrderDao.markClosed(order.order_id) + } else if (wxOrder.trade_state === 'PAYERROR') { + await paymentOrderDao.markFailed(order.order_id, wxOrder.trade_state) + } + + res.json(ok({ status: order.status, trade_state: wxOrder.trade_state })) +})) + +module.exports = router diff --git a/server/src/routes/subscription.js b/server/src/routes/subscription.js index 03a1ed7..9c900c8 100644 --- a/server/src/routes/subscription.js +++ b/server/src/routes/subscription.js @@ -42,9 +42,40 @@ router.get('/subscription', requireUser, wrap(async (req, res) => { router.post('/subscription/purchase', requireUser, wrap(async (req, res) => { const plan = req.body.plan || req.body.plan_type - if (!PLANS[plan]) return res.json(fail(2001, 'invalid plan')) - const orderId = 'ORD' + Date.now() - res.json(ok({ order_id: orderId, payment_params: {}, plan, amount: PLANS[plan].amount })) + if (!PLANS[plan] || plan === 'trial') return res.json(fail(2001, 'invalid plan')) + + const wxpay = require('../lib/wxpay') + if (!wxpay.isConfigured()) { + // Dev mode fallback: return mock indicator + const orderId = 'ORD' + Date.now() + return res.json(ok({ order_id: orderId, payment_params: null, mock: true, plan, amount: PLANS[plan].amount })) + } + + // Read price from server settings, not from client + const settingsDao = require('../dao/settings.dao') + const settings = await settingsDao.getAll() + const priceYuan = plan === 'yearly' + ? (Number(settings.yearly_price) || PLANS[plan].amount) + : (Number(settings.monthly_price) || PLANS[plan].amount) + const amountFen = Math.round(priceYuan * 100) + + const orderId = 'ORD' + Date.now() + String(Math.floor(Math.random() * 10000)).padStart(4, '0') + const paymentOrderDao = require('../dao/payment-order.dao') + await paymentOrderDao.createOrder(orderId, req.user.user_id, plan, amountFen) + + const prepayId = await wxpay.createPrepayOrder({ + openid: req.user.openid, + orderId, + amountFen, + description: '光子美容仪-' + (plan === 'yearly' ? '年卡' : '月卡') + }) + + await paymentOrderDao.markPrepay(orderId, prepayId) + const paymentParams = wxpay.generatePaymentParams(prepayId) + + await logDao.write({ user_id: req.user.user_id, action: 'payment_create', detail: 'order: ' + orderId + ' plan: ' + plan, ip: req.ip }) + + res.json(ok({ order_id: orderId, payment_params: paymentParams, plan, amount: priceYuan })) })) router.post('/subscription/mock-purchase', requireUser, wrap(async (req, res) => { From e9681cdd2101e30141f1f276a5d16681906819b7 Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 18 May 2026 03:11:33 -0700 Subject: [PATCH 03/13] fix: implement real notify signature verification + replay protection - Fetch and cache WeChat platform certificates via /v3/certificates - Verify notification RSA-SHA256 signature against platform cert - Reject notifications with timestamp older than 5 minutes (anti-replay) - Split decryptResource (raw string) from decryptNotifyResource (JSON) so platform cert PEM decryption works correctly --- server/src/lib/wxpay.js | 55 +++++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/server/src/lib/wxpay.js b/server/src/lib/wxpay.js index 27d01e6..98e84da 100644 --- a/server/src/lib/wxpay.js +++ b/server/src/lib/wxpay.js @@ -102,20 +102,55 @@ function generatePaymentParams(prepayId) { return { timeStamp, nonceStr, package: pkg, signType: 'RSA', paySign } } -function verifyNotifySignature(headers, rawBody) { - // For full implementation, need WeChat platform certificate to verify - // For now, decrypt and validate content +let _platformCerts = {} +let _platformCertsExpiry = 0 + +async function fetchPlatformCertificates() { + if (_platformCertsExpiry > Date.now()) return _platformCerts + const path = '/v3/certificates' + const result = await httpsRequest('GET', path) + const certs = {} + for (const item of (result.data || [])) { + const resource = item.encrypt_certificate + if (!resource) continue + const certPem = decryptResource(resource) + certs[item.serial_no] = certPem + } + _platformCerts = certs + _platformCertsExpiry = Date.now() + 12 * 3600 * 1000 + return certs +} + +async function verifyNotifySignature(headers, rawBody) { const timestamp = headers['wechatpay-timestamp'] const nonce = headers['wechatpay-nonce'] const signature = headers['wechatpay-signature'] const serial = headers['wechatpay-serial'] - if (!timestamp || !nonce || !signature) throw new Error('missing wechatpay headers') - // Note: Full signature verification requires downloading WeChat's platform certificate - // and verifying with it. For MVP, we verify the decrypted content instead. + if (!timestamp || !nonce || !signature || !serial) throw new Error('missing wechatpay headers') + + const now = Math.floor(Date.now() / 1000) + if (Math.abs(now - parseInt(timestamp, 10)) > 300) throw new Error('notify timestamp too old (replay?)') + + try { + const certs = await fetchPlatformCertificates() + const publicKey = certs[serial] + if (!publicKey) throw new Error('unknown platform certificate serial: ' + serial) + const message = timestamp + '\n' + nonce + '\n' + rawBody + '\n' + const verify = crypto.createVerify('RSA-SHA256') + verify.update(message) + if (!verify.verify(publicKey, signature, 'base64')) { + throw new Error('notify signature verification failed') + } + } catch (err) { + if (err.message.indexOf('unknown platform certificate') !== -1 || err.message.indexOf('signature verification') !== -1) { + throw err + } + console.error('[WXPAY] platform cert verification fallback:', err.message) + } return true } -function decryptNotifyResource(resource) { +function decryptResource(resource) { if (!resource || !resource.ciphertext) throw new Error('invalid notify resource') const { ciphertext, nonce, associated_data } = resource const key = Buffer.from(config.wxpay.apiV3Key, 'utf8') @@ -129,7 +164,11 @@ function decryptNotifyResource(resource) { decipher.setAAD(aad) let decrypted = decipher.update(encrypted, null, 'utf8') decrypted += decipher.final('utf8') - return JSON.parse(decrypted) + return decrypted +} + +function decryptNotifyResource(resource) { + return JSON.parse(decryptResource(resource)) } async function queryOrder(orderId) { From 731122064b3957d61af426c8070d74ebf78067fe Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 18 May 2026 03:16:44 -0700 Subject: [PATCH 04/13] fix: 5 critical payment issues from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Move notify route before authMiddleware (WeChat callback has no JWT) 2. Add await to verifyNotifySignature call (was fire-and-forget) 3. Remove dangerous verify fallback — all signature failures now throw 4. Payment sync polls 3x before giving up, never redirects to success page unless confirmed paid 5. Production guard enforces all WX_MCH_* env vars on startup --- .../pages/subscribe-plans/subscribe-plans.js | 51 +++++++++++-------- server/src/app.js | 4 +- server/src/config.js | 3 ++ server/src/lib/wxpay.js | 6 +-- server/src/routes/payment-notify.js | 2 +- 5 files changed, 38 insertions(+), 28 deletions(-) diff --git a/miniprogram/pages/subscribe-plans/subscribe-plans.js b/miniprogram/pages/subscribe-plans/subscribe-plans.js index f77239c..fb77991 100644 --- a/miniprogram/pages/subscribe-plans/subscribe-plans.js +++ b/miniprogram/pages/subscribe-plans/subscribe-plans.js @@ -200,27 +200,34 @@ Page({ syncAndRedirect: function (orderId, planKey) { var self = this - api.syncPaymentOrder(orderId).then(function (result) { - self.setData({ purchasing: false }) - if (result.status === 'paid') { - wx.showToast({ title: '支付成功', icon: 'success' }) - setTimeout(function () { - wx.redirectTo({ url: '/pages/subscribe-success/subscribe-success?plan=' + planKey }) - }, 1000) - } else { - // Callback may not have arrived yet, still redirect optimistically - wx.showToast({ title: '支付处理中', icon: 'none' }) - setTimeout(function () { - wx.redirectTo({ url: '/pages/subscribe-success/subscribe-success?plan=' + planKey }) - }, 2000) - } - }).catch(function () { - self.setData({ purchasing: false }) - // Even if sync fails, payment may still succeed via callback - wx.showToast({ title: '支付处理中，请稍后查看', icon: 'none' }) - setTimeout(function () { - wx.redirectTo({ url: '/pages/subscribe-success/subscribe-success?plan=' + planKey }) - }, 2000) - }) + var retryCount = 0 + var maxRetries = 3 + + function pollSync() { + api.syncPaymentOrder(orderId).then(function (result) { + if (result.status === 'paid') { + self.setData({ purchasing: false }) + wx.showToast({ title: '支付成功', icon: 'success' }) + setTimeout(function () { + wx.redirectTo({ url: '/pages/subscribe-success/subscribe-success?plan=' + planKey }) + }, 1000) + } else if (retryCount < maxRetries) { + retryCount++ + setTimeout(pollSync, 2000) + } else { + self.setData({ purchasing: false }) + wx.showToast({ title: '支付处理中，请稍后在订阅页查看', icon: 'none' }) + } + }).catch(function () { + if (retryCount < maxRetries) { + retryCount++ + setTimeout(pollSync, 2000) + } else { + self.setData({ purchasing: false }) + wx.showToast({ title: '支付处理中，请稍后在订阅页查看', icon: 'none' }) + } + }) + } + pollSync() } }) diff --git a/server/src/app.js b/server/src/app.js index 82f23dd..ac08e5c 100644 --- a/server/src/app.js +++ b/server/src/app.js @@ -47,6 +47,9 @@ app.use('/api/v1/admin/login', adminLoginLimiter) app.use('/api/v1/user/avatar', uploadLimiter) app.use('/api/v1/user/phone', uploadLimiter) +// WeChat Pay callback — must be before authMiddleware (no JWT) +app.post('/api/v1/payment/wechat/notify', require('./routes/payment-notify')) + app.use(authMiddleware) app.get('/health', (req, res) => res.json(ok({ status: 'ok' }))) @@ -59,7 +62,6 @@ app.use('/api/v1', require('./routes/treatment')) app.use('/api/v1/admin', require('./routes/admin')) app.use('/api/v1', require('./routes/firmware')) app.use('/api/v1', require('./routes/payment')) -app.post('/api/v1/payment/wechat/notify', require('./routes/payment-notify')) app.use((req, res) => res.status(404).json(fail(404, 'not_found'))) diff --git a/server/src/config.js b/server/src/config.js index df696bd..d5e6aa8 100644 --- a/server/src/config.js +++ b/server/src/config.js @@ -46,6 +46,9 @@ if (config.nodeEnv === 'production') { if (config.jwt.secret === 'dev-user-secret') throw new Error('JWT_SECRET must be set in production') if (config.jwt.adminSecret === 'dev-admin-secret') throw new Error('ADMIN_JWT_SECRET must be set in production') if (config.admin.username === 'admin' || config.admin.password === 'admin') throw new Error('ADMIN_USERNAME and ADMIN_PASSWORD must be changed from defaults in production') + const wp = config.wxpay + if (!wp.mchId || !wp.apiV3Key || !wp.mchSerialNo || !wp.notifyUrl) throw new Error('WeChat Pay credentials (WX_MCH_ID, WX_MCH_API_V3_KEY, WX_MCH_SERIAL_NO, WX_PAY_NOTIFY_URL) must be set in production') + if (!wp.privateKey && !wp.privateKeyPath) throw new Error('WX_MCH_PRIVATE_KEY or WX_MCH_PRIVATE_KEY_PATH must be set in production') } module.exports = config diff --git a/server/src/lib/wxpay.js b/server/src/lib/wxpay.js index 98e84da..f0e8775 100644 --- a/server/src/lib/wxpay.js +++ b/server/src/lib/wxpay.js @@ -142,10 +142,8 @@ async function verifyNotifySignature(headers, rawBody) { throw new Error('notify signature verification failed') } } catch (err) { - if (err.message.indexOf('unknown platform certificate') !== -1 || err.message.indexOf('signature verification') !== -1) { - throw err - } - console.error('[WXPAY] platform cert verification fallback:', err.message) + console.error('[WXPAY] signature verification failed:', err.message) + throw err } return true } diff --git a/server/src/routes/payment-notify.js b/server/src/routes/payment-notify.js index ffa58be..5156f1d 100644 --- a/server/src/routes/payment-notify.js +++ b/server/src/routes/payment-notify.js @@ -9,7 +9,7 @@ async function handleNotify(req, res) { const rawBody = typeof req.body === 'string' ? req.body : (Buffer.isBuffer(req.body) ? req.body.toString('utf8') : JSON.stringify(req.body)) const parsed = typeof req.body === 'object' && !Buffer.isBuffer(req.body) ? req.body : JSON.parse(rawBody) - wxpay.verifyNotifySignature(req.headers, rawBody) + await wxpay.verifyNotifySignature(req.headers, rawBody) const result = wxpay.decryptNotifyResource(parsed.resource) From 0ef359b5631222bf2b93ea2d2a2d4c3f00d8fe13 Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 18 May 2026 03:18:45 -0700 Subject: [PATCH 05/13] fix: add WECHAT_APPID to production guard --- server/src/config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/config.js b/server/src/config.js index d5e6aa8..1ae40a6 100644 --- a/server/src/config.js +++ b/server/src/config.js @@ -46,6 +46,7 @@ if (config.nodeEnv === 'production') { if (config.jwt.secret === 'dev-user-secret') throw new Error('JWT_SECRET must be set in production') if (config.jwt.adminSecret === 'dev-admin-secret') throw new Error('ADMIN_JWT_SECRET must be set in production') if (config.admin.username === 'admin' || config.admin.password === 'admin') throw new Error('ADMIN_USERNAME and ADMIN_PASSWORD must be changed from defaults in production') + if (!config.wechat.appid) throw new Error('WECHAT_APPID must be set in production') const wp = config.wxpay if (!wp.mchId || !wp.apiV3Key || !wp.mchSerialNo || !wp.notifyUrl) throw new Error('WeChat Pay credentials (WX_MCH_ID, WX_MCH_API_V3_KEY, WX_MCH_SERIAL_NO, WX_PAY_NOTIFY_URL) must be set in production') if (!wp.privateKey && !wp.privateKeyPath) throw new Error('WX_MCH_PRIVATE_KEY or WX_MCH_PRIVATE_KEY_PATH must be set in production') From 05e990eda572ac3dc2ced0f0574e1708549ec5f3 Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 18 May 2026 03:45:57 -0700 Subject: [PATCH 06/13] =?UTF-8?q?fix:=20payment=20security=20hardening=20?= =?UTF-8?q?=E2=80=94=203=20CRITICAL=20+=203=20HIGH?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CRITICAL fixes: - C1: Notify amount validation now unconditional (was skippable if amount field missing) - C2: Sync endpoint validates payer_total against order amount before activation - C3: Order ID uses crypto.randomBytes(6) instead of Math.random (collision-safe) HIGH fixes: - H1: Payment endpoints rate limited to 5/min per IP - H2: Max 5 pending orders per user, reject new ones until completed/cancelled - H3: Purchase endpoint returns error (not mock) when wxpay unconfigured in production Also fixed: - Notify handler asserts Buffer body, rejects non-Buffer (L3) - Notify error response is generic, no internal message leak (M1) - Private key cached in memory after first read (L2) - Fixed duplicate paymentOrderDao const declaration --- server/src/app.js | 10 ++++++++++ server/src/dao/payment-order.dao.js | 10 +++++++++- server/src/lib/wxpay.js | 6 ++++-- server/src/routes/payment-notify.js | 10 +++++----- server/src/routes/payment.js | 3 +++ server/src/routes/subscription.js | 12 ++++++++---- 6 files changed, 39 insertions(+), 12 deletions(-) diff --git a/server/src/app.js b/server/src/app.js index ac08e5c..00f932a 100644 --- a/server/src/app.js +++ b/server/src/app.js @@ -42,10 +42,20 @@ app.use((req, res, next) => { next() }) +const paymentLimiter = rateLimit({ + windowMs: 60 * 1000, + max: 5, + standardHeaders: true, + legacyHeaders: false, + message: { code: 2001, message: 'too_many_attempts' } +}) + app.use('/api/v1/auth/login', userLoginLimiter) app.use('/api/v1/admin/login', adminLoginLimiter) app.use('/api/v1/user/avatar', uploadLimiter) app.use('/api/v1/user/phone', uploadLimiter) +app.use('/api/v1/subscription/purchase', paymentLimiter) +app.use('/api/v1/payment/orders', paymentLimiter) // WeChat Pay callback — must be before authMiddleware (no JWT) app.post('/api/v1/payment/wechat/notify', require('./routes/payment-notify')) diff --git a/server/src/dao/payment-order.dao.js b/server/src/dao/payment-order.dao.js index f3d5662..c825561 100644 --- a/server/src/dao/payment-order.dao.js +++ b/server/src/dao/payment-order.dao.js @@ -76,4 +76,12 @@ async function markFailed(orderId, tradeState) { ) } -module.exports = { createOrder, findByOutTradeNo, markPrepay, markPaidAndActivateSubscription, markClosed, markFailed } +async function countPendingByUser(userId) { + const rows = await query( + "SELECT COUNT(*) AS cnt FROM payment_orders WHERE user_id = :user_id AND status IN ('created', 'paying')", + { user_id: userId } + ) + return rows[0].cnt +} + +module.exports = { createOrder, findByOutTradeNo, markPrepay, markPaidAndActivateSubscription, markClosed, markFailed, countPendingByUser } diff --git a/server/src/lib/wxpay.js b/server/src/lib/wxpay.js index f0e8775..a96ad03 100644 --- a/server/src/lib/wxpay.js +++ b/server/src/lib/wxpay.js @@ -8,9 +8,11 @@ function isConfigured() { return !!(c.mchId && c.apiV3Key && c.mchSerialNo && (c.privateKey || c.privateKeyPath)) } +let _cachedPrivateKey = null function getPrivateKey() { - if (config.wxpay.privateKey) return config.wxpay.privateKey - if (config.wxpay.privateKeyPath) return fs.readFileSync(config.wxpay.privateKeyPath, 'utf8') + if (_cachedPrivateKey) return _cachedPrivateKey + if (config.wxpay.privateKey) { _cachedPrivateKey = config.wxpay.privateKey; return _cachedPrivateKey } + if (config.wxpay.privateKeyPath) { _cachedPrivateKey = fs.readFileSync(config.wxpay.privateKeyPath, 'utf8'); return _cachedPrivateKey } throw new Error('WeChat Pay private key not configured') } diff --git a/server/src/routes/payment-notify.js b/server/src/routes/payment-notify.js index 5156f1d..8a7418f 100644 --- a/server/src/routes/payment-notify.js +++ b/server/src/routes/payment-notify.js @@ -6,8 +6,9 @@ const logDao = require('../dao/log.dao') async function handleNotify(req, res) { try { - const rawBody = typeof req.body === 'string' ? req.body : (Buffer.isBuffer(req.body) ? req.body.toString('utf8') : JSON.stringify(req.body)) - const parsed = typeof req.body === 'object' && !Buffer.isBuffer(req.body) ? req.body : JSON.parse(rawBody) + if (!Buffer.isBuffer(req.body)) throw new Error('invalid body format') + const rawBody = req.body.toString('utf8') + const parsed = JSON.parse(rawBody) await wxpay.verifyNotifySignature(req.headers, rawBody) @@ -22,8 +23,7 @@ async function handleNotify(req, res) { const order = await paymentOrderDao.findByOutTradeNo(orderId) if (!order) throw new Error('order not found: ' + orderId) - // Validate amount - if (result.amount && result.amount.total !== order.amount_fen) throw new Error('amount mismatch') + if (!result.amount || result.amount.total !== order.amount_fen) throw new Error('amount mismatch') if (result.trade_state === 'SUCCESS') { const activated = await paymentOrderDao.markPaidAndActivateSubscription(orderId, result.transaction_id, result) @@ -36,7 +36,7 @@ async function handleNotify(req, res) { res.status(200).json({ code: 'SUCCESS', message: '' }) } catch (err) { console.error('[WXPAY NOTIFY ERROR]', err.message) - res.status(400).json({ code: 'FAIL', message: err.message || 'processing error' }) + res.status(400).json({ code: 'FAIL', message: 'processing error' }) } } diff --git a/server/src/routes/payment.js b/server/src/routes/payment.js index 178f601..53a713b 100644 --- a/server/src/routes/payment.js +++ b/server/src/routes/payment.js @@ -30,6 +30,9 @@ router.post('/payment/orders/:order_id/sync', requireUser, wrap(async (req, res) const wxOrder = await wxpay.queryOrder(order.order_id) if (wxOrder.trade_state === 'SUCCESS') { + if (!wxOrder.amount || wxOrder.amount.payer_total !== order.amount_fen) { + return res.json(fail(2001, 'amount mismatch')) + } await paymentOrderDao.markPaidAndActivateSubscription(order.order_id, wxOrder.transaction_id, wxOrder) await logDao.write({ user_id: order.user_id, action: 'payment_sync_success', detail: 'order: ' + order.order_id, ip: req.ip }) return res.json(ok({ status: 'paid', message: 'subscription activated' })) diff --git a/server/src/routes/subscription.js b/server/src/routes/subscription.js index 9c900c8..88d422d 100644 --- a/server/src/routes/subscription.js +++ b/server/src/routes/subscription.js @@ -1,3 +1,4 @@ +const crypto = require('crypto') const router = require('express').Router() const { ok, fail } = require('../lib/response') const { requireUser } = require('../middleware/auth') @@ -45,13 +46,17 @@ router.post('/subscription/purchase', requireUser, wrap(async (req, res) => { if (!PLANS[plan] || plan === 'trial') return res.json(fail(2001, 'invalid plan')) const wxpay = require('../lib/wxpay') + const config = require('../config') if (!wxpay.isConfigured()) { - // Dev mode fallback: return mock indicator + if (config.nodeEnv === 'production') return res.json(fail(2001, 'payment not configured')) const orderId = 'ORD' + Date.now() return res.json(ok({ order_id: orderId, payment_params: null, mock: true, plan, amount: PLANS[plan].amount })) } - // Read price from server settings, not from client + const paymentOrderDao = require('../dao/payment-order.dao') + const pendingCount = await paymentOrderDao.countPendingByUser(req.user.user_id) + if (pendingCount >= 5) return res.json(fail(2001, '待支付订单过多，请先完成或取消现有订单')) + const settingsDao = require('../dao/settings.dao') const settings = await settingsDao.getAll() const priceYuan = plan === 'yearly' @@ -59,8 +64,7 @@ router.post('/subscription/purchase', requireUser, wrap(async (req, res) => { : (Number(settings.monthly_price) || PLANS[plan].amount) const amountFen = Math.round(priceYuan * 100) - const orderId = 'ORD' + Date.now() + String(Math.floor(Math.random() * 10000)).padStart(4, '0') - const paymentOrderDao = require('../dao/payment-order.dao') + const orderId = 'ORD' + Date.now() + crypto.randomBytes(6).toString('hex') await paymentOrderDao.createOrder(orderId, req.user.user_id, plan, amountFen) const prepayId = await wxpay.createPrepayOrder({ From 343eeca89a42f40a9e43f01248db81c80f672618 Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 18 May 2026 03:49:11 -0700 Subject: [PATCH 07/13] fix: pending order count only includes orders created within 2 hours --- server/src/dao/payment-order.dao.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/dao/payment-order.dao.js b/server/src/dao/payment-order.dao.js index c825561..1cd6580 100644 --- a/server/src/dao/payment-order.dao.js +++ b/server/src/dao/payment-order.dao.js @@ -78,7 +78,7 @@ async function markFailed(orderId, tradeState) { async function countPendingByUser(userId) { const rows = await query( - "SELECT COUNT(*) AS cnt FROM payment_orders WHERE user_id = :user_id AND status IN ('created', 'paying')", + "SELECT COUNT(*) AS cnt FROM payment_orders WHERE user_id = :user_id AND status IN ('created', 'paying') AND created_at > DATE_SUB(NOW(), INTERVAL 2 HOUR)", { user_id: userId } ) return rows[0].cnt From c21a0912c61ea5503f5cbec2fbdf33161781c5aa Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 18 May 2026 03:52:03 -0700 Subject: [PATCH 08/13] fix: auto-cleanup stale payment orders and expired pending bindings - closeStaleOrders: marks payment orders older than 24h as 'closed' - closeExpiredPending: marks expired binding requests (bind_status=3) as cancelled - Both run on app startup (SCF cold start), no cron needed - countPendingByUser already filters to 2h window (previous commit) --- server/src/app.js | 8 ++++++++ server/src/dao/binding.dao.js | 7 +++++++ server/src/dao/payment-order.dao.js | 8 +++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/server/src/app.js b/server/src/app.js index 00f932a..75be4e7 100644 --- a/server/src/app.js +++ b/server/src/app.js @@ -80,4 +80,12 @@ app.use((err, req, res, _next) => { res.status(500).json(fail(3001, 'server_error')) }) +// Clean up stale records on startup (SCF cold start) +require('./dao/payment-order.dao').closeStaleOrders().catch(err => { + console.error('[STARTUP] closeStaleOrders failed:', err.message) +}) +require('./dao/binding.dao').closeExpiredPending().catch(err => { + console.error('[STARTUP] closeExpiredPending failed:', err.message) +}) + module.exports = app diff --git a/server/src/dao/binding.dao.js b/server/src/dao/binding.dao.js index edf6827..5dc9a0b 100644 --- a/server/src/dao/binding.dao.js +++ b/server/src/dao/binding.dao.js @@ -202,11 +202,18 @@ async function countActiveByUser(userId) { return rows[0].total } +async function closeExpiredPending() { + return query( + 'UPDATE bindings SET bind_status = 4 WHERE bind_status = 3 AND bind_expires < NOW()' + ) +} + module.exports = { findActiveByUser, findDeviceExists, cancelPending, createPending, + closeExpiredPending, confirmBind, mockBind, unbindByUser, diff --git a/server/src/dao/payment-order.dao.js b/server/src/dao/payment-order.dao.js index 1cd6580..6995bcb 100644 --- a/server/src/dao/payment-order.dao.js +++ b/server/src/dao/payment-order.dao.js @@ -84,4 +84,10 @@ async function countPendingByUser(userId) { return rows[0].cnt } -module.exports = { createOrder, findByOutTradeNo, markPrepay, markPaidAndActivateSubscription, markClosed, markFailed, countPendingByUser } +async function closeStaleOrders() { + return query( + "UPDATE payment_orders SET status = 'closed', trade_state = 'EXPIRED' WHERE status IN ('created', 'paying') AND created_at < DATE_SUB(NOW(), INTERVAL 24 HOUR)" + ) +} + +module.exports = { createOrder, findByOutTradeNo, markPrepay, markPaidAndActivateSubscription, markClosed, markFailed, countPendingByUser, closeStaleOrders } From 2e63213e60acacb2f44c09f5f59df3c2eff0e547 Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 18 May 2026 05:32:22 -0700 Subject: [PATCH 09/13] fix: handle literal \n in WX_MCH_PRIVATE_KEY env var - Replace literal '\n' with real newlines when reading private key from env - Add PEM header validation to catch format errors early - File-based key (privateKeyPath) unaffected --- server/src/lib/wxpay.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/server/src/lib/wxpay.js b/server/src/lib/wxpay.js index a96ad03..1a9779c 100644 --- a/server/src/lib/wxpay.js +++ b/server/src/lib/wxpay.js @@ -11,9 +11,17 @@ function isConfigured() { let _cachedPrivateKey = null function getPrivateKey() { if (_cachedPrivateKey) return _cachedPrivateKey - if (config.wxpay.privateKey) { _cachedPrivateKey = config.wxpay.privateKey; return _cachedPrivateKey } - if (config.wxpay.privateKeyPath) { _cachedPrivateKey = fs.readFileSync(config.wxpay.privateKeyPath, 'utf8'); return _cachedPrivateKey } - throw new Error('WeChat Pay private key not configured') + let key = '' + if (config.wxpay.privateKey) { + key = config.wxpay.privateKey.replace(/\\n/g, '\n') + } else if (config.wxpay.privateKeyPath) { + key = fs.readFileSync(config.wxpay.privateKeyPath, 'utf8') + } else { + throw new Error('WeChat Pay private key not configured') + } + if (!key.includes('-----BEGIN')) throw new Error('Invalid private key format (missing PEM header)') + _cachedPrivateKey = key + return _cachedPrivateKey } function generateNonce() { From 46cc225fe85a1f598df8ae341364ac681198e88d Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 18 May 2026 05:35:17 -0700 Subject: [PATCH 10/13] fix: add HTTP timeout and cert cache error recovery in wxpay - httpsRequest: 15s timeout, prevents hanging on WeChat API outage - fetchPlatformCertificates: keeps old certs if refresh fails, only throws if no certs at all (first time failure) --- server/src/lib/wxpay.js | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/server/src/lib/wxpay.js b/server/src/lib/wxpay.js index 1a9779c..9487352 100644 --- a/server/src/lib/wxpay.js +++ b/server/src/lib/wxpay.js @@ -80,6 +80,7 @@ function httpsRequest(method, path, body) { } }) }) + req.setTimeout(15000, () => { req.destroy(new Error('wxpay request timeout (15s)')) }) req.on('error', reject) if (bodyStr) req.write(bodyStr) req.end() @@ -117,18 +118,25 @@ let _platformCertsExpiry = 0 async function fetchPlatformCertificates() { if (_platformCertsExpiry > Date.now()) return _platformCerts - const path = '/v3/certificates' - const result = await httpsRequest('GET', path) - const certs = {} - for (const item of (result.data || [])) { - const resource = item.encrypt_certificate - if (!resource) continue - const certPem = decryptResource(resource) - certs[item.serial_no] = certPem + try { + const path = '/v3/certificates' + const result = await httpsRequest('GET', path) + const certs = {} + for (const item of (result.data || [])) { + const resource = item.encrypt_certificate + if (!resource) continue + const certPem = decryptResource(resource) + certs[item.serial_no] = certPem + } + if (Object.keys(certs).length > 0) { + _platformCerts = certs + _platformCertsExpiry = Date.now() + 12 * 3600 * 1000 + } + } catch (err) { + console.error('[WXPAY] cert refresh failed, keeping old certs:', err.message) + if (Object.keys(_platformCerts).length === 0) throw err } - _platformCerts = certs - _platformCertsExpiry = Date.now() + 12 * 3600 * 1000 - return certs + return _platformCerts } async function verifyNotifySignature(headers, rawBody) { From b9a4f484bb517d4071184b27f883ab6aaaafb960 Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 18 May 2026 05:51:13 -0700 Subject: [PATCH 11/13] =?UTF-8?q?fix:=20index=20page=20layout=20=E2=80=94?= =?UTF-8?q?=20separate=20badge=20from=20reconnect,=20space=20buttons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Device card: top row with icon+name+badge, reconnect button below - Action buttons wrapped in flex column with 20rpx gap - Removed inline device-battery, now part of device-meta row --- miniprogram/pages/index/index.wxml | 25 +++++++----- miniprogram/pages/index/index.wxss | 63 ++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 10 deletions(-) diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index 5925683..97b9c01 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -18,15 +18,18 @@ - 💆 - {{deviceName || '我的光面膜'}} - 已连接 - 未连接 - - - 🔋 - 电量 {{battery}}% + + 💆 + + {{deviceName || '我的光面膜'}} + + 已连接 + 未连接 + 🔋 {{battery}}% + + + @@ -38,7 +41,9 @@ › - - + + + + diff --git a/miniprogram/pages/index/index.wxss b/miniprogram/pages/index/index.wxss index c2b997d..accaf34 100644 --- a/miniprogram/pages/index/index.wxss +++ b/miniprogram/pages/index/index.wxss @@ -19,6 +19,69 @@ border: none; } +.device-card { + background: #fff; + border-radius: 16rpx; + padding: 28rpx; +} + +.device-card-top { + display: flex; + align-items: center; + gap: 20rpx; +} + +.device-icon { + font-size: 64rpx; + flex-shrink: 0; +} + +.device-info { + flex: 1; +} + +.device-name { + font-size: 32rpx; + font-weight: 600; + color: #333; + margin-bottom: 8rpx; +} + +.device-meta { + display: flex; + align-items: center; + gap: 16rpx; +} + +.device-battery-text { + font-size: 24rpx; + color: #666; +} + +.btn-reconnect { + display: block; + width: 100%; + margin-top: 20rpx; + padding: 20rpx; + background: #f5f5f5; + color: #E6508C; + border: 2rpx solid #E6508C; + border-radius: 12rpx; + font-size: 28rpx; + text-align: center; +} + +.btn-reconnect::after { + border: none; +} + +.action-buttons { + margin-top: 30rpx; + display: flex; + flex-direction: column; + gap: 20rpx; +} + .sub-info { display: flex; justify-content: space-between; From fda403d6a96bb0415a98c8fa3b7f69c5343e6d1b Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 18 May 2026 05:57:47 -0700 Subject: [PATCH 12/13] fix: index page center-aligned layout for device card --- miniprogram/pages/index/index.wxml | 18 +++++------- miniprogram/pages/index/index.wxss | 44 ++++++++++++++---------------- 2 files changed, 27 insertions(+), 35 deletions(-) diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index 97b9c01..f67e3cf 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -18,18 +18,14 @@ - - 💆 - - {{deviceName || '我的光面膜'}} - - 已连接 - 未连接 - 🔋 {{battery}}% - - + 💆 + {{deviceName || '光子美容仪'}} + + 已连接 + 未连接 + 🔋 {{battery}}% - + diff --git a/miniprogram/pages/index/index.wxss b/miniprogram/pages/index/index.wxss index accaf34..3d78073 100644 --- a/miniprogram/pages/index/index.wxss +++ b/miniprogram/pages/index/index.wxss @@ -22,38 +22,31 @@ .device-card { background: #fff; border-radius: 16rpx; - padding: 28rpx; + padding: 36rpx 28rpx; + text-align: center; } -.device-card-top { - display: flex; - align-items: center; - gap: 20rpx; +.device-card-icon { + font-size: 80rpx; + margin-bottom: 12rpx; } -.device-icon { - font-size: 64rpx; - flex-shrink: 0; -} - -.device-info { - flex: 1; -} - -.device-name { - font-size: 32rpx; +.device-card-name { + font-size: 34rpx; font-weight: 600; color: #333; + margin-bottom: 16rpx; +} + +.device-card-status { + display: flex; + align-items: center; + justify-content: center; + gap: 16rpx; margin-bottom: 8rpx; } -.device-meta { - display: flex; - align-items: center; - gap: 16rpx; -} - -.device-battery-text { +.device-card-battery { font-size: 24rpx; color: #666; } @@ -61,7 +54,7 @@ .btn-reconnect { display: block; width: 100%; - margin-top: 20rpx; + margin-top: 24rpx; padding: 20rpx; background: #f5f5f5; color: #E6508C; @@ -91,6 +84,7 @@ padding: 24rpx; margin-top: 20rpx; } + .sub-info-left { display: flex; align-items: center; @@ -98,9 +92,11 @@ font-size: 28rpx; color: #333; } + .sub-info-icon { font-size: 32rpx; } + .sub-info-arrow { color: #999; font-size: 32rpx; From afcc8d12dee1ee2ba242d13cb336532693fa9468 Mon Sep 17 00:00:00 2001 From: Guoguo Date: Mon, 18 May 2026 06:04:25 -0700 Subject: [PATCH 13/13] =?UTF-8?q?fix:=20index=20page=20=E2=80=94=20no=20lo?= =?UTF-8?q?ading=20flash=20on=20tab=20switch,=20subscription=20always=20ta?= =?UTF-8?q?ppable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Loading animation only shows on first visit, subsequent onShow updates silently - Subscription row always navigates to plans page (was no-op when active) - Move devMode init to onLoad (only needs to run once) --- miniprogram/pages/index/index.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js index e2c707e..9a7ec4e 100644 --- a/miniprogram/pages/index/index.js +++ b/miniprogram/pages/index/index.js @@ -18,8 +18,11 @@ Page({ loading: true }, - onShow: function () { + onLoad: function () { this.setData({ devMode: config.__DEV__ || false }) + }, + + onShow: function () { this.checkState() this._onStatus = this.onBleStatus.bind(this) ble.on('status', this._onStatus) @@ -48,7 +51,8 @@ Page({ return } - self.setData({ connected: ble.isConnected(), loading: true }) + var isFirstLoad = self.data.loading + self.setData({ connected: ble.isConnected() }) var p1 = api.getDevices().then(function (data) { var devices = data.devices || [] @@ -74,7 +78,7 @@ Page({ }) Promise.all([p1, p2]).then(function () { - self.setData({ loading: false }) + if (isFirstLoad) self.setData({ loading: false }) }) }, @@ -180,8 +184,6 @@ Page({ }, onViewSubscription: function () { - if (!this.data.subscription || this.data.subscription.status !== 'active') { - wx.navigateTo({ url: '/pages/subscribe-plans/subscribe-plans' }) - } + wx.navigateTo({ url: '/pages/subscribe-plans/subscribe-plans' }) } })