From a11bc1b2471e492a267e0dc18d29e60c9bb2f0c6 Mon Sep 17 00:00:00 2001
From: txai-dev <txai-dev@yzrcloud.cn>
Date: Sun, 13 Sep 2026 13:42:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=88=91=E7=9A=84=E9=A1=B5=E6=8C=89?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=86=B3=E5=AE=9A=E7=A7=BB=E9=99=A4=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E4=B8=80=E9=94=AE=E7=99=BB=E5=BD=95/=E6=9A=82?=
 =?UTF-8?q?=E4=B8=8D=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE=EF=BC=88=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E5=8D=A1=E4=B8=BA=E7=99=BB=E5=BD=95=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=89=EF=BC=9B=E7=89=88=E6=9C=AC=E5=8F=B7=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=20manifest=20=E5=8D=95=E4=B8=80=E6=9D=A5=E6=BA=90=EF=BC=88?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5+=E6=88=91=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=89=EF=BC=9B=E7=99=BB=E5=BD=95=E9=94=99=E8=AF=AF=E7=9C=9F?=
 =?UTF-8?q?=E5=AE=9E=E5=8E=9F=E5=9B=A0=E9=80=8F=E5=87=BA=E5=88=B0=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E4=B8=8E=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/pages/login/login.vue       |    3 +-
 client/src/pages/profile/profile.vue   |   61 +-
 client/src/pages/settings/settings.vue |    5 +-
 client/src/utils/version.ts            |    4 +
 server/src/routes/auth.js              | 1196 ++++++++++++------------
 5 files changed, 613 insertions(+), 656 deletions(-)
 create mode 100644 client/src/utils/version.ts

diff --git a/client/src/pages/login/login.vue b/client/src/pages/login/login.vue
index 201f5ae..975cce3 100644
--- a/client/src/pages/login/login.vue
+++ b/client/src/pages/login/login.vue
@@ -219,7 +219,8 @@ const wechatLogin = async () => {
     uni.showToast({ title: '登录成功', icon: 'success' })
     setTimeout(() => uni.switchTab({ url: '/pages/index/index' }), 1000)
   } catch (err) {
-    uni.showToast({ title: '登录失败，请重试', icon: 'none' })
+    const msg = (err && (err.message || err.errMsg)) || ''
+    uni.showToast({ title: msg ? `登录失败：${msg}` : '登录失败，请重试', icon: 'none' })
   } finally {
     loading.value = false
   }
diff --git a/client/src/pages/profile/profile.vue b/client/src/pages/profile/profile.vue
index 0381478..5f85216 100644
--- a/client/src/pages/profile/profile.vue
+++ b/client/src/pages/profile/profile.vue
@@ -122,22 +122,15 @@
       </view>
     </view>
 
-    <!-- 登录/退出 -->
+    <!-- 登录入口：统一走上方订阅卡（登录后升级）；H5 保留登录/注册快捷按钮 -->
     <view class="action-row" v-if="!userStore.isLoggedIn">
-      <!-- 小程序：就地微信一键登录，不跳登录页 -->
-      <!-- #ifdef MP-WEIXIN -->
-      <view class="action-btn primary" :class="{ disabled: loginLoading }" @click="wechatLogin">
-        <text>{{ loginLoading ? '登录中...' : '微信一键登录' }}</text>
-      </view>
-      <!-- #endif -->
-      <!-- H5：登录页是正常入口（邮箱/用户名登录） -->
       <!-- #ifdef H5 -->
       <view class="action-btn primary" @click="goLogin">
         <text>登录 / 注册</text>
       </view>
       <!-- #endif -->
-      <view class="action-btn ghost" @click="goBrowse">
-        <text>暂不登录，先体验</text>
+      <view class="action-btn ghost" @click="goLogin">
+        <text>去登录，同步点亮进度</text>
       </view>
     </view>
     <view class="action-btn logout" v-else @click="handleLogout">
@@ -155,8 +148,8 @@ import { useUserStore } from '@/stores/user'
 import { knowledgeApi, aiChatApi } from '@/utils/api'
 import { DIMENSIONS } from '@/utils/dimensions'
 import AppIcon from '@/components/AppIcon.vue'
+import { APP_VERSION } from '@/utils/version'
 
-const VERSION = '1.2.0'
 const SUB_GUEST = '游客 · 点亮进度保存在本机，登录后同步'
 const SUB_USER = '已点亮 {n} 颗星球 · 连续 {d} 天'
 const PLAN_FREE = '✦ 免费版'
@@ -169,9 +162,8 @@ const collectedCount = ref(0)
 const stats = ref(null)
 const byDim = ref({})
 const quotaInfo = ref(null)
-const loginLoading = ref(false)
 
