feat: 迁移自定义功能至 1.5.9.9 版本

包含音乐源限制、CI 防 OOM 优化、数据库连接池优化、管理端权限及 UI 细节定制等功能

server/api/admin/users/index.get.ts

@@ -1,48 +1,25 @@
 import { createError, defineEventHandler, getQuery } from 'h3'
 import { db } from '~/drizzle/db'
 import { users } from '~/drizzle/schema'
-import { and, asc, desc, count, eq, ilike, inArray, isNull, notInArray, or, sql } from 'drizzle-orm'
-import { resolveAvatarSource } from '~~/server/utils/user-avatar'
-import { ARCHIVED_USER_STATUSES, resolveArchivedFilter } from '~~/server/utils/user-archive'
-
-const UNSET_FILTER_VALUE = '__UNSET__'
+import { and, asc, desc, count, eq, ilike, or, sql } from 'drizzle-orm'
 
 export default defineEventHandler(async (event) => {
   try {
-    // 检查用户是否为管理员
-    const user = event.context.user
-
-    if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
-      throw createError({
-        statusCode: 403,
-        message: '只有系统管理员可以访问用户列表'
-      })
-    }
-
+    // 获取查询参数
     const query = getQuery(event)
-    const { grade, class: className, search, page = '1', limit = '50', role, status, sortBy = 'id', sortOrder = 'asc', archived } = query
+    const { grade, class: className, search, page = '1', limit = '50', role, status, sortBy = 'id', sortOrder = 'asc' } = query
 
     // 构建筛选条件
     const whereConditions = []
 
     // 年级筛选
     if (grade && typeof grade === 'string' && grade.trim()) {
-      const gradeFilter = grade.trim()
-      whereConditions.push(
-        gradeFilter === UNSET_FILTER_VALUE
-          ? or(isNull(users.grade), eq(users.grade, ''))
-          : eq(users.grade, gradeFilter)
-      )
+      whereConditions.push(eq(users.grade, grade.trim()))
     }
 
     // 班级筛选
     if (className && typeof className === 'string' && className.trim()) {
-      const classFilter = className.trim()
-      whereConditions.push(
-        classFilter === UNSET_FILTER_VALUE
-          ? or(isNull(users.class), eq(users.class, ''))
-          : eq(users.class, classFilter)
-      )
+      whereConditions.push(eq(users.class, className.trim()))
     }
 
     // 角色筛选
@@ -52,18 +29,7 @@ export default defineEventHandler(async (event) => {
 
     // 状态筛选
     if (status && typeof status === 'string' && status.trim()) {
-      const statusFilter = status.trim()
-      if (['active', 'pending', 'withdrawn', 'graduate'].includes(statusFilter)) {
-        whereConditions.push(eq(users.status, statusFilter as 'active' | 'pending' | 'withdrawn' | 'graduate'))
-      }
-    }
-
-    // 归档筛选：archived=1 仅查已归档（graduate/withdrawn）；archived=0 排除已归档；缺省不限制
-    const archivedFilter = resolveArchivedFilter(archived)
-    if (archivedFilter === 'archived') {
-      whereConditions.push(inArray(users.status, [...ARCHIVED_USER_STATUSES]))
-    } else if (archivedFilter === 'unarchived') {
-      whereConditions.push(notInArray(users.status, [...ARCHIVED_USER_STATUSES]))
+      whereConditions.push(eq(users.status, status.trim()))
     }
 
     // 搜索功能（姓名、用户名或IP地址）
@@ -82,12 +48,12 @@ export default defineEventHandler(async (event) => {
 
     // 分页参数
     const pageNum = Math.max(1, parseInt(page as string) || 1)
-    const limitNum = Math.min(Math.max(1, parseInt(limit as string) || 50), 1000)
+    const limitNum = Math.max(1, parseInt(limit as string) || 50)
     const skip = (pageNum - 1) * limitNum
 
     // 获取总数
     const totalResult = await db.select({ count: count() }).from(users).where(whereClause)
-    const total = totalResult[0]?.count || 0
+    const total = totalResult[0].count
 
     // 排序逻辑
     let orderByClause
@@ -129,33 +95,35 @@ export default defineEventHandler(async (event) => {
         forcePasswordChange: true,
         meowNickname: true,
         meowBoundAt: true,
-        email: true,
-        emailVerified: true,
-        remark: true,
         createdAt: true,
         updatedAt: true,
         avatarProvider: true,
-        avatarProviderUserId: true
+        avatarProviderUserId: true,
+        email: true
       },
       with: {
-        identities: {
-          columns: {
-            provider: true,
-            providerUsername: true,
-            providerUserId: true,
-            avatar: true,
-            createdAt: true
-          }
-        }
+        identities: true
       }
     })
 
-    // 处理用户列表，添加头像字段
+    const { getUserAvatarUrl } = await import('~~/server/utils/user-avatar')
+
     const formattedUsers = usersList.map((user) => {
-      const avatarSource = resolveAvatarSource(user, user.identities || [])
+      const avatarUrl = getUserAvatarUrl(
+        {
+          id: user.id,
+          name: user.name,
+          username: user.username,
+          email: user.email,
+          avatarProvider: user.avatarProvider,
+          avatarProviderUserId: user.avatarProviderUserId
+        },
+        user.identities || []
+      )
       return {
         ...user,
-        avatar: avatarSource?.url ?? null
+        avatar: avatarUrl,
+        avatarUrl
       }
     })
 
@@ -183,11 +151,11 @@ export default defineEventHandler(async (event) => {
         search: search || null
       }
     }
-  } catch (error: any) {
+  } catch (error) {
     console.error('获取用户列表失败:', error)
     throw createError({
       statusCode: 500,
-      message: '获取用户列表失败: ' + error.message
+      statusMessage: '获取用户列表失败: ' + error.message
     })
   }
 })