zhy.he/jw-beauty
1
0
派生 0
代码 工单 合并请求 工作流 软件包 项目 发布 百科 活动

fix: comprehensive security, quality and consistency fixes

浏览代码 
Server:
- Block startup with default JWT secrets in production
- Make subscription verify admin-only (no payment integration yet)
- Add device ownership validation on command/result, event, treatment/sync
- Remove admin token from request body fallback
- Add pageParams boundary protection (pageSize capped at 100)
- Fix COS getObjectUrl to use callback-based Promise
- Add settings key whitelist matching frontend fields
- Add user existence check before subscription creation
- Fix firmware always returning has_update:true
- Replace hardcoded trial subscription with actual DB query
- Extract shared utilities (limitClause, toMysqlDate, formatDate)

Miniprogram:
- Replace fake PD random data with placeholder
- Mark client-timer treatment completions with source field
- Disable mock.js
- Fix BLE listener leaks (save refs, cleanup in onUnload)
- Fix ble.off clearing all listeners (pass specific callback)
- Add BLE disconnect detection via onBLEConnectionStateChange
- Fix subscription status type consistency (number not string)
- Fix scan callback accumulation in ble.js
- Fix history stats accumulation across pages
- Fix subscribe-success/treatment-done hardcoded values
- Fix profile subscription view logic
- Replace purchase flow with admin-contact modal
- Add error logging in command-sync report

