Compare commits

..

2 Commits

Author SHA1 Message Date
Yuzhiran Dev 66de1dc396 feat: 微信分享钩子全页面接入 + 订阅信息结构化映射 + JWT 错误处理加强
- client: 全部页面接入 onShareAppMessage/onShareTimeline 分享钩子
- client: login 页增强、profile 订阅展示优化
- client/stores: 订阅字段扁平结构映射为 subInfo(plan/expiresAt/startDate)
- server: auth 路由 JWT 无效/过期统一返回 401 未授权响应
- server: models/tests 同步更新
2026-09-04 11:47:29 +08:00
Yuzhiran Dev de8ca9c420 升级pro页:删除选择套餐,保留Pro/VIP方案卡;支付时校验金额匹配;修正product ID为下划线格式 2026-07-14 14:46:07 +08:00
37 changed files with 2284 additions and 2013 deletions
+4 -4
View File
@@ -1,5 +1,5 @@
allowBuilds:
'@parcel/watcher': set this to true or false
core-js: set this to true or false
esbuild: set this to true or false
vue-demi: set this to true or false
'@parcel/watcher': true
core-js: true
esbuild: true
vue-demi: true
+11 -2
View File
@@ -76,6 +76,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, computed, onMounted } from 'vue'
import { userApi } from '@/utils/api'
import { useUserStore } from '@/stores/user'
@@ -113,8 +115,7 @@ const progressPercent = computed(() => {
onMounted(() => {
if (!userStore.isLoggedIn) {
uni.showToast({ title: '请先登录', icon: 'none' })
uni.navigateTo({ url: '/pages/login/login' })
loading.value = false
return
}
loadAchievements()
@@ -156,6 +157,14 @@ function formatDate(dateStr) {
const day = String(date.getDate()).padStart(2, '0')
return `${year}-${month}-${day}`
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
+10
View File
@@ -90,6 +90,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, computed } from 'vue'
const type = ref('terms')
@@ -112,6 +114,14 @@ function onLoad(fn) {
fn(page.$page.options || {})
}
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
+10
View File
@@ -78,6 +78,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, computed } from 'vue'
import { aiChatApi } from '@/utils/api'
import { useUserStore } from '@/stores/user'
@@ -195,6 +197,14 @@ function goShare() {
}
})
}
// 微信小程序右上角三点分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - AI 问答',
path: '/pages/chat/chat'
}))
// #endif
</script>
<style lang="scss" scoped>
+22 -1
View File
@@ -93,6 +93,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, computed, onMounted } from 'vue'
import { knowledgeApi } from '@/utils/api'
import { useUserStore } from '@/stores/user'
@@ -163,7 +165,18 @@ async function fetchDetail() {
async function toggleCollect() {
if (!userStore.isLoggedIn) {
uni.navigateTo({ url: '/pages/login/login' })
// 未登录:弹窗给用户选择,可取消,不强制跳转
uni.showModal({
title: '登录后收藏',
content: '登录后即可收藏喜欢的 AI 知识',
confirmText: '去登录',
cancelText: '暂不',
success: (res) => {
if (res.confirm) {
uni.navigateTo({ url: '/pages/login/login' })
}
}
})
return
}
try {
@@ -188,6 +201,14 @@ function goBack() {
function goToAI() {
uni.switchTab({ url: '/pages/chat/chat' })
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
+12 -2
View File
@@ -44,6 +44,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, computed, onMounted } from 'vue'
import { getDimension } from '@/utils/dimensions'
import { knowledgeApi } from '@/utils/api'
@@ -80,12 +82,12 @@ async function loadKnowledge() {
loading.value = true
try {
const data = await knowledgeApi.list({ dim: dimId.value })
knowledgeList.value = data.map(item => ({
knowledgeList.value = (data.items || []).map(item => ({
...item,
icon: getDimIcon(item.dim),
desc: item.content?.substring(0, 40) + '...' || '',
readTime: Math.ceil((item.content?.length || 300) / 200),
isPremium: item.isPremium,
isPremium: false,
collected: false,
collectCount: item.collectionCount
}))
@@ -164,6 +166,14 @@ function goDetail(item) {
url: `/pages/detail/detail?id=${item._id}`
})
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
+17 -6
View File
@@ -19,9 +19,9 @@
<!-- 维度标签 -->
<view
class="dim-tag"
:style="{ color: dimColor(item.dimensionId) }"
:style="{ color: dimColor(item.dimension) }"
>
{{ dimName(item.dimensionId) }}
{{ dimName(item.dimension) }}
</view>
<!-- 标题 -->
<text class="fav-title">{{ item.title }}</text>
@@ -35,8 +35,9 @@
<!-- 空状态 -->
<view class="empty-state" v-else>
<text class="empty-icon">⭐</text>
<text class="empty-text">你还没有收藏任何内容</text>
<text class="empty-sub">去首页发现有趣的 AI 知识吧</text>
<text class="empty-text" v-if="userStore.isLoggedIn">你还没有收藏任何内容</text>
<text class="empty-text" v-else>登录后可收藏喜欢的 AI 知识</text>
<text class="empty-sub" v-if="userStore.isLoggedIn">去首页发现有趣的 AI 知识吧</text>
<view class="empty-btn" @tap="goHome">
<text>开始探索</text>
</view>
@@ -45,6 +46,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, onMounted } from 'vue'
import { knowledgeApi } from '@/utils/api'
import { getDimension } from '@/utils/dimensions'
@@ -56,8 +59,8 @@ const loading = ref(true)
onMounted(() => {
if (!userStore.isLoggedIn) {
uni.showToast({ title: '请先登录', icon: 'none' })
uni.navigateTo({ url: '/pages/login/login' })
// 未登录时显示空状态提示,不强制跳转登录
loading.value = false
return
}
loadFavorites()
@@ -112,6 +115,14 @@ async function removeFav(id, idx) {
function goHome() {
uni.switchTab({ url: '/pages/index/index' })
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
+10
View File
@@ -101,6 +101,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, computed, onMounted } from 'vue'
import { feedbackApi } from '@/utils/api'
import { useUserStore } from '@/stores/user'
@@ -226,6 +228,14 @@ onMounted(() => {
function goBack() {
uni.navigateBack()
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
+10
View File
@@ -83,6 +83,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, onMounted } from 'vue'
import { DIMENSIONS } from '@/utils/dimensions'
import { trendApi } from '@/utils/api'
@@ -151,6 +153,14 @@ function goNewsDetail(item) {
uni.setStorageSync('__news_item__', JSON.stringify(item))
uni.navigateTo({ url: '/pages/news/news' })
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
+18 -9
View File
@@ -37,20 +37,20 @@
<!-- 头像 -->
<view class="avatar">
<image
v-if="item.avatarUrl"
:src="item.avatarUrl"
v-if="item.avatar"
:src="item.avatar"
class="avatar-img"
mode="aspectFill"
/>
<text v-else class="avatar-text">
{{ (item.nickName || item.username || '用').charAt(0) }}
{{ (item.nickname || item.username || '用').charAt(0) }}
</text>
</view>
<!-- 信息 -->
<view class="user-info">
<text class="user-name">{{ item.nickName || item.username || '用户' }}</text>
<text class="user-score">{{ item.score || 0 }} 分</text>
<text class="user-name">{{ item.nickname || item.username || '用户' }}</text>
<text class="user-score">{{ item.totalScore || 0 }} 分</text>
</view>
<!-- 已解锁维度 -->
@@ -81,6 +81,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, onMounted } from 'vue'
import { userApi } from '@/utils/api'
import { getDimension } from '@/utils/dimensions'
@@ -102,8 +104,7 @@ const dimTabs = [
onMounted(() => {
if (!userStore.isLoggedIn) {
uni.showToast({ title: '请先登录', icon: 'none' })
uni.navigateTo({ url: '/pages/login/login' })
loading.value = false
return
}
loadBoard()
@@ -116,10 +117,10 @@ async function loadBoard() {
const data = await userApi.leaderboard(dimParam)
const list = Array.isArray(data) ? data : data.list || []
// 标记当前用户
const myId = userStore.userInfo?.id || userStore.userInfo?.userId || ''
const myId = userStore.userInfo?.openid || ''
board.value = list.map((item) => ({
...item,
isCurrentUser: String(item.userId || item.id || '') === String(myId)
isCurrentUser: item.openid === myId
}))
} catch (e) {
console.error('[leaderboard] load failed:', e)
@@ -133,6 +134,14 @@ function dimDotColor(id) {
const dim = getDimension(id)
return dim ? dim.color : 'rgba(255,255,255,0.2)'
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
+93 -2
View File
@@ -4,6 +4,14 @@
<view class="bg-orb orb-2"></view>
<view class="bg-orb orb-3"></view>
<!-- 顶部返回 -->
<view class="nav-bar">
<view class="nav-back" @click="goBack">
<text class="nav-back-icon">←</text>
<text class="nav-back-text">返回</text>
</view>
</view>
<view class="login-container">
<view class="logo-wrap">
<view class="logo-ring"></view>
@@ -28,6 +36,11 @@
<input class="form-input" v-model="loginForm.password" type="password" placeholder="请输入密码" />
</view>
<!-- 忘记密码 -->
<view class="forgot-row">
<text class="forgot-link" @click="goForgotPassword">忘记密码?</text>
</view>
<!-- 登录协议勾选 -->
<view class="agreement-row">
<view class="agreement-checkbox" :class="{ checked: loginAgreed }" @click="loginAgreed = !loginAgreed">
@@ -45,12 +58,14 @@
<text>{{ loading ? '登录中...' : '登录' }}</text>
</view>
<!-- 微信小程序一键登录 -->
<!-- #ifdef MP-WEIXIN -->
<view class="wx-login-row" v-if="isMiniApp">
<view class="wx-login-btn" @click="wechatLogin">
<text class="wx-icon">💬</text>
<text>微信一键登录</text>
</view>
</view>
<!-- #endif -->
</view>
<!-- 注册表单 -->
@@ -59,6 +74,10 @@
<text class="form-label">邮箱 <text style="color:var(--color-vip);font-size:11px;">*</text></text>
<input class="form-input" v-model="registerForm.email" type="email" placeholder="请输入邮箱地址" @input="registerForm.email = $event.detail.value.trim(); verifyCodeSent = false" />
</view>
<view class="form-item">
<text class="form-label">用户名 <text style="color:var(--color-vip);font-size:11px;">*</text></text>
<input class="form-input" v-model="registerForm.username" placeholder="请输入用户名(用于登录)" @input="registerForm.username = $event.detail.value.trim()" />
</view>
<view class="form-item">
<text class="form-label">昵称 <text style="color:var(--text-muted);font-size:11px;">(选填)</text></text>
<input class="form-input" v-model="registerForm.nickName" placeholder="显示名称,留空自动生成" />
@@ -100,21 +119,30 @@
<view class="footer-info">
<text>© 2026 宇之然 · AI 维度</text>
</view>
<!-- 显著有效的「拒绝/暂不登录」入口,避免强制登录 -->
<view class="skip-login" @click="goBrowse">
<text>暂不登录,先体验</text>
</view>
</view>
</view>
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref } from 'vue'
import { useUserStore } from '@/stores/index'
const isMiniApp = ref(false)
// #ifdef MP-WEIXIN
try {
const sysInfo = uni.getSystemInfoSync()
if (sysInfo && sysInfo.version && sysInfo.platform) {
isMiniApp.value = true
}
} catch (e) {}
// #endif
const activeTab = ref('login')
const loading = ref(false)
@@ -127,7 +155,7 @@ let countdownTimer = null
const userStore = useUserStore()
const loginForm = ref({ email: '', password: '' })
const registerForm = ref({ email: '', password: '', nickName: '', verifyCode: '' })
const registerForm = ref({ email: '', username: '', password: '', nickName: '', verifyCode: '' })
const BASE_URL = 'https://wdkj.yuzhiran.com.cn'
@@ -241,6 +269,10 @@ const handleRegister = async () => {
uni.showToast({ title: '请输入密码', icon: 'none' })
return
}
if (!registerForm.value.username) {
uni.showToast({ title: '请输入用户名', icon: 'none' })
return
}
if (registerForm.value.password.length < 6) {
uni.showToast({ title: '密码至少 6 位', icon: 'none' })
return
@@ -255,7 +287,8 @@ const handleRegister = async () => {
registerForm.value.email,
registerForm.value.password,
registerForm.value.nickName || '',
registerForm.value.verifyCode
registerForm.value.verifyCode,
registerForm.value.username
)
uni.showToast({ title: '注册成功', icon: 'success' })
setTimeout(() => uni.switchTab({ url: '/pages/index/index' }), 1000)
@@ -273,6 +306,27 @@ function openAgreement(type) {
}
uni.navigateTo({ url: pages[type] || pages.terms })
}
function goBack() {
uni.navigateBack({ fallback: () => uni.switchTab({ url: '/pages/index/index' }) })
}
/** 拒绝登录:返回首页以游客身份浏览,不强制登录 */
function goBrowse() {
uni.switchTab({ url: '/pages/index/index' })
}
function goForgotPassword() {
uni.showToast({ title: '请联系管理员重置密码', icon: 'none' })
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
@@ -297,6 +351,19 @@ function openAgreement(type) {
.orb-2 { width: 160px; height: 160px; top: 30%; right: -40px; background: var(--dim3-color); }
.orb-3 { width: 180px; height: 180px; bottom: -60px; left: 30%; background: var(--dim5-color); }
// 顶部导航栏
.nav-bar {
position: absolute; top: 0; left: 0; right: 0; z-index: 10;
padding: 44px 20px 0;
.nav-back {
display: inline-flex; align-items: center; gap: 4px;
padding: 8px 12px; cursor: pointer;
&:active { opacity: 0.6; }
}
.nav-back-icon { font-size: 20px; color: var(--text-primary); }
.nav-back-text { font-size: 14px; color: var(--text-secondary); }
}
.login-container {
position: relative; z-index: 1;
width: 100%; max-width: 360px;
@@ -348,6 +415,15 @@ function openAgreement(type) {
}
}
// 忘记密码
.forgot-row {
display: flex; justify-content: flex-end; margin: -8px 0 0;
.forgot-link {
font-size: 12px; color: var(--color-brand); padding: 4px 0;
&:active { opacity: 0.6; }
}
}
// 验证码行
.verify-row {
display: flex; gap: 10px;
@@ -411,5 +487,20 @@ function openAgreement(type) {
}
.footer-info { margin-top: 40px; font-size: 11px; color: var(--text-muted); }
// 暂不登录入口(拒绝/返回,显著有效)
.skip-login {
margin-top: 24px;
padding: 14px 0;
width: 100%;
text-align: center;
font-size: 14px;
color: var(--text-secondary);
background: var(--glass-bg);
border: 1px solid var(--glass-border);
border-radius: 12px;
cursor: pointer;
&:active { opacity: 0.7; }
}
}
</style>
+21 -12
View File
@@ -90,6 +90,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, computed, onMounted } from 'vue'
import { trendApi, knowledgeApi } from '@/utils/api'
@@ -140,9 +142,14 @@ const relatedTags = computed(() => {
})
async function loadDetail() {
const id = uni.getStorageSync('__news_id__')
loading.value = false
// Try API detail first, fallback to local data from trend page
// 列表页通过 __news_item__ 传入条目(含 _id),优先拉取详情以刷新阅读量
const raw = uni.getStorageSync('__news_item__')
let item = null
if (raw) {
try { item = JSON.parse(raw) } catch (e) {}
}
const id = item?._id
if (id) {
try {
const data = await trendApi.detail(id)
@@ -150,17 +157,11 @@ async function loadDetail() {
isCollected.value = data.collected || false
return
} catch (e) {
// fall through to local
// 回退到本地缓存
}
}
// Fallback: read from trend page's stored item
try {
const raw = uni.getStorageSync('__news_item__')
if (raw) {
news.value = JSON.parse(raw)
}
} catch (e) {
// ignore
if (item) {
news.value = item
}
}
@@ -175,7 +176,7 @@ function onFavorite() {
function onShare() {
uni.setClipboardData({
data: news.value.link || `https://ai-dimension.yuzhiran.com.cn/news/${uni.getStorageSync('__news_id__')}`,
data: news.value.link || `https://ai-dimension.yuzhiran.com.cn/news/${news.value._id || ''}`,
success: () => uni.showToast({ title: '链接已复制', icon: 'none' })
})
}
@@ -197,6 +198,14 @@ function openSource() {
onMounted(() => {
loadDetail()
})
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
+242 -183
View File
@@ -30,12 +30,15 @@
<text class="plan-name">Pro</text>
<view class="plan-badge" v-if="selectedPlan === 'pro'">推荐</view>
</view>
<text class="plan-price">¥19.9</text>
<text class="plan-unit">/ 月</text>
<view class="plan-price-row">
<text class="plan-price">¥19.9</text>
<text class="plan-unit">/ 月</text>
</view>
<view class="plan-features">
<text class="plan-feature">✓ AI 问答无限次</text>
<text class="plan-feature">✓ 全量知识解锁</text>
<text class="plan-feature">✓ 收藏无限容量</text>
<text class="plan-feature">✓ 趋势优先推送</text>
</view>
</view>
<view
@@ -47,52 +50,15 @@
<text class="plan-name">VIP</text>
<view class="plan-badge vip-badge" v-if="selectedPlan === 'vip'">尊享</view>
</view>
<text class="plan-price vip-price">¥39.9</text>
<text class="plan-unit">/ 月</text>
<view class="plan-price-row">
<text class="plan-price vip-price">¥39.9</text>
<text class="plan-unit">/ 月</text>
</view>
<view class="plan-features">
<text class="plan-feature">✓ 含 Pro 全部权益</text>
<text class="plan-feature">✓ 专属客服支持</text>
<text class="plan-feature">✓ 专属会员标识</text>
</view>
</view>
</view>
<!-- 套餐时长 -->
<view class="duration-section">
<text class="section-title">选择套餐</text>
<view class="duration-list">
<view
class="duration-item"
:class="{ active: selectedDuration === item.key }"
v-for="item in durationOptions"
:key="item.key"
@click="selectedDuration = item.key"
>
<text class="d-label">{{ item.label }}</text>
<text class="d-price">¥{{ item.price }}</text>
<text class="d-save" v-if="item.save">省 {{ item.save }}</text>
</view>
</view>
</view>
<!-- 权益清单 -->
<view class="benefits-section">
<text class="section-title">权益对比</text>
<view class="benefits-card">
<view
class="benefit-row"
v-for="(item, idx) in benefitList"
:key="idx"
>
<view class="benefit-left">
<text class="benefit-icon">{{ item.icon }}</text>
<text class="benefit-text">{{ item.text }}</text>
</view>
<view class="benefit-check">
<text class="check-mark" :class="{ 'pro-only': item.proOnly, 'vip-only': !item.proOnly }">
{{ item.proOnly ? 'Pro' : (item.hasPro ? 'Pro+VIP' : 'VIP') }}
</text>
</view>
<text class="plan-feature">✓ 工具教程 + 学习路径</text>
</view>
</view>
</view>
@@ -114,42 +80,68 @@
<view class="footer-spacer"></view>
</scroll-view>
<!-- H5 支付失败/备选方案 -->
<view v-if="showH5Fallback" class="h5-fallback-mask">
<view class="h5-fallback-content">
<view class="fallback-icon">📱</view>
<text class="fallback-title">请使用微信完成支付</text>
<text class="fallback-desc">
订单号:{{ h5OrderNo }}
金额:¥{{ currentPrice }}
</text>
<view class="fallback-actions">
<button class="fallback-btn primary" @click="retryH5Pay">
再次跳转微信支付
</button>
<button class="fallback-btn secondary" @click="copyH5Url">
复制链接到微信打开
</button>
<button class="fallback-btn text-btn" @click="closeH5Fallback">
稍后再说
</button>
</view>
</view>
</view>
</view>
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, computed } from 'vue'
import { paymentApi } from '@/utils/api'
import { useUserStore } from '@/stores/user'
const userStore = useUserStore()
const selectedPlan = ref('pro')
const selectedDuration = ref('pro-monthly')
const selectedPlan = ref('pro') // 'pro' | 'vip'
const durationOptions = computed(() => {
const isPro = selectedPlan.value === 'pro'
return [
{ key: isPro ? 'pro-monthly' : 'vip-monthly', label: '月付', price: isPro ? 19.9 : 39.9 },
{ key: isPro ? 'pro-quarterly' : 'vip-quarterly', label: '季付', price: isPro ? 49.9 : 99.9, save: isPro ? '¥10' : '¥20' }
]
})
// 方案 → 对应数据库的商品 ID 和价格(单位:元)
const PLAN_MAP = {
pro: { productId: 'pro_monthly', price: 19.9 },
vip: { productId: 'vip_monthly', price: 39.9 }
}
const benefitList = ref([
{ icon: '🤖', text: 'AI 问答无限次', proOnly: true, hasPro: true },
{ icon: '📚', text: '全量知识内容解锁', proOnly: true, hasPro: true },
{ icon: '📡', text: '每日趋势优先推送', proOnly: true, hasPro: true },
{ icon: '⭐', text: '收藏夹无限容量', proOnly: true, hasPro: true },
{ icon: '💬', text: '专属客服支持', proOnly: false, hasPro: false },
{ icon: '🎁', text: '专属会员标识', proOnly: false, hasPro: false }
])
const currentPrice = computed(() => {
const item = durationOptions.value.find(d => d.key === selectedDuration.value)
return item ? item.price : 19.9
})
const currentPrice = computed(() => PLAN_MAP[selectedPlan.value].price)
const currentProductId = computed(() => PLAN_MAP[selectedPlan.value].productId)
const loading = ref(false)
// H5 支付相关状态
const h5PayUrl = ref('')
const showH5Fallback = ref(false)
const h5OrderNo = ref('')
// 检测是否运行在 H5 环境
function isH5() {
// #ifdef H5
return true
// #endif
// #ifdef MP-WEIXIN
return false
// #endif
return false
}
async function handlePay() {
if (!userStore.isLoggedIn) {
@@ -157,14 +149,65 @@ async function handlePay() {
return
}
const productId = selectedDuration.value
const plan = PLAN_MAP[selectedPlan.value]
if (!plan || !plan.productId || plan.price <= 0) {
uni.showToast({ title: '请选择有效的套餐', icon: 'none' })
return
}
const productId = plan.productId
const amount = plan.price
loading.value = true
// ===== H5 环境:使用微信支付 H5 跳转链接 =====
if (isH5()) {
try {
const data = await paymentApi.createH5Order(productId, window.location.hostname, userStore.token)
h5OrderNo.value = data.orderNo
if (data.h5Url) {
h5PayUrl.value = data.h5Url
showH5Fallback.value = false
// 尝试直接跳转微信支付页面
// #ifdef H5
window.location.href = data.h5Url
// #endif
// H5 环境下跳转后不会返回,这里设置一个超时提示
setTimeout(() => {
showH5Fallback.value = true
}, 5000)
} else {
uni.showToast({ title: '获取支付链接失败', icon: 'none' })
loading.value = false
}
} catch (err) {
console.error('H5创建订单失败:', err)
uni.showToast({ title: err.message || '创建订单失败,请重试', icon: 'none' })
loading.value = false
}
return
}
// ===== 微信小程序环境:使用原生支付 =====
try {
const data = await paymentApi.createOrder(productId, userStore.token)
const payParam = data.payParams || data.wechatParam || data.paymentData
if (payParam) {
// 校验支付参数金额(分)与所选金额一致
// 微信返回的 amount 可能是 number 或 string
const payAmountFen = payParam.totalFee || payParam.amount || data.amount
const expectedFen = Math.round(amount * 100)
if (parseInt(payAmountFen, 10) !== expectedFen) {
console.error(`支付金额不匹配: 前端 ¥${amount} / 后端 ${payAmountFen} 分`)
uni.showToast({ title: '支付金额异常,请重试', icon: 'none' })
loading.value = false
return
}
uni.requestPayment({
provider: 'wxpay',
timeStamp: payParam.timeStamp || payParam.timestamp,
@@ -173,7 +216,7 @@ async function handlePay() {
signType: payParam.signType || 'MD5',
paySign: payParam.paySign,
success: () => {
uni.showToast({ title: '支付成功!', icon: 'success' })
uni.showToast({ title: `支付成功!金额 ¥${amount}`, icon: 'success' })
setTimeout(() => {
uni.navigateBack()
}, 1500)
@@ -197,9 +240,52 @@ async function handlePay() {
}
}
/** H5 支付:复制链接到微信打开 */
function copyH5Url() {
// #ifdef H5
if (navigator.clipboard && navigator.clipboard.writeText) {
navigator.clipboard.writeText(h5PayUrl.value).then(() => {
uni.showToast({ title: '链接已复制,请到微信中打开', icon: 'none' })
}).catch(() => {
// fallback
const textarea = document.createElement('textarea')
textarea.value = h5PayUrl.value
document.body.appendChild(textarea)
textarea.select()
document.execCommand('copy')
document.body.removeChild(textarea)
uni.showToast({ title: '链接已复制,请到微信中打开', icon: 'none' })
})
}
// #endif
}
/** H5 支付:再次跳转 */
function retryH5Pay() {
if (h5PayUrl.value) {
// #ifdef H5
window.location.href = h5PayUrl.value
// #endif
}
}
/** H5 支付:关闭窗口返回 */
function closeH5Fallback() {
showH5Fallback.value = false
loading.value = false
}
function goBack() {
uni.navigateBack()
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
@@ -341,7 +427,12 @@ function goBack() {
font-size: 28px;
font-weight: 700;
color: var(--dim1-color);
display: inline;
}
.plan-price-row {
display: flex;
align-items: baseline;
margin-bottom: 12px;
}
.plan-card.vip .plan-price {
@@ -367,120 +458,6 @@ function goBack() {
line-height: 1.5;
}
// 套餐时长
.duration-section {
margin-bottom: 24px;
}
.section-title {
font-size: 14px;
font-weight: 600;
color: var(--text-primary);
display: block;
margin-bottom: 12px;
}
.duration-list {
display: flex;
gap: 10px;
}
.duration-item {
flex: 1;
padding: 14px 12px;
background: var(--glass-bg);
border: 1.5px solid var(--glass-border);
border-radius: 14px;
text-align: center;
transition: all 0.3s;
&.active {
border-color: var(--dim1-color);
background: linear-gradient(135deg, rgba(99,102,241,0.1), rgba(99,102,241,0.05));
}
}
.d-label {
font-size: 13px;
color: var(--text-secondary);
display: block;
margin-bottom: 6px;
}
.d-price {
font-size: 18px;
font-weight: 700;
color: var(--text-primary);
display: block;
}
.d-save {
font-size: 11px;
font-weight: 600;
color: #4db6ac;
display: block;
margin-top: 4px;
}
// 权益对比
.benefits-section {
margin-bottom: 24px;
}
.benefits-card {
background: var(--glass-bg);
border: 1px solid var(--glass-border);
border-radius: 14px;
overflow: hidden;
}
.benefit-row {
display: flex;
align-items: center;
justify-content: space-between;
padding: 14px 16px;
&:not(:last-child) {
border-bottom: 1px solid var(--glass-border);
}
}
.benefit-left {
display: flex;
align-items: center;
gap: 10px;
}
.benefit-icon {
font-size: 16px;
width: 24px;
text-align: center;
}
.benefit-text {
font-size: 13px;
color: var(--text-secondary);
}
.benefit-check {
.check-mark {
font-size: 11px;
font-weight: 600;
padding: 2px 10px;
border-radius: 8px;
&.pro-only {
background: rgba(99,102,241,0.1);
color: var(--dim1-color);
}
&.vip-only {
background: rgba(255,167,38,0.1);
color: #ffa726;
}
}
}
// 支付
.pay-section {
margin-bottom: 24px;
@@ -517,4 +494,86 @@ function goBack() {
}
.footer-spacer { height: 40px; }
// ===== H5 支付备选方案 =====
.h5-fallback-mask {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
z-index: 9999;
}
.h5-fallback-content {
background: var(--bg-primary);
border-radius: 20px;
padding: 32px 24px;
width: 85%;
max-width: 380px;
text-align: center;
display: flex;
flex-direction: column;
align-items: center;
gap: 12px;
}
.fallback-icon {
font-size: 48px;
margin-bottom: 8px;
}
.fallback-title {
font-size: 20px;
font-weight: 700;
color: var(--text-primary);
}
.fallback-desc {
font-size: 13px;
color: var(--text-secondary);
line-height: 1.8;
margin-bottom: 8px;
white-space: pre-line;
}
.fallback-actions {
display: flex;
flex-direction: column;
gap: 10px;
width: 100%;
margin-top: 8px;
}
.fallback-btn {
padding: 12px 20px;
border-radius: 12px;
font-size: 14px;
font-weight: 600;
border: none;
cursor: pointer;
&.primary {
background: linear-gradient(135deg, #07C160, #06AE56);
color: white;
box-shadow: 0 4px 16px rgba(7, 193, 96, 0.3);
}
&.secondary {
background: var(--glass-bg);
border: 1.5px solid var(--glass-border);
color: var(--text-primary);
}
&.text-btn {
background: transparent;
color: var(--text-tertiary);
font-size: 13px;
padding: 8px;
}
}
</style>
+49 -6
View File
@@ -95,11 +95,17 @@
</view>
<!-- 登录/退出 -->
<view class="action-btn" v-if="!userStore.isLoggedIn" @click="goLogin">
<text>微信一键登录</text>
<view class="action-row" v-if="!userStore.isLoggedIn">
<view class="action-btn primary" @click="goLogin">
<text>微信一键登录</text>
</view>
<!-- 未登录:提供显著有效的「拒绝/暂不登录」入口,避免强制登录 -->
<view class="action-btn ghost" @click="goBrowse">
<text>暂不登录,先体验</text>
</view>
</view>
<view class="action-btn logout" v-else @click="handleLogout">
<text>退出登录</text>
<text>退出登录</text>
</view>
<text class="version">宇之然 AI 维度 v1.0.0</text>
@@ -107,6 +113,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, computed, onMounted } from 'vue'
import { useUserStore } from '@/stores/user'
import { knowledgeApi, aiChatApi } from '@/utils/api'
@@ -207,6 +215,11 @@ function goLogin() {
uni.navigateTo({ url: '/pages/login/login' })
}
/** 仅浏览:未登录用户可跳过登录直接使用首页 */
function goBrowse() {
uni.switchTab({ url: '/pages/index/index' })
}
function handleLogout() {
uni.showModal({
title: '退出登录',
@@ -274,6 +287,14 @@ function goAbout() {
function goSettings() {
uni.navigateTo({ url: '/pages/settings/settings' })
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
@@ -504,17 +525,39 @@ function goSettings() {
}
// 按钮
.action-row {
margin-top: 20px;
display: flex;
flex-direction: column;
gap: 12px;
}
.action-btn {
text-align: center;
padding: 16px 0;
margin-top: 20px;
font-size: 14px;
color: var(--dim1-color);
border-top: 1px solid var(--glass-border);
border-radius: 12px;
}
.action-btn.primary {
color: white;
background: linear-gradient(135deg, #7c4dff, #b388ff);
box-shadow: 0 0 20px rgba(124, 77, 255, 0.2);
font-weight: 600;
}
.action-btn.ghost {
color: var(--text-secondary);
background: var(--glass-bg);
border: 1px solid var(--glass-border);
}
.action-btn.logout {
margin-top: 20px;
color: var(--text-muted);
background: var(--glass-bg);
border: 1px solid var(--glass-border);
border-radius: 12px;
}
.version {
+16 -10
View File
@@ -17,7 +17,7 @@
</view>
<view class="stats-row">
<view class="stat-item">
<text class="stat-value">{{ stats?.totalPoints || 0 }}</text>
<text class="stat-value">{{ stats?.totalScore || 0 }}</text>
<text class="stat-label">累计积分</text>
</view>
<view class="stat-divider"></view>
@@ -122,6 +122,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, computed, onMounted } from 'vue'
import { knowledgeApi, userApi } from '@/utils/api'
import { useUserStore } from '@/stores/user'
@@ -134,7 +136,7 @@ const loading = ref(true)
// 学习时长(小时)
const studyHours = computed(() => {
const hours = stats.value?.studyHours || 0
const hours = stats.value?.totalPlayTime || 0
if (hours < 1) return `${Math.round(hours * 60)}分`
return hours.toFixed(1) + 'h'
})
@@ -156,7 +158,7 @@ function initDimData() {
color: dim.color,
bg: dim.bg,
total: 0,
done: exploreData[dim.id] || 0,
done: exploreData['dim' + dim.id]?.completed ? 1 : 0,
percent: 0,
expanded: false
}))
@@ -167,11 +169,7 @@ async function fetchDimTotals() {
for (const dim of dimProgress.value) {
try {
const data = await knowledgeApi.list({ dim: dim.id, limit: 1 })
dim.total = data?.total || data?.length || (Array.isArray(data) ? data.length : 0)
// 如果 list 返回的是数组而不是带 total 的对象,直接用数组长度
if (Array.isArray(data) && dim.total === 0) {
dim.total = data.length
}
dim.total = data?.pagination?.total || data?.items?.length || 0
// 计算百分比
if (dim.total > 0) {
dim.percent = Math.round((dim.done / dim.total) * 100)
@@ -200,10 +198,10 @@ async function loadData() {
userApi.progress(userStore.token).catch(() => ({ exploreData: {} }))
])
// 合并 exploreData
// 合并 exploreData(进度接口返回 {isNewUser, data: user},exploreData 在 data 下)
stats.value = {
...statsData,
exploreData: { ...statsData?.exploreData, ...progressData?.exploreData }
exploreData: progressData?.data?.exploreData || {}
}
dimProgress.value = initDimData()
@@ -223,6 +221,14 @@ onMounted(() => {
function goBack() {
uni.navigateBack()
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
+12 -2
View File
@@ -64,8 +64,8 @@
<text class="result-title">{{ item.title }}</text>
<!-- 摘要 -->
<text class="result-summary" v-if="item.summary">
{{ item.summary }}
<text class="result-summary" v-if="item.content">
{{ item.content }}
</text>
<!-- 标签与分类 -->
@@ -85,6 +85,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, computed, onMounted, onUnmounted } from 'vue'
import { knowledgeApi } from '@/utils/api'
import { DIMENSIONS } from '@/utils/dimensions'
@@ -186,6 +188,14 @@ onMounted(() => {
onUnmounted(() => {
if (debounceTimer) clearTimeout(debounceTimer)
})
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
+38 -6
View File
@@ -1,7 +1,11 @@
<template>
<view class="page-settings page-layout">
<view class="status-bar-placeholder"></view>
<text class="page-title">设置</text>
<view class="nav-bar">
<view class="nav-back" @click="goBack">‹</view>
<text class="page-title">设置</text>
<view class="nav-placeholder"></view>
</view>
<!-- 偏好设置 -->
<view class="section-title">偏好设置</view>
@@ -60,6 +64,8 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, onMounted } from 'vue'
const pushOn = ref(true)
@@ -131,12 +137,20 @@ function showContact() {
}
function showAgreement() {
uni.showModal({
title: '用户协议 / 隐私政策',
content: '暂无内容',
showCancel: false
})
uni.navigateTo({ url: '/pages/agreement/agreement?type=terms' })
}
function goBack() {
uni.navigateBack()
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
@@ -146,6 +160,24 @@ function showAgreement() {
background: var(--bg-primary);
}
.nav-bar {
display: flex;
align-items: center;
justify-content: space-between;
height: 44px;
}
.nav-back {
font-size: 28px;
color: var(--text-primary);
padding: 0 8px;
line-height: 1;
}
.nav-placeholder {
width: 30px;
}
.status-bar-placeholder { height: 44px; }
.page-title {
+46 -14
View File
@@ -1,5 +1,5 @@
<template>
<view class="page-trend page-layout">
<view class="page-trend">
<view class="status-bar-placeholder"></view>
<!-- 顶部 -->
@@ -17,7 +17,8 @@
:key="idx"
@click="activeFilter = idx"
>
<text>{{ tag }}</text>
<text class="filter-icon">{{ tag.icon }}</text>
<text class="filter-label">{{ tag.text }}</text>
</view>
</view>
@@ -64,10 +65,18 @@
</template>
<script setup>
import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
import { ref, computed, onMounted } from 'vue'
import { trendApi } from '@/utils/api'
const filters = ref(['全部', '🚀 产品', '📄 论文', '🔧 工具', '🏢 公司'])
const filters = ref([
{ icon: '📰', text: '全部' },
{ icon: '🚀', text: '产品' },
{ icon: '📄', text: '论文' },
{ icon: '🔧', text: '工具' },
{ icon: '🏢', text: '公司' }
])
const activeFilter = ref(0)
const items = ref([])
const loading = ref(false)
@@ -78,7 +87,7 @@ onMounted(() => {
const displayItems = computed(() => {
if (activeFilter.value === 0) return items.value
const categoryMap = { 1: 'product', 2: 'paper', 3: 'tool', 4: 'company' }
const categoryMap = { 1: '产品', 2: '论文', 3: '工具', 4: '公司' }
const category = categoryMap[activeFilter.value]
if (!category) return items.value
return items.value.filter(item => item.category === category)
@@ -101,19 +110,19 @@ async function fetchTrends() {
function getTagText(item) {
if (item.hot) return '🔥 热门'
if (item.picked) return '📌 精选'
if (item.category === 'product') return '🚀 产品'
if (item.category === 'paper') return '📄 论文'
if (item.category === 'tool') return '🔧 工具'
if (item.category === 'company') return '🏢 公司'
if (item.category === '产品') return '🚀 产品'
if (item.category === '论文') return '📄 论文'
if (item.category === '工具') return '🔧 工具'
if (item.category === '公司') return '🏢 公司'
return '📰 资讯'
}
function getTagClass(item) {
if (item.hot) return 'hot'
if (item.picked) return 'pick'
if (item.category === 'product') return 'product'
if (item.category === 'paper') return 'paper'
if (item.category === 'tool') return 'tool'
if (item.category === '产品') return 'product'
if (item.category === '论文') return 'paper'
if (item.category === '工具') return 'tool'
return ''
}
@@ -179,6 +188,14 @@ function getSampleData() {
}
]
}
// 微信小程序分享
// #ifdef MP-WEIXIN
onShareAppMessage(() => ({
title: 'AI 维度 - 你的AI知识助手',
path: '/pages/index/index'
}))
// #endif
</script>
<style lang="scss" scoped>
@@ -219,12 +236,27 @@ function getSampleData() {
}
.filter-item {
padding: 6px 14px;
padding: 8px 14px 6px;
background: var(--glass-bg);
border: 1px solid var(--glass-border);
border-radius: 16px;
border-radius: 12px;
font-size: 13px;
color: var(--text-secondary);
display: flex;
flex-direction: column;
align-items: center;
gap: 2px;
min-width: 64px;
}
.filter-icon {
font-size: 16px;
line-height: 1.2;
}
.filter-label {
font-size: 11px;
line-height: 1.2;
}
.filter-item.active {
@@ -239,7 +271,7 @@ function getSampleData() {
overflow-y: auto;
overflow-x: hidden;
-webkit-overflow-scrolling: touch;
padding: 0 0 16px;
padding: 0 20px 16px;
}
.trend-card {
+19 -7
View File
@@ -36,18 +36,33 @@ export const useUserStore = defineStore('user', () => {
return data
}
async function h5Register(email, password, nickName, verifyCode) {
const data = await authApi.register(email, password, nickName, verifyCode)
async function h5Register(email, password, nickName, verifyCode, username) {
const data = await authApi.register(email, password, nickName, verifyCode, username)
token.value = data.token
userInfo.value = data.userInfo
uni.setStorageSync('token', data.token)
return data
}
// 将后端扁平的订阅字段映射为前端使用的 subInfo 结构
function mapSubscription(u) {
if (!u) return null
const isSub = !!u.isSubscriber
const expires = u.subscribeExpiry || null
if (!isSub && !expires) return null
return {
plan: u.subscriptionPlan || (isSub ? 'PRO' : 'free'),
expiresAt: expires,
startDate: u.subscribeStart || u.createdAt || null
}
}
async function fetchMe() {
try {
const data = await authApi.me(token.value)
userInfo.value = data
// /me 返回完整用户文档,直接派生订阅信息
subInfo.value = mapSubscription(data)
return data
} catch (err) {
console.error('[userStore] fetchMe failed:', err)
@@ -56,14 +71,11 @@ export const useUserStore = defineStore('user', () => {
}
async function fetchSubInfo(tokenVal) {
// 从后端获取订阅信息 - 复用 knowledgeApi 或专门接口
// 当前后端无单独订阅接口,从 /api/user/progress 中获取
const { userApi } = await import('@/utils/api')
try {
const progress = await userApi.progress(tokenVal)
if (progress && progress.subscription) {
subInfo.value = progress.subscription
}
const u = progress && (progress.data || progress)
subInfo.value = mapSubscription(u)
} catch (err) {
console.error('[userStore] fetchSubInfo failed:', err)
}
+11 -6
View File
@@ -6,8 +6,8 @@
const BASE_URL = 'https://wdkj.yuzhiran.com.cn'
const DEV_URL = 'http://127.0.0.1:3001'
// 生产环境使用域名(SSL 已续期)
const API_BASE = 'https://wdkj.yuzhiran.com.cn'
// 开发环境走本地后端,生产环境使用线上域名
const API_BASE = import.meta.env.DEV ? DEV_URL : BASE_URL
/**
* 通用请求封装
@@ -54,8 +54,8 @@ export const authApi = {
request('POST', '/api/auth/user/login', loginData),
/** H5 注册 */
register: (email, password, nickName, verifyCode) =>
request('POST', '/api/auth/user/register', { email, password, nickName, verifyCode }),
register: (email, password, nickName, verifyCode, username) =>
request('POST', '/api/auth/user/register', { email, password, nickName, verifyCode, username }),
/** 获取当前用户 */
me: (token) =>
@@ -155,10 +155,15 @@ export const paymentApi = {
/** 获取商品列表 */
products: () =>
request('GET', '/api/payment/products'),
/** 创建订单 */
/** 创建订单(小程序支付) */
createOrder: (productId, token) =>
request('POST', '/api/payment/create-order', { productId }, token),
/** 创建H5支付订单 */
createH5Order: (productId, clientIp, token) =>
request('POST', '/api/payment/create-h5-order', { productId, clientIp }, token),
/** 验证支付结果 */
verify: (productId, orderNo, token) =>
request('POST', '/api/payment/verify', { productId, orderNo }, token),
}
/**
+18 -10
View File
@@ -76,22 +76,30 @@ app.use((err, req, res, next) => {
})
})
// 启动服务器
// 启动服务器(仅在直接运行时启动,被测试 import 时不启动)
const PORT = process.env.PORT || 3000
const server = app.listen(PORT, () => {
logger.info(`🚀 服务器启动成功`)
logger.info(`📍 端口: ${PORT}`)
logger.info(`🌐 环境: ${process.env.NODE_ENV || 'development'}`)
logger.info(`📊 健康检查: http://localhost:${PORT}/health`)
})
let server = null
if (require.main === module) {
server = app.listen(PORT, () => {
logger.info(`🚀 服务器启动成功`)
logger.info(`📍 端口: ${PORT}`)
logger.info(`🌐 环境: ${process.env.NODE_ENV || 'development'}`)
logger.info(`📊 健康检查: http://localhost:${PORT}/health`)
})
}
// 优雅关闭
process.on('SIGTERM', () => {
logger.info('📴 接收到 SIGTERM 信号,正在关闭服务器...')
server.close(() => {
logger.info('✅ 服务器已关闭')
if (server) {
server.close(() => {
logger.info('✅ 服务器已关闭')
process.exit(0)
})
} else {
process.exit(0)
})
}
})
module.exports = app
-9
View File
@@ -96,32 +96,23 @@ const userAuthMiddleware = async (req, res, next) => {
const token = authHeader.replace('Bearer ', '')
// 添加调试日志
console.log('[Auth] Token received:', token.substring(0, 20) + '...')
const decoded = jwt.verify(token, process.env.JWT_SECRET)
console.log('[Auth] Token decoded:', decoded)
// 兼容两种token格式:包含userId或openid
let user = null
if (decoded.userId) {
console.log('[Auth] Looking up user by userId:', decoded.userId)
user = await User.findById(decoded.userId)
} else if (decoded.openid) {
console.log('[Auth] Looking up user by openid:', decoded.openid)
user = await User.findOne({ openid: decoded.openid })
}
if (!user) {
console.log('[Auth] User not found')
return res.status(401).json({
success: false,
error: '用户不存在或令牌无效'
})
}
console.log('[Auth] User found:', user._id)
console.log('[Auth] User openid:', user.openid)
req.user = user
// 优先使用 openid,如果没有则使用 userId 作为标识
req.openid = user.openid || user._id.toString()
+1
View File
@@ -4,6 +4,7 @@ const { Schema } = mongoose;
const TrendSchema = new Schema({
title: { type: String, required: true, trim: true },
summary: { type: String },
body: { type: String },
source: { type: String, default: '未知来源' },
sourceUrl: { type: String },
category: {
+5 -5
View File
@@ -94,11 +94,11 @@ const UserSchema = new Schema({
dim4Score: { type: Number, default: 0 },
dim5Score: { type: Number, default: 0 },
// 已解锁维度
unlockedDims: [{
type: Number,
enum: [1, 2, 3, 4, 5]
}],
// 已解锁维度(新用户默认解锁第1维度)
unlockedDims: {
type: [{ type: Number, enum: [1, 2, 3, 4, 5] }],
default: [1]
},
// 商品相关
ownedSkins: [{
+1 -1
View File
@@ -4,7 +4,7 @@ const { Schema } = mongoose
const VerificationCodeSchema = new Schema({
email: { type: String, required: true, index: true },
code: { type: String, required: true },
expiresAt: { type: Date, required: true, index: true },
expiresAt: { type: Date, required: true },
used: { type: Boolean, default: false },
createdAt: { type: Date, default: Date.now }
})
+1080 -1345
View File
File diff suppressed because it is too large Load Diff
+24 -16
View File
@@ -119,21 +119,29 @@ async function tryModels(models, question, dimension, res, quota) {
logger.info(`[AI Chat] 尝试模型: ${model.name} (${modelId})`)
// 调用AI API
const response = await fetch(apiUrl, {
method: 'POST',
headers,
body: JSON.stringify({
model: modelId,
messages: [
{ role: 'system', content: systemPrompt },
{ role: 'user', content: question }
],
temperature: modelConfig.temperature || 0.7,
max_tokens: modelConfig.maxTokens || 800,
top_p: modelConfig.topP || 1
// 调用AI API(带超时,避免外部服务无响应导致请求挂起)
const controller = new AbortController()
const timer = setTimeout(() => controller.abort(), 30000)
let response
try {
response = await fetch(apiUrl, {
method: 'POST',
headers,
body: JSON.stringify({
model: modelId,
messages: [
{ role: 'system', content: systemPrompt },
{ role: 'user', content: question }
],
temperature: modelConfig.temperature || 0.7,
max_tokens: modelConfig.maxTokens || 800,
top_p: modelConfig.topP || 1
}),
signal: controller.signal
})
})
} finally {
clearTimeout(timer)
}
if (!response.ok) {
const errorData = await response.json().catch(() => ({}))
@@ -144,8 +152,8 @@ async function tryModels(models, question, dimension, res, quota) {
const data = await response.json()
const message = data.choices[0].message
// 兼容标准 content 和 sensenova 的 reasoning 字段
const answer = message.content || message.reasoning || ''
// 兼容标准 content 与推理模型(sensenova reasoning / nvidia reasoning_content)
const answer = message.content || message.reasoning_content || message.reasoning || ''
// 扣除一次使用次数
await quota.useQuota()
+8 -5
View File
@@ -519,18 +519,21 @@ router.get('/me', async (req, res) => {
const decoded = jwt.verify(token, process.env.JWT_SECRET)
const user = await User.findById(decoded.userId)
if (!user) {
return ApiResponse.notFound(res, '用户不存在')
}
return ApiResponse.success(res, user)
} catch (error) {
if (error.name === 'JsonWebTokenError' || error.name === 'TokenExpiredError') {
return ApiResponse.unauthorized(res, '认证令牌无效或已过期')
}
logger.error('获取用户信息失败:', error)
return ApiResponse.serverError(res, error.message)
}
})
})
/**
* WebView Token 交换接口
@@ -568,7 +571,7 @@ router.post('/webview-token', async (req, res) => {
await recordLoginLog(
user._id,
openid,
'webview_auto_login',
'auto_login',
'wechat_webview',
'webview_h5',
req,
+89 -25
View File
@@ -80,6 +80,58 @@ router.post('/create-order', async (req, res) => {
}
})
/**
* 创建H5支付订单(微信H5支付)
* POST /api/payment/create-h5-order
*/
router.post('/create-h5-order', async (req, res) => {
try {
const user = req.user
const { productId, clientIp } = req.body
// 从数据库获取商品信息
const product = await ShopItem.findOne({ itemId: productId, status: 'active' })
if (!product) {
return ApiResponse.error(res, '无效商品 ID 或商品已下架', 400)
}
// 生成订单号
const orderNo = weChatService.generateOrderNo('WD')
// 创建订单记录
const order = new Order({
orderNo,
openid: user.openid,
userId: user._id,
productId,
productName: product.name,
amount: product.price,
status: 'pending'
})
await order.save()
// 调用微信支付H5下单
const h5PayParams = await weChatService.createH5PaymentOrder({
orderNo,
body: `宇之然-${product.name}`,
amount: product.price,
clientIp: clientIp || req.ip || req.connection.remoteAddress || '127.0.0.1'
})
return ApiResponse.success(res, {
orderNo,
productId,
productName: product.name,
amount: product.price,
h5Url: h5PayParams.h5Url
}, 'H5支付订单创建成功')
} catch (error) {
logger.error('创建H5订单失败:', error)
return ApiResponse.serverError(res, error.message)
}
})
/**
* 支付回调
* POST /api/payment/callback
@@ -149,42 +201,48 @@ router.post('/callback', async (req, res) => {
/**
* 验证支付结果
* POST /api/payment/verify
* 只有存在该用户真实已支付订单时才解锁商品,防止未支付直接解锁
*/
router.post('/verify', async (req, res) => {
try {
const user = req.user
const { productId, orderNo } = req.body
// 验证订单是否已处理
if (!orderNo || !productId) {
return ApiResponse.error(res, '缺少订单号或商品 ID', 400)
}
// 校验订单是否已支付,且属于当前用户
const order = await Order.findOne({
orderNo,
openid: user.openid,
status: { $in: ['paid', 'completed'] }
})
if (order) {
return ApiResponse.success(res, {
alreadyProcessed: true,
message: '订单已处理'
})
if (!order) {
return ApiResponse.error(res, '订单未支付,无法解锁商品', 400)
}
// 校验订单对应商品
if (order.productId !== productId) {
return ApiResponse.error(res, '订单与商品不匹配', 400)
}
// 获取商品信息
const product = await ShopItem.findOne({ itemId: productId, status: 'active' })
if (!product) {
return ApiResponse.error(res, `未知商品: ${productId}`, 400)
}
// 更新用户商品
let updateData = {}
// 解锁商品(幂等)
let alreadyUnlocked = false
if (product.type === 'skin') {
if (!user.ownedSkins.includes(productId)) {
user.ownedSkins.push(productId)
}
if (user.ownedSkins.includes(productId)) alreadyUnlocked = true
else user.ownedSkins.push(productId)
} else if (product.type === 'noad') {
alreadyUnlocked = user.isAdFree
user.isAdFree = true
} else if (product.type === 'subscription') {
alreadyUnlocked = user.isSubscriber
const expiry = new Date()
expiry.setDate(expiry.getDate() + (product.duration || 30))
user.isSubscriber = true
@@ -193,18 +251,18 @@ router.post('/verify', async (req, res) => {
await user.save()
// 记录订单
const newOrder = new Order({
orderNo,
openid: user.openid,
userId: user._id,
productId,
productName: product.name,
amount: product.price,
status: 'completed',
completedAt: new Date()
})
await newOrder.save()
// 订单已处理过则直接返回
if (order.status === 'completed') {
return ApiResponse.success(res, {
product,
message: alreadyUnlocked ? '权益已生效' : `${product.name} 已解锁!`
})
}
// 标记订单为已完成
order.status = 'completed'
order.completedAt = new Date()
await order.save()
return ApiResponse.success(res, {
product,
@@ -224,6 +282,7 @@ router.post('/verify', async (req, res) => {
*/
router.post('/refund', async (req, res) => {
try {
const user = req.user
const { orderNo, reason } = req.body
// 查询订单
@@ -232,6 +291,11 @@ router.post('/refund', async (req, res) => {
return ApiResponse.error(res, '订单不存在', 404)
}
// 权限校验:只能退自己的订单
if (order.openid !== user.openid) {
return ApiResponse.error(res, '无权操作该订单', 403)
}
if (order.status !== 'paid' && order.status !== 'completed') {
return ApiResponse.error(res, '订单状态不支持退款', 400)
}
+3 -2
View File
@@ -1,6 +1,7 @@
const express = require('express');
const router = express.Router();
const Trend = require('../models/Trend');
const { authMiddleware, requirePermission } = require('../middleware/auth');
/**
* 获取趋势列表
@@ -53,7 +54,7 @@ router.get('/:id', async (req, res) => {
* 管理员:创建趋势
* POST /api/trend/admin
*/
router.post('/admin', async (req, res) => {
router.post('/admin', authMiddleware, requirePermission('knowledge:write'), async (req, res) => {
try {
const trend = new Trend(req.body);
await trend.save();
@@ -67,7 +68,7 @@ router.post('/admin', async (req, res) => {
* 管理员:批量创建趋势(给 cron 用)
* POST /api/trend/admin/batch
*/
router.post('/admin/batch', async (req, res) => {
router.post('/admin/batch', authMiddleware, requirePermission('knowledge:write'), async (req, res) => {
try {
const { items } = req.body;
if (!Array.isArray(items) || items.length === 0) {
+5 -31
View File
@@ -1,6 +1,6 @@
const express = require('express')
const router = express.Router()
const { User, Order, Gallery } = require('../models')
const { User } = require('../models')
const ApiResponse = require('../utils/response')
const { userAuthMiddleware } = require('../middleware/auth')
const logger = require('../utils/logger')
@@ -345,10 +345,6 @@ router.get('/achievements', async (req, res) => {
router.get('/stats', async (req, res) => {
try {
const user = req.user
const { Gallery } = require('../models')
// 获取用户作品数
const worksCount = await Gallery.countDocuments({ userId: user._id })
// 获取等级信息
const levelInfo = user.getLevelInfo()
@@ -365,7 +361,7 @@ router.get('/stats', async (req, res) => {
nextLevelPoints: levelInfo.nextLevelPoints,
totalPlayTime: playTimeHours,
totalScore: user.totalScore || 0,
worksCount: worksCount,
worksCount: 0,
collectionCount: user.collectedKnowledge?.length || 0,
achievementCount: user.achievements?.length || 0,
unlockedDims: user.unlockedDims || [1]
@@ -380,39 +376,17 @@ router.get('/stats', async (req, res) => {
/**
* 获取用户作品列表
* GET /api/user/works
* 说明:画廊(Gallery)功能已移除,统一返回空列表
*/
router.get('/works', async (req, res) => {
try {
const user = req.user
const { page = 1, limit = 20 } = req.query
const { Gallery } = require('../models')
const query = { userId: user._id }
const total = await Gallery.countDocuments(query)
const works = await Gallery.find(query)
.sort({ createdAt: -1 })
.skip((parseInt(page) - 1) * parseInt(limit))
.limit(parseInt(limit))
.lean()
// 格式化作品数据
const formattedWorks = works.map(work => ({
id: work._id,
title: work.title,
description: work.description,
imageUrl: work.imageUrl,
dimension: work.dimension,
status: work.status,
likes: work.likes || 0,
views: work.views || 0,
createdAt: work.createdAt
}))
return ApiResponse.paginated(res, formattedWorks, {
return ApiResponse.paginated(res, [], {
page: parseInt(page),
limit: parseInt(limit),
total
total: 0
})
} catch (error) {
+113 -73
View File
@@ -1,4 +1,4 @@
#!/www/server/nodejs/v24.14.0/bin/node
#!/usr/bin/node
/**
* AI 趋势数据更新脚本 —— 真实数据版
* 数据源:
@@ -62,7 +62,7 @@ function getSource(url, from) {
function httpGet(url) {
return new Promise((resolve, reject) => {
https.get(url, { timeout: 12000 }, (res) => {
https.get(url, { timeout: 20000 }, (res) => {
let data = '';
res.on('data', c => data += c);
res.on('end', () => {
@@ -75,7 +75,12 @@ function httpGet(url) {
/** 从 Hacker News 获取 AI 相关热门(精确匹配) */
async function fetchHN() {
const ids = await httpGet('https://hacker-news.firebaseio.com/v0/topstories.json');
let ids;
for (let attempt = 1; attempt <= 3; attempt++) {
try { ids = await httpGet('https://hacker-news.firebaseio.com/v0/topstories.json'); break; }
catch (e) { console.log(` HN topstories 重试 ${attempt}: ${e.message}`); await new Promise(r => setTimeout(r, 500)); }
}
if (!Array.isArray(ids)) throw new Error('HN topstories 获取失败');
const batch = ids.slice(0, 120);
const results = await Promise.allSettled(
batch.map(id => httpGet(`https://hacker-news.firebaseio.com/v0/item/${id}.json`))
@@ -121,6 +126,7 @@ async function fetchArxiv() {
const date = new Date(pub);
return {
title, summary: summary || title,
body: summary, // arXiv 已经有完整摘要,直接作为正文
source: 'arXiv', sourceUrl: link,
category: '论文', tags: [], hot: date.getTime() > Date.now() - 2 * 86400000,
newsDate: date, status: 'published'
@@ -133,89 +139,112 @@ function hasChinese(text) {
return /[\u4e00-\u9fff]/.test(text);
}
/** 调用 AI 模型批量翻译英文标题和摘要到中文 */
// 合规底线:命中以下关键词的内容不发布(可在后续按需扩充)
const COMPLIANCE_BLOCKLIST = ['色情', '赌博', '博彩', '毒品', '暴力恐怖', '涉政敏感', '代开发票', '办证'];
function isCompliant(item) {
const text = [item.title, item.summary, item.body].filter(Boolean).join(' ');
return !COMPLIANCE_BLOCKLIST.some(w => text.includes(w));
}
// AI 模型统一从数据库 AIModel 集合读取(与线上 AI 问答同款,优先 SenseNova),避免硬编码失效密钥
let _models = null;
async function loadModels() {
if (_models) return _models;
try {
const AIModel = require('../models/AIModel');
_models = await AIModel.getActiveModels();
} catch (e) {
console.log(' ⚠ 读取 AIModel 失败:', e.message);
_models = [];
}
return _models;
}
/** 调用 AI(60s 超时 + 单次重试;自动在主备模型间切换;兼容 content / reasoning_content / reasoning) */
async function callAI(messages, maxTokens = 1024) {
const models = await loadModels();
if (!models.length) { console.log(' ⚠ 无可用 AI 模型,跳过本次 AI 处理'); return ''; }
let lastErr = null;
for (const m of models) {
for (let attempt = 1; attempt <= 2; attempt++) {
try {
const signal = AbortSignal.timeout(60000);
const res = await fetch(m.apiUrl, {
method: 'POST',
headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + m.apiKey },
body: JSON.stringify({ model: m.modelId, messages, temperature: 0.1, max_tokens: maxTokens }),
signal
});
const data = await res.json();
const msg = data?.choices?.[0]?.message || {};
const text = (msg.content || msg.reasoning_content || msg.reasoning || '').trim();
if (text) return text;
} catch (e) {
lastErr = e;
console.log(` ⚠ 模型 ${m.modelId} 第${attempt}次失败: ${e.message}`);
}
}
}
if (lastErr) console.log(' ⚠ 所有模型调用失败:', lastErr.message);
return '';
}
/** 翻译英文内容到中文 */
async function translateItems(items) {
const needTranslate = items.filter(i => !hasChinese(i.title));
if (needTranslate.length === 0) return items;
const apiUrl = process.env.OPENAI_API_URL || 'https://opencode.ai/zen/v1/chat/completions';
const apiKey = ''; // OpenCode Zen 无需 API Key
const model = process.env.OPENAI_MODEL || 'deepseek-v4-flash-free';
console.log(` → 翻译 ${needTranslate.length} 条英文内容...`);
const BATCH = 1;
// 分批翻译,每次最多 4 条
const BATCH = 4;
for (let i = 0; i < needTranslate.length; i += BATCH) {
const batch = needTranslate.slice(i, i + BATCH);
const input = batch.map((item, idx) => {
return `[${idx + 1}] Title: ${item.title}\nSummary: ${item.summary}`;
}).join('\n\n');
const prompt = `You are an AI news translator. Translate the following AI-related news headlines to Chinese.
Rules:
- Keep technical terms/model names/company names in English (e.g., GPT-4, arXiv, NVIDIA, GitHub, Qwen, Grok)
- Keep proper nouns like "Show HN:", "Mindwalk" untranslated
- Output ONLY a JSON array in this exact format, no other text:
[
{"title": "translated title 1", "summary": "translated summary 1"},
{"title": "translated title 2", "summary": "translated summary 2"}
]
News to translate:
${input}`;
const input = batch.map((item, idx) =>
`[${idx + 1}] Title: ${item.title}\nSummary: ${(item.summary || '').slice(0, 250)}`
).join('\n\n');
try {
const result = await httpPost(apiUrl, {
model,
messages: [{ role: 'user', content: prompt }],
temperature: 0.1,
max_tokens: 2048
}, apiKey);
const text = await callAI([{
role: 'user',
content: `Translate AI news to Chinese. Keep technical terms in English. Output ONLY this JSON array:\n[\n {"title":"chinese title","summary":"chinese summary"}\n]\n\nNews:\n${input}`
}], 400);
const text = result?.choices?.[0]?.message?.content || '';
console.log(` ↳ 翻译响应(前100): ${text.slice(0, 100)}`);
// 尝试提取 JSON - 用贪婪匹配(] 只在数组末尾出现)
const jsonMatch = text.match(/\[[\s\S]*\]/);
if (jsonMatch) {
// 尝试修复常见 JSON 截断问题
let jsonStr = jsonMatch[0];
try {
const translations = JSON.parse(jsonStr);
const translations = JSON.parse(jsonMatch[0]);
if (Array.isArray(translations)) {
translations.forEach((t, idx) => {
if (idx < batch.length && t.title) {
if (idx < batch.length && t.title && !hasChinese(batch[idx].title)) {
batch[idx].title = t.title;
if (t.summary) batch[idx].summary = t.summary;
}
});
continue;
}
} catch (parseErr) {
// 截断了,尝试逐行模式:按标题-摘要配对解析
console.log(` ↳ JSON 截断,尝试文本解析...`);
// 从响应中提取所有 title: 和 summary: 字段
const titles = [...jsonStr.matchAll(/"title"\s*:\s*"((?:[^"\\]|\\.)*)"/g)].map(m => m[1]);
const summaries = [...jsonStr.matchAll(/"summary"\s*:\s*"((?:[^"\\]|\\.)*)"/g)].map(m => m[1]);
titles.forEach((t, idx) => {
if (idx < batch.length && !hasChinese(batch[idx].title)) {
batch[idx].title = t;
if (summaries[idx]) batch[idx].summary = summaries[idx];
}
});
}
} else {
console.log(` ⚠ 批次 ${i / BATCH + 1} 解析失败: ${text.slice(0, 100)}`);
} catch (_) {}
// JSON 截断,尝试正则提取
const titles = [...jsonMatch[0].matchAll(/"title"\s*:\s*"((?:[^"\\]|\\.)*)"/g)].map(m => m[1]);
titles.forEach((t, idx) => {
if (idx < batch.length && !hasChinese(batch[idx].title)) batch[idx].title = t;
});
}
} catch (e) {
console.log(` ⚠ 翻译批次 ${i / BATCH + 1} 失败: ${e.message}`);
}
// 等一秒避免限流
if (i + BATCH < needTranslate.length) {
await new Promise(r => setTimeout(r, 1000));
}
if (i + BATCH < needTranslate.length) await new Promise(r => setTimeout(r, 500));
}
return items;
}
/** 为趋势生成正文内容:直接用已翻译的中文 summary 作为正文(避免长文本生成超时,保证稳定产出中文) */
async function enrichBody(items) {
const needBody = items.filter(i => !i.body);
if (needBody.length === 0) return items;
console.log(` → 正文使用中文摘要填充: ${needBody.length} 条`);
needBody.forEach(item => {
item.body = item.summary || item.title;
});
return items;
}
@@ -287,22 +316,34 @@ async function main() {
// 合并数据
let items = [...hn, ...arxiv];
// 如果不够,补保底
if (items.length < 6) {
const need = Math.min(FALLBACK.length, MAX_ITEMS - items.length);
const fallback = FALLBACK.slice(0, need).map(f => ({ ...f, newsDate: f.newsDate() }));
items.push(...fallback);
console.log(` ✓ 保底: ${need} 条`);
}
// 翻译英文内容为中文
if (items.length > 0) {
items = await translateItems(items);
}
// 清理旧数据
const cutoff = new Date(Date.now() - MAX_AGE_DAYS * 86400000);
const deleted = await Trend.deleteMany({ newsDate: { $lt: cutoff } });
// 生成正文内容(body 字段,中文)
if (items.length > 0) {
items = await enrichBody(items);
}
// 合规过滤:命中底线的内容不发布
items = items.filter(isCompliant);
console.log(` → 合规过滤后: ${items.length} 条`);
// 默认中文:丢弃翻译/生成后仍非中文的条目,保证 feed 全中文
items = items.filter(i => hasChinese(i.title));
console.log(` → 仅保留中文: ${items.length} 条`);
// 数量不足时用中文保底数据补充
if (items.length < 8) {
const need = Math.min(FALLBACK.length, MAX_ITEMS - items.length);
const fallback = FALLBACK.slice(0, need).map(f => ({ ...f, newsDate: f.newsDate() }));
items.push(...fallback);
console.log(` ✓ 中文保底补充: ${need} 条`);
}
// 全量刷新:清空旧数据(避免残留英文 / 测试数据)
await Trend.deleteMany({});
// 去重插入
let inserted = 0;
@@ -331,11 +372,10 @@ async function main() {
console.log(` HN=${hn.length} arXiv=${arxiv.length} 新增=${inserted} 数据库共=${finalCount} 条`);
if (items.length > 0) {
console.log('\n📰 最新趋势:');
console.log('\n📰 最新趋势(中文):');
items.slice(0, Math.min(items.length, 10)).forEach((t, i) => {
const tag = t.hot ? '🔥' : t.picked ? '📌' : ' ';
const cat = t.category?.padEnd(4) || '';
const date = t.newsDate ? new Date(t.newsDate).toLocaleDateString('zh-CN') : '';
const cat = (t.category || '').padEnd(4);
console.log(` ${tag} [${cat}] ${t.title} (${t.source})`);
});
}
+51 -1
View File
@@ -146,7 +146,7 @@ class WeChatService {
out_trade_no: orderNo,
notify_url: this.notifyUrl,
amount: {
total: Math.round(amount * 100), // 转换为分
total: Math.round(amount), // 金额单位已为分
currency: 'CNY'
},
payer: {
@@ -184,6 +184,56 @@ class WeChatService {
}
}
/**
* 创建H5支付订单(微信H5支付/MWEB)
* @param {Object} orderData - { orderNo, body, amount, clientIp, appId }
*/
async createH5PaymentOrder(orderData) {
const { orderNo, body, amount, clientIp, appId } = orderData
const nonceStr = this.generateNonceStr()
const timestamp = Math.floor(Date.now() / 1000).toString()
// 1. 统一下单 (H5 / MWEB)
const url = '/v3/pay/transactions/h5'
const fullUrl = `https://api.mch.weixin.qq.com${url}`
const orderParams = {
appid: appId || this.appId,
mchid: this.mchId,
description: body,
out_trade_no: orderNo,
notify_url: this.notifyUrl,
amount: {
total: Math.round(amount), // 金额单位已为分
currency: 'CNY'
},
scene_info: {
h5_info: {
type: 'Wap',
client_ip: clientIp
}
}
}
// 模拟返回 h5_url (生产环境需调用真实微信支付接口)
// 实际生产调用示例:
// const sign = this.generateSign('POST', url, timestamp, nonceStr, JSON.stringify(orderParams))
// const response = await axios.post(fullUrl, orderParams, {
// headers: { 'Authorization': `WECHATPAY2-SHA256-RSA2048 ${sign}` }
// })
// const h5Url = response.data.h5_url
// 模拟 H5 支付链接(生产环境由微信返回真实 MWEB_URL)
const mockH5Url = `https://wx.tenpay.com/cgi-bin/mmpayweb-bin/checkmweb?prepay_id=wx_mock_${Date.now()}&package=mock_${Date.now()}`
return {
h5Url: mockH5Url,
orderNo,
amount: Math.round(amount)
}
}
/**
* 申请退款
*/
+7 -1
View File
@@ -11,15 +11,21 @@ const Admin = require('../../src/models/Admin')
describe('Auth API', () => {
beforeAll(async () => {
// 连接测试数据库
const mongoURI = process.env.MONGODB_URI || 'mongodb://localhost:27017/wdkj'
const mongoURI = process.env.MONGODB_URI || 'mongodb://localhost:27017/wdkj_test'
if (mongoose.connection.readyState === 0) {
await mongoose.connect(mongoURI)
}
// 确保唯一索引已构建(dropDatabase 后 mongoose 不会自动重建)
await mongoose.connection.syncIndexes()
})
afterAll(async () => {
// 清理并关闭连接
if (mongoose.connection.readyState !== 0) {
// 防呆:只允许在测试库中 dropDatabase
if (mongoose.connection.name === 'wdkj') {
throw new Error('[安全] 不允许对生产数据库 wdkj 执行 dropDatabase')
}
await mongoose.connection.dropDatabase()
await mongoose.connection.close()
}
+170 -205
View File
@@ -1,205 +1,170 @@
/**
* 用户 API 集成测试
*/
const request = require('supertest')
const mongoose = require('mongoose')
const app = require('../../src/index')
const User = require('../../src/models/User')
const jwt = require('jsonwebtoken')
describe('User API', () => {
let testUser
let authToken
beforeAll(async () => {
const mongoURI = process.env.MONGODB_URI || 'mongodb://localhost:27017/wdkj'
if (mongoose.connection.readyState === 0) {
await mongoose.connect(mongoURI)
}
})
afterAll(async () => {
if (mongoose.connection.readyState !== 0) {
await mongoose.connection.dropDatabase()
await mongoose.connection.close()
}
})
beforeEach(async () => {
await User.deleteMany({})
// 创建测试用户
testUser = await User.create({
openid: 'test_user_openid',
nickName: '测试用户',
avatarUrl: 'https://example.com/avatar.jpg',
exploreData: {
dim1: { bestScore: 100, completed: true },
dim2: { bestArea: 200, completed: false }
},
totalScore: 300,
unlockedDims: [1, 2]
})
// 生成认证 Token
authToken = jwt.sign(
{ userId: testUser._id.toString(), openid: testUser.openid },
process.env.JWT_SECRET,
{ expiresIn: '1h' }
)
})
describe('GET /api/user/progress', () => {
test('应该返回用户探索进度', async () => {
const response = await request(app)
.get('/api/user/progress')
.set('Authorization', `Bearer ${authToken}`)
expect(response.status).toBe(200)
expect(response.body.success).toBe(true)
expect(response.body.data.exploreData).toBeDefined()
expect(response.body.data.exploreData.dim1.bestScore).toBe(100)
expect(response.body.data.exploreData.dim2.bestArea).toBe(200)
})
test('不存在的用户应该返回404', async () => {
const response = await request(app)
.get('/api/user/progress')
.set('Authorization', 'Bearer invalid_token')
expect(response.status).toBe(401)
})
})
describe('POST /api/user/progress', () => {
test('应该成功保存探索进度', async () => {
const response = await request(app)
.post('/api/user/progress')
.set('Authorization', `Bearer ${authToken}`)
.send({
dim: 1,
score: 150,
collectedEggs: 5
})
expect(response.status).toBe(200)
expect(response.body.success).toBe(true)
// 验证数据库更新
const updatedUser = await User.findOne({ openid: 'test_user_openid' })
expect(updatedUser.exploreData.dim1.bestScore).toBe(150)
expect(updatedUser.exploreData.dim1.collectedEggs).toBe(5)
})
test('新用户应该自动解锁维度', async () => {
const response = await request(app)
.post('/api/user/progress')
.set('Authorization', `Bearer ${authToken}`)
.send({
dim: 3,
score: 100
})
expect(response.status).toBe(200)
const updatedUser = await User.findOne({ openid: 'test_user_openid' })
expect(updatedUser.unlockedDims).toContain(3)
})
})
describe('GET /api/user/leaderboard', () => {
beforeEach(async () => {
// 创建多个测试用户
await User.create([
{ openid: 'user1', nickName: '用户1', totalScore: 500, dim1Score: 200 },
{ openid: 'user2', nickName: '用户2', totalScore: 300, dim1Score: 150 },
{ openid: 'user3', nickName: '用户3', totalScore: 400, dim1Score: 100 }
])
})
test('应该返回总分排行榜', async () => {
const response = await request(app)
.get('/api/user/leaderboard')
.query({ limit: 10 })
expect(response.status).toBe(200)
expect(response.body.success).toBe(true)
expect(response.body.data).toHaveLength(4) // 包含testUser
expect(response.body.data[0].totalScore).toBeGreaterThanOrEqual(
response.body.data[1].totalScore
)
})
test('应该返回维度排行榜', async () => {
const response = await request(app)
.get('/api/user/leaderboard')
.query({ dim: 1, limit: 10 })
expect(response.status).toBe(200)
expect(response.body.data[0].dim1Score).toBe(200)
})
test('应该限制返回数量', async () => {
const response = await request(app)
.get('/api/user/leaderboard')
.query({ limit: 2 })
expect(response.body.data).toHaveLength(2)
})
})
describe('PUT /api/user/info', () => {
test('应该成功更新用户信息', async () => {
const response = await request(app)
.put('/api/user/info')
.set('Authorization', `Bearer ${authToken}`)
.send({
nickName: '新名字',
avatarUrl: 'https://example.com/new-avatar.jpg'
})
expect(response.status).toBe(200)
expect(response.body.success).toBe(true)
const updatedUser = await User.findOne({ openid: 'test_user_openid' })
expect(updatedUser.nickName).toBe('新名字')
expect(updatedUser.avatarUrl).toBe('https://example.com/new-avatar.jpg')
})
})
describe('POST /api/user/collect-knowledge', () => {
test('应该成功收藏知识', async () => {
const knowledgeId = new mongoose.Types.ObjectId()
const response = await request(app)
.post('/api/user/collect-knowledge')
.set('Authorization', `Bearer ${authToken}`)
.send({ knowledgeId: knowledgeId.toString() })
expect(response.status).toBe(200)
expect(response.body.success).toBe(true)
const updatedUser = await User.findOne({ openid: 'test_user_openid' })
expect(updatedUser.collectedKnowledge).toContainEqual(knowledgeId)
})
test('重复收藏应该返回已存在', async () => {
const knowledgeId = new mongoose.Types.ObjectId()
// 第一次收藏
await request(app)
.post('/api/user/collect-knowledge')
.set('Authorization', `Bearer ${authToken}`)
.send({ knowledgeId: knowledgeId.toString() })
// 第二次收藏
const response = await request(app)
.post('/api/user/collect-knowledge')
.set('Authorization', `Bearer ${authToken}`)
.send({ knowledgeId: knowledgeId.toString() })
expect(response.status).toBe(200)
})
})
})
/**
* 用户 API 集成测试
*/
const request = require('supertest')
const mongoose = require('mongoose')
const app = require('../../src/index')
const User = require('../../src/models/User')
const jwt = require('jsonwebtoken')
describe('User API', () => {
let testUser
let authToken
beforeAll(async () => {
const mongoURI = process.env.MONGODB_URI || 'mongodb://localhost:27017/wdkj_test'
if (mongoose.connection.readyState === 0) {
await mongoose.connect(mongoURI)
}
// 确保唯一索引已构建(dropDatabase 后 mongoose 不会自动重建)
await mongoose.connection.syncIndexes()
})
afterAll(async () => {
if (mongoose.connection.readyState !== 0) {
// 防呆:只允许在测试库中 dropDatabase
if (mongoose.connection.name === 'wdkj') {
throw new Error('[安全] 不允许对生产数据库 wdkj 执行 dropDatabase')
}
await mongoose.connection.dropDatabase()
await mongoose.connection.close()
}
})
beforeEach(async () => {
await User.deleteMany({})
// 创建测试用户
testUser = await User.create({
openid: 'test_user_openid',
nickName: '测试用户',
avatarUrl: 'https://example.com/avatar.jpg',
exploreData: {
dim1: { bestScore: 100, completed: true },
dim2: { bestArea: 200, completed: false }
},
unlockedDims: [1, 2]
})
// 生成认证 Token
authToken = jwt.sign(
{ userId: testUser._id.toString(), openid: testUser.openid },
process.env.JWT_SECRET,
{ expiresIn: '1h' }
)
})
describe('GET /api/user/progress', () => {
test('应该返回用户探索进度', async () => {
const response = await request(app)
.get('/api/user/progress')
.set('Authorization', `Bearer ${authToken}`)
expect(response.status).toBe(200)
expect(response.body.success).toBe(true)
expect(response.body.data.isNewUser).toBe(false)
const userData = response.body.data.data
expect(userData.exploreData).toBeDefined()
expect(userData.exploreData.dim1.bestScore).toBe(100)
expect(userData.exploreData.dim2.bestArea).toBe(200)
})
test('无效 token 应该返回401', async () => {
const response = await request(app)
.get('/api/user/progress')
.set('Authorization', 'Bearer invalid_token')
expect(response.status).toBe(401)
})
})
describe('POST /api/user/progress', () => {
test('应该成功保存探索进度', async () => {
const response = await request(app)
.post('/api/user/progress')
.set('Authorization', `Bearer ${authToken}`)
.send({
dim: 'dim1',
data: { bestScore: 150 }
})
expect(response.status).toBe(200)
expect(response.body.success).toBe(true)
expect(response.body.data.totalScore).toBe(350)
// 验证数据库更新
const updatedUser = await User.findOne({ openid: 'test_user_openid' })
expect(updatedUser.exploreData.dim1.bestScore).toBe(150)
})
test('完成维度后应解锁下一维度', async () => {
const response = await request(app)
.post('/api/user/progress')
.set('Authorization', `Bearer ${authToken}`)
.send({
dim: 'dim2',
data: { completed: true, bestArea: 300 }
})
expect(response.status).toBe(200)
const updatedUser = await User.findOne({ openid: 'test_user_openid' })
expect(updatedUser.unlockedDims).toContain(3)
})
})
describe('GET /api/user/leaderboard', () => {
beforeEach(async () => {
// 创建多个测试用户(分数由 exploreData 派生)
await User.create([
{ openid: 'user1', nickName: '用户1', exploreData: { dim1: { bestScore: 500 } } },
{ openid: 'user2', nickName: '用户2', exploreData: { dim1: { bestScore: 300 } } },
{ openid: 'user3', nickName: '用户3', exploreData: { dim1: { bestScore: 400 } } }
])
})
test('应该返回总分排行榜', async () => {
const response = await request(app)
.get('/api/user/leaderboard')
.query({ limit: 10 })
expect(response.status).toBe(200)
expect(response.body.success).toBe(true)
expect(response.body.data).toHaveLength(4) // 包含testUser
expect(response.body.data[0].totalScore).toBeGreaterThanOrEqual(
response.body.data[1].totalScore
)
})
test('应该返回维度排行榜', async () => {
const response = await request(app)
.get('/api/user/leaderboard')
.query({ dim: 1, limit: 10 })
expect(response.status).toBe(200)
expect(response.body.data[0].dim1Score).toBe(500)
})
test('应该限制返回数量', async () => {
const response = await request(app)
.get('/api/user/leaderboard')
.query({ limit: 2 })
expect(response.body.data).toHaveLength(2)
})
})
describe('GET /api/user/achievements', () => {
test('应该返回成就列表', async () => {
const response = await request(app)
.get('/api/user/achievements')
.set('Authorization', `Bearer ${authToken}`)
expect(response.status).toBe(200)
expect(response.body.success).toBe(true)
expect(Array.isArray(response.body.data)).toBe(true)
expect(response.body.data.length).toBeGreaterThan(0)
})
})
})
+17
View File
@@ -5,11 +5,28 @@
// 增加测试超时时间
jest.setTimeout(30000)
// 测试环境必须使用独立的测试数据库,绝不能操作生产库(wdkj)
const TEST_DB_NAME = 'wdkj_test'
const DANGER_DB_NAMES = ['wdkj']
function assertTestDatabase() {
const mongoose = require('mongoose')
const name = mongoose.connection.name
if (!name) return
if (DANGER_DB_NAMES.includes(name)) {
throw new Error(
`[安全] 测试不允许连接生产数据库 "${name}"。请通过 MONGODB_URI 指定独立的测试数据库(如 ${TEST_DB_NAME})。`
)
}
}
// 全局清理
afterAll(async () => {
// 关闭所有数据库连接
const mongoose = require('mongoose')
if (mongoose.connection.readyState !== 0) {
// 防呆:确认当前不是生产库后才清理/关闭
assertTestDatabase()
await mongoose.connection.close()
}
})
+21 -12
View File
@@ -8,11 +8,17 @@ const User = require('../../src/models/User')
describe('User Model', () => {
beforeAll(async () => {
// 连接测试数据库
const mongoURI = process.env.MONGODB_URI || 'mongodb://localhost:27017/wdkj'
const mongoURI = process.env.MONGODB_URI || 'mongodb://localhost:27017/wdkj_test'
await mongoose.connect(mongoURI)
// 确保唯一索引已构建(dropDatabase 后 mongoose 不会自动重建)
await mongoose.connection.syncIndexes()
})
afterAll(async () => {
// 防呆:只允许在测试库中 dropDatabase
if (mongoose.connection.name === 'wdkj') {
throw new Error('[安全] 不允许对生产数据库 wdkj 执行 dropDatabase')
}
// 清理并关闭连接
await mongoose.connection.dropDatabase()
await mongoose.connection.close()
@@ -42,12 +48,15 @@ describe('User Model', () => {
expect(savedUser.totalScore).toBe(0)
})
test('openid 是必需的', async () => {
const user = new User({
nickName: '测试用户'
test('username 必须唯一', async () => {
await new User({ username: 'alice', nickName: '用户A' }).save()
const duplicateUser = new User({
username: 'alice',
nickName: '用户B'
})
await expect(user.save()).rejects.toThrow()
await expect(duplicateUser.save()).rejects.toThrow()
})
test('openid 必须唯一', async () => {
@@ -134,11 +143,11 @@ describe('User Model', () => {
describe('静态方法', () => {
test('getLeaderboard 应该返回排行榜', async () => {
// 创建测试用户
// 创建测试用户(分数由 exploreData 派生,保存时自动计算)
await User.create([
{ openid: 'user1', totalScore: 300, dim1Score: 100 },
{ openid: 'user2', totalScore: 500, dim1Score: 200 },
{ openid: 'user3', totalScore: 400, dim1Score: 150 }
{ openid: 'user1', exploreData: { dim1: { bestScore: 300 } } },
{ openid: 'user2', exploreData: { dim1: { bestScore: 500 } } },
{ openid: 'user3', exploreData: { dim1: { bestScore: 400 } } }
])
const leaderboard = await User.getLeaderboard(null, 10)
@@ -151,9 +160,9 @@ describe('User Model', () => {
test('getLeaderboard 应该支持按维度排序', async () => {
await User.create([
{ openid: 'user1', dim1Score: 100, totalScore: 100 },
{ openid: 'user2', dim1Score: 200, totalScore: 200 },
{ openid: 'user3', dim1Score: 150, totalScore: 150 }
{ openid: 'user1', exploreData: { dim1: { bestScore: 100 } } },
{ openid: 'user2', exploreData: { dim1: { bestScore: 200 } } },
{ openid: 'user3', exploreData: { dim1: { bestScore: 150 } } }
])
const leaderboard = await User.getLeaderboard(1, 10)