141 lines
6.4 KiB
Diff
141 lines
6.4 KiB
Diff
From 0c71328efd09b45445461949a7930dbcb9913962 Mon Sep 17 00:00:00 2001
|
|
From: HenryDu8133 <813367384@qq.com>
|
|
Date: Sat, 12 Sep 2026 10:27:07 +0800
|
|
Subject: [PATCH 46/58] =?UTF-8?q?fix(nitro-import):=20permissions/user-ava?=
|
|
=?UTF-8?q?tar=20=E5=BC=95=E7=94=A8=E8=B7=AF=E5=BE=84=E7=BB=9F=E4=B8=80?=
|
|
=?UTF-8?q?=E6=94=B9=E4=B8=BA=20~~/server/utils=20=E5=88=AB=E5=90=8D?=
|
|
=?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=20Rollup=20UNRESOLVED=5FIMPORT?=
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
---
|
|
server/api/admin/roles/index.get.ts | 2 +-
|
|
server/api/admin/roles/index.put.ts | 2 +-
|
|
server/api/admin/stats/active-users.get.ts | 4 ++--
|
|
server/api/admin/stats/realtime.get.ts | 4 ++--
|
|
server/api/admin/users/[id].put.ts | 2 +-
|
|
server/api/admin/users/[id]/reset-password.post.ts | 2 +-
|
|
server/api/admin/users/index.get.ts | 2 +-
|
|
server/api/admin/users/index.post.ts | 2 +-
|
|
server/api/roles.get.ts | 2 +-
|
|
9 files changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/server/api/admin/roles/index.get.ts b/server/api/admin/roles/index.get.ts
|
|
index b11097b..f7d2c68 100644
|
|
--- a/server/api/admin/roles/index.get.ts
|
|
+++ b/server/api/admin/roles/index.get.ts
|
|
@@ -1,4 +1,4 @@
|
|
-import { ROLES } from '../../../utils/permissions.js'
|
|
+import { ROLES } from '~~/server/utils/permissions'
|
|
|
|
export default defineEventHandler((event) => {
|
|
const user = event.context.user
|
|
diff --git a/server/api/admin/roles/index.put.ts b/server/api/admin/roles/index.put.ts
|
|
index b3b4920..c2f8007 100644
|
|
--- a/server/api/admin/roles/index.put.ts
|
|
+++ b/server/api/admin/roles/index.put.ts
|
|
@@ -1,4 +1,4 @@
|
|
-import { ROLES, saveRolesConfig } from '../../../utils/permissions.js'
|
|
+import { ROLES, saveRolesConfig } from '~~/server/utils/permissions'
|
|
|
|
export default defineEventHandler(async (event) => {
|
|
const user = event.context.user
|
|
diff --git a/server/api/admin/stats/active-users.get.ts b/server/api/admin/stats/active-users.get.ts
|
|
index 34756ca..e5fb760 100644
|
|
--- a/server/api/admin/stats/active-users.get.ts
|
|
+++ b/server/api/admin/stats/active-users.get.ts
|
|
@@ -1,8 +1,8 @@
|
|
import { createError, defineEventHandler, getQuery } from 'h3'
|
|
import { db } from '~/drizzle/db'
|
|
import { songs, users, votes, userIdentities } from '~/drizzle/schema'
|
|
-import { CacheService } from '../../../services/cacheService'
|
|
-import { getUserAvatarUrl } from '../../../utils/user-avatar'
|
|
+import { CacheService } from '~~/server/services/cacheService'
|
|
+import { getUserAvatarUrl } from '~~/server/utils/user-avatar'
|
|
|
|
export default defineEventHandler(async (event) => {
|
|
const user = event.context.user
|
|
diff --git a/server/api/admin/stats/realtime.get.ts b/server/api/admin/stats/realtime.get.ts
|
|
index 86ed510..7b4f449 100644
|
|
--- a/server/api/admin/stats/realtime.get.ts
|
|
+++ b/server/api/admin/stats/realtime.get.ts
|
|
@@ -1,10 +1,10 @@
|
|
import { createError, defineEventHandler } from 'h3'
|
|
import { db } from '~/drizzle/db'
|
|
-import { CacheService } from '../../../services/cacheService'
|
|
+import { CacheService } from '~~/server/services/cacheService'
|
|
import { songs, users, votes, userIdentities } from '~/drizzle/schema'
|
|
import { count, eq, gte, inArray } from 'drizzle-orm'
|
|
import { getBeijingHour, getBeijingStartOfDay } from '~/utils/timeUtils'
|
|
-import { getUserAvatarUrl } from '../../../utils/user-avatar'
|
|
+import { getUserAvatarUrl } from '~~/server/utils/user-avatar'
|
|
|
|
function formatRelativeTime(date: Date | null | undefined): string {
|
|
if (!date) return '未知'
|
|
diff --git a/server/api/admin/users/[id].put.ts b/server/api/admin/users/[id].put.ts
|
|
index eeb5ff3..4dbfec8 100644
|
|
--- a/server/api/admin/users/[id].put.ts
|
|
+++ b/server/api/admin/users/[id].put.ts
|
|
@@ -3,7 +3,7 @@ import { db } from '~/drizzle/db'
|
|
import { users, userStatusLogs } from '~/drizzle/schema'
|
|
import { eq } from 'drizzle-orm'
|
|
import { updateUserPassword } from '~~/server/services/userService'
|
|
-import { getRoleLevel, canChangeRoleOf, canResetPasswordFor } from '~~/server/utils/permissions.js'
|
|
+import { getRoleLevel, canChangeRoleOf, canResetPasswordFor } from '~~/server/utils/permissions'
|
|
|
|
export default defineEventHandler(async (event) => {
|
|
try {
|
|
diff --git a/server/api/admin/users/[id]/reset-password.post.ts b/server/api/admin/users/[id]/reset-password.post.ts
|
|
index 968655f..c421e5b 100644
|
|
--- a/server/api/admin/users/[id]/reset-password.post.ts
|
|
+++ b/server/api/admin/users/[id]/reset-password.post.ts
|
|
@@ -2,7 +2,7 @@ import { updateUserPassword } from '~~/server/services/userService'
|
|
import { db } from '~/drizzle/db'
|
|
import { users } from '~/drizzle/schema'
|
|
import { eq } from 'drizzle-orm'
|
|
-import { canResetPasswordFor, getRoleLevel } from '../../../utils/permissions.js'
|
|
+import { canResetPasswordFor, getRoleLevel } from '~~/server/utils/permissions'
|
|
|
|
export default defineEventHandler(async (event) => {
|
|
const currentUser = event.context.user
|
|
diff --git a/server/api/admin/users/index.get.ts b/server/api/admin/users/index.get.ts
|
|
index 437b652..9c2b06f 100644
|
|
--- a/server/api/admin/users/index.get.ts
|
|
+++ b/server/api/admin/users/index.get.ts
|
|
@@ -106,7 +106,7 @@ export default defineEventHandler(async (event) => {
|
|
}
|
|
})
|
|
|
|
- const { getUserAvatarUrl } = await import('../../../utils/user-avatar')
|
|
+ const { getUserAvatarUrl } = await import('~~/server/utils/user-avatar')
|
|
|
|
const formattedUsers = usersList.map((user) => {
|
|
const avatarUrl = getUserAvatarUrl(
|
|
diff --git a/server/api/admin/users/index.post.ts b/server/api/admin/users/index.post.ts
|
|
index de23c11..5f41903 100644
|
|
--- a/server/api/admin/users/index.post.ts
|
|
+++ b/server/api/admin/users/index.post.ts
|
|
@@ -2,7 +2,7 @@ import bcrypt from 'bcryptjs'
|
|
import { db } from '~/drizzle/db'
|
|
import { users } from '~/drizzle/schema'
|
|
import { eq } from 'drizzle-orm'
|
|
-import { getRoleLevel, isRoleHigher, canManageUserRole } from '~~/server/utils/permissions.js'
|
|
+import { getRoleLevel, isRoleHigher, canManageUserRole } from '~~/server/utils/permissions'
|
|
|
|
export default defineEventHandler(async (event) => {
|
|
// 检查认证和权限
|
|
diff --git a/server/api/roles.get.ts b/server/api/roles.get.ts
|
|
index 415d3d7..7bd2a6c 100644
|
|
--- a/server/api/roles.get.ts
|
|
+++ b/server/api/roles.get.ts
|
|
@@ -1,4 +1,4 @@
|
|
-import { ROLES } from '../utils/permissions.js'
|
|
+import { ROLES } from '~~/server/utils/permissions'
|
|
|
|
export default defineEventHandler(() => {
|
|
return ROLES
|
|
--
|
|
2.45.1.windows.1
|
|
|