-const versionText = VERSION
+const versionText = APP_VERSION
 
 const profileSubText = computed(() => {
   if (!userStore.isLoggedIn) return SUB_GUEST
@@ -269,49 +261,6 @@ async function handleLogout() {
 
 function goLogin() { uni.navigateTo({ url: '/pages/login/login' }) }
 
-// 小程序端：我的页就地微信一键登录（登录页保留为账号登录入口）
-// #ifdef MP-WEIXIN
-async function wechatLogin() {
-  if (loginLoading.value) return
-  const agreed = uni.getStorageSync('wx_login_agreed')
-  if (!agreed) {
-    uni.showModal({
-      title: '用户协议',
-      content: '登录即表示同意《用户协议》与《隐私政策》',
-      confirmText: '同意并登录',
-      cancelText: '取消',
-      success: (res) => {
-        if (res.confirm) {
-          uni.setStorageSync('wx_login_agreed', '1')
-          doWechatLogin()
-        }
-      }
-    })
-    return
-  }
-  doWechatLogin()
-}
-
-async function doWechatLogin() {
-  loginLoading.value = true
-  try {
-    const loginRes = await new Promise((resolve, reject) => {
-      uni.login({ success: resolve, fail: reject })
-    })
-    if (!loginRes.code) throw new Error('no code')
-    await userStore.login(loginRes.code, {})
-    uni.showToast({ title: '登录成功', icon: 'success' })
-    // 登录后原地刷新档案数据，无需跳页
-    await userStore.fetchMe()
-    await Promise.all([loadStats(), loadCollected(), loadQuota()])
-  } catch (e) {
-    uni.showToast({ title: '登录失败，请重试', icon: 'none' })
-  } finally {
-    loginLoading.value = false
-  }
-}
-// #endif
-function goBrowse() { uni.switchTab({ url: '/pages/index/index' }) }
 function goChat() { uni.switchTab({ url: '/pages/chat/chat' }) }
 function goFavorites() { uni.navigateTo({ url: '/pages/favorites/favorites' }) }
 function goProgress() { uni.navigateTo({ url: '/pages/progress/progress' }) }
diff --git a/client/src/pages/settings/settings.vue b/client/src/pages/settings/settings.vue
index 5ec59eb..e1e78e5 100644
--- a/client/src/pages/settings/settings.vue
+++ b/client/src/pages/settings/settings.vue
@@ -59,11 +59,12 @@
       </view>
     </view>
 
-    <text class="version">宇之然 AI 维度 v1.0.0</text>
+    <text class="version">宇之然 AI 维度 v{{ appVersion }}</text>
   </view>
 </template>
 
 <script setup>
+import { APP_VERSION as appVersion } from '@/utils/version'
 import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
 
 import { ref, onMounted } from 'vue'
@@ -123,7 +124,7 @@ function applyTabBarTheme(theme) {
 function showAbout() {
   uni.showModal({
     title: '关于「宇之然AI维度」',
-    content: '宇之然 AI 维度 v1.0.0\n从 5 个维度系统理解人工智能\n© 2026 宇之然',
+    content: `宇之然AI维度 v${appVersion}\n从 5 个维度系统理解人工智能\n© 2026 宇之然`,
     showCancel: false
   })
 }
diff --git a/client/src/utils/version.ts b/client/src/utils/version.ts
new file mode 100644
index 0000000..f9ec570
--- /dev/null
+++ b/client/src/utils/version.ts
@@ -0,0 +1,4 @@
+// 版本号唯一来源：manifest.json 的 versionName（发布流程改那里，见 docs/版本规则.md）
+import manifest from '@/manifest.json'
+
+export const APP_VERSION: string = (manifest as any).versionName || '1.0.0'
diff --git a/server/src/routes/auth.js b/server/src/routes/auth.js
index 2665240..f3f26c1 100755
--- a/server/src/routes/auth.js
+++ b/server/src/routes/auth.js
@@ -1,598 +1,600 @@
-const express = require('express')
-const router = express.Router()
-const jwt = require('jsonwebtoken')
-const { User, Admin, AdminLog, LoginLog, VerificationCode } = require('../models')
-const ApiResponse = require('../utils/response')
-const weChatService = require('../utils/weixin')
-const logger = require('../utils/logger')
-const { sendVerificationCode } = require('../utils/mail')
-const axios = require('axios')
-
-/**
- * 获取客户端IP
- */
-const getClientIp = (req) => {
-  return req.headers['x-forwarded-for'] ||
-    req.headers['x-real-ip'] ||
-    req.connection.remoteAddress ||
-    req.socket.remoteAddress ||
-    '0.0.0.0'
-}
-
-/**
- * 解析User-Agent
- */
-const parseUserAgent = (userAgent) => {
-  if (!userAgent) return { device: '', os: '', browser: '' }
-  
-  const device = /Mobile|Android|iPhone|iPad|iPod/i.test(userAgent) ? 'mobile' : 'desktop'
-  
-  let os = ''
-  if (/Windows/i.test(userAgent)) os = 'Windows'
-  else if (/Mac OS X/i.test(userAgent)) os = 'MacOS'
-  else if (/Android/i.test(userAgent)) os = 'Android'
-  else if (/iOS|iPhone|iPad|iPod/i.test(userAgent)) os = 'iOS'
-  else if (/Linux/i.test(userAgent)) os = 'Linux'
-  else os = 'Unknown'
-  
-  let browser = ''
-  if (/MicroMessenger/i.test(userAgent)) browser = 'WeChat'
-  else if (/Chrome/i.test(userAgent)) browser = 'Chrome'
-  else if (/Safari/i.test(userAgent)) browser = 'Safari'
-  else if (/Firefox/i.test(userAgent)) browser = 'Firefox'
-  else if (/Edge/i.test(userAgent)) browser = 'Edge'
-  else browser = 'Unknown'
-  
-  return { device, os, browser }
-}
-
-/**
- * 记录登录日志
- */
-const recordLoginLog = async (userId, openid, type, method, source, req, success = true, failReason = '') => {
-  try {
-    const ip = getClientIp(req)
-    const userAgent = req.headers['user-agent'] || ''
-    const { device, os, browser } = parseUserAgent(userAgent)
-    
-    await LoginLog.create({
-      userId,
-      openid,
-      type,
-      method,
-      source,
-      ip,
-      userAgent,
-      device,
-      os,
-      browser,
-      success,
-      failReason
-    })
-  } catch (error) {
-    logger.error('记录登录日志失败:', error)
-  }
-}
-
-/**
- * 小程序登录
- * POST /api/auth/login
- */
-router.post('/login', async (req, res) => {
-  try {
-    const { code, userInfo, source = 'miniapp' } = req.body
-    
-    // 方式1: 通过 code 登录（推荐）
-    let openid = null
-    if (code) {
-      const sessionData = await weChatService.code2Session(code)
-      openid = sessionData.openid
-    }
-    
-    // 方式2: 开发环境直接使用 openid (已废弃，仅用于本地调试)
-    if (!openid && process.env.NODE_ENV === 'development' && req.body.openid) {
-      openid = req.body.openid
-    }
-    
-    if (!openid) {
-      return ApiResponse.error(res, '无法获取用户标识', 400)
-    }
-    
-    // 查找或创建用户
-    let user = await User.findOne({ openid })
-    let isNewUser = false
-    
-    if (!user) {
-      // 新用户
-      user = new User({
-        openid,
-        nickName: userInfo?.nickName || '星辰旅行者',
-        avatarUrl: userInfo?.avatarUrl || '',
-        unlockedDims: [1]
-      })
-      isNewUser = true
-      logger.info(`新用户注册: ${openid}`)
-    } else {
-      // 老用户，更新登录时间
-      user.lastLoginAt = new Date()
-      if (userInfo?.nickName) user.nickName = userInfo.nickName
-      if (userInfo?.avatarUrl) user.avatarUrl = userInfo.avatarUrl
-    }
-    
-    await user.save()
-    
-    // 记录登录日志
-    await recordLoginLog(
-      user._id,
-      openid,
-      isNewUser ? 'register' : 'login',
-      'wechat_miniapp',
-      source,
-      req,
-      true
-    )
-    
-    // 生成 JWT token（可选，小程序通常不需要）
-    const token = jwt.sign(
-      { openid, userId: user._id },
-      process.env.JWT_SECRET,
-      { expiresIn: process.env.JWT_EXPIRE }
-    )
-    
-    return ApiResponse.success(res, {
-      token,
-      openid,
-      isNewUser,
-      userInfo: {
-        nickName: user.nickName,
-        avatarUrl: user.avatarUrl
-      },
-      firstPlayDate: user.createdAt
-    }, isNewUser ? '注册成功' : '登录成功')
-    
-  } catch (error) {
-    logger.error('登录失败:', error)
-    return ApiResponse.serverError(res, error.message)
-  }
-})
-
-/**
- * WebView 静默登录
- * POST /api/auth/webview-login
- * 用于微信小程序 webview 内嵌 H5 的自动登录
- */
-router.post('/webview-login', async (req, res) => {
-  try {
-    const { code, userInfo } = req.body
-    
-    if (!code) {
-      return ApiResponse.error(res, '缺少登录凭证', 400)
-    }
-    
-    // 通过 code 获取 openid
-    let openid = null
-    try {
-      const sessionData = await weChatService.code2Session(code)
-      openid = sessionData.openid
-    } catch (error) {
-      logger.error('WebView登录获取session失败:', error)
-      return ApiResponse.error(res, '登录凭证无效', 401)
-    }
-    
-    if (!openid) {
-      return ApiResponse.error(res, '无法获取用户标识', 400)
-    }
-    
-    // 查找或创建用户
-    let user = await User.findOne({ openid })
-    let isNewUser = false
-    
-    if (!user) {
-      // 新用户 - 使用微信提供的信息创建账户
-      user = new User({
-        openid,
-        nickName: userInfo?.nickName || '星辰旅行者',
-        avatarUrl: userInfo?.avatarUrl || '',
-        unlockedDims: [1]
-      })
-      isNewUser = true
-      logger.info(`WebView新用户注册: ${openid}`)
-    } else {
-      // 老用户，更新登录时间和信息
-      user.lastLoginAt = new Date()
-      if (userInfo?.nickName) user.nickName = userInfo.nickName
-      if (userInfo?.avatarUrl) user.avatarUrl = userInfo.avatarUrl
-      logger.info(`WebView老用户登录: ${openid}`)
-    }
-    
-    await user.save()
-    
-    // 记录登录日志
-    await recordLoginLog(
-      user._id,
-      openid,
-      isNewUser ? 'register' : 'auto_login',
-      'wechat_webview',
-      'webview',
-      req,
-      true
-    )
-    
-    // 生成 JWT token
-    const token = jwt.sign(
-      { openid, userId: user._id },
-      process.env.JWT_SECRET,
-      { expiresIn: process.env.JWT_EXPIRE }
-    )
-    
-    return ApiResponse.success(res, {
-      token,
-      openid,
-      isNewUser,
-      userInfo: {
-        nickName: user.nickName,
-        avatarUrl: user.avatarUrl
-      },
-      firstPlayDate: user.createdAt
-    }, isNewUser ? '注册成功' : '自动登录成功')
-    
-  } catch (error) {
-    logger.error('WebView登录失败:', error)
-    return ApiResponse.serverError(res, error.message)
-  }
-})
-
-/**
- * 管理员登录
- * POST /api/auth/admin/login
- */
-router.post('/admin/login', async (req, res) => {
-  try {
-    const { username, password } = req.body
-    
-    // 查找管理员
-    const admin = await Admin.findOne({ username })
-    if (!admin) {
-      return ApiResponse.error(res, '用户名或密码错误', 401)
-    }
-    
-    // 验证密码
-    const isMatch = await admin.validatePassword(password)
-    if (!isMatch) {
-      return ApiResponse.error(res, '用户名或密码错误', 401)
-    }
-    
-    // 检查状态
-    if (admin.status !== 'active') {
-      return ApiResponse.error(res, '账户已禁用', 403)
-    }
-    
-    // 更新登录信息
-    admin.lastLogin = new Date()
-    admin.lastLoginIp = req.ip
-    admin.loginCount += 1
-    await admin.save()
-    
-    // 记录日志
-    await AdminLog.create({
-      adminId: admin._id,
-      adminName: admin.username,
-      action: 'login',
-      resource: 'system',
-      ip: req.ip,
-      userAgent: req.get('User-Agent')
-    })
-    
-    // 生成 JWT token
-    const token = jwt.sign(
-      { adminId: admin._id, role: admin.role },
-      process.env.JWT_SECRET,
-      { expiresIn: process.env.JWT_EXPIRE }
-    )
-    
-    // 获取权限
-    const permissions = Admin.getPermissionsByRole(admin.role)
-    
-    return ApiResponse.success(res, {
-      token,
-      adminId: admin._id,
-      username: admin.username,
-      role: admin.role,
-      permissions
-    }, '登录成功')
-    
-  } catch (error) {
-    logger.error('管理员登录失败:', error)
-    return ApiResponse.serverError(res, error.message)
-  }
-})
-
-/**
- * H5环境用户名密码登录
- * POST /api/auth/user/login
- */
-router.post('/user/login', async (req, res) => {
-  try {
-    const { username, email, password } = req.body
-    // 支持邮箱或用户名登录
-    const identifier = email || username
-    
-    // 查找用户（显式包含密码字段）
-    const user = await User.findOne({
-      $or: [
-        { email: identifier },
-        { username: identifier }
-      ]
-    }).select('+password')
-    if (!user) {
-      return ApiResponse.error(res, '用户名或密码错误', 401)
-    }
-    
-    // 验证密码
-    const isMatch = await user.validatePassword(password)
-    if (!isMatch) {
-      return ApiResponse.error(res, '用户名或密码错误', 401)
-    }
-    
-    // 更新登录时间
-    user.lastLoginAt = new Date()
-    await user.save()
-    
-    // 生成 JWT token
-    const token = jwt.sign(
-      { userId: user._id, openid: user.openid },
-      process.env.JWT_SECRET,
-      { expiresIn: process.env.JWT_EXPIRE }
-    )
-    
-    return ApiResponse.success(res, {
-      token,
-      userId: user._id,
-      openid: user.openid,
-      userInfo: {
-        nickName: user.nickName,
-        avatarUrl: user.avatarUrl
-      },
-      firstPlayDate: user.createdAt
-    }, '登录成功')
-    
-  } catch (error) {
-      logger.error('用户登录失败:', error)
-      return ApiResponse.serverError(res, error.message)
-    }
-  })
-
-  /**
-   * 发送邮箱验证码
-   * POST /api/auth/user/send-code
-   */
-  router.post('/user/send-code', async (req, res) => {
-    try {
-      const { email } = req.body
-      if (!email || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
-        return ApiResponse.error(res, '邮箱格式不正确', 400)
-      }
-
-      // 检查邮箱是否已被注册
-      const existing = await User.findOne({ email })
-      if (existing) {
-        return ApiResponse.error(res, '该邮箱已被注册', 400)
-      }
-
-      // 检查发送频率（1分钟内只能发一次）
-      const recent = await VerificationCode.findOne({
-        email,
-        createdAt: { $gte: new Date(Date.now() - 60000) }
-      })
-      if (recent) {
-        return ApiResponse.error(res, '发送过于频繁，请 1 分钟后再试', 429)
-      }
-
-      // 生成6位随机验证码
-      const code = String(Math.floor(100000 + Math.random() * 900000))
-
-      // 10分钟过期
-      const expiresAt = new Date(Date.now() + 10 * 60 * 1000)
-
-      // 使之前的验证码失效
-      await VerificationCode.updateMany({ email, used: false }, { $set: { used: true } })
-
-      // 保存新验证码
-      await VerificationCode.create({ email, code, expiresAt })
-
-      // 发送邮件
-      const result = await sendVerificationCode(email, code)
-
-      if (result.success) {
-        return ApiResponse.success(res, {
-          devCode: result.devCode || undefined
-        }, '验证码已发送')
-      } else {
-        return ApiResponse.error(res, '验证码发送失败，请稍后重试', 500)
-      }
-    } catch (error) {
-      logger.error('发送验证码失败:', error)
-      return ApiResponse.serverError(res, error.message)
-    }
-  })
-
-  /**
-   * H5环境用户注册（需邮箱验证码）
-   * POST /api/auth/user/register
-   */
-router.post('/user/register', async (req, res) => {
-  try {
-    const { username, email, password, nickName, avatarUrl, verifyCode } = req.body
-    const identifier = email || username
-    
-    if (!identifier) {
-      return ApiResponse.error(res, '请输入邮箱或用户名', 400)
-    }
-    
-    if (!email) {
-      return ApiResponse.error(res, '邮箱为必填项', 400)
-    }
-    
-    // 验证邮箱验证码
-    if (!verifyCode) {
-      return ApiResponse.error(res, '请输入邮箱验证码', 400)
-    }
-    const validCode = await VerificationCode.findOne({
-      email,
-      code: verifyCode,
-      used: false,
-      expiresAt: { $gt: new Date() }
-    })
-    if (!validCode) {
-      return ApiResponse.error(res, '验证码无效或已过期', 400)
-    }
-    
-    // 检查邮箱是否已存在
-    if (email) {
-      const existingEmail = await User.findOne({ email })
-      if (existingEmail) {
-        return ApiResponse.error(res, '该邮箱已被注册', 400)
-      }
-    }
-    
-    // 检查用户名是否已存在
-    if (username) {
-      const existingUser = await User.findOne({ username })
-      if (existingUser) {
-        return ApiResponse.error(res, '用户名已存在', 400)
-      }
-    }
-    
-    // 标记验证码为已使用
-    validCode.used = true
-    await validCode.save()
-    
-    // 自动生成用户名（若未提供）
-    const finalUsername = username || email.split('@')[0]
-    
-    // 创建新用户
-    const user = new User({
-      username: finalUsername,
-      email: email || '',
-      password,
-      nickName: nickName || '星辰旅行者',
-      avatarUrl: avatarUrl || '',
-      unlockedDims: [1]
-    })
-    await user.save()
-    
-    logger.info(`新用户注册: ${username}`)
-    
-    // 生成 JWT token
-    const token = jwt.sign(
-      { userId: user._id },
-      process.env.JWT_SECRET,
-      { expiresIn: process.env.JWT_EXPIRE }
-    )
-    
-    return ApiResponse.success(res, {
-      token,
-      userId: user._id,
-      userInfo: {
-        nickName: user.nickName,
-        avatarUrl: user.avatarUrl
-      }
-    }, '注册成功')
-    
-  } catch (error) {
-    logger.error('用户注册失败:', error)
-    return ApiResponse.serverError(res, error.message)
-  }
-})
-
-/**
- * 获取当前用户信息
- * GET /api/auth/me
- */
-router.get('/me', async (req, res) => {
-  try {
-    const token = req.header('Authorization')?.replace('Bearer ', '')
-    
-    if (!token) {
-      return ApiResponse.unauthorized(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)
-  }
+const express = require('express')
+const router = express.Router()
+const jwt = require('jsonwebtoken')
+const { User, Admin, AdminLog, LoginLog, VerificationCode } = require('../models')
+const ApiResponse = require('../utils/response')
+const weChatService = require('../utils/weixin')
+const logger = require('../utils/logger')
+const { sendVerificationCode } = require('../utils/mail')
+const axios = require('axios')
+
+/**
+ * 获取客户端IP
+ */
+const getClientIp = (req) => {
+  return req.headers['x-forwarded-for'] ||
+    req.headers['x-real-ip'] ||
+    req.connection.remoteAddress ||
+    req.socket.remoteAddress ||
+    '0.0.0.0'
+}
+
+/**
+ * 解析User-Agent
+ */
+const parseUserAgent = (userAgent) => {
+  if (!userAgent) return { device: '', os: '', browser: '' }
+  
+  const device = /Mobile|Android|iPhone|iPad|iPod/i.test(userAgent) ? 'mobile' : 'desktop'
+  
+  let os = ''
+  if (/Windows/i.test(userAgent)) os = 'Windows'
+  else if (/Mac OS X/i.test(userAgent)) os = 'MacOS'
+  else if (/Android/i.test(userAgent)) os = 'Android'
+  else if (/iOS|iPhone|iPad|iPod/i.test(userAgent)) os = 'iOS'
+  else if (/Linux/i.test(userAgent)) os = 'Linux'
+  else os = 'Unknown'
+  
+  let browser = ''
+  if (/MicroMessenger/i.test(userAgent)) browser = 'WeChat'
+  else if (/Chrome/i.test(userAgent)) browser = 'Chrome'
+  else if (/Safari/i.test(userAgent)) browser = 'Safari'
+  else if (/Firefox/i.test(userAgent)) browser = 'Firefox'
+  else if (/Edge/i.test(userAgent)) browser = 'Edge'
+  else browser = 'Unknown'
+  
+  return { device, os, browser }
+}
+
+/**
+ * 记录登录日志
+ */
+const recordLoginLog = async (userId, openid, type, method, source, req, success = true, failReason = '') => {
+  try {
+    const ip = getClientIp(req)
+    const userAgent = req.headers['user-agent'] || ''
+    const { device, os, browser } = parseUserAgent(userAgent)
+    
+    await LoginLog.create({
+      userId,
+      openid,
+      type,
+      method,
+      source,
+      ip,
+      userAgent,
+      device,
+      os,
+      browser,
+      success,
+      failReason
+    })
+  } catch (error) {
+    logger.error('记录登录日志失败:', error)
+  }
+}
+
+/**
+ * 小程序登录
+ * POST /api/auth/login
+ */
+router.post('/login', async (req, res) => {
+  try {
+    const { code, userInfo, source = 'miniapp' } = req.body
+    
+    // 方式1: 通过 code 登录（推荐）
+    let openid = null
+    if (code) {
+      const sessionData = await weChatService.code2Session(code)
+      openid = sessionData.openid
+    }
+    
+    // 方式2: 开发环境直接使用 openid (已废弃，仅用于本地调试)
+    if (!openid && process.env.NODE_ENV === 'development' && req.body.openid) {
+      openid = req.body.openid
+    }
+    
+    if (!openid) {
+      return ApiResponse.error(res, '无法获取用户标识', 400)
+    }
+    
+    // 查找或创建用户
+    let user = await User.findOne({ openid })
+    let isNewUser = false
+    
+    if (!user) {
+      // 新用户
+      user = new User({
+        openid,
+        nickName: userInfo?.nickName || '星辰旅行者',
+        avatarUrl: userInfo?.avatarUrl || '',
+        unlockedDims: [1]
+      })
+      isNewUser = true
+      logger.info(`新用户注册: ${openid}`)
+    } else {
+      // 老用户，更新登录时间
+      user.lastLoginAt = new Date()
+      if (userInfo?.nickName) user.nickName = userInfo.nickName
+      if (userInfo?.avatarUrl) user.avatarUrl = userInfo.avatarUrl
+    }
+    
+    await user.save()
+    
+    // 记录登录日志
+    await recordLoginLog(
+      user._id,
+      openid,
+      isNewUser ? 'register' : 'login',
+      'wechat_miniapp',
+      source,
+      req,
+      true
+    )
+    
+    // 生成 JWT token（可选，小程序通常不需要）
+    const token = jwt.sign(
+      { openid, userId: user._id },
+      process.env.JWT_SECRET,
+      { expiresIn: process.env.JWT_EXPIRE }
+    )
+    
+    return ApiResponse.success(res, {
+      token,
+      openid,
+      isNewUser,
+      userInfo: {
+        nickName: user.nickName,
+        avatarUrl: user.avatarUrl
+      },
+      firstPlayDate: user.createdAt
+    }, isNewUser ? '注册成功' : '登录成功')
+    
+  } catch (error) {
+    // 空message的错误也要留下可诊断线索（微信侧errmsg/错误名）
+    const detail = (error && (error.message || error.errmsg)) || (error && error.name) || '未知错误'
+    logger.error('登录失败:', error, '| detail:', detail)
+    return ApiResponse.error(res, detail ? `登录失败：${detail}` : '登录服务异常，请稍后再试', 500)
+  }
 })
-
-/**
- * WebView Token 交换接口
- * POST /api/auth/webview-token
- * 用于小程序 WebView 内嵌 H5 时，通过 openid 获取登录 token
- * 小程序在 URL 中传递 openid，H5 用这个接口换取 token
- */
-router.post('/webview-token', async (req, res) => {
-  try {
-    const { openid } = req.body
-    
-    if (!openid) {
-      return ApiResponse.error(res, '缺少用户标识', 400)
-    }
-    
-    // 查找用户
-    const user = await User.findOne({ openid })
-    
-    if (!user) {
-      return ApiResponse.error(res, '用户不存在', 404)
-    }
-    
-    // 生成新的 JWT token
-    const token = jwt.sign(
-      { openid, userId: user._id },
-      process.env.JWT_SECRET,
-      { expiresIn: process.env.JWT_EXPIRE }
-    )
-    
-    // 更新最后登录时间
-    user.lastLoginAt = new Date()
-    await user.save()
-    
-    // 记录登录日志
-    await recordLoginLog(
-      user._id,
-      openid,
-      'auto_login',
-      'wechat_webview',
-      'webview_h5',
-      req,
-      true
-    )
-    
-    logger.info(`WebView Token交换成功: ${openid}`)
-    
-    return ApiResponse.success(res, {
-      token,
-      openid,
-      userInfo: {
-        nickName: user.nickName,
-        avatarUrl: user.avatarUrl
-      }
-    }, '登录成功')
-    
-  } catch (error) {
-    logger.error('WebView Token交换失败:', error)
-    return ApiResponse.serverError(res, error.message)
-  }
-})
-
-module.exports = router
+
+/**
+ * WebView 静默登录
+ * POST /api/auth/webview-login
+ * 用于微信小程序 webview 内嵌 H5 的自动登录
+ */
+router.post('/webview-login', async (req, res) => {
+  try {
+    const { code, userInfo } = req.body
+    
+    if (!code) {
+      return ApiResponse.error(res, '缺少登录凭证', 400)
+    }
+    
+    // 通过 code 获取 openid
+    let openid = null
+    try {
+      const sessionData = await weChatService.code2Session(code)
+      openid = sessionData.openid
+    } catch (error) {
+      logger.error('WebView登录获取session失败:', error)
+      return ApiResponse.error(res, '登录凭证无效', 401)
+    }
+    
+    if (!openid) {
+      return ApiResponse.error(res, '无法获取用户标识', 400)
+    }
+    
+    // 查找或创建用户
+    let user = await User.findOne({ openid })
+    let isNewUser = false
+    
+    if (!user) {
+      // 新用户 - 使用微信提供的信息创建账户
+      user = new User({
+        openid,
+        nickName: userInfo?.nickName || '星辰旅行者',
+        avatarUrl: userInfo?.avatarUrl || '',
+        unlockedDims: [1]
+      })
+      isNewUser = true
+      logger.info(`WebView新用户注册: ${openid}`)
+    } else {
+      // 老用户，更新登录时间和信息
+      user.lastLoginAt = new Date()
+      if (userInfo?.nickName) user.nickName = userInfo.nickName
+      if (userInfo?.avatarUrl) user.avatarUrl = userInfo.avatarUrl
+      logger.info(`WebView老用户登录: ${openid}`)
+    }
+    
+    await user.save()
+    
+    // 记录登录日志
+    await recordLoginLog(
+      user._id,
+      openid,
+      isNewUser ? 'register' : 'auto_login',
+      'wechat_webview',
+      'webview',
+      req,
+      true
+    )
+    
+    // 生成 JWT token
+    const token = jwt.sign(
+      { openid, userId: user._id },
+      process.env.JWT_SECRET,
+      { expiresIn: process.env.JWT_EXPIRE }
+    )
+    
+    return ApiResponse.success(res, {
+      token,
+      openid,
+      isNewUser,
+      userInfo: {
+        nickName: user.nickName,
+        avatarUrl: user.avatarUrl
+      },
+      firstPlayDate: user.createdAt
+    }, isNewUser ? '注册成功' : '自动登录成功')
+    
+  } catch (error) {
+    logger.error('WebView登录失败:', error)
+    return ApiResponse.serverError(res, error.message)
+  }
+})
+
+/**
+ * 管理员登录
+ * POST /api/auth/admin/login
+ */
+router.post('/admin/login', async (req, res) => {
+  try {
+    const { username, password } = req.body
+    
+    // 查找管理员
+    const admin = await Admin.findOne({ username })
+    if (!admin) {
+      return ApiResponse.error(res, '用户名或密码错误', 401)
+    }
+    
+    // 验证密码
+    const isMatch = await admin.validatePassword(password)
+    if (!isMatch) {
+      return ApiResponse.error(res, '用户名或密码错误', 401)
+    }
+    
+    // 检查状态
+    if (admin.status !== 'active') {
+      return ApiResponse.error(res, '账户已禁用', 403)
+    }
+    
+    // 更新登录信息
+    admin.lastLogin = new Date()
+    admin.lastLoginIp = req.ip
+    admin.loginCount += 1
+    await admin.save()
+    
+    // 记录日志
+    await AdminLog.create({
+      adminId: admin._id,
+      adminName: admin.username,
+      action: 'login',
+      resource: 'system',
+      ip: req.ip,
+      userAgent: req.get('User-Agent')
+    })
+    
+    // 生成 JWT token
+    const token = jwt.sign(
+      { adminId: admin._id, role: admin.role },
+      process.env.JWT_SECRET,
+      { expiresIn: process.env.JWT_EXPIRE }
+    )
+    
+    // 获取权限
+    const permissions = Admin.getPermissionsByRole(admin.role)
+    
+    return ApiResponse.success(res, {
+      token,
+      adminId: admin._id,
+      username: admin.username,
+      role: admin.role,
+      permissions
+    }, '登录成功')
+    
+  } catch (error) {
+    logger.error('管理员登录失败:', error)
+    return ApiResponse.serverError(res, error.message)
+  }
+})
+
+/**
+ * H5环境用户名密码登录
+ * POST /api/auth/user/login
+ */
+router.post('/user/login', async (req, res) => {
+  try {
+    const { username, email, password } = req.body
+    // 支持邮箱或用户名登录
+    const identifier = email || username
+    
+    // 查找用户（显式包含密码字段）
+    const user = await User.findOne({
+      $or: [
+        { email: identifier },
+        { username: identifier }
+      ]
+    }).select('+password')
+    if (!user) {
+      return ApiResponse.error(res, '用户名或密码错误', 401)
+    }
+    
+    // 验证密码
+    const isMatch = await user.validatePassword(password)
+    if (!isMatch) {
+      return ApiResponse.error(res, '用户名或密码错误', 401)
+    }
+    
+    // 更新登录时间
+    user.lastLoginAt = new Date()
+    await user.save()
+    
+    // 生成 JWT token
+    const token = jwt.sign(
+      { userId: user._id, openid: user.openid },
+      process.env.JWT_SECRET,
+      { expiresIn: process.env.JWT_EXPIRE }
+    )
+    
+    return ApiResponse.success(res, {
+      token,
+      userId: user._id,
+      openid: user.openid,
+      userInfo: {
+        nickName: user.nickName,
+        avatarUrl: user.avatarUrl
+      },
+      firstPlayDate: user.createdAt
+    }, '登录成功')
+    
+  } catch (error) {
+      logger.error('用户登录失败:', error)
+      return ApiResponse.serverError(res, error.message)
+    }
+  })
+
+  /**
+   * 发送邮箱验证码
+   * POST /api/auth/user/send-code
+   */
+  router.post('/user/send-code', async (req, res) => {
+    try {
+      const { email } = req.body
+      if (!email || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+        return ApiResponse.error(res, '邮箱格式不正确', 400)
+      }
+
+      // 检查邮箱是否已被注册
+      const existing = await User.findOne({ email })
+      if (existing) {
+        return ApiResponse.error(res, '该邮箱已被注册', 400)
+      }
+
+      // 检查发送频率（1分钟内只能发一次）
+      const recent = await VerificationCode.findOne({
+        email,
+        createdAt: { $gte: new Date(Date.now() - 60000) }
+      })
+      if (recent) {
+        return ApiResponse.error(res, '发送过于频繁，请 1 分钟后再试', 429)
+      }
+
+      // 生成6位随机验证码
+      const code = String(Math.floor(100000 + Math.random() * 900000))
+
+      // 10分钟过期
+      const expiresAt = new Date(Date.now() + 10 * 60 * 1000)
+
+      // 使之前的验证码失效
+      await VerificationCode.updateMany({ email, used: false }, { $set: { used: true } })
+
+      // 保存新验证码
+      await VerificationCode.create({ email, code, expiresAt })
+
+      // 发送邮件
+      const result = await sendVerificationCode(email, code)
+
+      if (result.success) {
+        return ApiResponse.success(res, {
+          devCode: result.devCode || undefined
+        }, '验证码已发送')
+      } else {
+        return ApiResponse.error(res, '验证码发送失败，请稍后重试', 500)
+      }
+    } catch (error) {
+      logger.error('发送验证码失败:', error)
+      return ApiResponse.serverError(res, error.message)
+    }
+  })
+
+  /**
+   * H5环境用户注册（需邮箱验证码）
+   * POST /api/auth/user/register
+   */
+router.post('/user/register', async (req, res) => {
+  try {
+    const { username, email, password, nickName, avatarUrl, verifyCode } = req.body
+    const identifier = email || username
+    
+    if (!identifier) {
+      return ApiResponse.error(res, '请输入邮箱或用户名', 400)
+    }
+    
+    if (!email) {
+      return ApiResponse.error(res, '邮箱为必填项', 400)
+    }
+    
+    // 验证邮箱验证码
+    if (!verifyCode) {
+      return ApiResponse.error(res, '请输入邮箱验证码', 400)
+    }
+    const validCode = await VerificationCode.findOne({
+      email,
+      code: verifyCode,
+      used: false,
+      expiresAt: { $gt: new Date() }
+    })
+    if (!validCode) {
+      return ApiResponse.error(res, '验证码无效或已过期', 400)
+    }
+    
+    // 检查邮箱是否已存在
+    if (email) {
+      const existingEmail = await User.findOne({ email })
+      if (existingEmail) {
+        return ApiResponse.error(res, '该邮箱已被注册', 400)
+      }
+    }
+    
+    // 检查用户名是否已存在
+    if (username) {
+      const existingUser = await User.findOne({ username })
+      if (existingUser) {
+        return ApiResponse.error(res, '用户名已存在', 400)
+      }
+    }
+    
+    // 标记验证码为已使用
+    validCode.used = true
+    await validCode.save()
+    
+    // 自动生成用户名（若未提供）
+    const finalUsername = username || email.split('@')[0]
+    
+    // 创建新用户
+    const user = new User({
+      username: finalUsername,
+      email: email || '',
+      password,
+      nickName: nickName || '星辰旅行者',
+      avatarUrl: avatarUrl || '',
+      unlockedDims: [1]
+    })
+    await user.save()
+    
+    logger.info(`新用户注册: ${username}`)
+    
+    // 生成 JWT token
+    const token = jwt.sign(
+      { userId: user._id },
+      process.env.JWT_SECRET,
+      { expiresIn: process.env.JWT_EXPIRE }
+    )
+    
+    return ApiResponse.success(res, {
+      token,
+      userId: user._id,
+      userInfo: {
+        nickName: user.nickName,
+        avatarUrl: user.avatarUrl
+      }
+    }, '注册成功')
+    
+  } catch (error) {
+    logger.error('用户注册失败:', error)
+    return ApiResponse.serverError(res, error.message)
+  }
+})
+
+/**
+ * 获取当前用户信息
+ * GET /api/auth/me
+ */
+router.get('/me', async (req, res) => {
+  try {
+    const token = req.header('Authorization')?.replace('Bearer ', '')
+    
+    if (!token) {
+      return ApiResponse.unauthorized(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 交换接口
+ * POST /api/auth/webview-token
+ * 用于小程序 WebView 内嵌 H5 时，通过 openid 获取登录 token
+ * 小程序在 URL 中传递 openid，H5 用这个接口换取 token
+ */
+router.post('/webview-token', async (req, res) => {
+  try {
+    const { openid } = req.body
+    
+    if (!openid) {
+      return ApiResponse.error(res, '缺少用户标识', 400)
+    }
+    
+    // 查找用户
+    const user = await User.findOne({ openid })
+    
+    if (!user) {
+      return ApiResponse.error(res, '用户不存在', 404)
+    }
+    
+    // 生成新的 JWT token
+    const token = jwt.sign(
+      { openid, userId: user._id },
+      process.env.JWT_SECRET,
+      { expiresIn: process.env.JWT_EXPIRE }
+    )
+    
+    // 更新最后登录时间
+    user.lastLoginAt = new Date()
+    await user.save()
+    
+    // 记录登录日志
+    await recordLoginLog(
+      user._id,
+      openid,
+      'auto_login',
+      'wechat_webview',
+      'webview_h5',
+      req,
+      true
+    )
+    
+    logger.info(`WebView Token交换成功: ${openid}`)
+    
+    return ApiResponse.success(res, {
+      token,
+      openid,
+      userInfo: {
+        nickName: user.nickName,
+        avatarUrl: user.avatarUrl
+      }
+    }, '登录成功')
+    
+  } catch (error) {
+    logger.error('WebView Token交换失败:', error)
+    return ApiResponse.serverError(res, error.message)
+  }
+})
+
+module.exports = router