diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 6a78b874..c474b9ac 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -15,6 +15,7 @@ interface User { role: string isActive: boolean canDownload: boolean + managedDepartment?: string createdAt: string _count: { materials: number @@ -48,6 +49,12 @@ interface Scene { count: number } +interface Platform { + id: string + name: string + count: number +} + export default function AdminPage() { const { data: session, status } = useSession() const router = useRouter() @@ -56,14 +63,18 @@ export default function AdminPage() { const [users, setUsers] = useState([]) const [categories, setCategories] = useState([]) const [scenes, setScenes] = useState([]) + const [platforms, setPlatforms] = useState([]) const [loading, setLoading] = useState(true) const [editingMaterial, setEditingMaterial] = useState(null) const [editingCategory, setEditingCategory] = useState(null) const [editingScene, setEditingScene] = useState(null) + const [editingPlatform, setEditingPlatform] = useState(null) const [showAddCategoryModal, setShowAddCategoryModal] = useState(false) const [showAddSceneModal, setShowAddSceneModal] = useState(false) + const [showAddPlatformModal, setShowAddPlatformModal] = useState(false) const [newCategoryName, setNewCategoryName] = useState('') const [newSceneName, setNewSceneName] = useState('') + const [newPlatformName, setNewPlatformName] = useState('') const [toast, setToast] = useState<{message: string, type: 'success' | 'error'} | null>(null) // 编辑用户部门 @@ -75,6 +86,16 @@ export default function AdminPage() { const [newDepartmentName, setNewDepartmentName] = useState('') const [addingDepartment, setAddingDepartment] = useState(false) + // 用户搜索 + const [userSearchTerm, setUserSearchTerm] = useState('') + + // 素材搜索 + const [materialSearchTerm, setMaterialSearchTerm] = useState('') + + // 部门折叠状态 + const [collapsedDepartments, setCollapsedDepartments] = useState>(new Set()) + const [collapsedAdmins, setCollapsedAdmins] = useState>(new Set()) + // Toast自动隐藏 useEffect(() => { if (toast) { @@ -125,9 +146,10 @@ export default function AdminPage() { // 加载部门列表 fetchDepartments() } else if (activeTab === 'categories') { - const [categoriesRes, scenesRes] = await Promise.all([ + const [categoriesRes, scenesRes, platformsRes] = await Promise.all([ fetch('/api/categories'), - fetch('/api/scenes') + fetch('/api/scenes'), + fetch('/api/platforms') ]) if (categoriesRes.ok) { const data = await categoriesRes.json() @@ -137,6 +159,10 @@ export default function AdminPage() { const data = await scenesRes.json() setScenes(data) } + if (platformsRes.ok) { + const data = await platformsRes.json() + setPlatforms(data) + } } else if (activeTab === 'departments') { fetchDepartments() } @@ -580,6 +606,169 @@ export default function AdminPage() { } } + // 平台分类管理函数 + const handleAddPlatform = async () => { + if (!newPlatformName.trim()) { + showToast('平台名称不能为空', 'error') + return + } + + try { + const response = await fetch('/api/platforms', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ name: newPlatformName.trim() }), + }) + + if (response.ok) { + const data = await response.json() + setPlatforms(prevPlatforms => [...prevPlatforms, { id: data.id, name: newPlatformName.trim(), count: 0 }]) + setShowAddPlatformModal(false) + setNewPlatformName('') + showToast('添加成功') + } else { + const data = await response.json() + showToast(data.error || '添加失败', 'error') + } + } catch (error) { + console.error('Error adding platform:', error) + showToast('添加失败', 'error') + } + } + + const handleUpdatePlatform = async (id: string, newName: string) => { + if (!newName.trim()) { + showToast('平台名称不能为空', 'error') + return + } + + try { + const response = await fetch('/api/platforms', { + method: 'PUT', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ id, name: newName.trim() }), + }) + + if (response.ok) { + setPlatforms(prevPlatforms => + prevPlatforms.map(platform => + platform.id === id ? { ...platform, name: newName.trim() } : platform + ) + ) + setEditingPlatform(null) + showToast('修改成功') + } else { + const data = await response.json() + showToast(data.error || '修改失败', 'error') + } + } catch (error) { + console.error('Error updating platform:', error) + showToast('修改失败', 'error') + } + } + + const handleDeletePlatform = async (id: string) => { + if (!confirm('确定要删除这个平台分类吗?')) return + + try { + const response = await fetch(`/api/platforms?id=${id}`, { + method: 'DELETE', + }) + + if (response.ok) { + setPlatforms(prevPlatforms => prevPlatforms.filter(platform => platform.id !== id)) + showToast('删除成功') + } else { + const data = await response.json() + showToast(data.error || '删除失败', 'error') + } + } catch (error) { + console.error('Error deleting platform:', error) + showToast('删除失败', 'error') + } + } + + // 设置部门管理员 + const handleSetDepartmentManager = async (userId: string, departmentName: string) => { + try { + const response = await fetch('/api/admin/users/set-department-manager', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ userId, departmentName }), + }) + + if (response.ok) { + await fetchData() // 重新加载用户数据 + showToast('部门管理员设置成功') + } else { + const data = await response.json() + showToast(data.error || '设置失败', 'error') + } + } catch (error) { + console.error('Set department manager error:', error) + showToast('设置失败', 'error') + } + } + + // 切换部门折叠状态 + const toggleDepartmentCollapse = (departmentName: string) => { + setCollapsedDepartments(prev => { + const newSet = new Set(prev) + if (newSet.has(departmentName)) { + newSet.delete(departmentName) + } else { + newSet.add(departmentName) + } + return newSet + }) + } + + // 切换管理员折叠状态 + const toggleAdminCollapse = (adminId: string) => { + setCollapsedAdmins(prev => { + const newSet = new Set(prev) + if (newSet.has(adminId)) { + newSet.delete(adminId) + } else { + newSet.add(adminId) + } + return newSet + }) + } + + // 组织用户树形结构数据 + const getUserTreeData = () => { + // 系统管理员(包括总管理员和部门管理员) + const admins = users.filter(u => u.role === 'ADMIN') + // 所有部门名称 + const allDepartmentNames = Array.from(new Set(users.map(u => u.department).filter(d => d))) + + return { + admins, + departments: allDepartmentNames, + getUsersByDepartment: (deptName: string) => + users.filter(u => u.department === deptName && u.role !== 'ADMIN'), + getDepartmentsByAdmin: (adminId: string) => { + const admin = users.find(u => u.id === adminId) + if (!admin || !admin.managedDepartment) return [] + // 一个管理员只负责一个部门 + return [admin.managedDepartment] + }, + getUnmanagedDepartments: () => { + const managedDepts = new Set( + admins.map(a => a.managedDepartment).filter(Boolean) + ) + return allDepartmentNames.filter(d => !managedDepts.has(d)) + } + } + } + if (status === 'loading' || loading) { return (
@@ -672,6 +861,36 @@ export default function AdminPage() { {/* Materials Table */} {activeTab === 'materials' && (
+ {/* 素材搜索框 */} +
+
+ setMaterialSearchTerm(e.target.value)} + className="w-full pl-10 pr-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-white focus:border-blue-500 dark:focus:border-blue-400 focus:ring-2 focus:ring-blue-200 dark:focus:ring-blue-600 outline-none transition-all" + /> + + + + {materialSearchTerm && ( + + )} +
+
@@ -697,7 +916,19 @@ export default function AdminPage() { - {materials.map((material) => ( + {materials + .filter(material => { + if (!materialSearchTerm) return true + const searchLower = materialSearchTerm.toLowerCase() + return ( + material.productModel.toLowerCase().includes(searchLower) || + material.categoryName.toLowerCase().includes(searchLower) || + material.sceneName.toLowerCase().includes(searchLower) || + material.authorName.toLowerCase().includes(searchLower) || + material.materialType.toLowerCase().includes(searchLower) + ) + }) + .map((material) => (
)} - {/* Users Table */} + {/* Users Tree View */} {activeTab === 'users' && (
-
- - - - - - - - - - - - - - - - {users.map((user) => ( - - - - - - - - - - - - ))} - -
- 用户名 - - 邮箱 - - 部门 - - 角色 - - 状态 - - 下载权限 - - 素材数量 - - 注册时间 - - 操作 -
-
- {user.username} -
-
-
{user.email}
-
-
- {user.department || '-'} -
-
- - {user.role === 'ADMIN' ? '管理员' : '用户'} - - - - {user.isActive ? '已激活' : '未激活'} - - - - {user.canDownload ? '允许下载' : '禁止下载'} - - - {user._count.materials} - - {format(new Date(user.createdAt), 'yyyy-MM-dd')} - -
- {user.email !== session?.user?.email && ( - <> - - - - {user.role !== 'ADMIN' && ( + {/* 用户搜索框 */} +
+
+ setUserSearchTerm(e.target.value)} + className="w-full px-4 py-2 pl-10 rounded-apple border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-white focus:border-gray-900 dark:focus:border-gray-400 focus:ring-2 focus:ring-gray-200 dark:focus:ring-gray-600 outline-none" + /> + + + +
+
+ + {/* 树形结构显示 */} +
{(() => { + const treeData = getUserTreeData() + const filteredUsers = users.filter(user => { + if (!userSearchTerm) return true + const searchLower = userSearchTerm.toLowerCase() + return user.username.toLowerCase().includes(searchLower) || + (user.department && user.department.toLowerCase().includes(searchLower)) + }) + + return ( +
+ {/* 第一层:管理员列表 */} + {treeData.admins + .filter(admin => !userSearchTerm || filteredUsers.some(u => u.id === admin.id)) + .map((admin) => { + const managedDepts = treeData.getDepartmentsByAdmin(admin.id) + const isCollapsed = collapsedAdmins.has(admin.id) + + return ( +
+ {/* 管理员行 */} +
+
+ {/* 折叠按钮 */} + {managedDepts.length > 0 && ( )} - - - )} - {user.email === session?.user?.email && ( - - 当前账号 - - )} + +
+
+ {admin.username} + 管理员 + {admin.managedDepartment && ( + + 负责: {admin.managedDepartment} + + )} +
+
+ 部门: {admin.department || '未分配'} | 素材: {admin._count.materials} | + 注册: {format(new Date(admin.createdAt), 'yyyy-MM-dd')} +
+
+ + {/* 管理员操作按钮 */} + {admin.email !== session?.user?.email && ( +
+ + + +
+ )} +
+
+ + {/* 第二层:管理员负责的部门 */} + {!isCollapsed && managedDepts.map((deptName) => { + const deptUsers = treeData.getUsersByDepartment(deptName) + .filter(u => !userSearchTerm || filteredUsers.some(fu => fu.id === u.id)) + const isDeptCollapsed = collapsedDepartments.has(deptName) + + return ( +
+ {/* 部门行 */} +
+
+ {/* 折叠按钮 */} + {deptUsers.length > 0 && ( + + )} + +
+
+ + + + {deptName} + ({deptUsers.length} 人) +
+
+
+
+ + {/* 第三层:部门下的用户 */} + {!isDeptCollapsed && deptUsers.map((user) => ( +
+
+ + + + +
+
+ {user.username} + + {user.isActive ? '已激活' : '未激活'} + + + {user.canDownload ? '可下载' : '禁止下载'} + +
+
+ 素材: {user._count.materials} | 注册: {format(new Date(user.createdAt), 'yyyy-MM-dd')} +
+
+ + {/* 用户操作按钮 */} +
+ + + + + +
+
+
+ ))} +
+ ) + })}
-
-
- {users.length === 0 && ( -
- 暂无用户 -
- )} + ) + })} + + {/* 未分配管理员的部门 */} + {treeData.getUnmanagedDepartments() + .filter(deptName => { + if (!userSearchTerm) return true + const deptUsers = treeData.getUsersByDepartment(deptName) + return deptUsers.some(u => filteredUsers.some(fu => fu.id === u.id)) + }) + .map((deptName) => { + const deptUsers = treeData.getUsersByDepartment(deptName) + .filter(u => !userSearchTerm || filteredUsers.some(fu => fu.id === u.id)) + const isDeptCollapsed = collapsedDepartments.has(deptName) + + return ( +
+ {/* 部门行(未分配管理员) */} +
+
+ {/* 折叠按钮 */} + {deptUsers.length > 0 && ( + + )} + +
+
+ + + + {deptName} + 未分配管理员 + ({deptUsers.length} 人) +
+
+
+
+ + {/* 部门下的用户 */} + {!isDeptCollapsed && deptUsers.map((user) => ( +
+
+ + + + +
+
+ {user.username} + + {user.isActive ? '已激活' : '未激活'} + + + {user.canDownload ? '可下载' : '禁止下载'} + +
+
+ 素材: {user._count.materials} | 注册: {format(new Date(user.createdAt), 'yyyy-MM-dd')} +
+
+ + {/* 用户操作按钮 */} +
+ + + + + +
+
+
+ ))} +
+ ) + })} + + {/* 空状态提示 */} + {users.length === 0 && ( +
+ 暂无用户 +
+ )} +
+ ) + })()} )} @@ -1104,6 +1508,100 @@ export default function AdminPage() { )} + + {/* 平台分类 */} +
+
+
+

平台分类(可选)

+

管理所有平台分类名称,用于素材分类

+
+ +
+
+
+ {platforms.map((platform) => ( +
+ {editingPlatform?.id === platform.id ? ( +
+ { + if (e.key === 'Enter') { + handleUpdatePlatform(platform.id, e.currentTarget.value) + } else if (e.key === 'Escape') { + setEditingPlatform(null) + } + }} + autoFocus + /> +
+ + +
+
+ ) : ( +
+
+

+ {platform.name} +

+ + {platform.count} 个素材 + +
+
+ + +
+
+ )} +
+ ))} +
+ {platforms.length === 0 && ( +
+ 暂无平台分类 +
+ )} +
+
)} @@ -1306,6 +1804,57 @@ export default function AdminPage() { )} + {/* 新增平台分类模态框 */} + {showAddPlatformModal && ( +
+
+

+ 新增平台分类 +

+
+
+ + setNewPlatformName(e.target.value)} + onKeyDown={(e) => { + if (e.key === 'Enter') { + handleAddPlatform() + } else if (e.key === 'Escape') { + setShowAddPlatformModal(false) + setNewPlatformName('') + } + }} + placeholder="请输入平台名称" + className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-white rounded-lg focus:ring-2 focus:ring-gray-400 outline-none" + autoFocus + /> +
+
+ + +
+
+
+
+ )} + {/* 编辑用户部门模态框 */} {editingUser && (
diff --git a/app/api/admin/users/set-department-manager/route.ts b/app/api/admin/users/set-department-manager/route.ts new file mode 100644 index 00000000..40d36123 --- /dev/null +++ b/app/api/admin/users/set-department-manager/route.ts @@ -0,0 +1,86 @@ +import { NextRequest, NextResponse } from 'next/server' +import { getServerSession } from 'next-auth' +import { authOptions } from '@/lib/auth' +import { prisma } from '@/lib/prisma' + +export async function POST(req: NextRequest) { + try { + const session = await getServerSession(authOptions) + + if (!session || session.user.role !== 'ADMIN') { + return NextResponse.json({ error: '需要管理员权限' }, { status: 403 }) + } + + const { userId, departmentName } = await req.json() + + if (!userId || !departmentName) { + return NextResponse.json({ error: '用户ID和部门名称不能为空' }, { status: 400 }) + } + + // 检查该部门是否已经有管理员 + const existingManager = await prisma.user.findFirst({ + where: { + managedDepartment: departmentName, + NOT: { id: userId } + } + }) + + if (existingManager) { + return NextResponse.json({ + error: `部门"${departmentName}"已有管理员:${existingManager.username}` + }, { status: 400 }) + } + + // 更新用户为部门管理员 + const user = await prisma.user.update({ + where: { id: userId }, + data: { + managedDepartment: departmentName, + role: 'ADMIN' // 设置为管理员角色 + } + }) + + return NextResponse.json({ + message: '部门管理员设置成功', + user + }) + } catch (error) { + console.error('Set department manager error:', error) + return NextResponse.json({ error: '设置失败' }, { status: 500 }) + } +} + +// 取消部门管理员 +export async function DELETE(req: NextRequest) { + try { + const session = await getServerSession(authOptions) + + if (!session || session.user.role !== 'ADMIN') { + return NextResponse.json({ error: '需要管理员权限' }, { status: 403 }) + } + + const { searchParams } = new URL(req.url) + const userId = searchParams.get('userId') + + if (!userId) { + return NextResponse.json({ error: '用户ID不能为空' }, { status: 400 }) + } + + // 取消部门管理员 + const user = await prisma.user.update({ + where: { id: userId }, + data: { + managedDepartment: null + } + }) + + return NextResponse.json({ + message: '已取消部门管理员', + user + }) + } catch (error) { + console.error('Remove department manager error:', error) + return NextResponse.json({ error: '取消失败' }, { status: 500 }) + } +} + diff --git a/app/api/dingtalk/login/route.ts b/app/api/dingtalk/login/route.ts index 41b3323c..ed427d2c 100644 --- a/app/api/dingtalk/login/route.ts +++ b/app/api/dingtalk/login/route.ts @@ -185,7 +185,9 @@ export async function POST(request: NextRequest) { ) } - const company = state || 'default' + // state 用于传递前端数据(如origin),不是公司标识 + // 始终使用 default 配置 + const company = 'default' console.log('开始钉钉登录流程:', { code, company }) diff --git a/app/api/materials/route.ts b/app/api/materials/route.ts index 9ad524eb..81e7f231 100644 --- a/app/api/materials/route.ts +++ b/app/api/materials/route.ts @@ -12,6 +12,7 @@ export async function GET(req: NextRequest) { const categoryName = searchParams.get('category') || '' const sceneName = searchParams.get('scene') || '' const materialType = searchParams.get('materialType') || '' + const platformName = searchParams.get('platform') || '' const month = searchParams.get('month') || '' const sortBy = searchParams.get('sortBy') || 'createdAt' // createdAt | downloadCount const page = parseInt(searchParams.get('page') || '1') @@ -45,6 +46,11 @@ export async function GET(req: NextRequest) { where.materialType = materialType } + // Add platform filter (平台分类) + if (platformName) { + where.platformName = platformName + } + // Add month filter (上传月份) if (month) { const [year, monthNum] = month.split('-') diff --git a/app/api/materials/upload/route.ts b/app/api/materials/upload/route.ts index 923c2bb4..445a153c 100644 --- a/app/api/materials/upload/route.ts +++ b/app/api/materials/upload/route.ts @@ -263,19 +263,19 @@ export async function POST(req: NextRequest) { if (!zipFile) { console.log('[Upload] No zip file provided (Model type with images only), skipping file save...') } else { - console.log('[Upload] Saving file locally...') - const uploadDir = process.env.UPLOAD_DIR || './uploads' - await mkdir(uploadDir, { recursive: true }) + console.log('[Upload] Saving file locally...') + const uploadDir = process.env.UPLOAD_DIR || './uploads' + await mkdir(uploadDir, { recursive: true }) - const zipFileExt = path.extname(zipFile.name) + const zipFileExt = path.extname(zipFile.name) zipFileName = generateUniqueFileName('material', zipFileExt) zipFilePath = path.join(uploadDir, zipFileName) - + // 读取并保存素材文件 const zipBuffer = Buffer.from(await zipFile.arrayBuffer()) - await writeFile(zipFilePath, zipBuffer) + await writeFile(zipFilePath, zipBuffer) zipFileSize = BigInt(zipBuffer.length) // 记录文件大小(字节) - console.log('[Upload] File saved:', zipFilePath, `(${(Number(zipFileSize) / 1024 / 1024).toFixed(2)} MB)`) + console.log('[Upload] File saved:', zipFilePath, `(${(Number(zipFileSize) / 1024 / 1024).toFixed(2)} MB)`) } // Create material record diff --git a/app/api/platforms/route.ts b/app/api/platforms/route.ts new file mode 100644 index 00000000..ae743030 --- /dev/null +++ b/app/api/platforms/route.ts @@ -0,0 +1,162 @@ +import { NextRequest, NextResponse } from 'next/server' +import { prisma } from '@/lib/prisma' +import { getServerSession } from 'next-auth' +import { authOptions } from '@/lib/auth' + +// GET - 获取所有平台分类(包含数量统计) +export async function GET(request: NextRequest) { + try { + const platforms = await prisma.platform.findMany({ + orderBy: { createdAt: 'asc' } + }) + + // 获取每个平台的素材数量 + const platformsWithCount = await Promise.all( + platforms.map(async (platform) => { + const count = await prisma.material.count({ + where: { platformName: platform.name } + }) + return { + id: platform.id, + name: platform.name, + count + } + }) + ) + + return NextResponse.json(platformsWithCount) + } catch (error) { + console.error('Error fetching platforms:', error) + return NextResponse.json({ error: '获取平台分类失败' }, { status: 500 }) + } +} + +// POST - 创建新平台分类 +export async function POST(request: NextRequest) { + try { + const session = await getServerSession(authOptions) + + if (!session || session.user.role !== 'ADMIN') { + return NextResponse.json({ error: '需要管理员权限' }, { status: 403 }) + } + + const { name } = await request.json() + + if (!name || !name.trim()) { + return NextResponse.json({ error: '平台分类名称不能为空' }, { status: 400 }) + } + + // 检查是否已存在 + const existing = await prisma.platform.findUnique({ + where: { name: name.trim() } + }) + + if (existing) { + return NextResponse.json({ error: '该平台分类已存在' }, { status: 400 }) + } + + const platform = await prisma.platform.create({ + data: { name: name.trim() } + }) + + return NextResponse.json(platform, { status: 201 }) + } catch (error) { + console.error('Error creating platform:', error) + return NextResponse.json({ error: '创建平台分类失败' }, { status: 500 }) + } +} + +// PUT - 更新平台分类 +export async function PUT(request: NextRequest) { + try { + const session = await getServerSession(authOptions) + + if (!session || session.user.role !== 'ADMIN') { + return NextResponse.json({ error: '需要管理员权限' }, { status: 403 }) + } + + const { id, name } = await request.json() + + if (!id || !name || !name.trim()) { + return NextResponse.json({ error: '平台分类ID和名称不能为空' }, { status: 400 }) + } + + // 检查是否存在其他同名平台 + const existing = await prisma.platform.findFirst({ + where: { + name: name.trim(), + NOT: { id } + } + }) + + if (existing) { + return NextResponse.json({ error: '该平台分类名称已被使用' }, { status: 400 }) + } + + // 获取旧名称 + const oldPlatform = await prisma.platform.findUnique({ where: { id } }) + if (!oldPlatform) { + return NextResponse.json({ error: '平台分类不存在' }, { status: 404 }) + } + + // 更新平台分类 + const platform = await prisma.platform.update({ + where: { id }, + data: { name: name.trim() } + }) + + // 更新所有使用该平台的素材 + await prisma.material.updateMany({ + where: { platformName: oldPlatform.name }, + data: { platformName: name.trim() } + }) + + return NextResponse.json(platform) + } catch (error) { + console.error('Error updating platform:', error) + return NextResponse.json({ error: '更新平台分类失败' }, { status: 500 }) + } +} + +// DELETE - 删除平台分类 +export async function DELETE(request: NextRequest) { + try { + const session = await getServerSession(authOptions) + + if (!session || session.user.role !== 'ADMIN') { + return NextResponse.json({ error: '需要管理员权限' }, { status: 403 }) + } + + const { searchParams } = new URL(request.url) + const id = searchParams.get('id') + + if (!id) { + return NextResponse.json({ error: '平台分类ID不能为空' }, { status: 400 }) + } + + // 检查是否有素材使用该平台 + const platform = await prisma.platform.findUnique({ where: { id } }) + if (!platform) { + return NextResponse.json({ error: '平台分类不存在' }, { status: 404 }) + } + + const materialCount = await prisma.material.count({ + where: { platformName: platform.name } + }) + + if (materialCount > 0) { + return NextResponse.json({ + error: `无法删除:有 ${materialCount} 个素材正在使用该平台分类` + }, { status: 400 }) + } + + // 删除平台分类 + await prisma.platform.delete({ where: { id } }) + + return NextResponse.json({ message: '平台分类已删除' }) + } catch (error) { + console.error('Error deleting platform:', error) + return NextResponse.json({ error: '删除平台分类失败' }, { status: 500 }) + } +} + diff --git a/app/login/page.tsx b/app/login/page.tsx index 423cde0e..656dc7d9 100644 --- a/app/login/page.tsx +++ b/app/login/page.tsx @@ -17,6 +17,9 @@ export default function LoginPage() { // 系统设置 const [loginLogoUrl, setLoginLogoUrl] = useState('http://s3.1080p.hk/shuzhou/2025/05/18/8ebadf0a7cc34eaea00e8619b8efb827.png') const [siteName, setSiteName] = useState('由壹点3D素材') + + // 钉钉配置(从环境变量或配置文件获取) + const DINGTALK_CLIENT_ID = process.env.NEXT_PUBLIC_DINGTALK_CLIENT_ID || 'ding1bs1gxwrcfu16x0f' // 加载系统设置 useEffect(() => { @@ -128,9 +131,6 @@ export default function LoginPage() { setLoading(false) } } - - // 钉钉登录配置 - const DINGTALK_CLIENT_ID = 'ding1bs1gxwrcfu16x0f' const handleDingtalkLogin = () => { // 强制使用外网域名作为回调地址,支持内网访问 diff --git a/app/page.tsx b/app/page.tsx index 3d8f9d4a..8c17dfdc 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -41,8 +41,10 @@ export default function Home() { const [selectedCategory, setSelectedCategory] = useState('') const [selectedScene, setSelectedScene] = useState('') const [selectedMaterialType, setSelectedMaterialType] = useState('') // 素材类型筛选 + const [selectedPlatform, setSelectedPlatform] = useState('') // 平台分类筛选 const [categories, setCategories] = useState>([]) const [scenes, setScenes] = useState>([]) + const [platforms, setPlatforms] = useState>([]) const [materialTypes] = useState([ { value: '3DMAX', label: '3DMAX' }, { value: 'PSD', label: 'PSD' }, @@ -120,6 +122,7 @@ export default function Home() { fetchMaterials() fetchCategories() fetchScenes() + fetchPlatforms() fetchThemeColor() }, []) @@ -143,14 +146,14 @@ export default function Home() { useEffect(() => { setCurrentPage(1) // 重置到第一页 - }, [searchKeyword, selectedCategory, selectedScene, selectedMaterialType, selectedMonth, sortBy]) + }, [searchKeyword, selectedCategory, selectedScene, selectedMaterialType, selectedPlatform, selectedMonth, sortBy]) useEffect(() => { if (status === 'authenticated') { fetchMaterials() } // eslint-disable-next-line react-hooks/exhaustive-deps - }, [currentPage, searchKeyword, selectedCategory, selectedScene, selectedMaterialType, selectedMonth, sortBy]) + }, [currentPage, searchKeyword, selectedCategory, selectedScene, selectedMaterialType, selectedPlatform, selectedMonth, sortBy]) const fetchCategories = async () => { try { @@ -179,6 +182,18 @@ export default function Home() { } } + const fetchPlatforms = async () => { + try { + const response = await fetch('/api/platforms') + if (response.ok) { + const data = await response.json() + setPlatforms(data) + } + } catch (error) { + console.error('Error fetching platforms:', error) + } + } + const fetchMaterials = async () => { try { const params = new URLSearchParams() @@ -186,6 +201,7 @@ export default function Home() { if (selectedCategory) params.append('category', selectedCategory) if (selectedScene) params.append('scene', selectedScene) if (selectedMaterialType) params.append('materialType', selectedMaterialType) + if (selectedPlatform) params.append('platform', selectedPlatform) if (selectedMonth) params.append('month', selectedMonth) if (sortBy) params.append('sortBy', sortBy) params.append('page', currentPage.toString()) @@ -459,6 +475,45 @@ export default function Home() {
+ {/* Material Type Filter (类型分页) - 移到最顶部 */} +
+
+

类型分页

+ {selectedMaterialType && ( + + {materials.length} 个素材 + + )} +
+
+ + {materialTypes.map((type) => ( + + ))} +
+
+ {/* Category Filter (使用店铺) */}
@@ -565,44 +620,60 @@ export default function Home() {
- {/* Material Type Filter (素材类型) */} -
-
-

素材类型

- {selectedMaterialType && ( - - {materials.length} 个素材 - - )} -
-
- - {materialTypes.map((type) => ( + {/* Platform Filter (平台分类) - 条件显示,仅在有平台时显示 */} + {platforms.length > 0 && ( +
+
+

平台分类

+ {selectedPlatform && ( + + {materials.length} 个素材 + + )} +
+
- ))} + {platforms.map((platform) => ( + + ))} +
-
+ )} {/* Month Filter (上传月份) */}
@@ -684,7 +755,7 @@ export default function Home() {
{/* Active Filters Display */} - {(searchKeyword || selectedCategory || selectedScene || selectedMaterialType || selectedMonth) && ( + {(searchKeyword || selectedCategory || selectedScene || selectedMaterialType || selectedPlatform || selectedMonth) && (
当前筛选: @@ -732,6 +803,17 @@ export default function Home() { )} + {selectedPlatform && ( + + 平台分类: {selectedPlatform} + + + )} {selectedMonth && ( 月份: {months.find(m => m.value === selectedMonth)?.label || selectedMonth} @@ -749,6 +831,7 @@ export default function Home() { setSelectedCategory('') setSelectedScene('') setSelectedMaterialType('') + setSelectedPlatform('') setSelectedMonth('') }} className="text-blue-600 dark:text-blue-400 hover:text-blue-700 dark:hover:text-blue-300 underline ml-2 font-medium" @@ -771,7 +854,7 @@ export default function Home() { ) : materials.length === 0 ? (

- {searchKeyword || selectedCategory || selectedScene || selectedMaterialType ? '没有找到匹配的素材' : '还没有素材,快来上传第一个吧!'} + {searchKeyword || selectedCategory || selectedScene || selectedMaterialType || selectedPlatform ? '没有找到匹配的素材' : '还没有素材,快来上传第一个吧!'}

) : ( @@ -781,7 +864,7 @@ export default function Home() {
{/* Preview Image */}
{ // PSD和模特类型直接跳转到详情页,其他类型打开预览弹窗 if (material.materialType === 'PSD' || material.materialType === '模特') { diff --git a/app/share/[id]/page.tsx b/app/share/[id]/page.tsx index bc50bc45..68dddef4 100644 --- a/app/share/[id]/page.tsx +++ b/app/share/[id]/page.tsx @@ -285,105 +285,105 @@ export default function SharePage() {
) : ( /* 非PSD类型:原有布局 */ -
-
+
+
{/* 普通预览图 */} -
- {material.productModel} +
+ {material.productModel} +
+ + {/* Material Info */} +
+
+

+ {material.productModel} +

+
+ + {material.categoryName} + + + {material.sceneName} + +
- {/* Material Info */} -
-
-

- {material.productModel} -

-
- - {material.categoryName} - - - {material.sceneName} - -
+
+
+

作者

+

{material.authorName}

- -
-
-

作者

-

{material.authorName}

-
-
-

文件大小

-

{formatFileSize(material.zipFileSize)}

-
-
-

下载次数

-

{material.downloadCount}

-
-
-

点赞数

-

{material.likeCount}

-
+
+

文件大小

+

{formatFileSize(material.zipFileSize)}

- -
-

文件名

-

{material.zipFileName}

+
+

下载次数

+

{material.downloadCount}

- -
-

上传时间

-

- {format(new Date(material.createdAt), 'yyyy-MM-dd HH:mm')} -

+
+

点赞数

+

{material.likeCount}

+
- {/* Download Button */} - + + ) : ( + + + + + 立即下载 + + )} + - -
+
+
)} diff --git a/components/UploadModal.tsx b/components/UploadModal.tsx index 3d88f580..7990fb11 100644 --- a/components/UploadModal.tsx +++ b/components/UploadModal.tsx @@ -30,6 +30,10 @@ export default function UploadModal({ onClose, onSuccess }: UploadModalProps) { const [showNewSceneInput, setShowNewSceneInput] = useState(false) const [newSceneName, setNewSceneName] = useState('') + // 平台分类(可选) + const [platformName, setPlatformName] = useState('') + const [platforms, setPlatforms] = useState>([]) + // 素材类型 const [materialType, setMaterialType] = useState('3DMAX') @@ -42,6 +46,7 @@ export default function UploadModal({ onClose, onSuccess }: UploadModalProps) { const [error, setError] = useState('') const [isDragging, setIsDragging] = useState(false) const [isDisplayImageDragging, setIsDisplayImageDragging] = useState(false) // PSD展示图片拖拽状态 + const [isPreviewDragging, setIsPreviewDragging] = useState(false) // 预览图片拖拽状态 const [retryCount, setRetryCount] = useState(0) const MAX_RETRY = 2 @@ -49,12 +54,14 @@ export default function UploadModal({ onClose, onSuccess }: UploadModalProps) { const zipInputRef = useRef(null) const dropZoneRef = useRef(null) const displayImageDropZoneRef = useRef(null) // PSD展示图片拖拽区域 + const previewDropZoneRef = useRef(null) // 预览图片拖拽区域 const xhrRef = useRef(null) // 加载分类和场景列表 useEffect(() => { fetchCategories() fetchScenes() + fetchPlatforms() }, []) const fetchCategories = async () => { @@ -81,6 +88,18 @@ export default function UploadModal({ onClose, onSuccess }: UploadModalProps) { } } + const fetchPlatforms = async () => { + try { + const response = await fetch('/api/platforms') + if (response.ok) { + const data = await response.json() + setPlatforms(data) + } + } catch (error) { + console.error('Error fetching platforms:', error) + } + } + const handlePreviewChange = (e: React.ChangeEvent) => { const file = e.target.files?.[0] if (file) { @@ -238,6 +257,50 @@ export default function UploadModal({ onClose, onSuccess }: UploadModalProps) { } } + // 预览图片拖拽处理 + const handlePreviewDragEnter = (e: React.DragEvent) => { + e.preventDefault() + e.stopPropagation() + setIsPreviewDragging(true) + } + + const handlePreviewDragLeave = (e: React.DragEvent) => { + e.preventDefault() + e.stopPropagation() + + const rect = (e.currentTarget as HTMLElement).getBoundingClientRect() + const x = e.clientX + const y = e.clientY + + if (x <= rect.left || x >= rect.right || y <= rect.top || y >= rect.bottom) { + setIsPreviewDragging(false) + } + } + + const handlePreviewDragOver = (e: React.DragEvent) => { + e.preventDefault() + e.stopPropagation() + } + + const handlePreviewDrop = (e: React.DragEvent) => { + e.preventDefault() + e.stopPropagation() + setIsPreviewDragging(false) + + const files = Array.from(e.dataTransfer.files) + if (files.length === 0) return + + const imageFiles = files.filter(f => f.type.startsWith('image/')) + if (imageFiles.length > 0) { + const imgFile = imageFiles[0] + setPreviewImage(imgFile) + setPreviewUrl(URL.createObjectURL(imgFile)) + setError('') + } else { + setError('请拖拽图片文件') + } + } + // PSD展示图片拖拽处理 const handleDisplayImageDragEnter = (e: React.DragEvent) => { e.preventDefault() @@ -363,8 +426,14 @@ export default function UploadModal({ onClose, onSuccess }: UploadModalProps) { setError('') // Validation - 基础信息验证 - if (!productModel || !categoryName || !sceneName) { - setError('请填写所有必填字段(产品型号、分类、场景)') + if (!productModel) { + setError(materialType === '材质' ? '请填写材质名称' : '请填写SPU型号') + return + } + + // 材质类型不需要店铺和场景 + if (materialType !== '材质' && (!categoryName || !sceneName)) { + setError('请填写所有必填字段(店铺、场景)') return } @@ -413,11 +482,13 @@ export default function UploadModal({ onClose, onSuccess }: UploadModalProps) { } // 素材文件对于模特类型是可选的 if (zipFile) { - formData.append('zipFile', zipFile) + formData.append('zipFile', zipFile) } formData.append('productModel', productModel) - formData.append('categoryName', categoryName) - formData.append('sceneName', sceneName) + // 材质类型使用默认值 + formData.append('categoryName', materialType === '材质' ? '通用' : categoryName) + formData.append('sceneName', materialType === '材质' ? '通用' : sceneName) + formData.append('platformName', platformName || '') // 平台分类可选 formData.append('materialType', materialType) formData.append('renderer', renderer) @@ -588,42 +659,55 @@ export default function UploadModal({ onClose, onSuccess }: UploadModalProps) { -
- {previewUrl ? ( -
- Preview -
- ) : ( -
- - - -
- )} -
- +
+ {previewUrl ? ( +
+ Preview - -

- 支持 JPG、PNG、WebP 等格式 -

+
+ ) : ( +
+ + + +
+ )} +
+ + +

+ 支持 JPG、PNG、WebP 等格式,可拖拽上传 +

+
@@ -685,17 +769,17 @@ export default function UploadModal({ onClose, onSuccess }: UploadModalProps) {

💡 第一张图会自动作为预览图,高度超过1500px会自动切割 -

-
-
+

+
+
)} {/* 模特展示图片(仅模特类型显示) */} {materialType === '模特' && ( -
-
+ )} + + {/* 平台分类(可选,仅在后台配置了平台时显示) */} + {platforms.length > 0 && ( +
+ + +
+ )} {/* 渲染器(仅3DMAX显示) */} {materialType === '3DMAX' && ( diff --git a/lib/network.ts b/lib/network.ts index a819779e..a1b47b16 100644 --- a/lib/network.ts +++ b/lib/network.ts @@ -62,14 +62,14 @@ export async function initializeNetwork(): Promise { const host = getCurrentHost() const isInternal = isInternalIP(hostname) - currentNetwork = { + currentNetwork = { isInternal, host } if (isInternal) { console.log(`✅ 检测到内网访问 (${hostname})`) - } else { + } else { console.log(`🌐 检测到公网访问 (${hostname})`) } diff --git a/lib/s3.ts b/lib/s3.ts index 332e967c..91047ebd 100644 --- a/lib/s3.ts +++ b/lib/s3.ts @@ -13,7 +13,7 @@ const s3Client = new S3Client({ requestTimeout: 300000, // 5分钟超时 connectionTimeout: 30000, // 30秒连接超时 }, - maxAttempts: 3, // 失败重试3次 + maxAttempts: 10, // 失败重试10次,确保上传成功 }) export async function uploadToS3( @@ -31,9 +31,15 @@ export async function uploadToS3( ACL: 'public-read', }) + try { await s3Client.send(command) - return `${process.env.S3_PUBLIC_DOMAIN}/${key}` + } catch (error) { + // S3上传失败会自动重试(maxAttempts: 10),这里只记录日志 + console.error('[S3] Upload error (after all retries):', error) + // 重新抛出错误,让上层处理 + throw new Error('S3上传失败,请稍后重试') + } } export async function deleteFromS3(fileUrl: string): Promise { diff --git a/prisma/schema.prisma b/prisma/schema.prisma index d46150f7..0cc4d153 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -17,6 +17,7 @@ model User { username String @unique password String department String @default("") // 用户部门 + managedDepartment String? // 管理员负责的部门(如果是部门管理员) role Role @default(USER) isActive Boolean @default(false) // 是否激活,默认未激活 canDownload Boolean @default(true) // 是否允许下载,默认允许 @@ -43,6 +44,7 @@ model Material { productModel String // SPU categoryName String // 使用店铺 sceneName String // 场景类别 + platformName String @default("") // 平台分类(可选) materialType String @default("3DMAX") // 素材类型:3DMAX/PSD/AI/CAD/C4D/材质/模特/标准饰品/其他 renderer String @default("CR") // 渲染器:CR/VR/其它(仅3DMAX使用) authorName String // 作者花名 @@ -64,6 +66,7 @@ model Material { @@index([createdAt]) @@index([categoryName]) @@index([sceneName]) + @@index([platformName]) @@index([materialType]) @@index([downloadCount]) @@index([likeCount]) @@ -100,6 +103,14 @@ model Scene { @@map("scenes") } +model Platform { + id String @id @default(uuid()) + name String @unique // 平台分类名称 + createdAt DateTime @default(now()) + + @@map("platforms") +} + model SystemSettings { id String @id @default(uuid()) headerBgColor String @default("#1f2937") // 顶部导航栏背景色 diff --git a/project-update-v2.0.tar.gz b/project-update-v2.0.tar.gz deleted file mode 100644 index 8cb62e05..00000000 Binary files a/project-update-v2.0.tar.gz and /dev/null differ