diff --git a/.gitignore b/.gitignore
index 7d4585e..2e6bac7 100755
--- a/.gitignore
+++ b/.gitignore
@@ -67,5 +67,6 @@ yarn-error.log*
 
 # Ignore .idea files in the Expo monorepo
 **/.idea/
-
-uploads
\ No newline at end of file
+uploads
+packages/mind-elixir-core
+config/nginx/conf.d/web.conf
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..a2c76e4
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "marscode.chatLanguage": "cn"
+}
\ No newline at end of file
diff --git a/apps/server/src/auth/auth.service.ts b/apps/server/src/auth/auth.service.ts
index f7f679c..49d25c1 100755
--- a/apps/server/src/auth/auth.service.ts
+++ b/apps/server/src/auth/auth.service.ts
@@ -32,7 +32,7 @@ export class AuthService {
         return { isValid: false, error: FileValidationErrorType.INVALID_URI };
       }
       const fileId = extractFileIdFromNginxUrl(params.originalUri);
-      console.log(params.originalUri, fileId);
+      // console.log(params.originalUri, fileId);
       const resource = await db.resource.findFirst({ where: { fileId } });
 
       // 资源验证
diff --git a/apps/server/src/auth/utils.ts b/apps/server/src/auth/utils.ts
index 5e8cd9a..ef8968d 100755
--- a/apps/server/src/auth/utils.ts
+++ b/apps/server/src/auth/utils.ts
@@ -155,6 +155,7 @@ export class UserProfileService {
       where: { id },
       select: {
         id: true,
+        avatar: true,
         deptId: true,
         department: true,
         domainId: true,
diff --git a/apps/server/src/models/app-config/app-config.router.ts b/apps/server/src/models/app-config/app-config.router.ts
index ece1b35..350d047 100755
--- a/apps/server/src/models/app-config/app-config.router.ts
+++ b/apps/server/src/models/app-config/app-config.router.ts
@@ -4,44 +4,48 @@ import { AppConfigService } from './app-config.service';
 import { z, ZodType } from 'zod';
 import { Prisma } from '@nice/common';
 import { RealtimeServer } from '@server/socket/realtime/realtime.server';
-const AppConfigUncheckedCreateInputSchema: ZodType<Prisma.AppConfigUncheckedCreateInput> = z.any()
-const AppConfigUpdateArgsSchema: ZodType<Prisma.AppConfigUpdateArgs> = z.any()
-const AppConfigDeleteManyArgsSchema: ZodType<Prisma.AppConfigDeleteManyArgs> = z.any()
-const AppConfigFindFirstArgsSchema: ZodType<Prisma.AppConfigFindFirstArgs> = z.any()
+const AppConfigUncheckedCreateInputSchema: ZodType<Prisma.AppConfigUncheckedCreateInput> =
+  z.any();
+const AppConfigUpdateArgsSchema: ZodType<Prisma.AppConfigUpdateArgs> = z.any();
+const AppConfigDeleteManyArgsSchema: ZodType<Prisma.AppConfigDeleteManyArgs> =
+  z.any();
+const AppConfigFindFirstArgsSchema: ZodType<Prisma.AppConfigFindFirstArgs> =
+  z.any();
 @Injectable()
 export class AppConfigRouter {
-    constructor(
-        private readonly trpc: TrpcService,
-        private readonly appConfigService: AppConfigService,
-        private readonly realtimeServer: RealtimeServer
-    ) { }
-    router = this.trpc.router({
-        create: this.trpc.protectProcedure
-            .input(AppConfigUncheckedCreateInputSchema)
-            .mutation(async ({ ctx, input }) => {
-                const { staff } = ctx;
-                return await this.appConfigService.create({ data: input });
-            }),
-        update: this.trpc.protectProcedure
-            .input(AppConfigUpdateArgsSchema)
-            .mutation(async ({ ctx, input }) => {
-
-                const { staff } = ctx;
-                return await this.appConfigService.update(input);
-            }),
-        deleteMany: this.trpc.protectProcedure.input(AppConfigDeleteManyArgsSchema).mutation(async ({ input }) => {
-            return await this.appConfigService.deleteMany(input)
-        }),
-        findFirst: this.trpc.protectProcedure.input(AppConfigFindFirstArgsSchema).
-            query(async ({ input }) => {
-
-                return await this.appConfigService.findFirst(input)
-            }),
-        clearRowCache: this.trpc.protectProcedure.mutation(async () => {
-            return await this.appConfigService.clearRowCache()
-        }),
-        getClientCount: this.trpc.protectProcedure.query(() => {
-            return this.realtimeServer.getClientCount()
-        })
-    });
+  constructor(
+    private readonly trpc: TrpcService,
+    private readonly appConfigService: AppConfigService,
+    private readonly realtimeServer: RealtimeServer,
+  ) {}
+  router = this.trpc.router({
+    create: this.trpc.protectProcedure
+      .input(AppConfigUncheckedCreateInputSchema)
+      .mutation(async ({ ctx, input }) => {
+        const { staff } = ctx;
+        return await this.appConfigService.create({ data: input });
+      }),
+    update: this.trpc.protectProcedure
+      .input(AppConfigUpdateArgsSchema)
+      .mutation(async ({ ctx, input }) => {
+        const { staff } = ctx;
+        return await this.appConfigService.update(input);
+      }),
+    deleteMany: this.trpc.protectProcedure
+      .input(AppConfigDeleteManyArgsSchema)
+      .mutation(async ({ input }) => {
+        return await this.appConfigService.deleteMany(input);
+      }),
+    findFirst: this.trpc.procedure
+      .input(AppConfigFindFirstArgsSchema)
+      .query(async ({ input }) => {
+        return await this.appConfigService.findFirst(input);
+      }),
+    clearRowCache: this.trpc.protectProcedure.mutation(async () => {
+      return await this.appConfigService.clearRowCache();
+    }),
+    getClientCount: this.trpc.protectProcedure.query(() => {
+      return this.realtimeServer.getClientCount();
+    }),
+  });
 }
diff --git a/apps/server/src/models/app-config/app-config.service.ts b/apps/server/src/models/app-config/app-config.service.ts
index 733e620..bd003d7 100755
--- a/apps/server/src/models/app-config/app-config.service.ts
+++ b/apps/server/src/models/app-config/app-config.service.ts
@@ -1,10 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import {
-  db,
-  ObjectType,
-  Prisma,
-} from '@nice/common';
-
+import { db, ObjectType, Prisma } from '@nice/common';
 
 import { BaseService } from '../base/base.service';
 import { deleteByPattern } from '@server/utils/redis/utils';
@@ -12,10 +7,10 @@ import { deleteByPattern } from '@server/utils/redis/utils';
 @Injectable()
 export class AppConfigService extends BaseService<Prisma.AppConfigDelegate> {
   constructor() {
-    super(db, "appConfig");
+    super(db, 'appConfig');
   }
   async clearRowCache() {
-    await deleteByPattern("row-*")
-    return true
+    await deleteByPattern('row-*');
+    return true;
   }
 }
diff --git a/apps/server/src/models/base/base.service.ts b/apps/server/src/models/base/base.service.ts
index d1b8b16..ae45e06 100755
--- a/apps/server/src/models/base/base.service.ts
+++ b/apps/server/src/models/base/base.service.ts
@@ -8,6 +8,7 @@ import {
   DelegateFuncs,
   UpdateOrderArgs,
   TransactionType,
+  OrderByArgs,
   SelectArgs,
 } from './base.type';
 import {
@@ -450,9 +451,10 @@ export class BaseService<
     page?: number;
     pageSize?: number;
     where?: WhereArgs<A['findMany']>;
+    orderBy?: OrderByArgs<A['findMany']>;
     select?: SelectArgs<A['findMany']>;
   }): Promise<{ items: R['findMany']; totalPages: number }> {
-    const { page = 1, pageSize = 10, where, select } = args;
+    const { page = 1, pageSize = 10, where, select, orderBy } = args;
 
     try {
       // 获取总记录数
@@ -461,6 +463,7 @@ export class BaseService<
       const items = (await this.getModel().findMany({
         where,
         select,
+        orderBy,
         skip: (page - 1) * pageSize,
         take: pageSize,
       } as any)) as R['findMany'];
diff --git a/apps/server/src/models/base/base.tree.service.ts b/apps/server/src/models/base/base.tree.service.ts
index f62aecc..aa0e643 100755
--- a/apps/server/src/models/base/base.tree.service.ts
+++ b/apps/server/src/models/base/base.tree.service.ts
@@ -139,7 +139,7 @@ export class BaseTreeService<
 
       const result: any = await super.update(anyArgs, { tx: transaction });
 
-      if (anyArgs.data.parentId !== current.parentId) {
+      if (anyArgs.data.parentId && anyArgs.data.parentId !== current.parentId) {
         await transaction[this.ancestryType].deleteMany({
           where: { descendantId: result.id },
         });
diff --git a/apps/server/src/models/base/base.type.ts b/apps/server/src/models/base/base.type.ts
index 878dffe..01254df 100755
--- a/apps/server/src/models/base/base.type.ts
+++ b/apps/server/src/models/base/base.type.ts
@@ -1,25 +1,27 @@
-import { db, Prisma, PrismaClient } from "@nice/common";
+import { db, Prisma, PrismaClient } from '@nice/common';
 
 export type Operations =
-    | 'aggregate'
-    | 'count'
-    | 'create'
-    | 'createMany'
-    | 'delete'
-    | 'deleteMany'
-    | 'findFirst'
-    | 'findMany'
-    | 'findUnique'
-    | 'update'
-    | 'updateMany'
-    | 'upsert';
-export type DelegateFuncs = { [K in Operations]: (args: any) => Promise<unknown> }
+  | 'aggregate'
+  | 'count'
+  | 'create'
+  | 'createMany'
+  | 'delete'
+  | 'deleteMany'
+  | 'findFirst'
+  | 'findMany'
+  | 'findUnique'
+  | 'update'
+  | 'updateMany'
+  | 'upsert';
+export type DelegateFuncs = {
+  [K in Operations]: (args: any) => Promise<unknown>;
+};
 export type DelegateArgs<T> = {
-    [K in keyof T]: T[K] extends (args: infer A) => Promise<any> ? A : never;
+  [K in keyof T]: T[K] extends (args: infer A) => Promise<any> ? A : never;
 };
 
 export type DelegateReturnTypes<T> = {
-    [K in keyof T]: T[K] extends (args: any) => Promise<infer R> ? R : never;
+  [K in keyof T]: T[K] extends (args: any) => Promise<infer R> ? R : never;
 };
 
 export type WhereArgs<T> = T extends { where?: infer W } ? W : never;
@@ -28,17 +30,17 @@ export type DataArgs<T> = T extends { data: infer D } ? D : never;
 export type IncludeArgs<T> = T extends { include: infer I } ? I : never;
 export type OrderByArgs<T> = T extends { orderBy: infer O } ? O : never;
 export type UpdateOrderArgs = {
-    id: string
-    overId: string
-}
+  id: string;
+  overId: string;
+};
 export interface FindManyWithCursorType<T extends DelegateFuncs> {
-    cursor?: string;
-    limit?: number;
-    where?: WhereArgs<DelegateArgs<T>['findUnique']>;
-    select?: SelectArgs<DelegateArgs<T>['findUnique']>;
-    orderBy?: OrderByArgs<DelegateArgs<T>['findMany']>
+  cursor?: string;
+  limit?: number;
+  where?: WhereArgs<DelegateArgs<T>['findUnique']>;
+  select?: SelectArgs<DelegateArgs<T>['findUnique']>;
+  orderBy?: OrderByArgs<DelegateArgs<T>['findMany']>;
 }
 export type TransactionType = Omit<
-    PrismaClient,
-    '$connect' | '$disconnect' | '$on' | '$transaction' | '$use' | '$extends'
->;
\ No newline at end of file
+  PrismaClient,
+  '$connect' | '$disconnect' | '$on' | '$transaction' | '$use' | '$extends'
+>;
diff --git a/apps/server/src/models/course/course.module.ts b/apps/server/src/models/course/course.module.ts
deleted file mode 100755
index 8438e80..0000000
--- a/apps/server/src/models/course/course.module.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// import { Module } from '@nestjs/common';
-// import { CourseRouter } from './course.router';
-// import { CourseService } from './course.service';
-// import { TrpcService } from '@server/trpc/trpc.service';
-
-// @Module({
-//     providers: [CourseRouter, CourseService, TrpcService],
-//     exports: [CourseRouter, CourseService]
-// })
-// export class CourseModule { }
diff --git a/apps/server/src/models/course/course.router.ts b/apps/server/src/models/course/course.router.ts
deleted file mode 100755
index fe9047f..0000000
--- a/apps/server/src/models/course/course.router.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-// import { Injectable } from '@nestjs/common';
-// import { TrpcService } from '@server/trpc/trpc.service';
-// import { Prisma, UpdateOrderSchema } from '@nice/common';
-// import { CourseService } from './course.service';
-// import { z, ZodType } from 'zod';
-// // const CourseCreateArgsSchema: ZodType<Prisma.CourseCreateArgs> = z.any();
-// // const CourseUpdateArgsSchema: ZodType<Prisma.CourseUpdateArgs> = z.any();
-// // const CourseCreateManyInputSchema: ZodType<Prisma.CourseCreateManyInput> =
-// // z.any();
-// // const CourseDeleteManyArgsSchema: ZodType<Prisma.CourseDeleteManyArgs> =
-// // z.any();
-// // const CourseFindManyArgsSchema: ZodType<Prisma.CourseFindManyArgs> = z.any();
-// // const CourseFindFirstArgsSchema: ZodType<Prisma.CourseFindFirstArgs> = z.any();
-// // const CourseWhereInputSchema: ZodType<Prisma.CourseWhereInput> = z.any();
-// // const CourseSelectSchema: ZodType<Prisma.CourseSelect> = z.any();
-
-// @Injectable()
-// export class CourseRouter {
-//   constructor(
-//     private readonly trpc: TrpcService,
-//     private readonly courseService: CourseService,
-//   ) {}
-//   router = this.trpc.router({
-//     // create: this.trpc.protectProcedure
-//     //   .input(CourseCreateArgsSchema)
-//     //   .mutation(async ({ ctx, input }) => {
-//     //     const { staff } = ctx;
-//     //     return await this.courseService.create(input, { staff });
-//     //   }),
-//     // update: this.trpc.protectProcedure
-//     //   .input(CourseUpdateArgsSchema)
-//     //   .mutation(async ({ ctx, input }) => {
-//     //     const { staff } = ctx;
-//     //     return await this.courseService.update(input, { staff });
-//     //   }),
-//     // createMany: this.trpc.protectProcedure
-//     //   .input(z.array(CourseCreateManyInputSchema))
-//     //   .mutation(async ({ ctx, input }) => {
-//     //     const { staff } = ctx;
-//     //     return await this.courseService.createMany({ data: input }, staff);
-//     //   }),
-//     // deleteMany: this.trpc.procedure
-//     //   .input(CourseDeleteManyArgsSchema)
-//     //   .mutation(async ({ input }) => {
-//     //     return await this.courseService.deleteMany(input);
-//     //   }),
-//     // findFirst: this.trpc.procedure
-//     //   .input(CourseFindFirstArgsSchema) // Assuming StaffMethodSchema.findMany is the Zod schema for finding staffs by keyword
-//     //   .query(async ({ input }) => {
-//     //     return await this.courseService.findFirst(input);
-//     //   }),
-//     // softDeleteByIds: this.trpc.protectProcedure
-//     //   .input(z.object({ ids: z.array(z.string()) })) // expect input according to the schema
-//     //   .mutation(async ({ input }) => {
-//     //     return this.courseService.softDeleteByIds(input.ids);
-//     //   }),
-//     // updateOrder: this.trpc.protectProcedure
-//     //   .input(UpdateOrderSchema)
-//     //   .mutation(async ({ input }) => {
-//     //     return this.courseService.updateOrder(input);
-//     //   }),
-//     // findMany: this.trpc.procedure
-//     //   .input(CourseFindManyArgsSchema) // Assuming StaffMethodSchema.findMany is the Zod schema for finding staffs by keyword
-//     //   .query(async ({ input }) => {
-//     //     return await this.courseService.findMany(input);
-//     //   }),
-//     // findManyWithCursor: this.trpc.protectProcedure
-//     //   .input(
-//     //     z.object({
-//     //       cursor: z.any().nullish(),
-//     //       take: z.number().optional(),
-//     //       where: CourseWhereInputSchema.optional(),
-//     //       select: CourseSelectSchema.optional(),
-//     //     }),
-//     //   )
-//     //   .query(async ({ ctx, input }) => {
-//     //     return await this.courseService.findManyWithCursor(input);
-//     //   }),
-//     // findManyWithPagination: this.trpc.procedure
-//     //   .input(
-//     //     z.object({
-//     //       page: z.number().optional(),
-//     //       pageSize: z.number().optional(),
-//     //       where: CourseWhereInputSchema.optional(),
-//     //       select: CourseSelectSchema.optional(),
-//     //     }),
-//     //   ) // Assuming StaffMethodSchema.findMany is the Zod schema for finding staffs by keyword
-//     //   .query(async ({ input }) => {
-//     //     return await this.courseService.findManyWithPagination(input);
-//     //   }),
-//   });
-// }
diff --git a/apps/server/src/models/course/course.schema.ts b/apps/server/src/models/course/course.schema.ts
deleted file mode 100755
index e69de29..0000000
diff --git a/apps/server/src/models/course/course.service.ts b/apps/server/src/models/course/course.service.ts
deleted file mode 100755
index 55b1038..0000000
--- a/apps/server/src/models/course/course.service.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// import { Injectable } from '@nestjs/common';
-// import { BaseService } from '../base/base.service';
-// import {
-//   UserProfile,
-//   db,
-//   ObjectType,
-//   Prisma,
-//   InstructorRole,
-// } from '@nice/common';
-// @Injectable()
-// export class CourseService extends BaseService<Prisma.CourseDelegate> {
-//   constructor() {
-//     super(db, ObjectType.COURSE);
-//   }
-//   async create(
-//     args: Prisma.CourseCreateArgs,
-//     params?: { staff?: UserProfile }
-//   ) {
-//     return await db.$transaction(async tx => {
-//       const result = await super.create(args, { tx });
-//       if (params?.staff?.id) {
-//         await tx.courseInstructor.create({
-//           data: {
-//             instructorId: params.staff.id,
-//             courseId: result.id,
-//             role: InstructorRole.MAIN,
-//           }
-//         });
-//       }
-//       return result;
-//     }, {
-//       timeout: 10000 // 10 seconds
-//     });
-//   }
-//   async update(
-//     args: Prisma.CourseUpdateArgs,
-//     params?: { staff?: UserProfile }
-//   ) {
-//     return await db.$transaction(async tx => {
-//       const result = await super.update(args, { tx });
-//       return result;
-//     }, {
-//       timeout: 10000 // 10 seconds
-//     });
-//   }
-//   async removeInstructor(courseId: string, instructorId: string) {
-//     return await db.courseInstructor.delete({
-//       where: {
-//         courseId_instructorId: {
-//           courseId,
-//           instructorId,
-//         },
-//       },
-//     });
-//   }
-//   async addInstructor(params: {
-//     courseId: string;
-//     instructorId: string;
-//     role?: string;
-//     order?: number;
-//   }) {
-//     return await db.courseInstructor.create({
-//       data: {
-//         courseId: params.courseId,
-//         instructorId: params.instructorId,
-//         role: params.role || InstructorRole.ASSISTANT,
-//         order: params.order,
-//       },
-//     });
-//   }
-//   async getInstructors(courseId: string) {
-//     return await db.courseInstructor.findMany({
-//       where: { courseId },
-//       include: { instructor: true },
-//       orderBy: { order: 'asc' },
-//     });
-//   }
-// }
diff --git a/apps/server/src/models/course/utils.ts b/apps/server/src/models/course/utils.ts
deleted file mode 100755
index aef7966..0000000
--- a/apps/server/src/models/course/utils.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-// import { db, EnrollmentStatus, PostType } from '@nice/common';
-
-// // 更新课程评价统计
-// export async function updateCourseReviewStats(courseId: string) {
-//   const reviews = await db.post.findMany({
-//     where: {
-//       courseId,
-//       type: PostType.COURSE_REVIEW,
-//       deletedAt: null,
-//     },
-//     select: { rating: true },
-//   });
-//   const numberOfReviews = reviews.length;
-//   const averageRating =
-//     numberOfReviews > 0
-//       ? reviews.reduce((sum, review) => sum + review.rating, 0) /
-//         numberOfReviews
-//       : 0;
-
-//   return db.course.update({
-//     where: { id: courseId },
-//     data: {
-//       // numberOfReviews,
-//       //averageRating,
-//     },
-//   });
-// }
-
-// // 更新课程注册统计
-// export async function updateCourseEnrollmentStats(courseId: string) {
-//   const completedEnrollments = await db.enrollment.count({
-//     where: {
-//       courseId,
-//       status: EnrollmentStatus.COMPLETED,
-//     },
-//   });
-//   const totalEnrollments = await db.enrollment.count({
-//     where: { courseId },
-//   });
-//   const completionRate =
-//     totalEnrollments > 0 ? (completedEnrollments / totalEnrollments) * 100 : 0;
-//   return db.course.update({
-//     where: { id: courseId },
-//     data: {
-//       // numberOfStudents: totalEnrollments,
-//       // completionRate,
-//     },
-//   });
-// }
diff --git a/apps/server/src/models/lecture/lecture.module.ts b/apps/server/src/models/lecture/lecture.module.ts
deleted file mode 100755
index 71f6573..0000000
--- a/apps/server/src/models/lecture/lecture.module.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// import { Module } from '@nestjs/common';
-// import { LectureRouter } from './lecture.router';
-// import { LectureService } from './lecture.service';
-// import { TrpcService } from '@server/trpc/trpc.service';
-
-// @Module({
-//     providers: [LectureRouter, LectureService, TrpcService],
-//     exports: [LectureRouter, LectureService]
-// })
-// export class LectureModule { }
diff --git a/apps/server/src/models/lecture/lecture.router.ts b/apps/server/src/models/lecture/lecture.router.ts
deleted file mode 100755
index 832c8a6..0000000
--- a/apps/server/src/models/lecture/lecture.router.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// import { Injectable } from '@nestjs/common';
-// import { TrpcService } from '@server/trpc/trpc.service';
-// import { Prisma, UpdateOrderSchema } from '@nice/common';
-// import { LectureService } from './lecture.service';
-// import { z, ZodType } from 'zod';
-// const LectureCreateArgsSchema: ZodType<Prisma.LectureCreateArgs> = z.any()
-// const LectureCreateManyInputSchema: ZodType<Prisma.LectureCreateManyInput> = z.any()
-// const LectureDeleteManyArgsSchema: ZodType<Prisma.LectureDeleteManyArgs> = z.any()
-// const LectureFindManyArgsSchema: ZodType<Prisma.LectureFindManyArgs> = z.any()
-// const LectureFindFirstArgsSchema: ZodType<Prisma.LectureFindFirstArgs> = z.any()
-// const LectureWhereInputSchema: ZodType<Prisma.LectureWhereInput> = z.any()
-// const LectureSelectSchema: ZodType<Prisma.LectureSelect> = z.any()
-
-// @Injectable()
-// export class LectureRouter {
-//     constructor(
-//         private readonly trpc: TrpcService,
-//         private readonly lectureService: LectureService,
-//     ) { }
-//     router = this.trpc.router({
-//         create: this.trpc.protectProcedure
-//             .input(LectureCreateArgsSchema)
-//             .mutation(async ({ ctx, input }) => {
-//                 const { staff } = ctx;
-//                 return await this.lectureService.create(input, {staff});
-//             }),
-//         createMany: this.trpc.protectProcedure.input(z.array(LectureCreateManyInputSchema))
-//             .mutation(async ({ ctx, input }) => {
-//                 const { staff } = ctx;
-
-//                 return await this.lectureService.createMany({ data: input }, staff);
-//             }),
-//         deleteMany: this.trpc.procedure
-//             .input(LectureDeleteManyArgsSchema)
-//             .mutation(async ({ input }) => {
-//                 return await this.lectureService.deleteMany(input);
-//             }),
-//         findFirst: this.trpc.procedure
-//             .input(LectureFindFirstArgsSchema) // Assuming StaffMethodSchema.findMany is the Zod schema for finding staffs by keyword
-//             .query(async ({ input }) => {
-//                 return await this.lectureService.findFirst(input);
-//             }),
-//         softDeleteByIds: this.trpc.protectProcedure
-//             .input(z.object({ ids: z.array(z.string()) })) // expect input according to the schema
-//             .mutation(async ({ input }) => {
-//                 return this.lectureService.softDeleteByIds(input.ids);
-//             }),
-//         updateOrder: this.trpc.protectProcedure
-//             .input(UpdateOrderSchema)
-//             .mutation(async ({ input }) => {
-//                 return this.lectureService.updateOrder(input);
-//             }),
-//         findMany: this.trpc.procedure
-//             .input(LectureFindManyArgsSchema) // Assuming StaffMethodSchema.findMany is the Zod schema for finding staffs by keyword
-//             .query(async ({ input }) => {
-//                 return await this.lectureService.findMany(input);
-//             }),
-//         findManyWithCursor: this.trpc.protectProcedure
-//             .input(z.object({
-//                 cursor: z.any().nullish(),
-//                 take: z.number().nullish(),
-//                 where: LectureWhereInputSchema.nullish(),
-//                 select: LectureSelectSchema.nullish()
-//             }))
-//             .query(async ({ ctx, input }) => {
-//                 const { staff } = ctx;
-//                 return await this.lectureService.findManyWithCursor(input);
-//             }),
-//     });
-// }
diff --git a/apps/server/src/models/lecture/lecture.service.ts b/apps/server/src/models/lecture/lecture.service.ts
deleted file mode 100755
index 4eb7250..0000000
--- a/apps/server/src/models/lecture/lecture.service.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// import { Injectable } from '@nestjs/common';
-// import { BaseService } from '../base/base.service';
-// import {
-//   UserProfile,
-//   db,
-//   ObjectType,
-//   Prisma
-// } from '@nice/common';
-// import EventBus, { CrudOperation } from '@server/utils/event-bus';
-
-// @Injectable()
-// export class LectureService extends BaseService<Prisma.LectureDelegate> {
-//   constructor() {
-//     super(db, ObjectType.COURSE);
-//   }
-//   async create(args: Prisma.LectureCreateArgs, params?: { staff?: UserProfile }) {
-//     const result = await super.create(args)
-//     EventBus.emit('dataChanged', {
-//       type: ObjectType.LECTURE,
-//       operation: CrudOperation.CREATED,
-//       data: result,
-//     });
-//     return result;
-//   }
-//   async update(args: Prisma.LectureUpdateArgs) {
-//     const result = await super.update(args);
-//     EventBus.emit('dataChanged', {
-//       type: ObjectType.LECTURE,
-//       operation: CrudOperation.UPDATED,
-//       data: result,
-//     });
-//     return result;
-//   }
-
-// }
diff --git a/apps/server/src/models/lecture/utils.ts b/apps/server/src/models/lecture/utils.ts
deleted file mode 100755
index dc0c823..0000000
--- a/apps/server/src/models/lecture/utils.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { db, PostType } from '@nice/common';
-
-// export async function updateSectionLectureStats(sectionId: string) {
-//   const sectionStats = await db.post.aggregate({
-//     where: {
-//       parentId: sectionId,
-//       deletedAt: null,
-//       type: PostType.LECTURE,
-//     },
-//     _count: { _all: true },
-//     _sum: { duration: true },
-//   });
-
-//   await db.post.update({
-//     where: { id: sectionId },
-//     data: {
-//       // totalLectures: sectionStats._count._all,
-//       //  totalDuration: sectionStats._sum.duration || 0,
-//     },
-//   });
-// }
-
-// export async function updateParentLectureStats(parentId: string) {
-//   const ParentStats = await db.post.aggregate({
-//     where: {
-//       ancestors: {
-//         some: {
-//           ancestorId: parentId,
-//           descendant: {
-//             type: PostType.LECTURE,
-//             deletedAt: null,
-//           },
-//         },
-//       },
-//     },
-//     _count: { _all: true },
-//     _sum: {
-//       duration: true,
-//     },
-//   });
-//   await db.post.update({
-//     where: { id: parentId },
-//     data: {
-//       //totalLectures: courseStats._count._all,
-//       //totalDuration: courseStats._sum.duration || 0,
-//     },
-//   });
-// }
diff --git a/apps/server/src/models/post/post.router.ts b/apps/server/src/models/post/post.router.ts
index 458564d..bcde094 100755
--- a/apps/server/src/models/post/post.router.ts
+++ b/apps/server/src/models/post/post.router.ts
@@ -3,8 +3,10 @@ import { TrpcService } from '@server/trpc/trpc.service';
 import { CourseMethodSchema, Prisma } from '@nice/common';
 import { PostService } from './post.service';
 import { z, ZodType } from 'zod';
+import { UpdateOrderArgs } from '../base/base.type';
 const PostCreateArgsSchema: ZodType<Prisma.PostCreateArgs> = z.any();
 const PostUpdateArgsSchema: ZodType<Prisma.PostUpdateArgs> = z.any();
+const PostUpdateOrderArgsSchema: ZodType<UpdateOrderArgs> = z.any();
 const PostFindFirstArgsSchema: ZodType<Prisma.PostFindFirstArgs> = z.any();
 const PostFindManyArgsSchema: ZodType<Prisma.PostFindManyArgs> = z.any();
 const PostDeleteManyArgsSchema: ZodType<Prisma.PostDeleteManyArgs> = z.any();
@@ -56,13 +58,13 @@ export class PostRouter {
         const { staff } = ctx;
         return await this.postService.update(input, staff);
       }),
-    findById: this.trpc.protectProcedure
+    findById: this.trpc.procedure
       .input(z.object({ id: z.string(), args: PostFindFirstArgsSchema }))
       .query(async ({ ctx, input }) => {
         const { staff } = ctx;
         return await this.postService.findById(input.id, input.args);
       }),
-    findMany: this.trpc.protectProcedure
+    findMany: this.trpc.procedure
       .input(PostFindManyArgsSchema)
       .query(async ({ ctx, input }) => {
         const { staff } = ctx;
@@ -82,7 +84,7 @@ export class PostRouter {
       .mutation(async ({ input }) => {
         return await this.postService.deleteMany(input);
       }),
-    findManyWithCursor: this.trpc.protectProcedure
+    findManyWithCursor: this.trpc.procedure
       .input(
         z.object({
           cursor: z.any().nullish(),
@@ -107,5 +109,21 @@ export class PostRouter {
       .query(async ({ input }) => {
         return await this.postService.findManyWithPagination(input);
       }),
+    updateOrder: this.trpc.protectProcedure
+      .input(PostUpdateOrderArgsSchema)
+      .mutation(async ({ ctx, input }) => {
+        const { staff } = ctx;
+        return await this.postService.updateOrder(input);
+      }),
+    updateOrderByIds: this.trpc.protectProcedure
+      .input(
+        z.object({
+          ids: z.array(z.string()),
+        }),
+      )
+      .mutation(async ({ ctx, input }) => {
+        const { staff } = ctx;
+        return await this.postService.updateOrderByIds(input.ids);
+      }),
   });
 }
diff --git a/apps/server/src/models/post/post.service.ts b/apps/server/src/models/post/post.service.ts
index df99714..cbcf7bc 100755
--- a/apps/server/src/models/post/post.service.ts
+++ b/apps/server/src/models/post/post.service.ts
@@ -19,6 +19,9 @@ import { setCourseInfo, setPostRelation } from './utils';
 import EventBus, { CrudOperation } from '@server/utils/event-bus';
 import { BaseTreeService } from '../base/base.tree.service';
 import { z } from 'zod';
+import { DefaultArgs } from '@prisma/client/runtime/library';
+import dayjs from 'dayjs';
+import { OrderByArgs } from '../base/base.type';
 
 @Injectable()
 export class PostService extends BaseTreeService<Prisma.PostDelegate> {
@@ -42,13 +45,14 @@ export class PostService extends BaseTreeService<Prisma.PostDelegate> {
           content: content,
           title: title,
           authorId: params?.staff?.id,
+          updatedAt: dayjs().toDate(),
           resources: {
             connect: resourceIds.map((fileId) => ({ fileId })),
           },
           meta: {
             type: type,
           },
-        },
+        } as any,
       },
       { tx },
     );
@@ -70,7 +74,8 @@ export class PostService extends BaseTreeService<Prisma.PostDelegate> {
           parentId: courseId,
           title: title,
           authorId: staff?.id,
-        },
+          updatedAt: dayjs().toDate(),
+        } as any,
       },
       { tx },
     );
@@ -94,56 +99,23 @@ export class PostService extends BaseTreeService<Prisma.PostDelegate> {
   async createCourse(
     args: {
       courseDetail: Prisma.PostCreateArgs;
-      sections?: z.infer<typeof CourseMethodSchema.createSection>[];
     },
     params: { staff?: UserProfile; tx?: Prisma.TransactionClient },
   ) {
-    const { courseDetail, sections } = args;
+    const { courseDetail } = args;
     // If no transaction is provided, create a new one
     if (!params.tx) {
       return await db.$transaction(async (tx) => {
         const courseParams = { ...params, tx };
         // Create the course first
-        console.log(courseParams?.staff?.id);
-        console.log('courseDetail', courseDetail);
         const createdCourse = await this.create(courseDetail, courseParams);
         // If sections are provided, create them
-        if (sections && sections.length > 0) {
-          const sectionPromises = sections.map((section) =>
-            this.createSection(
-              {
-                courseId: createdCourse.id,
-                title: section.title,
-                lectures: section.lectures,
-              },
-              courseParams,
-            ),
-          );
-          // Create all sections (and their lectures) in parallel
-          await Promise.all(sectionPromises);
-        }
         return createdCourse;
       });
     }
     // If transaction is provided, use it directly
-    console.log('courseDetail', courseDetail);
     const createdCourse = await this.create(courseDetail, params);
     // If sections are provided, create them
-    if (sections && sections.length > 0) {
-      const sectionPromises = sections.map((section) =>
-        this.createSection(
-          {
-            courseId: createdCourse.id,
-            title: section.title,
-            lectures: section.lectures,
-          },
-          params,
-        ),
-      );
-      // Create all sections (and their lectures) in parallel
-      await Promise.all(sectionPromises);
-    }
-
     return createdCourse;
   }
   async create(
@@ -151,6 +123,8 @@ export class PostService extends BaseTreeService<Prisma.PostDelegate> {
     params?: { staff?: UserProfile; tx?: Prisma.TransactionClient },
   ) {
     args.data.authorId = params?.staff?.id;
+    args.data.updatedAt = dayjs().toDate();
+
     const result = await super.create(args);
     EventBus.emit('dataChanged', {
       type: ObjectType.POST,
@@ -161,6 +135,7 @@ export class PostService extends BaseTreeService<Prisma.PostDelegate> {
   }
   async update(args: Prisma.PostUpdateArgs, staff?: UserProfile) {
     args.data.authorId = staff?.id;
+    args.data.updatedAt = dayjs().toDate();
     const result = await super.update(args);
     EventBus.emit('dataChanged', {
       type: ObjectType.POST,
@@ -182,25 +157,13 @@ export class PostService extends BaseTreeService<Prisma.PostDelegate> {
           await this.setPerms(result, staff);
           await setCourseInfo({ data: result });
         }
-
+        // console.log(result);
         return result;
       },
     );
     return transDto;
   }
-  // async findMany(args: Prisma.PostFindManyArgs, staff?: UserProfile) {
-  //   if (!args.where) args.where = {};
-  //   args.where.OR = await this.preFilter(args.where.OR, staff);
-  //   return this.wrapResult(super.findMany(args), async (result) => {
-  //     await Promise.all(
-  //       result.map(async (item) => {
-  //         await setPostRelation({ data: item, staff });
-  //         await this.setPerms(item, staff);
-  //       }),
-  //     );
-  //     return { ...result };
-  //   });
-  // }
+
   async findManyWithCursor(args: Prisma.PostFindManyArgs, staff?: UserProfile) {
     if (!args.where) args.where = {};
     args.where.OR = await this.preFilter(args.where.OR, staff);
@@ -215,6 +178,72 @@ export class PostService extends BaseTreeService<Prisma.PostDelegate> {
       return { ...result, items };
     });
   }
+  async findManyWithPagination(args: {
+    page?: number;
+    pageSize?: number;
+    where?: Prisma.PostWhereInput;
+    orderBy?: OrderByArgs<(typeof db.post)['findMany']>;
+    select?: Prisma.PostSelect<DefaultArgs>;
+  }): Promise<{
+    items: {
+      id: string;
+      type: string | null;
+      level: string | null;
+      state: string | null;
+      title: string | null;
+      subTitle: string | null;
+      content: string | null;
+      important: boolean | null;
+      domainId: string | null;
+      order: number | null;
+      duration: number | null;
+      rating: number | null;
+      createdAt: Date;
+      views: number;
+      hates: number;
+      likes: number;
+      publishedAt: Date | null;
+      updatedAt: Date;
+      deletedAt: Date | null;
+      authorId: string | null;
+      parentId: string | null;
+      hasChildren: boolean | null;
+      meta: Prisma.JsonValue | null;
+    }[];
+    totalPages: number;
+  }> {
+    // super.updateOrder;
+    return super.findManyWithPagination(args);
+  }
+
+  async updateOrderByIds(ids: string[]) {
+    const posts = await db.post.findMany({
+      where: { id: { in: ids } },
+      select: { id: true, order: true },
+    });
+    const postMap = new Map(posts.map((post) => [post.id, post]));
+    const orderedPosts = ids
+      .map((id) => postMap.get(id))
+      .filter((post): post is { id: string; order: number } => !!post);
+
+    // 生成仅需更新的操作
+    const updates = orderedPosts
+      .map((post, index) => ({
+        id: post.id,
+        newOrder: index, // 按数组索引设置新顺序
+        currentOrder: post.order,
+      }))
+      .filter(({ newOrder, currentOrder }) => newOrder !== currentOrder)
+      .map(({ id, newOrder }) =>
+        db.post.update({
+          where: { id },
+          data: { order: newOrder },
+        }),
+      );
+
+    // 批量执行更新
+    return updates.length > 0 ? await db.$transaction(updates) : [];
+  }
 
   protected async setPerms(data: Post, staff?: UserProfile) {
     if (!staff) return;
@@ -267,37 +296,37 @@ export class PostService extends BaseTreeService<Prisma.PostDelegate> {
       staff?.id && {
         authorId: staff.id,
       },
-      staff?.id && {
-        watchableStaffs: {
-          some: {
-            id: staff.id,
-          },
-        },
-      },
-      deptId && {
-        watchableDepts: {
-          some: {
-            id: {
-              in: parentDeptIds,
-            },
-          },
-        },
-      },
+      // staff?.id && {
+      //   watchableStaffs: {
+      //     some: {
+      //       id: staff.id,
+      //     },
+      //   },
+      // },
+      // deptId && {
+      //   watchableDepts: {
+      //     some: {
+      //       id: {
+      //         in: parentDeptIds,
+      //       },
+      //     },
+      //   },
+      // },
 
-      {
-        AND: [
-          {
-            watchableStaffs: {
-              none: {}, // 匹配 watchableStaffs 为空
-            },
-          },
-          {
-            watchableDepts: {
-              none: {}, // 匹配 watchableDepts 为空
-            },
-          },
-        ],
-      },
+      // {
+      //   AND: [
+      //     {
+      //       watchableStaffs: {
+      //         none: {}, // 匹配 watchableStaffs 为空
+      //       },
+      //     },
+      //     {
+      //       watchableDepts: {
+      //         none: {}, // 匹配 watchableDepts 为空
+      //       },
+      //     },
+      //   ],
+      // },
     ].filter(Boolean);
 
     if (orCondition?.length > 0) return orCondition;
diff --git a/apps/server/src/models/post/utils.ts b/apps/server/src/models/post/utils.ts
index 9185a0f..57b0fd0 100755
--- a/apps/server/src/models/post/utils.ts
+++ b/apps/server/src/models/post/utils.ts
@@ -1,6 +1,7 @@
 import {
   db,
   EnrollmentStatus,
+  Lecture,
   Post,
   PostType,
   SectionDto,
@@ -127,7 +128,6 @@ export async function updateCourseEnrollmentStats(courseId: string) {
 
 export async function setCourseInfo({ data }: { data: Post }) {
   // await db.term
-
   if (data?.type === PostType.COURSE) {
     const ancestries = await db.postAncestry.findMany({
       where: {
@@ -137,30 +137,52 @@ export async function setCourseInfo({ data }: { data: Post }) {
         id: true,
         descendant: true,
       },
+      orderBy: {
+        descendant: {
+          order: 'asc',
+        },
+      },
     });
     const descendants = ancestries.map((ancestry) => ancestry.descendant);
-    const sections: SectionDto[] = descendants
-      .filter((descendant) => {
+    const sections: SectionDto[] = (
+      descendants.filter((descendant) => {
         return (
           descendant.type === PostType.SECTION &&
           descendant.parentId === data.id
         );
-      })
-      .map((section) => ({
-        ...section,
-        lectures: [],
-      }));
+      }) as any
+    ).map((section) => ({
+      ...section,
+      lectures: [],
+    }));
     const lectures = descendants.filter((descendant) => {
       return (
         descendant.type === PostType.LECTURE &&
         sections.map((section) => section.id).includes(descendant.parentId)
       );
     });
+
+    const lectureCount = lectures?.length || 0;
     sections.forEach((section) => {
       section.lectures = lectures.filter(
         (lecture) => lecture.parentId === section.id,
-      );
+      ) as any as Lecture[];
     });
-    Object.assign(data, { sections });
+
+    const students = await db.staff.findMany({
+      where: {
+        learningPosts: {
+          some: {
+            id: data.id,
+          },
+        },
+      },
+      select: {
+        id: true,
+      },
+    });
+
+    const studentIds = (students || []).map((student) => student?.id);
+    Object.assign(data, { sections, lectureCount, studentIds });
   }
 }
diff --git a/apps/server/src/models/section/section.module.ts b/apps/server/src/models/section/section.module.ts
deleted file mode 100755
index a337cb6..0000000
--- a/apps/server/src/models/section/section.module.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// import { Module } from '@nestjs/common';
-// import { SectionRouter } from './section.router';
-// import { SectionService } from './section.service';
-// import { TrpcService } from '@server/trpc/trpc.service';
-
-// @Module({
-//     exports: [SectionRouter, SectionService],
-//     providers: [SectionRouter, SectionService, TrpcService]
-// })
-// export class SectionModule { }
diff --git a/apps/server/src/models/section/section.router.ts b/apps/server/src/models/section/section.router.ts
deleted file mode 100755
index 2658567..0000000
--- a/apps/server/src/models/section/section.router.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// import { Injectable } from '@nestjs/common';
-// import { TrpcService } from '@server/trpc/trpc.service';
-// import { Prisma, UpdateOrderSchema } from '@nice/common';
-// import { SectionService } from './section.service';
-// import { z, ZodType } from 'zod';
-// const SectionCreateArgsSchema: ZodType<Prisma.SectionCreateArgs> = z.any()
-// const SectionCreateManyInputSchema: ZodType<Prisma.SectionCreateManyInput> = z.any()
-// const SectionDeleteManyArgsSchema: ZodType<Prisma.SectionDeleteManyArgs> = z.any()
-// const SectionFindManyArgsSchema: ZodType<Prisma.SectionFindManyArgs> = z.any()
-// const SectionFindFirstArgsSchema: ZodType<Prisma.SectionFindFirstArgs> = z.any()
-// const SectionWhereInputSchema: ZodType<Prisma.SectionWhereInput> = z.any()
-// const SectionSelectSchema: ZodType<Prisma.SectionSelect> = z.any()
-
-// @Injectable()
-// export class SectionRouter {
-//     constructor(
-//         private readonly trpc: TrpcService,
-//         private readonly sectionService: SectionService,
-//     ) { }
-//     router = this.trpc.router({
-//         create: this.trpc.protectProcedure
-//             .input(SectionCreateArgsSchema)
-//             .mutation(async ({ ctx, input }) => {
-//                 const { staff } = ctx;
-//                 return await this.sectionService.create(input, { staff });
-//             }),
-//         createMany: this.trpc.protectProcedure.input(z.array(SectionCreateManyInputSchema))
-//             .mutation(async ({ ctx, input }) => {
-//                 const { staff } = ctx;
-
-//                 return await this.sectionService.createMany({ data: input }, staff);
-//             }),
-//         deleteMany: this.trpc.procedure
-//             .input(SectionDeleteManyArgsSchema)
-//             .mutation(async ({ input }) => {
-//                 return await this.sectionService.deleteMany(input);
-//             }),
-//         findFirst: this.trpc.procedure
-//             .input(SectionFindFirstArgsSchema) // Assuming StaffMethodSchema.findMany is the Zod schema for finding staffs by keyword
-//             .query(async ({ input }) => {
-//                 return await this.sectionService.findFirst(input);
-//             }),
-//         softDeleteByIds: this.trpc.protectProcedure
-//             .input(z.object({ ids: z.array(z.string()) })) // expect input according to the schema
-//             .mutation(async ({ input }) => {
-//                 return this.sectionService.softDeleteByIds(input.ids);
-//             }),
-//         updateOrder: this.trpc.protectProcedure
-//             .input(UpdateOrderSchema)
-//             .mutation(async ({ input }) => {
-//                 return this.sectionService.updateOrder(input);
-//             }),
-//         findMany: this.trpc.procedure
-//             .input(SectionFindManyArgsSchema) // Assuming StaffMethodSchema.findMany is the Zod schema for finding staffs by keyword
-//             .query(async ({ input }) => {
-//                 return await this.sectionService.findMany(input);
-//             }),
-//         findManyWithCursor: this.trpc.protectProcedure
-//             .input(z.object({
-//                 cursor: z.any().nullish(),
-//                 take: z.number().nullish(),
-//                 where: SectionWhereInputSchema.nullish(),
-//                 select: SectionSelectSchema.nullish()
-//             }))
-//             .query(async ({ ctx, input }) => {
-//                 const { staff } = ctx;
-//                 return await this.sectionService.findManyWithCursor(input);
-//             }),
-//     });
-// }
diff --git a/apps/server/src/models/section/section.service.ts b/apps/server/src/models/section/section.service.ts
deleted file mode 100755
index 177cf4d..0000000
--- a/apps/server/src/models/section/section.service.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// import { Injectable } from '@nestjs/common';
-// import { BaseService } from '../base/base.service';
-// import {
-//   UserProfile,
-//   db,
-//   ObjectType,
-//   Prisma,
-
-// } from '@nice/common';
-// @Injectable()
-// export class SectionService extends BaseService<Prisma.SectionDelegate> {
-//   constructor() {
-//     super(db, ObjectType.SECTION);
-//   }
-
-//   create(args: Prisma.SectionCreateArgs, params?: { staff?: UserProfile }) {
-//     return super.create(args)
-//   }
-//   async update(args: Prisma.SectionUpdateArgs) {
-//     return super.update(args);
-//   }
-
-// }
diff --git a/apps/server/src/models/term/term.router.ts b/apps/server/src/models/term/term.router.ts
index 43afff5..1b15a3d 100755
--- a/apps/server/src/models/term/term.router.ts
+++ b/apps/server/src/models/term/term.router.ts
@@ -61,7 +61,7 @@ export class TermRouter {
       .input(TermMethodSchema.getSimpleTree)
       .query(async ({ input, ctx }) => {
         const { staff } = ctx;
-        return await this.termService.getChildSimpleTree(staff, input);
+        return await this.termService.getChildSimpleTree(input, staff);
       }),
     getParentSimpleTree: this.trpc.procedure
       .input(TermMethodSchema.getSimpleTree)
@@ -69,7 +69,7 @@ export class TermRouter {
         const { staff } = ctx;
         return await this.termService.getParentSimpleTree(staff, input);
       }),
-    getTreeData: this.trpc.protectProcedure
+    getTreeData: this.trpc.procedure
       .input(TermMethodSchema.getTreeData)
       .query(async ({ input }) => {
         return await this.termService.getTreeData(input);
diff --git a/apps/server/src/models/term/term.service.ts b/apps/server/src/models/term/term.service.ts
index cc119e6..7cbcc5f 100755
--- a/apps/server/src/models/term/term.service.ts
+++ b/apps/server/src/models/term/term.service.ts
@@ -269,10 +269,10 @@ export class TermService extends BaseTreeService<Prisma.TermDelegate> {
   }
 
   async getChildSimpleTree(
-    staff: UserProfile,
     data: z.infer<typeof TermMethodSchema.getSimpleTree>,
+    staff?: UserProfile,
   ) {
-    const { domainId = null, permissions } = staff;
+    const domainId = staff?.domainId || null;
     const hasAnyPerms =
       staff?.permissions?.includes(RolePerms.MANAGE_ANY_TERM) ||
       staff?.permissions?.includes(RolePerms.READ_ANY_TERM);
@@ -298,12 +298,12 @@ export class TermService extends BaseTreeService<Prisma.TermDelegate> {
             ...(hasAnyPerms
               ? {} // 当有全局权限时，不添加任何额外条件
               : {
-                // 当无全局权限时，添加域ID过滤
-                OR: [
-                  { domainId: null }, // 通用记录
-                  { domainId: domainId }, // 特定域记录
-                ],
-              }),
+                  // 当无全局权限时，添加域ID过滤
+                  OR: [
+                    { domainId: null }, // 通用记录
+                    { domainId: domainId }, // 特定域记录
+                  ],
+                }),
           },
           ancestorId: parentId,
           relDepth: 1,
@@ -315,29 +315,29 @@ export class TermService extends BaseTreeService<Prisma.TermDelegate> {
       }),
       termIds
         ? db.term.findMany({
-          where: {
-            ...(termIds && {
-              OR: [
-                ...(validTermIds.length
-                  ? [{ id: { in: validTermIds } }]
-                  : []),
-              ],
-            }),
-            taxonomyId: taxonomyId,
-            // 动态权限控制条件
-            ...(hasAnyPerms
-              ? {} // 当有全局权限时，不添加任何额外条件
-              : {
-                // 当无全局权限时，添加域ID过滤
+            where: {
+              ...(termIds && {
                 OR: [
-                  { domainId: null }, // 通用记录
-                  { domainId: domainId }, // 特定域记录
+                  ...(validTermIds.length
+                    ? [{ id: { in: validTermIds } }]
+                    : []),
                 ],
               }),
-          },
-          include: { children: true },
-          orderBy: { order: 'asc' },
-        })
+              taxonomyId: taxonomyId,
+              // 动态权限控制条件
+              ...(hasAnyPerms
+                ? {} // 当有全局权限时，不添加任何额外条件
+                : {
+                    // 当无全局权限时，添加域ID过滤
+                    OR: [
+                      { domainId: null }, // 通用记录
+                      { domainId: domainId }, // 特定域记录
+                    ],
+                  }),
+            },
+            include: { children: true },
+            orderBy: { order: 'asc' },
+          })
         : [],
     ]);
     const children = childrenData
@@ -352,7 +352,9 @@ export class TermService extends BaseTreeService<Prisma.TermDelegate> {
     staff: UserProfile,
     data: z.infer<typeof TermMethodSchema.getSimpleTree>,
   ) {
-    const { domainId = null, permissions } = staff;
+    // const { domainId = null, permissions } = staff;
+    const permissions = staff?.permissions || [];
+    const domainId = staff?.domainId || null;
     const hasAnyPerms =
       permissions.includes(RolePerms.READ_ANY_TERM) ||
       permissions.includes(RolePerms.MANAGE_ANY_TERM);
@@ -371,12 +373,12 @@ export class TermService extends BaseTreeService<Prisma.TermDelegate> {
             ...(hasAnyPerms
               ? {} // 当有全局权限时，不添加任何额外条件
               : {
-                // 当无全局权限时，添加域ID过滤
-                OR: [
-                  { domainId: null }, // 通用记录
-                  { domainId: domainId }, // 特定域记录
-                ],
-              }),
+                  // 当无全局权限时，添加域ID过滤
+                  OR: [
+                    { domainId: null }, // 通用记录
+                    { domainId: domainId }, // 特定域记录
+                  ],
+                }),
           },
         },
         include: {
@@ -398,12 +400,12 @@ export class TermService extends BaseTreeService<Prisma.TermDelegate> {
           ...(hasAnyPerms
             ? {} // 当有全局权限时，不添加任何额外条件
             : {
-              // 当无全局权限时，添加域ID过滤
-              OR: [
-                { domainId: null }, // 通用记录
-                { domainId: domainId }, // 特定域记录
-              ],
-            }),
+                // 当无全局权限时，添加域ID过滤
+                OR: [
+                  { domainId: null }, // 通用记录
+                  { domainId: domainId }, // 特定域记录
+                ],
+              }),
         },
         include: { children: true }, // 包含子节点信息
         orderBy: { order: 'asc' }, // 按顺序升序排序
diff --git a/apps/server/src/models/visit/visit.router.ts b/apps/server/src/models/visit/visit.router.ts
index 2bb9064..e600ff2 100755
--- a/apps/server/src/models/visit/visit.router.ts
+++ b/apps/server/src/models/visit/visit.router.ts
@@ -4,34 +4,34 @@ import { Prisma } from '@nice/common';
 
 import { VisitService } from './visit.service';
 import { z, ZodType } from 'zod';
-const VisitCreateArgsSchema: ZodType<Prisma.VisitCreateArgs> = z.any()
-const VisitCreateManyInputSchema: ZodType<Prisma.VisitCreateManyInput> = z.any()
-const VisitDeleteManyArgsSchema: ZodType<Prisma.VisitDeleteManyArgs> = z.any()
+const VisitCreateArgsSchema: ZodType<Prisma.VisitCreateArgs> = z.any();
+const VisitCreateManyInputSchema: ZodType<Prisma.VisitCreateManyInput> =
+  z.any();
+const VisitDeleteManyArgsSchema: ZodType<Prisma.VisitDeleteManyArgs> = z.any();
 @Injectable()
 export class VisitRouter {
-    constructor(
-        private readonly trpc: TrpcService,
-        private readonly visitService: VisitService,
-    ) { }
-    router = this.trpc.router({
-        create: this.trpc.protectProcedure
-            .input(VisitCreateArgsSchema)
-            .mutation(async ({ ctx, input }) => {
-                const { staff } = ctx;
-                return await this.visitService.create(input, staff);
-            }),
-        createMany: this.trpc.protectProcedure.input(z.array(VisitCreateManyInputSchema))
-            .mutation(async ({ ctx, input }) => {
-                const { staff } = ctx;
+  constructor(
+    private readonly trpc: TrpcService,
+    private readonly visitService: VisitService,
+  ) {}
+  router = this.trpc.router({
+    create: this.trpc.procedure
+      .input(VisitCreateArgsSchema)
+      .mutation(async ({ ctx, input }) => {
+        const { staff } = ctx;
+        return await this.visitService.create(input, staff);
+      }),
+    createMany: this.trpc.procedure
+      .input(z.array(VisitCreateManyInputSchema))
+      .mutation(async ({ ctx, input }) => {
+        const { staff } = ctx;
 
-                return await this.visitService.createMany({ data: input }, staff);
-            }),
-        deleteMany: this.trpc.procedure
-            .input(VisitDeleteManyArgsSchema)
-            .mutation(async ({ input }) => {
-                return await this.visitService.deleteMany(input);
-            }),
-
-
-    });
+        return await this.visitService.createMany({ data: input }, staff);
+      }),
+    deleteMany: this.trpc.procedure
+      .input(VisitDeleteManyArgsSchema)
+      .mutation(async ({ input }) => {
+        return await this.visitService.deleteMany(input);
+      }),
+  });
 }
diff --git a/apps/server/src/models/visit/visit.service.ts b/apps/server/src/models/visit/visit.service.ts
index a7f2ada..e050fa5 100755
--- a/apps/server/src/models/visit/visit.service.ts
+++ b/apps/server/src/models/visit/visit.service.ts
@@ -9,17 +9,22 @@ export class VisitService extends BaseService<Prisma.VisitDelegate> {
   }
   async create(args: Prisma.VisitCreateArgs, staff?: UserProfile) {
     const { postId, lectureId, messageId } = args.data;
-    const visitorId = args.data.visitorId || staff?.id;
+    const visitorId = args.data?.visitorId || staff?.id;
     let result;
+    console.log(args.data.type);
+    console.log(visitorId);
+    console.log(postId);
     const existingVisit = await db.visit.findFirst({
       where: {
         type: args.data.type,
-        visitorId,
-        OR: [{ postId }, { lectureId }, { messageId }],
+        // visitorId: visitorId ? visitorId : null,
+        OR: [{ postId }, { messageId }],
       },
     });
+    console.log('result', existingVisit);
     if (!existingVisit) {
       result = await super.create(args);
+      console.log('createdResult', result);
     } else if (args.data.type === VisitType.READED) {
       result = await super.update({
         where: { id: existingVisit.id },
@@ -30,12 +35,21 @@ export class VisitService extends BaseService<Prisma.VisitDelegate> {
       });
     }
 
-    // if (troubleId && args.data.type === VisitType.READED) {
-    //   EventBus.emit('updateViewCount', {
-    //     objectType: ObjectType.TROUBLE,
-    //     id: troubleId,
-    //   });
-    // }
+    if (
+      [VisitType.READED, VisitType.LIKE, VisitType.HATE].includes(
+        args.data.type as VisitType,
+      )
+    ) {
+      EventBus.emit('updateVisitCount', {
+        objectType: ObjectType.POST,
+        id: postId,
+        visitType: args.data.type, // 直接复用传入的类型
+      });
+      EventBus.emit('updateTotalCourseViewCount', {
+        visitType: args.data.type, // 直接复用传入的类型
+      });
+    }
+
     return result;
   }
   async createMany(args: Prisma.VisitCreateManyArgs, staff?: UserProfile) {
@@ -80,4 +94,64 @@ export class VisitService extends BaseService<Prisma.VisitDelegate> {
 
     return { count: updatePromises.length }; // Return the number of updates if no new creates
   }
+  async deleteMany(args: Prisma.VisitDeleteManyArgs, staff?: UserProfile) {
+    // const where = Array.isArray(args.where) ? args.where : [args.where];
+    // const updatePromises: any[] = [];
+    // const createData: Prisma.VisitCreateManyInput[] = [];
+    // super
+    // await Promise.all(
+    //   data.map(async (item) => {
+    //     if (staff && !item.visitorId) item.visitorId = staff.id;
+    //     const { postId, messageId, visitorId } = item;
+    //     const existingVisit = await db.visit.findFirst({
+    //       where: {
+    //         visitorId,
+    //         OR: [{ postId }, { messageId }],
+    //       },
+    //     });
+
+    //     if (existingVisit) {
+    //       updatePromises.push(
+    //         super.update({
+    //           where: { id: existingVisit.id },
+    //           data: {
+    //             ...item,
+    //             views: existingVisit.views + 1,
+    //           },
+    //         }),
+    //       );
+    //     } else {
+    //       createData.push(item);
+    //     }
+    //   }),
+    // );
+    // // Execute all updates in parallel
+    // await Promise.all(updatePromises);
+    // // Create new visits for those not existing
+    // if (createData.length > 0) {
+    //   return super.createMany({
+    //     ...args,
+    //     data: createData,
+    //   });
+    // }
+    // return { count: updatePromises.length }; // Return the number of updates if no new creates
+    const superDetele = super.deleteMany(args, staff);
+    if (args?.where?.postId) {
+      if (
+        [VisitType.READED, VisitType.LIKE, VisitType.HATE].includes(
+          args.where.type as any,
+        )
+      ) {
+        EventBus.emit('updateVisitCount', {
+          objectType: ObjectType.POST,
+          id: args?.where?.postId as string,
+          visitType: args.where.type as any, // 直接复用传入的类型
+        });
+        EventBus.emit('updateTotalCourseViewCount', {
+          visitType: args.where.type as any, // 直接复用传入的类型
+        });
+      }
+    }
+    return superDetele;
+  }
 }
diff --git a/apps/server/src/queue/models/post/post.queue.service.ts b/apps/server/src/queue/models/post/post.queue.service.ts
new file mode 100755
index 0000000..8e49a81
--- /dev/null
+++ b/apps/server/src/queue/models/post/post.queue.service.ts
@@ -0,0 +1,56 @@
+import { InjectQueue } from '@nestjs/bullmq';
+import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
+import { Queue } from 'bullmq';
+import EventBus from '@server/utils/event-bus';
+import { ObjectType, VisitType } from '@nice/common';
+import {
+  QueueJobType,
+  updatePostStateJobData,
+  updateVisitCountJobData,
+} from '@server/queue/types';
+
+@Injectable()
+export class PostQueueService implements OnModuleInit {
+  private readonly logger = new Logger(PostQueueService.name);
+  constructor(@InjectQueue('general') private generalQueue: Queue) {}
+  onModuleInit() {
+    EventBus.on('updateVisitCount', ({ id, objectType, visitType }) => {
+      if (objectType === ObjectType.POST) {
+        this.addUpdateVisitCountJob({ id, type: visitType });
+      }
+    });
+    EventBus.on('updatePostState', ({ id }) => {
+      this.addUpdatePostState({ id });
+    });
+    EventBus.on('updatePostState', ({ id }) => {
+      this.addUpdatePostState({ id });
+    });
+    EventBus.on('updateTotalCourseViewCount', ({ visitType }) => {
+      this.addUpdateTotalCourseViewCount({ visitType });
+    });
+  }
+  async addUpdateVisitCountJob(data: updateVisitCountJobData) {
+    this.logger.log(`update post view count ${data.id}`);
+    await this.generalQueue.add(QueueJobType.UPDATE_POST_VISIT_COUNT, data, {
+      debounce: {
+        id: `${QueueJobType.UPDATE_POST_VISIT_COUNT}_${data.type}_${data.id}`,
+      },
+    });
+  }
+  async addUpdatePostState(data: updatePostStateJobData) {
+    this.logger.log(`update post state ${data.id}`);
+    await this.generalQueue.add(QueueJobType.UPDATE_POST_STATE, data, {
+      debounce: { id: `${QueueJobType.UPDATE_POST_STATE}_${data.id}` },
+    });
+  }
+  async addUpdateTotalCourseViewCount({ visitType }) {
+    this.logger.log(`update post state ${visitType}`);
+    await this.generalQueue.add(
+      QueueJobType.UPDATE_TOTAL_COURSE_VIEW_COUNT,
+      { type: visitType },
+      {
+        debounce: { id: `${QueueJobType.UPDATE_POST_STATE}_${visitType}` },
+      },
+    );
+  }
+}
diff --git a/apps/server/src/queue/models/post/utils.ts b/apps/server/src/queue/models/post/utils.ts
new file mode 100755
index 0000000..7e3c3f1
--- /dev/null
+++ b/apps/server/src/queue/models/post/utils.ts
@@ -0,0 +1,136 @@
+import {
+  AppConfigSlug,
+  BaseSetting,
+  db,
+  PostType,
+  VisitType,
+} from '@nice/common';
+export async function updateTotalCourseViewCount(type: VisitType) {
+  const posts = await db.post.findMany({
+    where: {
+      // type: { in: [PostType.COURSE, PostType.LECTURE,] },
+      deletedAt: null,
+    },
+    select: { id: true, type: true },
+  });
+
+  const courseIds = posts
+    .filter((post) => post.type === PostType.COURSE)
+    .map((course) => course.id);
+  const lectures = posts.filter((post) => post.type === PostType.LECTURE);
+  const totalViews = await db.visit.aggregate({
+    _sum: {
+      views: true,
+    },
+    where: {
+      postId: { in: posts.map((post) => post.id) },
+      type: type,
+    },
+  });
+  const appConfig = await db.appConfig.findFirst({
+    where: {
+      slug: AppConfigSlug.BASE_SETTING,
+    },
+    select: {
+      id: true,
+      meta: true,
+    },
+  });
+  const staffs = await db.staff.count({
+    where: { deletedAt: null },
+  });
+
+  const baseSeting = appConfig.meta as BaseSetting;
+  await db.appConfig.update({
+    where: {
+      slug: AppConfigSlug.BASE_SETTING,
+    },
+    data: {
+      meta: {
+        ...baseSeting,
+        appConfig: {
+          ...(baseSeting?.appConfig || {}),
+          statistics: {
+            reads: totalViews._sum.views || 0,
+            courses: courseIds?.length || 0,
+            staffs: staffs || 0,
+            lectures: lectures?.length || 0,
+          },
+        },
+      },
+    },
+  });
+}
+export async function updatePostViewCount(id: string, type: VisitType) {
+  const post = await db.post.findFirst({
+    where: { id },
+    select: { id: true, meta: true, type: true },
+  });
+  const metaFieldMap = {
+    [VisitType.READED]: 'views',
+    [VisitType.LIKE]: 'likes',
+    [VisitType.HATE]: 'hates',
+  };
+  if (post?.type === PostType.LECTURE) {
+    const courseAncestry = await db.postAncestry.findFirst({
+      where: {
+        descendantId: post?.id,
+        ancestor: {
+          type: PostType.COURSE,
+        },
+      },
+      select: { id: true, ancestorId: true },
+    });
+    const course = { id: courseAncestry.ancestorId };
+    const lecturesAncestry = await db.postAncestry.findMany({
+      where: { ancestorId: course.id, descendant: { type: PostType.LECTURE } },
+      select: {
+        id: true,
+        descendantId: true,
+      },
+    });
+    const lectures = lecturesAncestry.map((ancestry) => ({
+      id: ancestry.descendantId,
+    }));
+    const courseViews = await db.visit.aggregate({
+      _sum: {
+        views: true,
+      },
+      where: {
+        postId: {
+          in: [course.id, ...lectures.map((lecture) => lecture.id)],
+        },
+        type: type,
+      },
+    });
+    await db.post.update({
+      where: { id: course.id },
+      data: {
+        [metaFieldMap[type]]: courseViews._sum.views || 0,
+        meta: {
+          ...((post?.meta as any) || {}),
+          [metaFieldMap[type]]: courseViews._sum.views || 0,
+        },
+      },
+    });
+  }
+  const totalViews = await db.visit.aggregate({
+    _sum: {
+      views: true,
+    },
+    where: {
+      postId: id,
+      type: type,
+    },
+  });
+  await db.post.update({
+    where: { id },
+    data: {
+      [metaFieldMap[type]]: totalViews._sum.views || 0,
+      meta: {
+        ...((post?.meta as any) || {}),
+        [metaFieldMap[type]]: totalViews._sum.views || 0,
+      },
+    },
+  });
+}
diff --git a/apps/server/src/queue/queue.module.ts b/apps/server/src/queue/queue.module.ts
index ca825eb..aab8453 100755
--- a/apps/server/src/queue/queue.module.ts
+++ b/apps/server/src/queue/queue.module.ts
@@ -2,6 +2,7 @@ import { BullModule } from '@nestjs/bullmq';
 import { Logger, Module } from '@nestjs/common';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { join } from 'path';
+import { PostQueueService } from './models/post/post.queue.service';
 
 @Module({
   imports: [
@@ -28,7 +29,7 @@ import { join } from 'path';
       },
     ),
   ],
-  providers: [Logger],
+  providers: [Logger, PostQueueService],
   exports: [],
 })
 export class QueueModule {}
diff --git a/apps/server/src/queue/types.ts b/apps/server/src/queue/types.ts
index c509c71..11119ee 100755
--- a/apps/server/src/queue/types.ts
+++ b/apps/server/src/queue/types.ts
@@ -1,4 +1,15 @@
+import { VisitType } from '@nice/common';
 export enum QueueJobType {
   UPDATE_STATS = 'update_stats',
   FILE_PROCESS = 'file_process',
+  UPDATE_POST_VISIT_COUNT = 'updatePostVisitCount',
+  UPDATE_POST_STATE = 'updatePostState',
+  UPDATE_TOTAL_COURSE_VIEW_COUNT = 'updateTotalCourseViewCount',
 }
+export type updateVisitCountJobData = {
+  id: string;
+  type: VisitType | string;
+};
+export type updatePostStateJobData = {
+  id: string;
+};
diff --git a/apps/server/src/queue/worker/file.processor.ts b/apps/server/src/queue/worker/file.processor.ts
index b416af4..1012a8c 100755
--- a/apps/server/src/queue/worker/file.processor.ts
+++ b/apps/server/src/queue/worker/file.processor.ts
@@ -10,7 +10,7 @@ const pipeline = new ResourceProcessingPipeline()
   .addProcessor(new VideoProcessor());
 export default async function processJob(job: Job<any, any, QueueJobType>) {
   if (job.name === QueueJobType.FILE_PROCESS) {
-    console.log('job', job);
+    // console.log('job', job);
     const { resource } = job.data;
     if (!resource) {
       throw new Error('No resource provided in job data');
diff --git a/apps/server/src/queue/worker/processor.ts b/apps/server/src/queue/worker/processor.ts
index 7273ecf..86d428b 100755
--- a/apps/server/src/queue/worker/processor.ts
+++ b/apps/server/src/queue/worker/processor.ts
@@ -11,6 +11,10 @@ import {
   updateCourseReviewStats,
   updateParentLectureStats,
 } from '@server/models/post/utils';
+import {
+  updatePostViewCount,
+  updateTotalCourseViewCount,
+} from '../models/post/utils';
 const logger = new Logger('QueueWorker');
 export default async function processJob(job: Job<any, any, QueueJobType>) {
   try {
@@ -44,6 +48,15 @@ export default async function processJob(job: Job<any, any, QueueJobType>) {
         `Updated course stats for courseId: ${courseId}, type: ${type}`,
       );
     }
+    if (job.name === QueueJobType.UPDATE_POST_VISIT_COUNT) {
+      await updatePostViewCount(job.data.id, job.data.type);
+    }
+    if (job.name === QueueJobType.UPDATE_POST_STATE) {
+      await updatePostViewCount(job.data.id, job.data.type);
+    }
+    if (job.name === QueueJobType.UPDATE_TOTAL_COURSE_VIEW_COUNT) {
+      await updateTotalCourseViewCount(job.data.type);
+    }
   } catch (error: any) {
     logger.error(
       `Error processing stats update job: ${error.message}`,
diff --git a/apps/server/src/tasks/init/gendev.service.ts b/apps/server/src/tasks/init/gendev.service.ts
index addb264..e5c3f9f 100755
--- a/apps/server/src/tasks/init/gendev.service.ts
+++ b/apps/server/src/tasks/init/gendev.service.ts
@@ -7,6 +7,7 @@ import {
   Department,
   getRandomElement,
   getRandomElements,
+  PostType,
   Staff,
   TaxonomySlug,
   Term,
@@ -14,6 +15,7 @@ import {
 import EventBus from '@server/utils/event-bus';
 import { capitalizeFirstLetter, DevDataCounts, getCounts } from './utils';
 import { StaffService } from '@server/models/staff/staff.service';
+import dayjs from 'dayjs';
 @Injectable()
 export class GenDevService {
   private readonly logger = new Logger(GenDevService.name);
@@ -29,13 +31,14 @@ export class GenDevService {
   domainDepts: Record<string, Department[]> = {};
   staffs: Staff[] = [];
   deptGeneratedCount = 0;
+  courseGeneratedCount = 1;
   constructor(
     private readonly appConfigService: AppConfigService,
 
     private readonly departmentService: DepartmentService,
     private readonly staffService: StaffService,
     private readonly termService: TermService,
-  ) { }
+  ) {}
   async genDataEvent() {
     EventBus.emit('genDataEvent', { type: 'start' });
     try {
@@ -43,6 +46,7 @@ export class GenDevService {
       await this.generateDepartments(3, 6);
       await this.generateTerms(2, 6);
       await this.generateStaffs(4);
+      await this.generateCourses(8);
     } catch (err) {
       this.logger.error(err);
     }
@@ -58,6 +62,7 @@ export class GenDevService {
     if (this.counts.termCount === 0) {
       this.logger.log('Generate terms');
       await this.createTerms(null, TaxonomySlug.CATEGORY, depth, count);
+      await this.createLevelTerm();
       const domains = this.depts.filter((item) => item.isDomain);
       for (const domain of domains) {
         await this.createTerms(domain, TaxonomySlug.CATEGORY, depth, count);
@@ -139,6 +144,65 @@ export class GenDevService {
     collectChildren(domainId);
     return children;
   }
+  private async generateCourses(countPerCate: number = 3) {
+    const titleList = [
+      '计算机科学导论',
+      '数据结构与算法',
+      '网络安全',
+      '机器学习',
+      '数据库管理系统',
+      'Web开发',
+      '移动应用开发',
+      '人工智能',
+      '计算机网络',
+      '操作系统',
+      '数字信号处理',
+      '无线通信',
+      '信息论',
+      '密码学',
+      '计算机图形学',
+    ];
+
+    if (!this.counts.courseCount) {
+      this.logger.log('Generating courses...');
+      const depts = await db.department.findMany({
+        select: { id: true, name: true },
+      });
+      const cates = await db.term.findMany({
+        where: {
+          taxonomy: { slug: TaxonomySlug.CATEGORY },
+        },
+        select: { id: true, name: true },
+      });
+      const total = cates.length * countPerCate;
+      const levels = await db.term.findMany({
+        where: {
+          taxonomy: { slug: TaxonomySlug.LEVEL },
+        },
+        select: { id: true, name: true },
+      });
+      for (const cate of cates) {
+        for (let i = 0; i < countPerCate; i++) {
+          const randomTitle = `${titleList[Math.floor(Math.random() * titleList.length)]} ${Math.random().toString(36).substring(7)}`;
+          const randomLevelId =
+            levels[Math.floor(Math.random() * levels.length)].id;
+          const randomDeptId =
+            depts[Math.floor(Math.random() * depts.length)].id;
+
+          await this.createCourse(
+            randomTitle,
+            randomDeptId,
+            cate.id,
+            randomLevelId,
+          );
+          this.courseGeneratedCount++;
+          this.logger.log(
+            `Generated ${this.courseGeneratedCount}/${total} course`,
+          );
+        }
+      }
+    }
+  }
   private async generateStaffs(countPerDept: number = 3) {
     if (this.counts.staffCount === 1) {
       this.logger.log('Generating staffs...');
@@ -174,7 +238,59 @@ export class GenDevService {
       }
     }
   }
+  private async createLevelTerm() {
+    try {
+      // 1. 获取分类时添加异常处理
+      const taxLevel = await db.taxonomy.findFirst({
+        where: { slug: TaxonomySlug.LEVEL },
+      });
 
+      if (!taxLevel) {
+        throw new Error('LEVEL taxonomy not found');
+      }
+
+      // 2. 使用数组定义初始化数据 + 名称去重
+      const termsToCreate = [
+        { name: '初级', taxonomyId: taxLevel.id },
+        { name: '中级', taxonomyId: taxLevel.id },
+        { name: '高级', taxonomyId: taxLevel.id }, // 改为高级更合理
+      ];
+      for (const termData of termsToCreate) {
+        await this.termService.create({
+          data: termData,
+        });
+      }
+      console.log('created level terms');
+    } catch (error) {
+      console.error('Failed to create level terms:', error);
+      throw error; // 向上抛出错误供上层处理
+    }
+  }
+  private async createCourse(
+    title: string,
+    deptId: string,
+    cateId: string,
+    levelId: string,
+  ) {
+    const course = await db.post.create({
+      data: {
+        type: PostType.COURSE,
+        title: title,
+        updatedAt: dayjs().toDate(),
+        depts: {
+          connect: {
+            id: deptId,
+          },
+        },
+        terms: {
+          connect: [cateId, levelId].map((id) => ({
+            id: id,
+          })),
+        },
+      },
+    });
+    return course;
+  }
   private async createDepartment(
     name: string,
     parentId?: string | null,
diff --git a/apps/server/src/tasks/init/utils.ts b/apps/server/src/tasks/init/utils.ts
index 292eb9e..d55dcec 100755
--- a/apps/server/src/tasks/init/utils.ts
+++ b/apps/server/src/tasks/init/utils.ts
@@ -1,34 +1,44 @@
-import { db, getRandomElement, getRandomIntInRange, getRandomTimeInterval,  } from '@nice/common';
+import {
+  db,
+  getRandomElement,
+  getRandomIntInRange,
+  getRandomTimeInterval,
+  PostType,
+} from '@nice/common';
 import dayjs from 'dayjs';
 export interface DevDataCounts {
-    deptCount: number;
+  deptCount: number;
 
-    staffCount: number
-    termCount: number
+  staffCount: number;
+  termCount: number;
+  courseCount: number;
 }
 export async function getCounts(): Promise<DevDataCounts> {
-    const counts = {
-        deptCount: await db.department.count(),
+  const counts = {
+    deptCount: await db.department.count(),
 
-        staffCount: await db.staff.count(),
-        termCount: await db.term.count(),
-    };
-    return counts;
+    staffCount: await db.staff.count(),
+    termCount: await db.term.count(),
+    courseCount: await db.post.count({
+      where: {
+        type: PostType.COURSE,
+      },
+    }),
+  };
+  return counts;
 }
 export function capitalizeFirstLetter(string: string) {
-    return string.charAt(0).toUpperCase() + string.slice(1);
+  return string.charAt(0).toUpperCase() + string.slice(1);
 }
 export function getRandomImageLinks(count: number = 5): string[] {
-    const baseUrl = 'https://picsum.photos/200/300?random=';
-    const imageLinks: string[] = [];
+  const baseUrl = 'https://picsum.photos/200/300?random=';
+  const imageLinks: string[] = [];
 
-    for (let i = 0; i < count; i++) {
-        // 生成随机数以确保每个链接都是唯一的
-        const randomId = Math.floor(Math.random() * 1000);
-        imageLinks.push(`${baseUrl}${randomId}`);
-    }
+  for (let i = 0; i < count; i++) {
+    // 生成随机数以确保每个链接都是唯一的
+    const randomId = Math.floor(Math.random() * 1000);
+    imageLinks.push(`${baseUrl}${randomId}`);
+  }
 
-    return imageLinks;
+  return imageLinks;
 }
-
-
diff --git a/apps/server/src/upload/tus.service.ts b/apps/server/src/upload/tus.service.ts
index 8844b97..e2dc45d 100755
--- a/apps/server/src/upload/tus.service.ts
+++ b/apps/server/src/upload/tus.service.ts
@@ -89,8 +89,8 @@ export class TusService implements OnModuleInit {
     upload: Upload,
   ) {
     try {
-      console.log('upload.id', upload.id);
-      console.log('fileId', this.getFileId(upload.id));
+      // console.log('upload.id', upload.id);
+      // console.log('fileId', this.getFileId(upload.id));
       const resource = await this.resourceService.update({
         where: { fileId: this.getFileId(upload.id) },
         data: { status: ResourceStatus.UPLOADED },
@@ -128,6 +128,7 @@ export class TusService implements OnModuleInit {
   }
 
   async handleTus(req: Request, res: Response) {
+    console.log(req)
     return this.tusServer.handle(req, res);
   }
 }
diff --git a/apps/server/src/utils/event-bus.ts b/apps/server/src/utils/event-bus.ts
index 8cc9c2e..3f96688 100755
--- a/apps/server/src/utils/event-bus.ts
+++ b/apps/server/src/utils/event-bus.ts
@@ -1,16 +1,31 @@
 import mitt from 'mitt';
-import { ObjectType, UserProfile, MessageDto } from '@nice/common';
+import { ObjectType, UserProfile, MessageDto, VisitType } from '@nice/common';
 export enum CrudOperation {
   CREATED,
   UPDATED,
-  DELETED
+  DELETED,
 }
 type Events = {
-  genDataEvent: { type: "start" | "end" },
-  markDirty: { objectType: string, id: string, staff?: UserProfile, subscribers?: string[] }
-  updateViewCount: { id: string, objectType: ObjectType },
-  onMessageCreated: { data: Partial<MessageDto> },
-  dataChanged: { type: string, operation: CrudOperation, data: any }
+  genDataEvent: { type: 'start' | 'end' };
+  markDirty: {
+    objectType: string;
+    id: string;
+    staff?: UserProfile;
+    subscribers?: string[];
+  };
+  updateVisitCount: {
+    id: string;
+    objectType: ObjectType;
+    visitType: VisitType | string;
+  };
+  updatePostState: {
+    id: string;
+  };
+  updateTotalCourseViewCount: {
+    visitType: VisitType | string;
+  };
+  onMessageCreated: { data: Partial<MessageDto> };
+  dataChanged: { type: string; operation: CrudOperation; data: any };
 };
 const EventBus = mitt<Events>();
 export default EventBus;
diff --git a/apps/web/package.json b/apps/web/package.json
index f10e338..7f6c264 100755
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -34,9 +34,8 @@
 		"@nice/common": "workspace:^",
 		"@nice/config": "workspace:^",
 		"@nice/iconer": "workspace:^",
-		"@nice/utils": "workspace:^",
-		"mind-elixir": "workspace:^",
 		"@nice/ui": "workspace:^",
+		"@nice/utils": "workspace:^",
 		"@tanstack/query-async-storage-persister": "^5.51.9",
 		"@tanstack/react-query": "^5.51.21",
 		"@tanstack/react-query-persist-client": "^5.51.9",
@@ -59,6 +58,7 @@
 		"framer-motion": "^11.15.0",
 		"hls.js": "^1.5.18",
 		"idb-keyval": "^6.2.1",
+		"mind-elixir": "workspace:^",
 		"mitt": "^3.0.1",
 		"quill": "2.0.3",
 		"react": "18.2.0",
@@ -69,6 +69,7 @@
 		"react-router-dom": "^6.24.1",
 		"superjson": "^2.2.1",
 		"tailwind-merge": "^2.6.0",
+		"use-debounce": "^10.0.4",
 		"uuid": "^10.0.0",
 		"yjs": "^13.6.20",
 		"zod": "^3.23.8"
diff --git a/apps/web/public/logo.svg b/apps/web/public/logo.svg
new file mode 100755
index 0000000..39a6980
--- /dev/null
+++ b/apps/web/public/logo.svg
@@ -0,0 +1 @@
+<svg t="1740656897964" class="icon" viewBox="0 0 1455 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1701" width="200" height="200"><path d="M1406.961225 224.573272l-769.220252 251.414363c-3.584422 1.228464-8.918983 1.295777-15.986857 0.168283l-52.84077-8.245852-115.610219-37.863609c-5.267249-1.682827-5.603814-4.08927-1.009697-7.236157l231.725287-161.04655c19.302026 8.296337 38.940618 9.709912 58.898948 4.207068 103.157299 3.197371 60.076926-104.503561-33.656542-87.00216-32.865613 1.127494-52.268609 17.720169-58.225816 49.811682l-258.818803 171.816643a18.729865 18.729865 0 0 1-15.145443 2.52424l-54.187032-14.472312-21.708469-3.533937a2040.713897 2040.713897 0 0 0-250.57295-86.665594c-46.61431-12.789486-62.432884-51.494508-6.563026-69.66904a16355.917924 16355.917924 0 0 0 328.656126-110.056891c28.50709 1.800625 53.749496-6.175975 75.727218-23.896144l246.1976-81.280547c20.53049-6.731308 40.842213-6.849106 60.91834-0.336566l651.422357 211.36308z" fill="#918191" p-id="1702"></path><path d="M448.422928 94.827305c-21.977721 17.720169-47.220127 25.696769-75.727218 23.896144a180.651485 180.651485 0 0 1 75.727218-23.896144z" fill="#CBC5CB" p-id="1703"></path><path d="M709.261123 178.968658c20.648288 25.578971 31.872745 54.574082 33.656542 87.00216-19.958329 5.502845-39.596921 4.08927-58.898948-4.207068 0.454363-22.886448-10.534497-33.875309-32.98341-32.98341 5.957208-32.091512 25.360204-48.684187 58.225816-49.811682z" fill="#685E67" p-id="1704"></path><path d="M709.261123 178.968658c93.733468-17.501401 136.81384 90.199531 33.656542 87.00216-1.783797-32.428078-13.008253-61.423188-33.656542-87.00216z" fill="#554E54" p-id="1705"></path><path d="M651.035307 228.78034c22.448913-0.891898 33.437774 10.096962 32.98341 32.98341l-231.725287 161.04655c-4.594118 3.146887-4.257552 5.553329 1.009697 7.236157l115.610219 37.863609 149.098478 54.860162c4.442663 1.632342 10.197932 1.396746 16.15514-0.673131l416.163133-137.655254a1097.724923 1097.724923 0 0 1 30.795735 210.353383c9.592114 51.494508-31.805432 54.523597-67.986213 63.779146l-10.096962-5.048481c-3.870502-1.85111-6.731308-6.71448-7.572722-12.789486l-21.035339-145.901106a7.067874 7.067874 0 0 0-3.449795-5.048482 7.774661 7.774661 0 0 0-6.310602-0.67313l-322.261383 104.671843c-5.284077 1.649171-10.938376 1.834282-16.323422 0.504848-109.552042-27.093516-215.401864-78.756307-323.775927-100.801341-48.970268-10.096962-142.198887-31.468866-79.429438-104.840126l54.187032 14.472312c5.031653 1.396746 10.534497 0.471192 15.145443-2.52424l258.818803-171.816643z" fill="#554E54" p-id="1706"></path><path d="M1406.961225 224.573272c60.076926 20.025642 46.950875 57.552686-1.346262 73.539543a16253.517897 16253.517897 0 0 0-255.284866 86.329028l-416.163133 137.655254c-5.957208 2.069877-11.712476 2.305473-16.15514 0.673131l-149.098478-54.860162 52.84077 8.245852c7.067874 1.127494 12.402435 1.060181 15.986857-0.168283l769.220252-251.414363z" fill="#7A6D79" p-id="1707"></path><path d="M301.17556 385.114974l21.708469 3.533937c-62.76945 73.37126 30.45917 94.743164 79.429438 104.840126 108.374063 22.045035 214.223885 73.707825 323.775927 100.801341 5.385047 1.329433 11.039346 1.144322 16.323422-0.504848l322.261383-104.671843a7.774661 7.774661 0 0 1 6.310602 0.67313 7.067874 7.067874 0 0 1 3.449795 5.048482l21.035339 145.901106c0.841414 6.075006 3.70222 10.938376 7.572722 12.789486l10.096962 5.048481-16.828271 11.274941a294.9491 294.9491 0 0 0-117.797894 42.070677l-109.38376 37.863609c-22.650852-1.901595-42.289444 5.098966-58.898947 21.035338l-134.626165 47.624006c-28.60806 4.156583-49.643398 19.133744-63.106015 44.931483l-46.277744 5.553329-83.468223-17.501401-35.002803-231.388722c30.964018-36.803428 30.526483-70.005606-1.346261-99.623362a22.785478 22.785478 0 0 0-14.808879-6.058177c-82.22293-4.156583-101.642755 32.478562-58.225816 109.888607l-30.795735 172.489774c-29.836524-10.096962-53.009053-27.648849-69.500758-52.672487a27.127172 27.127172 0 0 1-4.37535-15.482009c2.473756-115.324139 13.294334-229.823692 32.478562-343.465004z" fill="#685E67" p-id="1708"></path><path d="M447.749797 620.037632l-49.13855 4.207068h-25.242406c-43.416938-77.410045-23.997114-114.04519 58.225816-109.888607 5.637471 0.218768 10.904719 2.355958 14.808879 6.058177 31.872745 29.617756 32.31028 62.819934 1.346261 99.623362z" fill="#FDDD44" p-id="1709"></path><path d="M1417.058187 610.445518l-24.569275 68.491062c-2.019392 5.553329-5.671127 9.693084-9.92868 11.274941l-209.848535 77.073479c-14.909848-41.397546-40.38785-73.876108-76.400349-97.435687l16.828271-11.274941c36.180782-9.255549 77.578328-12.284638 67.986213-63.779146 6.394743 13.243849 16.104655 22.499398 29.112909 27.766647 4.745572 1.817453 10.433528 1.514544 15.818574-0.841414 54.355314-24.064427 147.583934-78.419741 191.000872-11.274941z" fill="#F1EFF2" p-id="1710"></path><path d="M1417.058187 610.445518c21.657984 33.538743 30.863048 67.935729 27.598364 103.157299-2.019392 22.549883-14.186232 38.082376-36.517348 46.61431l-236.26892 90.872661-0.504848-41.734111v-29.449474l1.346262-12.621203 209.848535-77.073479c4.257552-1.581857 7.909287-5.721612 9.92868-11.274941l24.569275-68.491062z" fill="#E1DDE1" p-id="1711"></path><path d="M398.611247 624.2447c-2.860806 14.135747-7.572722 23.559579-5.048481 38.200174a2093.369556 2093.369556 0 0 1 29.786039 323.102797l-68.491062-5.216764c-9.642599-0.7741-16.962897-10.029649-16.659988-21.035338l4.375351-162.561095 30.795735-172.489774h25.242406z" fill="#FCD430" p-id="1712"></path><path d="M447.749797 620.037632l35.002803 231.388722-1.177979 109.552042c-0.10097 6.125491-2.221332 11.325426-5.721612 13.967464-12.335122 9.642599-29.836524 13.176536-52.504204 10.601811a2093.369556 2093.369556 0 0 0-29.786039-323.102797c-2.524241-14.640595 2.187675-24.064427 5.048481-38.200174l49.13855-4.207068z" fill="#E6B729" p-id="1713"></path><path d="M1096.311348 669.849313c36.012499 23.559579 61.490501 56.038141 76.400349 97.435687l-1.346262 12.621203c-38.587225-1.127494-71.789403 11.493709-99.623362 37.863609l-8.414135-21.035338c-6.276945-50.939175-34.54844-79.21067-84.814484-84.814484a294.9491 294.9491 0 0 1 117.797894-42.070677z" fill="#FC9743" p-id="1714"></path><path d="M978.513454 711.91999c50.266044 5.603814 78.537539 33.875309 84.814484 84.814484 1.009696 6.512541-1.682827 10.988861-8.07757 13.462617-146.84349 56.761757-244.34649 92.437691-292.475344 107.027801-14.354515 4.37535-26.353072-2.13719-36.012499-19.520794l-51.157943-79.261155 134.626165-47.624006a100.010412 100.010412 0 0 0 58.898947-21.035338l109.38376-37.863609z" fill="#F1EFF2" p-id="1715"></path><path d="M869.129694 749.783599a100.010412 100.010412 0 0 1-58.898947 21.035338c16.609503-15.936372 36.248095-22.936933 58.898947-21.035338z" fill="#A69CA7" p-id="1716"></path><path d="M1171.365435 779.906203v29.449474c-9.979164 31.754947-33.925794 53.850466-71.856715 66.303386-21.641156 7.067874-31.351068-1.009696-29.112909-24.232709l1.346262-33.656542c27.83396-26.3699 61.036138-38.991103 99.623362-37.863609z" fill="#FA7621" p-id="1717"></path><path d="M1063.327938 796.734474l8.414135 21.035338-1.346262 33.656542-16.82827 42.070676-329.329257 117.124764c13.580414-39.041588 14.421828-76.686429 2.524241-112.917696 9.659427 17.383604 21.657984 23.896144 36.012499 19.520794 48.128854-14.590111 145.631854-50.266044 292.475344-107.027801 6.394743-2.473756 9.087266-6.950076 8.07757-13.462617z" fill="#E1DDE1" p-id="1718"></path><path d="M1171.365435 809.355677l0.504848 41.734111c44.544432 11.661992 78.083176 31.519351 100.633059 59.572078 3.399311 4.207068 4.644603 9.760397 3.348826 14.926676a16.020514 16.020514 0 0 1-9.911852 11.157144l-97.772252 36.349065a15.986857 15.986857 0 0 1-13.075566-1.060182 16.676816 16.676816 0 0 1-8.128055-10.551325c-13.227021-50.60261-44.359321-73.253462-93.396902-67.986214l16.82827-42.070676c-2.23816 23.223014 7.471752 31.300583 29.112909 24.232709 37.930922-12.45292 61.877551-34.54844 71.856715-66.303386z" fill="#FC9743" p-id="1719"></path><path d="M675.604582 818.442943l51.157943 79.261155c11.897587 36.231267 11.056174 73.876108-2.524241 112.917696a84.612545 84.612545 0 0 1-40.219567 4.207068c-23.727862-56.038141 24.064427-130.082532-71.52015-151.454436 13.462617-25.797739 34.497955-40.7749 63.106015-44.931483z" fill="#A69CA7" p-id="1720"></path><path d="M612.498567 863.374426c95.584577 21.371904 47.792289 95.416295 71.52015 151.454436-57.384403-25.915537-58.394099-85.487615-80.775699-133.784752-1.85111-4.190239-6.663995-6.596682-11.779789-5.889895-9.087266 1.009696-17.501401-1.060181-25.242406-6.22646l46.277744-5.553329z" fill="#B6ADB6" p-id="1721"></path></svg>
\ No newline at end of file
diff --git a/apps/web/public/placeholder.webp b/apps/web/public/placeholder.webp
new file mode 100644
index 0000000..1f474a5
Binary files /dev/null and b/apps/web/public/placeholder.webp differ
diff --git a/apps/web/public/vite.svg b/apps/web/public/vite.svg
index e7b8dfb..78260dd 100755
--- a/apps/web/public/vite.svg
+++ b/apps/web/public/vite.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
+<svg t="1740656897964" class="icon" viewBox="0 0 1455 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1701" width="400" height="400"><path d="M1406.961225 224.573272l-769.220252 251.414363c-3.584422 1.228464-8.918983 1.295777-15.986857 0.168283l-52.84077-8.245852-115.610219-37.863609c-5.267249-1.682827-5.603814-4.08927-1.009697-7.236157l231.725287-161.04655c19.302026 8.296337 38.940618 9.709912 58.898948 4.207068 103.157299 3.197371 60.076926-104.503561-33.656542-87.00216-32.865613 1.127494-52.268609 17.720169-58.225816 49.811682l-258.818803 171.816643a18.729865 18.729865 0 0 1-15.145443 2.52424l-54.187032-14.472312-21.708469-3.533937a2040.713897 2040.713897 0 0 0-250.57295-86.665594c-46.61431-12.789486-62.432884-51.494508-6.563026-69.66904a16355.917924 16355.917924 0 0 0 328.656126-110.056891c28.50709 1.800625 53.749496-6.175975 75.727218-23.896144l246.1976-81.280547c20.53049-6.731308 40.842213-6.849106 60.91834-0.336566l651.422357 211.36308z" fill="#918191" p-id="1702"></path><path d="M448.422928 94.827305c-21.977721 17.720169-47.220127 25.696769-75.727218 23.896144a180.651485 180.651485 0 0 1 75.727218-23.896144z" fill="#CBC5CB" p-id="1703"></path><path d="M709.261123 178.968658c20.648288 25.578971 31.872745 54.574082 33.656542 87.00216-19.958329 5.502845-39.596921 4.08927-58.898948-4.207068 0.454363-22.886448-10.534497-33.875309-32.98341-32.98341 5.957208-32.091512 25.360204-48.684187 58.225816-49.811682z" fill="#685E67" p-id="1704"></path><path d="M709.261123 178.968658c93.733468-17.501401 136.81384 90.199531 33.656542 87.00216-1.783797-32.428078-13.008253-61.423188-33.656542-87.00216z" fill="#554E54" p-id="1705"></path><path d="M651.035307 228.78034c22.448913-0.891898 33.437774 10.096962 32.98341 32.98341l-231.725287 161.04655c-4.594118 3.146887-4.257552 5.553329 1.009697 7.236157l115.610219 37.863609 149.098478 54.860162c4.442663 1.632342 10.197932 1.396746 16.15514-0.673131l416.163133-137.655254a1097.724923 1097.724923 0 0 1 30.795735 210.353383c9.592114 51.494508-31.805432 54.523597-67.986213 63.779146l-10.096962-5.048481c-3.870502-1.85111-6.731308-6.71448-7.572722-12.789486l-21.035339-145.901106a7.067874 7.067874 0 0 0-3.449795-5.048482 7.774661 7.774661 0 0 0-6.310602-0.67313l-322.261383 104.671843c-5.284077 1.649171-10.938376 1.834282-16.323422 0.504848-109.552042-27.093516-215.401864-78.756307-323.775927-100.801341-48.970268-10.096962-142.198887-31.468866-79.429438-104.840126l54.187032 14.472312c5.031653 1.396746 10.534497 0.471192 15.145443-2.52424l258.818803-171.816643z" fill="#554E54" p-id="1706"></path><path d="M1406.961225 224.573272c60.076926 20.025642 46.950875 57.552686-1.346262 73.539543a16253.517897 16253.517897 0 0 0-255.284866 86.329028l-416.163133 137.655254c-5.957208 2.069877-11.712476 2.305473-16.15514 0.673131l-149.098478-54.860162 52.84077 8.245852c7.067874 1.127494 12.402435 1.060181 15.986857-0.168283l769.220252-251.414363z" fill="#7A6D79" p-id="1707"></path><path d="M301.17556 385.114974l21.708469 3.533937c-62.76945 73.37126 30.45917 94.743164 79.429438 104.840126 108.374063 22.045035 214.223885 73.707825 323.775927 100.801341 5.385047 1.329433 11.039346 1.144322 16.323422-0.504848l322.261383-104.671843a7.774661 7.774661 0 0 1 6.310602 0.67313 7.067874 7.067874 0 0 1 3.449795 5.048482l21.035339 145.901106c0.841414 6.075006 3.70222 10.938376 7.572722 12.789486l10.096962 5.048481-16.828271 11.274941a294.9491 294.9491 0 0 0-117.797894 42.070677l-109.38376 37.863609c-22.650852-1.901595-42.289444 5.098966-58.898947 21.035338l-134.626165 47.624006c-28.60806 4.156583-49.643398 19.133744-63.106015 44.931483l-46.277744 5.553329-83.468223-17.501401-35.002803-231.388722c30.964018-36.803428 30.526483-70.005606-1.346261-99.623362a22.785478 22.785478 0 0 0-14.808879-6.058177c-82.22293-4.156583-101.642755 32.478562-58.225816 109.888607l-30.795735 172.489774c-29.836524-10.096962-53.009053-27.648849-69.500758-52.672487a27.127172 27.127172 0 0 1-4.37535-15.482009c2.473756-115.324139 13.294334-229.823692 32.478562-343.465004z" fill="#685E67" p-id="1708"></path><path d="M447.749797 620.037632l-49.13855 4.207068h-25.242406c-43.416938-77.410045-23.997114-114.04519 58.225816-109.888607 5.637471 0.218768 10.904719 2.355958 14.808879 6.058177 31.872745 29.617756 32.31028 62.819934 1.346261 99.623362z" fill="#FDDD44" p-id="1709"></path><path d="M1417.058187 610.445518l-24.569275 68.491062c-2.019392 5.553329-5.671127 9.693084-9.92868 11.274941l-209.848535 77.073479c-14.909848-41.397546-40.38785-73.876108-76.400349-97.435687l16.828271-11.274941c36.180782-9.255549 77.578328-12.284638 67.986213-63.779146 6.394743 13.243849 16.104655 22.499398 29.112909 27.766647 4.745572 1.817453 10.433528 1.514544 15.818574-0.841414 54.355314-24.064427 147.583934-78.419741 191.000872-11.274941z" fill="#F1EFF2" p-id="1710"></path><path d="M1417.058187 610.445518c21.657984 33.538743 30.863048 67.935729 27.598364 103.157299-2.019392 22.549883-14.186232 38.082376-36.517348 46.61431l-236.26892 90.872661-0.504848-41.734111v-29.449474l1.346262-12.621203 209.848535-77.073479c4.257552-1.581857 7.909287-5.721612 9.92868-11.274941l24.569275-68.491062z" fill="#E1DDE1" p-id="1711"></path><path d="M398.611247 624.2447c-2.860806 14.135747-7.572722 23.559579-5.048481 38.200174a2093.369556 2093.369556 0 0 1 29.786039 323.102797l-68.491062-5.216764c-9.642599-0.7741-16.962897-10.029649-16.659988-21.035338l4.375351-162.561095 30.795735-172.489774h25.242406z" fill="#FCD430" p-id="1712"></path><path d="M447.749797 620.037632l35.002803 231.388722-1.177979 109.552042c-0.10097 6.125491-2.221332 11.325426-5.721612 13.967464-12.335122 9.642599-29.836524 13.176536-52.504204 10.601811a2093.369556 2093.369556 0 0 0-29.786039-323.102797c-2.524241-14.640595 2.187675-24.064427 5.048481-38.200174l49.13855-4.207068z" fill="#E6B729" p-id="1713"></path><path d="M1096.311348 669.849313c36.012499 23.559579 61.490501 56.038141 76.400349 97.435687l-1.346262 12.621203c-38.587225-1.127494-71.789403 11.493709-99.623362 37.863609l-8.414135-21.035338c-6.276945-50.939175-34.54844-79.21067-84.814484-84.814484a294.9491 294.9491 0 0 1 117.797894-42.070677z" fill="#FC9743" p-id="1714"></path><path d="M978.513454 711.91999c50.266044 5.603814 78.537539 33.875309 84.814484 84.814484 1.009696 6.512541-1.682827 10.988861-8.07757 13.462617-146.84349 56.761757-244.34649 92.437691-292.475344 107.027801-14.354515 4.37535-26.353072-2.13719-36.012499-19.520794l-51.157943-79.261155 134.626165-47.624006a100.010412 100.010412 0 0 0 58.898947-21.035338l109.38376-37.863609z" fill="#F1EFF2" p-id="1715"></path><path d="M869.129694 749.783599a100.010412 100.010412 0 0 1-58.898947 21.035338c16.609503-15.936372 36.248095-22.936933 58.898947-21.035338z" fill="#A69CA7" p-id="1716"></path><path d="M1171.365435 779.906203v29.449474c-9.979164 31.754947-33.925794 53.850466-71.856715 66.303386-21.641156 7.067874-31.351068-1.009696-29.112909-24.232709l1.346262-33.656542c27.83396-26.3699 61.036138-38.991103 99.623362-37.863609z" fill="#FA7621" p-id="1717"></path><path d="M1063.327938 796.734474l8.414135 21.035338-1.346262 33.656542-16.82827 42.070676-329.329257 117.124764c13.580414-39.041588 14.421828-76.686429 2.524241-112.917696 9.659427 17.383604 21.657984 23.896144 36.012499 19.520794 48.128854-14.590111 145.631854-50.266044 292.475344-107.027801 6.394743-2.473756 9.087266-6.950076 8.07757-13.462617z" fill="#E1DDE1" p-id="1718"></path><path d="M1171.365435 809.355677l0.504848 41.734111c44.544432 11.661992 78.083176 31.519351 100.633059 59.572078 3.399311 4.207068 4.644603 9.760397 3.348826 14.926676a16.020514 16.020514 0 0 1-9.911852 11.157144l-97.772252 36.349065a15.986857 15.986857 0 0 1-13.075566-1.060182 16.676816 16.676816 0 0 1-8.128055-10.551325c-13.227021-50.60261-44.359321-73.253462-93.396902-67.986214l16.82827-42.070676c-2.23816 23.223014 7.471752 31.300583 29.112909 24.232709 37.930922-12.45292 61.877551-34.54844 71.856715-66.303386z" fill="#FC9743" p-id="1719"></path><path d="M675.604582 818.442943l51.157943 79.261155c11.897587 36.231267 11.056174 73.876108-2.524241 112.917696a84.612545 84.612545 0 0 1-40.219567 4.207068c-23.727862-56.038141 24.064427-130.082532-71.52015-151.454436 13.462617-25.797739 34.497955-40.7749 63.106015-44.931483z" fill="#A69CA7" p-id="1720"></path><path d="M612.498567 863.374426c95.584577 21.371904 47.792289 95.416295 71.52015 151.454436-57.384403-25.915537-58.394099-85.487615-80.775699-133.784752-1.85111-4.190239-6.663995-6.596682-11.779789-5.889895-9.087266 1.009696-17.501401-1.060181-25.242406-6.22646l46.277744-5.553329z" fill="#B6ADB6" p-id="1721"></path></svg>
diff --git a/apps/web/src/app/admin/base-setting/page.tsx b/apps/web/src/app/admin/base-setting/page.tsx
index ae1060d..d4a4efa 100755
--- a/apps/web/src/app/admin/base-setting/page.tsx
+++ b/apps/web/src/app/admin/base-setting/page.tsx
@@ -1,66 +1,66 @@
-import {
-	AppConfigSlug,
-	BaseSetting,
-	RolePerms,
-} from "@nice/common";
+import { AppConfigSlug, BaseSetting, RolePerms } from "@nice/common";
 import { useContext, useEffect, useState } from "react";
-import {
-	Button,
-	Form,
-	Input,
-	message,
-	theme,
-} from "antd";
+import { Button, Form, Input, message, theme } from "antd";
 import { useAppConfig } from "@nice/client";
 import { useAuth } from "@web/src/providers/auth-provider";
+import MultiAvatarUploader from "@web/src/components/common/uploader/MultiAvatarUploader";
 
 import FixedHeader from "@web/src/components/layout/fix-header";
 import { useForm } from "antd/es/form/Form";
-import { api } from "@nice/client"
+import { api } from "@nice/client";
 import { MainLayoutContext } from "../layout";
 
 export default function BaseSettingPage() {
 	const { update, baseSetting } = useAppConfig();
-	const utils = api.useUtils()
-	const [form] = useForm()
+	const utils = api.useUtils();
+	const [form] = useForm();
 	const { token } = theme.useToken();
-	const { data: clientCount } = api.app_config.getClientCount.useQuery(undefined, {
-		refetchInterval: 3000,
-		refetchIntervalInBackground: true
-	})
+	const { data: clientCount } = api.app_config.getClientCount.useQuery(
+		undefined,
+		{
+			refetchInterval: 3000,
+			refetchIntervalInBackground: true,
+		}
+	);
 	const [isFormChanged, setIsFormChanged] = useState(false);
 	const [loading, setLoading] = useState(false);
 	const { user, hasSomePermissions } = useAuth();
-	const { pageWidth } = useContext?.(MainLayoutContext);
+	const context = useContext(MainLayoutContext);
+	const pageWidth = context?.pageWidth;
+	// const [meta,setMeta ] = useState<>(baseSetting);
 	function handleFieldsChange() {
 		setIsFormChanged(true);
 	}
 	function onResetClick() {
-		if (!form)
-			return
+		if (!form) return;
 		if (!baseSetting) {
 			form.resetFields();
 		} else {
 			form.resetFields();
 			form.setFieldsValue(baseSetting);
-
 		}
 		setIsFormChanged(false);
 	}
 	function onSaveClick() {
-		if (form)
-			form.submit();
+		if (form) form.submit();
 	}
 	async function onSubmit(values: BaseSetting) {
 		setLoading(true);
-
+		const appConfig = values?.appConfig || {};
 		try {
-
 			await update.mutateAsync({
 				where: {
 					slug: AppConfigSlug.BASE_SETTING,
 				},
-				data: { meta: JSON.stringify(values) }
+				data: {
+					meta: {
+						...baseSetting,
+						appConfig: {
+							...(baseSetting?.appConfig || {}),
+							...appConfig,
+						},
+					},
+				},
 			});
 			setIsFormChanged(false);
 			message.success("已保存");
@@ -72,7 +72,6 @@ export default function BaseSettingPage() {
 	}
 	useEffect(() => {
 		if (baseSetting && form) {
-
 			form.setFieldsValue(baseSetting);
 		}
 	}, [baseSetting, form]);
@@ -103,7 +102,6 @@ export default function BaseSettingPage() {
 						!hasSomePermissions(RolePerms.MANAGE_BASE_SETTING)
 					}
 					onFinish={onSubmit}
-
 					onFieldsChange={handleFieldsChange}
 					layout="vertical">
 					{/* <div
@@ -129,6 +127,13 @@ export default function BaseSettingPage() {
 							<Input></Input>
 						</Form.Item>
 					</div>
+					<div className="p-2 grid grid-cols-8 gap-2 border-b">
+						<Form.Item
+							label="首页轮播图"
+							name={["appConfig", "slides"]}>
+							<MultiAvatarUploader></MultiAvatarUploader>
+						</Form.Item>
+					</div>
 					{/* <div
 						className="p-2 border-b flex items-center justify-between"
 						style={{
@@ -173,17 +178,21 @@ export default function BaseSettingPage() {
 						清除行模型缓存
 					</Button>
 				</div>
-				{<div
-					className="p-2 border-b text-primary flex justify-between  items-center"
-					style={{
-						fontSize: token.fontSize,
-						fontWeight: "bold",
-					}}>
-					<span>app在线人数</span>
-					<div>
-						{clientCount && clientCount > 0 ? `${clientCount}人在线` : '无人在线'}
+				{
+					<div
+						className="p-2 border-b text-primary flex justify-between  items-center"
+						style={{
+							fontSize: token.fontSize,
+							fontWeight: "bold",
+						}}>
+						<span>app在线人数</span>
+						<div>
+							{clientCount && clientCount > 0
+								? `${clientCount}人在线`
+								: "无人在线"}
+						</div>
 					</div>
-				</div>}
+				}
 			</div>
 		</div>
 	);
diff --git a/apps/web/src/app/main/course/detail/page.tsx b/apps/web/src/app/main/course/detail/page.tsx
index 16f7173..82dd7ae 100755
--- a/apps/web/src/app/main/course/detail/page.tsx
+++ b/apps/web/src/app/main/course/detail/page.tsx
@@ -3,6 +3,5 @@ import { useParams } from "react-router-dom";
 
 export function CourseDetailPage() {
 	const { id, lectureId } = useParams();
-	console.log("Course ID:", id);
 	return <CourseDetail id={id} lectureId={lectureId}></CourseDetail>;
 }
diff --git a/apps/web/src/app/main/course/preview/components/couresPreviewTabmsg.tsx b/apps/web/src/app/main/course/preview/components/couresPreviewTabmsg.tsx
new file mode 100755
index 0000000..8f32fce
--- /dev/null
+++ b/apps/web/src/app/main/course/preview/components/couresPreviewTabmsg.tsx
@@ -0,0 +1,25 @@
+import { Checkbox, List } from 'antd';
+import React from 'react';
+
+export function CoursePreviewTabmsg({data}){
+    
+
+    const renderItem = (item) => (
+        <List.Item>
+          <List.Item.Meta
+            title={item.title}
+            description={item.description}
+          />
+        </List.Item>
+      );
+    
+    return(
+        <div className='my-2'>
+            <List
+                dataSource={data}
+                split={false}
+                renderItem={renderItem}
+            />
+        </div>
+    )
+}
\ No newline at end of file
diff --git a/apps/web/src/app/main/course/preview/components/courseCatalog.tsx b/apps/web/src/app/main/course/preview/components/courseCatalog.tsx
new file mode 100755
index 0000000..b13e87d
--- /dev/null
+++ b/apps/web/src/app/main/course/preview/components/courseCatalog.tsx
@@ -0,0 +1,11 @@
+import type { MenuProps } from 'antd';
+import { Menu } from 'antd';
+
+type MenuItem = Required<MenuProps>['items'][number];
+
+export function CourseCatalog(){
+    return (
+        <>
+        </>
+    )
+}
\ No newline at end of file
diff --git a/apps/web/src/app/main/course/preview/components/coursePreviewAllmsg.tsx b/apps/web/src/app/main/course/preview/components/coursePreviewAllmsg.tsx
index ee10b4a..73ed1f9 100755
--- a/apps/web/src/app/main/course/preview/components/coursePreviewAllmsg.tsx
+++ b/apps/web/src/app/main/course/preview/components/coursePreviewAllmsg.tsx
@@ -1,7 +1,73 @@
-export function coursePreviewAllmsg() {
-    return (
-        <div className="min-h-screen">
-            helloword
-        </div>
-    )
-}
\ No newline at end of file
+import { useEffect } from "react";
+import { CoursePreviewMsg } from "@web/src/app/main/course/preview/type.ts";
+import { Button, Tabs, Image, Skeleton } from "antd";
+import type { TabsProps } from "antd";
+import { PlayCircleOutlined } from "@ant-design/icons";
+export function CoursePreviewAllmsg({
+	previewMsg,
+	items,
+	isLoading,
+}: {
+	previewMsg?: CoursePreviewMsg;
+	items: TabsProps["items"];
+	isLoading: boolean;
+}) {
+	useEffect(() => {
+		console.log(previewMsg);
+	});
+	const TapOnChange = (key: string) => {
+		console.log(key);
+	};
+	return (
+		<div className="min-h-screen max-w-7xl mx-auto px-6 lg:px-8">
+			<div className="overflow-auto flex justify-around align-items-center w-full mx-auto my-8">
+				<div className="relative w-[600px] h-[340px] m-4 overflow-hidden flex justify-center items-center">
+					<Image
+						src={
+							previewMsg.isLoading
+								? "error"
+								: previewMsg.videoPreview
+						}
+						alt="example"
+						preview={false}
+						className="w-full h-full object-cover z-0"
+						fallback="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMIAAADDCAYAAADQvc6UAAABRWlDQ1BJQ0MgUHJvZmlsZQAAKJFjYGASSSwoyGFhYGDIzSspCnJ3UoiIjFJgf8LAwSDCIMogwMCcmFxc4BgQ4ANUwgCjUcG3awyMIPqyLsis7PPOq3QdDFcvjV3jOD1boQVTPQrgSkktTgbSf4A4LbmgqISBgTEFyFYuLykAsTuAbJEioKOA7DkgdjqEvQHEToKwj4DVhAQ5A9k3gGyB5IxEoBmML4BsnSQk8XQkNtReEOBxcfXxUQg1Mjc0dyHgXNJBSWpFCYh2zi+oLMpMzyhRcASGUqqCZ16yno6CkYGRAQMDKMwhqj/fAIcloxgHQqxAjIHBEugw5sUIsSQpBobtQPdLciLEVJYzMPBHMDBsayhILEqEO4DxG0txmrERhM29nYGBddr//5/DGRjYNRkY/l7////39v///y4Dmn+LgeHANwDrkl1AuO+pmgAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAAwqADAAQAAAABAAAAwwAAAAD9b/HnAAAHlklEQVR4Ae3dP3PTWBSGcbGzM6GCKqlIBRV0dHRJFarQ0eUT8LH4BnRU0NHR0UEFVdIlFRV7TzRksomPY8uykTk/zewQfKw/9znv4yvJynLv4uLiV2dBoDiBf4qP3/ARuCRABEFAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghgg0Aj8i0JO4OzsrPv69Wv+hi2qPHr0qNvf39+iI97soRIh4f3z58/u7du3SXX7Xt7Z2enevHmzfQe+oSN2apSAPj09TSrb+XKI/f379+08+A0cNRE2ANkupk+ACNPvkSPcAAEibACyXUyfABGm3yNHuAECRNgAZLuYPgEirKlHu7u7XdyytGwHAd8jjNyng4OD7vnz51dbPT8/7z58+NB9+/bt6jU/TI+AGWHEnrx48eJ/EsSmHzx40L18+fLyzxF3ZVMjEyDCiEDjMYZZS5wiPXnyZFbJaxMhQIQRGzHvWR7XCyOCXsOmiDAi1HmPMMQjDpbpEiDCiL358eNHurW/5SnWdIBbXiDCiA38/Pnzrce2YyZ4//59F3ePLNMl4PbpiL2J0L979+7yDtHDhw8vtzzvdGnEXdvUigSIsCLAWavHp/+qM0BcXMd/q25n1vF57TYBp0a3mUzilePj4+7k5KSLb6gt6ydAhPUzXnoPR0dHl79WGTNCfBnn1uvSCJdegQhLI1vvCk+fPu2ePXt2tZOYEV6/fn31dz+shwAR1sP1cqvLntbEN9MxA9xcYjsxS1jWR4AIa2Ibzx0tc44fYX/16lV6NDFLXH+YL32jwiACRBiEbf5KcXoTIsQSpzXx4N28Ja4BQoK7rgXiydbHjx/P25TaQAJEGAguWy0+2Q8PD6/Ki4R8EVl+bzBOnZY95fq9rj9zAkTI2SxdidBHqG9+skdw43borCXO/ZcJdraPWdv22uIEiLA4q7nvvCug8WTqzQveOH26fodo7g6uFe/a17W3+nFBAkRYENRdb1vkkz1CH9cPsVy/jrhr27PqMYvENYNlHAIesRiBYwRy0V+8iXP8+/fvX11Mr7L7ECueb/r48eMqm7FuI2BGWDEG8cm+7G3NEOfmdcTQw4h9/55lhm7DekRYKQPZF2ArbXTAyu4kDYB2YxUzwg0gi/41ztHnfQG26HbGel/crVrm7tNY+/1btkOEAZ2M05r4FB7r9GbAIdxaZYrHdOsgJ/wCEQY0J74TmOKnbxxT9n3FgGGWWsVdowHtjt9Nnvf7yQM2aZU/TIAIAxrw6dOnAWtZZcoEnBpNuTuObWMEiLAx1HY0ZQJEmHJ3HNvGCBBhY6jtaMoEiJB0Z29vL6ls58vxPcO8/zfrdo5qvKO+d3Fx8Wu8zf1dW4p/cPzLly/dtv9Ts/EbcvGAHhHyfBIhZ6NSiIBTo0LNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiEC/wGgKKC4YMA4TAAAAABJRU5ErkJggg=="
+					/>
+					<div className="w-[600px] h-[360px] absolute top-0 z-10 bg-black opacity-30 transition-opacity duration-300 ease-in-out hover:opacity-70 cursor-pointer">
+						<PlayCircleOutlined className="absolute top-1/2  left-1/2 -translate-x-1/2 -translate-y-1/2 text-white text-4xl z-10" />
+					</div>
+				</div>
+				<div className="flex flex-col justify-between w-2/5 content-start h-[340px] my-4 overflow-hidden">
+					{isLoading ? (
+						<Skeleton className="my-5" active />
+					) : (
+						<>
+							<span className="text-3xl font-bold  my-3 ">
+								{previewMsg.Title}
+							</span>
+							<span className="text-xl font-semibold my-3 text-gray-700">
+								{previewMsg.SubTitle}
+							</span>
+							<span className="text-lg font-light my-3 text-gray-500 text-clip">
+								{previewMsg.Description}
+							</span>
+						</>
+					)}
+
+					<Button block type="primary" size="large">
+						{" "}
+						查看课程{" "}
+					</Button>
+				</div>
+			</div>
+			<div className="overflow-auto  w-11/12 mx-auto my-8">
+				<Tabs
+					defaultActiveKey="1"
+					tabBarGutter={100}
+					items={items}
+					onChange={TapOnChange}
+				/>
+			</div>
+		</div>
+	);
+}
diff --git a/apps/web/src/app/main/course/preview/page.tsx b/apps/web/src/app/main/course/preview/page.tsx
index f345883..367c21a 100755
--- a/apps/web/src/app/main/course/preview/page.tsx
+++ b/apps/web/src/app/main/course/preview/page.tsx
@@ -1,7 +1,81 @@
+import { Skeleton, type TabsProps } from 'antd';
+import { CoursePreviewAllmsg } from "./components/coursePreviewAllmsg";
+import { CoursePreviewTabmsg } from "./components/couresPreviewTabmsg";
+import { CoursePreviewMsg } from "./type";
+import { api } from '@nice/client' 
+import { useNavigate, useParams } from 'react-router-dom';
+import { useEffect, useState } from 'react';
+import { courseDetailSelect, CourseDto } from '@nice/common';
+
 export function CoursePreview(){
+    const { id } = useParams()
+    const { data:course,isLoading:courseIsLoading}:{data:CourseDto,isLoading:boolean}= api.post.findFirst.useQuery({
+      where:{
+        id
+      },
+      select:courseDetailSelect
+    })
+    // course.sections[0].lectures[0]
+    // `/course/${course.id}/detail/${Lecture.id}`
+    useEffect(() => {
+      if(!courseIsLoading){
+        setPreviewMsg({
+            videoPreview: course?.meta?.thumbnail,
+            Title: course?.title,
+            SubTitle:course?.subTitle,
+            Description:course?.content,
+            ToCourseUrl:`/course/${id}`,
+            isLoading:courseIsLoading
+        })
+      }
+
+    },[courseIsLoading])
+    const [previewMsg,setPreviewMsg] =  useState({
+        videoPreview: '',
+        Title: '',
+        SubTitle:'',
+        Description:'',
+        ToCourseUrl:'',
+        isLoading:courseIsLoading
+    })
+    const tapData = [
+        {
+          title: '掌握R语言的基本概念语法',
+          description: '学生将学习R语言和RStudio的基本知识',
+        },
+        {
+          title: '掌握R语言的基本概念语法',
+          description: '学生将学习R语言的变量、数据类型、循环和条件语句等',
+        },
+        {
+          title: '掌握R语言的数据导入管理',
+          description: '学生将学会如何将数据导入R环境，并且使用各种类型的数据',
+        },
+        {
+          title: '掌握R语言的基本数据清洗',
+          description: '学生将学会使用R语言进行数据清洗、整理和管理',
+        },
+        {
+          title: '掌握R语言的基本数据统计',
+          description: '学生将学会使用R语言进行基本的数据统计',
+        },
+        {
+          title: '掌握R语言的基本绘图功能',
+          description: '学生将学会使用R语言基本的绘图功能和ggplot2的应用',
+        },
+    ];
+    const isLoading = false
+    const items: TabsProps['items'] = [
+        {
+          key: '1',
+          label: '课程学习目标',
+          children: isLoading ? <Skeleton className='my-5' active />: <CoursePreviewTabmsg data={tapData}/>,
+        }
+      ];
+
     return(
        <div className="min-h-screen">
-         helloword
+        <CoursePreviewAllmsg previewMsg= {previewMsg} isLoading={courseIsLoading } items = {items}></CoursePreviewAllmsg>
        </div>
     )
 }
\ No newline at end of file
diff --git a/apps/web/src/app/main/course/preview/type.ts b/apps/web/src/app/main/course/preview/type.ts
new file mode 100755
index 0000000..fe3a2fd
--- /dev/null
+++ b/apps/web/src/app/main/course/preview/type.ts
@@ -0,0 +1,8 @@
+export interface CoursePreviewMsg {
+	videoPreview: string;
+	Title: string;
+	SubTitle: string;
+	Description: string;
+	ToCourseUrl: string;
+	isLoading: boolean;
+}
diff --git a/apps/web/src/app/main/courses/components/CourseCard.tsx b/apps/web/src/app/main/courses/components/CourseCard.tsx
deleted file mode 100755
index d549a1e..0000000
--- a/apps/web/src/app/main/courses/components/CourseCard.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Card, Rate, Tag } from 'antd';
-import { Course } from '../mockData';
-import { UserOutlined, ClockCircleOutlined } from '@ant-design/icons';
-
-interface CourseCardProps {
-  course: Course;
-}
-
-export default function CourseCard({ course }: CourseCardProps) {
-  return (
-    <Card 
-      hoverable 
-      className="w-full h-full transition-all duration-300 hover:shadow-lg"
-      cover={
-        <img
-          alt={course.title}
-          src={course.thumbnail}
-          className="object-cover w-full h-40"
-        />
-      }
-    >
-      <div className="space-y-3">
-        <h3 className="text-lg font-semibold line-clamp-2 hover:text-blue-600 transition-colors">
-          {course.title}
-        </h3>
-        <p className="text-gray-500 text-sm">{course.instructor}</p>
-        <div className="flex items-center space-x-2">
-          <Rate disabled defaultValue={course.rating} className="text-sm" />
-          <span className="text-gray-500 text-sm">{course.rating}</span>
-        </div>
-        <div className="flex items-center justify-between text-sm text-gray-500">
-          <div className="flex items-center space-x-1">
-            <UserOutlined className="text-gray-400" />
-            <span>{course.enrollments} 人在学</span>
-          </div>
-          <div className="flex items-center space-x-1">
-            <ClockCircleOutlined className="text-gray-400" />
-            <span>{course.duration}</span>
-          </div>
-        </div>
-        <div className="flex flex-wrap gap-2 pt-2">
-          <Tag color="blue" className="rounded-full px-3">{course.category}</Tag>
-          <Tag color="green" className="rounded-full px-3">{course.level}</Tag>
-        </div>
-      </div>
-    </Card>
-  );
-}
diff --git a/apps/web/src/app/main/courses/components/CourseList.tsx b/apps/web/src/app/main/courses/components/CourseList.tsx
deleted file mode 100755
index 3d67b1c..0000000
--- a/apps/web/src/app/main/courses/components/CourseList.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Pagination, Empty } from 'antd';
-import { Course } from '../mockData';
-import CourseCard from './CourseCard';
-
-interface CourseListProps {
-  courses: Course[];
-  total: number;
-  pageSize: number;
-  currentPage: number;
-  onPageChange: (page: number) => void;
-}
-
-export default function CourseList({
-  courses,
-  total,
-  pageSize,
-  currentPage,
-  onPageChange,
-}: CourseListProps) {
-  return (
-    <div className="space-y-6">
-      {courses.length > 0 ? (
-        <>
-          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
-            {courses.map(course => (
-              <CourseCard key={course.id} course={course} />
-            ))}
-          </div>
-          <div className="flex justify-center mt-8">
-            <Pagination
-              current={currentPage}
-              total={total}
-              pageSize={pageSize}
-              onChange={onPageChange}
-              showSizeChanger={false}
-            />
-          </div>
-        </>
-      ) : (
-        <Empty description="暂无相关课程" />
-      )}
-    </div>
-  );
-}
\ No newline at end of file
diff --git a/apps/web/src/app/main/courses/components/CoursesContainer.tsx b/apps/web/src/app/main/courses/components/CoursesContainer.tsx
new file mode 100755
index 0000000..72b9499
--- /dev/null
+++ b/apps/web/src/app/main/courses/components/CoursesContainer.tsx
@@ -0,0 +1,25 @@
+import { useMainContext } from "../../layout/MainProvider";
+import { PostType, Prisma } from "@nice/common";
+import PostList from "@web/src/components/models/course/list/PostList";
+import CourseCard from "@web/src/components/models/post/SubPost/CourseCard";
+
+export function CoursesContainer() {
+	const { searchCondition, termsCondition } = useMainContext();
+	return (
+		<>
+			<PostList
+				renderItem={(post) => <CourseCard post={post}></CourseCard>}
+				params={{
+					pageSize: 12,
+					where: {
+						type: PostType.COURSE,
+						...termsCondition,
+						...searchCondition,
+					},
+				}}
+				cols={4}></PostList>
+		</>
+	);
+}
+
+export default CoursesContainer;
diff --git a/apps/web/src/app/main/courses/components/FilterSection.tsx b/apps/web/src/app/main/courses/components/FilterSection.tsx
deleted file mode 100755
index 5cc1574..0000000
--- a/apps/web/src/app/main/courses/components/FilterSection.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { Checkbox, Divider, Radio, Space , Spin} from 'antd';
-import { categories, levels } from '../mockData';
-import { TaxonomySlug, TermDto } from '@nice/common';
-import { GetTaxonomyProps, useGetTaxonomy } from '@web/src/hooks/useGetTaxonomy';
-import { useMemo } from 'react';
-
-interface FilterSectionProps {
-	selectedCategory: string;
-	selectedLevel: string;
-	onCategoryChange: (category: string) => void;
-	onLevelChange: (level: string) => void;
-}
-
-export default function FilterSection({
-	selectedCategory,
-	selectedLevel,
-	onCategoryChange,
-	onLevelChange,
-}: FilterSectionProps) {
-  const gateGory : GetTaxonomyProps = useGetTaxonomy({
-      type: TaxonomySlug.CATEGORY,
-  })
-  const levels : GetTaxonomyProps = useGetTaxonomy({
-      type: TaxonomySlug.LEVEL,
-  })
-  return (
-    <div className="bg-white p-6 rounded-lg shadow-sm space-y-6">
-      <div>
-        <h3 className="text-lg font-medium mb-4">课程分类</h3>
-        <Radio.Group
-          value={selectedCategory}
-          onChange={(e) => onCategoryChange(e.target.value)}
-          className="flex flex-col space-y-3"
-        >
-        {
-          gateGory.isLoading?
-          (<Spin/>)
-          :
-          (
-          <>
-            <Radio value="">全部课程</Radio>
-            {gateGory.categories.map(category => (
-              <Radio key={category} value={category}>
-                {category}
-              </Radio>
-            ))}
-          </>)
-        }
-          
-        </Radio.Group>
-      </div>
-
-			<Divider className="my-6" />
-
-      <div>
-        <h3 className="text-lg font-medium mb-4">难度等级</h3>
-        <Radio.Group
-          value={selectedLevel}
-          onChange={(e) => onLevelChange(e.target.value)}
-          className="flex flex-col space-y-3"
-        >
-          {
-            levels.isLoading ?
-            (<Spin/>)
-            :
-            (
-            <>
-            <Radio value="">全部难度</Radio>
-            {levels.categories.map(level => (
-              <Radio key={level} value={level}>
-                {level}
-              </Radio>
-            ))}
-          </>)
-          }
-          
-        </Radio.Group>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/src/app/main/courses/instructor/page.tsx b/apps/web/src/app/main/courses/instructor/page.tsx
deleted file mode 100755
index a914925..0000000
--- a/apps/web/src/app/main/courses/instructor/page.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { PlusIcon } from "@heroicons/react/24/outline";
-import { CourseList } from "@web/src/components/models/course/list/course-list";
-import { Button } from "@web/src/components/common/element/Button";
-import { api } from "@nice/client";
-import { useState } from "react";
-import { CourseCard } from "@web/src/components/models/course/card/CourseCard";
-import { useNavigate } from "react-router-dom";
-import { useAuth } from "@web/src/providers/auth-provider";
-
-export default function InstructorCoursesPage() {
-	const navigate = useNavigate();
-	const [currentPage, setCurrentPage] = useState(1);
-	const { user } = useAuth();
-
-	const { data: paginationRes, refetch } =
-		api.post.findManyWithPagination.useQuery({
-			page: currentPage,
-			pageSize: 8,
-			where: {
-				instructors: {
-					some: {
-						instructorId: user?.id,
-					},
-				},
-			},
-		});
-
-	const handlePageChange = (page: number) => {
-		setCurrentPage(page);
-		refetch();
-	};
-
-	return (
-		<div className="bg-slate-50 px-4 py-8 sm:px-6 lg:px-8">
-			<div className="mx-auto max-w-7xl">
-				<div className="mb-8 flex items-center justify-between">
-					<h1 className="text-3xl font-semibold text-slate-800">
-						我教授的课程
-					</h1>
-					<Button
-						onClick={() => navigate("/course/editor")}
-						variant="primary"
-						leftIcon={<PlusIcon className="w-5 h-5" />}>
-						创建课程
-					</Button>
-				</div>
-				<CourseList
-					totalPages={paginationRes?.totalPages}
-					onPageChange={handlePageChange}
-					currentPage={currentPage}
-					courses={paginationRes?.items as any}
-					renderItem={(course) => (
-						<CourseCard
-							onClick={() => {
-								navigate(`/course/${course.id}/editor`, {
-									replace: true,
-								});
-							}}
-							course={course}
-						/>
-					)}
-				/>
-			</div>
-		</div>
-	);
-}
diff --git a/apps/web/src/app/main/courses/mockData.ts b/apps/web/src/app/main/courses/mockData.ts
deleted file mode 100755
index 096d174..0000000
--- a/apps/web/src/app/main/courses/mockData.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-export interface Course {
-  id: string;
-  title: string;
-  description: string;
-  instructor: string;
-  price: number;
-  originalPrice: number;
-  category: string;
-  level: string;
-  thumbnail: string;
-  rating: number;
-  enrollments: number;
-  duration: string;
-}
-
-export const categories = [
-  "计算机科学",
-  "数据科学",
-  "商业管理",
-  "人工智能",
-  "软件开发",
-  "网络安全",
-  "云计算",
-  "前端开发",
-  "后端开发",
-  "移动开发"
-];
-
-export const levels = ["入门", "初级", "中级", "高级"];
-
-export const mockCourses: Course[] = Array.from({ length: 50 }, (_, i) => ({
-  id: `course-${i + 1}`,
-  title: `${categories[i % categories.length]}课程 ${i + 1}`,
-  description: "本课程将带你深入了解该领域的核心概念和实践应用，通过实战项目提升你的专业技能。",
-  instructor: `讲师 ${i + 1}`,
-  price: Math.floor(Math.random() * 500 + 99),
-  originalPrice: Math.floor(Math.random() * 1000 + 299),
-  category: categories[i % categories.length],
-  level: levels[i % levels.length],
-  thumbnail: `/api/placeholder/280/160`,
-  rating: Number((Math.random() * 2 + 3).toFixed(1)),
-  enrollments: Math.floor(Math.random() * 10000),
-  duration: `${Math.floor(Math.random() * 20 + 10)}小时`
-}));
\ No newline at end of file
diff --git a/apps/web/src/app/main/courses/page.tsx b/apps/web/src/app/main/courses/page.tsx
index 30cd309..79eda89 100755
--- a/apps/web/src/app/main/courses/page.tsx
+++ b/apps/web/src/app/main/courses/page.tsx
@@ -1,101 +1,18 @@
-import { useState, useMemo } from "react";
-import { mockCourses } from "./mockData";
-import FilterSection from "./components/FilterSection";
-import CourseList from "./components/CourseList";
-import { api } from "@nice/client";
-import { LectureType, PostType } from "@nice/common";
-
-
+import BasePostLayout from "../layout/BasePost/BasePostLayout";
+import CoursesContainer from "./components/CoursesContainer";
+import { useEffect } from "react";
+import { useMainContext } from "../layout/MainProvider";
+import { PostType } from "@nice/common";
 export default function CoursesPage() {
-	const [currentPage, setCurrentPage] = useState(1);
-	const [selectedCategory, setSelectedCategory] = useState("");
-	const [selectedLevel, setSelectedLevel] = useState("");
-	const pageSize = 12;
-	const { data, isLoading } = api.post.findManyWithPagination.useQuery({
-		where: {
-			type: PostType.COURSE,
-			terms: {
-				some: {
-					AND: [
-						...(selectedCategory
-							? [
-									{
-										name: selectedCategory,
-									},
-								]
-							: []),
-						...(selectedLevel
-							? [
-									{
-										name: selectedLevel,
-									},
-								]
-							: []),
-					],
-				},
-			},
-		},
-	});
-	const filteredCourses = useMemo(() => {
-		return mockCourses.filter((course) => {
-			const matchCategory =
-				!selectedCategory || course.category === selectedCategory;
-			const matchLevel = !selectedLevel || course.level === selectedLevel;
-			return matchCategory && matchLevel;
-		});
-	}, [selectedCategory, selectedLevel]);
-
-	const paginatedCourses = useMemo(() => {
-		const startIndex = (currentPage - 1) * pageSize;
-		return filteredCourses.slice(startIndex, startIndex + pageSize);
-	}, [filteredCourses, currentPage]);
-
-	const handlePageChange = (page: number) => {
-		setCurrentPage(page);
-		window.scrollTo({ top: 0, behavior: "smooth" });
-	};
-
+	const { setSearchMode } = useMainContext();
+	useEffect(() => {
+		setSearchMode(PostType.COURSE);
+	}, [setSearchMode]);
 	return (
-		<div className="min-h-screen bg-gray-50">
-			<div className="container mx-auto px-4 py-8">
-				<div className="flex  gap-4">
-					{/* 左侧筛选区域 */}
-					<div className="lg:w-1/5">
-						<div className="sticky top-24">
-							<FilterSection
-								selectedCategory={selectedCategory}
-								selectedLevel={selectedLevel}
-								onCategoryChange={(category) => {
-									setSelectedCategory(category);
-									setCurrentPage(1);
-								}}
-								onLevelChange={(level) => {
-									setSelectedLevel(level);
-									setCurrentPage(1);
-								}}
-							/>
-						</div>
-					</div>
-
-					{/* 右侧课程列表区域 */}
-					<div className="lg:w-4/5">
-						<div className="bg-white p-6 rounded-lg shadow-sm">
-							<div className="flex justify-between items-center mb-6">
-								<span className="text-gray-600">
-									共找到 {filteredCourses.length} 门课程
-								</span>
-							</div>
-							<CourseList
-								courses={paginatedCourses}
-								total={filteredCourses.length}
-								pageSize={pageSize}
-								currentPage={currentPage}
-								onPageChange={handlePageChange}
-							/>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
+		<>
+			<BasePostLayout>
+				<CoursesContainer></CoursesContainer>
+			</BasePostLayout>
+		</>
 	);
 }
diff --git a/apps/web/src/app/main/courses/student/page.tsx b/apps/web/src/app/main/courses/student/page.tsx
deleted file mode 100755
index 2508c50..0000000
--- a/apps/web/src/app/main/courses/student/page.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { CourseList } from "@web/src/components/models/course/list/course-list";
-import { api } from "@nice/client";
-import { useState } from "react";
-import { CourseCard } from "@web/src/components/models/course/card/CourseCard";
-import { useAuth } from "@web/src/providers/auth-provider";
-
-export default function StudentCoursesPage() {
-	const [currentPage, setCurrentPage] = useState(1);
-	const { user } = useAuth();
-
-	const { data: paginationRes, refetch } =
-		api.post.findManyWithPagination.useQuery({
-			page: currentPage,
-			pageSize: 8,
-			where: {
-				enrollments: {
-					some: {
-						studentId: user?.id,
-					},
-				},
-			},
-		});
-
-	const handlePageChange = (page: number) => {
-		setCurrentPage(page);
-		refetch();
-	};
-
-	return (
-		<div className="bg-slate-50 px-4 py-8 sm:px-6 lg:px-8">
-			<div className="mx-auto max-w-7xl">
-				<div className="mb-8">
-					<h1 className="text-3xl font-semibold text-slate-800 mb-4">
-						我参加的课程
-					</h1>
-				</div>
-				<CourseList
-					totalPages={paginationRes?.totalPages}
-					onPageChange={handlePageChange}
-					currentPage={currentPage}
-					courses={paginationRes?.items as any}
-					renderItem={(course) => (
-						<CourseCard course={course}></CourseCard>
-					)}></CourseList>
-			</div>
-		</div>
-	);
-}
diff --git a/apps/web/src/app/main/home/components/CategorySection.tsx b/apps/web/src/app/main/home/components/CategorySection.tsx
index a64b551..7d23030 100755
--- a/apps/web/src/app/main/home/components/CategorySection.tsx
+++ b/apps/web/src/app/main/home/components/CategorySection.tsx
@@ -1,184 +1,86 @@
-import React, { useState, useCallback, useEffect, useMemo } from 'react';
-import { Typography, Button } from 'antd';
-import { stringToColor, TaxonomySlug, TermDto } from '@nice/common';
-import { api } from '@nice/client';
+import React, { useState, useCallback, useEffect, useMemo } from "react";
+import { Typography, Skeleton } from "antd";
+import { stringToColor, TaxonomySlug, TermDto } from "@nice/common";
+import { api } from "@nice/client";
+import LookForMore from "./LookForMore";
+import CategorySectionCard from "./CategorySectionCard";
+import { useNavigate } from "react-router-dom";
+import { useMainContext } from "../../layout/MainProvider";
 
 const { Title, Text } = Typography;
-
-interface CourseCategory {
-  name: string;
-  count: number;
-  description: string;
-}
-
-const courseCategories: CourseCategory[] = [
-  {
-    name: '计算机基础',
-    count: 120,
-    description: '计算机组成原理、操作系统、网络等基础知识'
-  },
-  {
-    name: '编程语言',
-    count: 85,
-    description: 'Python、Java、JavaScript等主流编程语言'
-  },
-  {
-    name: '人工智能',
-    count: 65,
-    description: '机器学习、深度学习、自然语言处理等前沿技术'
-  },
-  {
-    name: '数据科学',
-    count: 45,
-    description: '数据分析、数据可视化、商业智能等'
-  },
-  {
-    name: '云计算',
-    count: 38,
-    description: '云服务、容器化、微服务架构等'
-  },
-  {
-    name: '网络安全',
-    count: 42,
-    description: '网络安全基础、渗透测试、安全防护等'
-  }
-];
-
-
 const CategorySection = () => {
-  const [hoveredIndex, setHoveredIndex] = useState<number | null>(null);
-  const [showAll, setShowAll] = useState(false);
-  /**
-   * const {data,isLoading} :{data:TermDto[],isLoading:boolean}= api.term.findMany.useQuery({
-    where:{
-      taxonomy: {
-        slug:TaxonomySlug.CATEGORY
-      }
-    },
-    include:{
-      children :true
-    }
-  })
-  const courseCategories: CourseCategory[] = useMemo(() => {
-    return data?.map((term) => ({
-      name: term.name,
-      count:  term.hasChildren ? term.children.length : 0,
-      description: term.description
-    })) || [];
-  },[data])
-   */
-    
-  
-  const handleMouseEnter = useCallback((index: number) => {
-    setHoveredIndex(index);
-  }, []);
+	const [hoveredIndex, setHoveredIndex] = useState<number | null>(null);
+	const { selectedTerms, setSelectedTerms } = useMainContext();
+	const {
+		data: courseCategoriesData,
+		isLoading,
+	}: { data: TermDto[]; isLoading: boolean } = api.term.findMany.useQuery({
+		where: {
+			taxonomy: {
+				slug: TaxonomySlug.CATEGORY,
+			},
+			parentId: null,
+		},
+		take: 8,
+	});
+	const navigate = useNavigate();
 
-  const handleMouseLeave = useCallback(() => {
-    setHoveredIndex(null);
-  }, []);
+	const handleMouseEnter = useCallback((index: number) => {
+		setHoveredIndex(index);
+	}, []);
 
-  const displayedCategories = showAll 
-    ? courseCategories 
-    : courseCategories.slice(0, 8);
+	const handleMouseLeave = useCallback(() => {
+		setHoveredIndex(null);
+	}, []);
 
-  return (
-    <section className="py-32 relative overflow-hidden">
-      <div className="max-w-screen-2xl mx-auto px-4 relative">
-        <div className="text-center mb-24">
-          <Title level={2} className="font-bold text-5xl mb-6 bg-gradient-to-r from-gray-900 via-gray-700 to-gray-800 bg-clip-text text-transparent motion-safe:animate-gradient-x">
-            探索课程分类
-          </Title>
-          <Text type="secondary" className="text-xl font-light">
-            选择你感兴趣的方向，开启学习之旅
-          </Text>
-        </div>
-        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
-          {displayedCategories.map((category, index) => {
-            const categoryColor = stringToColor(category.name);
-            const isHovered = hoveredIndex === index;
+	const handleMouseClick = useCallback((categoryId: string) => {
+		setSelectedTerms({
+			...selectedTerms,
+			[TaxonomySlug.CATEGORY]: [categoryId],
+		});
+		navigate("/courses");
+		window.scrollTo({ top: 0, behavior: "smooth" });
+	}, []);
+	return (
+		<section className="py-8 relative overflow-hidden">
+			<div className="max-w-screen-2xl mx-auto px-4 relative">
+				<div className="text-center mb-12">
+					<Title
+						level={2}
+						className="font-bold text-5xl mb-6 bg-gradient-to-r from-gray-900 via-gray-700 to-gray-800 bg-clip-text text-transparent motion-safe:animate-gradient-x">
+						探索课程分类
+					</Title>
+					<Text type="secondary" className="text-xl font-light">
+						选择你感兴趣的方向，开启学习之旅
+					</Text>
+				</div>
+				<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
+					{isLoading ? (
+						<Skeleton paragraph={{ rows: 4 }}></Skeleton>
+					) : (
+						courseCategoriesData?.map((category, index) => {
+							const categoryColor = stringToColor(category.name);
+							const isHovered = hoveredIndex === index;
 
-            return (
-              <div
-                key={index}
-                className="group relative rounded-2xl transition-all duration-700 ease-out cursor-pointer will-change-transform hover:-translate-y-2"
-                onMouseEnter={() => handleMouseEnter(index)}
-                onMouseLeave={handleMouseLeave}
-                role="button"
-                tabIndex={0}
-                aria-label={`查看${category.name}课程类别`}
-              >
-                <div className="absolute -inset-0.5 bg-gradient-to-r from-gray-200 to-gray-300 opacity-50 rounded-2xl transition-all duration-700 group-hover:opacity-75" />
-                <div
-                  className={`absolute inset-0 rounded-2xl bg-gradient-to-br from-white to-gray-50 shadow-lg transition-all duration-700 ease-out ${
-                    isHovered ? 'scale-[1.02] bg-opacity-95' : 'scale-100 bg-opacity-90'
-                  }`}
-                />
-                <div
-                  className={`absolute inset-0 rounded-2xl transition-all duration-700 ease-out ${
-                    isHovered ? 'shadow-[0_8px_30px_rgb(0,0,0,0.12)]' : 'shadow-none opacity-0'
-                  }`}
-                />
-                <div
-                  className={`absolute top-0 left-1/2 -translate-x-1/2 h-1 rounded-full transition-all duration-500 ease-out ${
-                    isHovered ? 'w-36 opacity-90' : 'w-24 opacity-60'
-                  }`}
-                  style={{ backgroundColor: categoryColor }}
-                />
-                <div className="relative p-6">
-                  <div className="flex flex-col space-y-4 mb-4">
-                    <Text strong className="text-xl font-semibold tracking-tight">
-                      {category.name}
-                    </Text>
-                    <span
-                      className={`px-3 py-1 rounded-full text-sm w-fit font-medium transition-all duration-500 ease-out ${
-                        isHovered ? 'shadow-md scale-105' : ''
-                      }`}
-                      style={{
-                        backgroundColor: `${categoryColor}15`,
-                        color: categoryColor
-                      }}
-                    >
-                      {category.count} 门课程
-                    </span>
-                  </div>
-                  <Text type="secondary" className="block text-sm leading-relaxed opacity-90">
-                    {category.description}
-                  </Text>
-                  <div
-                    className={`mt-6 text-sm font-medium flex items-center space-x-2 transition-all duration-500 ease-out ${
-                      isHovered ? 'translate-x-2' : ''
-                    }`}
-                    style={{ color: categoryColor }}
-                  >
-                    <span>了解更多</span>
-                    <span
-                      className={`transform transition-all duration-500 ease-out ${
-                        isHovered ? 'translate-x-2' : ''
-                      }`}
-                    >
-                      →
-                    </span>
-                  </div>
-                </div>
-              </div>
-            );
-          })}
-        </div>
-        {courseCategories.length > 8 && (
-          <div className="flex justify-center mt-12">
-            <Button 
-              type="default"
-              size="large"
-              className="px-8 h-12 text-base font-medium hover:shadow-md transition-all duration-300"
-              onClick={() => setShowAll(!showAll)}
-            >
-              {showAll ? '收起' : '查看更多分类'}
-            </Button>
-          </div>
-        )}
-      </div>
-    </section>
-  );
+							return (
+								<CategorySectionCard
+									key={index}
+									index={index}
+									category={category}
+									categoryColor={categoryColor}
+									isHovered={isHovered}
+									handleMouseEnter={handleMouseEnter}
+									handleMouseLeave={handleMouseLeave}
+									handleMouseClick={handleMouseClick}
+								/>
+							);
+						})
+					)}
+				</div>
+				<LookForMore to={"/courses"}></LookForMore>
+			</div>
+		</section>
+	);
 };
 
-export default CategorySection;
\ No newline at end of file
+export default CategorySection;
diff --git a/apps/web/src/app/main/home/components/CategorySectionCard.tsx b/apps/web/src/app/main/home/components/CategorySectionCard.tsx
new file mode 100755
index 0000000..e3e1273
--- /dev/null
+++ b/apps/web/src/app/main/home/components/CategorySectionCard.tsx
@@ -0,0 +1,58 @@
+import { useNavigate } from "react-router-dom";
+import { Typography } from "antd";
+export default function CategorySectionCard({handleMouseClick, index,handleMouseEnter,handleMouseLeave,category,categoryColor,isHovered,}) {
+    const navigate = useNavigate()
+    const { Title, Text } = Typography;
+    return (
+        <div
+            key={index}
+            className="group relative min-h-[130px] rounded-2xl transition-all duration-700 ease-out cursor-pointer will-change-transform hover:-translate-y-2"
+            onMouseEnter={() => handleMouseEnter(index)}
+            onMouseLeave={handleMouseLeave}
+            role="button"
+            tabIndex={0}
+            aria-label={`查看${category.name}课程类别`}
+            onClick={()=>{
+                handleMouseClick(category.id)
+            }}
+        >
+            <div className="absolute -inset-0.5 bg-gradient-to-r from-gray-200 to-gray-300 opacity-50 rounded-2xl transition-all duration-700 group-hover:opacity-75" />
+            <div
+                className={`absolute inset-0 rounded-2xl bg-gradient-to-br from-white to-gray-50 shadow-lg transition-all duration-700 ease-out ${isHovered
+                        ? "scale-[1.02] bg-opacity-95"
+                        : "scale-100 bg-opacity-90"
+                    }`}
+            />
+            <div
+                className={`absolute inset-0 rounded-2xl transition-all duration-700 ease-out ${isHovered
+                        ? "shadow-[0_8px_30px_rgb(0,0,0,0.12)]"
+                        : "shadow-none opacity-0"
+                    }`}
+            />
+            <div
+                className={`absolute w-1/2 top-0 left-1/2 -translate-x-1/2 h-1 rounded-full transition-all duration-500 ease-out `}
+                style={{
+                    backgroundColor: categoryColor,
+                }}
+            />
+            <div className="relative w-full h-full p-6">
+                <div className="flex w-2/3 absolute left-1/2 -translate-x-1/2 top-1/2 -translate-y-1/2 flex-col space-y-4 mb-4">
+                    <Text
+                        strong
+                        className="text-xl font-medium tracking-wide">
+                        {category.name}
+                    </Text>
+                </div>
+                <div
+                    className={` mt-6 absolute bottom-4 right-6 text-sm font-medium flex items-center space-x-2 transition-all duration-500 ease-out `}
+                    style={{ color: categoryColor }}>
+                    <span>了解更多</span>
+                    <span
+                        className={`transform transition-all duration-500 ease-out `}>
+                        →
+                    </span>
+                </div>
+            </div>
+        </div>
+    )
+}
\ No newline at end of file
diff --git a/apps/web/src/app/main/home/components/CoursesSection.tsx b/apps/web/src/app/main/home/components/CoursesSection.tsx
index 8d6c1c5..cc68bd0 100755
--- a/apps/web/src/app/main/home/components/CoursesSection.tsx
+++ b/apps/web/src/app/main/home/components/CoursesSection.tsx
@@ -1,227 +1,112 @@
-import React, { useState, useMemo, useEffect } from 'react';
-import { useNavigate } from 'react-router-dom';
-import { Button, Card, Typography, Tag, Progress,Spin } from 'antd';
-import {
-  PlayCircleOutlined,
-  UserOutlined,
-  ClockCircleOutlined,
-  TeamOutlined,
-  StarOutlined,
-  ArrowRightOutlined,
-} from '@ant-design/icons';
-import { TaxonomySlug, TermDto } from '@nice/common';
-import { api } from '@nice/client';
-import { GetTaxonomyProps, useGetTaxonomy } from '@web/src/hooks/useGetTaxonomy';
-
+import React, { useState, useMemo, ReactNode } from "react";
+import { Typography, Skeleton } from "antd";
+import { TaxonomySlug, TermDto } from "@nice/common";
+import { api } from "@nice/client";
+import { CoursesSectionTag } from "./CoursesSectionTag";
+import LookForMore from "./LookForMore";
+import PostList from "@web/src/components/models/course/list/PostList";
+interface GetTaxonomyProps {
+	categories: string[];
+	isLoading: boolean;
+}
+function useGetTaxonomy({ type }): GetTaxonomyProps {
+	const { data, isLoading }: { data: TermDto[]; isLoading: boolean } =
+		api.term.findMany.useQuery({
+			where: {
+				taxonomy: {
+					slug: type,
+				},
+				parentId: null,
+			},
+			take: 11, // 只取前10个
+		});
+	const categories = useMemo(() => {
+		const allCategories = isLoading
+			? []
+			: data?.map((course) => course.name);
+		return [...Array.from(new Set(allCategories))];
+	}, [data]);
+	return { categories, isLoading };
+}
 const { Title, Text } = Typography;
-
-interface Course {
-  id: number;
-  title: string;
-  instructor: string;
-  students: number;
-  rating: number;
-  level: string;
-  duration: string;
-  category: string;
-  progress: number;
-  thumbnail: string;
-}
-
 interface CoursesSectionProps {
-  title: string;
-  description: string;
-  courses: Course[];
-  initialVisibleCoursesCount?: number;
+	title: string;
+	description: string;
+	initialVisibleCoursesCount?: number;
+	postType:string;
+	render?:(post)=>ReactNode;
+	to:string
 }
-
-
 const CoursesSection: React.FC<CoursesSectionProps> = ({
-  title,
-  description,
-  courses,
-  initialVisibleCoursesCount = 8,
+	title,
+	description,
+	initialVisibleCoursesCount = 8,
+	postType,
+	render,
+	to
 }) => {
-  const navigate = useNavigate();
-  const [selectedCategory, setSelectedCategory] = useState<string>('全部');
-  const [visibleCourses, setVisibleCourses] = useState(initialVisibleCoursesCount);
-  const gateGory : GetTaxonomyProps = useGetTaxonomy({
-    type: TaxonomySlug.CATEGORY,
-  })
-  useEffect(() => {
-    
-  })
-  const filteredCourses = useMemo(() => {
-    return selectedCategory === '全部'
-      ? courses
-      : courses.filter((course) => course.category === selectedCategory);
-  }, [selectedCategory, courses]);
-
-  const displayedCourses = filteredCourses.slice(0, visibleCourses);
-
-  return (
-    <section className="relative py-16 overflow-hidden">
-      <div className="max-w-screen-2xl mx-auto px-4 relative">
-        <div className="flex justify-between items-end mb-12">
-          <div>
-            <Title
-              level={2}
-              className="font-bold text-5xl mb-6 bg-gradient-to-r from-gray-900 via-blue-600 to-gray-800 bg-clip-text text-transparent motion-safe:animate-gradient-x"
-            >
-              {title}
-            </Title>
-            <Text type="secondary" className="text-xl font-light">
-              {description}
-            </Text>
-          </div>
-        </div>
-
-        <div className="mb-8 flex flex-wrap gap-3">
-          {gateGory.isLoading ? <Spin className='m-3'/> : 
-            (
-              <>
-              <Tag 
-                color={selectedCategory === "全部" ? 'blue' : 'default'} 
-                onClick={() => setSelectedCategory("全部")}
-                className={`px-4 py-2 text-base cursor-pointer hover:scale-105 transform transition-all duration-300 ${selectedCategory === "全部"
-                  ? 'shadow-[0_2px_8px_-4px_rgba(59,130,246,0.5)]'
-                  : 'hover:shadow-md'
-                  }`}
-              >全部</Tag>
-              {
-                gateGory.categories.map((category) => (
-                  <Tag
-                    key={category}
-                    color={selectedCategory === category ? 'blue' : 'default'}
-                    onClick={() => setSelectedCategory(category)}
-                    className={`px-4 py-2 text-base cursor-pointer hover:scale-105 transform transition-all duration-300 ${selectedCategory === category
-                      ? 'shadow-[0_2px_8px_-4px_rgba(59,130,246,0.5)]'
-                      : 'hover:shadow-md'
-                      }`}
-                  >
-                    {category}
-                  </Tag>
-                ))
-              }
-              </>
-
-            )
-            }
-        </div>
-
-        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
-          {displayedCourses.map((course) => (
-            <Card
-              key={course.id}
-              hoverable
-              className="group overflow-hidden rounded-2xl border-0 bg-white/70 backdrop-blur-sm 
-                shadow-[0_10px_40px_-15px_rgba(0,0,0,0.1)] hover:shadow-[0_20px_50px_-15px_rgba(0,0,0,0.15)] 
-                transition-all duration-700 ease-out transform hover:-translate-y-1 will-change-transform"
-              cover={
-                <div className="relative h-48 bg-gradient-to-br from-gray-900 to-gray-800 overflow-hidden">
-                  <div
-                    className="absolute inset-0 bg-cover bg-center transform transition-all duration-1000 ease-out group-hover:scale-110"
-                    style={{ backgroundImage: `url(${course.thumbnail})` }}
-                  />
-                  <div className="absolute inset-0 bg-gradient-to-tr from-black/60 via-black/40 to-transparent opacity-60 group-hover:opacity-40 transition-opacity duration-700" />
-                  <PlayCircleOutlined className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 text-6xl text-white/90 opacity-0 group-hover:opacity-100 transition-all duration-500 ease-out transform group-hover:scale-110 drop-shadow-lg" />
-                  {course.progress > 0 && (
-                    <div className="absolute bottom-0 left-0 right-0 backdrop-blur-md bg-black/20">
-                      <Progress
-                        percent={course.progress}
-                        showInfo={false}
-                        strokeColor={{
-                          from: '#3b82f6',
-                          to: '#60a5fa',
-                        }}
-                        className="m-0"
-                      />
-                    </div>
-                  )}
-                </div>
-              }
-            >
-              <div className="px-2">
-                <div className="flex gap-2 mb-4">
-                  <Tag
-                    color="blue"
-                    className="px-3 py-1 rounded-full border-0 shadow-[0_2px_8px_-4px_rgba(59,130,246,0.5)] transition-all duration-300 hover:shadow-[0_4px_12px_-4px_rgba(59,130,246,0.6)]"
-                  >
-                    {course.category}
-                  </Tag>
-                  <Tag
-                    color={
-                      course.level === '入门'
-                        ? 'green'
-                        : course.level === '中级'
-                          ? 'blue'
-                          : 'purple'
-                    }
-                    className="px-3 py-1 rounded-full border-0 shadow-sm transition-all duration-300 hover:shadow-md"
-                  >
-                    {course.level}
-                  </Tag>
-                </div>
-                <Title
-                  level={4}
-                  className="mb-4 line-clamp-2 font-bold leading-snug transition-colors duration-300 group-hover:text-blue-600"
-                >
-                  {course.title}
-                </Title>
-                <div className="flex items-center mb-4 transition-all duration-300 group-hover:text-blue-500">
-                  <UserOutlined className="mr-2 text-blue-500" />
-                  <Text className="text-gray-600 font-medium group-hover:text-blue-500">
-                    {course.instructor}
-                  </Text>
-                </div>
-                <div className="flex justify-between items-center mb-4 text-gray-500 text-sm">
-                  <span className="flex items-center">
-                    <ClockCircleOutlined className="mr-1.5" />
-                    {course.duration}
-                  </span>
-                  <span className="flex items-center">
-                    <TeamOutlined className="mr-1.5" />
-                    {course.students.toLocaleString()}
-                  </span>
-                  <span className="flex items-center text-yellow-500">
-                    <StarOutlined className="mr-1.5" />
-                    {course.rating}
-                  </span>
-                </div>
-                <div className="pt-4 border-t border-gray-100 text-center">
-                  <Button
-                    type="primary"
-                    size="large"
-                    className="w-full shadow-[0_8px_20px_-6px_rgba(59,130,246,0.5)] hover:shadow-[0_12px_24px_-6px_rgba(59,130,246,0.6)] 
-                      transform hover:translate-y-[-2px] transition-all duration-500 ease-out"
-                  >
-                    立即学习
-                  </Button>
-                </div>
-              </div>
-            </Card>
-          ))}
-        </div>
-
-        {filteredCourses.length >= visibleCourses && (
-          <div className=' flex items-center gap-4 justify-between mt-6'>
-            <div className='h-[1px]    flex-grow  bg-gray-200'></div>
-            <div className="flex justify-end ">
-              <div
-                onClick={() => navigate('/courses')}
-                className="cursor-pointer tracking-widest text-gray-500 hover:text-primary font-medium flex items-center gap-2 transition-all duration-300 ease-in-out"
-              >
-                查看更多
-
-              </div>
-
-            </div>
-
-          </div>
-        )}
-      </div>
-    </section>
-  );
+	const [selectedCategory, setSelectedCategory] = useState<string>("全部");
+	const gateGory: GetTaxonomyProps = useGetTaxonomy({
+		type: TaxonomySlug.CATEGORY,
+	});
+	return (
+		<section className="relative py-16 overflow-hidden ">
+			<div className="max-w-screen-2xl mx-auto px-4 relative">
+				<div className="flex justify-between items-end mb-12 ">
+					<div>
+						<Title
+							level={2}
+							className="font-bold text-5xl mb-6 bg-gradient-to-r from-blue-600 to-purple-600 bg-clip-text text-transparent">
+							{title}
+						</Title>
+						<Text
+							type="secondary"
+							className="text-xl font-light text-gray-600">
+							{description}
+						</Text>
+					</div>
+				</div>
+				<div className="mb-12 flex flex-wrap gap-4">
+					{gateGory.isLoading ? (
+						<Skeleton paragraph={{ rows: 2 }}></Skeleton>
+					) : (
+						<>
+							{["全部", ...gateGory.categories].map(
+								(category, idx) => (
+									<CoursesSectionTag
+										key={idx}
+										category={category}
+										selectedCategory={selectedCategory}
+										setSelectedCategory={
+											setSelectedCategory
+										}
+									/>
+								)
+							)}
+						</>
+					)}
+				</div>
+				<PostList
+					renderItem={(post) => render(post)}
+					params={{
+						page: 1,
+						pageSize: initialVisibleCoursesCount,
+						where: {
+							terms: !(selectedCategory === "全部")
+								? {
+										some: {
+											name: selectedCategory,
+										},
+									}
+								: {},
+							type: postType
+						},
+					}}
+					showPagination={false}
+					cols={4}></PostList>
+				<LookForMore to={to}></LookForMore>
+			</div>
+		</section>
+	);
 };
-
 export default CoursesSection;
diff --git a/apps/web/src/app/main/home/components/CoursesSectionTag.tsx b/apps/web/src/app/main/home/components/CoursesSectionTag.tsx
new file mode 100755
index 0000000..c03d718
--- /dev/null
+++ b/apps/web/src/app/main/home/components/CoursesSectionTag.tsx
@@ -0,0 +1,24 @@
+import { Tag } from "antd";
+
+export function CoursesSectionTag({category, selectedCategory, setSelectedCategory}) {
+    return (
+        <>
+            <Tag
+                key={category}
+                color={
+                    selectedCategory === category
+                        ? "blue"
+                        : "default"
+                }
+                onClick={() => {
+                    setSelectedCategory(category);
+                }}
+                className={`px-6 py-2 text-base cursor-pointer rounded-full transition-all duration-300 ${selectedCategory === category
+                        ? "bg-blue-600 text-white shadow-lg"
+                        : "bg-white text-gray-600 hover:bg-gray-100"
+                    }`}>
+                {category}
+            </Tag>
+        </>
+    )
+}
diff --git a/apps/web/src/app/main/home/components/HeroSection.tsx b/apps/web/src/app/main/home/components/HeroSection.tsx
index b577173..8f6b7a8 100755
--- a/apps/web/src/app/main/home/components/HeroSection.tsx
+++ b/apps/web/src/app/main/home/components/HeroSection.tsx
@@ -1,157 +1,161 @@
-import React, { useRef, useCallback } from 'react';
-import { Button, Carousel, Typography } from 'antd';
+import React, {
+	useRef,
+	useCallback,
+	useEffect,
+	useMemo,
+	useState,
+} from "react";
+import { Carousel, Typography } from "antd";
 import {
-  TeamOutlined,
-  BookOutlined,
-  StarOutlined,
-  ClockCircleOutlined,
-  LeftOutlined,
-  RightOutlined
-} from '@ant-design/icons';
-import type { CarouselRef } from 'antd/es/carousel';
+	TeamOutlined,
+	BookOutlined,
+	StarOutlined,
+	LeftOutlined,
+	RightOutlined,
+	EyeOutlined,
+} from "@ant-design/icons";
+import type { CarouselRef } from "antd/es/carousel";
+import { useAppConfig } from "@nice/client";
 
 const { Title, Text } = Typography;
 
 interface CarouselItem {
-  title: string;
-  desc: string;
-  image: string;
-  action: string;
-  color: string;
+	title: string;
+	desc: string;
+	image: string;
+	action: string;
+	color: string;
 }
 
 interface PlatformStat {
-  icon: React.ReactNode;
-  value: string;
-  label: string;
+	icon: React.ReactNode;
+	value: number;
+	label: string;
 }
 
-const carouselItems: CarouselItem[] = [
-  {
-    title: '探索编程世界',
-    desc: '从零开始学习编程，开启你的技术之旅',
-    image: '/images/banner1.jpg',
-    action: '立即开始',
-    color: 'from-blue-600/90'
-  },
-  {
-    title: '人工智能课程',
-    desc: '掌握AI技术，引领未来发展',
-    image: '/images/banner2.jpg',
-    action: '了解更多',
-    color: 'from-purple-600/90'
-  }
-];
-
-const platformStats: PlatformStat[] = [
-  { icon: <TeamOutlined />, value: '50,000+', label: '注册学员' },
-  { icon: <BookOutlined />, value: '1,000+', label: '精品课程' },
-  { icon: <StarOutlined />, value: '98%', label: '好评度' },
-  { icon: <ClockCircleOutlined />, value: '100万+', label: '学习时长' }
-];
-
 const HeroSection = () => {
-  const carouselRef = useRef<CarouselRef>(null);
+	const carouselRef = useRef<CarouselRef>(null);
+	const { statistics, slides } = useAppConfig();
+	const [countStatistics, setCountStatistics] = useState<number>(4);
+	const platformStats: PlatformStat[] = useMemo(() => {
+		return [
+			{
+				icon: <TeamOutlined />,
+				value: statistics.staffs,
+				label: "注册学员",
+			},
+			{
+				icon: <StarOutlined />,
+				value: statistics.courses,
+				label: "精品课程",
+			},
+			{
+				icon: <BookOutlined />,
+				value: statistics.lectures,
+				label: "课程章节",
+			},
+			{
+				icon: <EyeOutlined />,
+				value: statistics.reads,
+				label: "播放次数",
+			},
+		];
+	}, [statistics]);
+	const handlePrev = useCallback(() => {
+		carouselRef.current?.prev();
+	}, []);
 
-  const handlePrev = useCallback(() => {
-    carouselRef.current?.prev();
-  }, []);
+	const handleNext = useCallback(() => {
+		carouselRef.current?.next();
+	}, []);
 
-  const handleNext = useCallback(() => {
-    carouselRef.current?.next();
-  }, []);
+	const countNonZeroValues = (statistics: Record<string, number>): number => {
+		return Object.values(statistics).filter((value) => value !== 0).length;
+	};
 
-  return (
-    <section className="relative ">
-      <div className="group">
-        <Carousel
-          ref={carouselRef}
-          autoplay
-          effect="fade"
-          className="h-[600px] mb-24"
-          dots={{
-            className: 'carousel-dots !bottom-32 !z-20',
-          }}
-        >
-          {carouselItems.map((item, index) => (
-            <div key={index} className="relative h-[600px]">
-              <div
-                className="absolute inset-0 bg-cover bg-center transform transition-[transform,filter] duration-[2000ms] group-hover:scale-105 group-hover:brightness-110 will-change-[transform,filter]"
-                style={{
-                  backgroundImage: `url(${item.image})`,
-                  backfaceVisibility: 'hidden'
-                }}
-              />
-              <div
-                className={`absolute inset-0 bg-gradient-to-r ${item.color} to-transparent opacity-90 mix-blend-overlay transition-opacity duration-500`}
-              />
-              <div className="absolute inset-0 bg-gradient-to-t from-black/50 to-transparent" />
+	useEffect(() => {
+		const count = countNonZeroValues(statistics);
+		console.log(count);
+		setCountStatistics(count);
+	}, [statistics]);
+	return (
+		<section className="relative ">
+			<div className="group">
+				<Carousel
+					ref={carouselRef}
+					autoplay
+					effect="fade"
+					className="h-[600px] mb-24"
+					dots={{
+						className: "carousel-dots !bottom-32 !z-20",
+					}}>
+					{Array.isArray(slides) ? (
+						slides.map((item, index) => (
+							<div key={index} className="relative h-[600px]">
+								<div
+									className="absolute inset-0 bg-cover bg-center transform transition-[transform,filter] duration-[2000ms] group-hover:scale-105 group-hover:brightness-110 will-change-[transform,filter]"
+									style={{
+										//backgroundImage: `url(https://s.cn.bing.net/th?id=OHR.GiantCuttlefish_ZH-CN0670915878_1920x1080.webp&qlt=50)`,
+										backgroundImage: `url(${item})`,
+										backfaceVisibility: "hidden",
+									}}
+								/>
+								{/* <div
+									className={`absolute inset-0 bg-gradient-to-r ${item.color} to-transparent opacity-90 mix-blend-overlay transition-opacity duration-500`}
+								/> */}
+								<div className="absolute inset-0 bg-gradient-to-t from-black/50 to-transparent" />
 
-              {/* Content Container */}
-              <div className="relative h-full max-w-7xl mx-auto px-6 lg:px-8">
-                <div className="absolute left-0 top-1/2 -translate-y-1/2 max-w-2xl">
-                  <Title
-                    className="text-white mb-8 text-5xl md:text-6xl xl:text-7xl !leading-tight font-bold tracking-tight"
-                    style={{
-                      transform: 'translateZ(0)'
-                    }}
-                  >
-                    {item.title}
-                  </Title>
-                  <Text className="text-white/95 text-lg md:text-xl block mb-12 font-light leading-relaxed">
-                    {item.desc}
-                  </Text>
-                  <Button
-                    type="primary"
-                    size="large"
-                    className="h-14 px-12 text-lg font-semibold bg-gradient-to-r from-primary to-primary-600 border-0 shadow-lg hover:shadow-xl hover:from-primary-600 hover:to-primary-700 hover:scale-105 transform transition-all duration-300 ease-out"
-                  >
-                    {item.action}
-                  </Button>
-                </div>
-              </div>
-            </div>
-          ))}
-        </Carousel>
+								{/* Content Container */}
+								<div className="relative h-full max-w-7xl mx-auto px-6 lg:px-8"></div>
+							</div>
+						))
+					) : (
+						<div></div>
+					)}
+				</Carousel>
 
-        {/* Navigation Buttons */}
-        <button
-          onClick={handlePrev}
-          className="absolute left-4 md:left-8 top-1/2 -translate-y-1/2 z-10 opacity-0 group-hover:opacity-100 transition-all duration-300 bg-black/20 hover:bg-black/30 w-12 h-12 flex items-center justify-center rounded-full transform hover:scale-110 hover:shadow-lg"
-          aria-label="Previous slide"
-        >
-          <LeftOutlined className="text-white text-xl" />
-        </button>
-        <button
-          onClick={handleNext}
-          className="absolute right-4 md:right-8 top-1/2 -translate-y-1/2 z-10 opacity-0 group-hover:opacity-100 transition-all duration-300 bg-black/20 hover:bg-black/30 w-12 h-12 flex items-center justify-center rounded-full transform hover:scale-110 hover:shadow-lg"
-          aria-label="Next slide"
-        >
-          <RightOutlined className="text-white text-xl" />
-        </button>
-      </div>
+				{/* Navigation Buttons */}
+				<button
+					onClick={handlePrev}
+					className="absolute left-4 md:left-8 top-1/2 -translate-y-1/2 z-10 opacity-0 group-hover:opacity-100 transition-all duration-300 bg-black/20 hover:bg-black/30 w-12 h-12 flex items-center justify-center rounded-full transform hover:scale-110 hover:shadow-lg"
+					aria-label="Previous slide">
+					<LeftOutlined className="text-white text-xl" />
+				</button>
+				<button
+					onClick={handleNext}
+					className="absolute right-4 md:right-8 top-1/2 -translate-y-1/2 z-10 opacity-0 group-hover:opacity-100 transition-all duration-300 bg-black/20 hover:bg-black/30 w-12 h-12 flex items-center justify-center rounded-full transform hover:scale-110 hover:shadow-lg"
+					aria-label="Next slide">
+					<RightOutlined className="text-white text-xl" />
+				</button>
+			</div>
 
-      {/* Stats Container */}
-      <div className="absolute -bottom-24 left-1/2 -translate-x-1/2 w-full max-w-6xl px-4">
-        <div className="rounded-2xl grid grid-cols-2 md:grid-cols-4 gap-4 md:gap-8 p-6 md:p-8 bg-white border shadow-xl hover:shadow-2xl transition-shadow duration-500 will-change-[transform,box-shadow]">
-          {platformStats.map((stat, index) => (
-            <div
-              key={index}
-              className="text-center transform hover:-translate-y-1 hover:scale-105 transition-transform duration-300 ease-out"
-            >
-              <div className="inline-flex items-center justify-center w-16 h-16 mb-4 rounded-full bg-primary-50 text-primary-600 text-3xl transition-colors duration-300 group-hover:text-primary-700">
-                {stat.icon}
-              </div>
-              <div className="text-2xl font-bold bg-gradient-to-r from-gray-800 to-gray-600 bg-clip-text text-transparent mb-1.5">
-                {stat.value}
-              </div>
-              <div className="text-gray-600 font-medium">{stat.label}</div>
-            </div>
-          ))}
-        </div>
-      </div>
-    </section>
-  );
+			{/* Stats Container */}
+			{countStatistics > 1 && (
+				<div className="absolute -bottom-20 left-1/2 -translate-x-1/2 w-3/5 max-w-6xl px-4">
+					<div
+						className={`rounded-2xl grid grid-cols-${countStatistics} lg:grid-cols-${countStatistics} md:grid-cols-${countStatistics} gap-4 md:gap-8 p-6 md:p-8 bg-white border shadow-xl hover:shadow-2xl transition-shadow duration-500 will-change-[transform,box-shadow]`}>
+						{platformStats.map((stat, index) => {
+							return stat.value ? (
+								<div
+									key={index}
+									className="text-center transform hover:-translate-y-1 hover:scale-105 transition-transform duration-300 ease-out">
+									<div className="inline-flex items-center justify-center w-16 h-16 mb-4 rounded-full bg-primary-50 text-primary-600 text-3xl transition-colors duration-300 group-hover:text-primary-700">
+										{stat.icon}
+									</div>
+									<div className="text-2xl font-bold bg-gradient-to-r from-gray-800 to-gray-600 bg-clip-text text-transparent mb-1.5">
+										{stat.value}
+									</div>
+									<div className="text-gray-600 font-medium">
+										{stat.label}
+									</div>
+								</div>
+							) : null;
+						})}
+					</div>
+				</div>
+			)}
+		</section>
+	);
 };
 
-export default HeroSection;
\ No newline at end of file
+export default HeroSection;
diff --git a/apps/web/src/app/main/home/components/LookForMore.tsx b/apps/web/src/app/main/home/components/LookForMore.tsx
new file mode 100755
index 0000000..2bd74cc
--- /dev/null
+++ b/apps/web/src/app/main/home/components/LookForMore.tsx
@@ -0,0 +1,27 @@
+import { ArrowRightOutlined } from "@ant-design/icons";
+import { Button } from "antd";
+import { useNavigate } from "react-router-dom";
+
+export default function LookForMore({to}:{to:string}) {
+    const navigate = useNavigate();
+    return (
+        <>
+            <div className="flex items-center gap-4 justify-between mt-12">
+                <div className="h-[1px] flex-grow bg-gradient-to-r from-transparent via-gray-300 to-transparent"></div>
+                <div className="flex justify-end">
+                    <Button
+                        type="link"
+                        onClick={() => {
+                            navigate(to)
+                            window.scrollTo({top: 0,behavior: "smooth"});
+                        }}
+                        className="flex items-center gap-2 text-gray-600 hover:text-blue-600 font-medium transition-colors duration-300">
+                        查看更多
+                        <ArrowRightOutlined />
+                    </Button>
+                </div>
+            </div>
+        </>
+    )
+
+}
diff --git a/apps/web/src/app/main/home/page.tsx b/apps/web/src/app/main/home/page.tsx
index 8715fbf..4482872 100755
--- a/apps/web/src/app/main/home/page.tsx
+++ b/apps/web/src/app/main/home/page.tsx
@@ -1,126 +1,34 @@
-import HeroSection from './components/HeroSection';
-import CategorySection from './components/CategorySection';
-import CoursesSection from './components/CoursesSection';
-import FeaturedTeachersSection from './components/FeaturedTeachersSection';
+import HeroSection from "./components/HeroSection";
+import CategorySection from "./components/CategorySection";
+import CoursesSection from "./components/CoursesSection";
+import { PostType } from "@nice/common";
+import PathCard from "@web/src/components/models/post/SubPost/PathCard";
+import CourseCard from "@web/src/components/models/post/SubPost/CourseCard";
+
+
 const HomePage = () => {
-  const mockCourses = [
-    {
-      id: 1,
-      title: 'Python 零基础入门',
-      instructor: '张教授',
-      students: 12000,
-      rating: 4.8,
-      level: '入门',
-      duration: '36小时',
-      category: '编程语言',
-      progress: 0,
-      thumbnail: '/images/course1.jpg',
-    },
-    {
-      id: 2,
-      title: '数据结构与算法',
-      instructor: '李教授',
-      students: 8500,
-      rating: 4.9,
-      level: '进阶',
-      duration: '48小时',
-      category: '计算机基础',
-      progress: 35,
-      thumbnail: '/images/course2.jpg',
-    },
-    {
-      id: 3,
-      title: '前端开发实战',
-      instructor: '王教授',
-      students: 10000,
-      rating: 4.7,
-      level: '中级',
-      duration: '42小时',
-      category: '前端开发',
-      progress: 68,
-      thumbnail: '/images/course3.jpg',
-    },
-    {
-      id: 4,
-      title: 'Java企业级开发',
-      instructor: '刘教授',
-      students: 9500,
-      rating: 4.6,
-      level: '高级',
-      duration: '56小时',
-      category: '编程语言',
-      progress: 0,
-      thumbnail: '/images/course4.jpg',
-    },
-    {
-      id: 5,
-      title: '人工智能基础',
-      instructor: '陈教授',
-      students: 11000,
-      rating: 4.9,
-      level: '中级',
-      duration: '45小时',
-      category: '人工智能',
-      progress: 20,
-      thumbnail: '/images/course5.jpg',
-    },
-    {
-      id: 6,
-      title: '大数据分析',
-      instructor: '赵教授',
-      students: 8000,
-      rating: 4.8,
-      level: '进阶',
-      duration: '50小时',
-      category: '数据科学',
-      progress: 45,
-      thumbnail: '/images/course6.jpg',
-    },
-    {
-      id: 7,
-      title: '云计算实践',
-      instructor: '孙教授',
-      students: 7500,
-      rating: 4.7,
-      level: '高级',
-      duration: '48小时',
-      category: '云计算',
-      progress: 15,
-      thumbnail: '/images/course7.jpg',
-    },
-    {
-      id: 8,
-      title: '移动应用开发',
-      instructor: '周教授',
-      students: 9000,
-      rating: 4.8,
-      level: '中级',
-      duration: '40小时',
-      category: '移动开发',
-      progress: 0,
-      thumbnail: '/images/course8.jpg',
-    },
-  ];
 
-  return (
-    <div className="min-h-screen">
-      <HeroSection />
-      {/* <TusUploader></TusUploader> */}
-
-      <CoursesSection
-        title="推荐课程"
-        description="最受欢迎的精品课程，助你快速成长"
-        courses={mockCourses}
-      />
-      <CoursesSection
-        title="热门课程"
-        description="最受欢迎的精品课程，助你快速成长"
-        courses={mockCourses}
-      />
-      <CategorySection />
-      <FeaturedTeachersSection />
-    </div>
-  );
+	return (
+		<div className="min-h-screen">
+			<HeroSection />
+			<CoursesSection
+				title="最受欢迎的思维导图"
+				description="深受追捧的思维导图，点亮你的智慧人生"
+				postType={PostType.PATH}
+				render={(post)=><PathCard post={post}></PathCard>}
+				to={"path"}
+			/>
+			<CoursesSection
+				title="推荐课程"
+				description="最受欢迎的精品课程，助你快速成长"
+				postType={PostType.COURSE}
+				render={(post)=> <CourseCard post={post}></CourseCard>}
+				to={"/courses"}
+			/>
+			
+			<CategorySection />
+		</div>
+	);
 };
 
-export default HomePage;
\ No newline at end of file
+export default HomePage;
diff --git a/apps/web/src/app/main/layout/BasePost/BasePostLayout.tsx b/apps/web/src/app/main/layout/BasePost/BasePostLayout.tsx
new file mode 100644
index 0000000..09c7852
--- /dev/null
+++ b/apps/web/src/app/main/layout/BasePost/BasePostLayout.tsx
@@ -0,0 +1,29 @@
+import { ReactNode, useEffect } from "react";
+import FilterSection from "./FilterSection";
+import { useMainContext } from "../MainProvider";
+
+export function BasePostLayout({
+	children,
+	showSearchMode = false,
+}: {
+	children: ReactNode;
+	showSearchMode?: boolean;
+}) {
+	const { setShowSearchMode } = useMainContext();
+	useEffect(() => {
+		setShowSearchMode(showSearchMode);
+	}, [showSearchMode]);
+	return (
+		<>
+			<div className="min-h-screen bg-gray-50">
+				<div className=" flex">
+					<div className="w-1/6">
+						<FilterSection></FilterSection>
+					</div>
+					<div className="w-5/6 p-4 py-8">{children}</div>
+				</div>
+			</div>
+		</>
+	);
+}
+export default BasePostLayout;
diff --git a/apps/web/src/app/main/layout/BasePost/FilterSection.tsx b/apps/web/src/app/main/layout/BasePost/FilterSection.tsx
new file mode 100755
index 0000000..084878c
--- /dev/null
+++ b/apps/web/src/app/main/layout/BasePost/FilterSection.tsx
@@ -0,0 +1,46 @@
+import { Divider } from "antd";
+import { api } from "@nice/client";
+import { useMainContext } from "../MainProvider";
+import TermParentSelector from "@web/src/components/models/term/term-parent-selector";
+import SearchModeRadio from "./SearchModeRadio";
+export default function FilterSection() {
+	const { data: taxonomies } = api.taxonomy.getAll.useQuery({});
+	const { selectedTerms, setSelectedTerms, showSearchMode } =
+		useMainContext();
+	const handleTermChange = (slug: string, selected: string[]) => {
+		setSelectedTerms({
+			...selectedTerms,
+			[slug]: selected, // 更新对应 slug 的选择
+		});
+	};
+	return (
+		<div className=" flex z-0 p-6 flex-col  mt-4   space-y-6   overscroll-contain overflow-x-hidden">
+			{showSearchMode && <SearchModeRadio></SearchModeRadio>}
+			{taxonomies?.map((tax, index) => {
+				const items = Object.entries(selectedTerms).find(
+					([key, items]) => key === tax.slug
+				)?.[1];
+				return (
+					<div key={index}>
+						<h3 className="text-lg font-medium mb-4">
+							{tax?.name}
+							{/* {JSON.stringify(items)} */}
+						</h3>
+						<TermParentSelector
+							value={items}
+							// slug={tax?.slug}
+							className="w-70 max-h-[400px] overscroll-contain overflow-x-hidden"
+							onChange={(selected) =>
+								handleTermChange(
+									tax?.slug,
+									selected as string[]
+								)
+							}
+							taxonomyId={tax?.id}></TermParentSelector>
+						<Divider></Divider>
+					</div>
+				);
+			})}
+		</div>
+	);
+}
diff --git a/apps/web/src/app/main/layout/BasePost/SearchModeRadio.tsx b/apps/web/src/app/main/layout/BasePost/SearchModeRadio.tsx
new file mode 100644
index 0000000..507e94f
--- /dev/null
+++ b/apps/web/src/app/main/layout/BasePost/SearchModeRadio.tsx
@@ -0,0 +1,25 @@
+import { useMainContext } from "../MainProvider";
+import { Radio, Space, Typography } from "antd";
+import { PostType } from "@nice/common"; // Assuming PostType is defined in this path
+
+export default function SearchModeRadio() {
+	const { searchMode, setSearchMode } = useMainContext();
+
+	const handleModeChange = (e) => {
+		setSearchMode(e.target.value);
+	};
+
+	return (
+		<Space direction="vertical" align="start" className="mb-2">
+			<h3 className="text-lg font-medium mb-4">只搜索</h3>
+			<Radio.Group
+				value={searchMode}
+				onChange={handleModeChange}
+				buttonStyle="solid">
+				<Radio.Button value={PostType.COURSE}>视频课程</Radio.Button>
+				<Radio.Button value={PostType.PATH}>思维导图</Radio.Button>
+				<Radio.Button value="both">所有资源</Radio.Button>
+			</Radio.Group>
+		</Space>
+	);
+}
diff --git a/apps/web/src/app/main/layout/MainFooter.tsx b/apps/web/src/app/main/layout/MainFooter.tsx
index 1356335..b232752 100755
--- a/apps/web/src/app/main/layout/MainFooter.tsx
+++ b/apps/web/src/app/main/layout/MainFooter.tsx
@@ -1,68 +1,76 @@
-import { CloudOutlined, FileSearchOutlined, HomeOutlined, MailOutlined, PhoneOutlined } from '@ant-design/icons';
-import { Layout, Typography } from 'antd';
+import {
+	CloudOutlined,
+	FileSearchOutlined,
+	HomeOutlined,
+	MailOutlined,
+	PhoneOutlined,
+} from "@ant-design/icons";
+
 export function MainFooter() {
-    return (
-        <footer className="bg-gradient-to-b from-slate-800 to-slate-900  text-secondary-200">
-            <div className="container mx-auto px-4 py-6">
-                <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-                    {/* 开发组织信息 */}
-                    <div className="text-center md:text-left space-y-2">
-                        <h3 className="text-white font-semibold text-sm flex items-center justify-center md:justify-start">
-                            创新高地  软件小组
-                        </h3>
-                        <p className="text-gray-400 text-xs italic">
-                            提供技术支持
-                        </p>
-                    </div>
+	return (
+		<footer className="bg-gradient-to-b from-slate-800 to-slate-900 relative z-10 text-secondary-200">
+			<div className="container mx-auto px-4 py-6">
+				<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
+					{/* 开发组织信息 */}
+					<div className="text-center md:text-left space-y-2">
+						<h3 className="text-white font-semibold text-sm flex items-center justify-center md:justify-start">
+							软件与数据小组
+						</h3>
+						<p className="text-gray-400 text-xs italic">
+							提供技术支持
+						</p>
+					</div>
 
-                    {/* 联系方式 */}
-                    <div className="text-center space-y-2">
-                        <div className="flex items-center justify-center space-x-2">
-                            <PhoneOutlined className="text-gray-400" />
-                            <span className="text-gray-300 text-xs">628118</span>
-                        </div>
-                        <div className="flex items-center justify-center space-x-2">
-                            <MailOutlined className="text-gray-400" />
-                            <span className="text-gray-300 text-xs">gcsjs6@tx3l.nb.kj</span>
-                        </div>
-                    </div>
+					{/* 联系方式 */}
+					<div className="text-center space-y-2">
+						<div className="flex items-center justify-center space-x-2">
+							<PhoneOutlined className="text-gray-400" />
+							<span className="text-gray-300 text-xs">
+								628118
+							</span>
+						</div>
+						<div className="flex items-center justify-center space-x-2">
+							<MailOutlined className="text-gray-400" />
+							<span className="text-gray-300 text-xs">
+								gcsjs6@tx3l.nb.kj
+							</span>
+						</div>
+					</div>
 
-                    {/* 系统链接 */}
-                    <div className="text-center md:text-right space-y-2">
-                        <div className="flex items-center justify-center md:justify-end space-x-4">
-                            <a
-                                href="https://27.57.72.21"
-                                className="text-gray-400 hover:text-white transition-colors"
-                                title="访问门户网站"
-                            >
-                                <HomeOutlined className="text-lg" />
-                            </a>
-                            <a
-                                href="https://27.57.72.14"
-                                className="text-gray-400 hover:text-white transition-colors"
-                                title="访问烽火青云"
-                            >
-                                <CloudOutlined className="text-lg" />
-                            </a>
+					{/* 系统链接 */}
+					<div className="text-center md:text-right space-y-2">
+						<div className="flex items-center justify-center md:justify-end space-x-4">
+							<a
+								href="https://27.57.72.21"
+								className="text-gray-400 hover:text-white transition-colors"
+								title="访问门户网站">
+								<HomeOutlined className="text-lg" />
+							</a>
+							<a
+								href="https://27.57.72.14"
+								className="text-gray-400 hover:text-white transition-colors"
+								title="访问烽火青云">
+								<CloudOutlined className="text-lg" />
+							</a>
 
-                            <a
-                                href="http://27.57.72.38"
-                                className="text-gray-400 hover:text-white transition-colors"
-                                title="访问烽火律询"
-                            >
-                                <FileSearchOutlined className="text-lg" />
-                            </a>
-                        </div>
-                    </div>
-                </div>
+							<a
+								href="http://27.57.72.38"
+								className="text-gray-400 hover:text-white transition-colors"
+								title="访问烽火律询">
+								<FileSearchOutlined className="text-lg" />
+							</a>
+						</div>
+					</div>
+				</div>
 
-                {/* 版权信息 */}
-                <div className="border-t border-gray-700/50 mt-4 pt-4 text-center">
-                    <p className="text-gray-400 text-xs">
-                        © {new Date().getFullYear()} 南天烽火. All rights reserved.
-                    </p>
-                </div>
-            </div>
-        </footer>
-    );
+				{/* 版权信息 */}
+				<div className="border-t border-gray-700/50 mt-4 pt-4 text-center">
+					<p className="text-gray-400 text-xs">
+						© {new Date().getFullYear()} 南天烽火. All rights
+						reserved.
+					</p>
+				</div>
+			</div>
+		</footer>
+	);
 }
diff --git a/apps/web/src/app/main/layout/MainHeader.tsx b/apps/web/src/app/main/layout/MainHeader.tsx
index 80ea733..29e70d7 100755
--- a/apps/web/src/app/main/layout/MainHeader.tsx
+++ b/apps/web/src/app/main/layout/MainHeader.tsx
@@ -1,75 +1,108 @@
-import { useState } from "react";
-import { Input, Layout, Avatar, Button, Dropdown } from "antd";
-import { EditFilled, SearchOutlined, UserOutlined } from "@ant-design/icons";
+import { Input, Button } from "antd";
+import { PlusOutlined, SearchOutlined, UserOutlined } from "@ant-design/icons";
 import { useAuth } from "@web/src/providers/auth-provider";
-import { useNavigate } from "react-router-dom";
-import { UserMenu } from "./UserMenu";
+import { useNavigate, useParams } from "react-router-dom";
+import { UserMenu } from "./UserMenu/UserMenu";
 import { NavigationMenu } from "./NavigationMenu";
-
-const { Header } = Layout;
-
+import { useMainContext } from "./MainProvider";
 export function MainHeader() {
-	const [searchValue, setSearchValue] = useState("");
 	const { isAuthenticated, user } = useAuth();
+	const { id } = useParams();
 	const navigate = useNavigate();
+	const { searchValue, setSearchValue } = useMainContext();
 
 	return (
-		<Header className="select-none flex items-center justify-center bg-white shadow-md border-b border-gray-100 fixed w-full z-30">
-			<div className="w-full max-w-screen-2xl px-4 md:px-6 mx-auto flex items-center justify-between h-full">
-				<div className="flex items-center space-x-8">
-					<div
-						onClick={() => navigate("/")}
-						className="text-2xl font-bold bg-gradient-to-r from-primary-600 via-primary-500 to-primary-400 bg-clip-text text-transparent hover:scale-105 transition-transform cursor-pointer">
-						烽火慕课
-					</div>
-					<NavigationMenu />
+		<div className="select-none w-full flex items-center justify-between bg-white shadow-md border-b border-gray-100 fixed z-30 py-2 px-4 md:px-6">
+			{/* 左侧区域 - 设置为不收缩 */}
+			<div className="flex items-center justify-start space-x-4 flex-shrink-0">
+				<img src="/logo.svg" className="h-12 w-12" />
+				<div
+					onClick={() => navigate("/")}
+					className="text-2xl font-bold bg-gradient-to-r from-primary-600 via-primary-500 to-primary-400 bg-clip-text text-transparent hover:scale-105 transition-transform cursor-pointer whitespace-nowrap">
+					烽火慕课
 				</div>
-				<div className="flex items-center space-x-6">
-					<div className="group relative">
-						<Input
-							size="large"
-							prefix={
-								<SearchOutlined className="text-gray-400 group-hover:text-blue-500 transition-colors" />
+				<NavigationMenu />
+			</div>
+
+			{/* 右侧区域 - 可以灵活收缩 */}
+			<div className="flex justify-end gap-2 md:gap-4 flex-shrink">
+				<div className="flex items-center gap-2 md:gap-4">
+					<Input
+						size="large"
+						prefix={
+							<SearchOutlined className="text-gray-400 group-hover:text-blue-500 transition-colors" />
+						}
+						placeholder="搜索课程"
+						className="w-full md:w-96 rounded-full"
+						value={searchValue}
+						onClick={(e) => {
+							if (
+								!window.location.pathname.startsWith("/search")
+							) {
+								navigate(`/search`);
+								window.scrollTo({
+									top: 0,
+									behavior: "smooth",
+								});
 							}
-							placeholder="搜索课程"
-							className="w-72 rounded-full"
-							value={searchValue}
-							onChange={(e) => setSearchValue(e.target.value)}
-						/>
-					</div>
+						}}
+						onChange={(e) => setSearchValue(e.target.value)}
+						onPressEnter={(e) => {
+							if (
+								!window.location.pathname.startsWith("/search")
+							) {
+								navigate(`/search`);
+								window.scrollTo({
+									top: 0,
+									behavior: "smooth",
+								});
+							}
+						}}
+					/>
 					{isAuthenticated && (
 						<>
 							<Button
-								onClick={() => navigate("/course/editor")}
-								className="flex items-center space-x-1 bg-gradient-to-r from-blue-500 to-blue-600 text-white hover:from-blue-600 hover:to-blue-700 border-none shadow-md hover:shadow-lg transition-all"
-								icon={<EditFilled />}>
-								创建课程
+								size="large"
+								shape="round"
+								icon={<PlusOutlined></PlusOutlined>}
+								onClick={() => {
+									const url = id
+										? `/course/${id}/editor`
+										: "/course/editor";
+									navigate(url);
+								}}
+								type="primary">
+								{id ? "编辑课程" : "创建课程"}
 							</Button>
 						</>
 					)}
+					{isAuthenticated && (
+						<Button
+							size="large"
+							shape="round"
+							onClick={() => {
+								window.location.href = "/path/editor";
+							}}
+							ghost
+							type="primary"
+							icon={<PlusOutlined></PlusOutlined>}>
+							创建思维导图
+						</Button>
+					)}
 					{isAuthenticated ? (
-						<Dropdown
-							overlay={<UserMenu />}
-							trigger={["click"]}
-							placement="bottomRight">
-							<Avatar
-								size="large"
-								className="cursor-pointer hover:scale-105 transition-all bg-gradient-to-r from-blue-500 to-blue-600 text-white font-semibold">
-								{(user?.showname ||
-									user?.username ||
-									"")[0]?.toUpperCase()}
-							</Avatar>
-						</Dropdown>
+						<UserMenu />
 					) : (
 						<Button
+							type="primary"
+							size="large"
+							shape="round"
 							onClick={() => navigate("/login")}
-							className="flex items-center space-x-1 bg-gradient-to-r from-blue-500 to-blue-600 text-white hover:from-blue-600 hover:to-blue-700 border-none shadow-md hover:shadow-lg transition-all"
 							icon={<UserOutlined />}>
 							登录
 						</Button>
 					)}
 				</div>
 			</div>
-		</Header>
+		</div>
 	);
 }
diff --git a/apps/web/src/app/main/layout/MainLayout.tsx b/apps/web/src/app/main/layout/MainLayout.tsx
index 09f5670..fa3bad7 100755
--- a/apps/web/src/app/main/layout/MainLayout.tsx
+++ b/apps/web/src/app/main/layout/MainLayout.tsx
@@ -1,19 +1,21 @@
-import { Layout } from 'antd';
-import { Outlet } from 'react-router-dom';
-import { MainHeader } from './MainHeader';
-import { MainFooter } from './MainFooter';
+import { Layout } from "antd";
+import { Outlet } from "react-router-dom";
+import { MainHeader } from "./MainHeader";
+import { MainFooter } from "./MainFooter";
+import { MainProvider } from "./MainProvider";
 
 const { Content } = Layout;
 
 export function MainLayout() {
-    return (
-        <Layout className="min-h-screen">
-
-            <MainHeader />
-            <Content className="mt-16 bg-gray-50">
-                <Outlet />
-            </Content>
-            <MainFooter />
-        </Layout>
-    );
-}
\ No newline at end of file
+	return (
+		<MainProvider>
+			<div className=" min-h-screen  bg-gray-100">
+				<MainHeader />
+				<Content className=" flex-grow pt-16 bg-gray-50   ">
+					<Outlet />
+				</Content>
+				<MainFooter />
+			</div>
+		</MainProvider>
+	);
+}
diff --git a/apps/web/src/app/main/layout/MainProvider.tsx b/apps/web/src/app/main/layout/MainProvider.tsx
new file mode 100755
index 0000000..73db96a
--- /dev/null
+++ b/apps/web/src/app/main/layout/MainProvider.tsx
@@ -0,0 +1,109 @@
+import { PostType, Prisma } from "@nice/common";
+import React, {
+	createContext,
+	ReactNode,
+	useContext,
+	useMemo,
+	useState,
+} from "react";
+import { useDebounce } from "use-debounce";
+interface SelectedTerms {
+	[key: string]: string[]; // 每个 slug 对应一个 string 数组
+}
+
+interface MainContextType {
+	searchValue?: string;
+	selectedTerms?: SelectedTerms;
+	setSearchValue?: React.Dispatch<React.SetStateAction<string>>;
+	setSelectedTerms?: React.Dispatch<React.SetStateAction<SelectedTerms>>;
+	searchCondition?: Prisma.PostWhereInput;
+	termsCondition?: Prisma.PostWhereInput;
+	searchMode?: PostType.COURSE | PostType.PATH | "both";
+	setSearchMode?: React.Dispatch<
+		React.SetStateAction<PostType.COURSE | PostType.PATH | "both">
+	>;
+	showSearchMode?: boolean;
+	setShowSearchMode?: React.Dispatch<React.SetStateAction<boolean>>;
+}
+
+const MainContext = createContext<MainContextType | null>(null);
+interface MainProviderProps {
+	children: ReactNode;
+}
+
+export function MainProvider({ children }: MainProviderProps) {
+	const [searchMode, setSearchMode] = useState<
+		PostType.COURSE | PostType.PATH | "both"
+	>("both");
+	const [showSearchMode, setShowSearchMode] = useState<boolean>(false);
+	const [searchValue, setSearchValue] = useState<string>("");
+	const [debouncedValue] = useDebounce<string>(searchValue, 500);
+	const [selectedTerms, setSelectedTerms] = useState<SelectedTerms>({}); // 初始化状态
+	const termFilters = useMemo(() => {
+		return Object.entries(selectedTerms)
+			.filter(([, terms]) => terms.length > 0)
+			?.map(([, terms]) => terms);
+	}, [selectedTerms]);
+
+	const termsCondition: Prisma.PostWhereInput = useMemo(() => {
+		return termFilters && termFilters?.length > 0
+			? {
+					AND: termFilters.map((termFilter) => ({
+						terms: {
+							some: {
+								id: {
+									in: termFilter, // 确保至少有一个 term.id 在当前 termFilter 中
+								},
+							},
+						},
+					})),
+				}
+			: {};
+	}, [termFilters]);
+	const searchCondition: Prisma.PostWhereInput = useMemo(() => {
+		const containTextCondition: Prisma.StringNullableFilter = {
+			contains: debouncedValue,
+			mode: "insensitive" as Prisma.QueryMode, // 使用类型断言
+		};
+		return debouncedValue
+			? {
+					OR: [
+						{ title: containTextCondition },
+						{ subTitle: containTextCondition },
+						{ content: containTextCondition },
+						{
+							terms: {
+								some: {
+									name: containTextCondition,
+								},
+							},
+						},
+					],
+				}
+			: {};
+	}, [searchValue, debouncedValue]);
+	return (
+		<MainContext.Provider
+			value={{
+				searchValue,
+				setSearchValue,
+				selectedTerms,
+				setSelectedTerms,
+				searchCondition,
+				termsCondition,
+				searchMode,
+				setSearchMode,
+				showSearchMode,
+				setShowSearchMode,
+			}}>
+			{children}
+		</MainContext.Provider>
+	);
+}
+export const useMainContext = () => {
+	const context = useContext(MainContext);
+	if (!context) {
+		throw new Error("useMainContext must be used within MainProvider");
+	}
+	return context;
+};
diff --git a/apps/web/src/app/main/layout/NavigationMenu.tsx b/apps/web/src/app/main/layout/NavigationMenu.tsx
index b1a4fb6..1f50140 100755
--- a/apps/web/src/app/main/layout/NavigationMenu.tsx
+++ b/apps/web/src/app/main/layout/NavigationMenu.tsx
@@ -1,31 +1,59 @@
-import { Menu } from 'antd';
-import { useNavigate, useLocation } from 'react-router-dom';
-
-const menuItems = [
-    { key: 'home', path: '/', label: '首页' },
-    { key: 'courses', path: '/courses', label: '全部课程' },
-    { key: 'paths', path: '/paths', label: '学习路径' }
-];
+import { useAuth } from "@web/src/providers/auth-provider";
+import { Menu } from "antd";
+import { useMemo } from "react";
+import { useNavigate, useLocation } from "react-router-dom";
 
 export const NavigationMenu = () => {
-    const navigate = useNavigate();
-    const { pathname } = useLocation();
-    const selectedKey = menuItems.find(item => item.path === pathname)?.key || '';
-    return (
-        <Menu
-            mode="horizontal"
-            className="border-none font-medium"
-            selectedKeys={[selectedKey]}
-            onClick={({ key }) => {
-                const selectedItem = menuItems.find(item => item.key === key);
-                if (selectedItem) navigate(selectedItem.path);
-            }}
-        >
-            {menuItems.map(({ key, label }) => (
-                <Menu.Item key={key} className="text-gray-600 hover:text-blue-600">
-                    {label}
-                </Menu.Item>
-            ))}
-        </Menu>
-    );
-};
\ No newline at end of file
+	const navigate = useNavigate();
+	const { isAuthenticated } = useAuth();
+	const { pathname } = useLocation();
+
+	const menuItems = useMemo(() => {
+		const baseItems = [
+			{ key: "home", path: "/", label: "首页" },
+			{ key: "path", path: "/path", label: "全部思维导图" },
+			{ key: "courses", path: "/courses", label: "所有课程" },
+		];
+
+		if (!isAuthenticated) {
+			return baseItems;
+		} else {
+			return [
+				...baseItems,
+				{ key: "my-duty", path: "/my-duty", label: "我创建的课程" },
+				{ key: "my-learning", path: "/my-learning", label: "我学习的课程" },
+				{ key: "my-duty-path", path: "/my-duty-path", label: "我创建的思维导图" },
+				{ key: "my-path", path: "/my-path", label: "我学习的思维导图" },
+			];
+		}
+	}, [isAuthenticated]);
+
+	const selectedKey = useMemo(() => {
+		const normalizePath = (path: string): string => path.replace(/\/$/, "");
+		return pathname === '/' ? "home" : menuItems.find((item) => normalizePath(pathname) === item.path)?.key || "";
+	}, [pathname]);
+	
+	return (
+		<Menu
+			mode="horizontal"
+			className="border-none font-medium"
+			disabledOverflow={true}
+			selectedKeys={[selectedKey]}
+			onClick={({ key }) => {
+				const selectedItem = menuItems.find((item) => item.key === key);
+				if (selectedItem) navigate(selectedItem.path);
+				window.scrollTo({
+					top: 0,
+					behavior: "smooth",
+				});
+			}}>
+			{menuItems.map(({ key, label }) => (
+				<Menu.Item
+					key={key}
+					className="text-gray-600 hover:text-blue-600">
+					{label}
+				</Menu.Item>
+			))}
+		</Menu>
+	);
+};
diff --git a/apps/web/src/app/main/layout/UserMenu.tsx b/apps/web/src/app/main/layout/UserMenu.tsx
deleted file mode 100755
index 2591253..0000000
--- a/apps/web/src/app/main/layout/UserMenu.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Avatar, Menu, Dropdown } from "antd";
-import {
-	LogoutOutlined,
-	SettingOutlined,
-	UserAddOutlined,
-	UserSwitchOutlined,
-} from "@ant-design/icons";
-import { useAuth } from "@web/src/providers/auth-provider";
-import { useNavigate } from "react-router-dom";
-
-export const UserMenu = () => {
-	const { isAuthenticated, logout, user } = useAuth();
-	const navigate = useNavigate();
-
-	return (
-		<Menu className="w-48">
-			{isAuthenticated ? (
-				<>
-					<Menu.Item key="profile" className="px-4 py-2">
-						<div className="flex items-center space-x-3">
-							<Avatar className="bg-gradient-to-r from-blue-500 to-blue-600 text-white font-semibold">
-								{(user?.showname ||
-									user?.username ||
-									"")[0]?.toUpperCase()}
-							</Avatar>
-							<div className="flex flex-col">
-								<span className="font-medium">
-									{user?.showname || user?.username}
-								</span>
-								<span className="text-xs text-gray-500">
-									{user?.department?.name || user?.officerId}
-								</span>
-							</div>
-						</div>
-					</Menu.Item>
-					<Menu.Divider />
-					<Menu.Item
-						key="user-settings"
-						icon={<UserSwitchOutlined />}
-						className="px-4">
-						个人设置
-					</Menu.Item>
-					<Menu.Item
-						key="settings"
-						icon={<SettingOutlined />}
-						onClick={() => {
-							navigate("/admin/staff");
-						}}
-						className="px-4">
-						后台管理
-					</Menu.Item>
-					<Menu.Item
-						key="logout"
-						icon={<LogoutOutlined />}
-						onClick={async () => await logout()}
-						className="px-4 text-red-500 hover:text-red-600 hover:bg-red-50">
-						退出登录
-					</Menu.Item>
-				</>
-			) : (
-				<Menu.Item
-					key="login"
-					onClick={() => navigate("/login")}
-					className="px-4 text-blue-500 hover:text-blue-600 hover:bg-blue-50">
-					登录/注册
-				</Menu.Item>
-			)}
-		</Menu>
-	);
-};
diff --git a/apps/web/src/app/main/layout/UserMenu/UserEditModal.tsx b/apps/web/src/app/main/layout/UserMenu/UserEditModal.tsx
new file mode 100755
index 0000000..ed30812
--- /dev/null
+++ b/apps/web/src/app/main/layout/UserMenu/UserEditModal.tsx
@@ -0,0 +1,27 @@
+import { Button, Drawer, Modal } from "antd";
+import React, { useContext, useEffect, useState } from "react";
+
+import { UserEditorContext } from "./UserMenu";
+import UserForm from "./UserForm";
+
+export default function UserEditModal() {
+	const { formLoading, modalOpen, setModalOpen, form } =
+		useContext(UserEditorContext);
+	const handleOk = () => {
+		form.submit();
+	};
+	return (
+		<Modal
+			width={400}
+			onOk={handleOk}
+			centered
+			open={modalOpen}
+			confirmLoading={formLoading}
+			onCancel={() => {
+				setModalOpen(false);
+			}}
+			title={"编辑个人信息"}>
+			<UserForm />
+		</Modal>
+	);
+}
diff --git a/apps/web/src/app/main/layout/UserMenu/UserForm.tsx b/apps/web/src/app/main/layout/UserMenu/UserForm.tsx
new file mode 100755
index 0000000..edef377
--- /dev/null
+++ b/apps/web/src/app/main/layout/UserMenu/UserForm.tsx
@@ -0,0 +1,164 @@
+import { Button, Form, Input, Spin, Switch, message } from "antd";
+import { useContext, useEffect } from "react";
+import { useStaff } from "@nice/client";
+import DepartmentSelect from "@web/src/components/models/department/department-select";
+import { api } from "@nice/client";
+
+import { useAuth } from "@web/src/providers/auth-provider";
+import AvatarUploader from "@web/src/components/common/uploader/AvatarUploader";
+import { StaffDto } from "@nice/common";
+import { UserEditorContext } from "./UserMenu";
+import toast from "react-hot-toast";
+export default function StaffForm() {
+	const { user } = useAuth();
+	const { create, update } = useStaff(); // Ensure you have these methods in your hooks
+	const { formLoading, modalOpen, setModalOpen, domainId, setDomainId, form, setFormLoading, } = useContext(UserEditorContext);
+	const {
+		data,
+		isLoading,
+	}: {
+		data: StaffDto;
+		isLoading: boolean;
+	} = api.staff.findFirst.useQuery(
+		{ where: { id: user?.id } },
+		{ enabled: !!user?.id }
+	);
+	const { isRoot } = useAuth();
+	async function handleFinish(values: any) {
+		const {
+			username,
+			showname,
+			deptId,
+			domainId,
+			password,
+			phoneNumber,
+			officerId,
+			enabled,
+			avatar,
+			photoUrl,
+			email,
+			rank,
+			office,
+		} = values;
+		setFormLoading(true);
+		try {
+			if (data && user?.id) {
+				await update.mutateAsync({
+					where: { id: data.id },
+					data: {
+						username,
+						deptId,
+						showname,
+						domainId,
+						password,
+						phoneNumber,
+						officerId,
+						enabled,
+						avatar,
+					},
+				});
+			}
+			toast.success("提交成功");
+			setModalOpen(false);
+		} catch (err: any) {
+			toast.error(err.message);
+		} finally {
+			setFormLoading(false);
+		}
+	}
+	useEffect(() => {
+		form.resetFields();
+		console.log('cc', data);
+
+		if (data) {
+			form.setFieldValue("username", data.username);
+			form.setFieldValue("showname", data.showname);
+			form.setFieldValue("domainId", data.domainId);
+			form.setFieldValue("deptId", data.deptId);
+			form.setFieldValue("officerId", data.officerId);
+			form.setFieldValue("phoneNumber", data.phoneNumber);
+			form.setFieldValue("enabled", data.enabled);
+			form.setFieldValue("avatar", data.avatar);
+		}
+	}, [data]);
+	// useEffect(() => {
+	// 	if (!data && domainId) {
+	// 		form.setFieldValue("domainId", domainId);
+	// 		form.setFieldValue("deptId", domainId);
+	// 	}
+	// }, [domainId, data as any]);
+	return (
+		<div className="relative">
+			{isLoading && (
+				<div className="absolute h-full inset-0 flex items-center justify-center bg-white bg-opacity-50 z-10">
+					<Spin />
+				</div>
+			)}
+			<Form
+				disabled={isLoading}
+				form={form}
+				layout="vertical"
+				requiredMark="optional"
+				autoComplete="off"
+				onFinish={handleFinish}>
+				<div className=" flex items-center gap-4 mb-2">
+					<div>
+						<Form.Item name={"avatar"} label="头像" noStyle>
+							<AvatarUploader
+								placeholder="点击上传头像"
+								className="rounded-lg"
+								style={{
+									width: "120px",
+									height: "150px",
+								}}></AvatarUploader>
+						</Form.Item>
+					</div>
+
+					<div className="grid  grid-cols-1  gap-2  flex-1">
+						<Form.Item
+							noStyle
+							rules={[{ required: true }]}
+							name={"showname"}
+							label="名称">
+							<Input
+								placeholder="请输入姓名"
+								allowClear
+								autoComplete="new-name" // 使用非标准的自动完成值
+								spellCheck={false}
+							/>
+						</Form.Item>
+						<Form.Item
+							name={"domainId"}
+							label="所属域"
+							noStyle
+							rules={[{ required: true }]}>
+							<DepartmentSelect
+								placeholder="选择域"
+								onChange={(value) => {
+									setDomainId(value as string);
+								}}
+								domain={true}
+							/>
+						</Form.Item>
+						<Form.Item
+							noStyle
+							name={"deptId"}
+							label="所属单位"
+							rules={[{ required: true }]}>
+							<DepartmentSelect rootId={domainId} />
+						</Form.Item>
+
+						<Form.Item noStyle label="密码" name={"password"}>
+							<Input.Password
+								placeholder="修改密码"
+								spellCheck={false}
+								visibilityToggle
+								autoComplete="new-password"
+							/>
+						</Form.Item>
+					</div>
+				</div>
+			</Form>
+		</div>
+	);
+}
diff --git a/apps/web/src/app/main/layout/UserMenu/UserMenu.tsx b/apps/web/src/app/main/layout/UserMenu/UserMenu.tsx
new file mode 100755
index 0000000..fc63758
--- /dev/null
+++ b/apps/web/src/app/main/layout/UserMenu/UserMenu.tsx
@@ -0,0 +1,246 @@
+import { useClickOutside } from "@web/src/hooks/useClickOutside";
+import { useAuth } from "@web/src/providers/auth-provider";
+import { motion, AnimatePresence } from "framer-motion";
+import React, {
+	useState,
+	useRef,
+	useCallback,
+	useMemo,
+	createContext,
+} from "react";
+import { Avatar } from "@web/src/components/common/element/Avatar";
+import {
+	UserOutlined,
+	SettingOutlined,
+	LogoutOutlined,
+} from "@ant-design/icons";
+import { FormInstance, Spin } from "antd";
+import { useNavigate } from "react-router-dom";
+import { MenuItemType } from "./types";
+import { RolePerms } from "@nice/common";
+import { useForm } from "antd/es/form/Form";
+import UserEditModal from "./UserEditModal";
+const menuVariants = {
+	hidden: { opacity: 0, scale: 0.95, y: -10 },
+	visible: {
+		opacity: 1,
+		scale: 1,
+		y: 0,
+		transition: {
+			type: "spring",
+			stiffness: 300,
+			damping: 30,
+		},
+	},
+	exit: {
+		opacity: 0,
+		scale: 0.95,
+		y: -10,
+		transition: {
+			duration: 0.2,
+		},
+	},
+};
+
+export const UserEditorContext = createContext<{
+	domainId: string;
+	setDomainId: React.Dispatch<React.SetStateAction<string>>;
+	modalOpen: boolean;
+	setModalOpen: React.Dispatch<React.SetStateAction<boolean>>;
+	form: FormInstance<any>;
+	formLoading: boolean;
+	setFormLoading: React.Dispatch<React.SetStateAction<boolean>>;
+}>({
+	modalOpen: false,
+	domainId: undefined,
+	setDomainId: undefined,
+	setModalOpen: undefined,
+	form: undefined,
+	formLoading: undefined,
+	setFormLoading: undefined,
+});
+
+export function UserMenu() {
+	const [form] = useForm();
+	const [formLoading, setFormLoading] = useState<boolean>();
+	const [showMenu, setShowMenu] = useState(false);
+	const menuRef = useRef<HTMLDivElement>(null);
+	const { user, logout, isLoading, hasSomePermissions } = useAuth();
+	const navigate = useNavigate();
+	useClickOutside(menuRef, () => setShowMenu(false));
+	const [modalOpen, setModalOpen] = useState<boolean>(false);
+	const [domainId, setDomainId] = useState<string>();
+	const toggleMenu = useCallback(() => {
+		setShowMenu((prev) => !prev);
+	}, []);
+	const canManageAnyStaff = useMemo(() => {
+		return hasSomePermissions(RolePerms.MANAGE_ANY_STAFF);
+	}, [user]);
+	const menuItems: MenuItemType[] = useMemo(
+		() =>
+			[
+				{
+					icon: <UserOutlined className="text-lg" />,
+					label: "个人信息",
+					action: () => {
+						setModalOpen(true);
+					},
+				},
+
+				canManageAnyStaff && {
+					icon: <SettingOutlined className="text-lg" />,
+					label: "设置",
+					action: () => {
+						navigate("/admin/staff");
+					},
+				},
+
+				{
+					icon: <LogoutOutlined className="text-lg" />,
+					label: "注销",
+					action: () => logout(),
+				},
+			].filter(Boolean),
+		[logout]
+	);
+
+	const handleMenuItemClick = useCallback((action: () => void) => {
+		action();
+		setShowMenu(false);
+	}, []);
+
+	if (isLoading) {
+		return (
+			<div className="flex items-center justify-center w-10 h-10">
+				<Spin size="small" />
+			</div>
+		);
+	}
+
+	return (
+		<UserEditorContext.Provider
+			value={{
+				formLoading,
+				setFormLoading,
+				form,
+				domainId,
+				modalOpen,
+				setDomainId,
+				setModalOpen,
+			}}>
+			<div ref={menuRef} className="relative">
+				<motion.button
+					aria-label="用户菜单"
+					aria-haspopup="true"
+					aria-expanded={showMenu}
+					aria-controls="user-menu"
+					whileHover={{ scale: 1.02 }}
+					whileTap={{ scale: 0.98 }}
+					onClick={toggleMenu}
+					className="flex items-center rounded-full transition-all duration-200 ease-in-out">
+					{/* Avatar 容器，相对定位 */}
+					<div className="relative">
+						<Avatar
+							src={user?.avatar}
+							name={user?.showname || user?.username}
+							size={40}
+							className="ring-2 ring-white hover:ring-[#00538E]/90
+                transition-all duration-200 ease-in-out shadow-md
+                hover:shadow-lg focus:outline-none
+             focus:ring-2 focus:ring-[#00538E]/80 focus:ring-offset-2
+             focus:ring-offset-white "
+						/>
+						{/* 小绿点 */}
+						<span
+							className="absolute bottom-0 right-0 h-3 w-3
+                 rounded-full bg-emerald-500 ring-2 ring-white
+                 shadow-sm transition-transform duration-200
+                 ease-in-out hover:scale-110"
+							aria-hidden="true"
+						/>
+					</div>
+				</motion.button>
+
+				<AnimatePresence>
+					{showMenu && (
+						<motion.div
+							initial="hidden"
+							animate="visible"
+							exit="exit"
+							variants={menuVariants}
+							role="menu"
+							id="user-menu"
+							aria-orientation="vertical"
+							aria-labelledby="user-menu-button"
+							style={{ zIndex: 100 }}
+							className="absolute right-0 mt-3 w-64 origin-top-right
+                            bg-white rounded-xl overflow-hidden shadow-lg
+                            border border-[#E5EDF5]">
+							{/* User Profile Section */}
+							<div
+								className="px-4 py-4 bg-gradient-to-b from-[#F6F9FC] to-white 
+                                border-b border-[#E5EDF5] ">
+								<div className="flex items-center space-x-4">
+									<Avatar
+										src={user?.avatar}
+										name={user?.showname || user?.username}
+										size={40}
+										className="ring-2 ring-white shadow-sm"
+									/>
+									<div className="flex flex-col space-y-0.5">
+										<span className="text-sm font-semibold text-[#00538E]">
+											{user?.showname || user?.username}
+										</span>
+										<span className="text-xs text-[#718096] flex items-center gap-1.5">
+											<span className="w-1.5 h-1.5 rounded-full bg-emerald-500 animate-pulse"></span>
+											在线
+										</span>
+									</div>
+								</div>
+							</div>
+
+							{/* Menu Items */}
+							<div className="p-2">
+								{menuItems.map((item, index) => (
+									<button
+										key={index}
+										role="menuitem"
+										tabIndex={showMenu ? 0 : -1}
+										onClick={(e) => {
+											e.stopPropagation();
+											handleMenuItemClick(item.action);
+										}}
+										className={`flex items-center gap-3 w-full px-4 py-3
+                                        text-sm font-medium rounded-lg transition-all
+                                        focus:outline-none
+                                        focus:ring-2 focus:ring-[#00538E]/20
+                                        group relative overflow-hidden 
+                                        active:scale-[0.99]
+                                        ${
+											item.label === "注销"
+												? "text-[#B22234] hover:bg-red-50/80 hover:text-red-700"
+												: "text-[#00538E] hover:bg-[#E6EEF5] hover:text-[#003F6A]"
+										}`}>
+										<span
+											className={`w-5 h-5 flex items-center justify-center
+                                        transition-all duration-200 ease-in-out
+                                        group-hover:scale-110 group-hover:rotate-6
+                                        group-hover:translate-x-0.5 ${
+											item.label === "注销"
+												? "group-hover:text-red-600"
+												: "group-hover:text-[#003F6A]"
+										}`}>
+											{item.icon}
+										</span>
+										<span>{item.label}</span>
+									</button>
+								))}
+							</div>
+						</motion.div>
+					)}
+				</AnimatePresence>
+			</div>
+			<UserEditModal></UserEditModal>
+		</UserEditorContext.Provider>
+	);
+}
diff --git a/apps/web/src/app/main/layout/UserMenu/types.ts b/apps/web/src/app/main/layout/UserMenu/types.ts
new file mode 100755
index 0000000..dfe4b00
--- /dev/null
+++ b/apps/web/src/app/main/layout/UserMenu/types.ts
@@ -0,0 +1,6 @@
+import React, { ReactNode } from "react";
+export interface MenuItemType {
+	icon: ReactNode;
+	label: string;
+	action: () => void;
+}
diff --git a/apps/web/src/app/main/my-duty-path/components/MyDutyPathContainer.tsx b/apps/web/src/app/main/my-duty-path/components/MyDutyPathContainer.tsx
new file mode 100644
index 0000000..148706e
--- /dev/null
+++ b/apps/web/src/app/main/my-duty-path/components/MyDutyPathContainer.tsx
@@ -0,0 +1,30 @@
+import PostList from "@web/src/components/models/course/list/PostList";
+import { useAuth } from "@web/src/providers/auth-provider";
+import { useMainContext } from "../../layout/MainProvider";
+import { PostType } from "@nice/common";
+import PathCard from "@web/src/components/models/post/SubPost/PathCard";
+
+export default function MyLearningListContainer() {
+	const { user } = useAuth();
+	const { searchCondition, termsCondition } = useMainContext();
+	return (
+		<>
+			<PostList
+				renderItem={(post) => <PathCard post={post}></PathCard>}
+				params={{
+					pageSize: 12,
+					where: {
+						type: PostType.PATH,
+						students: {
+							some: {
+								id: user?.id,
+							},
+						},
+						...termsCondition,
+						...searchCondition,
+					},
+				}}
+				cols={4}></PostList>
+		</>
+	);
+}
diff --git a/apps/web/src/app/main/my-duty-path/page.tsx b/apps/web/src/app/main/my-duty-path/page.tsx
new file mode 100755
index 0000000..24d7931
--- /dev/null
+++ b/apps/web/src/app/main/my-duty-path/page.tsx
@@ -0,0 +1,17 @@
+import { useEffect } from "react";
+import BasePostLayout from "../layout/BasePost/BasePostLayout";
+import { useMainContext } from "../layout/MainProvider";
+import { PostType } from "@nice/common";
+import MyDutyPathContainer from "./components/MyDutyPathContainer";
+
+export default function MyDutyPathPage() {
+	const { setSearchMode } = useMainContext();
+	useEffect(() => {
+		setSearchMode(PostType.PATH);
+	}, [setSearchMode]);
+	return (
+		<BasePostLayout>
+			<MyDutyPathContainer></MyDutyPathContainer>
+		</BasePostLayout>
+	);
+}
diff --git a/apps/web/src/app/main/my-duty/components/MyDutyListContainer.tsx b/apps/web/src/app/main/my-duty/components/MyDutyListContainer.tsx
new file mode 100644
index 0000000..727e828
--- /dev/null
+++ b/apps/web/src/app/main/my-duty/components/MyDutyListContainer.tsx
@@ -0,0 +1,27 @@
+import PostList from "@web/src/components/models/course/list/PostList";
+import { useAuth } from "@web/src/providers/auth-provider";
+import { PostType } from "@nice/common";
+import { useMainContext } from "../../layout/MainProvider";
+import PostCard from "@web/src/components/models/post/PostCard";
+import CourseCard from "@web/src/components/models/post/SubPost/CourseCard";
+
+export default function MyDutyListContainer() {
+	const { user } = useAuth();
+	const { searchCondition, termsCondition } = useMainContext();
+	return (
+		<>
+			<PostList
+				renderItem={(post) => <CourseCard post={post}></CourseCard>}
+				params={{
+					pageSize: 12,
+					where: {
+						type: PostType.COURSE,
+						authorId: user.id,
+						...termsCondition,
+						...searchCondition,
+					},
+				}}
+				cols={4}></PostList>
+		</>
+	);
+}
diff --git a/apps/web/src/app/main/my-duty/page.tsx b/apps/web/src/app/main/my-duty/page.tsx
new file mode 100755
index 0000000..fff4c91
--- /dev/null
+++ b/apps/web/src/app/main/my-duty/page.tsx
@@ -0,0 +1,16 @@
+import BasePostLayout from "../layout/BasePost/BasePostLayout";
+import MyDutyListContainer from "./components/MyDutyListContainer";
+import { useEffect } from "react";
+import { useMainContext } from "../layout/MainProvider";
+import { PostType } from "@nice/common";
+export default function MyDutyPage() {
+	const { setSearchMode } = useMainContext();
+	useEffect(() => {
+		setSearchMode(PostType.COURSE);
+	}, [setSearchMode]);
+	return (
+		<BasePostLayout>
+			<MyDutyListContainer></MyDutyListContainer>
+		</BasePostLayout>
+	);
+}
diff --git a/apps/web/src/app/main/my-learning/components/MyLearningListContainer.tsx b/apps/web/src/app/main/my-learning/components/MyLearningListContainer.tsx
new file mode 100644
index 0000000..be281ae
--- /dev/null
+++ b/apps/web/src/app/main/my-learning/components/MyLearningListContainer.tsx
@@ -0,0 +1,31 @@
+import PostList from "@web/src/components/models/course/list/PostList";
+import { useAuth } from "@web/src/providers/auth-provider";
+import { useMainContext } from "../../layout/MainProvider";
+import { PostType } from "@nice/common";
+import PostCard from "@web/src/components/models/post/PostCard";
+import CourseCard from "@web/src/components/models/post/SubPost/CourseCard";
+
+export default function MyLearningListContainer() {
+	const { user } = useAuth();
+	const { searchCondition, termsCondition } = useMainContext();
+	return (
+		<>
+			<PostList
+				renderItem={(post) => <CourseCard post={post}></CourseCard>}
+				params={{
+					pageSize: 12,
+					where: {
+						type: PostType.COURSE,
+						students: {
+							some: {
+								id: user?.id,
+							},
+						},
+						...termsCondition,
+						...searchCondition,
+					},
+				}}
+				cols={4}></PostList>
+		</>
+	);
+}
diff --git a/apps/web/src/app/main/my-learning/page.tsx b/apps/web/src/app/main/my-learning/page.tsx
new file mode 100755
index 0000000..cee2c94
--- /dev/null
+++ b/apps/web/src/app/main/my-learning/page.tsx
@@ -0,0 +1,17 @@
+import { useEffect } from "react";
+import BasePostLayout from "../layout/BasePost/BasePostLayout";
+import { useMainContext } from "../layout/MainProvider";
+import MyLearningListContainer from "./components/MyLearningListContainer";
+import { PostType } from "@nice/common";
+
+export default function MyLearningPage() {
+	const { setSearchMode } = useMainContext();
+	useEffect(() => {
+		setSearchMode(PostType.COURSE);
+	}, [setSearchMode]);
+	return (
+		<BasePostLayout>
+			<MyLearningListContainer></MyLearningListContainer>
+		</BasePostLayout>
+	);
+}
diff --git a/apps/web/src/app/main/my-path/components/MyPathListContainer.tsx b/apps/web/src/app/main/my-path/components/MyPathListContainer.tsx
new file mode 100644
index 0000000..33e0346
--- /dev/null
+++ b/apps/web/src/app/main/my-path/components/MyPathListContainer.tsx
@@ -0,0 +1,28 @@
+import PostList from "@web/src/components/models/course/list/PostList";
+import { useAuth } from "@web/src/providers/auth-provider";
+
+import { PostType } from "@nice/common";
+import { useMainContext } from "../../layout/MainProvider";
+import PostCard from "@web/src/components/models/post/PostCard";
+import PathCard from "@web/src/components/models/post/SubPost/PathCard";
+
+export default function MyPathListContainer() {
+	const { user } = useAuth();
+	const { searchCondition, termsCondition } = useMainContext();
+	return (
+		<>
+			<PostList
+				renderItem={(post) => <PathCard post={post}></PathCard>}
+				params={{
+					pageSize: 12,
+					where: {
+						type: PostType.PATH,
+						authorId: user.id,
+						...termsCondition,
+						...searchCondition,
+					},
+				}}
+				cols={4}></PostList>
+		</>
+	);
+}
diff --git a/apps/web/src/app/main/my-path/page.tsx b/apps/web/src/app/main/my-path/page.tsx
new file mode 100755
index 0000000..81f7298
--- /dev/null
+++ b/apps/web/src/app/main/my-path/page.tsx
@@ -0,0 +1,17 @@
+import { useEffect } from "react";
+import BasePostLayout from "../layout/BasePost/BasePostLayout";
+import { useMainContext } from "../layout/MainProvider";
+import MyPathListContainer from "./components/MyPathListContainer";
+import { PostType } from "@nice/common";
+
+export default function MyPathPage() {
+	const { setSearchMode } = useMainContext();
+	useEffect(() => {
+		setSearchMode(PostType.PATH);
+	}, [setSearchMode]);
+	return (
+		<BasePostLayout>
+			<MyPathListContainer></MyPathListContainer>
+		</BasePostLayout>
+	);
+}
diff --git a/apps/web/src/app/main/path/components/DeptInfo.tsx b/apps/web/src/app/main/path/components/DeptInfo.tsx
new file mode 100644
index 0000000..ed6510b
--- /dev/null
+++ b/apps/web/src/app/main/path/components/DeptInfo.tsx
@@ -0,0 +1,42 @@
+import { BookOutlined, EyeOutlined, TeamOutlined } from "@ant-design/icons";
+import { Typography } from "antd";
+import { PostDto } from "@nice/common";
+
+const { Title, Text } = Typography;
+const DeptInfo = ({ post }: { post: PostDto }) => {
+	return (
+		<div className="gap-1 flex items-center justify-between flex-grow">
+			<div className=" flex justify-start gap-1 items-center">
+				<TeamOutlined className="text-blue-500 text-lg transform group-hover:scale-110 transition-transform duration-300" />
+				{post?.depts && post?.depts?.length > 0 ? (
+					<Text className="font-medium text-blue-500 hover:text-blue-600 transition-colors duration-300 truncate max-w-[120px]">
+						{post?.depts?.length > 1
+							? `${post.depts[0].name}等`
+							: post?.depts?.[0]?.name}
+					</Text>
+				) : (
+					<Text className="font-medium text-blue-500 hover:text-blue-600 transition-colors duration-300 truncate max-w-[120px]">
+						未设置单位
+					</Text>
+				)}
+			</div>
+			{post && (
+				<div className="flex items-center gap-2">
+					<span className="gap-1 text-xs font-medium text-gray-500 flex items-center">
+						浏览量
+						<EyeOutlined />
+						{`${post?.views || 0}`}
+					</span>
+					{post?.studentIds && post?.studentIds?.length > 0 && (
+						<span className="gap-1 text-xs font-medium text-gray-500 flex items-center">
+							<BookOutlined />
+							{`${post?.studentIds?.length || 0}`}
+						</span>
+					)}
+				</div>
+			)}
+		</div>
+	);
+};
+
+export default DeptInfo;
diff --git a/apps/web/src/app/main/path/components/PathListContainer.tsx b/apps/web/src/app/main/path/components/PathListContainer.tsx
new file mode 100755
index 0000000..4e7ade6
--- /dev/null
+++ b/apps/web/src/app/main/path/components/PathListContainer.tsx
@@ -0,0 +1,25 @@
+import PostList from "@web/src/components/models/course/list/PostList";
+import { useMainContext } from "../../layout/MainProvider";
+import { PostType, Prisma } from "@nice/common";
+import PostCard from "@web/src/components/models/post/PostCard";
+import PathCard from "@web/src/components/models/post/SubPost/PathCard";
+
+export function PathListContainer() {
+	const { searchCondition, termsCondition } = useMainContext();
+	return (
+		<>
+			<PostList
+				renderItem={(post) => <PathCard post={post}></PathCard>}
+				params={{
+					pageSize: 12,
+					where: {
+						type: PostType.PATH,
+						...termsCondition,
+						...searchCondition,
+					},
+				}}
+				cols={4}></PostList>
+		</>
+	);
+}
+export default PathListContainer;
diff --git a/apps/web/src/app/main/path/components/TermInfo.tsx b/apps/web/src/app/main/path/components/TermInfo.tsx
new file mode 100644
index 0000000..b26f721
--- /dev/null
+++ b/apps/web/src/app/main/path/components/TermInfo.tsx
@@ -0,0 +1,41 @@
+import { Tag } from "antd";
+import { PostDto, TaxonomySlug, TermDto } from "@nice/common";
+
+const TermInfo = ({ terms = [] }: { terms?: TermDto[] }) => {
+	return (
+		<div>
+			{terms && terms?.length > 0 ? (
+				<div className="flex gap-2 mb-4">
+					{terms?.map((term: any) => {
+						return (
+							<Tag
+								key={term.id}
+								color={
+									term?.taxonomy?.slug ===
+										TaxonomySlug.CATEGORY
+										? "green"
+										: term?.taxonomy?.slug ===
+											TaxonomySlug.LEVEL
+											? "blue"
+											: "orange"
+								}
+								className="px-3 py-1 rounded-full  border-0">
+								{term.name}
+							</Tag>
+						);
+					})}
+				</div>
+			) : (
+				<div className="flex gap-2 mb-4">
+					<Tag
+						color={"orange"}
+						className="px-3 py-1 rounded-full  border-0">
+						{"未设置分类"}
+					</Tag>
+				</div>
+			)}
+		</div>
+	);
+};
+
+export default TermInfo;
diff --git a/apps/web/src/app/main/path/editor/page.tsx b/apps/web/src/app/main/path/editor/page.tsx
new file mode 100755
index 0000000..eaed95d
--- /dev/null
+++ b/apps/web/src/app/main/path/editor/page.tsx
@@ -0,0 +1,10 @@
+import MindEditor from "@web/src/components/common/editor/MindEditor";
+import { useParams } from "react-router-dom";
+
+export default function PathEditorPage() {
+    const { id } = useParams();
+
+    return <div className="">
+        <MindEditor id={id}></MindEditor>
+    </div>
+}
diff --git a/apps/web/src/app/main/path/page.tsx b/apps/web/src/app/main/path/page.tsx
new file mode 100755
index 0000000..65178db
--- /dev/null
+++ b/apps/web/src/app/main/path/page.tsx
@@ -0,0 +1,17 @@
+import { useEffect } from "react";
+import BasePostLayout from "../layout/BasePost/BasePostLayout";
+import { useMainContext } from "../layout/MainProvider";
+import PathListContainer from "./components/PathListContainer";
+import { PostType } from "@nice/common";
+
+export default function PathPage() {
+	const { setSearchMode } = useMainContext();
+	useEffect(() => {
+		setSearchMode(PostType.PATH);
+	}, [setSearchMode]);
+	return (
+		<BasePostLayout>
+			<PathListContainer></PathListContainer>
+		</BasePostLayout>
+	);
+}
diff --git a/apps/web/src/app/main/paths/page.tsx b/apps/web/src/app/main/paths/page.tsx
deleted file mode 100755
index e1283a0..0000000
--- a/apps/web/src/app/main/paths/page.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import MindEditor from "@web/src/components/common/editor/MindEditor";
-
-export default function PathsPage() {
-	return <MindEditor></MindEditor>;
-}
diff --git a/apps/web/src/app/main/search/components/SearchContainer.tsx b/apps/web/src/app/main/search/components/SearchContainer.tsx
new file mode 100644
index 0000000..292d9b5
--- /dev/null
+++ b/apps/web/src/app/main/search/components/SearchContainer.tsx
@@ -0,0 +1,33 @@
+import PostList from "@web/src/components/models/course/list/PostList";
+import { useMainContext } from "../../layout/MainProvider";
+import PostCard from "@web/src/components/models/post/PostCard";
+import { PostType } from "@nice/common";
+import CourseCard from "@web/src/components/models/post/SubPost/CourseCard";
+import PathCard from "@web/src/components/models/post/SubPost/PathCard";
+const POST_TYPE_COMPONENTS = {
+	[PostType.COURSE]: CourseCard,
+	[PostType.PATH]: PathCard,
+};
+export default function SearchListContainer() {
+	const { searchCondition, termsCondition, searchMode } = useMainContext();
+
+	return (
+		<>
+			<PostList
+				renderItem={(post) => {
+					const Component =
+						POST_TYPE_COMPONENTS[post.type] || PostCard;
+					return <Component post={post} />;
+				}}
+				params={{
+					pageSize: 12,
+					where: {
+						type: searchMode === "both" ? undefined : searchMode,
+						...termsCondition,
+						...searchCondition,
+					},
+				}}
+				cols={4}></PostList>
+		</>
+	);
+}
diff --git a/apps/web/src/app/main/search/page.tsx b/apps/web/src/app/main/search/page.tsx
new file mode 100755
index 0000000..cfb6153
--- /dev/null
+++ b/apps/web/src/app/main/search/page.tsx
@@ -0,0 +1,20 @@
+import { useEffect } from "react";
+import BasePostLayout from "../layout/BasePost/BasePostLayout";
+import SearchListContainer from "./components/SearchContainer";
+import { useMainContext } from "../layout/MainProvider";
+
+export default function SearchPage() {
+	const { setShowSearchMode, setSearchValue } = useMainContext();
+	useEffect(() => {
+		setShowSearchMode(true);
+		return () => {
+			setShowSearchMode(false);
+			setSearchValue("");
+		};
+	}, [setShowSearchMode]);
+	return (
+		<BasePostLayout>
+			<SearchListContainer></SearchListContainer>
+		</BasePostLayout>
+	);
+}
diff --git a/apps/web/src/components/common/container/CollapsibleContent.tsx b/apps/web/src/components/common/container/CollapsibleContent.tsx
index 6d1ea96..7480439 100755
--- a/apps/web/src/components/common/container/CollapsibleContent.tsx
+++ b/apps/web/src/components/common/container/CollapsibleContent.tsx
@@ -1,52 +1,27 @@
-import React, { useRef, useState } from "react";
-
+import React, { useEffect, useRef, useState } from "react";
+import Quill from "quill";
+import "quill/dist/quill.snow.css"; // 引入默认样式
 interface CollapsibleContentProps {
 	content: string;
 	maxHeight?: number;
 }
 
-const CollapsibleContent: React.FC<CollapsibleContentProps> = ({
-	content,
-	maxHeight = 150,
-}) => {
-	const contentWrapperRef = useRef<HTMLDivElement>(null);
-	const [isExpanded, setIsExpanded] = useState(false);
-
-	// Determine if content needs to be collapsed
-	const shouldCollapse = contentWrapperRef.current
-		? contentWrapperRef.current.scrollHeight > maxHeight
-		: false;
-
+const CollapsibleContent: React.FC<CollapsibleContentProps> = ({ content }) => {
+	const contentWrapperRef = useRef(null);
 	return (
-		<div>
-			<div
-				ref={contentWrapperRef}
-				className={`duration-300 ${
-					shouldCollapse && !isExpanded
-						? `max-h-[${maxHeight}px] overflow-hidden relative`
-						: ""
-				}`}>
-				<div
-					className="ql-editor p-0 space-y-1 leading-relaxed"
-					dangerouslySetInnerHTML={{
-						__html: content || "",
-					}}
-				/>
-
-				{/* Gradient overlay */}
-				{shouldCollapse && !isExpanded && (
-					<div className="absolute bottom-0 left-0 right-0 h-20 bg-gradient-to-t from-white to-transparent" />
-				)}
+		<div className=" text-base ">
+			<div className=" flex flex-col gap-4    transition-all duration-300 ease-in-out rounded-xl p-6 ">
+				{/* 包装整个内容区域的容器 */}
+				<div ref={contentWrapperRef}>
+					{/* 内容区域 */}
+					<div
+						className="ql-editor p-0 space-y-1 leading-relaxed"
+						dangerouslySetInnerHTML={{
+							__html: content || "",
+						}}
+					/>
+				</div>
 			</div>
-
-			{/* Expand/Collapse button */}
-			{shouldCollapse && (
-				<button
-					onClick={() => setIsExpanded(!isExpanded)}
-					className="mt-2 text-blue-500 hover:text-blue-700">
-					{isExpanded ? "收起" : "展开"}
-				</button>
-			)}
 		</div>
 	);
 };
diff --git a/apps/web/src/components/common/editor/MindEditor.tsx b/apps/web/src/components/common/editor/MindEditor.tsx
index 732cfae..dfcff70 100755
--- a/apps/web/src/components/common/editor/MindEditor.tsx
+++ b/apps/web/src/components/common/editor/MindEditor.tsx
@@ -1,26 +1,241 @@
+import { Button, Empty, Form, Spin } from "antd";
+import NodeMenu from "./NodeMenu";
+import { api, usePost, useVisitor } from "@nice/client";
+import {
+	ObjectType,
+	PathDto,
+	postDetailSelect,
+	PostType,
+	Prisma,
+	RolePerms,
+	VisitType,
+} from "@nice/common";
+import TermSelect from "../../models/term/term-select";
+import DepartmentSelect from "../../models/department/department-select";
+import { useEffect, useMemo, useRef, useState } from "react";
+import toast from "react-hot-toast";
 import { MindElixirInstance } from "mind-elixir";
-import { useRef, useEffect } from "react";
 import MindElixir from "mind-elixir";
-
-export default function MindEditor() {
-	const me = useRef<MindElixirInstance>();
+import { useTusUpload } from "@web/src/hooks/useTusUpload";
+import { useNavigate } from "react-router-dom";
+import { useAuth } from "@web/src/providers/auth-provider";
+import { MIND_OPTIONS } from "./constant";
+import { SaveOutlined } from "@ant-design/icons";
+export default function MindEditor({ id }: { id?: string }) {
+	const containerRef = useRef<HTMLDivElement>(null);
+	const [instance, setInstance] = useState<MindElixirInstance | null>(null);
+	const { isAuthenticated, user, hasSomePermissions } = useAuth();
+	const { read } = useVisitor();
+	const { data: post, isLoading }: { data: PathDto; isLoading: boolean } =
+		api.post.findFirst.useQuery(
+			{
+				where: {
+					id,
+				},
+				select: postDetailSelect,
+			},
+			{ enabled: Boolean(id) }
+		);
+	const canEdit: boolean = useMemo(() => {
+		const isAuth = isAuthenticated && user?.id === post?.author?.id;
+		return !!id || isAuth || hasSomePermissions(RolePerms.MANAGE_ANY_POST);
+	}, [user]);
+	const navigate = useNavigate();
+	const { create, update } = usePost();
+	const { data: taxonomies } = api.taxonomy.getAll.useQuery({
+		type: ObjectType.COURSE,
+	});
+	const { handleFileUpload } = useTusUpload();
+	const [form] = Form.useForm();
 	useEffect(() => {
-		const instance = new MindElixir({
-			el: "#map",
-			direction: MindElixir.SIDE,
-			draggable: true, // default true
-			contextMenu: true, // default true
-			toolBar: true, // default true
-			nodeMenu: true, // default true
-			keypress: true, // default true
+		if (post?.id && id) {
+			read.mutateAsync({
+				data: {
+					visitorId: user?.id || null,
+					postId: post?.id,
+					type: VisitType.READED,
+				},
+			});
+		}
+	}, [post]);
+	useEffect(() => {
+		if (post && form && instance && id) {
+			instance.refresh((post as any).meta);
+			const deptIds = (post?.depts || [])?.map((dept) => dept.id);
+			const formData = {
+				title: post.title,
+				deptIds: deptIds,
+			};
+			post.terms?.forEach((term) => {
+				formData[term.taxonomyId] = term.id; // 假设 taxonomyName是您在 Form.Item 中使用的name
+			});
+			form.setFieldsValue(formData);
+		}
+	}, [post, form, instance, id]);
+	useEffect(() => {
+		if (!containerRef.current) return;
+		const mind = new MindElixir({
+			...MIND_OPTIONS,
+			el: containerRef.current,
+			before: {
+				beginEdit() {
+					return canEdit;
+				},
+			},
+			draggable: canEdit, // 禁用拖拽
+			contextMenu: canEdit, // 禁用右键菜单
+			toolBar: canEdit, // 禁用工具栏
+			nodeMenu: canEdit, // 禁用节点右键菜单
+			keypress: canEdit, // 禁用键盘快捷键
 		});
-		// instance.install(NodeMenu);
-		instance.init(MindElixir.new("新主题"));
-		me.current = instance;
+		mind.init(MindElixir.new("新思维导图"));
+		containerRef.current.hidden = true;
+		//挂载实例
+		setInstance(mind);
+	}, [canEdit]);
+	useEffect(() => {
+		if ((!id || post) && instance) {
+			containerRef.current.hidden = false;
+			instance.toCenter();
+			if (post?.meta?.nodeData) {
+				instance.refresh(post?.meta);
+			}
+		}
+	}, [id, post, instance]);
+	//保存 按钮 函数
+	const handleSave = async () => {
+		if (!instance) return;
+		const values = form.getFieldsValue();
+		//以图片格式导出思维导图以作为思维导图封面
+		const imgBlob = await instance?.exportPng();
+		handleFileUpload(
+			imgBlob,
+			async (result) => {
+				const termIds = taxonomies
+					.map((tax) => values[tax.id])
+					.filter((id) => id);
+				const deptIds = (values?.deptIds || []) as string[];
+				const { theme, ...data } = instance.getData();
+				try {
+					if (post && id) {
+						const params: Prisma.PostUpdateArgs = {
+							where: {
+								id,
+							},
+							data: {
+								title: data.nodeData.topic,
+								meta: {
+									...data,
+									thumbnail: result.compressedUrl,
+								},
+								terms: {
+									set: termIds.map((id) => ({ id })),
+								},
+								depts: {
+									set: deptIds.map((id) => ({ id })),
+								},
+								updatedAt: new Date(),
+							},
+						};
+						await update.mutateAsync(params);
+						toast.success("更新成功");
+					} else {
+						const params: Prisma.PostCreateInput = {
+							type: PostType.PATH,
+							title: data.nodeData.topic,
+							meta: { ...data, thumbnail: result.compressedUrl },
+							terms: {
+								connect: termIds.map((id) => ({ id })),
+							},
+							depts: {
+								connect: deptIds.map((id) => ({ id })),
+							},
+							updatedAt: new Date(),
+						};
+
+						const res = await create.mutateAsync({ data: params });
+						navigate(`/path/editor/${res.id}`, { replace: true });
+						toast.success("创建成功");
+					}
+				} catch (error) {
+					toast.error("保存失败");
+					throw error;
+				}
+				console.log(result);
+			},
+			(error) => {},
+			`mind-thumb-${new Date().toString()}`
+		);
+	};
+	useEffect(() => {
+		containerRef.current.style.height = `${Math.floor(window.innerHeight - 271)}px`;
 	}, []);
+
 	return (
-		<div>
-			<div id="map" style={{ width: "100%" }} />
+		<div className={` flex-col  flex `}>
+			{canEdit && taxonomies && (
+				<Form form={form} className=" bg-white p-4 border-b">
+					<div className="flex items-center   justify-between gap-4">
+						<div className="flex items-center gap-4">
+							{taxonomies.map((tax, index) => (
+								<Form.Item
+									key={tax.id}
+									name={tax.id}
+									// rules={[{ required: true }]}
+									noStyle>
+									<TermSelect
+										disabled={!canEdit}
+										className=" w-48"
+										placeholder={`请选择${tax.name}`}
+										taxonomyId={tax.id}
+									/>
+								</Form.Item>
+							))}
+							<Form.Item
+								// rules={[{ required: true }]}
+								name="deptIds"
+								noStyle>
+								<DepartmentSelect
+									disabled={!canEdit}
+									className="w-96"
+									placeholder="请选择制作单位"
+									multiple
+								/>
+							</Form.Item>
+						</div>
+						{canEdit && (
+							<Button
+								ghost
+								type="primary"
+								icon={<SaveOutlined></SaveOutlined>}
+								onSubmit={(e) => e.preventDefault()}
+								onClick={handleSave}>
+								{id ? "更新" : "保存"}
+							</Button>
+						)}
+					</div>
+				</Form>
+			)}
+			<div
+				ref={containerRef}
+				className="w-full"
+				onContextMenu={(e) => e.preventDefault()}
+			/>
+			{canEdit && instance && <NodeMenu mind={instance} />}
+			{isLoading && (
+				<div
+					className="py-64 justify-center flex"
+					style={{ height: "calc(100vh - 271px)" }}>
+					<Spin size="large"></Spin>
+				</div>
+			)}
+			{!post && id && !isLoading && (
+				<div
+					className="py-64"
+					style={{ height: "calc(100vh - 271px)" }}>
+					<Empty></Empty>
+				</div>
+			)}
 		</div>
 	);
-}
+}
\ No newline at end of file
diff --git a/apps/web/src/components/common/editor/NodeMenu.tsx b/apps/web/src/components/common/editor/NodeMenu.tsx
new file mode 100755
index 0000000..7ad908e
--- /dev/null
+++ b/apps/web/src/components/common/editor/NodeMenu.tsx
@@ -0,0 +1,196 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Input, Button, ColorPicker, Select } from 'antd';
+import {
+  FontSizeOutlined,
+  BoldOutlined,
+  LinkOutlined,
+} from '@ant-design/icons';
+import type { MindElixirInstance, NodeObj } from 'mind-elixir';
+
+const xmindColorPresets = [
+  // 经典16色
+  '#FFFFFF', '#F5F5F5', // 白色系
+  '#2196F3', '#1976D2', // 蓝色系
+  '#4CAF50', '#388E3C', // 绿色系
+  '#FF9800', '#F57C00', // 橙色系
+  '#F44336', '#D32F2F', // 红色系
+  '#9C27B0', '#7B1FA2', // 紫色系
+  '#424242', '#757575', // 灰色系
+  '#FFEB3B', '#FBC02D'  // 黄色系
+];
+
+interface NodeMenuProps {
+  mind: MindElixirInstance;
+}
+
+//管理节点样式状态
+const NodeMenu: React.FC<NodeMenuProps> = ({ mind }) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const [selectedFontColor, setSelectedFontColor] = useState<string>('');
+  const [selectedBgColor, setSelectedBgColor] = useState<string>('');
+  const [selectedSize, setSelectedSize] = useState<string>('');
+  const [isBold, setIsBold] = useState(false);
+  const [url, setUrl] = useState<string>('');
+  const containerRef = useRef<HTMLDivElement | null>(null);
+
+
+  //监听思维导图节点选择事件，更新节点菜单状态
+  useEffect(() => {
+    const handleSelectNode = (nodeObj: NodeObj) => {
+      setIsOpen(true);
+      const style = nodeObj.style || {};
+      setSelectedFontColor(style.color || '');
+      setSelectedBgColor(style.background || '');
+      setSelectedSize(style.fontSize || '24');
+      setIsBold(style.fontWeight === 'bold');
+      setUrl(nodeObj.hyperLink || '');
+    };
+    const handleUnselectNode = () => {
+      setIsOpen(false);
+    };
+    mind.bus.addListener('selectNode', handleSelectNode);
+    mind.bus.addListener('unselectNode', handleUnselectNode);
+  }, [mind]);
+
+  useEffect(() => {
+    if (containerRef.current && mind.container) {
+      mind.container.appendChild(containerRef.current);
+    }
+
+  }, [mind.container]);
+
+  const handleColorChange = (type: "font" | "background", color: string) => {
+    if (type === 'font') {
+      setSelectedFontColor(color);
+    } else {
+      setSelectedBgColor(color);
+    }
+    const patch = { style: {} as any };
+    if (type === 'font') {
+      patch.style.color = color;
+    } else {
+      patch.style.background = color;
+    }
+    mind.reshapeNode(mind.currentNode, patch);
+  };
+
+  const handleSizeChange = (size: string) => {
+    setSelectedSize(size);
+    mind.reshapeNode(mind.currentNode, { style: { fontSize: size } });
+  };
+
+  const handleBoldToggle = () => {
+    const fontWeight = isBold ? '' : 'bold';
+    setIsBold(!isBold);
+    mind.reshapeNode(mind.currentNode, { style: { fontWeight } });
+  };
+
+  const handleUrlChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const value = e.target.value;
+    setUrl(value);
+    mind.reshapeNode(mind.currentNode, { hyperLink: value });
+  };
+
+  return (
+    <div
+      className={`node-menu-container absolute right-2 top-2 rounded-lg bg-slate-200 shadow-xl ring-2 ring-white transition-all duration-300 ${isOpen ? 'opacity-100 translate-y-0' : 'opacity-0 translate-y-4 pointer-events-none'
+        }`}
+      ref={containerRef}
+    >
+      <div className="p-5 space-y-6">
+        {/* Font Size Selector */}
+        <div className="space-y-2">
+          <h3 className="text-sm font-medium text-gray-600">文字样式</h3>
+          <div className="flex gap-3 items-center justify-between">
+            <Select
+              value={selectedSize}
+              onChange={handleSizeChange}
+              prefix={<FontSizeOutlined className='mr-2' />}
+              className="w-1/2"
+              options={[
+                { value: '12', label: '12' },
+                { value: '14', label: '14' },
+                { value: '16', label: '16' },
+                { value: '18', label: '18' },
+                { value: '20', label: '20' },
+                { value: '24', label: '24' },
+                { value: '28', label: '28' },
+                { value: '32', label: '32' }
+              ]}
+            />
+            <Button
+              type={isBold ? "primary" : "default"}
+              onClick={handleBoldToggle}
+              className='w-1/2'
+              icon={<BoldOutlined />}
+            >
+
+              加粗
+            </Button>
+          </div>
+        </div>
+
+        {/* Color Picker */}
+        <div className="space-y-3">
+          <h3 className="text-sm font-medium text-gray-600">颜色设置</h3>
+
+          {/* Font Color Picker */}
+          <div className="space-y-2">
+            <h4 className="text-xs font-medium text-gray-500">文字颜色</h4>
+            <div className="grid grid-cols-8 gap-2 p-2 bg-gray-50 rounded-lg">
+              {xmindColorPresets.map((color) => (
+                <div
+                  key={`font-${color}`}
+                  className={`w-6 h-6 rounded-full cursor-pointer hover:scale-105 transition-transform outline outline-2 outline-offset-1 ${selectedFontColor === color ? 'outline-blue-500' : 'outline-transparent'
+                    }`}
+                  style={{ backgroundColor: color }}
+                  onClick={() => {
+
+                    handleColorChange('font', color);
+                  }}
+                />
+              ))}
+            </div>
+          </div>
+
+          {/* Background Color Picker */}
+          <div className="space-y-2">
+            <h4 className="text-xs font-medium text-gray-500">背景颜色</h4>
+            <div className="grid grid-cols-8 gap-2 p-2 bg-gray-50 rounded-lg">
+              {xmindColorPresets.map((color) => (
+                <div
+                  key={`bg-${color}`}
+                  className={`w-6 h-6 rounded-full cursor-pointer hover:scale-105 transition-transform outline outline-2 outline-offset-1 ${selectedBgColor === color ? 'outline-blue-500' : 'outline-transparent'
+                    }`}
+                  style={{ backgroundColor: color }}
+                  onClick={() => {
+                    handleColorChange('background', color);
+                  }}
+                />
+              ))}
+            </div>
+          </div>
+        </div>
+
+        <h3 className="text-sm font-medium text-gray-600">关联链接</h3>
+        {/* URL Input */}
+        <div className="space-y-1">
+          <Input
+            placeholder="例如：https://example.com"
+            value={url}
+            onChange={handleUrlChange}
+            addonBefore={<LinkOutlined />}
+          />
+          {url && !/^https?:\/\/\S+$/.test(url) && (
+            <p className="text-xs text-red-500">请输入有效的URL地址</p>
+          )}
+        </div>
+        <div className="space-y-2">
+          <>wojiao</>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default NodeMenu;
\ No newline at end of file
diff --git a/apps/web/src/components/common/editor/constant.ts b/apps/web/src/components/common/editor/constant.ts
new file mode 100644
index 0000000..29e6890
--- /dev/null
+++ b/apps/web/src/components/common/editor/constant.ts
@@ -0,0 +1,34 @@
+import MindElixir from "mind-elixir";
+export const MIND_OPTIONS = {
+	direction: MindElixir.SIDE,
+	draggable: true,
+	contextMenu: true,
+	toolBar: true,
+	nodeMenu: true,
+	keypress: true,
+	locale: "zh_CN" as const,
+	theme: {
+		name: "Latte",
+		palette: [
+			"#dd7878",
+			"#ea76cb",
+			"#8839ef",
+			"#e64553",
+			"#fe640b",
+			"#df8e1d",
+			"#40a02b",
+			"#209fb5",
+			"#1e66f5",
+			"#7287fd",
+		],
+		cssVar: {
+			"--main-color": "#444446",
+			"--main-bgcolor": "#ffffff",
+			"--color": "#777777",
+			"--bgcolor": "#f6f6f6",
+			"--panel-color": "#444446",
+			"--panel-bgcolor": "#ffffff",
+			"--panel-border-color": "#eaeaea",
+		},
+	},
+};
diff --git a/apps/web/src/components/common/editor/quill/constants.ts b/apps/web/src/components/common/editor/quill/constants.ts
index d47f27b..fd92bd1 100755
--- a/apps/web/src/components/common/editor/quill/constants.ts
+++ b/apps/web/src/components/common/editor/quill/constants.ts
@@ -1,11 +1,11 @@
 export const defaultModules = {
-    toolbar: [
-        [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
-        ['bold', 'italic', 'underline', 'strike'],
-        [{ 'list': 'ordered' }, { 'list': 'bullet' }],
-        [{ 'color': [] }, { 'background': [] }],
-        [{ 'align': [] }],
-        ['link', 'image'],
-        ['clean']
-    ]
-};
\ No newline at end of file
+	toolbar: [
+		[{ header: [1, 2, 3, 4, 5, 6, false] }],
+		["bold", "italic", "underline", "strike"],
+		[{ list: "ordered" }, { list: "bullet" }],
+		[{ color: [] }, { background: [] }],
+		[{ align: [] }],
+		["link"],
+		["clean"],
+	],
+};
diff --git a/apps/web/src/components/common/editor/types.ts b/apps/web/src/components/common/editor/types.ts
new file mode 100755
index 0000000..3810ba7
--- /dev/null
+++ b/apps/web/src/components/common/editor/types.ts
@@ -0,0 +1,14 @@
+import { MindElixirInstance, MindElixirData } from 'mind-elixir';
+import { PostType, ObjectType } from '@nice/common';
+
+export interface MindEditorProps {
+  initialData?: MindElixirData;
+  onSave?: (data: MindElixirData) => Promise<void>;
+  taxonomyType?: ObjectType;
+}
+
+export interface MindEditorState {
+  instance: MindElixirInstance | null;
+  isSaving: boolean;
+  error: Error | null;
+}
diff --git a/apps/web/src/components/common/input/InputList.tsx b/apps/web/src/components/common/input/InputList.tsx
index f6247d5..b0964a5 100755
--- a/apps/web/src/components/common/input/InputList.tsx
+++ b/apps/web/src/components/common/input/InputList.tsx
@@ -1,22 +1,29 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Input, Button } from "antd";
 import { DeleteOutlined } from "@ant-design/icons";
 
 interface InputListProps {
-	initialValue?: string[];
+	value?: string[];
 	onChange?: (value: string[]) => void;
 	placeholder?: string;
 }
 
 const InputList: React.FC<InputListProps> = ({
-	initialValue,
+	value,
 	onChange,
 	placeholder = "请输入内容",
 }) => {
 	// Internal state management with fallback to initial value or empty array
-	const [inputValues, setInputValues] = useState<string[]>(
-		initialValue && initialValue.length > 0 ? initialValue : [""]
-	);
+	const [inputValues, setInputValues] = useState<string[]>([""]);
+
+	// Update inputValues when value changes
+	useEffect(() => {
+		if (value && value.length > 0) {
+			setInputValues(value);
+		} else {
+			setInputValues([""]);
+		}
+	}, [value]);
 
 	// Handle individual input value change
 	const handleInputChange = (index: number, newValue: string) => {
diff --git a/apps/web/src/components/common/uploader/AvatarUploader.tsx b/apps/web/src/components/common/uploader/AvatarUploader.tsx
index d4077f3..33246c8 100755
--- a/apps/web/src/components/common/uploader/AvatarUploader.tsx
+++ b/apps/web/src/components/common/uploader/AvatarUploader.tsx
@@ -12,6 +12,8 @@ export interface AvatarUploaderProps {
 	onChange?: (value: string) => void;
 	compressed?: boolean;
 	style?: React.CSSProperties; // 添加style属性
+	successText?: string;
+	showCover?: boolean;
 }
 
 interface UploadingFile {
@@ -31,12 +33,14 @@ const AvatarUploader: React.FC<AvatarUploaderProps> = ({
 	className,
 	placeholder = "点击上传",
 	style, // 解构style属性
+	successText = "上传成功",
+	showCover = true,
 }) => {
 	const { handleFileUpload, uploadProgress } = useTusUpload();
 	const [file, setFile] = useState<UploadingFile | null>(null);
 	const avatarRef = useRef<HTMLImageElement>(null);
 	const [previewUrl, setPreviewUrl] = useState<string>(value || "");
-
+	const [imageSrc, setImageSrc] = useState(value);
 	const [compressedUrl, setCompressedUrl] = useState<string>(value || "");
 	const [url, setUrl] = useState<string>(value || "");
 	const [uploading, setUploading] = useState(false);
@@ -44,7 +48,11 @@ const AvatarUploader: React.FC<AvatarUploaderProps> = ({
 	// 在组件中定义 key 状态
 	const [avatarKey, setAvatarKey] = useState(0);
 	const { token } = theme.useToken();
-
+	useEffect(() => {
+		if (!previewUrl || previewUrl?.length < 1) {
+			setPreviewUrl(value || "");
+		}
+	}, [value]);
 	const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
 		const selectedFile = event.target.files?.[0];
 		if (!selectedFile) return;
@@ -88,12 +96,12 @@ const AvatarUploader: React.FC<AvatarUploaderProps> = ({
 			// 使用 resolved 的最新值调用 onChange
 			// 强制刷新 Avatar 组件
 			setAvatarKey((prev) => prev + 1); // 修改 key 强制重新挂载
-			onChange?.(uploadedUrl);
 			console.log(uploadedUrl);
-			toast.success("头像上传成功");
+			onChange?.(uploadedUrl);
+			toast.success(successText);
 		} catch (error) {
 			console.error("上传错误:", error);
-			toast.error("头像上传失败");
+			toast.error("上传失败");
 			setFile((prev) => ({ ...prev!, status: "error" }));
 		} finally {
 			setUploading(false);
@@ -120,12 +128,20 @@ const AvatarUploader: React.FC<AvatarUploaderProps> = ({
 				accept="image/*"
 				style={{ display: "none" }}
 			/>
-			{previewUrl ? (
+			{(previewUrl && showCover) ? (
 				<Avatar
 					key={avatarKey}
 					ref={avatarRef}
 					src={previewUrl}
 					shape="square"
+					onError={() => {
+						if (value && previewUrl && imageSrc === value) {
+							// 当原始图片（value）加载失败时，切换到 previewUrl
+							setImageSrc(previewUrl);
+							return true; // 阻止默认的 fallback 行为，让它尝试新设置的 src
+						}
+						return false; // 如果 previewUrl 也失败了，显示默认头像
+					}}
 					className="w-full h-full object-cover"
 				/>
 			) : (
diff --git a/apps/web/src/components/common/uploader/MultiAvatarUploader.tsx b/apps/web/src/components/common/uploader/MultiAvatarUploader.tsx
new file mode 100755
index 0000000..bf324ea
--- /dev/null
+++ b/apps/web/src/components/common/uploader/MultiAvatarUploader.tsx
@@ -0,0 +1,100 @@
+import React, { useEffect, useState } from "react";
+import { Upload, Progress, Button, Image, Form } from "antd";
+import { DeleteOutlined } from "@ant-design/icons";
+import AvatarUploader from "./AvatarUploader";
+import { isEqual } from "lodash";
+
+interface MultiAvatarUploaderProps {
+	value?: string[];
+	onChange?: (value: string[]) => void;
+	className?: string;
+	placeholder?: string;
+	style?: React.CSSProperties;
+}
+
+export function MultiAvatarUploader({
+	value,
+	onChange,
+	className,
+	style,
+	placeholder = "点击上传",
+}: MultiAvatarUploaderProps) {
+	const [imageList, setImageList] = useState<string[]>(value || []);
+	const [previewImage, setPreviewImage] = useState<string>("");
+	useEffect(() => {
+		if (!isEqual(value, imageList)) {
+			setImageList(value || []);
+		}
+	}, [value]);
+	useEffect(() => {
+		onChange?.(imageList);
+	}, [imageList]);
+	return (
+		<>
+			<div className="flex gap-2 mb-2" style={{ width: "1200px" }}>
+				{(imageList || [])?.map((image, index) => {
+					return (
+						<div
+							className={`mr-2px relative ${className}`}
+							key={index}
+							style={{
+								width: "100px",
+								height: "100px",
+								...style,
+							}}>
+							<Image
+								alt=""
+								className={className}
+								style={{
+									width: "100px",
+									height: "100px",
+									...style,
+								}}
+								src={image}
+								preview={{
+									visible: previewImage === image,
+									onVisibleChange: (visible) =>
+										setPreviewImage(
+											visible ? image || "" : ""
+										),
+								}}></Image>
+							<Button
+								type="text"
+								danger
+								icon={<DeleteOutlined className="text-red" />}
+								onClick={() =>
+									image &&
+									setImageList(
+										imageList.filter((_, i) => i !== index)
+									)
+								}
+								style={{
+									position: "absolute", // 绝对定位
+									top: "0", // 顶部对齐
+									right: "0", // 右侧对齐
+									zIndex: 1, // 确保按钮在图片上方
+									padding: "4px", // 调整按钮内边距
+									backgroundColor: "rgba(255, 255, 255, 0.2)", // 半透明背景
+									borderRadius: "50%", // 圆形按钮
+								}}
+							/>
+						</div>
+					);
+				})}
+			</div>
+			<div className="flex">
+				<AvatarUploader
+					style={style}
+					className={className}
+					showCover={false}
+					placeholder={placeholder}
+					successText={"轮播图上传成功"}
+					onChange={(value) => {
+						console.log(value);
+						setImageList([...imageList, value]);
+					}}></AvatarUploader>
+			</div>
+		</>
+	);
+}
+export default MultiAvatarUploader;
diff --git a/apps/web/src/components/common/uploader/ResourceShower.tsx b/apps/web/src/components/common/uploader/ResourceShower.tsx
new file mode 100755
index 0000000..e1e1e01
--- /dev/null
+++ b/apps/web/src/components/common/uploader/ResourceShower.tsx
@@ -0,0 +1,136 @@
+import React, { useMemo } from "react";
+import { Image, Button, Row, Col, Tooltip } from "antd";
+import { ResourceDto } from "@nice/common";
+import { env } from "@web/src/env";
+import { getFileIcon } from "./utils";
+import { formatFileSize, getCompressedImageUrl } from "@nice/utils";
+
+export default function ResourcesShower({
+	resources = [],
+}: {
+	resources: ResourceDto[];
+}) {
+	const { resources: dealedResources } = useMemo(() => {
+		if (!resources) return { resources: [] };
+
+		const isImage = (url: string) =>
+			/\.(png|jpg|jpeg|gif|webp)$/i.test(url);
+
+		const sortedResources = resources
+			.map((resource) => {
+				const original = `http://${env.SERVER_IP}:${env.FILE_PORT}/uploads/${resource.url}`;
+				const isImg = isImage(resource.url);
+				return {
+					...resource,
+					url: isImg ? getCompressedImageUrl(original) : original,
+					originalUrl: original,
+					isImage: isImg,
+				};
+			})
+			.sort((a, b) => (a.isImage === b.isImage ? 0 : a.isImage ? -1 : 1));
+
+		return { resources: sortedResources };
+	}, [resources]);
+
+	const imageResources = dealedResources.filter((res) => res.isImage);
+	const fileResources = dealedResources.filter((res) => !res.isImage);
+	return (
+		<div className="space-y-3">
+			{imageResources.length > 0 && (
+				<Row gutter={[16, 16]} className="mb-6">
+					<Image.PreviewGroup>
+						{imageResources.map((resource) => (
+							<Col
+								key={resource.url}
+								xs={12}
+								sm={8}
+								md={6}
+								lg={6}
+								xl={4}
+								className="relative">
+								<div className="relative aspect-square rounded-lg overflow-hidden  bg-gray-100">
+									<div className="w-full h-full">
+										<Image
+											src={resource.url}
+											alt={resource.title}
+											preview={{
+												src: resource.originalUrl,
+												mask: (
+													<div className="flex items-center justify-center text-white">
+														点击预览
+													</div>
+												),
+											}}
+											style={{
+												position: "absolute",
+												inset: 0,
+												width: "100%",
+												height: "100%",
+												objectFit: "cover",
+											}}
+											rootClassName="w-full h-full"
+										/>
+									</div>
+									{resource.title && (
+										<div className="absolute bottom-0 left-0 right-0 p-3 bg-gradient-to-t from-black/60 to-transparent text-white text-sm truncate">
+											{resource.title}
+										</div>
+									)}
+								</div>
+							</Col>
+						))}
+					</Image.PreviewGroup>
+				</Row>
+			)}
+			<div className=" text-sm px-2">附件:</div>
+			{fileResources.length > 0 && (
+				<div className="rounded-xl p-1 border border-gray-100 bg-white">
+					<div className="flex flex-nowrap overflow-x-auto scrollbar-hide gap-1.5">
+						{fileResources.map((resource) => {
+							return (
+								<a
+									key={resource.url}
+									className="flex-shrink-0 relative active:scale-95 transition-transform select-none "
+									href={resource.originalUrl}
+									target="_blank"
+									download={true}
+									title="点击下载文件">
+									{/* 超紧凑卡片容器 */}
+									<div className="w-[120px] h-[80px] p-2 flex flex-col items-center justify-between  rounded-xl  hover:bg-primary-50/40 cursor-pointer">
+										{/* 微型文件图标 */}
+										<div className="text-primary-600 text-base">
+											{getFileIcon(resource.url)}
+										</div>
+
+										{/* 压缩信息展示 */}
+										<div className="w-full text-center space-y-0.5">
+											<p className="text-xs font-medium text-gray-800 truncate">
+												{resource.title?.slice(0, 12) ||
+													"未命名"}
+											</p>
+											<div className="flex items-center justify-between text-xs text-gray-500 ">
+												<span className="bg-gray-100 px-0.5 rounded-sm mr-2 whitespace-pre-wrap">
+													{resource.url
+														.split(".")
+														.pop()
+														?.slice(0, 4)
+														.toUpperCase()}
+												</span>
+												<span className="flex  bg-gray-100 px-0.5 rounded-sm justify-items-center whitespace-pre-wrap">
+													{resource.meta.size &&
+														formatFileSize(
+															resource.meta.size
+														)}
+												</span>
+											</div>
+										</div>
+									</div>
+								</a>
+							);
+						})}
+					</div>
+				</div>
+			)}
+		</div>
+	);
+}
diff --git a/apps/web/src/components/common/uploader/TusUploader.tsx b/apps/web/src/components/common/uploader/TusUploader.tsx
index e9fa45b..17e2685 100755
--- a/apps/web/src/components/common/uploader/TusUploader.tsx
+++ b/apps/web/src/components/common/uploader/TusUploader.tsx
@@ -11,6 +11,7 @@ export interface TusUploaderProps {
 	value?: string[];
 	onChange?: (value: string[]) => void;
 	multiple?: boolean;
+	allowTypes?: string[];
 }
 
 interface UploadingFile {
@@ -25,8 +26,8 @@ export const TusUploader = ({
 	value = [],
 	onChange,
 	multiple = true,
+	allowTypes = undefined,
 }: TusUploaderProps) => {
-
 	const { handleFileUpload, uploadProgress } = useTusUpload();
 	const [uploadingFiles, setUploadingFiles] = useState<UploadingFile[]>([]);
 	const [completedFiles, setCompletedFiles] = useState<UploadingFile[]>(
@@ -39,7 +40,6 @@ export const TusUploader = ({
 			})) || []
 	);
 	const [uploadResults, setUploadResults] = useState<string[]>(value || []);
-
 	const handleRemoveFile = useCallback(
 		(fileId: string) => {
 			setCompletedFiles((prev) =>
@@ -61,7 +61,10 @@ export const TusUploader = ({
 
 	const handleBeforeUpload = useCallback(
 		(file: File) => {
-			
+			if (allowTypes && !allowTypes.includes(file.type)) {
+				toast.error(`文件类型 ${file.type} 不在允许范围内`);
+				return Upload.LIST_IGNORE; // 使用 antd 的官方阻止方式
+			}
 			const fileKey = `${file.name}-${Date.now()}`;
 
 			setUploadingFiles((prev) => [
@@ -136,10 +139,10 @@ export const TusUploader = ({
 	return (
 		<div className="space-y-1">
 			<Upload.Dragger
+				accept={allowTypes?.join(",")}
 				name="files"
 				multiple={multiple}
 				showUploadList={false}
-
 				beforeUpload={handleBeforeUpload}>
 				<p className="ant-upload-drag-icon">
 					<UploadOutlined />
@@ -149,6 +152,11 @@ export const TusUploader = ({
 				</p>
 				<p className="ant-upload-hint">
 					{multiple ? "支持单个或批量上传文件" : "仅支持上传单个文件"}
+					{allowTypes && (
+						<span className="block text-xs text-gray-500">
+							允许类型: {allowTypes.join(", ")}
+						</span>
+					)}
 				</p>
 
 				<div className="px-2 py-0 rounded mt-1">
@@ -165,10 +173,10 @@ export const TusUploader = ({
 										file.status === "done"
 											? 100
 											: Math.round(
-												uploadProgress?.[
-												file.fileKey!
-												] || 0
-											)
+													uploadProgress?.[
+														file.fileKey!
+													] || 0
+												)
 									}
 									status={
 										file.status === "error"
diff --git a/apps/web/src/components/common/uploader/utils.tsx b/apps/web/src/components/common/uploader/utils.tsx
new file mode 100755
index 0000000..8437211
--- /dev/null
+++ b/apps/web/src/components/common/uploader/utils.tsx
@@ -0,0 +1,48 @@
+import {
+	FilePdfOutlined,
+	FileWordOutlined,
+	FileExcelOutlined,
+	FilePptOutlined,
+	FileTextOutlined,
+	FileZipOutlined,
+	FileImageOutlined,
+	FileUnknownOutlined,
+} from "@ant-design/icons";
+
+export const isContentEmpty = (html: string) => {
+	// 创建一个临时 div 来解析 HTML 内容
+	const temp = document.createElement("div");
+	temp.innerHTML = html;
+	// 获取纯文本内容并检查是否为空
+	return !temp.textContent?.trim();
+};
+export const getFileIcon = (filename: string) => {
+	const extension = filename.split(".").pop()?.toLowerCase();
+	switch (extension) {
+		case "pdf":
+			return <FilePdfOutlined className="text-red-500" />;
+		case "doc":
+		case "docx":
+			return <FileWordOutlined className="text-blue-500" />;
+		case "xls":
+		case "xlsx":
+			return <FileExcelOutlined className="text-green-600" />;
+		case "ppt":
+		case "pptx":
+			return <FilePptOutlined className="text-orange-500" />;
+		case "txt":
+			return <FileTextOutlined className="text-gray-600" />;
+		case "zip":
+		case "rar":
+		case "7z":
+			return <FileZipOutlined className="text-purple-500" />;
+		case "png":
+		case "jpg":
+		case "jpeg":
+		case "gif":
+		case "webp":
+			return <FileImageOutlined className="text-pink-400" />;
+		default:
+			return <FileUnknownOutlined className="text-gray-500" />;
+	}
+};
diff --git a/apps/web/src/components/layout/breadcrumb.tsx b/apps/web/src/components/layout/breadcrumb.tsx
index 1804dab..bffbb65 100755
--- a/apps/web/src/components/layout/breadcrumb.tsx
+++ b/apps/web/src/components/layout/breadcrumb.tsx
@@ -1,38 +1,42 @@
-import React from 'react';
-import { useLocation, Link, useMatches } from 'react-router-dom';
-import { theme } from 'antd';
-import { RightOutlined } from '@ant-design/icons';
+import React from "react";
+import { useLocation, Link, useMatches } from "react-router-dom";
+import { theme } from "antd";
+import { RightOutlined } from "@ant-design/icons";
 
 export default function Breadcrumb() {
-    let matches = useMatches();
-    const { token } = theme.useToken()
+	const matches = useMatches();
+	const { token } = theme.useToken();
 
-    let crumbs = matches
-        // first get rid of any matches that don't have handle and crumb
-        .filter((match) => Boolean((match.handle as any)?.crumb))
-        // now map them into an array of elements, passing the loader
-        // data to each one
-        .map((match) => (match.handle as any).crumb(match.data));
+	const crumbs = matches
+		// first get rid of any matches that don't have handle and crumb
+		.filter((match) => Boolean((match.handle as any)?.crumb))
+		// now map them into an array of elements, passing the loader
+		// data to each one
+		.map((match) => (match.handle as any).crumb(match.data));
 
-    return (
-        <ol className='flex items-center space-x-2 text-gray-600'>
-            {crumbs.map((crumb, index) => (
-                <React.Fragment key={index}>
-                    <li className={`inline-flex items-center `}
-                        style={{
-                            color: (index === crumbs.length - 1) ? token.colorPrimaryText : token.colorTextSecondary,
-                            fontWeight: (index === crumbs.length - 1) ? "bold" : "normal",
-                        }}
-                    >
-                        {crumb}
-                    </li>
-                    {index < crumbs.length - 1 && (
-                        <li className='mx-2'>
-                            <RightOutlined></RightOutlined>
-                        </li>
-                    )}
-                </React.Fragment>
-            ))}
-        </ol>
-    );
+	return (
+		<ol className="flex items-center space-x-2 text-gray-600">
+			{crumbs.map((crumb, index) => (
+				<React.Fragment key={index}>
+					<li
+						className={`inline-flex items-center `}
+						style={{
+							color:
+								index === crumbs.length - 1
+									? token.colorPrimaryText
+									: token.colorTextSecondary,
+							fontWeight:
+								index === crumbs.length - 1 ? "bold" : "normal",
+						}}>
+						{crumb}
+					</li>
+					{index < crumbs.length - 1 && (
+						<li className="mx-2">
+							<RightOutlined></RightOutlined>
+						</li>
+					)}
+				</React.Fragment>
+			))}
+		</ol>
+	);
 }
diff --git a/apps/web/src/components/layout/element/usermenu/usermenu.tsx b/apps/web/src/components/layout/element/usermenu/usermenu.tsx
index e00965b..31460cd 100755
--- a/apps/web/src/components/layout/element/usermenu/usermenu.tsx
+++ b/apps/web/src/components/layout/element/usermenu/usermenu.tsx
@@ -185,13 +185,13 @@ export function UserMenu() {
 							id="user-menu"
 							aria-orientation="vertical"
 							aria-labelledby="user-menu-button"
-							style={{ zIndex: 100 }}
+							style={{ zIndex: 1000 }}
 							className="absolute right-0 mt-3 w-64 origin-top-right
                             bg-white rounded-xl overflow-hidden shadow-lg
                             border border-[#E5EDF5]">
 							{/* User Profile Section */}
 							<div
-								className="px-4 py-4 bg-gradient-to-b from-[#F6F9FC] to-white 
+								className="z-50 px-4 py-4 bg-gradient-to-b from-[#F6F9FC] to-white 
                                 border-b border-[#E5EDF5] ">
 								<div className="flex items-center space-x-4">
 									<Avatar
@@ -229,20 +229,18 @@ export function UserMenu() {
                                         focus:ring-2 focus:ring-[#00538E]/20
                                         group relative overflow-hidden 
                                          active:scale-[0.99]
-                                        ${
-											item.label === "注销"
+                                        ${item.label === "注销"
 												? "text-[#B22234] hover:bg-red-50/80 hover:text-red-700"
 												: "text-[#00538E] hover:bg-[#E6EEF5] hover:text-[#003F6A]"
-										}`}>
+											}`}>
 										<span
 											className={`w-5 h-5 flex items-center justify-center
                                         transition-all duration-200 ease-in-out
                                         group-hover:scale-110 group-hover:rotate-6
-                                        group-hover:translate-x-0.5 ${
-											item.label === "注销"
-												? "group-hover:text-red-600"
-												: "group-hover:text-[#003F6A]"
-										}`}>
+                                        group-hover:translate-x-0.5 ${item.label === "注销"
+													? "group-hover:text-red-600"
+													: "group-hover:text-[#003F6A]"
+												}`}>
 											{item.icon}
 										</span>
 										<span>{item.label}</span>
diff --git a/apps/web/src/components/models/course/card/CourseCard.tsx b/apps/web/src/components/models/course/card/CourseCard.tsx
deleted file mode 100755
index 60e1f48..0000000
--- a/apps/web/src/components/models/course/card/CourseCard.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { CourseDto } from "@nice/common";
-import { Card } from "@web/src/components/common/container/Card";
-import { CourseHeader } from "./CourseHeader";
-import { CourseStats } from "./CourseStats";
-import { Popover } from "@web/src/components/presentation/popover";
-import { useState } from "react";
-
-interface CourseCardProps {
-	course: CourseDto;
-	onClick?: () => void;
-}
-
-export const CourseCard = ({ course, onClick }: CourseCardProps) => {
-	return (
-		<Card onClick={onClick} className="w-full max-w-sm">
-			<CourseHeader
-				title={course.title}
-				subTitle={course.subTitle}
-				thumbnail={course.thumbnail}
-				level={course.level}
-				numberOfStudents={course.numberOfStudents}
-				publishedAt={course.publishedAt}
-			/>
-			<CourseStats
-				averageRating={course.averageRating}
-				numberOfReviews={course.numberOfReviews}
-				completionRate={course.completionRate}
-				totalDuration={course.totalDuration}
-			/>
-		</Card>
-	);
-};
diff --git a/apps/web/src/components/models/course/card/CourseStats.tsx b/apps/web/src/components/models/course/card/CourseStats.tsx
index 0ff3906..51f547a 100755
--- a/apps/web/src/components/models/course/card/CourseStats.tsx
+++ b/apps/web/src/components/models/course/card/CourseStats.tsx
@@ -6,7 +6,6 @@ interface CourseStatsProps {
     completionRate?: number;
     totalDuration?: number;
 }
-
 export const CourseStats = ({
     averageRating,
     numberOfReviews,
diff --git a/apps/web/src/components/models/course/detail/CourseDetail.tsx b/apps/web/src/components/models/course/detail/CourseDetail.tsx
index 353ec4f..c33c268 100755
--- a/apps/web/src/components/models/course/detail/CourseDetail.tsx
+++ b/apps/web/src/components/models/course/detail/CourseDetail.tsx
@@ -8,11 +8,7 @@ export default function CourseDetail({
 	id?: string;
 	lectureId?: string;
 }) {
-	const iframeStyle = {
-		width: "50%",
-		height: "100vh",
-		border: "none",
-	};
+	
 	return (
 		<>
 			<CourseDetailProvider editId={id}>
diff --git a/apps/web/src/components/models/course/detail/CourseDetailContext.tsx b/apps/web/src/components/models/course/detail/CourseDetailContext.tsx
index c67a896..c833dc5 100755
--- a/apps/web/src/components/models/course/detail/CourseDetailContext.tsx
+++ b/apps/web/src/components/models/course/detail/CourseDetailContext.tsx
@@ -1,7 +1,21 @@
-import { api } from "@nice/client";
-import { courseDetailSelect, CourseDto, Lecture } from "@nice/common";
-import React, { createContext, ReactNode, useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { api, useVisitor } from "@nice/client";
+import {
+	courseDetailSelect,
+	CourseDto,
+	Lecture,
+	lectureDetailSelect,
+	RolePerms,
+	VisitType,
+} from "@nice/common";
+import { useAuth } from "@web/src/providers/auth-provider";
+import React, {
+	createContext,
+	ReactNode,
+	useEffect,
+	useMemo,
+	useState,
+} from "react";
+import { useNavigate, useParams } from "react-router-dom";
 
 interface CourseDetailContextType {
 	editId?: string; // 添加 editId
@@ -10,13 +24,19 @@ interface CourseDetailContextType {
 	selectedLectureId?: string | undefined;
 	setSelectedLectureId?: React.Dispatch<React.SetStateAction<string>>;
 	isLoading?: boolean;
+	lectureIsLoading?: boolean;
 	isHeaderVisible: boolean; // 新增
 	setIsHeaderVisible: (visible: boolean) => void; // 新增
+	canEdit?: boolean;
+	userIsLearning?: boolean;
+	setUserIsLearning:(learning: boolean) => void;
 }
+
 interface CourseFormProviderProps {
 	children: ReactNode;
 	editId?: string; // 添加 editId 参数
 }
+
 export const CourseDetailContext =
 	createContext<CourseDetailContextType | null>(null);
 export function CourseDetailProvider({
@@ -24,30 +44,73 @@ export function CourseDetailProvider({
 	editId,
 }: CourseFormProviderProps) {
 	const navigate = useNavigate();
+	const { read } = useVisitor();
+	const { user, hasSomePermissions, isAuthenticated } = useAuth();
+	const { lectureId } = useParams();
+
 	const { data: course, isLoading }: { data: CourseDto; isLoading: boolean } =
 		(api.post as any).findFirst.useQuery(
 			{
 				where: { id: editId },
-				include: {
-					// sections: { include: { lectures: true } },
-					enrollments: true,
-				},
+				select: courseDetailSelect,
 			},
 			{ enabled: Boolean(editId) }
 		);
+
+	// const userIsLearning = useMemo(() => {
+	// 	return (course?.studentIds || []).includes(user?.id);
+	// }, [user, course, isLoading]);
+	const [userIsLearning, setUserIsLearning] = useState(false);
+	useEffect(()=>{
+		console.log(course?.studentIds,user?.id)
+		setUserIsLearning((course?.studentIds || []).includes(user?.id));
+	},[user, course, isLoading])
+	const canEdit = useMemo(() => {
+		const isAuthor = isAuthenticated && user?.id === course?.authorId;
+		const isRoot = hasSomePermissions(RolePerms?.MANAGE_ANY_POST);
+		return isAuthor || isRoot;
+	}, [user, course]);
+
 	const [selectedLectureId, setSelectedLectureId] = useState<
 		string | undefined
-	>(undefined);
+	>(lectureId || undefined);
 	const { data: lecture, isLoading: lectureIsLoading } = (
 		api.post as any
 	).findFirst.useQuery(
 		{
 			where: { id: selectedLectureId },
+			select: lectureDetailSelect,
 		},
 		{ enabled: Boolean(editId) }
 	);
+
 	useEffect(() => {
-		navigate(`/course/${editId}/detail/${selectedLectureId}`);
+		if (lectureId) {
+			console.log(123);
+			console.log(lectureId);
+			read.mutateAsync({
+				data: {
+					visitorId: user?.id || null,
+					postId: lectureId,
+					type: VisitType.READED,
+				},
+			});
+		} else {
+			console.log(321);
+			console.log(editId);
+			read.mutateAsync({
+				data: {
+					visitorId: user?.id || null,
+					postId: editId,
+					type: VisitType.READED,
+				},
+			});
+		}
+	}, [editId, lectureId]);
+	useEffect(() => {
+		if (lectureId !== selectedLectureId) {
+			navigate(`/course/${editId}/detail/${selectedLectureId}`);
+		}
 	}, [selectedLectureId, editId]);
 	const [isHeaderVisible, setIsHeaderVisible] = useState(true); // 新增
 	return (
@@ -59,8 +122,12 @@ export function CourseDetailProvider({
 				selectedLectureId,
 				setSelectedLectureId,
 				isLoading,
+				lectureIsLoading,
 				isHeaderVisible,
 				setIsHeaderVisible,
+				canEdit,
+				userIsLearning,
+				setUserIsLearning
 			}}>
 			{children}
 		</CourseDetailContext.Provider>
diff --git a/apps/web/src/components/models/course/detail/CourseDetailDescription.tsx b/apps/web/src/components/models/course/detail/CourseDetailDescription.tsx
new file mode 100755
index 0000000..019dcbc
--- /dev/null
+++ b/apps/web/src/components/models/course/detail/CourseDetailDescription.tsx
@@ -0,0 +1,90 @@
+import { Course, TaxonomySlug } from "@nice/common";
+import React, { useContext, useEffect, useMemo } from "react";
+import { Image, Typography, Skeleton, Tag } from "antd"; // 引入 antd 组件
+import { CourseDetailContext } from "./CourseDetailContext";
+import { useNavigate, useParams } from "react-router-dom";
+import { useStaff } from "@nice/client";
+import { useAuth } from "@web/src/providers/auth-provider";
+import TermInfo from "@web/src/app/main/path/components/TermInfo";
+import { PictureOutlined } from "@ant-design/icons";
+
+export const CourseDetailDescription: React.FC = () => {
+	const {
+		course,
+		canEdit,
+		isLoading,
+		selectedLectureId,
+		setSelectedLectureId,
+		userIsLearning,
+		lecture = null,
+	} = useContext(CourseDetailContext);
+	const { Paragraph } = Typography;
+	const { user } = useAuth();
+	const { update } = useStaff();
+	const firstLectureId = useMemo(() => {
+		return course?.sections?.[0]?.lectures?.[0]?.id;
+	}, [course]);
+	const navigate = useNavigate();
+	const { id } = useParams();
+	return (
+		// <div className="w-full bg-white shadow-md rounded-lg border border-gray-200 p-5 my-4">
+		<div className="w-full   px-5 my-2">
+			{isLoading || !course ? (
+				<Skeleton active paragraph={{ rows: 4 }} />
+			) : (
+				<div className="space-y-2">
+					{!selectedLectureId && (
+						<div className="relative mb-4 overflow-hidden flex justify-center items-center">
+							{
+								<div
+									className="w-full rounded-xl aspect-video bg-cover bg-center z-0"
+									style={{
+										backgroundImage: `url(${course?.meta?.thumbnail || "/placeholder.webp"})`,
+									}}
+								/>
+							}
+							<div
+								onClick={async () => {
+									setSelectedLectureId(firstLectureId);
+									if (!userIsLearning) {
+										await update.mutateAsync({
+											where: { id: user?.id },
+											data: {
+												learningPosts: {
+													connect: {
+														id: course.id,
+													},
+												},
+											},
+										});
+									}
+								}}
+								className="absolute  rounded-xl top-0 left-0 right-0 bottom-0 z-10 bg-[rgba(0,0,0,0.3)] transition-all duration-300 ease-in-out hover:bg-[rgba(0,0,0,0.7)] cursor-pointer group">
+								<div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 text-white text-4xl z-10 opacity-0 group-hover:opacity-100 transition-opacity duration-300">
+									点击进入学习
+								</div>
+							</div>
+						</div>
+					)}
+					<div className="text-lg font-bold">{"课程简介:"}</div>
+					<div className="flex flex-col gap-2">
+						<div className="flex gap-2 flex-wrap items-center float-start">
+							{course?.subTitle && <div>{course?.subTitle}</div>}
+							<TermInfo terms={course.terms}></TermInfo>
+						</div>
+					</div>
+					<Paragraph
+						className="text-gray-600"
+						ellipsis={{
+							rows: 3,
+							expandable: true,
+							symbol: "展开",
+							onExpand: () => console.log("展开"),
+						}}>
+						{course?.content}
+					</Paragraph>
+				</div>
+			)}
+		</div>
+	);
+};
diff --git a/apps/web/src/components/models/course/detail/CourseDetailDescription/CourseDetailDescription.tsx b/apps/web/src/components/models/course/detail/CourseDetailDescription/CourseDetailDescription.tsx
deleted file mode 100755
index a3c8114..0000000
--- a/apps/web/src/components/models/course/detail/CourseDetailDescription/CourseDetailDescription.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { CheckCircleIcon } from "@heroicons/react/24/outline";
-import { Course } from "@nice/common";
-import { motion } from "framer-motion";
-import React from "react";
-import CourseDetailSkeleton from "../CourseDetailSkeleton";
-import CourseDetailNavBar from "./CourseDetailNavBar";
-interface CourseDetailProps {
-	course: Course;
-	isLoading: boolean;
-}
-
-export const CourseDetailDescription: React.FC<CourseDetailProps> = ({
-	course,
-	isLoading,
-}) => {
-	return (
-		<>
-			<CourseDetailNavBar></CourseDetailNavBar>
-
-			<div className="w-[80%] mx-auto px-4 py-8">
-				{isLoading || !course ? (
-					<CourseDetailSkeleton />
-				) : (
-					<CourseDetailSkeleton />
-				)}
-			</div>
-		</>
-	);
-};
diff --git a/apps/web/src/components/models/course/detail/CourseDetailDescription/CourseDetailNavBar.tsx b/apps/web/src/components/models/course/detail/CourseDetailDescription/CourseDetailNavBar.tsx
deleted file mode 100755
index a5b862d..0000000
--- a/apps/web/src/components/models/course/detail/CourseDetailDescription/CourseDetailNavBar.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { NavBar } from "@web/src/components/presentation/NavBar";
-import { HomeIcon, BellIcon } from "@heroicons/react/24/outline";
-import {
-	DocumentTextIcon,
-	MagnifyingGlassIcon,
-	StarIcon,
-} from "@heroicons/react/24/solid";
-
-export default function CourseDetailNavBar() {
-	const navItems = [
-		{
-			id: "search",
-			icon: <MagnifyingGlassIcon className="w-5 h-5" />,
-			label: "搜索",
-		},
-		{
-			id: "overview",
-			icon: <HomeIcon className="w-5 h-5" />,
-			label: "概述",
-		},
-		{
-			id: "notes",
-			icon: <DocumentTextIcon className="w-5 h-5" />,
-			label: "备注",
-		},
-		{
-			id: "announcements",
-			icon: <BellIcon className="w-5 h-5" />,
-			label: "公告",
-		},
-		{
-			id: "reviews",
-			icon: <StarIcon className="w-5 h-5" />,
-			label: "评价",
-		},
-	];
-
-	return (
-		<div className=" bg-gray-50">
-			<NavBar
-				items={navItems}
-				defaultSelected="overview"
-				onSelect={(id) => console.log("Selected:", id)}
-			/>
-		</div>
-	);
-}
diff --git a/apps/web/src/components/models/course/detail/CourseDetailDescription/Description/Overview.tsx b/apps/web/src/components/models/course/detail/CourseDetailDescription/Description/Overview.tsx
deleted file mode 100755
index 334c36b..0000000
--- a/apps/web/src/components/models/course/detail/CourseDetailDescription/Description/Overview.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { useContext } from "react";
-import { CourseDetailContext } from "../../CourseDetailContext";
-import { CheckCircleIcon } from "@heroicons/react/24/solid";
-
-export function Overview() {
-	const { course } = useContext(CourseDetailContext);
-	return (
-		<>
-			<div className="space-y-8">
-				{/* 课程描述 */}
-				<div className="prose max-w-none">
-					<p>{course?.description}</p>
-				</div>
-
-				{/* 学习目标 */}
-				<div>
-					<h2 className="text-xl font-semibold mb-4">学习目标</h2>
-					<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-						{course?.objectives.map((objective, index) => (
-							<div key={index} className="flex items-start gap-2">
-								<CheckCircleIcon className="w-5 h-5 text-green-500 flex-shrink-0 mt-1" />
-								<span>{objective}</span>
-							</div>
-						))}
-					</div>
-				</div>
-
-				{/* 适合人群 */}
-				<div>
-					<h2 className="text-xl font-semibold mb-4">适合人群</h2>
-					<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-						{course?.audiences.map((audience, index) => (
-							<div key={index} className="flex items-start gap-2">
-								<CheckCircleIcon className="w-5 h-5 text-blue-500 flex-shrink-0 mt-1" />
-								<span>{audience}</span>
-							</div>
-						))}
-					</div>
-				</div>
-
-				{/* 课程要求 */}
-				<div>
-					<h2 className="text-xl font-semibold mb-4">课程要求</h2>
-					<ul className="list-disc list-inside space-y-2 text-gray-700">
-						{course?.requirements.map((requirement, index) => (
-							<li key={index}>{requirement}</li>
-						))}
-					</ul>
-				</div>
-
-				{/* 可获得技能 */}
-				<div>
-					<h2 className="text-xl font-semibold mb-4">可获得技能</h2>
-					<div className="flex flex-wrap gap-2">
-						{course?.skills.map((skill, index) => (
-							<span
-								key={index}
-								className="px-3 py-1 bg-blue-100 text-blue-800 rounded-full text-sm">
-								{skill}
-							</span>
-						))}
-					</div>
-				</div>
-			</div>
-		</>
-	);
-}
diff --git a/apps/web/src/components/models/course/detail/CourseDetailDescription/Description/index.ts b/apps/web/src/components/models/course/detail/CourseDetailDescription/Description/index.ts
deleted file mode 100755
index e69de29..0000000
diff --git a/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx b/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx
index 3a2d6ff..7d89f1a 100755
--- a/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx
+++ b/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx
@@ -2,66 +2,75 @@
 import { motion, useScroll, useTransform } from "framer-motion";
 import React, { useContext, useRef, useState } from "react";
 import { VideoPlayer } from "@web/src/components/presentation/video-player/VideoPlayer";
-import { CourseDetailDescription } from "./CourseDetailDescription/CourseDetailDescription";
+import { CourseDetailDescription } from "./CourseDetailDescription";
 import { Course, LectureType, PostType } from "@nice/common";
 import { CourseDetailContext } from "./CourseDetailContext";
 import CollapsibleContent from "@web/src/components/common/container/CollapsibleContent";
+import { Skeleton } from "antd";
+import ResourcesShower from "@web/src/components/common/uploader/ResourceShower";
+import { useNavigate } from "react-router-dom";
+import CourseDetailTitle from "./CourseDetailTitle";
 
-interface CourseDetailDisplayAreaProps {
-	// course: Course;
-	videoSrc?: string;
-	videoPoster?: string;
-	// isLoading?: boolean;
-}
 
-export const CourseDetailDisplayArea: React.FC<
-	CourseDetailDisplayAreaProps
-> = ({ videoSrc, videoPoster }) => {
+export const CourseDetailDisplayArea: React.FC = () => {
 	// 创建滚动动画效果
-	const { course, isLoading, lecture } = useContext(CourseDetailContext);
+	const {
+		course,
+		isLoading,
+		canEdit,
+		lecture,
+		lectureIsLoading,
+		selectedLectureId,
+	} = useContext(CourseDetailContext);
+	const navigate = useNavigate();
 	const { scrollY } = useScroll();
-	const videoScale = useTransform(scrollY, [0, 200], [1, 0.8]);
 	const videoOpacity = useTransform(scrollY, [0, 200], [1, 0.8]);
-	const contentWrapperRef = useRef(null);
-	const [isExpanded, setIsExpanded] = useState(false);
-	const [shouldCollapse, setShouldCollapse] = useState(false);
 	return (
 		<div className="min-h-screen bg-gray-50">
 			{/* 固定的视频区域 */}
-			{/* 移除 sticky 定位，让视频区域随页面滚动 */}
-			{lecture?.meta?.type === LectureType.VIDEO && (
-				<motion.div
-					style={{
-						opacity: videoOpacity,
-					}}
-					className="w-full bg-black">
-					<div className=" w-full  ">
-						<VideoPlayer src={videoSrc} poster={videoPoster} />
-					</div>
-				</motion.div>
+			{lectureIsLoading && (
+				<Skeleton active paragraph={{ rows: 4 }} title={false} />
 			)}
-			{lecture?.meta?.type === LectureType.ARTICLE && (
-				<div className="flex justify-center w-full my-2">
-					<div className="w-4/5  bg-white shadow-md rounded-lg  border border-gray-200  p-6  ">
-						<CollapsibleContent
-							content={lecture?.content || ""}
-							maxHeight={150} // Optional, defaults to 150
-						/>
+			<CourseDetailTitle></CourseDetailTitle>
+			{selectedLectureId &&
+				!lectureIsLoading &&
+				lecture?.meta?.type === LectureType.VIDEO && (
+					<div className="flex justify-center flex-col items-center gap-2 w-full mt-2 px-4">
+						<motion.div
+							style={{
+								opacity: videoOpacity,
+							}}
+							className="w-full bg-black rounded-lg  ">
+							<div className=" w-full  ">
+								<VideoPlayer src={lecture?.meta?.videoUrl} />
+							</div>
+						</motion.div>
 					</div>
-				</div>
-			)}
+				)}
+			{!lectureIsLoading &&
+				selectedLectureId &&
+				lecture?.meta?.type === LectureType.ARTICLE && (
+					<div className="flex justify-center flex-col items-center gap-2 w-full my-2 ">
+						<div className="w-full   rounded-lg      ">
+							<CollapsibleContent
+								content={lecture?.content || ""}
+								maxHeight={500} // Optional, defaults to 150
+							/>
+							<div className="px-6">
+								<ResourcesShower
+									resources={
+										lecture?.resources
+									}></ResourcesShower>
+							</div>
+						</div>
+					</div>
+				)}
+			<div className="flex justify-center flex-col items-center gap-2 w-full my-2  ">
+				<CourseDetailDescription />
+			</div>
 			{/* 课程内容区域 */}
-			<motion.div
-				initial={{ opacity: 0, y: 20 }}
-				animate={{ opacity: 1, y: 0 }}
-				transition={{ duration: 0.5, delay: 0.2 }}
-				className="w-full">
-				<CourseDetailDescription
-					course={course}
-					isLoading={isLoading}
-				/>
-			</motion.div>
 		</div>
 	);
 };
+
 export default CourseDetailDisplayArea;
diff --git a/apps/web/src/components/models/course/detail/CourseDetailHeader/CourseDetailHeader.tsx b/apps/web/src/components/models/course/detail/CourseDetailHeader/CourseDetailHeader.tsx
index bbcdffc..15eb7e5 100755
--- a/apps/web/src/components/models/course/detail/CourseDetailHeader/CourseDetailHeader.tsx
+++ b/apps/web/src/components/models/course/detail/CourseDetailHeader/CourseDetailHeader.tsx
@@ -1,63 +1,97 @@
-// components/Header.tsx
-import { motion, useScroll, useTransform } from "framer-motion";
-import { useContext, useEffect, useState } from "react";
+import { useContext, useState } from "react";
+import { Input, Layout, Avatar, Button, Dropdown } from "antd";
+import {
+	EditFilled,
+	HomeOutlined,
+	SearchOutlined,
+	UserOutlined,
+} from "@ant-design/icons";
+import { useAuth } from "@web/src/providers/auth-provider";
+import { useNavigate, useParams } from "react-router-dom";
+import { UserMenu } from "@web/src/app/main/layout/UserMenu/UserMenu";
 import { CourseDetailContext } from "../CourseDetailContext";
-import { Button } from "antd";
+import { usePost, useStaff } from "@nice/client";
+import toast from "react-hot-toast";
+import { NavigationMenu } from "@web/src/app/main/layout/NavigationMenu";
 
-export const CourseDetailHeader = () => {
-	const { scrollY } = useScroll();
+const { Header } = Layout;
 
-	const [lastScrollY, setLastScrollY] = useState(0);
-	const { course, isHeaderVisible, setIsHeaderVisible, lecture } =
-		useContext(CourseDetailContext);
-	useEffect(() => {
-		const updateHeader = () => {
-			const current = scrollY.get();
-			const direction = current > lastScrollY ? "down" : "up";
-
-			if (direction === "down" && current > 100) {
-				setIsHeaderVisible(false);
-			} else if (direction === "up") {
-				setIsHeaderVisible(true);
-			}
-
-			setLastScrollY(current);
-		};
-
-		// 使用 requestAnimationFrame 来优化性能
-		const unsubscribe = scrollY.on("change", () => {
-			requestAnimationFrame(updateHeader);
-		});
-
-		return () => {
-			unsubscribe();
-		};
-	}, [lastScrollY, scrollY, setIsHeaderVisible]);
+export function CourseDetailHeader() {
+	const { id } = useParams();
+	const { isAuthenticated, user, hasSomePermissions, hasEveryPermissions } =
+		useAuth();
+	const navigate = useNavigate();
+	const { course, canEdit, userIsLearning } = useContext(CourseDetailContext);
+	const { update } = useStaff();
 
 	return (
-		<motion.header
-			initial={{ y: 0 }}
-			animate={{ y: isHeaderVisible ? 0 : -100 }}
-			transition={{ type: "spring", stiffness: 300, damping: 30 }}
-			className="fixed top-0 left-0 w-full h-16 bg-slate-900 backdrop-blur-sm z-50 shadow-sm">
-			<div className="w-full mx-auto px-4 h-full flex items-center justify-between">
-				<div className="flex items-center space-x-4">
-					<h1 className="text-white text-xl ">{course?.title}</h1>
+		<Header className="select-none  flex items-center justify-center bg-white shadow-md border-b border-gray-100 fixed w-full z-30">
+			<div className="w-full  max-w-screen-3xl px-4 md:px-6 flex items-center justify-between h-full">
+				<div className="flex items-center space-x-8">
+					<div
+						onClick={() => navigate("/")}
+						className="text-2xl font-bold bg-gradient-to-r from-primary-600 via-primary-500 to-primary-400 bg-clip-text text-transparent hover:scale-105 transition-transform cursor-pointer">
+						烽火慕课
+					</div>
+					<NavigationMenu />
 				</div>
-				<Button
-					onClick={() => {
-						console.log(lecture);
-					}}>
-					123
-				</Button>
-				<nav className="flex items-center space-x-4">
-					<button className="px-4 py-2 rounded-full bg-blue-500 text-white hover:bg-blue-600 transition-colors">
-						开始学习
-					</button>
-				</nav>
-			</div>
-		</motion.header>
-	);
-};
 
-export default CourseDetailHeader;
+				<div className="flex items-center space-x-6">
+					{isAuthenticated && (
+						<Button
+							onClick={async () => {
+								if (!userIsLearning) {
+									await update.mutateAsync({
+										where: { id: user?.id },
+										data: {
+											learningPosts: {
+												connect: { id: course.id },
+											},
+										},
+									});
+								} else {
+									await update.mutateAsync({
+										where: { id: user?.id },
+										data: {
+											learningPosts: {
+												disconnect: {
+													id: course.id,
+												},
+											},
+										},
+									});
+								}
+							}}
+							className="flex items-center space-x-1 bg-gradient-to-r from-blue-500 to-blue-600 text-white hover:from-blue-600 hover:to-blue-700 border-none shadow-md hover:shadow-lg transition-all"
+							icon={<EditFilled />}>
+							{userIsLearning ? "退出学习" : "加入学习"}
+						</Button>
+					)}
+					{canEdit && (
+						<Button
+							onClick={() => {
+								const url = id
+									? `/course/${id}/editor`
+									: "/course/editor";
+								navigate(url);
+							}}
+							className="flex items-center space-x-1 bg-gradient-to-r from-blue-500 to-blue-600 text-white hover:from-blue-600 hover:to-blue-700 border-none shadow-md hover:shadow-lg transition-all"
+							icon={<EditFilled />}>
+							{"编辑课程"}
+						</Button>
+					)}
+					{isAuthenticated ? (
+						<UserMenu />
+					) : (
+						<Button
+							onClick={() => navigate("/login")}
+							className="flex items-center space-x-1 bg-gradient-to-r from-blue-500 to-blue-600 text-white hover:from-blue-600 hover:to-blue-700 border-none shadow-md hover:shadow-lg transition-all"
+							icon={<UserOutlined />}>
+							登录
+						</Button>
+					)}
+				</div>
+			</div>
+		</Header>
+	);
+}
diff --git a/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx b/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx
index 6686093..4ac0d73 100755
--- a/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx
+++ b/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx
@@ -4,44 +4,35 @@ import { CourseDetailContext } from "./CourseDetailContext";
 
 import CourseDetailDisplayArea from "./CourseDetailDisplayArea";
 import { CourseSyllabus } from "./CourseSyllabus/CourseSyllabus";
-import CourseDetailHeader from "./CourseDetailHeader/CourseDetailHeader";
-import { Button } from "antd";
+import { CourseDetailHeader } from "./CourseDetailHeader/CourseDetailHeader";
 
 export default function CourseDetailLayout() {
 	const {
 		course,
-		selectedLectureId,
-		lecture,
-		isLoading,
+
 		setSelectedLectureId,
 	} = useContext(CourseDetailContext);
 
 	const handleLectureClick = (lectureId: string) => {
 		setSelectedLectureId(lectureId);
 	};
-	const [isSyllabusOpen, setIsSyllabusOpen] = useState(false);
+	const [isSyllabusOpen, setIsSyllabusOpen] = useState(true);
 	return (
 		<div className="relative">
-			<CourseDetailHeader />
 
-			{/* 添加 Header 组件 */}
-			{/* 主内容区域 */}
-			{/* 为了防止 Header 覆盖内容，添加上边距 */}
-			<div className="pt-16">
+			<div className="pt-12 px-32">
 				{" "}
 				{/* 添加这个包装 div */}
 				<motion.div
+					initial={{
+						width: "75%",
+					}}
 					animate={{
 						width: isSyllabusOpen ? "75%" : "100%",
 					}}
 					transition={{ type: "spring", stiffness: 300, damping: 30 }}
 					className="relative">
-					<CourseDetailDisplayArea
-						// course={course}
-						// isLoading={isLoading}
-						videoSrc="https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8"
-						videoPoster="https://picsum.photos/800/450"
-					/>
+					<CourseDetailDisplayArea />
 				</motion.div>
 				{/* 课程大纲侧边栏 */}
 				<CourseSyllabus
diff --git a/apps/web/src/components/models/course/detail/CourseDetailSkeleton.tsx b/apps/web/src/components/models/course/detail/CourseDetailSkeleton.tsx
index 95b1049..ad58cb8 100755
--- a/apps/web/src/components/models/course/detail/CourseDetailSkeleton.tsx
+++ b/apps/web/src/components/models/course/detail/CourseDetailSkeleton.tsx
@@ -2,6 +2,7 @@ import {
 	SkeletonItem,
 	SkeletonSection,
 } from "@web/src/components/presentation/Skeleton";
+import { api } from "packages/client/dist";
 
 export const CourseDetailSkeleton = () => {
 	return (
diff --git a/apps/web/src/components/models/course/detail/CourseDetailTitle.tsx b/apps/web/src/components/models/course/detail/CourseDetailTitle.tsx
new file mode 100755
index 0000000..de577eb
--- /dev/null
+++ b/apps/web/src/components/models/course/detail/CourseDetailTitle.tsx
@@ -0,0 +1,70 @@
+import { useContext } from "react";
+import { CourseDetailContext } from "./CourseDetailContext";
+import { useNavigate } from "react-router-dom";
+import {
+	BookOutlined,
+	CalendarOutlined,
+	EditTwoTone,
+	EyeOutlined,
+	ReloadOutlined,
+} from "@ant-design/icons";
+import dayjs from "dayjs";
+import CourseOperationBtns from "./JoinLearingButton";
+
+export default function CourseDetailTitle() {
+	const { course, lecture, selectedLectureId } =
+		useContext(CourseDetailContext);
+	return (
+		<div className="flex justify-center flex-col items-center gap-2 w-full my-2  px-6">
+			<div className="flex justify-start w-full text-2xl font-bold">
+				{!selectedLectureId ? course?.title : lecture?.title}
+			</div>
+			<div className="text-gray-600 flex w-full justify-start items-center gap-5">
+				{course?.author?.showname && (
+					<div>
+						发布者:
+						{course?.author?.showname}
+					</div>
+				)}
+				{course?.depts && course?.depts?.length > 0 && (
+					<div>
+						发布单位:
+						{course?.depts?.map((dept) => dept.name)}
+					</div>
+				)}
+			</div>
+			<div className="text-gray-600 flex w-full justify-start items-center gap-5">
+				<div className="flex gap-1">
+					<CalendarOutlined></CalendarOutlined>
+					{"发布于:"}
+					{dayjs(
+						!selectedLectureId
+							? course?.createdAt
+							: lecture?.createdAt
+					).format("YYYY年M月D日")}
+				</div>
+				<div className="flex gap-1">
+					{"最后更新:"}
+					{dayjs(
+						!selectedLectureId
+							? course?.updatedAt
+							: lecture?.updatedAt
+					).format("YYYY年M月D日")}
+				</div>
+				<div className="flex gap-1">
+					<EyeOutlined></EyeOutlined>
+					<div>{`观看次数${
+						!selectedLectureId
+							? course?.views || 0
+							: lecture?.views || 0
+					}`}</div>
+				</div>
+				<div className="flex gap-1">
+					<BookOutlined />
+					<div>{`学习人数${course?.studentIds?.length || 0}`}</div>
+				</div>
+				<CourseOperationBtns />
+			</div>
+		</div>
+	);
+}
diff --git a/apps/web/src/components/models/course/detail/CoursePreview/CoursePreview.tsx b/apps/web/src/components/models/course/detail/CoursePreview/CoursePreview.tsx
new file mode 100755
index 0000000..7d6d4f4
--- /dev/null
+++ b/apps/web/src/components/models/course/detail/CoursePreview/CoursePreview.tsx
@@ -0,0 +1,50 @@
+import { useContext, useEffect } from "react";
+import { CoursePreviewMsg } from "@web/src/app/main/course/preview/type.ts";
+import { Button, Tabs, Image, Skeleton } from "antd";
+import type { TabsProps } from "antd";
+import { PlayCircleOutlined } from "@ant-design/icons";
+import { CourseDetailContext } from "../CourseDetailContext";
+export function CoursePreview() {
+	const { course, isLoading, lecture, lectureIsLoading, selectedLectureId } =
+		useContext(CourseDetailContext);
+	return (
+		<div className="min-h-screen max-w-7xl mx-auto px-6 lg:px-8">
+			<div className="overflow-auto flex justify-around align-items-center w-full mx-auto my-8">
+				<div className="relative w-[600px] h-[340px] m-4 overflow-hidden flex justify-center items-center">
+					<Image
+						src={isLoading ? "error" : course?.meta?.thumbnail}
+						alt="example"
+						preview={false}
+						className="w-full h-full object-cover z-0"
+						fallback="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMIAAADDCAYAAADQvc6UAAABRWlDQ1BJQ0MgUHJvZmlsZQAAKJFjYGASSSwoyGFhYGDIzSspCnJ3UoiIjFJgf8LAwSDCIMogwMCcmFxc4BgQ4ANUwgCjUcG3awyMIPqyLsis7PPOq3QdDFcvjV3jOD1boQVTPQrgSkktTgbSf4A4LbmgqISBgTEFyFYuLykAsTuAbJEioKOA7DkgdjqEvQHEToKwj4DVhAQ5A9k3gGyB5IxEoBmML4BsnSQk8XQkNtReEOBxcfXxUQg1Mjc0dyHgXNJBSWpFCYh2zi+oLMpMzyhRcASGUqqCZ16yno6CkYGRAQMDKMwhqj/fAIcloxgHQqxAjIHBEugw5sUIsSQpBobtQPdLciLEVJYzMPBHMDBsayhILEqEO4DxG0txmrERhM29nYGBddr//5/DGRjYNRkY/l7////39v///y4Dmn+LgeHANwDrkl1AuO+pmgAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAAwqADAAQAAAABAAAAwwAAAAD9b/HnAAAHlklEQVR4Ae3dP3PTWBSGcbGzM6GCKqlIBRV0dHRJFarQ0eUT8LH4BnRU0NHR0UEFVdIlFRV7TzRksomPY8uykTk/zewQfKw/9znv4yvJynLv4uLiV2dBoDiBf4qP3/ARuCRABEFAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghgg0Aj8i0JO4OzsrPv69Wv+hi2qPHr0qNvf39+iI97soRIh4f3z58/u7du3SXX7Xt7Z2enevHmzfQe+oSN2apSAPj09TSrb+XKI/f379+08+A0cNRE2ANkupk+ACNPvkSPcAAEibACyXUyfABGm3yNHuAECRNgAZLuYPgEirKlHu7u7XdyytGwHAd8jjNyng4OD7vnz51dbPT8/7z58+NB9+/bt6jU/TI+AGWHEnrx48eJ/EsSmHzx40L18+fLyzxF3ZVMjEyDCiEDjMYZZS5wiPXnyZFbJaxMhQIQRGzHvWR7XCyOCXsOmiDAi1HmPMMQjDpbpEiDCiL358eNHurW/5SnWdIBbXiDCiA38/Pnzrce2YyZ4//59F3ePLNMl4PbpiL2J0L979+7yDtHDhw8vtzzvdGnEXdvUigSIsCLAWavHp/+qM0BcXMd/q25n1vF57TYBp0a3mUzilePj4+7k5KSLb6gt6ydAhPUzXnoPR0dHl79WGTNCfBnn1uvSCJdegQhLI1vvCk+fPu2ePXt2tZOYEV6/fn31dz+shwAR1sP1cqvLntbEN9MxA9xcYjsxS1jWR4AIa2Ibzx0tc44fYX/16lV6NDFLXH+YL32jwiACRBiEbf5KcXoTIsQSpzXx4N28Ja4BQoK7rgXiydbHjx/P25TaQAJEGAguWy0+2Q8PD6/Ki4R8EVl+bzBOnZY95fq9rj9zAkTI2SxdidBHqG9+skdw43borCXO/ZcJdraPWdv22uIEiLA4q7nvvCug8WTqzQveOH26fodo7g6uFe/a17W3+nFBAkRYENRdb1vkkz1CH9cPsVy/jrhr27PqMYvENYNlHAIesRiBYwRy0V+8iXP8+/fvX11Mr7L7ECueb/r48eMqm7FuI2BGWDEG8cm+7G3NEOfmdcTQw4h9/55lhm7DekRYKQPZF2ArbXTAyu4kDYB2YxUzwg0gi/41ztHnfQG26HbGel/crVrm7tNY+/1btkOEAZ2M05r4FB7r9GbAIdxaZYrHdOsgJ/wCEQY0J74TmOKnbxxT9n3FgGGWWsVdowHtjt9Nnvf7yQM2aZU/TIAIAxrw6dOnAWtZZcoEnBpNuTuObWMEiLAx1HY0ZQJEmHJ3HNvGCBBhY6jtaMoEiJB0Z29vL6ls58vxPcO8/zfrdo5qvKO+d3Fx8Wu8zf1dW4p/cPzLly/dtv9Ts/EbcvGAHhHyfBIhZ6NSiIBTo0LNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiEC/wGgKKC4YMA4TAAAAABJRU5ErkJggg=="
+					/>
+					<div className="w-[600px] h-[360px] absolute top-0 z-10 bg-black opacity-30 transition-opacity duration-300 ease-in-out hover:opacity-70 cursor-pointer">
+						<PlayCircleOutlined className="absolute top-1/2  left-1/2 -translate-x-1/2 -translate-y-1/2 text-white text-4xl z-10" />
+					</div>
+				</div>
+				<div className="flex flex-col justify-between w-2/5 content-start h-[340px] my-4 overflow-hidden">
+					{isLoading ? (
+						<Skeleton className="my-5" active />
+					) : (
+						<>
+							<span className="text-3xl font-bold  my-3 ">
+								{course.title}
+							</span>
+							<span className="text-xl font-semibold my-3 text-gray-700">
+								{course.subTitle}
+							</span>
+							<span className="text-lg font-light my-3 text-gray-500 text-clip">
+								{course.content}
+							</span>
+						</>
+					)}
+
+					<Button block type="primary" size="large">
+						{" "}
+						查看课程{" "}
+					</Button>
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/apps/web/src/components/models/course/detail/CoursePreview/couresPreviewTabmsg.tsx b/apps/web/src/components/models/course/detail/CoursePreview/couresPreviewTabmsg.tsx
new file mode 100755
index 0000000..8f32fce
--- /dev/null
+++ b/apps/web/src/components/models/course/detail/CoursePreview/couresPreviewTabmsg.tsx
@@ -0,0 +1,25 @@
+import { Checkbox, List } from 'antd';
+import React from 'react';
+
+export function CoursePreviewTabmsg({data}){
+    
+
+    const renderItem = (item) => (
+        <List.Item>
+          <List.Item.Meta
+            title={item.title}
+            description={item.description}
+          />
+        </List.Item>
+      );
+    
+    return(
+        <div className='my-2'>
+            <List
+                dataSource={data}
+                split={false}
+                renderItem={renderItem}
+            />
+        </div>
+    )
+}
\ No newline at end of file
diff --git a/apps/web/src/components/models/course/detail/CoursePreview/courseCatalog.tsx b/apps/web/src/components/models/course/detail/CoursePreview/courseCatalog.tsx
new file mode 100755
index 0000000..b13e87d
--- /dev/null
+++ b/apps/web/src/components/models/course/detail/CoursePreview/courseCatalog.tsx
@@ -0,0 +1,11 @@
+import type { MenuProps } from 'antd';
+import { Menu } from 'antd';
+
+type MenuItem = Required<MenuProps>['items'][number];
+
+export function CourseCatalog(){
+    return (
+        <>
+        </>
+    )
+}
\ No newline at end of file
diff --git a/apps/web/src/components/models/course/detail/CourseSyllabus/CourseSyllabus.tsx b/apps/web/src/components/models/course/detail/CourseSyllabus/CourseSyllabus.tsx
index 3b04395..84463cf 100755
--- a/apps/web/src/components/models/course/detail/CourseSyllabus/CourseSyllabus.tsx
+++ b/apps/web/src/components/models/course/detail/CourseSyllabus/CourseSyllabus.tsx
@@ -6,7 +6,6 @@ import {
 } from "@heroicons/react/24/outline";
 import { ChevronLeftIcon, ChevronRightIcon } from "@heroicons/react/24/outline";
 import React, { useState, useRef, useContext } from "react";
-import { motion, AnimatePresence } from "framer-motion";
 import { SectionDto, TaxonomySlug } from "@nice/common";
 import { SyllabusHeader } from "./SyllabusHeader";
 import { SectionItem } from "./SectionItem";
@@ -28,13 +27,11 @@ export const CourseSyllabus: React.FC<CourseSyllabusProps> = ({
 	onToggle,
 }) => {
 	const { isHeaderVisible } = useContext(CourseDetailContext);
-	const [expandedSections, setExpandedSections] = useState<string[]>([]);
+	const [expandedSections, setExpandedSections] = useState<string[]>(
+		sections.map((section) => section.id) // 默认展开所有章节
+	);
 	const sectionRefs = useRef<{ [key: string]: HTMLDivElement | null }>({});
-	// api.term.findMany.useQuery({
-	// 	where: {
-	// 		taxonomy: { slug: TaxonomySlug.CATEGORY },
-	// 	},
-	// });
+
 	const toggleSection = (sectionId: string) => {
 		setExpandedSections((prev) =>
 			prev.includes(sectionId)
@@ -42,70 +39,55 @@ export const CourseSyllabus: React.FC<CourseSyllabusProps> = ({
 				: [...prev, sectionId]
 		);
 
-		setTimeout(() => {
-			sectionRefs.current[sectionId]?.scrollIntoView({
-				behavior: "smooth",
-				block: "start",
-			});
-		}, 100);
+		// 直接滚动，无需延迟
+		sectionRefs.current[sectionId]?.scrollIntoView({
+			behavior: "smooth",
+			block: "start",
+		});
 	};
-
 	return (
 		<>
-			<AnimatePresence>
-				{/* 收起时的悬浮按钮 */}
-				{!isOpen && (
-					<motion.div
-						initial={{ opacity: 0 }}
-						animate={{ opacity: 1 }}
-						exit={{ opacity: 0 }}
-						className="fixed top-1/3 right-0 -translate-y-1/2 z-20">
-						<CollapsedButton onToggle={onToggle} />
-					</motion.div>
-				)}
-			</AnimatePresence>
-			<motion.div
-				initial={false}
-				animate={{
+			{/* 收起按钮直接显示 */}
+			{!isOpen && (
+				<div className="fixed top-1/3 right-0 -translate-y-1/2 z-20">
+					<CollapsedButton onToggle={onToggle} />
+				</div>
+			)}
+
+			<div
+				style={{
 					width: isOpen ? "25%" : "0",
 					right: 0,
-					top: isHeaderVisible ? "64px" : "0",
+					top: isHeaderVisible ? "56px" : "0",
 				}}
 				className="fixed top-0 bottom-0 z-20 bg-white shadow-xl">
-				<AnimatePresence>
-					{isOpen && (
-						<motion.div
-							initial={{ opacity: 0, x: 20 }}
-							animate={{ opacity: 1, x: 0 }}
-							exit={{ opacity: 0, x: 20 }}
-							className="h-full flex flex-col">
-							<SyllabusHeader onToggle={onToggle} />
+				{isOpen && (
+					<div className="h-full flex flex-col">
+						<SyllabusHeader onToggle={onToggle} />
 
-							<div className="flex-1 overflow-y-auto p-4">
-								<div className="space-y-4">
-									{sections.map((section, index) => (
-										<SectionItem
-											key={section.id}
-											ref={(el) =>
-												(sectionRefs.current[
-													section.id
-												] = el)
-											}
-											index={index + 1}
-											section={section}
-											isExpanded={expandedSections.includes(
-												section.id
-											)}
-											onToggle={toggleSection}
-											onLectureClick={onLectureClick}
-										/>
-									))}
-								</div>
+						<div className="flex-1 overflow-y-auto p-4">
+							<div className="space-y-4">
+								{sections.map((section, index) => (
+									<SectionItem
+										key={section.id}
+										ref={(el) =>
+											(sectionRefs.current[section.id] =
+												el)
+										}
+										index={index + 1}
+										section={section}
+										isExpanded={expandedSections.includes(
+											section.id
+										)}
+										onToggle={toggleSection}
+										onLectureClick={onLectureClick}
+									/>
+								))}
 							</div>
-						</motion.div>
-					)}
-				</AnimatePresence>
-			</motion.div>
+						</div>
+					</div>
+				)}
+			</div>
 		</>
 	);
 };
diff --git a/apps/web/src/components/models/course/detail/CourseSyllabus/LectureItem.tsx b/apps/web/src/components/models/course/detail/CourseSyllabus/LectureItem.tsx
index 0999f3c..9f41c82 100755
--- a/apps/web/src/components/models/course/detail/CourseSyllabus/LectureItem.tsx
+++ b/apps/web/src/components/models/course/detail/CourseSyllabus/LectureItem.tsx
@@ -1,8 +1,14 @@
 // components/CourseSyllabus/LectureItem.tsx
 
-import { Lecture, LectureType } from "@nice/common";
-import React from "react";
-import { ClockCircleOutlined, FileTextOutlined, PlayCircleOutlined } from "@ant-design/icons"; // 使用 Ant Design 图标
+import { Lecture, LectureType, LessonTypeLabel } from "@nice/common";
+import React, { useMemo } from "react";
+import {
+	ClockCircleOutlined,
+	EyeOutlined,
+	FileTextOutlined,
+	PlayCircleOutlined,
+} from "@ant-design/icons"; // 使用 Ant Design 图标
+import { useParams } from "react-router-dom";
 
 interface LectureItemProps {
 	lecture: Lecture;
@@ -12,25 +18,48 @@ interface LectureItemProps {
 export const LectureItem: React.FC<LectureItemProps> = ({
 	lecture,
 	onClick,
-}) => (
-	<div
-		className="w-full flex items-center gap-4 p-4 hover:bg-gray-50 text-left transition-colors cursor-pointer"
-		onClick={() => onClick(lecture.id)}>
-		{lecture.type === LectureType.VIDEO && (
-			<PlayCircleOutlined className="w-5 h-5 text-blue-500 flex-shrink-0" />
-		)}
-		{lecture.type === LectureType.ARTICLE && (
-			<FileTextOutlined className="w-5 h-5 text-blue-500 flex-shrink-0" /> // 为文章类型添加图标
-		)}
-		<div className="flex-grow">
-			<h4 className="font-medium text-gray-800">{lecture.title}</h4>
-			{lecture.subTitle && (
-				<p className="text-sm text-gray-500 mt-1">{lecture.subTitle}</p>
+}) => {
+	const { lectureId } = useParams();
+	const isReading = useMemo(() => {
+		return lecture?.id === lectureId;
+	}, [lectureId, lecture]);
+	return (
+		<div
+			className={`w-full flex items-center gap-4 p-4 text-left transition-colors cursor-pointer 
+			${
+				isReading
+					? "bg-blue-50 border-l-4 border-blue-500 hover:bg-blue-50"
+					: "hover:bg-gray-200"
+			}`}
+			onClick={() => onClick(lecture.id)}>
+			{lecture?.meta?.type === LectureType.VIDEO && (
+				<div className="text-blue-500 flex items-center">
+					<PlayCircleOutlined className="w-5 h-5  flex-shrink-0" />
+					<span>{LessonTypeLabel[lecture?.meta?.type]}</span>
+				</div>
 			)}
+			{lecture?.meta?.type === LectureType.ARTICLE && (
+				<div className="text-blue-500 flex items-center">
+					<FileTextOutlined className="w-5 h-5 text-blue-500 flex-shrink-0" />{" "}
+					<span>{LessonTypeLabel[lecture?.meta?.type]}</span>
+				</div>
+			)}
+			<div className="flex-grow flex justify-between items-center w-2/3 realative">
+				<h4 className="font-medium text-gray-800 w-4/5">
+					{lecture.title}
+				</h4>
+				{lecture.subTitle && (
+					<span className="text-sm text-gray-500 mt-1 w-4/5">
+						{lecture.subTitle}
+					</span>
+				)}
+				<div className="text-gray-500 whitespace-normal">
+					<EyeOutlined></EyeOutlined>
+					<span className="ml-2">
+						{lecture?.views ? lecture?.views : 0}
+					</span>
+				</div>
+			</div>
 		</div>
-		<div className="flex items-center gap-1 text-sm text-gray-500">
-			<ClockCircleOutlined className="w-4 h-4" />
-			<span>{lecture.duration}分钟</span>
-		</div>
-	</div>
-);
+	);
+};
diff --git a/apps/web/src/components/models/course/detail/CourseSyllabus/SectionItem.tsx b/apps/web/src/components/models/course/detail/CourseSyllabus/SectionItem.tsx
index d2a4fe6..3c0a4c5 100755
--- a/apps/web/src/components/models/course/detail/CourseSyllabus/SectionItem.tsx
+++ b/apps/web/src/components/models/course/detail/CourseSyllabus/SectionItem.tsx
@@ -1,10 +1,9 @@
 import { ChevronDownIcon } from "@heroicons/react/24/outline";
 import { SectionDto } from "@nice/common";
 import { AnimatePresence, motion } from "framer-motion";
-import React from "react";
+import React, { useMemo } from "react";
 import { LectureItem } from "./LectureItem";
-
-// components/CourseSyllabus/SectionItem.tsx
+import { useParams } from "react-router-dom";
 interface SectionItemProps {
 	section: SectionDto;
 	index?: number;
@@ -13,57 +12,68 @@ interface SectionItemProps {
 	onLectureClick: (lectureId: string) => void;
 	ref: React.RefObject<HTMLDivElement>;
 }
-
 export const SectionItem = React.forwardRef<HTMLDivElement, SectionItemProps>(
-	({ section, index, isExpanded, onToggle, onLectureClick }, ref) => (
-		<motion.div
-			ref={ref}
-			initial={{ opacity: 0, y: 20 }}
-			animate={{ opacity: 1, y: 0 }}
-			transition={{ duration: 0.3 }}
-			className="border rounded-lg overflow-hidden bg-white shadow-sm hover:shadow-md transition-shadow">
-			<button
-				className="w-full flex items-center justify-between p-4 hover:bg-gray-50 transition-colors"
-				onClick={() => onToggle(section.id)}>
-				<div className="flex items-center gap-4">
-					<span className="text-lg font-medium text-gray-700">
-						第{index}章
-					</span>
-					<div className="flex flex-col items-start">
-						<h3 className="text-left font-medium text-gray-900">
-							{section.title}
-						</h3>
-						<p className="text-sm text-gray-500">
-							{section?.lectures?.length}节课 ·{" "}
-							{/* {Math.floor(section?.totalDuration / 60)}分钟 */}
-						</p>
+	({ section, index, isExpanded, onToggle, onLectureClick }, ref) => {
+		const { lectureId } = useParams();
+		const isReading = useMemo(() => {
+			return (section?.lectures || [])
+				?.map((lecture) => lecture?.id)
+				.includes(lectureId);
+		}, [lectureId, section]);
+		return (
+			<div
+				ref={ref}
+				className="border rounded-lg overflow-hidden bg-white shadow-sm hover:shadow-md transition-shadow">
+				<div
+					className="w-full flex items-center justify-between p-4 hover:bg-gray-50 transition-colors"
+					onClick={() => onToggle(section.id)}>
+					<div className="flex items-center gap-4">
+						<span className="text-lg font-medium text-gray-700">
+							第{index}章
+						</span>
+						<div className="flex flex-col items-start">
+							<h3 className="text-left font-medium text-gray-900">
+								{section.title}
+							</h3>
+							<p className="text-sm text-gray-500">
+								{section?.lectures?.length}节课 ·
+							</p>
+						</div>
+					</div>
+
+					<div className=" flex justify-end gap-2">
+						{isReading && (
+							<span className="text-primary text-sm">
+								正在学习中
+							</span>
+						)}
+						<motion.div
+							animate={{ rotate: isExpanded ? 180 : 0 }}
+							transition={{ duration: 0.2 }}>
+							<ChevronDownIcon className="w-5 h-5 text-gray-500" />
+						</motion.div>
 					</div>
 				</div>
-				<motion.div
-					animate={{ rotate: isExpanded ? 180 : 0 }}
-					transition={{ duration: 0.2 }}>
-					<ChevronDownIcon className="w-5 h-5 text-gray-500" />
-				</motion.div>
-			</button>
 
-			<AnimatePresence>
-				{isExpanded && (
-					<motion.div
-						initial={{ height: 0, opacity: 0 }}
-						animate={{ height: "auto", opacity: 1 }}
-						exit={{ height: 0, opacity: 0 }}
-						transition={{ duration: 0.3 }}
-						className="border-t">
-						{section.lectures.map((lecture) => (
-							<LectureItem
-								key={lecture.id}
-								lecture={lecture}
-								onClick={onLectureClick}
-							/>
-						))}
-					</motion.div>
-				)}
-			</AnimatePresence>
-		</motion.div>
-	)
+				<AnimatePresence>
+					{isExpanded && (
+						<motion.div
+							initial={{ height: 0, opacity: 0 }}
+							animate={{ height: "auto", opacity: 1 }}
+							exit={{ height: 0, opacity: 0 }}
+							transition={{ duration: 0.3 }}
+							className="border-t">
+							{section.lectures.map((lecture) => (
+								<LectureItem
+									key={lecture.id}
+									lecture={lecture}
+									onClick={onLectureClick}
+								/>
+							))}
+						</motion.div>
+					)}
+				</AnimatePresence>
+			</div>
+		);
+	}
 );
diff --git a/apps/web/src/components/models/course/detail/JoinLearingButton.tsx b/apps/web/src/components/models/course/detail/JoinLearingButton.tsx
new file mode 100644
index 0000000..942a7de
--- /dev/null
+++ b/apps/web/src/components/models/course/detail/JoinLearingButton.tsx
@@ -0,0 +1,101 @@
+import { useAuth } from "@web/src/providers/auth-provider";
+import { useContext, useState } from "react";
+import { useNavigate, useParams } from "react-router-dom";
+import { CourseDetailContext } from "./CourseDetailContext";
+import { useStaff } from "@nice/client";
+import {
+	CheckCircleFilled,
+	CheckCircleOutlined,
+	CloseCircleFilled,
+	CloseCircleOutlined,
+	EditFilled,
+	EditTwoTone,
+	LoginOutlined,
+} from "@ant-design/icons";
+import toast from "react-hot-toast";
+
+export default function CourseOperationBtns() {
+	const { id } = useParams();
+	const { isAuthenticated, user, hasSomePermissions, hasEveryPermissions } =
+		useAuth();
+	const navigate = useNavigate();
+	const { course, canEdit, userIsLearning, setUserIsLearning} = useContext(CourseDetailContext);
+	const { update } = useStaff();
+	const [isHovered, setIsHovered] = useState(false);
+	
+	const toggleLearning = async () => {
+		if (!userIsLearning) {
+			await update.mutateAsync({
+				where: { id: user?.id },
+				data: {
+					learningPosts: {
+						connect: { id: course.id },
+					},
+				},
+			});
+			setUserIsLearning(true)
+			toast.success("加入学习成功");
+		} else {
+			
+			await update.mutateAsync({
+				where: { id: user?.id },
+				data: {
+					learningPosts: {
+						disconnect: {
+							id: course.id,
+						},
+					},
+				},
+			});
+			toast.success("退出学习成功");
+			setUserIsLearning(false)
+		}
+	};
+	return (
+		<>
+			{isAuthenticated && (
+				<div
+					onClick={toggleLearning}
+					onMouseEnter={() => setIsHovered(true)}
+					onMouseLeave={() => setIsHovered(false)}
+					className={`flex px-1 py-0.5 gap-1 hover:cursor-pointer   transition-all ${
+						userIsLearning
+							? isHovered
+								? "text-red-500 border-red-500  rounded-md "
+								: "text-green-500 "
+							: "text-primary "
+					}`}>
+					{userIsLearning ? (
+						isHovered ? (
+							<CloseCircleOutlined />
+						) : (
+							<CheckCircleOutlined />
+						)
+					) : (
+						<LoginOutlined />
+					)}
+					<span>
+						{userIsLearning
+							? isHovered
+								? "退出学习"
+								: "正在学习"
+							: "加入学习"}
+					</span>
+				</div>
+			)}
+			{canEdit && (
+				<div
+					className="flex gap-1 px-1 py-0.5 text-primary hover:cursor-pointer"
+					onClick={() => {
+						const url = course?.id
+							? `/course/${course?.id}/editor`
+							: "/course/editor";
+						navigate(url);
+					}}>
+					<EditTwoTone></EditTwoTone>
+					{"编辑课程"}
+				</div>
+			)}
+		</>
+	);
+}
diff --git a/apps/web/src/components/models/course/detail/course-objectives.tsx b/apps/web/src/components/models/course/detail/course-objectives.tsx
deleted file mode 100755
index b849eac..0000000
--- a/apps/web/src/components/models/course/detail/course-objectives.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { CheckOutlined } from '@ant-design/icons';
-import React from 'react';
-interface CourseObjectivesProps {
-    objectives: string[];
-    title?: string;
-}
-const CourseObjectives: React.FC<CourseObjectivesProps> = ({
-    objectives,
-    title = "您将会学到"
-}) => {
-    return (
-        <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-            <h2 className="text-xl font-bold mb-4">{title}</h2>
-            <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-                {objectives.map((objective, index) => (
-                    <div
-                        key={index}
-                        className="flex items-start space-x-3"
-                    >
-                        <CheckOutlined></CheckOutlined>
-                        <span className="text-gray-700">{objective}</span>
-                    </div>
-                ))}
-            </div>
-        </div>
-    );
-};
-
-export default CourseObjectives;
\ No newline at end of file
diff --git a/apps/web/src/components/models/course/editor/context/CourseEditorContext.tsx b/apps/web/src/components/models/course/editor/context/CourseEditorContext.tsx
index efa4962..6cbfd00 100755
--- a/apps/web/src/components/models/course/editor/context/CourseEditorContext.tsx
+++ b/apps/web/src/components/models/course/editor/context/CourseEditorContext.tsx
@@ -1,7 +1,9 @@
 import { createContext, useContext, ReactNode, useEffect } from "react";
 import { Form, FormInstance, message } from "antd";
 import {
+	courseDetailSelect,
 	CourseDto,
+	CourseMeta,
 	CourseStatus,
 	ObjectType,
 	PostType,
@@ -10,6 +12,7 @@ import {
 import { api, usePost } from "@nice/client";
 import { useNavigate } from "react-router-dom";
 import { z } from "zod";
+import { useAuth } from "@web/src/providers/auth-provider";
 
 export type CourseFormData = {
 	title: string;
@@ -42,12 +45,11 @@ export function CourseFormProvider({
 }: CourseFormProviderProps) {
 	const [form] = Form.useForm<CourseFormData>();
 	const { create, update, createCourse } = usePost();
+	const { user } = useAuth();
 	const { data: course }: { data: CourseDto } = api.post.findFirst.useQuery(
 		{
 			where: { id: editId },
-			include: {
-				terms: true,
-			},
+			select: courseDetailSelect,
 		},
 		{ enabled: Boolean(editId) }
 	);
@@ -62,13 +64,15 @@ export function CourseFormProvider({
 
 	useEffect(() => {
 		if (course) {
+			const deptIds = (course?.depts || [])?.map((dept) => dept.id);
 			const formData = {
 				title: course.title,
 				subTitle: course.subTitle,
 				content: course.content,
-				thumbnail: course?.meta?.thumbnail,
-				requirements: course?.meta?.requirements,
-				objectives: course?.meta?.objectives,
+				deptIds: deptIds,
+				meta: {
+					thumbnail: course?.meta?.thumbnail,
+				},
 			};
 			course.terms?.forEach((term) => {
 				formData[term.taxonomyId] = term.id; // 假设 taxonomyName 是您在 Form.Item 中使用的 name
@@ -77,51 +81,70 @@ export function CourseFormProvider({
 		}
 	}, [course, form]);
 
-	const onSubmit = async (values: CourseFormData) => {
-		console.log(values);
+	const onSubmit = async (values: any) => {
+		
 		const sections = values?.sections || [];
+		const deptIds = values?.deptIds || [];
 		const termIds = taxonomies
 			.map((tax) => values[tax.id]) // 获取每个 taxonomy 对应的选中值
 			.filter((id) => id); // 过滤掉空值
 
 		const formattedValues = {
 			...values,
+			type: PostType.COURSE,
 			meta: {
-				requirements: values.requirements,
-				objectives: values.objectives,
-			},
-			terms: {
-				connect: termIds.map((id) => ({ id })), // 转换成 connect 格式
+				...((course?.meta as CourseMeta) || {}),
+				...(values?.meta?.thumbnail !== undefined && {
+					thumbnail: values?.meta?.thumbnail,
+				}),
 			},
+			terms:
+				termIds?.length > 0
+					? {
+							[editId ? "set" : "connect"]: termIds.map((id) => ({
+								id,
+							})), // 转换成 connect 格式
+						}
+					: undefined,
+			depts:
+				deptIds?.length > 0
+					? {
+							[editId ? "set" : "connect"]: deptIds.map((id) => ({
+								id,
+							})),
+						}
+					: undefined,
 		};
 		// 删除原始的 taxonomy 字段
 		taxonomies.forEach((tax) => {
 			delete formattedValues[tax.id];
 		});
-		delete formattedValues.requirements;
-		delete formattedValues.objectives;
 		delete formattedValues.sections;
+		delete formattedValues.deptIds;
+
 		try {
 			if (editId) {
-				await update.mutateAsync({
+				const result = await update.mutateAsync({
 					where: { id: editId },
 					data: formattedValues,
 				});
 				message.success("课程更新成功！");
+				navigate(`/course/${result.id}/editor/content`);
 			} else {
 				const result = await createCourse.mutateAsync({
 					courseDetail: {
 						data: {
-							title: formattedValues.title || "12345",
-							state: CourseStatus.DRAFT,
+							title: formattedValues.title,
+
+							// state: CourseStatus.DRAFT,
 							type: PostType.COURSE,
 							...formattedValues,
 						},
 					},
 					sections,
 				});
-				navigate(`/course/${result.id}/editor`, { replace: true });
 				message.success("课程创建成功！");
+				navigate(`/course/${result.id}/editor/content`);
 			}
 			form.resetFields();
 		} catch (error) {
@@ -130,6 +153,7 @@ export function CourseFormProvider({
 		}
 	};
 
+
 	return (
 		<CourseEditorContext.Provider
 			value={{
diff --git a/apps/web/src/components/models/course/editor/form/CourseBasicForm.tsx b/apps/web/src/components/models/course/editor/form/CourseBasicForm.tsx
index 333e94d..69f6b0e 100755
--- a/apps/web/src/components/models/course/editor/form/CourseBasicForm.tsx
+++ b/apps/web/src/components/models/course/editor/form/CourseBasicForm.tsx
@@ -4,11 +4,12 @@ import { convertToOptions } from "@nice/client";
 import TermSelect from "../../../term/term-select";
 import { useCourseEditor } from "../context/CourseEditorContext";
 import AvatarUploader from "@web/src/components/common/uploader/AvatarUploader";
+import DepartmentSelect from "../../../department/department-select";
 
 const { TextArea } = Input;
 
 export function CourseBasicForm() {
-	// 将 CourseLevelLabel 转换为 Ant Design Select 需要的选项格式
+	// 将 CourseLevelLabel 使用 Object.entries 将 CourseLevelLabel 对象转换为键值对数组。
 	const levelOptions = Object.entries(CourseLevelLabel).map(
 		([key, value]) => ({
 			label: value,
@@ -31,15 +32,26 @@ export function CourseBasicForm() {
 			<Form.Item
 				name="subTitle"
 				label="课程副标题"
-				rules={[{ max: 10, message: "副标题最多10个字符" }]}>
+				rules={[{ max: 20, message: "副标题最多20个字符" }]}>
 				<Input placeholder="请输入课程副标题" />
 			</Form.Item>
+			<Form.Item name={["meta", "thumbnail"]} label="课程封面">
+				<AvatarUploader
+					style={{
+						width: "192px",
+						height: "108px",
+						margin: " 0 10px",
+					}}></AvatarUploader>
+			</Form.Item>
 			<Form.Item name="content" label="课程描述">
 				<TextArea
 					placeholder="请输入课程描述"
 					autoSize={{ minRows: 3, maxRows: 6 }}
 				/>
 			</Form.Item>
+			<Form.Item name="deptIds" label="参与单位">
+				<DepartmentSelect multiple />
+			</Form.Item>
 			{taxonomies &&
 				taxonomies.map((tax, index) => (
 					<Form.Item
diff --git a/apps/web/src/components/models/course/editor/form/CourseContentForm/CourseContentForm.tsx b/apps/web/src/components/models/course/editor/form/CourseContentForm/CourseContentForm.tsx
index ee0916a..6b0e103 100755
--- a/apps/web/src/components/models/course/editor/form/CourseContentForm/CourseContentForm.tsx
+++ b/apps/web/src/components/models/course/editor/form/CourseContentForm/CourseContentForm.tsx
@@ -24,6 +24,7 @@ import { CourseContentFormHeader } from "./CourseContentFormHeader";
 import { CourseSectionEmpty } from "./CourseSectionEmpty";
 import { SortableSection } from "./SortableSection";
 import { LectureList } from "./LectureList";
+import toast from "react-hot-toast";
 
 const CourseContentForm: React.FC = () => {
 	const { editId } = useCourseEditor();
@@ -33,7 +34,7 @@ const CourseContentForm: React.FC = () => {
 			coordinateGetter: sortableKeyboardCoordinates,
 		})
 	);
-	const { softDeleteByIds } = usePost();
+	const { softDeleteByIds, updateOrderByIds } = usePost();
 	const { data: sections = [], isLoading } = api.post.findMany.useQuery(
 		{
 			where: {
@@ -41,6 +42,9 @@ const CourseContentForm: React.FC = () => {
 				type: PostType.SECTION,
 				deletedAt: null,
 			},
+			orderBy: {
+				order: "asc",
+			},
 		},
 		{
 			enabled: !!editId,
@@ -56,11 +60,15 @@ const CourseContentForm: React.FC = () => {
 	const handleDragEnd = (event: DragEndEvent) => {
 		const { active, over } = event;
 		if (!over || active.id === over.id) return;
-
+		let newItems = [];
 		setItems((items) => {
 			const oldIndex = items.findIndex((item) => item.id === active.id);
 			const newIndex = items.findIndex((item) => item.id === over.id);
-			return arrayMove(items, oldIndex, newIndex);
+			newItems = arrayMove(items, oldIndex, newIndex);
+			return newItems;
+		});
+		updateOrderByIds.mutateAsync({
+			ids: newItems.map((item) => item.id),
 		});
 	};
 
@@ -107,10 +115,11 @@ const CourseContentForm: React.FC = () => {
 				icon={<PlusOutlined />}
 				className="mt-4"
 				onClick={() => {
-					setItems([
-						...items.filter((item) => !!item.id),
-						{ id: null, title: "" },
-					]);
+					if (items.some((item) => item.id === null)) {
+						toast.error("请先保存当前编辑的章节");
+					} else {
+						setItems([...items, { id: null, title: "" }]);
+					}
 				}}>
 				添加章节
 			</Button>
diff --git a/apps/web/src/components/models/course/editor/form/CourseContentForm/LectureList.tsx b/apps/web/src/components/models/course/editor/form/CourseContentForm/LectureList.tsx
index 8395c94..138fc0f 100755
--- a/apps/web/src/components/models/course/editor/form/CourseContentForm/LectureList.tsx
+++ b/apps/web/src/components/models/course/editor/form/CourseContentForm/LectureList.tsx
@@ -33,11 +33,17 @@ import {
 	useSortable,
 	verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
-import { Lecture, LectureType, PostType } from "@nice/common";
+import {
+	Lecture,
+	lectureDetailSelect,
+	LectureType,
+	PostType,
+} from "@nice/common";
 import { useCourseEditor } from "../../context/CourseEditorContext";
 import { usePost } from "@nice/client";
 import { LectureData, SectionData } from "./interface";
 import { SortableLecture } from "./SortableLecture";
+import toast from "react-hot-toast";
 
 interface LectureListProps {
 	field: SectionData;
@@ -48,7 +54,7 @@ export const LectureList: React.FC<LectureListProps> = ({
 	field,
 	sectionId,
 }) => {
-	const { softDeleteByIds } = usePost();
+	const { softDeleteByIds, updateOrderByIds } = usePost();
 	const { data: lectures = [], isLoading } = (
 		api.post.findMany as any
 	).useQuery(
@@ -58,6 +64,10 @@ export const LectureList: React.FC<LectureListProps> = ({
 				type: PostType.LECTURE,
 				deletedAt: null,
 			},
+			orderBy: {
+				order: "asc",
+			},
+			select: lectureDetailSelect,
 		},
 		{
 			enabled: !!sectionId,
@@ -65,7 +75,7 @@ export const LectureList: React.FC<LectureListProps> = ({
 	);
 
 	// 用 lectures 初始化 items 状态
-	const [items, setItems] = useState<LectureData[]>(lectures);
+	const [items, setItems] = useState<Lecture[]>(lectures);
 
 	// 当 lectures 变化时更新 items
 	useEffect(() => {
@@ -84,22 +94,24 @@ export const LectureList: React.FC<LectureListProps> = ({
 	const handleDragEnd = (event: DragEndEvent) => {
 		const { active, over } = event;
 		if (!over || active.id === over.id) return;
-
+		// updateOrder.mutateAsync({
+		// 	id: active.id,
+		// 	overId: over.id,
+		// });
+		let newItems = [];
 		setItems((items) => {
 			const oldIndex = items.findIndex((item) => item.id === active.id);
 			const newIndex = items.findIndex((item) => item.id === over.id);
-			return arrayMove(items, oldIndex, newIndex);
+			newItems = arrayMove(items, oldIndex, newIndex);
+			return newItems;
+		});
+		updateOrderByIds.mutateAsync({
+			ids: newItems.map((item) => item.id),
 		});
 	};
 
 	return (
 		<div className="pl-8">
-			{/* <Button
-				onClick={() => {
-					console.log(lectures);
-				}}>
-				123
-			</Button> */}
 			<DndContext
 				sensors={sensors}
 				collisionDetection={closestCenter}
@@ -130,16 +142,20 @@ export const LectureList: React.FC<LectureListProps> = ({
 				icon={<PlusOutlined />}
 				className="mt-4"
 				onClick={() => {
-					setItems((prevItems) => [
-						...prevItems.filter((item) => !!item.id),
-						{
-							id: null,
-							title: "",
-							meta: {
-								type: LectureType.ARTICLE,
-							},
-						},
-					]);
+					if (items.some((item) => item.id === null)) {
+						toast.error("请先保存当前编辑中的课时！");
+					} else {
+						setItems((prevItems) => [
+							...prevItems.filter((item) => !!item.id),
+							{
+								id: null,
+								title: "",
+								meta: {
+									type: LectureType.ARTICLE,
+								},
+							} as Lecture,
+						]);
+					}
 				}}>
 				添加课时
 			</Button>
diff --git a/apps/web/src/components/models/course/editor/form/CourseContentForm/SortableLecture.tsx b/apps/web/src/components/models/course/editor/form/CourseContentForm/SortableLecture.tsx
index 4f11be4..2f74c61 100755
--- a/apps/web/src/components/models/course/editor/form/CourseContentForm/SortableLecture.tsx
+++ b/apps/web/src/components/models/course/editor/form/CourseContentForm/SortableLecture.tsx
@@ -2,6 +2,7 @@ import {
 	DragOutlined,
 	CaretRightOutlined,
 	SaveOutlined,
+	CaretDownOutlined,
 } from "@ant-design/icons";
 import { Form, Button, Input, Select, Space } from "antd";
 import React, { useState } from "react";
@@ -9,13 +10,26 @@ import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import QuillEditor from "@web/src/components/common/editor/quill/QuillEditor";
 import { TusUploader } from "@web/src/components/common/uploader/TusUploader";
-import { LectureType, LessonTypeLabel, PostType } from "@nice/common";
+import {
+	Lecture,
+	LectureType,
+	LessonTypeLabel,
+	PostType,
+	ResourceStatus,
+	videoMimeTypes,
+} from "@nice/common";
 import { usePost } from "@nice/client";
 import toast from "react-hot-toast";
-import { LectureData } from "./interface";
+
+import { env } from "@web/src/env";
+import CollapsibleContent from "@web/src/components/common/container/CollapsibleContent";
+import { VideoPlayer } from "@web/src/components/presentation/video-player/VideoPlayer";
+import MultiAvatarUploader from "@web/src/components/common/uploader/MultiAvatarUploader";
+import ResourcesShower from "@web/src/components/common/uploader/ResourceShower";
+import { set } from "idb-keyval";
 
 interface SortableLectureProps {
-	field: LectureData;
+	field: Lecture;
 	remove: () => void;
 	sectionFieldKey: string;
 }
@@ -36,6 +50,11 @@ export const SortableLecture: React.FC<SortableLectureProps> = ({
 	const [form] = Form.useForm();
 	const [editing, setEditing] = useState(field?.id ? false : true);
 	const [loading, setLoading] = useState(false);
+	const [isContentVisible, setIsContentVisible] = useState(false); // State to manage content visibility
+
+	const handleToggleContent = () => {
+		setIsContentVisible(!isContentVisible); // Toggle content visibility
+	};
 	const lectureType =
 		Form.useWatch(["meta", "type"], form) || LectureType.ARTICLE;
 	const handleSave = async () => {
@@ -43,7 +62,13 @@ export const SortableLecture: React.FC<SortableLectureProps> = ({
 			setLoading(true);
 			const values = await form.validateFields();
 			let result;
-
+			const fileIds = values?.meta?.fileIds || [];
+			const videoUrlId = Array.isArray(values?.meta?.videoIds)
+				? values?.meta?.videoIds[0]
+				: typeof values?.meta?.videoIds === "string"
+					? values?.meta?.videoIds
+					: undefined;
+			console.log(sectionFieldKey);
 			if (!field.id) {
 				result = await create.mutateAsync({
 					data: {
@@ -52,15 +77,22 @@ export const SortableLecture: React.FC<SortableLectureProps> = ({
 						title: values?.title,
 						meta: {
 							type: values?.meta?.type,
-							fileIds: values?.meta?.fileIds,
-						},
-						resources: {
-							connect: (values?.meta?.fileIds || []).map(
-								(fileId) => ({
-									fileId,
-								})
-							),
+							fileIds: fileIds,
+							videoIds: videoUrlId ? [videoUrlId] : [],
+							videoUrl: videoUrlId
+								? `http://${env.SERVER_IP}:${env.FILE_PORT}/uploads/${videoUrlId}/stream/index.m3u8`
+								: undefined,
 						},
+						resources:
+							[videoUrlId, ...fileIds].filter(Boolean)?.length > 0
+								? {
+										connect: [videoUrlId, ...fileIds]
+											.filter(Boolean)
+											.map((fileId) => ({
+												fileId,
+											})),
+									}
+								: undefined,
 						content: values?.content,
 					},
 				});
@@ -70,22 +102,31 @@ export const SortableLecture: React.FC<SortableLectureProps> = ({
 						id: field?.id,
 					},
 					data: {
+						parentId: sectionFieldKey,
 						title: values?.title,
 						meta: {
 							type: values?.meta?.type,
-							fieldIds: values?.meta?.fileIds,
-						},
-						resources: {
-							connect: (values?.meta?.fileIds || []).map(
-								(fileId) => ({
-									fileId,
-								})
-							),
+							fileIds: fileIds,
+							videoIds: videoUrlId ? [videoUrlId] : [],
+							videoUrl: videoUrlId
+								? `http://${env.SERVER_IP}:${env.FILE_PORT}/uploads/${videoUrlId}/stream/index.m3u8`
+								: undefined,
 						},
+						resources:
+							[videoUrlId, ...fileIds].filter(Boolean)?.length > 0
+								? {
+										set: [videoUrlId, ...fileIds]
+											.filter(Boolean)
+											.map((fileId) => ({
+												fileId,
+											})),
+									}
+								: undefined,
 						content: values?.content,
 					},
 				});
 			}
+			setIsContentVisible(false);
 			toast.success("课时已更新");
 			field.id = result.id;
 			setEditing(false);
@@ -113,7 +154,9 @@ export const SortableLecture: React.FC<SortableLectureProps> = ({
 							name="title"
 							initialValue={field?.title}
 							className="mb-0 flex-1"
-							rules={[{ required: true }]}>
+							rules={[
+								{ required: true, message: "请输入课时标题" },
+							]}>
 							<Input placeholder="课时标题" />
 						</Form.Item>
 						<Form.Item
@@ -135,18 +178,38 @@ export const SortableLecture: React.FC<SortableLectureProps> = ({
 					<div className="mt-4 flex flex-1 ">
 						{lectureType === LectureType.VIDEO ? (
 							<Form.Item
-								name={["meta", "fileIds"]}
+								name={["meta", "videoIds"]}
 								className="mb-0 flex-1"
-								rules={[{ required: true }]}>
-								<TusUploader multiple={false} />
+								rules={[
+									{
+										required: true,
+										message: "请传入视频",
+									},
+								]}>
+								<TusUploader
+									allowTypes={videoMimeTypes}
+									multiple={false}
+								/>
 							</Form.Item>
 						) : (
-							<Form.Item
-								name="content"
-								className="mb-0 flex-1"
-								rules={[{ required: true }]}>
-								<QuillEditor />
-							</Form.Item>
+							<div>
+								<Form.Item
+									name="content"
+									className="mb-0 flex-1"
+									rules={[
+										{
+											required: true,
+											message: "请输入内容",
+										},
+									]}>
+									<QuillEditor />
+								</Form.Item>
+								<Form.Item
+									name={["meta", "fileIds"]}
+									className="mb-0 flex-1">
+									<TusUploader multiple={true} />
+								</Form.Item>
+							</div>
 						)}
 					</div>
 
@@ -177,7 +240,11 @@ export const SortableLecture: React.FC<SortableLectureProps> = ({
 							{...listeners}
 							className="cursor-move"
 						/>
-						<CaretRightOutlined />
+						{isContentVisible ? (
+							<CaretDownOutlined onClick={handleToggleContent} />
+						) : (
+							<CaretRightOutlined onClick={handleToggleContent} />
+						)}
 						<span>{LessonTypeLabel[field?.meta?.type]}</span>
 						<span>{field?.title || "未命名课时"}</span>
 					</Space>
@@ -191,6 +258,22 @@ export const SortableLecture: React.FC<SortableLectureProps> = ({
 					</Space>
 				</div>
 			)}
+			{isContentVisible &&
+				!editing && // Conditionally render content based on type
+				(field?.meta?.type === LectureType.ARTICLE ? (
+					<div>
+						<CollapsibleContent
+							maxHeight={200}
+							content={field?.content}
+						/>
+						<div className="px-6 ">
+							<ResourcesShower
+								resources={field?.resources}></ResourcesShower>
+						</div>
+					</div>
+				) : (
+					<VideoPlayer src={field?.meta?.videoUrl} />
+				))}
 		</div>
 	);
 };
diff --git a/apps/web/src/components/models/course/editor/form/CourseContentForm/SortableSection.tsx b/apps/web/src/components/models/course/editor/form/CourseContentForm/SortableSection.tsx
index aea9b29..1b6dfaa 100755
--- a/apps/web/src/components/models/course/editor/form/CourseContentForm/SortableSection.tsx
+++ b/apps/web/src/components/models/course/editor/form/CourseContentForm/SortableSection.tsx
@@ -69,6 +69,9 @@ export const SortableSection: React.FC<SortableSectionProps> = ({
 					});
 				} else {
 					result = await update.mutateAsync({
+						where: {
+							id: field?.id,
+						},
 						data: {
 							title: values?.title,
 						},
@@ -132,7 +135,7 @@ export const SortableSection: React.FC<SortableSectionProps> = ({
 							</Form>
 						) : (
 							<div className="flex items-center justify-between">
-								<Space>
+								<Space className=" flex">
 									<DragOutlined
 										{...attributes}
 										{...listeners}
@@ -140,19 +143,28 @@ export const SortableSection: React.FC<SortableSectionProps> = ({
 									/>
 									<span>{field.title || "未命名章节"}</span>
 								</Space>
-								<Space>
-									<Button
-										type="link"
-										onClick={() => setEditing(true)}>
-										编辑
-									</Button>
-									<Button type="link" danger onClick={remove}>
-										删除
-									</Button>
-								</Space>
 							</div>
 						)
 					}
+					extra={
+						!editing && (
+							<Space onClick={(e) => e.stopPropagation()}>
+								<Button
+									size="small"
+									type="link"
+									onClick={() => setEditing(true)}>
+									编辑
+								</Button>
+								<Button
+									size="small"
+									type="link"
+									danger
+									onClick={remove}>
+									删除
+								</Button>
+							</Space>
+						)
+					}
 					key={field.id || "new"}>
 					{children}
 				</Collapse.Panel>
diff --git a/apps/web/src/components/models/course/editor/form/CourseGoalForm.tsx b/apps/web/src/components/models/course/editor/form/CourseGoalForm.tsx
deleted file mode 100755
index 5254f7a..0000000
--- a/apps/web/src/components/models/course/editor/form/CourseGoalForm.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { FormArrayField } from "@web/src/components/common/form/FormArrayField";
-import { useFormContext } from "react-hook-form";
-import { CourseFormData } from "../context/CourseEditorContext";
-import InputList from "@web/src/components/common/input/InputList";
-import { useState } from "react";
-import { Form } from "antd";
-
-export function CourseGoalForm() {
-	return (
-		<div className="max-w-2xl mx-auto space-y-6 p-6">
-			<Form.Item name="requirements" label="前置要求">
-				<InputList placeholder="请输入前置要求"></InputList>
-			</Form.Item>
-			<Form.Item name="objectives" label="学习目标">
-				<InputList placeholder="请输入学习目标"></InputList>
-			</Form.Item>
-		</div>
-	);
-}
diff --git a/apps/web/src/components/models/course/editor/form/CourseSettingForm.tsx b/apps/web/src/components/models/course/editor/form/CourseSettingForm.tsx
deleted file mode 100755
index 13cadb6..0000000
--- a/apps/web/src/components/models/course/editor/form/CourseSettingForm.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import AvatarUploader from "@web/src/components/common/uploader/AvatarUploader";
-import { Form, Input } from "antd";
-
-export default function CourseSettingForm() {
-    return (
-        <div className="max-w-2xl mx-auto space-y-6 p-6">
-			<Form.Item
-				name="title"
-				label="课程预览图"
-			>
-			<AvatarUploader
-				style={
-					{
-						width: "120px",
-						height: "120px",
-						margin:" 0 10px"
-					}
-				}
-				onChange={(value) => {
-					console.log(value);
-				}}
-			></AvatarUploader>
-			</Form.Item>
-		</div>
-    )
-}
\ No newline at end of file
diff --git a/apps/web/src/components/models/course/editor/layout/CourseEditorHeader.tsx b/apps/web/src/components/models/course/editor/layout/CourseEditorHeader.tsx
index 91471ef..a3197f8 100755
--- a/apps/web/src/components/models/course/editor/layout/CourseEditorHeader.tsx
+++ b/apps/web/src/components/models/course/editor/layout/CourseEditorHeader.tsx
@@ -4,6 +4,7 @@ import { useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import { CourseStatus, CourseStatusLabel } from "@nice/common";
 import { useCourseEditor } from "../context/CourseEditorContext";
+import { useAuth } from "@web/src/providers/auth-provider";
 
 const { Title } = Typography;
 
@@ -16,6 +17,8 @@ const courseStatusVariant: Record<CourseStatus, string> = {
 
 export default function CourseEditorHeader() {
 	const navigate = useNavigate();
+	const { user, hasSomePermissions } = useAuth();
+
 	const { onSubmit, course, form } = useCourseEditor();
 
 	const handleSave = () => {
@@ -34,14 +37,20 @@ export default function CourseEditorHeader() {
 				<div className="flex items-center space-x-3">
 					<Button
 						icon={<ArrowLeftOutlined />}
-						onClick={() => navigate(-1)}
+						onClick={() => {
+							if (course?.id) {
+								navigate(`/course/${course?.id}/detail`);
+							} else {
+								navigate("/");
+							}
+						}}
 						type="text"
 					/>
 					<div className="flex items-center space-x-2">
 						<Title level={4} style={{ margin: 0 }}>
 							{course?.title || "新建课程"}
 						</Title>
-						<Tag
+						{/* <Tag
 							color={
 								courseStatusVariant[
 									course?.state || CourseStatus.DRAFT
@@ -50,20 +59,20 @@ export default function CourseEditorHeader() {
 							{course?.state
 								? CourseStatusLabel[course.state]
 								: CourseStatusLabel[CourseStatus.DRAFT]}
-						</Tag>
-						{course?.duration && (
+						</Tag> */}
+						{/* {course?.duration && (
 							<span className="hidden md:flex items-center text-gray-500 text-sm">
 								<ClockCircleOutlined
 									style={{ marginRight: 4 }}
 								/>
 								总时长 {course.duration}
 							</span>
-						)}
+						)} */}
 					</div>
 				</div>
 				<Button
 					type="primary"
-					size="small"
+					// size="small"
 					onClick={handleSave}
 					// disabled={form
 					// 	.getFieldsError()
diff --git a/apps/web/src/components/models/course/editor/layout/CourseEditorLayout.tsx b/apps/web/src/components/models/course/editor/layout/CourseEditorLayout.tsx
index caf8953..aaa823d 100755
--- a/apps/web/src/components/models/course/editor/layout/CourseEditorLayout.tsx
+++ b/apps/web/src/components/models/course/editor/layout/CourseEditorLayout.tsx
@@ -2,63 +2,65 @@ import { ReactNode, useEffect, useState } from "react";
 import { Outlet, useNavigate, useParams } from "react-router-dom";
 import CourseEditorHeader from "./CourseEditorHeader";
 import { motion } from "framer-motion";
-import { NavItem } from "@nice/client"
+import { NavItem } from "@nice/client";
 import CourseEditorSidebar from "./CourseEditorSidebar";
 import { CourseFormProvider } from "../context/CourseEditorContext";
 import { getNavItems } from "../navItems";
 
-
 export default function CourseEditorLayout() {
-    const { id } = useParams();
-    const [isHovered, setIsHovered] = useState(false);
-    const [selectedSection, setSelectedSection] = useState<number>(0);
-    const [navItems, setNavItems] = useState<NavItem[]>(getNavItems(id));
-    useEffect(() => {
-        setNavItems(getNavItems(id))
-    }, [id])
-    useEffect(() => {
-        const currentPath = location.pathname;
-        const index = navItems.findIndex(item => item.path === currentPath);
-        if (index !== -1) {
-            setSelectedSection(index);
-        }
-    }, [location.pathname, navItems]);
-    const navigate = useNavigate();
-    const handleNavigation = (item: NavItem, index: number) => {
-        setSelectedSection(index);
-        navigate(item.path, { replace: true });
-    };
-    return (
-        <CourseFormProvider editId={id}>
-            <div className="min-h-screen bg-gray-50">
-                <CourseEditorHeader />
-                <div className="flex pt-16">
-                    <CourseEditorSidebar
-                        isHovered={isHovered}
-                        setIsHovered={setIsHovered}
-                        navItems={navItems}
-                        selectedSection={selectedSection}
-                        onNavigate={handleNavigation}
-                    />
-                    <motion.main
-                        animate={{ marginLeft: isHovered ? "16rem" : "5rem" }}
-                        transition={{ type: "spring", stiffness: 200, damping: 25, mass: 1 }}
-                        className="flex-1 p-8"
-                    >
-                        <div className="max-w-6xl mx-auto bg-white rounded-xl shadow-lg">
-                            <header className="p-6 border-b border-gray-100">
-                                <h1 className="text-2xl font-bold text-gray-900">
-                                    {navItems[selectedSection]?.label}
-                                </h1>
-                            </header>
-                            <div className="p-6">
-                                <Outlet></Outlet>
-                            </div>
-                        </div>
-                    </motion.main>
-                </div>
-            </div>
-        </CourseFormProvider>
-
-    );
-}
\ No newline at end of file
+	const { id } = useParams();
+	const [isHovered, setIsHovered] = useState(false);
+	const [selectedSection, setSelectedSection] = useState<number>(0);
+	const [navItems, setNavItems] = useState<NavItem[]>(getNavItems(id));
+	useEffect(() => {
+		setNavItems(getNavItems(id));
+	}, [id]);
+	useEffect(() => {
+		const currentPath = location.pathname;
+		const index = navItems.findIndex((item) => item.path === currentPath);
+		if (index !== -1) {
+			setSelectedSection(index);
+		}
+	}, [location.pathname, navItems]);
+	const navigate = useNavigate();
+	const handleNavigation = (item: NavItem, index: number) => {
+		setSelectedSection(index);
+		navigate(item.path);
+	};
+	return (
+		<CourseFormProvider editId={id}>
+			<div className="min-h-screen bg-gray-50">
+				<CourseEditorHeader />
+				<div className="flex pt-16">
+					<CourseEditorSidebar
+						isHovered={isHovered}
+						setIsHovered={setIsHovered}
+						navItems={navItems}
+						selectedSection={selectedSection}
+						onNavigate={handleNavigation}
+					/>
+					<motion.main
+						animate={{ marginLeft: "16rem" }}
+						transition={{
+							type: "spring",
+							stiffness: 200,
+							damping: 25,
+							mass: 1,
+						}}
+						className="flex-1 p-8">
+						<div className="max-w-6xl mx-auto bg-white rounded-xl shadow-lg">
+							<header className="p-6 border-b border-gray-100">
+								<h1 className="text-2xl font-bold text-gray-900">
+									{navItems[selectedSection]?.label}
+								</h1>
+							</header>
+							<div className="p-6">
+								<Outlet></Outlet>
+							</div>
+						</div>
+					</motion.main>
+				</div>
+			</div>
+		</CourseFormProvider>
+	);
+}
diff --git a/apps/web/src/components/models/course/editor/layout/CourseEditorSidebar.tsx b/apps/web/src/components/models/course/editor/layout/CourseEditorSidebar.tsx
index 2c23177..764aa9a 100755
--- a/apps/web/src/components/models/course/editor/layout/CourseEditorSidebar.tsx
+++ b/apps/web/src/components/models/course/editor/layout/CourseEditorSidebar.tsx
@@ -1,6 +1,7 @@
 import { motion } from "framer-motion";
 import { NavItem } from "@nice/client";
 import { useCourseEditor } from "../context/CourseEditorContext";
+import toast from "react-hot-toast";
 interface CourseSidebarProps {
 	id?: string | undefined;
 	isHovered: boolean;
@@ -23,21 +24,22 @@ export default function CourseEditorSidebar({
 	const { editId } = useCourseEditor();
 	return (
 		<motion.nav
-			initial={{ width: "5rem" }}
-			animate={{ width: isHovered ? "16rem" : "5rem" }}
+			animate={{ width: "16rem" }}
 			transition={{ type: "spring", stiffness: 300, damping: 40 }}
-			onHoverStart={() => setIsHovered(true)}
-			onHoverEnd={() => setIsHovered(false)}
 			className="fixed left-0 top-16 h-[calc(100vh-4rem)] bg-white border-r border-gray-200 shadow-lg overflow-x-hidden">
 			<div className="p-4">
 				{navItems.map((item, index) => (
 					<button
 						key={index}
 						type="button"
-						disabled={!editId && !item.isInitialized}
 						onClick={(e) => {
-							e.preventDefault();
-							onNavigate(item, index);
+							if (!editId && !item.isInitialized) {
+								e.preventDefault();
+								toast.error("请先完成课程概述填写并保存"); // 提示信息
+							} else {
+								e.preventDefault();
+								onNavigate(item, index);
+							}
 						}}
 						className={`w-full flex ${!isHovered ? "justify-center" : "items-center"} px-5 py-2.5 mb-1 rounded-lg transition-all duration-200 ${
 							selectedSection === index
@@ -45,16 +47,13 @@ export default function CourseEditorSidebar({
 								: "text-gray-600 hover:bg-gray-50"
 						}`}>
 						<span className="flex-shrink-0">{item.icon}</span>
-						{isHovered && (
+						{
 							<>
-								<motion.span
-									initial={{ opacity: 0 }}
-									animate={{ opacity: 1 }}
-									className="ml-3 font-medium flex-1 truncate">
+								<span className="ml-3 font-medium flex-1 truncate">
 									{item.label}
-								</motion.span>
+								</span>
 							</>
-						)}
+						}
 					</button>
 				))}
 			</div>
diff --git a/apps/web/src/components/models/course/editor/navItems.tsx b/apps/web/src/components/models/course/editor/navItems.tsx
index b475bbb..4aa346e 100755
--- a/apps/web/src/components/models/course/editor/navItems.tsx
+++ b/apps/web/src/components/models/course/editor/navItems.tsx
@@ -15,22 +15,22 @@ export const getNavItems = (
 		path: `/course/${courseId ? `${courseId}/` : ""}editor`,
 		isInitialized: true,
 	},
-	{
-		label: "目标学员",
-		icon: <AcademicCapIcon className="w-5 h-5" />,
-		path: `/course/${courseId ? `${courseId}/` : ""}editor/goal`,
-		isInitialized: false,
-	},
+	// {
+	// 	label: "目标学员",
+	// 	icon: <AcademicCapIcon className="w-5 h-5" />,
+	// 	path: `/course/${courseId ? `${courseId}/` : ""}editor/goal`,
+	// 	isInitialized: false,
+	// },
 	{
 		label: "课程内容",
 		icon: <VideoCameraIcon className="w-5 h-5" />,
 		path: `/course/${courseId ? `${courseId}/` : ""}editor/content`,
 		isInitialized: false,
 	},
-	{
-		label: "课程设置",
-		icon: <Cog6ToothIcon className="w-5 h-5" />,
-		path: `/course/${courseId ? `${courseId}/` : ""}editor/setting`,
-		isInitialized: false,
-	},
+	// {
+	// 	label: "课程设置",
+	// 	icon: <Cog6ToothIcon className="w-5 h-5" />,
+	// 	path: `/course/${courseId ? `${courseId}/` : ""}editor/setting`,
+	// 	isInitialized: false,
+	// },
 ];
diff --git a/apps/web/src/components/models/course/list/PostList.tsx b/apps/web/src/components/models/course/list/PostList.tsx
new file mode 100755
index 0000000..ce9da18
--- /dev/null
+++ b/apps/web/src/components/models/course/list/PostList.tsx
@@ -0,0 +1,97 @@
+import { Pagination, Empty, Skeleton } from "antd";
+import { courseDetailSelect, CourseDto, PostDto, Prisma } from "@nice/common";
+import { api } from "@nice/client";
+import { DefaultArgs } from "@prisma/client/runtime/library";
+import React, { useEffect, useMemo, useState } from "react";
+interface PostListProps {
+	params?: {
+		page?: number;
+		pageSize?: number;
+		where?: Prisma.PostWhereInput;
+		select?: Prisma.PostSelect<DefaultArgs>;
+	};
+	cols?: number;
+	showPagination?: boolean;
+	renderItem: (post: PostDto) => React.ReactNode;
+}
+interface PostPagnationProps {
+	data: {
+		items: CourseDto[];
+		totalPages: number;
+	};
+	isLoading: boolean;
+}
+export default function PostList({
+	params,
+	cols = 3,
+	showPagination = true,
+	renderItem,
+}: PostListProps) {
+	const [currentPage, setCurrentPage] = useState<number>(params?.page || 1);
+	const { data, isLoading }: PostPagnationProps =
+		api.post.findManyWithPagination.useQuery({
+			select: courseDetailSelect,
+			...params,
+			page: currentPage,
+		});
+	const totalPages = useMemo(() => {
+		if (data && !isLoading) {
+			return data?.totalPages;
+		}
+		return 1;
+	}, [data, isLoading]);
+
+	const posts = useMemo(() => {
+		if (data && !isLoading) {
+			return data?.items;
+		}
+		return [];
+	}, [data, isLoading]);
+
+	useEffect(() => {
+		setCurrentPage(params?.page || 1);
+	}, [params?.page, params]);
+	function onPageChange(page: number, pageSize: number) {
+		setCurrentPage(page);
+		window.scrollTo({ top: 0, behavior: "smooth" });
+	}
+	if (isLoading) {
+		return (
+			<div className="space-y-6">
+				<Skeleton paragraph={{ rows: 10 }}></Skeleton>
+			</div>
+		);
+	}
+	return (
+		<div className="space-y-6">
+			{posts.length > 0 ? (
+				<>
+					<div className={`grid lg:grid-cols-${cols} gap-6`}>
+						{isLoading ? (
+							<Skeleton paragraph={{ rows: 5 }}></Skeleton>
+						) : (
+							posts.map((post) => (
+								<div key={post.id}>{renderItem(post)}</div>
+							))
+						)}
+					</div>
+					{showPagination && (
+						<div className="flex justify-center mt-8">
+							<Pagination
+								current={currentPage}
+								total={totalPages * params.pageSize}
+								pageSize={params?.pageSize}
+								onChange={onPageChange}
+								showSizeChanger={false}
+							/>
+						</div>
+					)}
+				</>
+			) : (
+				<div className="py-64">
+					<Empty description="暂无数据" />
+				</div>
+			)}
+		</div>
+	);
+}
diff --git a/apps/web/src/components/models/course/list/course-list.tsx b/apps/web/src/components/models/course/list/course-list.tsx
deleted file mode 100755
index 64c8e83..0000000
--- a/apps/web/src/components/models/course/list/course-list.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-// CourseList.tsx
-import { motion } from "framer-motion";
-import { Course, CourseDto } from "@nice/common";
-import { EmptyState } from "@web/src/components/common/space/Empty";
-import { Pagination } from "@web/src/components/common/element/Pagination";
-import React from "react";
-
-interface CourseListProps {
-	courses?: CourseDto[];
-	renderItem: (course: CourseDto) => React.ReactNode;
-	emptyComponent?: React.ReactNode;
-	// 新增分页相关属性
-	currentPage: number;
-	totalPages: number;
-	onPageChange: (page: number) => void;
-}
-
-const container = {
-	hidden: { opacity: 0 },
-	show: {
-		opacity: 1,
-		transition: {
-			staggerChildren: 0.05,
-			duration: 0.3,
-		},
-	},
-};
-export const CourseList = ({
-	courses,
-	renderItem,
-	emptyComponent: EmptyComponent,
-	currentPage,
-	totalPages,
-	onPageChange,
-}: CourseListProps) => {
-	if (!courses || courses.length === 0) {
-		return EmptyComponent || <EmptyState />;
-	}
-
-	return (
-		<div>
-			<motion.div
-				variants={container}
-				initial="hidden"
-				animate="show"
-				className="grid gap-6 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
-				{courses.map((course) => (
-					<motion.div key={course.id}>
-						{renderItem(course)}
-					</motion.div>
-				))}
-			</motion.div>
-
-			<Pagination
-				currentPage={currentPage}
-				totalPages={totalPages}
-				onPageChange={onPageChange}
-			/>
-		</div>
-	);
-};
diff --git a/apps/web/src/components/models/post/PostCard.tsx b/apps/web/src/components/models/post/PostCard.tsx
new file mode 100644
index 0000000..eb9f51e
--- /dev/null
+++ b/apps/web/src/components/models/post/PostCard.tsx
@@ -0,0 +1,67 @@
+import { Typography, Button, Empty, Card } from "antd";
+
+import { PostDto } from "@nice/common";
+import DeptInfo from "@web/src/app/main/path/components/DeptInfo";
+import TermInfo from "@web/src/app/main/path/components/TermInfo";
+import { PictureOutlined } from "@ant-design/icons";
+
+interface PostCardProps {
+	post?: PostDto;
+	onClick?: (post?: PostDto) => void;
+}
+const { Title } = Typography;
+export default function PostCard({ post, onClick }: PostCardProps) {
+	const handleClick = (post: PostDto) => {
+		onClick?.(post);
+	};
+	return (
+		<Card
+			onClick={() => handleClick(post)}
+			key={post?.id}
+			hoverable
+			className="group overflow-hidden rounded-2xl border border-gray-200  shadow-xl hover:shadow-2xl transition-all duration-300 transform hover:-translate-y-2"
+			cover={
+				<div className="relative h-56  overflow-hidden group">
+					{post?.meta?.thumbnail ? (
+						<div
+							className="absolute inset-0 bg-cover bg-center transform transition-all duration-700 ease-out group-hover:scale-110"
+							style={{
+								backgroundImage: `url(${post?.meta?.thumbnail})`,
+							}}
+						/>
+					) : (
+						<div className="absolute inset-0 flex items-center justify-center bg-gradient-to-br from-primary-500 to-primary-700">
+							<PictureOutlined className="text-white  text-6xl" />
+						</div>
+					)}
+				</div>
+			}>
+			<div className="px-4 ">
+				<div className="overflow-hidden hover:overflow-auto">
+					<div className="flex gap-2 h-7   whiteSpace-nowrap">
+						<TermInfo terms={post.terms}></TermInfo>
+					</div>
+				</div>
+				<Title
+					level={4}
+					className="mb-4 mt-4 line-clamp-2 font-bold leading-snug text-gray-800 hover:text-blue-600 transition-colors duration-300 group-hover:scale-[1.02] transform origin-left">
+					<button> {post?.title}</button>
+				</Title>
+				<div className="flex items-center mb-4  rounded-lg transition-all duration-300 hover:bg-blue-50 group">
+					<DeptInfo post={post}></DeptInfo>
+				</div>
+
+				<div className="pt-4 border-t border-gray-100 text-center">
+					<Button
+						shape="round"
+						type="primary"
+						size="large"
+						className="w-full shadow-[0_8px_20px_-6px_rgba(59,130,246,0.5)] hover:shadow-[0_12px_24px_-6px_rgba(59,130,246,0.6)] 
+            transform hover:translate-y-[-2px] transition-all duration-500 ease-out">
+						{"立即学习"}
+					</Button>
+				</div>
+			</div>
+		</Card>
+	);
+}
diff --git a/apps/web/src/components/models/post/PostSelect/PostSelect.tsx b/apps/web/src/components/models/post/PostSelect/PostSelect.tsx
index d564424..8b3a5fb 100644
--- a/apps/web/src/components/models/post/PostSelect/PostSelect.tsx
+++ b/apps/web/src/components/models/post/PostSelect/PostSelect.tsx
@@ -1,3 +1,4 @@
+
 // import React, { useState } from 'react';
 // import { Form, Select, Input } from 'antd';
 // import axios from 'axios';
@@ -93,4 +94,20 @@
 //   );
 // };
 
-// export default PostForm;
\ No newline at end of file
+// export default PostForm;
+import { api } from "@nice/client";
+import { Select } from "antd";
+import { useState } from "react";
+
+export default function PostSelect() {
+	api.post.findMany.useQuery({});
+	const [search, setSearch] = useState("");
+	return (
+		<>
+			<Select
+				options={[{ value: "id1", label: <></> }]}
+				onSearch={(inputValue) => setSearch(inputValue)}></Select>
+		</>
+	);
+}
+
diff --git a/apps/web/src/components/models/post/PostSelect/post.ts b/apps/web/src/components/models/post/PostSelect/post.ts
new file mode 100755
index 0000000..037d004
--- /dev/null
+++ b/apps/web/src/components/models/post/PostSelect/post.ts
@@ -0,0 +1,95 @@
+import {
+	Post,
+	Department,
+	Staff,
+	Enrollment,
+	Taxonomy,
+	Term,
+} from "@prisma/client";
+import { StaffDto } from "./staff";
+import { TermDto } from "./term";
+import { ResourceDto } from "./resource";
+import { DepartmentDto } from "./department";
+
+export type PostComment = {
+	id: string;
+	type: string;
+	title: string;
+	content: string;
+	authorId: string;
+	domainId: string;
+	referenceId: string;
+	resources: string[];
+	createdAt: Date;
+	updatedAt: Date;
+	parentId: string;
+	author: {
+		id: string;
+		showname: string;
+		username: string;
+		avatar: string;
+	};
+};
+export type PostDto = Post & {
+	readed: boolean;
+	readedCount: number;
+	author: StaffDto;
+	limitedComments: PostComment[];
+	commentsCount: number;
+	perms?: {
+		delete: boolean;
+		// edit: boolean;
+	};
+	watchableDepts: Department[];
+	watchableStaffs: Staff[];
+	terms: TermDto[];
+	depts: DepartmentDto[];
+	meta?: {
+		thumbnail?: string;
+		views?: number;
+	};
+	studentIds?: string[];
+};
+
+export type LectureMeta = {
+	type?: string;
+	views?: number;
+	videoUrl?: string;
+	videoThumbnail?: string;
+	videoIds?: string[];
+	videoThumbnailIds?: string[];
+};
+
+export type Lecture = Post & {
+	resources?: ResourceDto[];
+	meta?: LectureMeta;
+};
+
+export type SectionMeta = {
+	objectives?: string[];
+};
+export type Section = Post & {
+	meta?: SectionMeta;
+};
+export type SectionDto = Section & {
+	lectures: Lecture[];
+};
+export type CourseMeta = {
+	thumbnail?: string;
+
+	objectives?: string[];
+	views?: number;
+	likes?: number;
+	hates?: number;
+};
+export type Course = PostDto & {
+	meta?: CourseMeta;
+};
+export type CourseDto = Course & {
+	enrollments?: Enrollment[];
+	sections?: SectionDto[];
+	terms: TermDto[];
+	lectureCount?: number;
+	depts: Department[];
+	studentIds: string[];
+};
diff --git a/apps/web/src/components/models/post/SubPost/CourseCard.tsx b/apps/web/src/components/models/post/SubPost/CourseCard.tsx
new file mode 100644
index 0000000..6140607
--- /dev/null
+++ b/apps/web/src/components/models/post/SubPost/CourseCard.tsx
@@ -0,0 +1,14 @@
+import { CourseDto, PostDto } from "@nice/common";
+import { useNavigate } from "react-router-dom";
+import PostCard from "../PostCard";
+export default function CourseCard({ post }: { post: PostDto }) {
+	const navigate = useNavigate();
+	return (
+		<PostCard
+			post={post}
+			onClick={() => {
+				navigate(`/course/${post?.id}/detail`);
+				window.scrollTo({ top: 0, behavior: "smooth" });
+			}}></PostCard>
+	);
+}
diff --git a/apps/web/src/components/models/post/SubPost/PathCard.tsx b/apps/web/src/components/models/post/SubPost/PathCard.tsx
new file mode 100644
index 0000000..9de4ed0
--- /dev/null
+++ b/apps/web/src/components/models/post/SubPost/PathCard.tsx
@@ -0,0 +1,15 @@
+import { PostDto } from "@nice/common";
+import { useNavigate } from "react-router-dom";
+import PostCard from "../PostCard";
+
+export default function PathCard({ post }: { post: PostDto }) {
+	const navigate = useNavigate();
+	return (
+		<PostCard
+			post={post}
+			onClick={() => {
+				navigate(`/path/editor/${post?.id}`);
+				window.scrollTo({ top: 0, behavior: "smooth" });
+			}}></PostCard>
+	);
+}
diff --git a/apps/web/src/components/models/staff/staff-form.tsx b/apps/web/src/components/models/staff/staff-form.tsx
index 1dc4920..513f08c 100755
--- a/apps/web/src/components/models/staff/staff-form.tsx
+++ b/apps/web/src/components/models/staff/staff-form.tsx
@@ -1,10 +1,11 @@
 import { Button, Form, Input, Spin, Switch, message } from "antd";
-import { useContext, useEffect} from "react";
+import { useContext, useEffect } from "react";
 import { useStaff } from "@nice/client";
 import DepartmentSelect from "../department/department-select";
-import { api } from "@nice/client"
+import { api } from "@nice/client";
 import { StaffEditorContext } from "./staff-editor";
 import { useAuth } from "@web/src/providers/auth-provider";
+import AvatarUploader from "../../common/uploader/AvatarUploader";
 export default function StaffForm() {
 	const { create, update } = useStaff(); // Ensure you have these methods in your hooks
 	const {
@@ -21,6 +22,7 @@ export default function StaffForm() {
 		{ where: { id: editId } },
 		{ enabled: !!editId }
 	);
+
 	const { isRoot } = useAuth();
 	async function handleFinish(values: any) {
 		const {
@@ -31,8 +33,9 @@ export default function StaffForm() {
 			password,
 			phoneNumber,
 			officerId,
-			enabled
-		} = values
+			enabled,
+			avatar,
+		} = values;
 		setFormLoading(true);
 		try {
 			if (data && editId) {
@@ -46,8 +49,9 @@ export default function StaffForm() {
 						password,
 						phoneNumber,
 						officerId,
-						enabled
-					}
+						enabled,
+						avatar,
+					},
 				});
 			} else {
 				await create.mutateAsync({
@@ -58,8 +62,9 @@ export default function StaffForm() {
 						domainId: fieldDomainId ? fieldDomainId : domainId,
 						password,
 						officerId,
-						phoneNumber
-					}
+						phoneNumber,
+						avatar,
+					},
 				});
 				form.resetFields();
 				if (deptId) form.setFieldValue("deptId", deptId);
@@ -77,13 +82,14 @@ export default function StaffForm() {
 	useEffect(() => {
 		form.resetFields();
 		if (data && editId) {
-			form.setFieldValue("username", data.username);
-			form.setFieldValue("showname", data.showname);
-			form.setFieldValue("domainId", data.domainId);
-			form.setFieldValue("deptId", data.deptId);
-			form.setFieldValue("officerId", data.officerId);
-			form.setFieldValue("phoneNumber", data.phoneNumber);
-			form.setFieldValue("enabled", data.enabled)
+			form.setFieldValue("username", data?.username);
+			form.setFieldValue("showname", data?.showname);
+			form.setFieldValue("domainId", data?.domainId);
+			form.setFieldValue("deptId", data?.deptId);
+			form.setFieldValue("officerId", data?.officerId);
+			form.setFieldValue("phoneNumber", data?.phoneNumber);
+			form.setFieldValue("enabled", data?.enabled);
+			form.setFieldValue("avatar", data?.avatar);
 		}
 	}, [data]);
 	useEffect(() => {
@@ -99,6 +105,7 @@ export default function StaffForm() {
 					<Spin />
 				</div>
 			)}
+
 			<Form
 				disabled={isLoading}
 				form={form}
@@ -106,6 +113,9 @@ export default function StaffForm() {
 				requiredMark="optional"
 				autoComplete="off"
 				onFinish={handleFinish}>
+				<Form.Item name={"avatar"} label="头像">
+					<AvatarUploader></AvatarUploader>
+				</Form.Item>
 				{canManageAnyStaff && (
 					<Form.Item
 						name={"domainId"}
@@ -127,7 +137,8 @@ export default function StaffForm() {
 					rules={[{ required: true }]}
 					name={"username"}
 					label="帐号">
-					<Input allowClear
+					<Input
+						allowClear
 						autoComplete="new-username" // 使用非标准的自动完成值
 						spellCheck={false}
 					/>
@@ -136,7 +147,8 @@ export default function StaffForm() {
 					rules={[{ required: true }]}
 					name={"showname"}
 					label="姓名">
-					<Input allowClear
+					<Input
+						allowClear
 						autoComplete="new-name" // 使用非标准的自动完成值
 						spellCheck={false}
 					/>
@@ -146,8 +158,8 @@ export default function StaffForm() {
 						{
 							required: false,
 							pattern: /^\d{5,18}$/,
-							message: "请输入正确的证件号（数字）"
-						}
+							message: "请输入正确的证件号（数字）",
+						},
 					]}
 					name={"officerId"}
 					label="证件号">
@@ -158,20 +170,29 @@ export default function StaffForm() {
 						{
 							required: false,
 							pattern: /^\d{6,11}$/,
-							message: "请输入正确的手机号（数字）"
-						}
+							message: "请输入正确的手机号（数字）",
+						},
 					]}
 					name={"phoneNumber"}
 					label="手机号">
-					<Input autoComplete="new-phone" // 使用非标准的自动完成值
-						spellCheck={false} allowClear />
+					<Input
+						autoComplete="new-phone" // 使用非标准的自动完成值
+						spellCheck={false}
+						allowClear
+					/>
 				</Form.Item>
 				<Form.Item label="密码" name={"password"}>
-					<Input.Password spellCheck={false} visibilityToggle autoComplete="new-password" />
+					<Input.Password
+						spellCheck={false}
+						visibilityToggle
+						autoComplete="new-password"
+					/>
 				</Form.Item>
-				{editId && <Form.Item label="是否启用" name={"enabled"}>
-					<Switch></Switch>
-				</Form.Item>}
+				{editId && (
+					<Form.Item label="是否启用" name={"enabled"}>
+						<Switch></Switch>
+					</Form.Item>
+				)}
 			</Form>
 		</div>
 	);
diff --git a/apps/web/src/components/models/term/taxonomy-form.tsx b/apps/web/src/components/models/term/taxonomy-form.tsx
index 3bdeee2..d612976 100755
--- a/apps/web/src/components/models/term/taxonomy-form.tsx
+++ b/apps/web/src/components/models/term/taxonomy-form.tsx
@@ -31,7 +31,7 @@ export default function TaxonomyForm() {
 				setTaxonomyModalOpen(false)
 			}}>
 			<Form.Item
-				rules={[{ required: true, message: "请输入名称" }]}
+				rules={[{ required: true, message: "请输入姓名" }]}
 				name={"name"}
 				label="名称">
 				<Input></Input>
diff --git a/apps/web/src/components/models/term/term-parent-selector.tsx b/apps/web/src/components/models/term/term-parent-selector.tsx
new file mode 100755
index 0000000..58c1765
--- /dev/null
+++ b/apps/web/src/components/models/term/term-parent-selector.tsx
@@ -0,0 +1,56 @@
+import { api } from "@nice/client/";
+import { Checkbox, Skeleton } from "antd";
+import { TermDto } from "@nice/common";
+import React from "react";
+export default function TermParentSelector({
+	value,
+	onChange,
+	className,
+	taxonomyId,
+	domainId = undefined,
+	style,
+}: {
+	value?: string[];
+	onChange?: (value: string[]) => void;
+	className?: string;
+	taxonomyId: string;
+	domainId?: string;
+	style?: React.CSSProperties;
+}) {
+	const { data, isLoading }: { data: TermDto[]; isLoading: boolean } =
+		api.term.findMany.useQuery({
+			where: {
+				taxonomyId: taxonomyId,
+				parentId: null,
+				domainId,
+			},
+		});
+	const handleCheckboxChange = (checkedValues: string[]) => {
+		// setSelectedValues(checkedValues); // 更新选中的值
+		if (onChange) {
+			onChange(checkedValues); // 调用外部传入的 onChange 回调
+		}
+	};
+	return (
+		<div className={className} style={style}>
+			{isLoading ? (
+				<Skeleton
+					paragraph={{
+						rows: 4,
+					}}></Skeleton>
+			) : (
+				<Checkbox.Group value={value} onChange={handleCheckboxChange}>
+					{data?.map((category) => (
+						<div className="w-full h-9 p-2 my-1" key={category.id}>
+							<Checkbox
+								className="text-base text-slate-700"
+								value={category.id}>
+								{category.name}
+							</Checkbox>
+						</div>
+					))}
+				</Checkbox.Group>
+			)}
+		</div>
+	);
+}
diff --git a/apps/web/src/components/models/term/term-select.tsx b/apps/web/src/components/models/term/term-select.tsx
index 045e0e1..3896d8e 100755
--- a/apps/web/src/components/models/term/term-select.tsx
+++ b/apps/web/src/components/models/term/term-select.tsx
@@ -1,5 +1,12 @@
 import { TreeSelect, TreeSelectProps } from "antd";
-import React, { useEffect, useState, useCallback, useRef } from "react";
+import React, {
+	useEffect,
+	useState,
+	useCallback,
+	useRef,
+	ReactElement,
+	JSXElementConstructor,
+} from "react";
 import { getUniqueItems } from "@nice/common";
 import { api } from "@nice/client";
 import { DefaultOptionType } from "antd/es/select";
@@ -8,29 +15,35 @@ interface TermSelectProps {
 	defaultValue?: string | string[];
 	value?: string | string[];
 	onChange?: (value: string | string[]) => void;
-	placeholder?: string;
 	multiple?: boolean;
-	// rootId?: string;
-	// domain?: boolean;
 	taxonomyId?: string;
 	disabled?: boolean;
-	className?: string;
 	domainId?: string;
+	dropdownStyle?: React.CSSProperties;
+	style?: React.CSSProperties;
+	open?: boolean;
+	showSearch?: boolean;
+	dropdownRender?: (
+		menu: ReactElement<any, string | JSXElementConstructor<any>>
+	) => ReactElement<any, string | JSXElementConstructor<any>>;
 }
 
 export default function TermSelect({
 	defaultValue,
 	value,
 	onChange,
-	className,
-	placeholder = "选择单位",
+	placeholder = "选择分类",
 	multiple = false,
 	taxonomyId,
+	open = undefined,
+	showSearch = true,
 	domainId,
-	// rootId = null,
+	dropdownStyle,
+	style,
 	disabled = false,
-	// domain = undefined,
-}: TermSelectProps) {
+	dropdownRender,
+	...treeSelectProps
+}: TermSelectProps & TreeSelectProps) {
 	const utils = api.useUtils();
 	const [listTreeData, setListTreeData] = useState<
 		Omit<DefaultOptionType, "label">[]
@@ -57,7 +70,7 @@ export default function TermSelect({
 				throw error;
 			}
 		},
-		[utils]
+		[utils, value]
 	);
 
 	const fetchTerms = useCallback(async () => {
@@ -124,37 +137,35 @@ export default function TermSelect({
 		}
 	};
 
-	const handleExpand = async (keys: React.Key[]) => {
-		// console.log(keys);
-		try {
-			const allKeyIds =
-				keys.map((key) => key.toString()).filter(Boolean) || [];
-			// const expandedNodes = await Promise.all(
-			// 	keys.map(async (key) => {
-			// 		return await utils.department.getChildSimpleTree.fetch({
-			// 			deptId: key.toString(),
-			// 			domain,
-			// 		});
-			// 	})
-			// );
-			//
-			//上面那样一个个拉会拉爆，必须直接拉deptIds
-			const expandedNodes = await utils.term.getChildSimpleTree.fetch({
-				termIds: allKeyIds,
-				taxonomyId,
-				domainId,
-			});
-			const flattenedNodes = expandedNodes.flat();
-			const newItems = getUniqueItems(
-				[...listTreeData, ...flattenedNodes],
-				"id"
-			);
-			setListTreeData(newItems);
-		} catch (error) {
-			console.error("Error expanding nodes with keys", keys, ":", error);
-		}
-	};
-
+	const handleExpand = useCallback(
+		async (keys: React.Key[]) => {
+			try {
+				const allKeyIds =
+					keys.map((key) => key.toString()).filter(Boolean) || [];
+				const expandedNodes = await utils.term.getChildSimpleTree.fetch(
+					{
+						termIds: allKeyIds,
+						taxonomyId,
+						domainId,
+					}
+				);
+				const flattenedNodes = expandedNodes.flat();
+				const newItems = getUniqueItems(
+					[...listTreeData, ...flattenedNodes],
+					"id"
+				);
+				setListTreeData(newItems);
+			} catch (error) {
+				console.error(
+					"Error expanding nodes with keys",
+					keys,
+					":",
+					error
+				);
+			}
+		},
+		[value]
+	);
 	const handleDropdownVisibleChange = async (open: boolean) => {
 		if (open) {
 			// This will attempt to expand all nodes and fetch their children when the dropdown opens
@@ -162,22 +173,19 @@ export default function TermSelect({
 			await handleExpand(allKeys);
 		}
 	};
-
 	return (
 		<TreeSelect
 			treeDataSimpleMode
 			disabled={disabled}
-			showSearch
-			allowClear
 			// ref={selectRef}
 			dropdownStyle={{
 				width: "300px", // 固定宽度
 				minWidth: "200px", // 最小宽度
 				maxWidth: "600px", // 最大宽度
+				...dropdownStyle,
 			}}
 			defaultValue={defaultValue}
 			value={value}
-			className={className}
 			placeholder={placeholder}
 			onChange={handleChange}
 			loadData={onLoadData}
@@ -188,6 +196,7 @@ export default function TermSelect({
 			onClear={() => handleChange(multiple ? [] : undefined)}
 			onTreeExpand={handleExpand}
 			onDropdownVisibleChange={handleDropdownVisibleChange}
+			{...treeSelectProps}
 		/>
 	);
-}
\ No newline at end of file
+}
diff --git a/apps/web/src/components/models/term/util.ts b/apps/web/src/components/models/term/util.ts
index c54910a..f7aebc8 100755
--- a/apps/web/src/components/models/term/util.ts
+++ b/apps/web/src/components/models/term/util.ts
@@ -1,15 +1,16 @@
-import { TreeDataNode } from "@nice/common"
+import { TreeDataNode } from "@nice/common";
+import React from "react";
 export const treeVisitor = (
-    data: TreeDataNode[],
-    key: React.Key,
-    callback: (node: TreeDataNode, i: number, data: TreeDataNode[]) => void
+	data: TreeDataNode[],
+	key: React.Key,
+	callback: (node: TreeDataNode, i: number, data: TreeDataNode[]) => void
 ) => {
-    for (let i = 0; i < data.length; i++) {
-        if (data[i].key === key) {
-            return callback(data[i], i, data);
-        }
-        if (data[i].children) {
-            treeVisitor(data[i].children!, key, callback);
-        }
-    }
-};
\ No newline at end of file
+	for (let i = 0; i < data.length; i++) {
+		if (data[i].key === key) {
+			return callback(data[i], i, data);
+		}
+		if (data[i].children) {
+			treeVisitor(data[i].children!, key, callback);
+		}
+	}
+};
diff --git a/apps/web/src/components/presentation/collapse-section.tsx b/apps/web/src/components/presentation/collapse-section.tsx
index 072e596..d0a9798 100755
--- a/apps/web/src/components/presentation/collapse-section.tsx
+++ b/apps/web/src/components/presentation/collapse-section.tsx
@@ -14,7 +14,7 @@ interface CollapsibleSectionProps {
 interface MenuItem {
 	key: string;
 	link?: string;
-	blank?: boolean
+	blank?: boolean;
 	icon?: React.ReactNode;
 	label: string;
 	children?: Array<MenuItem>;
@@ -69,7 +69,10 @@ const CollapsibleSection: React.FC<CollapsibleSectionProps> = ({
 			const isChildCollapsed = !expandedSections[item.key];
 
 			return (
-				<div key={item.key} className="flex flex-col mb-2 select-none" style={{ color: token.colorTextLightSolid }}>
+				<div
+					key={item.key}
+					className="flex flex-col mb-2 select-none"
+					style={{ color: token.colorTextLightSolid }}>
 					<motion.div
 						className={`flex items-center justify-between px-4 py-2 rounded-full ${hasChildren ? "cursor-pointer" : ""} `}
 						onClick={() => {
@@ -78,7 +81,7 @@ const CollapsibleSection: React.FC<CollapsibleSectionProps> = ({
 							}
 							if (item.link) {
 								if (!item.blank) {
-									navigate(item.link, { replace: true });
+									navigate(item.link);
 								} else {
 									window.open(item.link, "_blank");
 								}
@@ -86,12 +89,20 @@ const CollapsibleSection: React.FC<CollapsibleSectionProps> = ({
 						}}
 						initial={false}
 						animate={{
-							backgroundColor: isActive ? token.colorPrimaryBorder : token.colorPrimary,
+							backgroundColor: isActive
+								? token.colorPrimaryBorder
+								: token.colorPrimary,
 						}}
-						whileHover={{ backgroundColor: token.colorPrimaryHover }}
-						transition={{ type: "spring", stiffness: 300, damping: 25, duration: 0.3 }}
-						style={{ marginLeft: `${level * 16}px` }}
-					>
+						whileHover={{
+							backgroundColor: token.colorPrimaryHover,
+						}}
+						transition={{
+							type: "spring",
+							stiffness: 300,
+							damping: 25,
+							duration: 0.3,
+						}}
+						style={{ marginLeft: `${level * 16}px` }}>
 						<div className="flex items-center justify-between">
 							<div className=" items-center flex gap-2">
 								{item.icon && <span>{item.icon}</span>}
@@ -100,8 +111,7 @@ const CollapsibleSection: React.FC<CollapsibleSectionProps> = ({
 							{hasChildren && (
 								<Icon
 									name={"caret-right"}
-									className={`ml-1  transition-transform duration-300 ${!isChildCollapsed ? "rotate-90" : ""}`}
-								></Icon>
+									className={`ml-1  transition-transform duration-300 ${!isChildCollapsed ? "rotate-90" : ""}`}></Icon>
 							)}
 						</div>
 						{item.extra && <div className="ml-4">{item.extra}</div>}
@@ -115,11 +125,10 @@ const CollapsibleSection: React.FC<CollapsibleSectionProps> = ({
 								// stiffness: 200,
 								// damping: 20,
 								type: "tween",
-								duration: 0.2
+								duration: 0.2,
 							}}
 							style={{ overflow: "hidden" }}
-							className="mt-1"
-						>
+							className="mt-1">
 							{renderItems(item.children, level + 1)}
 						</motion.div>
 					)}
diff --git a/apps/web/src/components/presentation/video-player/ControlButtons/Brightness.tsx b/apps/web/src/components/presentation/video-player/ControlButtons/Brightness.tsx
index 2dcaf4d..f3b3e88 100755
--- a/apps/web/src/components/presentation/video-player/ControlButtons/Brightness.tsx
+++ b/apps/web/src/components/presentation/video-player/ControlButtons/Brightness.tsx
@@ -8,9 +8,9 @@ export default function Brightness() {
 		<>
 			{/* 亮度控制 */}
 			<div className="relative group flex items-center">
-				<button className="text-white hover:text-primaryHover">
+				<div className="text-white hover:text-primaryHover">
 					<SunIcon className="w-10 h-10" />
-				</button>
+				</div>
 				<div className="absolute bottom-full left-1/2 -translate-x-1/2 mb-2 opacity-0 group-hover:opacity-100 transition-opacity duration-200">
 					<div className="bg-black/80 rounded-lg p-2">
 						<input
diff --git a/apps/web/src/components/presentation/video-player/ControlButtons/FullScreen.tsx b/apps/web/src/components/presentation/video-player/ControlButtons/FullScreen.tsx
index b48b3e5..70b6c20 100755
--- a/apps/web/src/components/presentation/video-player/ControlButtons/FullScreen.tsx
+++ b/apps/web/src/components/presentation/video-player/ControlButtons/FullScreen.tsx
@@ -9,7 +9,7 @@ export default function FullScreen() {
     const { videoRef } = useContext(VideoPlayerContext);
 	return (
 		<>
-			<button
+			<div
 				onClick={() => {
 					if (document.fullscreenElement) {
 						document.exitFullscreen();
@@ -23,7 +23,7 @@ export default function FullScreen() {
 				) : (
 					<ArrowsPointingOutIcon className="w-10 h-10" />
 				)}
-			</button>
+			</div>
 		</>
 	);
 }
diff --git a/apps/web/src/components/presentation/video-player/ControlButtons/Play.tsx b/apps/web/src/components/presentation/video-player/ControlButtons/Play.tsx
index fdff076..721242d 100755
--- a/apps/web/src/components/presentation/video-player/ControlButtons/Play.tsx
+++ b/apps/web/src/components/presentation/video-player/ControlButtons/Play.tsx
@@ -4,22 +4,25 @@ import { PauseIcon, PlayIcon } from "@heroicons/react/24/solid";
 
 export default function Play() {
 	const { isPlaying, videoRef } = useContext(VideoPlayerContext);
-
+	const handleClick = (event) => {
+		event.stopPropagation(); // 阻止事件冒泡
+		if (videoRef.current?.paused) {
+			videoRef.current.play();
+		} else {
+			videoRef.current?.pause();
+		}
+	};
 	return (
 		<>
-			<button
-				onClick={() =>
-					videoRef.current?.paused
-						? videoRef.current.play()
-						: videoRef.current?.pause()
-				}
+			<div
+				onClick={handleClick}
 				className="text-white hover:text-primaryHover">
 				{isPlaying ? (
 					<PauseIcon className="w-10 h-10" />
 				) : (
 					<PlayIcon className="w-10 h-10" />
 				)}
-			</button>
+			</div>
 		</>
 	);
 }
diff --git a/apps/web/src/components/presentation/video-player/ControlButtons/Setting.tsx b/apps/web/src/components/presentation/video-player/ControlButtons/Setting.tsx
index 2ece400..1e5278d 100755
--- a/apps/web/src/components/presentation/video-player/ControlButtons/Setting.tsx
+++ b/apps/web/src/components/presentation/video-player/ControlButtons/Setting.tsx
@@ -15,11 +15,11 @@ export default function Setting() {
 	return (
 		<>
 			<div className="relative flex items-center">
-				<button
+				<div
 					onClick={() => setIsSettingsOpen(!isSettingsOpen)}
 					className="text-white hover:text-primaryHover">
 					<Cog6ToothIcon className="w-10 h-10" />
-				</button>
+				</div>
 
 				<AnimatePresence>
 					{isSettingsOpen && (
diff --git a/apps/web/src/components/presentation/video-player/ControlButtons/Speed.tsx b/apps/web/src/components/presentation/video-player/ControlButtons/Speed.tsx
index 52efb5d..162af22 100755
--- a/apps/web/src/components/presentation/video-player/ControlButtons/Speed.tsx
+++ b/apps/web/src/components/presentation/video-player/ControlButtons/Speed.tsx
@@ -14,14 +14,14 @@ export default function Speed() {
 	return (
 		<>
 			<div className="relative flex items-center">
-				<button
+				<div
 					onClick={() => setIsSpeedOpen(!isSpeedOpen)}
 					className="text-white hover:text-primaryHover flex items-center">
 					<span className="text-xl font-bold mr-1">
 						{playbackSpeed === 1.0 ? "倍速" : `${playbackSpeed}x`}
 					</span>
 					<ChevronUpDownIcon className="w-10 h-10" />
-				</button>
+				</div>
 				{isSpeedOpen && (
 					<div className="absolute bottom-full left-1/2 -translate-x-1/2 mb-2">
 						<div className="bg-black/80 rounded-lg p-2">
diff --git a/apps/web/src/components/presentation/video-player/ControlButtons/Volume.tsx b/apps/web/src/components/presentation/video-player/ControlButtons/Volume.tsx
index bb25b68..559267d 100755
--- a/apps/web/src/components/presentation/video-player/ControlButtons/Volume.tsx
+++ b/apps/web/src/components/presentation/video-player/ControlButtons/Volume.tsx
@@ -9,7 +9,7 @@ export default function Volume() {
 		<>
 			{/* 音量控制 */}
 			<div className="group relative flex items-center">
-				<button
+				<div
 					onClick={() => setIsMuted(!isMuted)}
 					className="text-white hover:text-primaryHover">
 					{isMuted ? (
@@ -17,7 +17,7 @@ export default function Volume() {
 					) : (
 						<SpeakerWaveIcon className="w-10 h-10" />
 					)}
-				</button>
+				</div>
 				<div className="absolute bottom-full left-1/2 -translate-x-1/2 mb-2 opacity-0 group-hover:opacity-100 transition-opacity duration-200">
 					<div className="bg-black/80 rounded-lg p-2">
 						<input
diff --git a/apps/web/src/components/presentation/video-player/VideoControls.tsx b/apps/web/src/components/presentation/video-player/VideoControls.tsx
index 93fc540..4200476 100755
--- a/apps/web/src/components/presentation/video-player/VideoControls.tsx
+++ b/apps/web/src/components/presentation/video-player/VideoControls.tsx
@@ -96,7 +96,6 @@ export const Controls = () => {
 				<div className="flex items-center space-x-4">
 					{/* 播放/暂停按钮 */}
 					<Play></Play>
-
 					{/* 时间显示 */}
 					{duration && (
 						<span className="text-white text-xl">
@@ -114,7 +113,7 @@ export const Controls = () => {
 					{/* 倍速控制 */}
 					<Speed></Speed>
 					{/* 设置按钮 */}
-					<Setting></Setting>
+					{/* <Setting></Setting> */}
 
 					{/* 全屏按钮 */}
 					<FullScreen></FullScreen>
diff --git a/apps/web/src/components/presentation/video-player/VideoDisplay.tsx b/apps/web/src/components/presentation/video-player/VideoDisplay.tsx
index fb1b40d..32b1109 100755
--- a/apps/web/src/components/presentation/video-player/VideoDisplay.tsx
+++ b/apps/web/src/components/presentation/video-player/VideoDisplay.tsx
@@ -25,8 +25,6 @@ export const VideoDisplay: React.FC<VideoDisplayProps> = ({
 		isDragging,
 		setIsDragging,
 		progressRef,
-		resolution,
-		setResolutions,
 	} = useContext(VideoPlayerContext);
 
 	// 处理进度条拖拽
@@ -39,7 +37,6 @@ export const VideoDisplay: React.FC<VideoDisplayProps> = ({
 		);
 		videoRef.current.currentTime = percent * videoRef.current.duration;
 	};
-
 	// 添加拖拽事件监听
 	useEffect(() => {
 		const handleMouseUp = () => setIsDragging(false);
@@ -65,15 +62,12 @@ export const VideoDisplay: React.FC<VideoDisplayProps> = ({
 			setError(null);
 			setLoadingProgress(0);
 			setBufferingState(false);
-
 			// Check for native HLS support (Safari)
 			if (videoRef.current.canPlayType("application/vnd.apple.mpegurl")) {
 				videoRef.current.src = src;
 				setIsReady(true);
-
 				// 设置视频时长
 				setDuration(videoRef.current.duration);
-
 				if (autoPlay) {
 					try {
 						await videoRef.current.play();
@@ -84,14 +78,12 @@ export const VideoDisplay: React.FC<VideoDisplayProps> = ({
 				}
 				return;
 			}
-
 			if (!Hls.isSupported()) {
 				const errorMessage = "您的浏览器不支持 HLS 视频播放";
 				setError(errorMessage);
 				onError?.(errorMessage);
 				return;
 			}
-
 			hls = new Hls({
 				maxBufferLength: 30,
 				maxMaxBufferLength: 600,
@@ -101,13 +93,10 @@ export const VideoDisplay: React.FC<VideoDisplayProps> = ({
 
 			hls.loadSource(src);
 			hls.attachMedia(videoRef.current);
-
 			hls.on(Hls.Events.MANIFEST_PARSED, async () => {
 				setIsReady(true);
-
 				// 设置视频时长
 				setDuration(videoRef.current?.duration || 0);
-
 				if (autoPlay && videoRef.current) {
 					try {
 						await videoRef.current.play();
@@ -117,7 +106,6 @@ export const VideoDisplay: React.FC<VideoDisplayProps> = ({
 					}
 				}
 			});
-
 			hls.on(Hls.Events.BUFFER_APPENDING, () => {
 				setBufferingState(true);
 			});
@@ -204,19 +192,21 @@ export const VideoDisplay: React.FC<VideoDisplayProps> = ({
 	}, [src, onError, autoPlay]);
 
 	return (
-		<video
-			ref={videoRef}
-			className="w-full h-full"
-			poster={poster}
-			controls={false}
-			playsInline
-			muted={isMuted}
-			style={{ filter: `brightness(${brightness})` }}
-			onTimeUpdate={() => {
-				if (videoRef.current) {
-					setCurrentTime(videoRef.current.currentTime);
-				}
-			}}
-		/>
+		<div className="relative w-full aspect-video">
+			<video
+				ref={videoRef}
+				className="w-full h-full"
+				poster={poster}
+				controls={false}
+				playsInline
+				muted={isMuted}
+				style={{ filter: `brightness(${brightness})` }}
+				onTimeUpdate={() => {
+					if (videoRef.current) {
+						setCurrentTime(videoRef.current.currentTime);
+					}
+				}}
+			/>
+		</div>
 	);
 };
diff --git a/apps/web/src/components/presentation/video-player/VideoPlayer.tsx b/apps/web/src/components/presentation/video-player/VideoPlayer.tsx
index 4a86f4b..e89bf91 100755
--- a/apps/web/src/components/presentation/video-player/VideoPlayer.tsx
+++ b/apps/web/src/components/presentation/video-player/VideoPlayer.tsx
@@ -82,6 +82,10 @@ export function VideoPlayer({
 	const progressRef = useRef<HTMLDivElement>(null);
 	const [isSpeedOpen, setIsSpeedOpen] = useState(false);
 	const [isBrightnessOpen, setIsBrightnessOpen] = useState(false);
+
+	const handleClick = (event: React.MouseEvent) => {
+		event.stopPropagation(); // 阻止事件向上传递
+	};
 	return (
 		<VideoPlayerContext.Provider
 			value={{
@@ -129,7 +133,9 @@ export function VideoPlayer({
 				resolutions,
 				setResolutions,
 			}}>
-			<VideoPlayerLayout></VideoPlayerLayout>
+			<div onClick={handleClick}>
+				<VideoPlayerLayout></VideoPlayerLayout>
+			</div>
 		</VideoPlayerContext.Provider>
 	);
 }
diff --git a/apps/web/src/components/presentation/video-player/VideoPlayerLayout.tsx b/apps/web/src/components/presentation/video-player/VideoPlayerLayout.tsx
index 5bcbb51..3c5d9c6 100755
--- a/apps/web/src/components/presentation/video-player/VideoPlayerLayout.tsx
+++ b/apps/web/src/components/presentation/video-player/VideoPlayerLayout.tsx
@@ -18,12 +18,11 @@ export default function VideoPlayerLayout() {
 		<>
 			<div
 				className={`relative w-full bg-black rounded-lg overflow-hidden`}
-				style={{ aspectRatio: "21/9" }}
+				style={{ aspectRatio: "16/9" }}
 				onMouseEnter={() => {
 					setIsHovering(true);
 					setShowControls(true);
 				}}>
-				{!isReady && <div>123</div>}
 				{!isReady && <LoadingOverlay></LoadingOverlay>}
 				<VideoDisplay></VideoDisplay>
 				<AnimatePresence>
diff --git a/apps/web/src/hooks/useGetTaxonomy.ts b/apps/web/src/hooks/useGetTaxonomy.ts
deleted file mode 100755
index 4eeb3d5..0000000
--- a/apps/web/src/hooks/useGetTaxonomy.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { api } from "@nice/client/"
-import { TaxonomySlug, TermDto } from "@nice/common"
-import { useMemo } from 'react';
-
-export interface GetTaxonomyProps {
-    categories: string[];
-    isLoading: boolean;
-}
-
-export function useGetTaxonomy({type}) : GetTaxonomyProps {
-    const {data,isLoading} :{data:TermDto[],isLoading:boolean}= api.term.findMany.useQuery({
-        where:{
-          taxonomy: {
-            //TaxonomySlug.CATEGORY
-            slug:type
-          }
-        },
-        include:{
-          children :true
-        },
-        take:10, // 只取前10个
-        orderBy: {
-            createdAt: 'desc', // 按创建时间降序排列
-        },
-    })
-    const categories = useMemo(() => {
-        const allCategories = isLoading ? [] : data?.map((course) => course.name);
-        return [...Array.from(new Set(allCategories))];
-    }, [data]);
-    return {categories,isLoading}
-}
diff --git a/apps/web/src/hooks/useLocalSetting.ts b/apps/web/src/hooks/useLocalSetting.ts
index 03b4057..7cb5c21 100755
--- a/apps/web/src/hooks/useLocalSetting.ts
+++ b/apps/web/src/hooks/useLocalSetting.ts
@@ -1,4 +1,3 @@
-
 import { useCallback, useMemo } from "react";
 import { env } from "../env";
 export function useLocalSettings() {
@@ -6,12 +5,12 @@ export function useLocalSettings() {
         return `${protocol}://${env.SERVER_IP}:${port}`;
     }, []);
     const tusUrl = useMemo(() => getBaseUrl('http', 8080), [getBaseUrl]);
-    const apiUrl = useMemo(() => getBaseUrl('http', 3000), [getBaseUrl]);
-    const websocketUrl = useMemo(() => getBaseUrl('ws', 3000), [getBaseUrl]);
+    const apiUrl = useMemo(() => getBaseUrl('http', parseInt(env.SERVER_PORT)), [getBaseUrl]);
+    const websocketUrl = useMemo(() => getBaseUrl('ws', parseInt(env.SERVER_PORT)), [getBaseUrl]);
     const checkIsTusUrl = useCallback((url: string) => {
         return url.startsWith(tusUrl)
     }, [tusUrl])
     return {
         apiUrl, websocketUrl, checkIsTusUrl, tusUrl
     }
-}
\ No newline at end of file
+}
diff --git a/apps/web/src/hooks/useTusUpload.ts b/apps/web/src/hooks/useTusUpload.ts
index a4589a5..0337110 100755
--- a/apps/web/src/hooks/useTusUpload.ts
+++ b/apps/web/src/hooks/useTusUpload.ts
@@ -34,7 +34,7 @@ export function useTusUpload() {
 		return resUrl;
 	};
 	const handleFileUpload = async (
-		file: File,
+		file: File | Blob,
 		onSuccess: (result: UploadResult) => void,
 		onError: (error: Error) => void,
 		fileKey: string // 添加文件唯一标识
@@ -45,14 +45,24 @@ export function useTusUpload() {
 		setUploadError(null);
 
 		try {
+			// 如果是Blob，需要转换为File
+			let fileName = "uploaded-file";
+			if (file instanceof Blob && !(file instanceof File)) {
+				// 根据MIME类型设置文件扩展名
+				const extension = file.type.split('/')[1];
+				fileName = `uploaded-file.${extension}`;
+			}
+			const uploadFile = file instanceof Blob && !(file instanceof File)
+				? new File([file], fileName, { type: file.type })
+				: file as File;
 			console.log(`http://${env.SERVER_IP}:${env.SERVER_PORT}/upload`);
-			const upload = new tus.Upload(file, {
+			const upload = new tus.Upload(uploadFile, {
 				endpoint: `http://${env.SERVER_IP}:${env.SERVER_PORT}/upload`,
 				retryDelays: [0, 1000, 3000, 5000],
 				metadata: {
-					filename: file.name,
-					filetype: file.type,
-					size: file.size as any,
+					filename: uploadFile.name,
+					filetype: uploadFile.type,
+					size: uploadFile.size as any,
 				},
 				onProgress: (bytesUploaded, bytesTotal) => {
 					const progress = Number(
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 45d7dc7..65e941c 100755
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -6,13 +6,49 @@
 	border-top-left-radius: 8px;
 	border-top-right-radius: 8px;
 	border-bottom: none;
-	border: none
+	border: none;
 }
 
 .quill-editor-container .ql-container {
 	border-bottom-left-radius: 8px;
 	border-bottom-right-radius: 8px;
-	border: none
+	border: none;
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
+	content: "标题 1";
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
+	content: "标题 2";
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
+	content: "标题 3";
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
+	content: "标题 4";
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
+	content: "标题 5";
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
+	content: "标题 6";
+}
+
+/* 针对下拉菜单中的选项 */
+.ql-snow .ql-picker.ql-header .ql-picker-item:not([data-value])::before,
+.ql-snow .ql-picker.ql-header .ql-picker-label:not([data-value])::before {
+	content: "正文" !important;
 }
 
 .ag-custom-dragging-class {
@@ -123,10 +159,4 @@
 .custom-table .ant-table-tbody>tr:last-child>td {
 	border-bottom: none;
 	/* 去除最后一行的底部边框 */
-}
-
-#map {
-	height: 600px;
-	width: 100%;
-}
-
+}
\ No newline at end of file
diff --git a/apps/web/src/routes/index.tsx b/apps/web/src/routes/index.tsx
index ab535c8..b12f419 100755
--- a/apps/web/src/routes/index.tsx
+++ b/apps/web/src/routes/index.tsx
@@ -3,24 +3,27 @@ import {
 	IndexRouteObject,
 	Link,
 	NonIndexRouteObject,
+	useParams,
 } from "react-router-dom";
 import ErrorPage from "../app/error";
 import WithAuth from "../components/utils/with-auth";
 import LoginPage from "../app/login";
-import StudentCoursesPage from "../app/main/courses/student/page";
-import InstructorCoursesPage from "../app/main/courses/instructor/page";
 import HomePage from "../app/main/home/page";
 import { CourseDetailPage } from "../app/main/course/detail/page";
 import { CourseBasicForm } from "../components/models/course/editor/form/CourseBasicForm";
 import CourseContentForm from "../components/models/course/editor/form/CourseContentForm/CourseContentForm";
-import { CourseGoalForm } from "../components/models/course/editor/form/CourseGoalForm";
-import CourseSettingForm from "../components/models/course/editor/form/CourseSettingForm";
 import CourseEditorLayout from "../components/models/course/editor/layout/CourseEditorLayout";
 import { MainLayout } from "../app/main/layout/MainLayout";
 import CoursesPage from "../app/main/courses/page";
-import PathsPage from "../app/main/paths/page";
+import PathPage from "../app/main/path/page";
 import { adminRoute } from "./admin-route";
+import PathEditorPage from "../app/main/path/editor/page";
+
 import { CoursePreview } from "../app/main/course/preview/page";
+import MyLearningPage from "../app/main/my-learning/page";
+import MyDutyPage from "../app/main/my-duty/page";
+import MyPathPage from "../app/main/my-path/page";
+import SearchPage from "../app/main/search/page";
 interface CustomIndexRouteObject extends IndexRouteObject {
 	name?: string;
 	breadcrumb?: string;
@@ -59,81 +62,97 @@ export const routes: CustomRouteObject[] = [
 						element: <HomePage />,
 					},
 					{
-						path: "paths",
-						element: <PathsPage></PathsPage>,
+						path: "path",
+						children: [
+							{
+								index: true,
+								element: <PathPage></PathPage>,
+							},
+							{
+								path: "editor/:id?",
+								element: <WithAuth>
+											<PathEditorPage></PathEditorPage>
+										</WithAuth>,
+							},
+						],
 					},
 					{
 						path: "courses",
 						element: <CoursesPage></CoursesPage>,
 					},
 					{
-						path: "my-courses",
+						path: "my-path",
+						element: (
+							<WithAuth>
+								<MyPathPage></MyPathPage>
+							</WithAuth>
+						),
 					},
 					{
-						path: "profiles",
+						path: "my-duty-path",
+						element: (
+							<WithAuth>
+								<MyPathPage></MyPathPage>
+							</WithAuth>
+						),
 					},
 					{
-						path: "courses",
-						children: [
-							{
-								path: "student",
-								element: (
-									<WithAuth>
-										<StudentCoursesPage />
-									</WithAuth>
-								),
-							},
-							{
-								path: "instructor",
-								element: (
-									<WithAuth>
-										<InstructorCoursesPage />
-									</WithAuth>
-								),
-							},
-						],
+						path: "my-duty",
+						element: (
+							<WithAuth>
+								<MyDutyPage></MyDutyPage>
+							</WithAuth>
+						),
 					},
-					// 课程预览页面
 					{
-						path: "coursePreview",
-						element:<CoursePreview></CoursePreview>
-					}
-					
+						path: "my-learning",
+						element: (
+							<WithAuth>
+								<MyLearningPage></MyLearningPage>
+							</WithAuth>
+						),
+					},
+					{
+						path: "search",
+						element: <SearchPage></SearchPage>,
+					},
+					{
+						path: "course/:id?/detail/:lectureId?", // 使用 ? 表示 id 参数是可选的
+						element: <CourseDetailPage />,
+					},
 				],
 			},
+
 			{
 				path: "course",
 				children: [
 					{
 						path: ":id?/editor",
-						element: <CourseEditorLayout></CourseEditorLayout>,
+						element: (
+							<WithAuth>
+								<CourseEditorLayout></CourseEditorLayout>
+							</WithAuth>
+						),
 						children: [
 							{
 								index: true,
-								element: <CourseBasicForm></CourseBasicForm>,
-							},
-							{
-								path: "goal",
-								element: <CourseGoalForm></CourseGoalForm>,
+								element: (
+									<WithAuth>
+										<CourseBasicForm></CourseBasicForm>
+									</WithAuth>
+								),
 							},
+
 							{
 								path: "content",
 								element: (
-									<CourseContentForm></CourseContentForm>
-								),
-							},
-							{
-								path: "setting",
-								element: (
-									<CourseSettingForm></CourseSettingForm>
+									<WithAuth>
+										<CourseContentForm></CourseContentForm>
+									</WithAuth>
 								),
 							},
 						],
 					},
-					{
-						path: ":id?/detail/:lectureId?", // 使用 ? 表示 id 参数是可选的
-						element: <CourseDetailPage />,
-					},
 				],
 			},
 			adminRoute,
diff --git a/apps/web/src/utils/axios-client.ts b/apps/web/src/utils/axios-client.ts
index 23877df..5b6a119 100755
--- a/apps/web/src/utils/axios-client.ts
+++ b/apps/web/src/utils/axios-client.ts
@@ -1,20 +1,20 @@
 import axios from 'axios';
 import { env } from '../env';
-const BASE_URL = `http://${env.SERVER_IP}:3000`
+const BASE_URL = `http://${env.SERVER_IP}:${env?.SERVER_PORT}`
 const apiClient = axios.create({
-    baseURL: BASE_URL,
-    // withCredentials: true,
+	baseURL: BASE_URL,
+	// withCredentials: true,
 });
 // Add a request interceptor to attach the access token
 apiClient.interceptors.request.use(
-    (config) => {
-        const accessToken = localStorage.getItem('access_token');
-        if (accessToken) {
-            config.headers['Authorization'] = `Bearer ${accessToken}`;
-        }
-        return config;
-    },
-    (error) => Promise.reject(error)
+	(config) => {
+		const accessToken = localStorage.getItem("access_token");
+		if (accessToken) {
+			config.headers["Authorization"] = `Bearer ${accessToken}`;
+		}
+		return config;
+	},
+	(error) => Promise.reject(error)
 );
 
 export default apiClient;
diff --git a/config/nginx/conf.d/web.conf b/config/nginx/conf.d/web.conf
index bf90259..67302b8 100755
--- a/config/nginx/conf.d/web.conf
+++ b/config/nginx/conf.d/web.conf
@@ -101,6 +101,7 @@ server {
         internal;
         # 代理到认证服务
         proxy_pass http://host.docker.internal:3000/auth/file;
+        
         # 请求优化：不传递请求体
         proxy_pass_request_body off;
         proxy_set_header Content-Length "";
diff --git a/config/nginx/conf.d/web.template b/config/nginx/conf.d/web.template
index 35c1d2b..779c9b2 100755
--- a/config/nginx/conf.d/web.template
+++ b/config/nginx/conf.d/web.template
@@ -100,7 +100,8 @@ server {
         # 仅供内部使用
         internal;
         # 代理到认证服务
-        proxy_pass http://${SERVER_IP}:3000/auth/file;
+        proxy_pass http://${SERVER_IP}:${SERVER_PORT}/auth/file;
+        
         # 请求优化：不传递请求体
         proxy_pass_request_body off;
         proxy_set_header Content-Length "";
diff --git a/config/nginx/entrypoint.sh b/config/nginx/entrypoint.sh
index ca557f8..cb85633 100755
--- a/config/nginx/entrypoint.sh
+++ b/config/nginx/entrypoint.sh
@@ -5,7 +5,7 @@ for template in /etc/nginx/conf.d/*.template; do
     # 将输出文件名改为 .conf 结尾
     conf="${template%.template}.conf"
     echo "Processing $template"
-    if envsubst '$SERVER_IP' < "$template" > "$conf"; then
+    if envsubst '$SERVER_IP $SERVER_PORT' < "$template" > "$conf"; then
         echo "Replaced $conf successfully"
     else
         echo "Failed to replace $conf"
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
index bb75926..ab857dc 100755
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -1,134 +1,136 @@
 version: "3.8"
 services:
-  db:
-    image: postgres:latest
-    ports:
-      - "5432:5432"
-    environment:
-      - POSTGRES_DB=app
-      - POSTGRES_USER=root
-      - POSTGRES_PASSWORD=Letusdoit000
-    volumes:
-      - ./volumes/postgres:/var/lib/postgresql/data
-  # minio:
-  #   image: minio/minio
-  #   ports:
-  #     - "9000:9000"
-  #     - "9001:9001"
-  #   volumes:
-  #     - ./volumes/minio:/minio_data
-  #   environment:
-  #     - MINIO_ACCESS_KEY=minioadmin
-  #     - MINIO_SECRET_KEY=minioadmin
-  #   command: minio server /minio_data --console-address ":9001" -address ":9000"
-  #   healthcheck:
-  #     test:
-  #       [
-  #         "CMD",
-  #         "curl",
-  #         "-f",
-  #         "http://192.168.2.1:9001/minio/health/live"
-  #       ]
-  #     interval: 30s
-  #     timeout: 20s
-  #     retries: 3
-  pgadmin:
-    image: dpage/pgadmin4
-    ports:
-      - "8082:80"
-    environment:
-      - PGADMIN_DEFAULT_EMAIL=insiinc@outlook.com
-      - PGADMIN_DEFAULT_PASSWORD=Letusdoit000
-  # tusd:
-  #   image: tusproject/tusd
-  #   ports:
-  #     - "8080:8080"
-  #   environment:
-  #     - AWS_REGION=cn-north-1
-  #     - AWS_ACCESS_KEY_ID=minioadmin
-  #     - AWS_SECRET_ACCESS_KEY=minioadmin
-  #   command: -verbose -s3-bucket app -s3-endpoint http://minio:9000 -hooks-http http://host.docker.internal:3000/upload/hook
-  #   volumes:
-  #     - ./volumes/tusd:/data
-  #   extra_hosts:
-  #     - "host.docker.internal:host-gateway"
-  #   depends_on:
-  #     - minio
-  # tusd:
-  #   image: tusproject/tusd
-  #   ports:
-  #     - "8080:8080"
-  #   command: -verbose -upload-dir /data -hooks-http http://host.docker.internal:3000/upload/hook
-  #   volumes:
-  #     - ./uploads:/data
-  #   extra_hosts:
-  #     - "host.docker.internal:host-gateway"
-  nginx:
-    image: nice-nginx:latest
-    ports:
-      - "80:80"
-    volumes:
-      - ./config/nginx/conf.d:/etc/nginx/conf.d
-      - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf
-      - ./uploads:/data/uploads  # tusd 上传目录
-      - ./web-dist:/usr/share/nginx/html  # 添加前端构建文件的挂载
-      - ./config/nginx/entrypoint.sh:/docker-entrypoint.sh
-    environment:
-      - SERVER_IP=host.docker.internal
-    entrypoint: ["/docker-entrypoint.sh"]
-    extra_hosts:
-      - "host.docker.internal:host-gateway" 
-  redis:
-      image: redis:latest
-      ports:
-        - "6379:6379"
-      volumes:
-        - ./config/redis.conf:/usr/local/etc/redis/redis.conf
-        - ./volumes/redis:/data
-      command: ["redis-server", "/usr/local/etc/redis/redis.conf"]
-  # restic:
-  #   image: restic/restic:latest
-  #   environment:
-  #     - RESTIC_REPOSITORY=/backup
-  #     - RESTIC_PASSWORD=Letusdoit000
-  #   volumes:
-  #     - ./volumes/postgres:/data
-  #     - ./volumes/restic-cache:/root/.cache/restic
-  #     - ./backup:/backup   # 本地目录挂载到容器内的 /backup
-  #     - ./config/backup.sh:/usr/local/bin/backup.sh # Mount your script inside the container
-  #   entrypoint:  /usr/local/bin/backup.sh
-  #   depends_on:
-  #     - db
-  # web:
-  #   image: td-web:latest
-  #   ports:
-  #     - "80:80"
-  #   environment:
-  #     - VITE_APP_SERVER_IP=192.168.79.77
-  #     - VITE_APP_VERSION=0.3.0
-  #     - VITE_APP_APP_NAME=两道防线管理后台
-  # server:
-  #   image: td-server:latest
-  #   ports:
-  #     - "3000:3000"
-  #     - "3001:3001"
-  #   environment:
-  #     - DATABASE_URL=postgresql://root:Letusdoit000@db:5432/app?schema=public
-  #     - REDIS_HOST=redis
-  #     - REDIS_PORT=6379
-  #     - REDIS_PASSWORD=Letusdoit000
-  #     - TUS_URL=http://192.168.2.1:8080
-  #     - JWT_SECRET=/yT9MnLm/r6NY7ee2Fby6ihCHZl+nFx4OQFKupivrhA=
-  #     - PUSH_URL=http://dns:9092
-  #     - PUSH_APPID=123
-  #     - PUSH_APPSECRET=123
-  #     - MINIO_HOST=minio
-  #     - ADMIN_PHONE_NUMBER=13258117304
-  #     - DEADLINE_CRON=0 0 8 * * *
-  #   depends_on:
-  #     - db
-  #     - redis
+    db:
+        image: postgres:latest
+        ports:
+            - "5432:5432"
+        environment:
+            - POSTGRES_DB=app
+            - POSTGRES_USER=root
+            - POSTGRES_PASSWORD=Letusdoit000
+        volumes:
+            - ./volumes/postgres:/var/lib/postgresql/data
+    # minio:
+    #   image: minio/minio
+    #   ports:
+    #     - "9000:9000"
+    #     - "9001:9001"
+    #   volumes:
+    #     - ./volumes/minio:/minio_data
+    #   environment:
+    #     - MINIO_ACCESS_KEY=minioadmin
+    #     - MINIO_SECRET_KEY=minioadmin
+    #   command: minio server /minio_data --console-address ":9001" -address ":9000"
+    #   healthcheck:
+    #     test:
+    #       [
+    #         "CMD",
+    #         "curl",
+    #         "-f",
+    #         "http://192.168.2.1:9001/minio/health/live"
+    #       ]
+    #     interval: 30s
+    #     timeout: 20s
+    #     retries: 3
+    pgadmin:
+        image: dpage/pgadmin4
+        ports:
+            - "8082:80"
+        environment:
+            - PGADMIN_DEFAULT_EMAIL=insiinc@outlook.com
+            - PGADMIN_DEFAULT_PASSWORD=Letusdoit000
+        # tusd:
+        #   image: tusproject/tusd
+        #   ports:
+        #     - "8080:8080"
+        #   environment:
+        #     - AWS_REGION=cn-north-1
+        #     - AWS_ACCESS_KEY_ID=minioadmin
+        #     - AWS_SECRET_ACCESS_KEY=minioadmin
+        #   command: -verbose -s3-bucket app -s3-endpoint http://minio:9000 -hooks-http http://host.docker.internal:3000/upload/hook
+        #   volumes:
+        #     - ./volumes/tusd:/data
+        #   extra_hosts:
+        #     - "host.docker.internal:host-gateway"
+        #   depends_on:
+        #     - minio
+        # tusd:
+        #   image: tusproject/tusd
+        #   ports:
+        #     - "8080:8080"
+        #   command: -verbose -upload-dir /data -hooks-http http://host.docker.internal:3000/upload/hook
+        #   volumes:
+        #     - ./uploads:/data
+        #   extra_hosts:
+        #     - "host.docker.internal:host-gateway"
+    nginx:
+        image: nice-nginx:2.0
+        ports:
+            - "80:80"
+        volumes:
+            - ./config/nginx/conf.d:/etc/nginx/conf.d
+            - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf
+            - ./uploads:/data/uploads # tusd 上传目录
+            - ./web-dist:/usr/share/nginx/html # 添加前端构建文件的挂载
+            - ./config/nginx/entrypoint.sh:/docker-entrypoint.sh
+        environment:
+            - SERVER_IP=host.docker.internal
+            - SERVER_PORT=3000
+        entrypoint: ["/docker-entrypoint.sh"]
+        extra_hosts:
+            - "host.docker.internal:host-gateway"
+
+    redis:
+        image: redis:latest
+        ports:
+            - "6379:6379"
+        volumes:
+            - ./config/redis.conf:/usr/local/etc/redis/redis.conf
+            - ./volumes/redis:/data
+        command: ["redis-server", "/usr/local/etc/redis/redis.conf"]
+    # restic:
+    #   image: restic/restic:latest
+    #   environment:
+    #     - RESTIC_REPOSITORY=/backup
+    #     - RESTIC_PASSWORD=Letusdoit000
+    #   volumes:
+    #     - ./volumes/postgres:/data
+    #     - ./volumes/restic-cache:/root/.cache/restic
+    #     - ./backup:/backup   # 本地目录挂载到容器内的 /backup
+    #     - ./config/backup.sh:/usr/local/bin/backup.sh # Mount your script inside the container
+    #   entrypoint:  /usr/local/bin/backup.sh
+    #   depends_on:
+    #     - db
+    # web:
+    #   image: td-web:latest
+    #   ports:
+    #     - "80:80"
+    #   environment:
+    #     - VITE_APP_SERVER_IP=192.168.79.77
+    #     - VITE_APP_VERSION=0.3.0
+    #     - VITE_APP_APP_NAME=两道防线管理后台
+    # server:
+    #   image: td-server:latest
+    #   ports:
+    #     - "3000:3000"
+    #     - "3001:3001"
+    #   environment:
+    #     - DATABASE_URL=postgresql://root:Letusdoit000@db:5432/app?schema=public
+    #     - REDIS_HOST=redis
+    #     - REDIS_PORT=6379
+    #     - REDIS_PASSWORD=Letusdoit000
+    #     - TUS_URL=http://192.168.2.1:8080
+    #     - JWT_SECRET=/yT9MnLm/r6NY7ee2Fby6ihCHZl+nFx4OQFKupivrhA=
+    #     - PUSH_URL=http://dns:9092
+    #     - PUSH_APPID=123
+    #     - PUSH_APPSECRET=123
+    #     - MINIO_HOST=minio
+    #     - ADMIN_PHONE_NUMBER=13258117304
+    #     - DEADLINE_CRON=0 0 8 * * *
+    #   depends_on:
+    #     - db
+    #     - redis
 
 networks:
-  default:
-    name: remooc
+    default:
+        name: remooc
diff --git a/package.json b/package.json
index 8a85a11..8156253 100755
--- a/package.json
+++ b/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "pnpm run --parallel dev",
-    "db:clear": "pnpm --filter common run db:clear"
+    "db:clear": "pnpm --filter common run db:clear",
+    "studio": "pnpm --filter common run studio"
   },
   "keywords": [],
   "author": "insiinc",
diff --git a/packages/client/src/api/hooks/index.ts b/packages/client/src/api/hooks/index.ts
index 896a883..73b516d 100755
--- a/packages/client/src/api/hooks/index.ts
+++ b/packages/client/src/api/hooks/index.ts
@@ -9,4 +9,4 @@ export * from "./useTaxonomy"
 export * from "./useVisitor"
 export * from "./useMessage"
 export * from "./usePost"
-// export * from "./useCourse"
\ No newline at end of file
+export * from "./useEntity"
diff --git a/packages/client/src/api/hooks/useAppConfig.ts b/packages/client/src/api/hooks/useAppConfig.ts
index 0b00ffd..f38b6de 100755
--- a/packages/client/src/api/hooks/useAppConfig.ts
+++ b/packages/client/src/api/hooks/useAppConfig.ts
@@ -3,15 +3,16 @@ import { AppConfigSlug, BaseSetting } from "@nice/common";
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 export function useAppConfig() {
-	const utils = api.useUtils()
+	const utils = api.useUtils();
 	const [baseSetting, setBaseSetting] = useState<BaseSetting | undefined>();
 
 	const { data, isLoading }: { data: any; isLoading: boolean } =
 		api.app_config.findFirst.useQuery({
-			where: { slug: AppConfigSlug.BASE_SETTING }
+			where: { slug: AppConfigSlug.BASE_SETTING },
 		});
+
 	const handleMutationSuccess = useCallback(() => {
-		utils.app_config.invalidate()
+		utils.app_config.invalidate();
 	}, [utils]);
 
 	// Use the generic success handler in mutations
@@ -26,9 +27,9 @@ export function useAppConfig() {
 	});
 	useEffect(() => {
 		if (data?.meta) {
-			setBaseSetting(JSON.parse(data?.meta));
+			// console.log(JSON.parse(data?.meta));
+			setBaseSetting(data?.meta);
 		}
-
 	}, [data, isLoading]);
 	const splashScreen = useMemo(() => {
 		return baseSetting?.appConfig?.splashScreen;
@@ -36,8 +37,20 @@ export function useAppConfig() {
 	const devDept = useMemo(() => {
 		return baseSetting?.appConfig?.devDept;
 	}, [baseSetting]);
+	const slides = useMemo(() => {
+		return baseSetting?.appConfig?.slides || [];
+	}, [baseSetting]);
+	const statistics = useMemo(() => {
+		return (
+			baseSetting?.appConfig?.statistics || {
+				reads: 0,
+				staffs: 0,
+				courses: 0,
+				lectures: 0,
+			}
+		);
+	}, [baseSetting]);
 	return {
-
 		create,
 		deleteMany,
 		update,
@@ -45,5 +58,7 @@ export function useAppConfig() {
 		splashScreen,
 		devDept,
 		isLoading,
+		slides,
+		statistics,
 	};
 }
diff --git a/packages/client/src/api/hooks/useEntity.ts b/packages/client/src/api/hooks/useEntity.ts
index 2b1dbfa..175b342 100755
--- a/packages/client/src/api/hooks/useEntity.ts
+++ b/packages/client/src/api/hooks/useEntity.ts
@@ -113,5 +113,8 @@ export function useEntity<T extends keyof RouterInputs>(
 			T,
 			"updateOrder"
 		>, // 更新实体顺序的 mutation 函数
+		updateOrderByIds: createMutationHandler(
+			"updateOrderByIds"
+		) as MutationResult<T, "updateOrderByIds">, // 更新实体顺序的 mutation 函数
 	};
 }
diff --git a/packages/client/src/api/hooks/usePost.ts b/packages/client/src/api/hooks/usePost.ts
index 41e0063..88c6326 100755
--- a/packages/client/src/api/hooks/usePost.ts
+++ b/packages/client/src/api/hooks/usePost.ts
@@ -1,12 +1,5 @@
-import { useQueryClient } from "@tanstack/react-query";
-import { getQueryKey } from "@trpc/react-query";
-import { MutationResult, useEntity } from "./useEntity";
-import { ObjectType } from "@nice/common";
-import { api } from "../trpc";
-import { CrudOperation, emitDataChange } from "../../event";
-export function usePost() {
-	const queryClient = useQueryClient();
-	const queryKey = getQueryKey(api.post);
 
+import { MutationResult, useEntity } from "./useEntity";
+export function usePost() {
 	return useEntity("post");
 }
diff --git a/packages/client/src/api/hooks/useStaff.ts b/packages/client/src/api/hooks/useStaff.ts
index fbdf571..aed3aa7 100755
--- a/packages/client/src/api/hooks/useStaff.ts
+++ b/packages/client/src/api/hooks/useStaff.ts
@@ -5,39 +5,48 @@ import { ObjectType, Staff } from "@nice/common";
 import { findQueryData } from "../utils";
 import { CrudOperation, emitDataChange } from "../../event";
 export function useStaff() {
-    const queryClient = useQueryClient();
-    const queryKey = getQueryKey(api.staff);
+	const queryClient = useQueryClient();
+	const queryKey = getQueryKey(api.staff);
 
-    const create = api.staff.create.useMutation({
-        onSuccess: (result) => {
-            queryClient.invalidateQueries({ queryKey });
-            emitDataChange(ObjectType.STAFF, result as any, CrudOperation.CREATED)
-        },
-    });
-    const updateUserDomain = api.staff.updateUserDomain.useMutation({
-        onSuccess: async (result) => {
-            queryClient.invalidateQueries({ queryKey });
-        },
-    });
-    const update = api.staff.update.useMutation({
-        onSuccess: (result) => {
-            queryClient.invalidateQueries({ queryKey });
-            emitDataChange(ObjectType.STAFF, result as any, CrudOperation.UPDATED)
-        },
-    });
+	const create = api.staff.create.useMutation({
+		onSuccess: (result) => {
+			queryClient.invalidateQueries({ queryKey });
+			emitDataChange(
+				ObjectType.STAFF,
+				result as any,
+				CrudOperation.CREATED
+			);
+		},
+	});
+	const updateUserDomain = api.staff.updateUserDomain.useMutation({
+		onSuccess: async (result) => {
+			queryClient.invalidateQueries({ queryKey });
+		},
+	});
+	const update = api.staff.update.useMutation({
+		onSuccess: (result) => {
+			queryClient.invalidateQueries({ queryKey });
+			queryClient.invalidateQueries({ queryKey: getQueryKey(api.post) });
+			emitDataChange(
+				ObjectType.STAFF,
+				result as any,
+				CrudOperation.UPDATED
+			);
+		},
+	});
 	const softDeleteByIds = api.staff.softDeleteByIds.useMutation({
 		onSuccess: (result, variables) => {
 			queryClient.invalidateQueries({ queryKey });
 		},
 	});
-    const getStaff = (key: string) => {
-        return findQueryData<Staff>(queryClient, api.staff, key);
-    };
-    return {
-        create,
-        update,
-        softDeleteByIds,
-        getStaff,
-        updateUserDomain
-    };
+	const getStaff = (key: string) => {
+		return findQueryData<Staff>(queryClient, api.staff, key);
+	};
+	return {
+		create,
+		update,
+		softDeleteByIds,
+		getStaff,
+		updateUserDomain,
+	};
 }
diff --git a/packages/common/prisma/schema.prisma b/packages/common/prisma/schema.prisma
index 01bb99e..d2185e3 100755
--- a/packages/common/prisma/schema.prisma
+++ b/packages/common/prisma/schema.prisma
@@ -88,9 +88,12 @@ model Staff {
     deletedAt DateTime? @map("deleted_at")
     officerId String?   @map("officer_id")
 
-    watchedPost    Post[]           @relation("post_watch_staff")
+    // watchedPost    Post[]           @relation("post_watch_staff")
     visits         Visit[]
     posts          Post[]
+
+
+    learningPosts  Post[]            @relation("post_student")
     sentMsgs       Message[]        @relation("message_sender")
     receivedMsgs   Message[]        @relation("message_receiver")
     registerToken  String?
@@ -110,6 +113,7 @@ model Department {
     id           String         @id @default(cuid())
     name         String
     order        Float?
+    posts Post[]  @relation("post_dept") 
     ancestors    DeptAncestry[] @relation("DescendantToAncestor")
     descendants  DeptAncestry[] @relation("AncestorToDescendant")
     parentId     String?        @map("parent_id")
@@ -123,7 +127,7 @@ model Department {
     deptStaffs   Staff[]        @relation("DeptStaff")
     terms        Term[]         @relation("department_term")
 
-    watchedPost Post[]   @relation("post_watch_dept")
+    // watchedPost Post[]   @relation("post_watch_dept")
     hasChildren Boolean? @default(false) @map("has_children")
 
     @@index([parentId])
@@ -200,11 +204,16 @@ model Post {
     order       Float?  @default(0) @map("order")
     duration   Int?
     rating   Int?   @default(0)    
+    students  Staff[]   @relation("post_student")
+    depts Department[]  @relation("post_dept") 
+    views     Int      @default(0) @map("views")
+    hates     Int      @default(0) @map("hates")
+    likes     Int      @default(0) @map("likes")
     // 索引
     // 日期时间类型字段
     createdAt       DateTime         @default(now()) @map("created_at")
     publishedAt     DateTime?        @map("published_at") // 发布时间
-    updatedAt       DateTime         @updatedAt @map("updated_at")
+    updatedAt       DateTime         @map("updated_at")
     deletedAt       DateTime?        @map("deleted_at") // 删除时间，可为空
     instructors     PostInstructor[]
     // 关系类型字段
@@ -220,8 +229,6 @@ model Post {
     ancestors       PostAncestry[]   @relation("DescendantPosts")
     descendants     PostAncestry[]   @relation("AncestorPosts")
     resources       Resource[] // 附件列表
-    watchableStaffs Staff[]          @relation("post_watch_staff") // 可观看的员工列表，关联 Staff 模型
-    watchableDepts  Department[]     @relation("post_watch_dept") // 可观看的部门列表，关联 Department 模型
     meta            Json? // 封面url 视频url  objectives具体的学习目标 rating评分Int    
 
     // 索引
@@ -234,6 +241,7 @@ model Post {
     @@index([type, publishedAt])
     @@index([state])
     @@index([level])
+    @@index([views])
     @@index([important])
     @@map("post")
 }
@@ -266,9 +274,8 @@ model Message {
     content   String?
     receivers Staff[]   @relation("message_receiver")
     visits    Visit[]
-    createdAt DateTime  @default(now()) @map("created_at")
+    createdAt DateTime  @default(now()) @map("created_at")+
     updatedAt DateTime? @updatedAt @map("updated_at")
-
     @@index([type, createdAt])
     @@map("message")
 }
@@ -279,21 +286,13 @@ model Visit {
     views     Int      @default(1) @map("views")
     // sourceIP  String?  @map("source_ip")
     // 关联关系
-    visitorId String   @map("visitor_id")
-    visitor   Staff    @relation(fields: [visitorId], references: [id])
+    visitorId String?   @map("visitor_id")
+    visitor   Staff?    @relation(fields: [visitorId], references: [id])
     postId    String?  @map("post_id")
     post      Post?    @relation(fields: [postId], references: [id])
     message   Message? @relation(fields: [messageId], references: [id])
     messageId String?  @map("message_id")
     lectureId String?  @map("lecture_id") // 课时ID
-
-    // 学习数据
-    // progress       Float?    @default(0) @map("progress") // 完成进度(0-100%)
-    // isCompleted    Boolean?  @default(false) @map("is_completed") // 是否完成
-    // lastPosition   Int?      @default(0) @map("last_position") // 视频播放位置(秒)
-    // totalWatchTime Int?      @default(0) @map("total_watch_time") // 总观看时长(秒)
-    // // 时间记录
-    // lastWatchedAt  DateTime? @map("last_watched_at") // 最后观看时间
     createdAt DateTime  @default(now()) @map("created_at") // 创建时间
     updatedAt DateTime  @updatedAt @map("updated_at") // 更新时间
     deletedAt DateTime? @map("deleted_at") // 删除时间，可为空
@@ -404,7 +403,6 @@ model NodeEdge {
     @@index([targetId])
     @@map("node_edge")
 }
-
 model Animal {
     id     String  @id @default(cuid())
     name   String
diff --git a/packages/common/src/constants.ts b/packages/common/src/constants.ts
index 0a41f6e..34aca4f 100755
--- a/packages/common/src/constants.ts
+++ b/packages/common/src/constants.ts
@@ -56,8 +56,9 @@ export const InitTaxonomies: {
 	objectType?: string[];
 }[] = [
 	{
-		name: "分类",
+		name: "课程分类",
 		slug: TaxonomySlug.CATEGORY,
+		objectType: [ObjectType.COURSE],
 	},
 	{
 		name: "难度等级",
@@ -68,10 +69,10 @@ export const InitTaxonomies: {
 	// 	name: "研判单元",
 	// 	slug: TaxonomySlug.UNIT,
 	// },
-	{
-		name: "标签",
-		slug: TaxonomySlug.TAG,
-	},
+	// {
+	// 	name: "标签",
+	// 	slug: TaxonomySlug.TAG,
+	// },
 ];
 export const InitAppConfigs: Prisma.AppConfigCreateInput[] = [
 	{
@@ -80,3 +81,17 @@ export const InitAppConfigs: Prisma.AppConfigCreateInput[] = [
 		description: "",
 	},
 ];
+export const videoMimeTypes = [
+	"video/*", // 通配符 (部分浏览器可能不支持)
+	"video/mp4", // .mp4
+	"video/quicktime", // .mov
+	"video/x-msvideo", // .avi
+	"video/x-matroska", // .mkv
+	"video/webm", // .webm
+	"video/ogg", // .ogv
+	"video/mpeg", // .mpeg
+	"video/3gpp", // .3gp
+	"video/3gpp2", // .3g2
+	"video/x-flv", // .flv
+	"video/x-ms-wmv", // .wmv
+];
diff --git a/packages/common/src/enum.ts b/packages/common/src/enum.ts
index 32903b2..309ef6d 100755
--- a/packages/common/src/enum.ts
+++ b/packages/common/src/enum.ts
@@ -5,9 +5,10 @@ export enum PostType {
 	POST = "post",
 	POST_COMMENT = "post_comment",
 	COURSE_REVIEW = "course_review",
-	COURSE = "couse",
+	COURSE = "course",
 	SECTION = "section",
 	LECTURE = "lecture",
+	PATH = "path",
 }
 export enum LectureType {
 	VIDEO = "video",
diff --git a/packages/common/src/models/index.ts b/packages/common/src/models/index.ts
index 2716f11..6273433 100755
--- a/packages/common/src/models/index.ts
+++ b/packages/common/src/models/index.ts
@@ -1,7 +1,8 @@
-export * from "./department"
-export * from "./message"
-export * from "./staff"
-export * from "./term"
-export * from "./post"
-export * from "./rbac"
-export * from "./select"
\ No newline at end of file
+export * from "./department";
+export * from "./message";
+export * from "./staff";
+export * from "./term";
+export * from "./post";
+export * from "./rbac";
+export * from "./select";
+export * from "./resource";
diff --git a/packages/common/src/models/post.ts b/packages/common/src/models/post.ts
index a82d22a..d672bc8 100755
--- a/packages/common/src/models/post.ts
+++ b/packages/common/src/models/post.ts
@@ -8,6 +8,8 @@ import {
 } from "@prisma/client";
 import { StaffDto } from "./staff";
 import { TermDto } from "./term";
+import { ResourceDto } from "./resource";
+import { DepartmentDto } from "./department";
 
 export type PostComment = {
 	id: string;
@@ -38,21 +40,35 @@ export type PostDto = Post & {
 		delete: boolean;
 		// edit: boolean;
 	};
+	meta?: PostMeta;
 	watchableDepts: Department[];
 	watchableStaffs: Staff[];
-};
+	terms: TermDto[];
+	depts: DepartmentDto[];
 
-export type LectureMeta = {
+	studentIds?: string[];
+};
+export type PostMeta = {
+	thumbnail?: string;
+	views?: number;
+	likes?: number;
+	hates?: number;
+};
+export type LectureMeta = PostMeta & {
 	type?: string;
+
 	videoUrl?: string;
 	videoThumbnail?: string;
+	videoIds?: string[];
+	videoThumbnailIds?: string[];
 };
 
 export type Lecture = Post & {
+	resources?: ResourceDto[];
 	meta?: LectureMeta;
 };
 
-export type SectionMeta = {
+export type SectionMeta = PostMeta & {
 	objectives?: string[];
 };
 export type Section = Post & {
@@ -61,16 +77,59 @@ export type Section = Post & {
 export type SectionDto = Section & {
 	lectures: Lecture[];
 };
-export type CourseMeta = {
-	thumbnail?: string;
-	requirements?: string[];
+export type CourseMeta = PostMeta & {
 	objectives?: string[];
 };
-export type Course = Post & {
+export type Course = PostDto & {
 	meta?: CourseMeta;
 };
 export type CourseDto = Course & {
 	enrollments?: Enrollment[];
 	sections?: SectionDto[];
-	terms: Term[];
+	terms: TermDto[];
+	lectureCount?: number;
+	depts: Department[];
+	studentIds: string[];
+};
+
+export type Summary = {
+	id: string;
+	text: string;
+	parent: string;
+	start: number;
+	end: number;
+};
+export type NodeObj = {
+	topic: string;
+	id: string;
+	style?: {
+		fontSize?: string;
+		color?: string;
+		background?: string;
+		fontWeight?: string;
+	};
+	children?: NodeObj[];
+};
+export type Arrow = {
+	id: string;
+	label: string;
+	from: string;
+	to: string;
+	delta1: {
+		x: number;
+		y: number;
+	};
+	delta2: {
+		x: number;
+		y: number;
+	};
+};
+export type PathMeta = PostMeta & {
+	nodeData: NodeObj;
+	arrows?: Arrow[];
+	summaries?: Summary[];
+	direction?: number;
+};
+export type PathDto = PostDto & {
+	meta: PathMeta;
 };
diff --git a/packages/common/src/models/resource.ts b/packages/common/src/models/resource.ts
new file mode 100755
index 0000000..e732d88
--- /dev/null
+++ b/packages/common/src/models/resource.ts
@@ -0,0 +1,52 @@
+import { Resource } from "@prisma/client";
+
+export interface BaseMetadata {
+	size: number;
+	filetype: string;
+	filename: string;
+	extension: string;
+	modifiedAt: Date;
+}
+/**
+ * 图片特有元数据接口
+ */
+export interface ImageMetadata {
+	width: number; // 图片宽度(px)
+	height: number; // 图片高度(px)
+	compressedUrl?: string;
+	orientation?: number; // EXIF方向信息
+	space?: string; // 色彩空间 (如: RGB, CMYK)
+	hasAlpha?: boolean; // 是否包含透明通道
+}
+
+/**
+ * 视频特有元数据接口
+ */
+export interface VideoMetadata {
+	width?: number;
+	height?: number;
+	duration?: number;
+	videoCodec?: string;
+	audioCodec?: string;
+	coverUrl?: string;
+}
+
+/**
+ * 音频特有元数据接口
+ */
+export interface AudioMetadata {
+	duration: number; // 音频时长(秒)
+	bitrate?: number; // 比特率(bps)
+	sampleRate?: number; // 采样率(Hz)
+	channels?: number; // 声道数
+	codec?: string; // 音频编码格式
+}
+
+export type FileMetadata = ImageMetadata &
+	VideoMetadata &
+	AudioMetadata &
+	BaseMetadata;
+
+export type ResourceDto = Resource & {
+	meta: FileMetadata;
+};
diff --git a/packages/common/src/models/section.ts b/packages/common/src/models/section.ts
deleted file mode 100755
index 0824441..0000000
--- a/packages/common/src/models/section.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { Lecture, Section } from "@prisma/client";
-
-export type SectionDto = Section & {
-    lectures: Lecture[];
-};
\ No newline at end of file
diff --git a/packages/common/src/models/select.ts b/packages/common/src/models/select.ts
index 5417c1c..f21f1a6 100755
--- a/packages/common/src/models/select.ts
+++ b/packages/common/src/models/select.ts
@@ -6,9 +6,25 @@ export const postDetailSelect: Prisma.PostSelect = {
 	title: true,
 	content: true,
 	resources: true,
-	watchableDepts: true,
-	watchableStaffs: true,
+	parent: true,
+	parentId: true,
+	// watchableDepts: true,
+	// watchableStaffs: true,
 	updatedAt: true,
+	terms: {
+		select: {
+			id: true,
+			name: true,
+			taxonomyId: true,
+			taxonomy: {
+				select: {
+					id: true,
+					slug: true,
+				},
+			},
+		},
+	},
+	depts: true,
 	author: {
 		select: {
 			id: true,
@@ -28,11 +44,16 @@ export const postDetailSelect: Prisma.PostSelect = {
 			},
 		},
 	},
+	meta: true,
+	views: true,
 };
 export const postUnDetailSelect: Prisma.PostSelect = {
 	id: true,
 	type: true,
 	title: true,
+	views: true,
+	parent: true,
+	parentId: true,
 	content: true,
 	resources: true,
 	updatedAt: true,
@@ -60,6 +81,7 @@ export const messageDetailSelect: Prisma.MessageSelect = {
 	id: true,
 	sender: true,
 	content: true,
+
 	title: true,
 	url: true,
 	option: true,
@@ -69,29 +91,47 @@ export const courseDetailSelect: Prisma.PostSelect = {
 	id: true,
 	title: true,
 	subTitle: true,
+	views: true,
+	type: true,
+	author: true,
+	authorId: true,
 	content: true,
-
-	level: true,
-	// requirements: true,
-	// objectives: true,
-	// skills: true,
-	// audiences: true,
-	// totalDuration: true,
-	// totalLectures: true,
-	// averageRating: true,
-	// numberOfReviews: true,
-	// numberOfStudents: true,
-	// completionRate: true,
-	state: true,
+	depts: true,
 	// isFeatured: true,
 	createdAt: true,
-	publishedAt: true,
+	updatedAt: true,
 	// 关联表选择
-	children: {
-		include: {
-			children: true,
+	terms: {
+		select: {
+			id: true,
+			name: true,
+			taxonomyId: true,
+			taxonomy: {
+				select: {
+					id: true,
+					slug: true,
+				},
+			},
 		},
 	},
-	enrollments: true,
+	enrollments: {
+		select: {
+			id: true,
+		},
+	},
+	meta: true,
+	rating: true,
+};
+export const lectureDetailSelect: Prisma.PostSelect = {
+	id: true,
+	title: true,
+	subTitle: true,
+	content: true,
+	resources: true,
+	views: true,
+	createdAt: true,
+	updatedAt: true,
+	// 关联表选择
+
 	meta: true,
 };
diff --git a/packages/common/src/models/staff.ts b/packages/common/src/models/staff.ts
index a6ace02..565f847 100755
--- a/packages/common/src/models/staff.ts
+++ b/packages/common/src/models/staff.ts
@@ -2,37 +2,37 @@ import { Staff, Department } from "@prisma/client";
 import { RolePerms } from "../enum";
 
 export type StaffRowModel = {
-    avatar: string;
-    dept_name: string;
-    officer_id: string;
-    phone_number: string;
-    showname: string;
-    username: string;
+	avatar: string;
+	dept_name: string;
+	officer_id: string;
+	phone_number: string;
+	showname: string;
+	username: string;
 };
 export type UserProfile = Staff & {
-    permissions: RolePerms[];
-    deptIds: string[];
-    parentDeptIds: string[];
-    domain: Department;
-    department: Department;
+	permissions: RolePerms[];
+	deptIds: string[];
+	parentDeptIds: string[];
+	domain: Department;
+	department: Department;
 };
 
 export type StaffDto = Staff & {
-    domain?: Department;
-    department?: Department;
+	domain?: Department;
+	department?: Department;
 };
 export interface AuthDto {
-    token: string;
-    staff: StaffDto;
-    refreshToken: string;
-    perms: string[];
+	token: string;
+	staff: StaffDto;
+	refreshToken: string;
+	perms: string[];
 }
 export interface JwtPayload {
-    sub: string;
-    username: string;
+	sub: string;
+	username: string;
 }
 export interface TokenPayload {
-    id: string;
-    phoneNumber: string;
-    name: string;
-}
\ No newline at end of file
+	id: string;
+	phoneNumber: string;
+	name: string;
+}
diff --git a/packages/common/src/models/term.ts b/packages/common/src/models/term.ts
index cef8b61..37c5d7f 100755
--- a/packages/common/src/models/term.ts
+++ b/packages/common/src/models/term.ts
@@ -1,8 +1,10 @@
-import { Term } from "@prisma/client";
+import { Taxonomy, Term } from "@prisma/client";
 import { ResPerm } from "./rbac";
+import { TaxonomySlug } from "../enum";
 
 export type TermDto = Term & {
     permissions: ResPerm;
     children: TermDto[];
     hasChildren: boolean;
+    taxonomy: Taxonomy
 };
\ No newline at end of file
diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts
index 084316a..0207fb7 100755
--- a/packages/common/src/types.ts
+++ b/packages/common/src/types.ts
@@ -43,6 +43,13 @@ export interface BaseSetting {
 	appConfig?: {
 		splashScreen?: string;
 		devDept?: string;
+		slides?: [];
+		statistics?: {
+			reads?: number;
+			courses?: number;
+			lectures?: number;
+			staffs?: number;
+		};
 	};
 }
 export type RowModelResult = {
diff --git a/packages/mind-elixir-core b/packages/mind-elixir-core
deleted file mode 160000
index b911b4b..0000000
--- a/packages/mind-elixir-core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b911b4ba7629da9d6c622abe241fd25299baf1a5
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 73c6a31..382d2e7 100755
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,7 +12,7 @@ importers:
     dependencies:
       '@nestjs/bullmq':
         specifier: ^10.2.0
-        version: 10.2.3(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15)(bullmq@5.34.8)
+        version: 10.2.3(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(@nestjs/websockets@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1))(bullmq@5.34.8)
       '@nestjs/common':
         specifier: ^10.3.10
         version: 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1)
@@ -33,7 +33,7 @@ importers:
         version: 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@10.4.15)(rxjs@7.8.1)
       '@nestjs/schedule':
         specifier: ^4.1.0
-        version: 4.1.2(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15)
+        version: 4.1.2(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(@nestjs/websockets@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1))
       '@nestjs/websockets':
         specifier: ^10.3.10
         version: 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15)(@nestjs/platform-socket.io@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1)
@@ -148,7 +148,7 @@ importers:
         version: 10.2.3(chokidar@3.6.0)(typescript@5.7.2)
       '@nestjs/testing':
         specifier: ^10.0.0
-        version: 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15)(@nestjs/platform-express@10.4.15)
+        version: 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(@nestjs/websockets@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15))
       '@types/exceljs':
         specifier: ^1.3.0
         version: 1.3.2
@@ -401,6 +401,9 @@ importers:
       tailwind-merge:
         specifier: ^2.6.0
         version: 2.6.0
+      use-debounce:
+        specifier: ^10.0.4
+        version: 10.0.4(react@18.2.0)
       uuid:
         specifier: ^10.0.0
         version: 10.0.0
@@ -1984,79 +1987,67 @@ packages:
     resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linux-arm@1.0.5':
     resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==}
     cpu: [arm]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linux-s390x@1.0.4':
     resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==}
     cpu: [s390x]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linux-x64@1.0.4':
     resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
     resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@img/sharp-libvips-linuxmusl-x64@1.0.4':
     resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@img/sharp-linux-arm64@0.33.5':
     resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linux-arm@0.33.5':
     resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linux-s390x@0.33.5':
     resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [s390x]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linux-x64@0.33.5':
     resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linuxmusl-arm64@0.33.5':
     resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@img/sharp-linuxmusl-x64@0.33.5':
     resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@img/sharp-wasm32@0.33.5':
     resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==}
@@ -2524,61 +2515,51 @@ packages:
     resolution: {integrity: sha512-PaMRNBSqCx7K3Wc9QZkFx5+CX27WFpAMxJNiYGAXfmMIKC7jstlr32UhTgK6T07OtqR+wYlWm9IxzennjnvdJg==}
     cpu: [arm]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-arm-musleabihf@4.30.1':
     resolution: {integrity: sha512-B8Rcyj9AV7ZlEFqvB5BubG5iO6ANDsRKlhIxySXcF1axXYUyqwBok+XZPgIYGBgs7LDXfWfifxhw0Ik57T0Yug==}
     cpu: [arm]
     os: [linux]
-    libc: [musl]
 
   '@rollup/rollup-linux-arm64-gnu@4.30.1':
     resolution: {integrity: sha512-hqVyueGxAj3cBKrAI4aFHLV+h0Lv5VgWZs9CUGqr1z0fZtlADVV1YPOij6AhcK5An33EXaxnDLmJdQikcn5NEw==}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-musl@4.30.1':
     resolution: {integrity: sha512-i4Ab2vnvS1AE1PyOIGp2kXni69gU2DAUVt6FSXeIqUCPIR3ZlheMW3oP2JkukDfu3PsexYRbOiJrY+yVNSk9oA==}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@rollup/rollup-linux-loongarch64-gnu@4.30.1':
     resolution: {integrity: sha512-fARcF5g296snX0oLGkVxPmysetwUk2zmHcca+e9ObOovBR++9ZPOhqFUM61UUZ2EYpXVPN1redgqVoBB34nTpQ==}
     cpu: [loong64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-powerpc64le-gnu@4.30.1':
     resolution: {integrity: sha512-GLrZraoO3wVT4uFXh67ElpwQY0DIygxdv0BNW9Hkm3X34wu+BkqrDrkcsIapAY+N2ATEbvak0XQ9gxZtCIA5Rw==}
     cpu: [ppc64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-gnu@4.30.1':
     resolution: {integrity: sha512-0WKLaAUUHKBtll0wvOmh6yh3S0wSU9+yas923JIChfxOaaBarmb/lBKPF0w/+jTVozFnOXJeRGZ8NvOxvk/jcw==}
     cpu: [riscv64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-s390x-gnu@4.30.1':
     resolution: {integrity: sha512-GWFs97Ruxo5Bt+cvVTQkOJ6TIx0xJDD/bMAOXWJg8TCSTEK8RnFeOeiFTxKniTc4vMIaWvCplMAFBt9miGxgkA==}
     cpu: [s390x]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.30.1':
     resolution: {integrity: sha512-UtgGb7QGgXDIO+tqqJ5oZRGHsDLO8SlpE4MhqpY9Llpzi5rJMvrK6ZGhsRCST2abZdBqIBeXW6WPD5fGK5SDwg==}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-x64-musl@4.30.1':
     resolution: {integrity: sha512-V9U8Ey2UqmQsBT+xTOeMzPzwDzyXmnAoO4edZhL7INkwQcaW1Ckv3WJX3qrrp/VHaDkEWIBWhRwP47r8cdrOow==}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@rollup/rollup-win32-arm64-msvc@4.30.1':
     resolution: {integrity: sha512-WabtHWiPaFF47W3PkHnjbmWawnX/aE57K47ZDT1BXTS5GgrBUEpvOzq0FI0V/UYzQJgdb8XlhVNH8/fwV8xDjw==}
@@ -2620,6 +2601,7 @@ packages:
   '@shopify/semaphore@3.1.0':
     resolution: {integrity: sha512-LxonkiWEu12FbZhuOMhsdocpxCqm7By8C/2U9QgNuEoXUx2iMrlXjJv3p93RwfNC6TrdlNRo17gRer1z1309VQ==}
     engines: {node: '>=18.12.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
   '@sinclair/typebox@0.27.8':
     resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
@@ -2936,28 +2918,24 @@ packages:
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@swc/core-linux-arm64-musl@1.10.6':
     resolution: {integrity: sha512-hB2xZFmXCKf2iJF5y2z01PSuLqEoUP3jIX/XlIHN+/AIP7PkSKsValE63LnjlnWPnSEI0IxUyRE3T3FzWE/fQQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@swc/core-linux-x64-gnu@1.10.6':
     resolution: {integrity: sha512-PRGPp0I22+oJ8RMGg8M4hXYxEffH3ayu0WoSDPOjfol1F51Wj1tfTWN4wVa2RibzJjkBwMOT0KGLGb/hSEDDXQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@swc/core-linux-x64-musl@1.10.6':
     resolution: {integrity: sha512-SoNBxlA86lnoV9vIz/TCyakLkdRhFSHx6tFMKNH8wAhz1kKYbZfDmpYoIzeQqdTh0tpx8e/Zu1zdK4smovsZqQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@swc/core-win32-arm64-msvc@1.10.6':
     resolution: {integrity: sha512-6L5Y2E+FVvM+BtoA+mJFjf/SjpFr73w2kHBxINxwH8/PkjAjkePDr5m0ibQhPXV61bTwX49+1otzTY85EsUW9Q==}
@@ -5586,14 +5564,17 @@ packages:
   level-codec@9.0.2:
     resolution: {integrity: sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ==}
     engines: {node: '>=6'}
+    deprecated: Superseded by level-transcoder (https://github.com/Level/community#faq)
 
   level-concat-iterator@2.0.1:
     resolution: {integrity: sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw==}
     engines: {node: '>=6'}
+    deprecated: Superseded by abstract-level (https://github.com/Level/community#faq)
 
   level-errors@2.0.1:
     resolution: {integrity: sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==}
     engines: {node: '>=6'}
+    deprecated: Superseded by abstract-level (https://github.com/Level/community#faq)
 
   level-iterator-stream@4.0.2:
     resolution: {integrity: sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==}
@@ -5606,6 +5587,7 @@ packages:
   level-packager@5.1.1:
     resolution: {integrity: sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ==}
     engines: {node: '>=6'}
+    deprecated: Superseded by abstract-level (https://github.com/Level/community#faq)
 
   level-supports@1.0.1:
     resolution: {integrity: sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==}
@@ -7576,6 +7558,12 @@ packages:
   url-parse@1.5.10:
     resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
 
+  use-debounce@10.0.4:
+    resolution: {integrity: sha512-6Cf7Yr7Wk7Kdv77nnJMf6de4HuDE4dTxKij+RqE9rufDsI6zsbjyAxcH5y2ueJCQAnfgKbzXbZHYlkFwmBlWkw==}
+    engines: {node: '>= 16.0.0'}
+    peerDependencies:
+      react: '*'
+
   use-sync-external-store@1.4.0:
     resolution: {integrity: sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==}
     peerDependencies:
@@ -9666,15 +9654,15 @@ snapshots:
   '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.3':
     optional: true
 
-  '@nestjs/bull-shared@10.2.3(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15)':
+  '@nestjs/bull-shared@10.2.3(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(@nestjs/websockets@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1))':
     dependencies:
       '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1)
       '@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(@nestjs/websockets@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1)
       tslib: 2.8.1
 
-  '@nestjs/bullmq@10.2.3(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15)(bullmq@5.34.8)':
+  '@nestjs/bullmq@10.2.3(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(@nestjs/websockets@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1))(bullmq@5.34.8)':
     dependencies:
-      '@nestjs/bull-shared': 10.2.3(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15)
+      '@nestjs/bull-shared': 10.2.3(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(@nestjs/websockets@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1))
       '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1)
       '@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(@nestjs/websockets@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1)
       bullmq: 5.34.8
@@ -9771,7 +9759,7 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@nestjs/schedule@4.1.2(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15)':
+  '@nestjs/schedule@4.1.2(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(@nestjs/websockets@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1))':
     dependencies:
       '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1)
       '@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(@nestjs/websockets@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1)
@@ -9789,7 +9777,7 @@ snapshots:
     transitivePeerDependencies:
       - chokidar
 
-  '@nestjs/testing@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15)(@nestjs/platform-express@10.4.15)':
+  '@nestjs/testing@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(@nestjs/websockets@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15))':
     dependencies:
       '@nestjs/common': 10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1)
       '@nestjs/core': 10.4.15(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.15)(@nestjs/websockets@10.4.15)(reflect-metadata@0.2.2)(rxjs@7.8.1)
@@ -15829,6 +15817,10 @@ snapshots:
       querystringify: 2.2.0
       requires-port: 1.0.0
 
+  use-debounce@10.0.4(react@18.2.0):
+    dependencies:
+      react: 18.2.0
+
   use-sync-external-store@1.4.0(react@18.2.0):
     dependencies:
       react: 18.2.0