Admin console:
- Fix AdminLayout logout (require->import, logout->clearToken)
- Remove all mock data from production request.js
- Replace dashboard fake data with real API calls
- Replace monthly_revenue with subscription_count
- Fix subscription stats fallback (|| -> ??)
- Add token expiry tracking (7 days)
- Unify device status map and subscription status text
- Fix user page record link navigation
- Fix subscription createForm.user_id type handling
- Add error feedback in all empty catch blocks
- Remove unused remember checkbox and uview-plus dependency
- Extract common CSS to shared stylesheet (-900 lines)
- Extract formatDate to shared utils/format.js
- Show real admin name in layout header
这个提交包含在：
Guoguo
2026-04-28 08:46:59 -07:00
父节点 543808b76e
当前提交 b80e872600
共修改 42 个文件，包含 495 行新增和 1216 行删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件
admin-console/package.json
-1
查看文件
@@ -13,7 +13,6 @@
"@dcloudio/uni-components": "3.0.0-4020920240930001",
"@dcloudio/uni-h5": "3.0.0-4020920240930001",
"pinia": "^2.1.0",
"uview-plus": "^3.2.0",
"vue": "^3.4.0"
},
"devDependencies": {
admin-console/src/components/AdminLayout.vue
+8 -3
查看文件
@@ -20,7 +20,7 @@
<view class="top-header">
<text class="header-title">{{ pageTitle }}</text>
<view class="header-right">
<text class="header-user">👤 管理员</text>
<text class="header-user">👤 {{ adminName }}</text>
<text class="header-logout" @click="onLogout">退出</text>
</view>
</view>
@@ -32,6 +32,8 @@
</template>
<script>
import { useUserStore } from '../store/user'
export default {
props: {
currentPage: { type: String, default: '' }
@@ -53,6 +55,10 @@ export default {
pageTitle() {
const item = this.menuItems.find(m => m.path === this.currentPage)
return item ? `${item.icon} ${item.label}` : '光子美容仪管理后台'
},
adminName() {
const store = useUserStore()
return (store.adminInfo && store.adminInfo.real_name) || '管理员'
}
},
methods: {
@@ -60,9 +66,8 @@ export default {
uni.redirectTo({ url: path })
},
onLogout() {
const { useUserStore } = require('../store/user')
const store = useUserStore()
store.logout()
store.clearToken()
uni.reLaunch({ url: '/pages/login/index' })
}
}
admin-console/src/config/env.js
+1
查看文件
@@ -1,5 +1,6 @@
const ENV = 'test'
// WARNING: Before deploying to production, replace the prod URL below with the real SCF endpoint.
const API_BASES = {
local: 'http://localhost:3000',
test: 'https://1426323813-ilxkhlxf4p.ap-guangzhou.tencentscf.com',
admin-console/src/pages/dashboard/index.vue
+35 -41
查看文件
@@ -5,25 +5,21 @@
<view class="stat-icon blue">📱</view>
<text class="stat-value">{{ stats.device_count || 0 }}</text>
<text class="stat-label">绑定设备数</text>
<text class="stat-trend blue-text">↑ 12%</text>
</view>
<view class="stat-card">
<view class="stat-icon green">👥</view>
<text class="stat-value">{{ stats.user_count || 0 }}</text>
<text class="stat-label">注册用户数</text>
<text class="stat-trend green-text">↑ 8%</text>
</view>
<view class="stat-card">
<view class="stat-icon pink">💆</view>
<text class="stat-value">{{ stats.treatment_count || 0 }}</text>
<text class="stat-label">护理次数</text>
<text class="stat-trend pink-text">↑ 15%</text>
</view>
<view class="stat-card">
<view class="stat-icon gold">💰</view>
<text class="stat-value">¥{{ stats.monthly_revenue || 0 }}</text>
<text class="stat-label">本月收入</text>
<text class="stat-trend gold-text">↑ 6%</text>
<view class="stat-icon gold">💳</view>
<text class="stat-value">{{ stats.subscription_count || 0 }}</text>
<text class="stat-label">活跃订阅</text>
</view>
</view>
@@ -46,17 +42,20 @@
</view>
<view class="t-body">
<view class="t-row" v-for="(item, idx) in recentTreatments" :key="idx">
<text class="t-td" style="flex:2">{{ item.user || '-' }}</text>
<text class="t-td" style="flex:2">{{ item.device || '-' }}</text>
<text class="t-td" style="flex:2">{{ item.nickname || item.user_id || '-' }}</text>
<text class="t-td" style="flex:2">{{ item.device_id || '-' }}</text>
<text class="t-td" style="flex:1">
<text class="badge badge-blue">✨ 智能模式</text>
</text>
<text class="t-td" style="flex:1">{{ item.duration || '-' }}</text>
<text class="t-td" style="flex:2">{{ item.time || '-' }}</text>
<text class="t-td" style="flex:1">{{ Math.floor((item.total_duration_ms || 0) / 60000) }}分</text>
<text class="t-td" style="flex:2">{{ formatDate(item.start_time || item.started_at) }}</text>
<text class="t-td" style="flex:1">
<text class="badge badge-success">进行中</text>
<text class="badge badge-success">已完成</text>
</text>
</view>
<view v-if="recentTreatments.length === 0" class="empty-state">
<text class="empty-text">暂无护理记录</text>
</view>
</view>
</view>
</view>
@@ -99,13 +98,7 @@ export default {
data() {
return {
stats: {},
recentTreatments: [
{ user: '张三', device: 'GBM-2026-001', duration: '15分', time: '2026-04-22 14:30' },
{ user: '李四', device: 'GBM-2026-023', duration: '10分', time: '2026-04-22 14:15' },
{ user: '王五', device: 'GBM-2026-045', duration: '20分', time: '2026-04-22 13:50' },
{ user: '赵六', device: 'GBM-2026-067', duration: '12分', time: '2026-04-22 13:30' },
{ user: '孙七', device: 'GBM-2026-089', duration: '18分', time: '2026-04-22 13:10' }
]
recentTreatments: []
}
},
onShow() {
@@ -115,7 +108,19 @@ export default {
async loadDashboard() {
try {
this.stats = await get('/api/v1/admin/dashboard')
} catch (e) {}
} catch (e) {
uni.showToast({ title: '加载失败', icon: 'none' })
}
try {
const data = await get('/api/v1/admin/records', { page: 1, page_size: 5 })
this.recentTreatments = data.records || []
} catch (e) {
this.recentTreatments = []
}
},
formatDate(d) {
if (!d) return '--'
return String(d).slice(0, 19).replace('T', ' ')
},
onNav(path) {
uni.redirectTo({ url: path })
@@ -181,27 +186,6 @@ export default {
color: #999;
}
.stat-trend {
font-size: 12px;
font-weight: 500;
}
.blue-text {
color: #1890ff;
}
.green-text {
color: #52c41a;
}
.pink-text {
color: #E6508C;
}
.gold-text {
color: #faad14;
}
.main-row {
display: flex;
gap: 16px;
@@ -330,4 +314,14 @@ export default {
font-size: 18px;
color: #999;
}
.empty-state {
padding: 24px 0;
text-align: center;
}
.empty-text {
font-size: 14px;
color: #999;
}
</style>
admin-console/src/pages/device-detail/index.vue
+4 -69
查看文件
@@ -102,6 +102,7 @@
<script>
import { get, post } from '../../utils/request'
import { formatDate as formatDateUtil } from '../../utils/format'
import AdminLayout from '../../components/AdminLayout.vue'
export default {
@@ -156,14 +157,14 @@ export default {
onCheckUpdate() {
uni.showToast({ title: '正在检查更新...', icon: 'none' })
},
formatDate(d) {
return d ? d.slice(0, 19).replace('T', ' ') : '-'
}
formatDate: formatDateUtil
}
}
</script>
<style scoped>
@import '../../styles/common.css';
.back-link {
color: #E6508C;
font-size: 14px;
@@ -171,13 +172,6 @@ export default {
cursor: pointer;
}
.page-card {
background: #fff;
border-radius: 8px;
padding: 20px;
margin-bottom: 16px;
}
.page-header {
display: flex;
justify-content: space-between;
@@ -226,62 +220,7 @@ export default {
margin-bottom: 16px;
}
.badge {
display: inline-block;
padding: 2px 8px;
border-radius: 4px;
font-size: 12px;
}
.badge-success {
background: #f6ffed;
color: #52c41a;
}
.badge-default {
background: #f5f5f5;
color: #999;
}
.data-table {
width: 100%;
}
.t-header {
background: #fafafa;
}
.t-row {
display: flex;
align-items: center;
padding: 12px 0;
border-bottom: 1px solid #f0f0f0;
}
.t-th {
font-size: 14px;
color: #666;
font-weight: 500;
}
.t-td {
font-size: 14px;
color: #333;
}
.flex1 {
flex: 1;
}
.flex2 {
flex: 2;
}
.btn-primary {
background: #E6508C;
color: #fff;
border: none;
border-radius: 6px;
padding: 0 20px;
height: 36px;
font-size: 14px;
@@ -289,10 +228,6 @@ export default {
}
.btn-default {
background: #fff;
color: #333;
border: 1px solid #d9d9d9;
border-radius: 6px;
padding: 0 20px;
height: 36px;
font-size: 14px;
admin-console/src/pages/device/index.vue
+7 -169
查看文件
@@ -61,6 +61,7 @@
<script>
import { get, post } from '../../utils/request'
import { exportCSV } from '../../utils/export'
import { formatDateShort } from '../../utils/format'
import AdminLayout from '../../components/AdminLayout.vue'
export default {
@@ -72,7 +73,7 @@ export default {
page: 1,
pageSize: 20,
keyword: '',
statusMap: { 1: '库存', 2: '在线', 3: '离线', 4: '故障' }
statusMap: { 1: '未激活', 2: '在线', 3: '离线', 4: '故障' }
}
},
computed: {
@@ -89,7 +90,9 @@ export default {
const data = await get('/api/v1/admin/devices', { page: this.page, page_size: this.pageSize, keyword: this.keyword })
this.devices = data.records || []
this.total = data.total || 0
} catch (e) {}
} catch (e) {
uni.showToast({ title: '加载失败', icon: 'none' })
}
},
onSearch() {
this.page = 1
@@ -124,9 +127,7 @@ export default {
const map = { 2: 'badge badge-success', 3: 'badge badge-warning', 1: 'badge badge-blue', 4: 'badge badge-error' }
return map[status] || 'badge badge-default'
},
formatDate(d) {
return d ? d.slice(0, 10) : '-'
},
formatDate: formatDateShort,
async onExport() {
try {
const data = await get('/api/v1/admin/devices', { page: 1, page_size: 9999, keyword: this.keyword })
@@ -147,172 +148,9 @@ export default {
</script>
<style scoped>
.toolbar {
background: #fff;
border-radius: 8px;
padding: 12px 20px;
margin-bottom: 16px;
display: flex;
justify-content: flex-end;
}
.header-actions {
display: flex;
align-items: center;
gap: 8px;
}
.page-card {
background: #fff;
border-radius: 8px;
padding: 20px;
}
.search-input {
width: 220px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 6px;
padding: 0 12px;
font-size: 14px;
box-sizing: border-box;
}
.input-placeholder {
color: #bfbfbf;
}
.btn-primary {
background: #E6508C;
color: #fff;
border: none;
border-radius: 6px;
cursor: pointer;
}
.btn-default {
background: #fff;
color: #333;
border: 1px solid #d9d9d9;
border-radius: 6px;
cursor: pointer;
}
.btn-sm {
height: 32px;
padding: 0 16px;
font-size: 14px;
line-height: 32px;
}
.data-table {
width: 100%;
}
.t-header {
background: #fafafa;
}
.t-row {
display: flex;
align-items: center;
padding: 12px 0;
border-bottom: 1px solid #f0f0f0;
}
.t-th {
font-size: 14px;
color: #666;
font-weight: 500;
}
.t-td {
font-size: 14px;
color: #333;
}
.flex1 {
flex: 1;
}
.flex2 {
flex: 2;
}
.badge {
display: inline-block;
padding: 2px 8px;
border-radius: 4px;
font-size: 12px;
}
.badge-success {
background: #f6ffed;
color: #52c41a;
}
.badge-warning {
background: #fffbe6;
color: #faad14;
}
.badge-error {
background: #fff2f0;
color: #ff4d4f;
}
.badge-default {
background: #f5f5f5;
color: #999;
}
.badge-blue {
background: #e6f7ff;
color: #1890ff;
}
.action-link {
color: #E6508C;
font-size: 14px;
margin-right: 12px;
cursor: pointer;
}
@import '../../styles/common.css';
.pagination {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 8px;
margin-top: 20px;
}
.btn-page {
width: 32px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 6px;
background: #fff;
color: #333;
font-size: 14px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
.btn-page.active {
background: #E6508C;
color: #fff;
border-color: #E6508C;
}
.btn-page[disabled] {
opacity: 0.4;
}
.page-info {
font-size: 13px;
color: #999;
margin-left: 8px;
}
</style>
admin-console/src/pages/log/index.vue
+6 -108
查看文件
@@ -41,6 +41,7 @@
<script>
import { get } from '../../utils/request'
import { exportCSV } from '../../utils/export'
import { formatDate as formatDateUtil } from '../../utils/format'
import AdminLayout from '../../components/AdminLayout.vue'
export default {
@@ -71,7 +72,9 @@ export default {
const data = await get('/api/v1/admin/logs', params)
this.logs = data.records || []
this.total = data.total || 0
} catch (e) {}
} catch (e) {
uni.showToast({ title: '加载失败', icon: 'none' })
}
},
onSearch() {
this.page = 1
@@ -96,9 +99,7 @@ export default {
if (type === 2) return 'actor-system'
return 'actor-user'
},
formatDate(d) {
return d ? d.slice(0, 19).replace('T', ' ') : '-'
},
formatDate: formatDateUtil,
async onExport() {
try {
var params = { page: 1, page_size: 9999 }
@@ -121,63 +122,7 @@ export default {
</script>
<style scoped>
.toolbar {
background: #fff;
border-radius: 8px;
padding: 12px 20px;
margin-bottom: 16px;
display: flex;
justify-content: flex-end;
}
.header-actions {
display: flex;
align-items: center;
gap: 8px;
}
.page-card {
background: #fff;
border-radius: 8px;
padding: 20px;
}
.search-input {
width: 220px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 6px;
padding: 0 12px;
font-size: 14px;
box-sizing: border-box;
}
.input-placeholder {
color: #bfbfbf;
}
.btn-primary {
background: #E6508C;
color: #fff;
border: none;
border-radius: 6px;
cursor: pointer;
}
.btn-default {
background: #fff;
color: #333;
border: 1px solid #d9d9d9;
border-radius: 6px;
cursor: pointer;
}
.btn-sm {
height: 32px;
padding: 0 16px;
font-size: 14px;
line-height: 32px;
}
@import '../../styles/common.css';
.log-list {
margin-top: 8px;
@@ -206,10 +151,6 @@ export default {
}
.badge {
display: inline-block;
padding: 2px 8px;
border-radius: 4px;
font-size: 12px;
width: fit-content;
}
@@ -218,11 +159,6 @@ export default {
color: #E6508C;
}
.badge-blue {
background: #e6f7ff;
color: #1890ff;
}
.badge-green {
background: #f6ffed;
color: #52c41a;
@@ -259,42 +195,4 @@ export default {
color: #333;
font-weight: 500;
}
.pagination {
display: flex;
align-items: center;
justify-content: center;
gap: 8px;
margin-top: 20px;
}
.btn-page {
width: 32px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 6px;
background: #fff;
color: #333;
font-size: 14px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
.btn-page.active {
background: #E6508C;
color: #fff;
border-color: #E6508C;
}
.btn-page[disabled] {
opacity: 0.4;
}
.page-info {
font-size: 13px;
color: #999;
margin-left: 8px;
}
</style>
admin-console/src/pages/login/index.vue
+2 -47
查看文件
@@ -26,15 +26,6 @@
/>
</view>
<view class="remember-row">
<view class="checkbox-wrap" @click="remember = !remember">
<view class="checkbox-box" :class="{ checked: remember }">
<text class="checkbox-icon" v-if="remember">✓</text>
</view>
<text class="remember-text">记住登录状态</text>
</view>
</view>
<button class="login-btn" :loading="loading" :disabled="loading" @click="onLogin">
登 录
</button>
@@ -51,8 +42,7 @@ export default {
data() {
return {
form: { username: 'admin', password: 'admin' },
loading: false,
remember: false
loading: false
}
},
methods: {
@@ -145,43 +135,8 @@ export default {
color: #bfbfbf;
}
.remember-row {
margin-bottom: 24px;
}
.checkbox-wrap {
display: flex;
align-items: center;
gap: 8px;
}
.checkbox-box {
width: 16px;
height: 16px;
border: 1px solid #d9d9d9;
border-radius: 3px;
display: flex;
align-items: center;
justify-content: center;
}
.checkbox-box.checked {
background: #E6508C;
border-color: #E6508C;
}
.checkbox-icon {
color: #fff;
font-size: 11px;
line-height: 16px;
}
.remember-text {
font-size: 14px;
color: #666;
}
.login-btn {
margin-top: 24px;
width: 100%;
height: 44px;
background: #E6508C;
admin-console/src/pages/record/index.vue
+6 -152
查看文件
@@ -64,6 +64,7 @@
<script>
import { get } from '../../utils/request'
import { exportCSV } from '../../utils/export'
import { formatDate as formatDateUtil } from '../../utils/format'
import AdminLayout from '../../components/AdminLayout.vue'
var REGION_MAP = {
@@ -105,7 +106,9 @@ export default {
const data = await get('/api/v1/admin/records', params)
this.records = data.records || []
this.total = data.total || 0
} catch (e) {}
} catch (e) {
uni.showToast({ title: '加载失败', icon: 'none' })
}
},
onSearch() {
this.page = 1
@@ -124,9 +127,7 @@ export default {
}
return names.join(',') || '-'
},
formatDate(d) {
return d ? d.slice(0, 10) : '-'
},
formatDate: formatDateUtil,
async onExport() {
try {
const data = await get('/api/v1/admin/records', { page: 1, page_size: 9999, keyword: this.keyword, date_from: this.dateFrom, date_to: this.dateTo })
@@ -152,35 +153,10 @@ export default {
</script>
<style scoped>
.toolbar {
background: #fff;
border-radius: 8px;
padding: 12px 20px;
margin-bottom: 16px;
display: flex;
justify-content: flex-end;
}
.header-actions {
display: flex;
align-items: center;
gap: 8px;
}
.page-card {
background: #fff;
border-radius: 8px;
padding: 20px;
}
@import '../../styles/common.css';
.search-input {
width: 160px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 6px;
padding: 0 12px;
font-size: 14px;
box-sizing: border-box;
}
.date-input {
@@ -191,126 +167,4 @@ export default {
color: #999;
font-size: 14px;
}
.input-placeholder {
color: #bfbfbf;
}
.btn-primary {
background: #E6508C;
color: #fff;
border: none;
border-radius: 6px;
cursor: pointer;
}
.btn-default {
background: #fff;
color: #333;
border: 1px solid #d9d9d9;
border-radius: 6px;
cursor: pointer;
}
.btn-sm {
height: 32px;
padding: 0 16px;
font-size: 14px;
line-height: 32px;
}
.data-table {
width: 100%;
}
.t-header {
background: #fafafa;
}
.t-row {
display: flex;
align-items: center;
padding: 12px 0;
border-bottom: 1px solid #f0f0f0;
}
.t-th {
font-size: 14px;
color: #666;
font-weight: 500;
}
.t-td {
font-size: 14px;
color: #333;
}
.flex1 {
flex: 1;
}
.flex2 {
flex: 2;
}
.badge {
display: inline-block;
padding: 2px 8px;
border-radius: 4px;
font-size: 12px;
}
.badge-blue {
background: #e6f7ff;
color: #1890ff;
}
.badge-warning {
background: #fffbe6;
color: #faad14;
}
.action-link {
color: #E6508C;
font-size: 14px;
cursor: pointer;
}
.pagination {
display: flex;
align-items: center;
justify-content: center;
gap: 8px;
margin-top: 20px;
}
.btn-page {
width: 32px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 6px;
background: #fff;
color: #333;
font-size: 14px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
.btn-page.active {
background: #E6508C;
color: #fff;
border-color: #E6508C;
}
.btn-page[disabled] {
opacity: 0.4;
}
.page-info {
font-size: 13px;
color: #999;
margin-left: 8px;
}
</style>
admin-console/src/pages/settings/index.vue
+3 -1
查看文件
@@ -136,7 +136,9 @@ export default {
if (data) {
Object.assign(this.settings, data)
}
} catch (e) {}
} catch (e) {
uni.showToast({ title: '加载失败', icon: 'none' })
}
},
async onSave() {
try {
admin-console/src/pages/subscription/index.vue
+11 -155
查看文件
@@ -9,19 +9,19 @@
<view class="page-card">
<view class="stats-row">
<view class="stat-item">
<text class="stat-value">{{ stats.monthly_count || 486 }}</text>
<text class="stat-value">{{ stats.monthly_count ?? 0 }}</text>
<text class="stat-label">月卡会员</text>
</view>
<view class="stat-item">
<text class="stat-value">{{ stats.yearly_count || 1258 }}</text>
<text class="stat-value">{{ stats.yearly_count ?? 0 }}</text>
<text class="stat-label">年卡会员</text>
</view>
<view class="stat-item">
<text class="stat-value">{{ stats.trial_count || 856 }}</text>
<text class="stat-value">{{ stats.trial_count ?? 0 }}</text>
<text class="stat-label">试用中</text>
</view>
<view class="stat-item">
<text class="stat-value">¥{{ stats.monthly_revenue || 45890 }}</text>
<text class="stat-value">¥{{ stats.monthly_revenue ?? 0 }}</text>
<text class="stat-label">本月收入</text>
</view>
</view>
@@ -103,6 +103,7 @@
<script>
import { get, post } from '../../utils/request'
import { exportCSV } from '../../utils/export'
import { formatDateShort } from '../../utils/format'
import AdminLayout from '../../components/AdminLayout.vue'
export default {
@@ -135,7 +136,9 @@ export default {
this.subscriptions = data.records || []
this.total = data.total || 0
if (data.stats) this.stats = data.stats
} catch (e) {}
} catch (e) {
uni.showToast({ title: '加载失败', icon: 'none' })
}
},
onTabFilter(tab) {
this.activeTab = tab
@@ -150,7 +153,7 @@ export default {
this.creating = true
try {
await post('/api/v1/admin/subscriptions', {
user_id: parseInt(this.createForm.user_id),
user_id: String(this.createForm.user_id).trim(),
plan: this.createForm.plan,
days: parseInt(this.createForm.days)
})
@@ -175,9 +178,7 @@ export default {
const map = { 1: 'badge badge-success', 2: 'badge badge-warning', 3: 'badge badge-error' }
return map[status] || 'badge badge-default'
},
formatDate(d) {
return d ? d.slice(0, 10) : '-'
},
formatDate: formatDateShort,
async onExport() {
try {
const data = await get('/api/v1/admin/subscriptions', { page: 1, page_size: 9999, tab: this.activeTab })
@@ -200,27 +201,7 @@ export default {
</script>
<style scoped>
.toolbar {
background: #fff;
border-radius: 8px;
padding: 12px 20px;
margin-bottom: 16px;
display: flex;
justify-content: flex-end;
}
.header-actions {
display: flex;
align-items: center;
gap: 8px;
}
.page-card {
background: #fff;
border-radius: 8px;
padding: 20px;
margin-bottom: 16px;
}
@import '../../styles/common.css';
.stats-row {
display: flex;
@@ -270,133 +251,8 @@ export default {
font-weight: 500;
}
.data-table {
width: 100%;
}
.t-header {
background: #fafafa;
}
.t-row {
display: flex;
align-items: center;
padding: 12px 0;
border-bottom: 1px solid #f0f0f0;
}
.t-th {
font-size: 14px;
color: #666;
font-weight: 500;
}
.t-td {
font-size: 14px;
color: #333;
}
.flex1 {
flex: 1;
}
.flex2 {
flex: 2;
}
.badge {
display: inline-block;
padding: 2px 8px;
border-radius: 4px;
font-size: 12px;
}
.badge-success {
background: #f6ffed;
color: #52c41a;
}
.badge-warning {
background: #fffbe6;
color: #faad14;
}
.badge-error {
background: #fff2f0;
color: #ff4d4f;
}
.badge-default {
background: #f5f5f5;
color: #999;
}
.action-link {
color: #E6508C;
font-size: 14px;
margin-right: 8px;
cursor: pointer;
}
.pagination {
display: flex;
align-items: center;
justify-content: center;
gap: 8px;
margin-top: 20px;
}
.btn-page {
width: 32px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 6px;
background: #fff;
color: #333;
font-size: 14px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
.btn-page.active {
background: #E6508C;
color: #fff;
border-color: #E6508C;
}
.btn-page[disabled] {
opacity: 0.4;
}
.page-info {
font-size: 13px;
color: #999;
margin-left: 8px;
}
.btn-primary {
background: #E6508C;
color: #fff;
border: none;
border-radius: 6px;
cursor: pointer;
}
.btn-default {
background: #fff;
color: #333;
border: 1px solid #d9d9d9;
border-radius: 6px;
cursor: pointer;
}
.btn-sm {
height: 32px;
padding: 0 16px;
font-size: 14px;
line-height: 32px;
}
.modal-mask {
admin-console/src/pages/user-detail/index.vue
+4 -67
查看文件
@@ -82,6 +82,7 @@
<script>
import { get } from '../../utils/request'
import { formatDateShort } from '../../utils/format'
import AdminLayout from '../../components/AdminLayout.vue'
export default {
@@ -118,14 +119,14 @@ export default {
const map = { yearly: '年卡', monthly: '月卡', trial: '试用' }
return map[type] || '-'
},
formatDate(d) {
return d ? d.slice(0, 10) : '-'
}
formatDate: formatDateShort
}
}
</script>
<style scoped>
@import '../../styles/common.css';
.back-link {
color: #E6508C;
font-size: 14px;
@@ -133,13 +134,6 @@ export default {
cursor: pointer;
}
.page-card {
background: #fff;
border-radius: 8px;
padding: 20px;
margin-bottom: 16px;
}
.page-header {
display: flex;
justify-content: space-between;
@@ -191,18 +185,9 @@ export default {
}
.badge {
display: inline-block;
padding: 2px 8px;
border-radius: 4px;
font-size: 12px;
margin-top: 4px;
}
.badge-success {
background: #f6ffed;
color: #52c41a;
}
.stats-row {
display: flex;
gap: 16px;
@@ -266,40 +251,6 @@ export default {
color: #333;
}
.data-table {
width: 100%;
}
.t-header {
background: #fafafa;
}
.t-row {
display: flex;
align-items: center;
padding: 12px 0;
border-bottom: 1px solid #f0f0f0;
}
.t-th {
font-size: 14px;
color: #666;
font-weight: 500;
}
.t-td {
font-size: 14px;
color: #333;
}
.flex1 {
flex: 1;
}
.flex2 {
flex: 2;
}
.view-all {
text-align: center;
margin-top: 16px;
@@ -311,18 +262,4 @@ export default {
cursor: pointer;
}
.btn-primary {
background: #E6508C;
color: #fff;
border: none;
border-radius: 6px;
cursor: pointer;
}
.btn-sm {
height: 32px;
padding: 0 16px;
font-size: 14px;
line-height: 32px;
}
</style>
admin-console/src/pages/user/index.vue
+11 -165
查看文件
@@ -44,7 +44,7 @@
<text class="t-td flex2">{{ formatDate(item.created_at) }}</text>
<text class="t-td flex1">
<text class="action-link" @click="onDetail(item.user_id)">详情</text>
<text class="action-link" @click="onDetail(item.user_id)">记录</text>
<text class="action-link" @click="onViewRecords(item.user_id)">记录</text>
</text>
</view>
</view>
@@ -63,6 +63,7 @@
<script>
import { get } from '../../utils/request'
import { exportCSV } from '../../utils/export'
import { formatDateShort } from '../../utils/format'
import AdminLayout from '../../components/AdminLayout.vue'
export default {
@@ -90,7 +91,9 @@ export default {
const data = await get('/api/v1/admin/users', { page: this.page, page_size: this.pageSize, keyword: this.keyword })
this.users = data.records || []
this.total = data.total || 0
} catch (e) {}
} catch (e) {
uni.showToast({ title: '加载失败', icon: 'none' })
}
},
onSearch() {
this.page = 1
@@ -103,8 +106,11 @@ export default {
onDetail(userId) {
uni.navigateTo({ url: '/pages/user-detail/index?user_id=' + userId })
},
onViewRecords(userId) {
uni.navigateTo({ url: '/pages/record/index?user_id=' + userId })
},
subStatusText(status) {
const map = { yearly: '年卡', monthly: '月卡', trial: '试用中', none: '未订阅' }
const map = { yearly: '年卡会员', monthly: '月卡会员', trial: '试用中', none: '未订阅' }
return map[status] || '未订阅'
},
subBadge(status) {
@@ -116,9 +122,7 @@ export default {
}
return map[status] || 'badge badge-default'
},
formatDate(d) {
return d ? d.slice(0, 10) : '-'
},
formatDate: formatDateShort,
async onExport() {
try {
const data = await get('/api/v1/admin/users', { page: 1, page_size: 9999, keyword: this.keyword })
@@ -139,97 +143,7 @@ export default {
</script>
<style scoped>
.toolbar {
background: #fff;
border-radius: 8px;
padding: 12px 20px;
margin-bottom: 16px;
display: flex;
justify-content: flex-end;
}
.header-actions {
display: flex;
align-items: center;
gap: 8px;
}
.page-card {
background: #fff;
border-radius: 8px;
padding: 20px;
}
.search-input {
width: 220px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 6px;
padding: 0 12px;
font-size: 14px;
box-sizing: border-box;
}
.input-placeholder {
color: #bfbfbf;
}
.btn-primary {
background: #E6508C;
color: #fff;
border: none;
border-radius: 6px;
cursor: pointer;
}
.btn-default {
background: #fff;
color: #333;
border: 1px solid #d9d9d9;
border-radius: 6px;
cursor: pointer;
}
.btn-sm {
height: 32px;
padding: 0 16px;
font-size: 14px;
line-height: 32px;
}
.data-table {
width: 100%;
}
.t-header {
background: #fafafa;
}
.t-row {
display: flex;
align-items: center;
padding: 12px 0;
border-bottom: 1px solid #f0f0f0;
}
.t-th {
font-size: 14px;
color: #666;
font-weight: 500;
}
.t-td {
font-size: 14px;
color: #333;
}
.flex1 {
flex: 1;
}
.flex2 {
flex: 2;
}
@import '../../styles/common.css';
.user-cell {
display: flex;
@@ -249,75 +163,7 @@ export default {
flex-shrink: 0;
}
.badge {
display: inline-block;
padding: 2px 8px;
border-radius: 4px;
font-size: 12px;
}
.badge-success {
background: #f6ffed;
color: #52c41a;
}
.badge-warning {
background: #fffbe6;
color: #faad14;
}
.badge-blue {
background: #e6f7ff;
color: #1890ff;
}
.badge-default {
background: #f5f5f5;
color: #999;
}
.action-link {
color: #E6508C;
font-size: 14px;
margin-right: 12px;
cursor: pointer;
}
.pagination {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 8px;
margin-top: 20px;
}
.btn-page {
width: 32px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 6px;
background: #fff;
color: #333;
font-size: 14px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
.btn-page.active {
background: #E6508C;
color: #fff;
border-color: #E6508C;
}
.btn-page[disabled] {
opacity: 0.4;
}
.page-info {
font-size: 13px;
color: #999;
margin-left: 8px;
}
</style>
admin-console/src/store/user.js
+9 -1
查看文件
@@ -9,12 +9,14 @@ export const useUserStore = defineStore('user', () => {
function setToken(val) {
token.value = val
uni.setStorageSync('admin_token', val)
uni.setStorageSync('admin_token_expiry', Date.now() + 7 * 24 * 3600 * 1000)
}
function clearToken() {
token.value = ''
adminInfo.value = null
uni.removeStorageSync('admin_token')
uni.removeStorageSync('admin_token_expiry')
}
async function login(credentials) {
@@ -30,7 +32,13 @@ export const useUserStore = defineStore('user', () => {
}
function isLoggedIn() {
return !!token.value
if (!token.value) return false
const expiry = uni.getStorageSync('admin_token_expiry') || 0
if (Date.now() > expiry) {
clearToken()
return false
}
return true
}
return { token, adminInfo, setToken, clearToken, login, isLoggedIn }
admin-console/src/styles/common.css
+173
查看文件
@@ -0,0 +1,173 @@
.data-table {
width: 100%;
}
.t-header {
background: #fafafa;
}
.t-row {
display: flex;
align-items: center;
padding: 12px 0;
border-bottom: 1px solid #f0f0f0;
}
.t-th {
font-size: 14px;
color: #666;
font-weight: 500;
}
.t-td {
font-size: 14px;
color: #333;
}
.flex1 {
flex: 1;
}
.flex2 {
flex: 2;
}
.flex3 {
flex: 3;
}
.badge {
display: inline-block;
padding: 2px 8px;
border-radius: 4px;
font-size: 12px;
}
.badge-success {
background: #f6ffed;
color: #52c41a;
}
.badge-warning {
background: #fffbe6;
color: #faad14;
}
.badge-error {
background: #fff2f0;
color: #ff4d4f;
}
.badge-default {
background: #f5f5f5;
color: #999;
}
.badge-blue {
background: #e6f7ff;
color: #1890ff;
}
.btn-primary {
background: #E6508C;
color: #fff;
border: none;
border-radius: 6px;
cursor: pointer;
}
.btn-default {
background: #fff;
color: #333;
border: 1px solid #d9d9d9;
border-radius: 6px;
cursor: pointer;
}
.btn-sm {
height: 32px;
padding: 0 16px;
font-size: 14px;
line-height: 32px;
}
.action-link {
color: #E6508C;
font-size: 14px;
margin-right: 12px;
cursor: pointer;
}
.pagination {
display: flex;
align-items: center;
justify-content: center;
gap: 8px;
margin-top: 20px;
}
.btn-page {
width: 32px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 6px;
background: #fff;
color: #333;
font-size: 14px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
.btn-page.active {
background: #E6508C;
color: #fff;
border-color: #E6508C;
}
.btn-page[disabled] {
opacity: 0.4;
}
.page-info {
font-size: 13px;
color: #999;
margin-left: 8px;
}
.page-card {
background: #fff;
border-radius: 8px;
padding: 20px;
margin-bottom: 16px;
}
.toolbar {
background: #fff;
border-radius: 8px;
padding: 12px 20px;
margin-bottom: 16px;
display: flex;
justify-content: flex-end;
}
.header-actions {
display: flex;
align-items: center;
gap: 8px;
}
.search-input {
width: 220px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 6px;
padding: 0 12px;
font-size: 14px;
box-sizing: border-box;
}
.input-placeholder {
color: #bfbfbf;
}
admin-console/src/utils/format.js
+9
查看文件
@@ -0,0 +1,9 @@
export function formatDate(d) {
if (!d) return '--'
return String(d).slice(0, 19).replace('T', ' ')
}
export function formatDateShort(d) {
if (!d) return '--'
return String(d).slice(0, 10)
}
admin-console/src/utils/request.js
-89
查看文件
@@ -1,97 +1,8 @@
import env from '../config/env'
const BASE_URL = env.API_BASE
const USE_MOCK = false
const MOCK_DATA = {
'/api/v1/admin/devices/AABBCCDDEEFF0011': {
device_id: 'AABBCCDDEEFF0011', bound_user: 'user_001', battery: 85, fw_version: '1.0.0',
activated_at: '2025-03-15T10:00:00Z', status: 2, total_usage: '45h', last_online: '2025-04-22T14:30:00Z',
binding_history: [
{ nickname: '张小姐', bound_at: '2025-03-15T10:00:00Z', unbound_at: null, status: 1 }
]
},
'/api/v1/admin/dashboard': {
device_count: 12,
user_count: 86,
treatment_count: 1234,
subscription_count: 52
},
'/api/v1/admin/devices': {
records: [
{ device_id: 'AABBCCDDEEFF0011', bound_user: 'user_001', battery: 85, fw_version: '1.0.0', activated_at: '2025-03-15T10:00:00Z', status: 2 },
{ device_id: '1122334455667788', bound_user: 'user_002', battery: 60, fw_version: '1.0.0', activated_at: '2025-03-20T14:00:00Z', status: 2 },
{ device_id: 'A1B2C3D4E5F60011', bound_user: null, battery: null, fw_version: '1.0.0', activated_at: '2025-03-10T08:00:00Z', status: 1 }
],
total: 3
},
'/api/v1/admin/users': {
records: [
{ _id: 'u1', openid: 'oXXXX1', nickname: '张小姐', phone: '138****1234', created_at: '2025-03-01T08:00:00Z', subscription_status: 'yearly' },
{ _id: 'u2', openid: 'oXXXX2', nickname: '李女士', phone: '139****5678', created_at: '2025-03-05T10:00:00Z', subscription_status: 'monthly' },
{ _id: 'u3', openid: 'oXXXX3', nickname: '王先生', phone: '137****9012', created_at: '2025-03-10T12:00:00Z', subscription_status: 'trial' }
],
total: 3
},
'/api/v1/admin/users/u1': {
_id: 'u1', openid: 'oXXXX1', nickname: '张小姐', phone: '138****1234',
created_at: '2025-03-01T08:00:00Z', subscription_type: 'yearly', subscription_status: 'active',
subscription_expire: '2026-03-01T08:00:00Z', treatment_count: 28, total_duration: '14h',
total_spent: 899, devices: [{ device_id: 'AABBCCDDEEFF0011', device_name: '我的光面膜' }],
recent_treatments: [
{ started_at: '2025-04-20T10:00:00Z', total_duration_ms: 1200000, device_id: 'AABBCCDDEEFF0011' },
{ started_at: '2025-04-18T09:00:00Z', total_duration_ms: 900000, device_id: 'AABBCCDDEEFF0011' }
]
},
'/api/v1/admin/subscriptions': {
records: [
{ id: 's1', user_id: 'user_001', plan: 'yearly', amount: 899, started_at: '2025-03-01T00:00:00Z', expired_at: '2026-03-01T00:00:00Z', status: 1 },
{ id: 's2', user_id: 'user_002', plan: 'monthly', amount: 99, started_at: '2025-04-01T00:00:00Z', expired_at: '2025-05-01T00:00:00Z', status: 1 },
{ id: 's3', user_id: 'user_003', plan: 'trial', amount: '-', started_at: '2025-03-10T00:00:00Z', expired_at: '2025-03-17T00:00:00Z', status: 3 }
],
total: 3,
stats: { monthly_count: 15, yearly_count: 30, trial_count: 7, monthly_revenue: 45890 }
},
'/api/v1/admin/records': {
records: [
{ started_at: '2025-04-20T10:00:00Z', total_duration_ms: 1200000, device_id: 'AABBCCDDEEFF0011', openid: 'oXXXX1' },
{ started_at: '2025-04-19T15:00:00Z', total_duration_ms: 900000, device_id: '1122334455667788', openid: 'oXXXX2' }
],
total: 2
},
'/api/v1/admin/logs': {
records: [
{ created_at: '2025-04-20T10:05:00Z', action: 'treatment_complete', detail: '用户张小姐完成护理', openid: 'oXXXX1' },
{ created_at: '2025-04-20T09:00:00Z', action: 'device_bind', detail: '设备AABBCCDDEEFF0011绑定', openid: 'oXXXX1' }
],
total: 2
}
}
function getMockData(url, data) {
if (url.includes('/api/v1/admin/login')) {
if (data && data.username === 'admin' && data.password === 'admin123') {
return { token: 'mock_token_admin', admin_id: 'admin_001', username: 'admin', real_name: '管理员', role: 'admin' }
}
throw { code: 1001, message: '用户名或密码错误' }
}
if (url.startsWith('/api/v1/admin/users/') && !url.includes('users?')) {
const id = url.split('/').pop()
return MOCK_DATA['/api/v1/admin/users/u1'] || { _id: id, nickname: '未知用户' }
}
for (const key of Object.keys(MOCK_DATA)) {
if (url.includes(key)) return MOCK_DATA[key]
}
return {}
}
function request(options) {
if (USE_MOCK) {
return new Promise(resolve => {
setTimeout(() => resolve(getMockData(options.url, options.data)), 200)
})
}
const token = uni.getStorageSync('admin_token')
return new Promise((resolve, reject) => {
miniprogram/config/env.js
+2 -1
查看文件
@@ -1,9 +1,10 @@
var ENV = 'test'
// !! RELEASE BLOCKER: Change ENV to 'prod' and replace prod URL before publishing !!
var API_BASES = {
local: 'http://localhost:3000',
test: 'https://1426323813-ilxkhlxf4p.ap-guangzhou.tencentscf.com',
prod: 'https://replace-with-scf-prod-url'
prod: 'https://replace-with-scf-prod-url' // TODO: replace with actual production SCF URL
}
module.exports = {
miniprogram/pages/auto-scan/auto-scan.js
+19 -15
查看文件
@@ -7,6 +7,7 @@ Page({
scanProgress: 0,
regions: 0x7F,
regionData: [],
timeout: false,
error: ''
},
@@ -21,42 +22,45 @@ Page({
startScan: function () {
var self = this
self.setData({ scanning: true, scanProgress: 0 })
self.setData({ scanning: true, scanProgress: 0, timeout: false })
var progressTimer = setInterval(function () {
this._progressTimer = setInterval(function () {
var p = self.data.scanProgress + 2
if (p > 98) p = 98
self.setData({ scanProgress: p })
}, 100)
ble.on('status', function (status) {
this._onStatus = function (status) {
if (status.mode_state === 0x01) {
self.setData({ scanProgress: 50 })
} else if (status.mode_state === 0x04 || status.mode_state === 0x00) {
clearInterval(progressTimer)
clearInterval(self._progressTimer)
self.setData({ scanning: false, scanProgress: 100 })
if (status.region_mask) {
self.parseScanResults(status)
var names = ble.getRegionName(status.region_mask || 0x7F)
self.setData({ regionData: self.parseScanResults(names) })
}
}
})
ble.on('status', this._onStatus)
ble.queryStatus().catch(function () {})
setTimeout(function () {
clearInterval(progressTimer)
clearInterval(self._progressTimer)
if (!self.data.scanning) return
self.setData({ scanning: false, scanProgress: 100 })
self.parseScanResults({ region_mask: self.data.regions })
self.setData({ scanning: false, timeout: true })
wx.showToast({ title: '扫描超时，请重试', icon: 'none' })
}, 5000)
},
parseScanResults: function (status) {
var regions = ble.getRegionName(status.region_mask || 0x7F)
var data = regions.map(function (name) {
return { region: name, pd: (Math.random() * 0.3 + 0.3).toFixed(2) }
parseScanResults: function (regions) {
return regions.map(function (name) {
return { region: name, pd: '--' }
})
this.setData({ regionData: data })
},
onUnload: function () {
if (this._progressTimer) clearInterval(this._progressTimer)
if (this._onStatus) ble.off('status', this._onStatus)
},
onNext: function () {
miniprogram/pages/ble-connect/ble-connect.js
+4 -2
查看文件
@@ -24,6 +24,7 @@ Page({
onUnload: function () {
clearTimeout(this._scanTimer)
ble.stopScan()
if (this._onBindResult) ble.off('bind_result', this._onBindResult)
},
startBleConnect: function () {
@@ -55,7 +56,7 @@ Page({
doBind: function () {
var self = this
var userId = app.globalData.userId || ''
ble.on('bind_result', function (result) {
this._onBindResult = function (result) {
if (result.success) {
http.post('/api/v1/device/bind/confirm', {
device_id: self.data.deviceId,
@@ -71,7 +72,8 @@ Page({
} else {
self.setData({ state: 'error', error: '设备绑定失败' })
}
})
}
ble.on('bind_result', this._onBindResult)
ble.bindDevice(userId, self.data.bindToken).catch(function (err) {
self.setData({ state: 'error', error: err.error_msg || '绑定命令失败' })
miniprogram/pages/history/history.js
+7 -3
查看文件
@@ -6,6 +6,7 @@ Page({
records: [],
total: 0,
totalHours: 0,
totalMs: 0,
monthCount: 0,
page: 1,
pageSize: 20,
@@ -43,14 +44,14 @@ Page({
page: page,
page_size: self.data.pageSize
}).then(function (data) {
var totalMs = 0
var pageMs = 0
var now = new Date()
var monthStart = new Date(now.getFullYear(), now.getMonth(), 1)
var monthCount = 0
var monthCount = refresh ? 0 : self.data.monthCount
var records = (data.records || []).map(function (r) {
var durationMin = Math.floor((r.total_duration_ms || 0) / 60000)
totalMs += (r.total_duration_ms || 0)
pageMs += (r.total_duration_ms || 0)
r.duration_text = durationMin + '分钟'
r.region_names = ble.getRegionName(r.regions || 0).join('、')
r.wavelength_name = ble.getWavelengthName(r.wavelength || 2)
@@ -62,9 +63,12 @@ Page({
return r
})
var totalMs = refresh ? pageMs : self.data.totalMs + pageMs
self.setData({
records: refresh ? records : self.data.records.concat(records),
total: data.total || 0,
totalMs: totalMs,
totalHours: Math.round(totalMs / 3600000),
monthCount: monthCount,
page: page,
miniprogram/pages/index/index.js
+11 -3
查看文件
@@ -17,15 +17,23 @@ Page({
onShow: function () {
this.checkState()
ble.on('status', this.onBleStatus.bind(this))
this._onStatus = this.onBleStatus.bind(this)
ble.on('status', this._onStatus)
},
_cleanup: function () {
if (this._onStatus) {
ble.off('status', this._onStatus)
this._onStatus = null
}
},
onHide: function () {
ble.off('status')
this._cleanup()
},
onUnload: function () {
ble.off('status')
this._cleanup()
},
checkState: function () {
miniprogram/pages/profile/profile.js
+6 -1
查看文件
@@ -38,7 +38,12 @@ Page({
if (!this.data.subscription || this.data.subscription.status === 0) {
wx.navigateTo({ url: '/pages/subscribe-plans/subscribe-plans' })
} else {
wx.navigateTo({ url: '/pages/subscribe-prompt/subscribe-prompt' })
var sub = this.data.subscription
wx.showModal({
title: '订阅信息',
content: '套餐类型：' + (sub.plan_type || '未知') + '\n剩余天数：' + (sub.remaining_days || 0) + '天',
showCancel: false
})
}
},
miniprogram/pages/subscribe-plans/subscribe-plans.js
+4 -21
查看文件
@@ -21,27 +21,10 @@ Page({
},
onPurchase: function () {
var self = this
if (!self.data.selected) {
wx.showToast({ title: '请选择套餐', icon: 'none' })
return
}
self.setData({ purchasing: true })
http.post('/api/v1/subscription/purchase', {
plan_type: self.data.selected,
payment_method: 'wechat'
}).then(function (data) {
return http.post('/api/v1/subscription/verify', {
order_id: data.order_id,
plan_type: self.data.selected
})
}).then(function () {
self.setData({ purchasing: false })
wx.redirectTo({ url: '/pages/subscribe-success/subscribe-success' })
}).catch(function () {
self.setData({ purchasing: false })
wx.showToast({ title: '购买失败', icon: 'none' })
wx.showModal({
title: '暂未开放',
content: '在线购买功能尚未开放，请联系管理员开通订阅。',
showCancel: false
})
}
})
miniprogram/pages/subscribe-success/subscribe-success.js
+11 -3
查看文件
@@ -5,15 +5,23 @@ Page({
expiryDate: ''
},
onLoad: function () {
onLoad: function (options) {
var app = getApp()
this.setData({ statusBarHeight: app.globalData.statusBarHeight })
var planMap = { yearly: '年卡会员', monthly: '月卡会员', trial: '试用会员' }
var durationMap = { yearly: 365, monthly: 30, trial: 7 }
var plan = options.plan || 'yearly'
var now = new Date()
now.setFullYear(now.getFullYear() + 1)
now.setDate(now.getDate() + (durationMap[plan] || 365))
var y = now.getFullYear()
var m = ('0' + (now.getMonth() + 1)).slice(-2)
var d = ('0' + now.getDate()).slice(-2)
this.setData({ expiryDate: y + '年' + m + '月' + d + '日' })
this.setData({
planName: planMap[plan] || '会员',
expiryDate: y + '年' + m + '月' + d + '日'
})
},
onStartSmart: function () {
miniprogram/pages/treating/treating.js
+17 -12
查看文件
@@ -16,7 +16,6 @@ Page({
paused: false,
completed: false,
startedAt: 0,
localTimer: null
},
onLoad: function (options) {
@@ -31,18 +30,21 @@ Page({
startedAt: Date.now()
})
ble.on('status', this.onStatus.bind(this))
ble.on('treatment_complete', this.onComplete.bind(this))
ble.on('exception', this.onException.bind(this))
this._onStatus = this.onStatus.bind(this)
this._onComplete = this.onComplete.bind(this)
this._onException = this.onException.bind(this)
ble.on('status', this._onStatus)
ble.on('treatment_complete', this._onComplete)
ble.on('exception', this._onException)
this.startLocalTimer()
this.syncCommands()
},
onUnload: function () {
ble.off('status')
ble.off('treatment_complete')
ble.off('exception')
if (this.data.localTimer) clearInterval(this.data.localTimer)
if (this._onStatus) ble.off('status', this._onStatus)
if (this._onComplete) ble.off('treatment_complete', this._onComplete)
if (this._onException) ble.off('exception', this._onException)
if (this._localTimer) clearInterval(this._localTimer)
},
startLocalTimer: function () {
@@ -57,7 +59,7 @@ Page({
self.finishAsComplete()
}
}, 1000)
this.setData({ localTimer: timer })
this._localTimer = timer
},
updateProgress: function (remaining) {
@@ -95,12 +97,14 @@ Page({
var app = getApp()
app.globalData.currentTreatment = result
var self = this
setTimeout(function () {
wx.redirectTo({
url: '/pages/treatment-done/treatment-done?session_id=' + result.session_id +
'&regions=' + result.regions +
'&duration=' + result.total_duration_ms +
'&avg_pd=' + result.avg_pd
'&avg_pd=' + result.avg_pd +
'&mode=' + (self.data.mode || 0)
})
}, 1000)
},
@@ -108,10 +112,11 @@ Page({
finishAsComplete: function () {
var elapsed = Math.min(this.data.duration, Date.now() - this.data.startedAt)
this.onComplete({
session_id: 'SESS' + Date.now(),
session_id: 'LOCAL_' + Date.now(),
regions: this.data.regions,
total_duration_ms: elapsed,
avg_pd: 0
avg_pd: 0,
source: 'client_timer'
})
},
miniprogram/pages/treatment-done/treatment-done.js
+6 -2
查看文件
@@ -9,6 +9,7 @@ Page({
regions: 0,
duration: 0,
avgPd: 0,
mode: 0,
durationText: '',
regionNames: [],
syncing: false,
@@ -34,6 +35,7 @@ Page({
duration: durationMs,
avgPd: options.avg_pd || 0,
durationText: durationText,
mode: parseInt(options.mode) || 0,
regionNames: ble.getRegionName(parseInt(options.regions) || 0)
})
@@ -42,6 +44,7 @@ Page({
syncRecord: function () {
var self = this
var treatment = (app.globalData.currentTreatment) || {}
self.setData({ syncing: true })
http.post('/api/v1/treatment/sync', {
@@ -51,8 +54,9 @@ Page({
end_time: new Date().toISOString(),
regions: self.data.regions,
total_duration_ms: self.data.duration,
mode: 0,
avg_pd: self.data.avgPd
mode: self.data.mode,
avg_pd: self.data.avgPd,
source: treatment.source || 'device'
}).then(function () {
self.setData({ syncing: false, synced: true })
}).catch(function () {
miniprogram/pages/treatment-setup/treatment-setup.js
+1 -1
查看文件
@@ -29,7 +29,7 @@ Page({
var self = this
http.get('/api/v1/subscription').then(function (sub) {
self.setData({
subExpired: sub.status !== 'active',
subExpired: sub.status !== 1,
subDays: sub.remaining_days || 0
})
}).catch(function () {})
miniprogram/pages/wear-check/wear-check.js
+8 -2
查看文件
@@ -21,20 +21,26 @@ Page({
var self = this
self.setData({ checking: true, result: null, error: '' })
ble.on('status', function (status) {
if (this._onStatus) ble.off('status', this._onStatus)
this._onStatus = function (status) {
self.setData({ checking: false })
if (status.bind_status === 1) {
self.setData({ result: 'ok' })
} else {
self.setData({ result: 'fail', error: '请确认设备已正确佩戴' })
}
})
}
ble.on('status', this._onStatus)
ble.queryStatus().catch(function (err) {
self.setData({ checking: false, result: 'fail', error: err.error_msg || '查询失败' })
})
},
onUnload: function () {
if (this._onStatus) ble.off('status', this._onStatus)
},
onNext: function () {
wx.navigateTo({ url: '/pages/treatment-setup/treatment-setup' })
},
miniprogram/services/ble.js
+8
查看文件
@@ -289,6 +289,7 @@ function startScan(callbacks) {
wx.startBluetoothDevicesDiscovery({
allowDuplicatesKey: false,
success: function () {
wx.offBluetoothDeviceFound()
wx.onBluetoothDeviceFound(function (res) {
var devices = res.devices || []
for (var i = 0; i < devices.length; i++) {
@@ -555,6 +556,13 @@ function disconnect() {
wx.closeBluetoothAdapter({})
}
wx.onBLEConnectionStateChange(function (res) {
if (!res.connected) {
_connected = false
emit('disconnected', { deviceId: res.deviceId })
}
})
function getRegionName(mask) {
var names = []
var bits = [
miniprogram/services/command-sync.js
+1 -1
查看文件
@@ -36,7 +36,7 @@ function report(command, success, result) {
success: success,
opcode: command.opcode,
result: result || null
}).catch(function () {})
}).catch(function (err) { console.error('[command-sync] report failed:', err) })
}
function runOne(command) {
miniprogram/utils/mock.js
+1 -1
查看文件
@@ -141,5 +141,5 @@ function handle(method, path, data) {
module.exports = {
handle: handle,
MOCK_TOKEN: MOCK_TOKEN,
enabled: true
enabled: false
}
server/src/config.js
+5
查看文件
@@ -32,4 +32,9 @@ const config = {
}
}
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')
}
module.exports = config
server/src/lib/auth.js
+1 -1
查看文件
@@ -38,7 +38,7 @@ async function requireUser(ctx) {
}
async function requireAdmin(ctx) {
const token = readBearer(ctx.headers) || (ctx.body && ctx.body.token)
const token = readBearer(ctx.headers)
if (!token) return null
try {
const payload = jwt.verify(token, config.jwt.adminSecret)
server/src/lib/cos.js
+7 -2
查看文件
@@ -14,12 +14,17 @@ function getClient() {
}
function getObjectUrl(key, expiresSeconds) {
return getClient().getObjectUrl({
return new Promise((resolve, reject) => {
getClient().getObjectUrl({
Bucket: config.cos.bucket,
Region: config.cos.region,
Key: key,
Sign: true,
Expires: expiresSeconds || 600
Expires: expiresSeconds || 3600
}, (err, data) => {
if (err) reject(err)
else resolve(data.Url)
})
})
}
server/src/lib/db.js
+5 -1
查看文件
@@ -45,4 +45,8 @@ async function transaction(work) {
}
}
module.exports = { getPool, query, one, transaction }
function limitClause(pageSize, offset) {
return ' LIMIT ' + Number(pageSize) + ' OFFSET ' + Number(offset)
}
module.exports = { getPool, query, one, transaction, limitClause }
server/src/lib/utils.js
+12
查看文件
@@ -0,0 +1,12 @@
function toMysqlDate(value) {
if (!value) return null
const d = new Date(value)
if (Number.isNaN(d.getTime())) return null
return d.toISOString().slice(0, 19).replace('T', ' ')
}
function formatDate(date) {
return toMysqlDate(date)
}
module.exports = { toMysqlDate, formatDate }
server/src/routes/admin.js
+33 -34
查看文件
@@ -1,23 +1,14 @@
const { one, query } = require('../lib/db')
const { one, query, limitClause } = require('../lib/db')
const { ok, fail } = require('../lib/response')
const { hashPassword, signAdmin, requireAdmin } = require('../lib/auth')
const { writeLog } = require('../lib/log')
function pageParams(ctx) {
const page = Math.max(1, parseInt(ctx.query.page || ctx.body.page, 10) || 1)
const pageSize = Math.min(Math.max(1, parseInt(ctx.query.page_size || ctx.body.page_size, 10) || 20), 100)
const page = Math.max(1, parseInt(ctx.query.page, 10) || 1)
const pageSize = Math.min(Math.max(1, parseInt(ctx.query.page_size, 10) || 20), 100)
return { page, pageSize, offset: (page - 1) * pageSize }
}
function limitClause(p) {
return ' LIMIT ' + Number(p.pageSize) + ' OFFSET ' + Number(p.offset)
}
async function adminOnly(ctx) {
const admin = await requireAdmin(ctx)
return admin
}
function register(router) {
router.post('/api/v1/admin/login', async ctx => {
const username = ctx.body.username || ''
@@ -30,7 +21,7 @@ function register(router) {
})
router.get('/api/v1/admin/dashboard', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const rows = await Promise.all([
query('SELECT COUNT(*) AS total FROM devices', {}),
@@ -42,16 +33,16 @@ function register(router) {
})
router.get('/api/v1/admin/devices', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const p = pageParams(ctx)
const total = await query('SELECT COUNT(*) AS total FROM devices', {})
const records = await query('SELECT d.*, b.user_id AS bound_user, b.bind_time AS activated_at FROM devices d LEFT JOIN bindings b ON b.device_id = d.device_id AND b.bind_status = 1 ORDER BY d.created_at DESC' + limitClause(p), {})
const records = await query('SELECT d.*, b.user_id AS bound_user, b.bind_time AS activated_at FROM devices d LEFT JOIN bindings b ON b.device_id = d.device_id AND b.bind_status = 1 ORDER BY d.created_at DESC' + limitClause(p.pageSize, p.offset), {})
return ok({ records, total: total[0].total })
})
router.post('/api/v1/admin/devices', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const deviceId = String(ctx.body.device_id || '').trim()
if (!deviceId) return fail(2001, 'device_id required')
@@ -70,7 +61,7 @@ function register(router) {
})
router.get('/api/v1/admin/devices/:device_id', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const device = await one('SELECT d.*, b.user_id AS bound_user, b.bind_time AS activated_at FROM devices d LEFT JOIN bindings b ON b.device_id = d.device_id AND b.bind_status = 1 WHERE d.device_id = :device_id', { device_id: ctx.params.device_id })
if (!device) return fail(1005, 'DEVICE_NOT_FOUND')
@@ -78,7 +69,7 @@ function register(router) {
})
router.post('/api/v1/admin/devices/:device_id/unbind', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
await query('UPDATE bindings SET bind_status = 2, unbind_time = NOW() WHERE device_id = :device_id AND bind_status = 1', { device_id: ctx.params.device_id })
await writeLog({ admin_id: admin.admin_id, action: 'admin_device_unbind', detail: '后台解绑设备: ' + ctx.params.device_id, ip: ctx.ip })
@@ -86,7 +77,7 @@ function register(router) {
})
router.post('/api/v1/admin/devices/:device_id/command', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const opcode = parseInt(ctx.body.opcode, 10)
if (!opcode) return fail(2001, 'opcode required')
@@ -99,28 +90,28 @@ function register(router) {
})
router.get('/api/v1/admin/devices/:device_id/commands', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const p = pageParams(ctx)
const total = await query('SELECT COUNT(*) AS total FROM device_commands WHERE device_id = :device_id', { device_id: ctx.params.device_id })
const records = await query(
'SELECT command_id, device_id, admin_id, opcode, payload_json, status, created_at, pulled_at, finished_at, result_json FROM device_commands WHERE device_id = :device_id ORDER BY created_at DESC' + limitClause(p),
'SELECT command_id, device_id, admin_id, opcode, payload_json, status, created_at, pulled_at, finished_at, result_json FROM device_commands WHERE device_id = :device_id ORDER BY created_at DESC' + limitClause(p.pageSize, p.offset),
{ device_id: ctx.params.device_id }
)
return ok({ records, total: total[0].total })
})
router.get('/api/v1/admin/users', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const p = pageParams(ctx)
const total = await query('SELECT COUNT(*) AS total FROM users', {})
const records = await query('SELECT * FROM users ORDER BY created_at DESC' + limitClause(p), {})
const records = await query('SELECT * FROM users ORDER BY created_at DESC' + limitClause(p.pageSize, p.offset), {})
return ok({ records, total: total[0].total })
})
router.get('/api/v1/admin/users/:user_id', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const user = await one('SELECT * FROM users WHERE user_id = :user_id', { user_id: ctx.params.user_id })
if (!user) return fail(1004, 'USER_NOT_FOUND')
@@ -130,17 +121,19 @@ function register(router) {
})
router.get('/api/v1/admin/subscriptions', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const p = pageParams(ctx)
const total = await query('SELECT COUNT(*) AS total FROM subscriptions', {})
const records = await query('SELECT * FROM subscriptions ORDER BY created_at DESC' + limitClause(p), {})
const records = await query('SELECT * FROM subscriptions ORDER BY created_at DESC' + limitClause(p.pageSize, p.offset), {})
return ok({ records, total: total[0].total })
})
router.post('/api/v1/admin/subscriptions', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const targetUser = await one('SELECT user_id FROM users WHERE user_id = :user_id', { user_id: ctx.body.user_id })
if (!targetUser) return fail(1004, 'user_not_found')
await query('INSERT INTO subscriptions (user_id, plan, status, amount, order_id, start_time, expire_time) VALUES (:user_id, :plan, 1, :amount, :order_id, NOW(), DATE_ADD(NOW(), INTERVAL :days DAY))', {
user_id: ctx.body.user_id,
plan: ctx.body.plan || 'monthly',
@@ -152,38 +145,44 @@ function register(router) {
})
router.get('/api/v1/admin/records', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const p = pageParams(ctx)
const total = await query('SELECT COUNT(*) AS total FROM treatment_records', {})
const records = await query('SELECT * FROM treatment_records ORDER BY created_at DESC' + limitClause(p), {})
const records = await query('SELECT * FROM treatment_records ORDER BY created_at DESC' + limitClause(p.pageSize, p.offset), {})
return ok({ records, total: total[0].total })
})
router.get('/api/v1/admin/logs', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const p = pageParams(ctx)
const total = await query('SELECT COUNT(*) AS total FROM operation_logs', {})
const records = await query('SELECT * FROM operation_logs ORDER BY created_at DESC' + limitClause(p), {})
const records = await query('SELECT * FROM operation_logs ORDER BY created_at DESC' + limitClause(p.pageSize, p.offset), {})
return ok({ records, total: total[0].total })
})
router.get('/api/v1/admin/settings', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const rows = await query('SELECT setting_key, setting_value FROM system_settings', {})
const settings = {}
rows.forEach(row => {
settings[row.setting_key] = typeof row.setting_value === 'string' ? JSON.parse(row.setting_value) : row.setting_value
if (typeof row.setting_value === 'string') {
try { settings[row.setting_key] = JSON.parse(row.setting_value) } catch (_) { settings[row.setting_key] = row.setting_value }
} else {
settings[row.setting_key] = row.setting_value
}
})
return ok(settings)
})
router.post('/api/v1/admin/settings', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const ALLOWED_KEYS = ['system_name', 'admin_email', 'timezone', 'monthly_price', 'yearly_price', 'trial_days', 'enable_register', 'enable_binding', 'enable_free_mode', 'enable_smart_mode', 'maintenance_mode']
for (const key of Object.keys(ctx.body || {})) {
if (!ALLOWED_KEYS.includes(key)) continue
await query('REPLACE INTO system_settings (setting_key, setting_value) VALUES (:setting_key, :setting_value)', { setting_key: key, setting_value: JSON.stringify(ctx.body[key]) })
}
return ok({ message: 'success' })
server/src/routes/device.js
+9 -6
查看文件
@@ -2,10 +2,7 @@ const { one, query, transaction } = require('../lib/db')
const { ok, fail } = require('../lib/response')
const { requireUser, randomHex } = require('../lib/auth')
const { writeLog } = require('../lib/log')
function formatDate(date) {
return date.toISOString().slice(0, 19).replace('T', ' ')
}
const { formatDate } = require('../lib/utils')
async function ensureTrial(conn, userId) {
const [subs] = await conn.execute('SELECT subscription_id FROM subscriptions WHERE user_id = ? AND status = 1 AND expire_time > NOW() LIMIT 1', [userId])
@@ -40,7 +37,8 @@ function register(router) {
if (result.invalid) return fail(1005, 'DEVICE_NOT_FOUND')
if (result.duplicated) return fail(2001, '已绑定设备', { device_id: result.device_id })
await writeLog({ user_id: user.user_id, action: 'device_bind_request', detail: '申请绑定设备: ' + deviceId, ip: ctx.ip })
return ok(Object.assign(result, { subscription: { plan: 'trial', remaining_days: 7 } }))
const sub = await one('SELECT plan, GREATEST(DATEDIFF(expire_time, NOW()), 0) AS remaining_days FROM subscriptions WHERE user_id = :user_id AND status = 1 AND expire_time > NOW() ORDER BY expire_time DESC LIMIT 1', { user_id: user.user_id })
return ok(Object.assign(result, { subscription: sub ? { plan: sub.plan, remaining_days: sub.remaining_days } : { plan: 'none', remaining_days: 0 } }))
})
router.post('/api/v1/device/bind/confirm', async ctx => {
@@ -62,7 +60,8 @@ function register(router) {
})
if (!updated) return fail(2001, 'bind_token invalid or expired')
await writeLog({ user_id: user.user_id, action: 'device_bind_confirm', detail: '确认绑定设备: ' + deviceId, ip: ctx.ip })
return ok({ message: 'success', subscription: { plan: 'trial', remaining_days: 7 } })
const sub = await one('SELECT plan, GREATEST(DATEDIFF(expire_time, NOW()), 0) AS remaining_days FROM subscriptions WHERE user_id = :user_id AND status = 1 AND expire_time > NOW() ORDER BY expire_time DESC LIMIT 1', { user_id: user.user_id })
return ok({ message: 'success', subscription: sub ? { plan: sub.plan, remaining_days: sub.remaining_days } : { plan: 'none', remaining_days: 0 } })
})
router.post('/api/v1/device/unbind', async ctx => {
@@ -107,6 +106,8 @@ function register(router) {
const commandId = parseInt(ctx.body.command_id || ctx.body.seq, 10)
const success = ctx.body.success !== false
if (!commandId) return fail(2001, 'command_id required')
const cmd = await one('SELECT dc.command_id FROM device_commands dc JOIN bindings b ON b.device_id = dc.device_id AND b.user_id = :user_id AND b.bind_status = 1 WHERE dc.command_id = :command_id', { user_id: user.user_id, command_id: commandId })
if (!cmd) return fail(1006, 'device_not_bound')
await query('UPDATE device_commands SET status = :status, finished_at = NOW(), result_json = :result_json WHERE command_id = :command_id', {
command_id: commandId,
status: success ? 3 : 4,
@@ -131,6 +132,8 @@ function register(router) {
if (!user) return fail(1001, 'invalid_token')
const deviceId = String(ctx.body.device_id || '').trim()
if (!deviceId) return fail(2001, 'device_id required')
const binding = await one('SELECT binding_id FROM bindings WHERE user_id = :user_id AND device_id = :device_id AND bind_status = 1', { user_id: user.user_id, device_id: deviceId })
if (!binding) return fail(1006, 'device_not_bound')
await query(
'INSERT INTO device_events (device_id, user_id, event_type, error_code, temperature, payload_json) VALUES (:device_id, :user_id, :event_type, :error_code, :temperature, :payload_json)',
{
server/src/routes/firmware.js
+6 -8
查看文件
@@ -4,20 +4,16 @@ const { requireUser, requireAdmin } = require('../lib/auth')
const { getObjectUrl } = require('../lib/cos')
const { writeLog } = require('../lib/log')
function adminOnly(ctx) {
return requireAdmin(ctx)
}
function register(router) {
router.get('/api/v1/admin/firmware', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const rows = await query('SELECT firmware_id, version, device_type, cos_key, size_bytes, sha256, status, created_at FROM firmware_files ORDER BY created_at DESC', {})
return ok({ records: rows, total: rows.length })
})
router.post('/api/v1/admin/firmware', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const version = String(ctx.body.version || '').trim()
const cosKey = String(ctx.body.cos_key || '').trim()
@@ -38,7 +34,7 @@ function register(router) {
})
router.post('/api/v1/admin/firmware/:firmware_id/status', async ctx => {
const admin = await adminOnly(ctx)
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const firmwareId = parseInt(ctx.params.firmware_id, 10)
const status = Number(ctx.body.status) === 1 ? 1 : 0
@@ -53,12 +49,14 @@ function register(router) {
if (!user) return fail(1001, 'invalid_token')
const firmware = await one('SELECT * FROM firmware_files WHERE status = 1 ORDER BY created_at DESC LIMIT 1', {})
if (!firmware) return ok({ has_update: false })
const currentVersion = ctx.query.current_version || ''
if (currentVersion && currentVersion === firmware.version) return ok({ has_update: false })
return ok({
has_update: true,
version: firmware.version,
size_bytes: firmware.size_bytes,
sha256: firmware.sha256,
download_url: getObjectUrl(firmware.cos_key, 600)
download_url: await getObjectUrl(firmware.cos_key, 600)
})
})
}
server/src/routes/subscription.js
+13 -12
查看文件
@@ -1,6 +1,6 @@
const { one, query } = require('../lib/db')
const { one, query, transaction } = require('../lib/db')
const { ok, fail } = require('../lib/response')
const { requireUser } = require('../lib/auth')
const { requireUser, requireAdmin } = require('../lib/auth')
const { writeLog } = require('../lib/log')
const PLANS = {
@@ -26,21 +26,22 @@ function register(router) {
return ok({ order_id: orderId, payment_params: {}, plan, amount: PLANS[plan].amount })
})
// Temporary: admin-only until payment integration
router.post('/api/v1/subscription/verify', async ctx => {
const user = await requireUser(ctx)
if (!user) return fail(1001, 'invalid_token')
const admin = await requireAdmin(ctx)
if (!admin) return fail(1002, '未授权，请重新登录')
const userId = ctx.body.user_id
if (!userId) return fail(2001, 'user_id required')
const plan = ctx.body.plan || ctx.body.plan_type || 'monthly'
if (!PLANS[plan]) return fail(2001, 'invalid plan')
const p = PLANS[plan]
await query('UPDATE subscriptions SET status = 2 WHERE user_id = :user_id AND status = 1', { user_id: user.user_id })
await query('INSERT INTO subscriptions (user_id, plan, status, amount, order_id, start_time, expire_time) VALUES (:user_id, :plan, 1, :amount, :order_id, NOW(), DATE_ADD(NOW(), INTERVAL :days DAY))', {
user_id: user.user_id,
plan,
amount: p.amount,
order_id: ctx.body.order_id || 'ORD' + Date.now(),
days: p.days
await transaction(async conn => {
await conn.execute('UPDATE subscriptions SET status = 2 WHERE user_id = ? AND status = 1', [userId])
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))', [
userId, plan, p.amount, ctx.body.order_id || 'ORD' + Date.now(), p.days
])
})
await writeLog({ user_id: user.user_id, action: 'subscription_verify', detail: '订阅生效: ' + plan, ip: ctx.ip })
await writeLog({ admin_id: admin.admin_id, action: 'subscription_verify', detail: '订阅生效: ' + plan + ' user:' + userId, ip: ctx.ip })
return ok({ status: 'active', plan, remaining_days: p.days })
})
}
server/src/routes/treatment.js
+4 -11
查看文件
@@ -1,19 +1,10 @@
const { query } = require('../lib/db')
const { one, query, limitClause } = require('../lib/db')
const { ok, fail } = require('../lib/response')
const { requireUser } = require('../lib/auth')
const { writeLog } = require('../lib/log')
function toMysqlDate(value) {
if (!value) return null
const d = new Date(value)
if (Number.isNaN(d.getTime())) return null
return d.toISOString().slice(0, 19).replace('T', ' ')
}
const { toMysqlDate } = require('../lib/utils')
function register(router) {
function limitClause(pageSize, offset) {
return ' LIMIT ' + Number(pageSize) + ' OFFSET ' + Number(offset)
}
router.get('/api/v1/treatment/history', async ctx => {
const user = await requireUser(ctx)
@@ -31,6 +22,8 @@ function register(router) {
if (!user) return fail(1001, 'invalid_token')
const d = ctx.body || {}
if (!d.device_id) return fail(2001, 'device_id required')
const binding = await one('SELECT binding_id FROM bindings WHERE user_id = :user_id AND device_id = :device_id AND bind_status = 1', { user_id: user.user_id, device_id: d.device_id })
if (!binding) return fail(1006, 'device_not_bound')
const sessionId = d.session_id || 'SESS' + Date.now()
await query(
`INSERT INTO treatment_records