= ({ skinUrl }) => {
- return (
-
- );
-};
-
-export default SkinViewer3D;
\ No newline at end of file
diff --git a/src/components/ui/card.tsx b/src/components/ui/card.tsx
index d05bbc6..4d63cd5 100644
--- a/src/components/ui/card.tsx
+++ b/src/components/ui/card.tsx
@@ -7,7 +7,7 @@ function Card({ className, ...props }: React.ComponentProps<"div">) {
{
+ console.log('serverSignOut函数执行开始');
+
+ // 使用更直接的方式清除会话并重定向
+ // 1. 首先清除所有可能的cookie
+ const { cookies } = await import('next/headers');
+ const cookieStore = cookies();
+
+ // 获取并记录当前所有的cookie
+ const allCookies = cookieStore.getAll();
+ console.log('当前cookies:', allCookies.map(c => c.name));
+
+ // 清除所有可能的NextAuth相关cookie
+ let deletedCookies = 0;
+ allCookies.forEach(cookie => {
+ if (cookie.name.includes('next-auth')) {
+ console.log('删除cookie:', cookie.name);
+ cookieStore.delete(cookie.name);
+ deletedCookies++;
+ }
+ });
+
+ console.log(`总共删除了${deletedCookies}个cookie`);
+
+ // 强制重定向到登录页面
+ // 确保页面完全刷新而不是客户端导航
+ console.log('执行重定向到登录页面');
+ const { redirect } = await import('next/navigation');
+ redirect('/login');
+};
+
+// 导出登录函数 - 供服务器端使用
+export const login = async (credentials: {
+ username?: string;
+ email?: string;
+ password: string
+}) => {
+ try {
+ // 对于测试环境，可以直接验证测试账号
+ const TEST_USERNAME = 'test';
+ const TEST_PASSWORD = 'test';
+ // 对于测试环境，可以直接验证测试账号 - 支持通过username或email字段登录
+ const usernameField = credentials.username || credentials.email;
+ if (usernameField === TEST_USERNAME && credentials.password === TEST_PASSWORD) {
+ return {
+ success: true,
+ user: {
+ id: 'test_user_1',
+ name: '测试玩家',
+ email: 'test@test.com',
+ minecraftUsername: 'SteveTest'
+ }
+ };
+ }
+
+ // 实际环境中调用API
+ const response = await axios.post(`${API_URL}/auth/login`, credentials);
+ return { success: true, ...response.data };
+ } catch (error) {
+ console.error('登录失败:', error);
+ return { success: false, error: '登录失败，请检查用户名和密码' };
+ }
+};
+
+// 导出注册函数
+export const register = async (userData: {
+ username: string;
+ password: string;
+ email: string;
+ minecraftUsername: string;
+}) => {
+ try {
+ // 实际环境中调用API
+ const response = await axios.post(`${API_URL}/auth/register`, userData);
+ return { success: true, ...response.data };
+ } catch (error) {
+ console.error('注册失败:', error);
+ return { success: false, error: '注册失败，请稍后再试' };
+ }
+};
\ No newline at end of file
diff --git a/src/lib/api/auth.ts b/src/lib/api/auth.ts
index 6548ed8..f012f4c 100644
--- a/src/lib/api/auth.ts
+++ b/src/lib/api/auth.ts
@@ -22,10 +22,31 @@ export const authOptions: AuthOptions = {
name: 'Credentials',
credentials: {
username: { label: "用户名", type: "text" },
+ email: { label: "邮箱", type: "email" },
password: { label: "密码", type: "password" }
},
async authorize(credentials) {
+ // 默认测试账号 - 用于开发和测试环境
+ const TEST_USERNAME = 'test';
+ const TEST_PASSWORD = 'test';
+
try {
+ // 检查是否是测试账号 - 支持通过username或email字段登录
+ const usernameField = credentials?.username || credentials?.email;
+ if (usernameField === TEST_USERNAME && credentials?.password === TEST_PASSWORD) {
+ // 返回模拟的测试用户数据
+ return {
+ id: 'test_user_1',
+ name: '测试玩家',
+ email: 'test@test.com',
+ minecraftUsername: 'SteveTest'
+ };
+
+
+
+ }
+
+ // 正常的API登录流程
const response = await axios.post(`${API_URL}/auth/login`, {
username: credentials?.username,
password: credentials?.password
@@ -48,7 +69,7 @@ export const authOptions: AuthOptions = {
],
pages: {
signIn: '/login',
- signOut: '/login'
+ signOut: '/login' // 退出登录后重定向到登录页面
},
callbacks: {
async jwt({ token, user }) {
@@ -62,6 +83,15 @@ export const authOptions: AuthOptions = {
session.user.id = token.id as string;
}
return session;
+ },
+ // 登录成功后重定向到用户主页
+ async redirect({ url, baseUrl }) {
+ // 如果已经有明确的重定向URL，则使用它
+ if (url.startsWith(baseUrl)) {
+ return url;
+ }
+ // 否则默认重定向到用户主页
+ return `${baseUrl}/user-home`;
}
},
secret: process.env.NEXTAUTH_SECRET,
@@ -70,25 +100,4 @@ export const authOptions: AuthOptions = {
// 导出 NextAuth 处理函数
export const nextAuthHandler = NextAuth(authOptions);
-// 导出登录函数
-export const login = async (credentials: {
- username: string;
- password: string
-}) => {
- // 实现同上...
-};
-
-// 导出注册函数
-export const register = async (userData: {
- username: string;
- password: string;
- email: string;
- minecraftUsername: string;
-}) => {
- // 实现同上...
-};
-export async function signOut() {
- // 实际应用中这里会调用API退出登录
- console.log('用户退出登录');
- // 在客户端组件中，你可能会使用 next-auth 的 signOut 方法
-}
\ No newline at end of file
+// Server Actions已移至actions.ts文件
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/lib/utils/minecraft.ts b/src/lib/utils/minecraft.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/styles/globals.css b/src/styles/globals.css
deleted file mode 100644
index 40fda50..0000000
--- a/src/styles/globals.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/* src/styles/globals.css */
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-/* 添加 Minecraft 像素风格字体 */
-@import url('https://fonts.googleapis.com/css2?family=Press+Start+2P&display=swap');
-
-/* 自定义全局样式 */
-@layer base {
- body {
- @apply bg-gray-50 dark:bg-gray-900 text-gray-800 dark:text-gray-100;
- font-family: 'Inter', sans-serif;
- }
-
- h1, h2, h3, h4, h5, h6 {
- @apply font-bold;
- }
-
- /* Minecraft 风格按钮 */
- .btn-minecraft {
- @apply px-4 py-2 rounded-md font-bold text-white bg-minecraft-green
- border-2 border-b-4 border-minecraft-dark-green
- hover:bg-minecraft-dark-green hover:border-minecraft-dark
- active:transform active:translate-y-1 active:border-b-2
- transition-all duration-100;
- }
-
- /* 像素风格元素 */
- .pixel-border {
- @apply border-2 border-gray-800;
- }
-}
\ No newline at end of file
diff --git a/src/types/api/response.ts b/src/types/api/response.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index adeafcb..56a2d5f 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -1,17 +1,8 @@
// src/types/global.d.ts
-import * as THREE from 'three';
-import { Object3DNode } from '@react-three/fiber';
-
declare global {
- namespace JSX {
- interface IntrinsicElements {
- // Three.js 元素
- mesh: Object3DNode;
- boxGeometry: Object3DNode;
- meshStandardMaterial: Object3DNode;
- ambientLight: Object3DNode;
- spotLight: Object3DNode;
- meshBasicMaterial: Object3DNode;
- }
- }
+ interface Window {
+ __NEXT_DATA__?: any;
+ gtag?: (...args: any[]) => void;
+ // 可以在这里扩展window对象的类型
+ }
}
\ No newline at end of file
diff --git a/src/types/three.d.ts b/src/types/three.d.ts
deleted file mode 100644
index b5f00ff..0000000
--- a/src/types/three.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// src/types/three.d.ts
-import * as THREE from 'three';
-import { Object3DNode } from '@react-three/fiber';
-
-declare global {
- namespace JSX {
- interface IntrinsicElements {
- // 使用大写开头的类名
- mesh: Object3DNode;
- boxGeometry: Object3DNode;
- meshStandardMaterial: Object3DNode;
- ambientLight: Object3DNode;
- spotLight: Object3DNode;
- meshBasicMaterial: Object3DNode;
- }
- }
-}
\ No newline at end of file
diff --git a/数据库参考.txt b/数据库参考.txt
new file mode 100644
index 0000000..e402cfe
--- /dev/null
+++ b/数据库参考.txt
@@ -0,0 +1,114 @@
+-- 用户表，支持积分系统和权限管理
+CREATE TABLE `user` (
+ `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+ `username` VARCHAR(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户名',
+ `password` VARCHAR(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '密码哈希',
+ `email` VARCHAR(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '邮箱地址',
+ `avatar` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '头像URL（存储在MinIO中）',
+ `points` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '用户积分',
+ `role` VARCHAR(50) NOT NULL DEFAULT 'user' COMMENT '用户角色（user, vip, admin等）',
+ `status` TINYINT NOT NULL DEFAULT 1 COMMENT '用户状态（1:正常, 0:禁用, -1:删除）',
+ `last_login_at` TIMESTAMP NULL COMMENT '最后登录时间',
+ `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_username` (`username`),
+ UNIQUE KEY `uk_email` (`email`),
+ INDEX `idx_role` (`role`),
+ INDEX `idx_status` (`status`),
+ INDEX `idx_points` (`points` DESC)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='用户表';
+
+-- 材质表，存储皮肤和披风
+CREATE TABLE `textures` (
+ `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '材质的唯一ID',
+ `uploader_id` BIGINT UNSIGNED NOT NULL COMMENT '上传者的用户ID',
+ `name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '材质名称',
+ `description` TEXT COMMENT '材质描述',
+ `type` ENUM('SKIN', 'CAPE') NOT NULL COMMENT '材质类型（皮肤或披风）',
+ `url` VARCHAR(255) NOT NULL COMMENT '材质在MinIO中的永久访问URL',
+ `hash` VARCHAR(64) NOT NULL COMMENT '材质文件的SHA-256哈希值，用于快速去重和校验',
+ `size` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '文件大小（字节）',
+ `is_public` BOOLEAN NOT NULL DEFAULT FALSE COMMENT '是否公开到皮肤广场',
+ `download_count` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '下载次数',
+ `favorite_count` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '收藏次数',
+ `status` TINYINT NOT NULL DEFAULT 1 COMMENT '状态（1:正常, 0:审核中, -1:已删除）',
+ `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_hash` (`hash`),
+ INDEX `idx_uploader_id` (`uploader_id`),
+ INDEX `idx_public_type_status` (`is_public`, `type`, `status`),
+ INDEX `idx_download_count` (`download_count` DESC),
+ INDEX `idx_favorite_count` (`favorite_count` DESC),
+ CONSTRAINT `fk_textures_uploader` FOREIGN KEY (`uploader_id`) REFERENCES `user` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='皮肤与披风材质表';
+
+-- 用户材质收藏表
+CREATE TABLE `user_texture_favorites` (
+ `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '收藏记录的唯一ID',
+ `user_id` BIGINT UNSIGNED NOT NULL COMMENT '用户ID',
+ `texture_id` BIGINT UNSIGNED NOT NULL COMMENT '收藏的材质ID',
+ `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '收藏时间',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_user_texture` (`user_id`, `texture_id`),
+ INDEX `idx_user_id` (`user_id`),
+ INDEX `idx_texture_id` (`texture_id`),
+ INDEX `idx_created_at` (`created_at`),
+ CONSTRAINT `fk_favorites_user` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `fk_favorites_texture` FOREIGN KEY (`texture_id`) REFERENCES `textures` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='用户材质收藏表';
+
+-- 用户角色信息表（Minecraft档案）
+CREATE TABLE `profiles` (
+ `uuid` VARCHAR(36) NOT NULL COMMENT '角色的UUID，通常为Minecraft玩家的UUID',
+ `user_id` BIGINT UNSIGNED NOT NULL COMMENT '关联的用户ID',
+ `name` VARCHAR(16) NOT NULL COMMENT '角色名（Minecraft游戏内名称）',
+ `skin_id` BIGINT UNSIGNED NULL DEFAULT NULL COMMENT '当前使用的皮肤ID',
+ `cape_id` BIGINT UNSIGNED NULL DEFAULT NULL COMMENT '当前使用的披风ID',
+ `rsa_private_key` TEXT NOT NULL COMMENT '用于签名的RSA-2048私钥（PEM格式）',
+ `is_active` BOOLEAN NOT NULL DEFAULT TRUE COMMENT '是否为活跃档案',
+ `last_used_at` TIMESTAMP NULL COMMENT '最后使用时间',
+ `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+ PRIMARY KEY (`uuid`),
+ UNIQUE KEY `uk_name` (`name`),
+ INDEX `idx_user_id` (`user_id`),
+ INDEX `idx_active` (`is_active`),
+ CONSTRAINT `fk_profiles_user` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `fk_profiles_skin` FOREIGN KEY (`skin_id`) REFERENCES `textures` (`id`) ON DELETE SET NULL,
+ CONSTRAINT `fk_profiles_cape` FOREIGN KEY (`cape_id`) REFERENCES `textures` (`id`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='用户角色信息表（Minecraft档案）';
+
+-- Casbin权限管理相关表
+-- casbin_rule表用于存储RBAC权限规则
+CREATE TABLE `casbin_rule` (
+ `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '规则ID',
+ `ptype` VARCHAR(100) NOT NULL COMMENT '策略类型（p, g等）',
+ `v0` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '主体（用户或角色）',
+ `v1` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '资源对象',
+-- 材质表，存储皮肤和披风
+CREATE TABLE `textures` (
+ `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '材质的唯一ID',
+ `uploader_id` BIGINT UNSIGNED NOT NULL COMMENT '上传者的用户ID',
+ `name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '材质名称',
+ `description` TEXT COMMENT '材质描述',
+ `type` ENUM('SKIN', 'CAPE') NOT NULL COMMENT '材质类型（皮肤或披风）',
+ `url` VARCHAR(255) NOT NULL COMMENT '材质在MinIO中的永久访问URL',
+ `hash` VARCHAR(64) NOT NULL COMMENT '材质文件的SHA-256哈希值，用于快速去重和校验',
+ `size` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '文件大小（字节）',
+ `is_public` BOOLEAN NOT NULL DEFAULT FALSE COMMENT '是否公开到皮肤广场',
+ `download_count` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '下载次数',
+ `favorite_count` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '收藏次数',
+ "is_silm" BOOLEAN NOT NULL DEFAULT FALSE COMMENT '是否为细手臂模型（Steve/Alex），默认为粗手臂模型（Steve）',
+ `status` TINYINT NOT NULL DEFAULT 1 COMMENT '状态（1:正常, 0:审核中, -1:已删除）',
+ `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_hash` (`hash`),
+ INDEX `idx_uploader_id` (`uploader_id`),
+ INDEX `idx_public_type_status` (`is_public`, `type`, `status`),
+ INDEX `idx_download_count` (`download_count` DESC),
+ INDEX `idx_favorite_count` (`favorite_count` DESC),
+ CONSTRAINT `fk_textures_uploader` FOREIGN KEY (`uploader_id`) REFERENCES `user` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='皮肤与披风材质表';
\ No newline at end of file
+