update

playedu-api/pom.xml

@@ -44,9 +44,6 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>3.1.2</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
                 <executions>
                     <execution>
                         <goals>

playedu-api/src/main/java/xyz/playedu/api/PlayeduApiApplication.java

@@ -20,11 +20,14 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
+
 import xyz.playedu.common.config.UniqueNameGeneratorConfig;
 
 @SpringBootApplication
 @EnableAsync
-@ComponentScan(basePackages = {"xyz.playedu"}, nameGenerator = UniqueNameGeneratorConfig.class)
+@ComponentScan(
+        basePackages = {"xyz.playedu"},
+        nameGenerator = UniqueNameGeneratorConfig.class)
 @MapperScan("xyz.playedu.**.mapper")
 public class PlayeduApiApplication {
 

playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
+
 import xyz.playedu.common.exception.LimitException;
 import xyz.playedu.common.exception.NotFoundException;
 import xyz.playedu.common.exception.ServiceException;

playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java

@@ -24,12 +24,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import xyz.playedu.common.context.BCtx;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.bus.BackendBus;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
-import xyz.playedu.common.annotation.BackendPermission;
+import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.domain.AdminLog;
 import xyz.playedu.common.service.AdminLogService;
 import xyz.playedu.common.types.JsonResponse;

playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminRoleController.java

@@ -21,6 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import xyz.playedu.api.request.backend.AdminRoleRequest;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BackendConstant;
@@ -28,8 +30,6 @@ import xyz.playedu.common.constant.BusinessTypeConstant;
 import xyz.playedu.common.domain.AdminPermission;
 import xyz.playedu.common.domain.AdminRole;
 import xyz.playedu.common.exception.NotFoundException;
-import xyz.playedu.common.annotation.BackendPermission;
-import xyz.playedu.api.request.backend.AdminRoleRequest;
 import xyz.playedu.common.service.AdminPermissionService;
 import xyz.playedu.common.service.AdminRoleService;
 import xyz.playedu.common.types.JsonResponse;

playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java

@@ -22,6 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import xyz.playedu.api.request.backend.AdminUserRequest;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
@@ -29,8 +31,6 @@ import xyz.playedu.common.domain.AdminRole;
 import xyz.playedu.common.domain.AdminUser;
 import xyz.playedu.common.exception.NotFoundException;
 import xyz.playedu.common.exception.ServiceException;
-import xyz.playedu.common.annotation.BackendPermission;
-import xyz.playedu.api.request.backend.AdminUserRequest;
 import xyz.playedu.common.service.AdminRoleService;
 import xyz.playedu.common.service.AdminUserService;
 import xyz.playedu.common.types.JsonResponse;

playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java

@@ -18,13 +18,13 @@ package xyz.playedu.api.controller.backend;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import xyz.playedu.api.request.backend.AppConfigRequest;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
 import xyz.playedu.common.constant.SystemConstant;
 import xyz.playedu.common.domain.AppConfig;
-import xyz.playedu.common.annotation.BackendPermission;
-import xyz.playedu.api.request.backend.AppConfigRequest;
 import xyz.playedu.common.service.AppConfigService;
 import xyz.playedu.common.types.JsonResponse;
 

playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentController.java

@@ -22,18 +22,18 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import xyz.playedu.api.request.backend.CourseAttachmentMultiRequest;
+import xyz.playedu.api.request.backend.CourseAttachmentRequest;
+import xyz.playedu.api.request.backend.CourseAttachmentSortRequest;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BackendConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
-import xyz.playedu.course.domain.CourseAttachment;
 import xyz.playedu.common.exception.NotFoundException;
-import xyz.playedu.common.annotation.BackendPermission;
-import xyz.playedu.api.request.backend.CourseAttachmentMultiRequest;
-import xyz.playedu.api.request.backend.CourseAttachmentRequest;
-import xyz.playedu.api.request.backend.CourseAttachmentSortRequest;
-import xyz.playedu.course.service.CourseAttachmentService;
 import xyz.playedu.common.types.JsonResponse;
+import xyz.playedu.course.domain.CourseAttachment;
+import xyz.playedu.course.service.CourseAttachmentService;
 
 import java.util.*;
 

playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java

@@ -20,19 +20,19 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import xyz.playedu.common.context.BCtx;
+import xyz.playedu.api.event.CourseChapterDestroyEvent;
+import xyz.playedu.api.request.backend.CourseChapterRequest;
+import xyz.playedu.api.request.backend.CourseChapterSortRequest;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
-import xyz.playedu.course.domain.CourseChapter;
+import xyz.playedu.common.context.BCtx;
-import xyz.playedu.api.event.CourseChapterDestroyEvent;
 import xyz.playedu.common.exception.NotFoundException;
-import xyz.playedu.common.annotation.BackendPermission;
+import xyz.playedu.common.types.JsonResponse;
-import xyz.playedu.api.request.backend.CourseChapterRequest;
+import xyz.playedu.course.domain.CourseChapter;
-import xyz.playedu.api.request.backend.CourseChapterSortRequest;
 import xyz.playedu.course.service.CourseChapterService;
 import xyz.playedu.course.service.CourseHourService;
-import xyz.playedu.common.types.JsonResponse;
 
 @RestController
 @RequestMapping("/backend/v1/course/{courseId}/chapter")

playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseController.java

@@ -24,14 +24,14 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import xyz.playedu.common.context.BCtx;
+import xyz.playedu.api.event.CourseDestroyEvent;
+import xyz.playedu.api.request.backend.CourseRequest;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
-import xyz.playedu.api.event.CourseDestroyEvent;
+import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.exception.NotFoundException;
-import xyz.playedu.common.annotation.BackendPermission;
-import xyz.playedu.api.request.backend.CourseRequest;
 import xyz.playedu.common.service.*;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.types.paginate.CoursePaginateFiler;

playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java

@@ -23,24 +23,24 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import xyz.playedu.common.context.BCtx;
+import xyz.playedu.api.event.CourseHourCreatedEvent;
+import xyz.playedu.api.event.CourseHourDestroyEvent;
+import xyz.playedu.api.request.backend.CourseHourMultiRequest;
+import xyz.playedu.api.request.backend.CourseHourRequest;
+import xyz.playedu.api.request.backend.CourseHourSortRequest;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BackendConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
-import xyz.playedu.course.domain.CourseChapter;
+import xyz.playedu.common.context.BCtx;
-import xyz.playedu.course.domain.CourseHour;
-import xyz.playedu.api.event.CourseHourCreatedEvent;
-import xyz.playedu.api.event.CourseHourDestroyEvent;
 import xyz.playedu.common.exception.NotFoundException;
-import xyz.playedu.common.annotation.BackendPermission;
-import xyz.playedu.api.request.backend.CourseHourMultiRequest;
-import xyz.playedu.api.request.backend.CourseHourRequest;
-import xyz.playedu.api.request.backend.CourseHourSortRequest;
-import xyz.playedu.course.service.CourseChapterService;
-import xyz.playedu.course.service.CourseHourService;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.types.SelectOption;
+import xyz.playedu.course.domain.CourseChapter;
+import xyz.playedu.course.domain.CourseHour;
+import xyz.playedu.course.service.CourseChapterService;
+import xyz.playedu.course.service.CourseHourService;
 
 import java.util.*;
 

playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java

@@ -24,19 +24,19 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import xyz.playedu.api.event.UserCourseRecordDestroyEvent;
+import xyz.playedu.api.request.backend.CourseUserDestroyRequest;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
 import xyz.playedu.common.domain.User;
-import xyz.playedu.course.domain.UserCourseRecord;
-import xyz.playedu.api.event.UserCourseRecordDestroyEvent;
-import xyz.playedu.common.annotation.BackendPermission;
-import xyz.playedu.api.request.backend.CourseUserDestroyRequest;
 import xyz.playedu.common.service.*;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper;
 import xyz.playedu.common.types.paginate.PaginationResult;
 import xyz.playedu.common.types.paginate.UserPaginateFilter;
+import xyz.playedu.course.domain.UserCourseRecord;
 import xyz.playedu.course.service.CourseService;
 import xyz.playedu.course.service.UserCourseHourRecordService;
 import xyz.playedu.course.service.UserCourseRecordService;

playedu-api/src/main/java/xyz/playedu/api/controller/backend/DashboardController.java

@@ -25,9 +25,9 @@ import xyz.playedu.common.constant.BackendConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
 import xyz.playedu.common.constant.SystemConstant;
 import xyz.playedu.common.domain.User;
-import xyz.playedu.course.domain.UserLearnDurationStats;
 import xyz.playedu.common.service.*;
 import xyz.playedu.common.types.JsonResponse;
+import xyz.playedu.course.domain.UserLearnDurationStats;
 import xyz.playedu.course.service.CourseService;
 import xyz.playedu.course.service.UserLearnDurationStatsService;
 import xyz.playedu.resource.service.ResourceService;

playedu-api/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java

@@ -23,28 +23,28 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import xyz.playedu.api.event.DepartmentDestroyEvent;
 import xyz.playedu.api.request.backend.DepartmentParentRequest;
 import xyz.playedu.api.request.backend.DepartmentRequest;
 import xyz.playedu.api.request.backend.DepartmentSortRequest;
-import xyz.playedu.common.context.BCtx;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
-import xyz.playedu.course.domain.Course;
+import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.domain.Department;
 import xyz.playedu.common.domain.User;
-import xyz.playedu.course.domain.UserCourseRecord;
-import xyz.playedu.api.event.DepartmentDestroyEvent;
 import xyz.playedu.common.exception.NotFoundException;
-import xyz.playedu.common.annotation.BackendPermission;
-import xyz.playedu.course.service.CourseDepartmentService;
-import xyz.playedu.course.service.CourseService;
 import xyz.playedu.common.service.DepartmentService;
-import xyz.playedu.course.service.UserCourseRecordService;
 import xyz.playedu.common.service.UserService;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.types.paginate.PaginationResult;
 import xyz.playedu.common.types.paginate.UserPaginateFilter;
+import xyz.playedu.course.domain.Course;
+import xyz.playedu.course.domain.UserCourseRecord;
+import xyz.playedu.course.service.CourseDepartmentService;
+import xyz.playedu.course.service.CourseService;
+import xyz.playedu.course.service.UserCourseRecordService;
 
 import java.util.*;
 import java.util.stream.Collectors;

playedu-api/src/main/java/xyz/playedu/api/controller/backend/LoginController.java

@@ -20,17 +20,17 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import xyz.playedu.common.context.BCtx;
+import xyz.playedu.api.event.AdminUserLoginEvent;
+import xyz.playedu.api.request.backend.LoginRequest;
+import xyz.playedu.api.request.backend.PasswordChangeRequest;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.bus.BackendBus;
 import xyz.playedu.common.config.PlayEduConfig;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
+import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.domain.AdminUser;
-import xyz.playedu.api.event.AdminUserLoginEvent;
-import xyz.playedu.common.annotation.BackendPermission;
-import xyz.playedu.api.request.backend.LoginRequest;
-import xyz.playedu.api.request.backend.PasswordChangeRequest;
 import xyz.playedu.common.service.AdminUserService;
 import xyz.playedu.common.service.BackendAuthService;
 import xyz.playedu.common.service.RateLimiterService;

playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java

@@ -20,25 +20,25 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import xyz.playedu.common.context.BCtx;
+import xyz.playedu.api.event.ResourceCategoryDestroyEvent;
+import xyz.playedu.api.request.backend.ResourceCategoryParentRequest;
+import xyz.playedu.api.request.backend.ResourceCategoryRequest;
+import xyz.playedu.api.request.backend.ResourceCategorySortRequest;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BackendConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
+import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.domain.Category;
-import xyz.playedu.common.service.CategoryService;
-import xyz.playedu.course.service.CourseCategoryService;
-import xyz.playedu.resource.domain.Resource;
-import xyz.playedu.api.event.ResourceCategoryDestroyEvent;
 import xyz.playedu.common.exception.NotFoundException;
-import xyz.playedu.common.annotation.BackendPermission;
+import xyz.playedu.common.service.CategoryService;
-import xyz.playedu.api.request.backend.ResourceCategoryParentRequest;
+import xyz.playedu.common.types.JsonResponse;
-import xyz.playedu.api.request.backend.ResourceCategoryRequest;
+import xyz.playedu.course.service.CourseCategoryService;
-import xyz.playedu.api.request.backend.ResourceCategorySortRequest;
 import xyz.playedu.course.service.CourseService;
+import xyz.playedu.resource.domain.Resource;
 import xyz.playedu.resource.service.ResourceCategoryService;
 import xyz.playedu.resource.service.ResourceService;
-import xyz.playedu.common.types.JsonResponse;
 
 import java.util.*;
 import java.util.stream.Collectors;

playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java

@@ -23,25 +23,25 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import xyz.playedu.common.context.BCtx;
+import xyz.playedu.api.request.backend.ResourceDestroyMultiRequest;
+import xyz.playedu.api.request.backend.ResourceUpdateRequest;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.bus.BackendBus;
 import xyz.playedu.common.constant.BackendConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
+import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.domain.AdminUser;
-import xyz.playedu.resource.domain.Resource;
-import xyz.playedu.resource.domain.ResourceVideo;
 import xyz.playedu.common.exception.NotFoundException;
 import xyz.playedu.common.exception.ServiceException;
-import xyz.playedu.api.request.backend.ResourceDestroyMultiRequest;
-import xyz.playedu.api.request.backend.ResourceUpdateRequest;
 import xyz.playedu.common.service.AdminUserService;
 import xyz.playedu.common.service.MinioService;
-import xyz.playedu.resource.service.ResourceService;
-import xyz.playedu.resource.service.ResourceVideoService;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.types.paginate.PaginationResult;
 import xyz.playedu.common.types.paginate.ResourcePaginateFilter;
+import xyz.playedu.resource.domain.Resource;
+import xyz.playedu.resource.domain.ResourceVideo;
+import xyz.playedu.resource.service.ResourceService;
+import xyz.playedu.resource.service.ResourceVideoService;
 
 import java.util.*;
 import java.util.stream.Collectors;

playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java

@@ -21,10 +21,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BusinessTypeConstant;
 import xyz.playedu.common.constant.ConfigConstant;
+import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.util.RequestUtil;
 

playedu-api/src/main/java/xyz/playedu/api/controller/backend/UploadController.java

@@ -23,17 +23,17 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import xyz.playedu.common.context.BCtx;
+import xyz.playedu.api.request.backend.UploadFileMergeRequest;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BackendConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
-import xyz.playedu.resource.domain.Resource;
+import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.exception.ServiceException;
-import xyz.playedu.api.request.backend.UploadFileMergeRequest;
 import xyz.playedu.common.service.MinioService;
-import xyz.playedu.resource.service.ResourceService;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.util.HelperUtil;
+import xyz.playedu.resource.domain.Resource;
+import xyz.playedu.resource.service.ResourceService;
 import xyz.playedu.resource.service.UploadService;
 
 import java.util.HashMap;

playedu-api/src/main/java/xyz/playedu/api/controller/backend/UserController.java

@@ -28,20 +28,20 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import xyz.playedu.common.context.BCtx;
+import xyz.playedu.api.event.UserCourseHourRecordDestroyEvent;
+import xyz.playedu.api.event.UserCourseRecordDestroyEvent;
+import xyz.playedu.api.event.UserDestroyEvent;
+import xyz.playedu.api.request.backend.UserImportRequest;
+import xyz.playedu.api.request.backend.UserRequest;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
 import xyz.playedu.common.constant.ConfigConstant;
 import xyz.playedu.common.constant.SystemConstant;
+import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.domain.*;
-import xyz.playedu.api.event.UserCourseHourRecordDestroyEvent;
-import xyz.playedu.api.event.UserCourseRecordDestroyEvent;
-import xyz.playedu.api.event.UserDestroyEvent;
 import xyz.playedu.common.exception.NotFoundException;
-import xyz.playedu.common.annotation.BackendPermission;
-import xyz.playedu.api.request.backend.UserImportRequest;
-import xyz.playedu.api.request.backend.UserRequest;
 import xyz.playedu.common.service.*;
 import xyz.playedu.common.service.UserDepartmentService;
 import xyz.playedu.common.types.JsonResponse;

playedu-api/src/main/java/xyz/playedu/api/controller/frontend/CourseController.java

@@ -20,6 +20,7 @@ import lombok.SneakyThrows;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.common.context.FCtx;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.types.paginate.CoursePaginateFiler;

playedu-api/src/main/java/xyz/playedu/api/controller/frontend/DepartmentController.java

@@ -18,6 +18,7 @@ package xyz.playedu.api.controller.frontend;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.common.domain.Department;
 import xyz.playedu.common.exception.NotFoundException;
 import xyz.playedu.common.service.DepartmentService;
@@ -27,7 +28,6 @@ import xyz.playedu.common.types.paginate.PaginationResult;
 import xyz.playedu.course.domain.Course;
 import xyz.playedu.course.service.CourseService;
 
-
 import java.util.HashMap;
 import java.util.stream.Collectors;
 

playedu-api/src/main/java/xyz/playedu/api/controller/frontend/HourController.java

@@ -21,15 +21,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.event.UserCourseHourFinishedEvent;
 import xyz.playedu.api.event.UserLearnCourseUpdateEvent;
-import xyz.playedu.course.bus.UserBus;
-import xyz.playedu.course.caches.CourseCache;
-import xyz.playedu.course.caches.UserCanSeeCourseCache;
 import xyz.playedu.api.request.frontend.CourseHourRecordRequest;
 import xyz.playedu.common.context.FCtx;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.util.RedisDistributedLock;
+import xyz.playedu.course.bus.UserBus;
+import xyz.playedu.course.caches.CourseCache;
+import xyz.playedu.course.caches.UserCanSeeCourseCache;
 import xyz.playedu.course.caches.UserLastLearnTimeCache;
 import xyz.playedu.course.domain.Course;
 import xyz.playedu.course.domain.CourseHour;
@@ -40,7 +41,6 @@ import xyz.playedu.course.service.UserCourseHourRecordService;
 import xyz.playedu.resource.domain.Resource;
 import xyz.playedu.resource.service.ResourceService;
 
-
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
@@ -136,10 +136,17 @@ public class HourController {
         }
 
         try {
-            boolean isFinished = userCourseHourRecordService.storeOrUpdate(
+            boolean isFinished =
-                    FCtx.getId(), course.getId(), hour.getId(), duration, hour.getDuration());
+                    userCourseHourRecordService.storeOrUpdate(
+                            FCtx.getId(),
+                            course.getId(),
+                            hour.getId(),
+                            duration,
+                            hour.getDuration());
             if (isFinished) {
-                ctx.publishEvent(new UserCourseHourFinishedEvent(this, FCtx.getId(), courseId, hour.getId()));
+                ctx.publishEvent(
+                        new UserCourseHourFinishedEvent(
+                                this, FCtx.getId(), courseId, hour.getId()));
             }
         } finally {
             // 此处未考虑上面代码执行失败释放锁

playedu-api/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java

@@ -22,11 +22,12 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
 import xyz.playedu.api.event.UserLoginEvent;
 import xyz.playedu.api.event.UserLogoutEvent;
 import xyz.playedu.api.request.frontend.LoginPasswordRequest;
-import xyz.playedu.common.context.FCtx;
 import xyz.playedu.common.config.PlayEduConfig;
+import xyz.playedu.common.context.FCtx;
 import xyz.playedu.common.domain.User;
 import xyz.playedu.common.exception.LimitException;
 import xyz.playedu.common.service.FrontendAuthService;
@@ -38,7 +39,6 @@ import xyz.playedu.common.util.IpUtil;
 import xyz.playedu.common.util.RedisUtil;
 import xyz.playedu.common.util.RequestUtil;
 
-
 import java.util.HashMap;
 
 @RestController

playedu-api/src/main/java/xyz/playedu/api/controller/frontend/SystemController.java

@@ -19,11 +19,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
 import xyz.playedu.common.constant.ConfigConstant;
 import xyz.playedu.common.service.AppConfigService;
 import xyz.playedu.common.types.JsonResponse;
 
-
 import java.util.HashMap;
 import java.util.Map;
 

playedu-api/src/main/java/xyz/playedu/api/controller/frontend/UserController.java

@@ -22,9 +22,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import xyz.playedu.api.request.frontend.ChangePasswordRequest;
-import xyz.playedu.common.context.FCtx;
 import xyz.playedu.common.constant.FrontendConstant;
+import xyz.playedu.common.context.FCtx;
 import xyz.playedu.common.domain.Department;
 import xyz.playedu.common.domain.User;
 import xyz.playedu.common.domain.UserUploadImageLog;
@@ -32,11 +33,11 @@ import xyz.playedu.common.exception.ServiceException;
 import xyz.playedu.common.service.DepartmentService;
 import xyz.playedu.common.service.UserService;
 import xyz.playedu.common.types.JsonResponse;
+import xyz.playedu.common.types.mapper.UserCourseHourRecordCourseCountMapper;
 import xyz.playedu.common.util.PrivacyUtil;
 import xyz.playedu.course.domain.*;
 import xyz.playedu.course.service.*;
 import xyz.playedu.resource.service.UploadService;
-import xyz.playedu.common.types.mapper.UserCourseHourRecordCourseCountMapper;
 
 import java.util.*;
 import java.util.stream.Collectors;

playedu-api/src/main/java/xyz/playedu/api/listener/AdminUserLoginListener.java

@@ -21,8 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
-import xyz.playedu.common.domain.AdminUser;
 import xyz.playedu.api.event.AdminUserLoginEvent;
+import xyz.playedu.common.domain.AdminUser;
 import xyz.playedu.common.service.AdminUserService;
 
 @Component

playedu-api/src/main/java/xyz/playedu/api/listener/CourseDestroyListener.java

@@ -21,10 +21,10 @@ import org.springframework.stereotype.Component;
 
 import xyz.playedu.api.event.CourseDestroyEvent;
 import xyz.playedu.course.service.CourseAttachmentService;
+import xyz.playedu.course.service.CourseCategoryService;
 import xyz.playedu.course.service.CourseDepartmentService;
 import xyz.playedu.course.service.UserCourseHourRecordService;
 import xyz.playedu.course.service.UserCourseRecordService;
-import xyz.playedu.course.service.CourseCategoryService;
 
 /**
  * @Author 杭州白书科技有限公司

playedu-common/src/main/java/xyz/playedu/common/bus/BackendBus.java

@@ -18,8 +18,8 @@ package xyz.playedu.common.bus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.constant.BackendConstant;
+import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.domain.AdminRole;
 import xyz.playedu.common.service.AdminPermissionService;
 import xyz.playedu.common.service.AdminRoleService;

playedu-common/src/main/java/xyz/playedu/common/config/AuthConfig.java

@@ -16,6 +16,7 @@
 package xyz.playedu.common.config;
 
 import lombok.Data;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 

playedu-common/src/main/java/xyz/playedu/common/config/MybatisPlusConfig.java

@@ -18,6 +18,7 @@ package xyz.playedu.common.config;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

playedu-common/src/main/java/xyz/playedu/common/config/PlayEduConfig.java

@@ -16,6 +16,7 @@
 package xyz.playedu.common.config;
 
 import lombok.Data;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

playedu-common/src/main/java/xyz/playedu/common/config/PlayEduMinioClientConfig.java

@@ -19,6 +19,7 @@ import io.minio.CreateMultipartUploadResponse;
 import io.minio.ListPartsResponse;
 import io.minio.MinioAsyncClient;
 import io.minio.messages.Part;
+
 import lombok.SneakyThrows;
 
 import java.util.List;

playedu-common/src/main/java/xyz/playedu/common/config/SaTokenConfig.java

@@ -17,6 +17,7 @@ package xyz.playedu.common.config;
 
 import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
 import cn.dev33.satoken.stp.StpLogic;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

playedu-common/src/main/java/xyz/playedu/common/domain/AdminLog.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.Data;
 
 import java.io.Serializable;

playedu-common/src/main/java/xyz/playedu/common/domain/AdminUser.java

@@ -25,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+
 import xyz.playedu.common.bus.BackendBus;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BackendConstant;

playedu-common/src/main/java/xyz/playedu/common/domain/User.java

@@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
+
 import xyz.playedu.common.bus.BackendBus;
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BackendConstant;

playedu-common/src/main/java/xyz/playedu/common/domain/UserLoginRecord.java

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import lombok.Data;
 
 import java.io.Serializable;

playedu-common/src/main/java/xyz/playedu/common/domain/UserUploadImageLog.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.Data;
 
 import java.io.Serializable;

playedu-common/src/main/java/xyz/playedu/common/service/AdminLogService.java

@@ -16,16 +16,16 @@
 package xyz.playedu.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import xyz.playedu.common.domain.AdminLog;
 import xyz.playedu.common.types.paginate.AdminLogPaginateFiler;
 import xyz.playedu.common.types.paginate.PaginationResult;
-import xyz.playedu.common.domain.AdminLog;
 
 /**
  * @author tengteng
  * @description 针对表【admin_logs】的数据库操作Service
  * @createDate 2023-02-17 15:40:31
  */
-
 public interface AdminLogService extends IService<AdminLog> {
     PaginationResult<AdminLog> paginate(int page, int size, AdminLogPaginateFiler filter);
 }

playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminRoleServiceImpl.java

@@ -26,8 +26,8 @@ import xyz.playedu.common.domain.AdminRole;
 import xyz.playedu.common.domain.AdminRolePermission;
 import xyz.playedu.common.exception.NotFoundException;
 import xyz.playedu.common.mapper.AdminRoleMapper;
-import xyz.playedu.common.service.AdminRoleService;
 import xyz.playedu.common.service.AdminRolePermissionService;
+import xyz.playedu.common.service.AdminRoleService;
 import xyz.playedu.common.service.AdminUserRoleService;
 import xyz.playedu.common.util.HelperUtil;
 

playedu-common/src/main/java/xyz/playedu/common/service/impl/CategoryServiceImpl.java

@@ -24,6 +24,7 @@ import xyz.playedu.common.domain.Category;
 import xyz.playedu.common.exception.NotFoundException;
 import xyz.playedu.common.mapper.CategoryMapper;
 import xyz.playedu.common.service.CategoryService;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -36,8 +37,7 @@ import java.util.stream.Collectors;
  * @createDate 2023-02-23 09:50:18
  */
 @Service
-public class CategoryServiceImpl
+public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category>
-        extends ServiceImpl<CategoryMapper, Category>
         implements CategoryService {
 
     @Override
@@ -217,8 +217,7 @@ public class CategoryServiceImpl
 
     @Override
     public Map<Integer, String> id2name() {
-        return all().stream()
+        return all().stream().collect(Collectors.toMap(Category::getId, Category::getName));
-                .collect(Collectors.toMap(Category::getId, Category::getName));
     }
 
     @Override

playedu-common/src/main/java/xyz/playedu/common/service/impl/MinioServiceImpl.java

@@ -24,11 +24,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import xyz.playedu.common.config.PlayEduMinioClientConfig;
 import xyz.playedu.common.exception.ServiceException;
 import xyz.playedu.common.service.AppConfigService;
 import xyz.playedu.common.service.MinioService;
 import xyz.playedu.common.types.config.MinioConfig;
-import xyz.playedu.common.config.PlayEduMinioClientConfig;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

playedu-common/src/main/java/xyz/playedu/common/service/impl/UserServiceImpl.java

@@ -29,8 +29,8 @@ import xyz.playedu.common.domain.UserDepartment;
 import xyz.playedu.common.exception.NotFoundException;
 import xyz.playedu.common.exception.ServiceException;
 import xyz.playedu.common.mapper.UserMapper;
-import xyz.playedu.common.service.UserService;
 import xyz.playedu.common.service.UserDepartmentService;
+import xyz.playedu.common.service.UserService;
 import xyz.playedu.common.types.paginate.PaginationResult;
 import xyz.playedu.common.types.paginate.UserPaginateFilter;
 import xyz.playedu.common.util.HelperUtil;

playedu-common/src/main/java/xyz/playedu/common/service/impl/UserUploadImageLogServiceImpl.java

@@ -16,7 +16,9 @@
 package xyz.playedu.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 import org.springframework.stereotype.Service;
+
 import xyz.playedu.common.domain.UserUploadImageLog;
 import xyz.playedu.common.mapper.UserUploadImageLogMapper;
 import xyz.playedu.common.service.UserUploadImageLogService;

playedu-common/src/main/java/xyz/playedu/common/util/HelperUtil.java

@@ -17,6 +17,7 @@ package xyz.playedu.common.util;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.springframework.util.DigestUtils;
 
 import java.io.*;

playedu-common/src/main/java/xyz/playedu/common/util/IpUtil.java

@@ -18,7 +18,9 @@ package xyz.playedu.common.util;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+
 import jakarta.servlet.http.HttpServletRequest;
+
 import lombok.extern.slf4j.Slf4j;
 
 import java.net.InetAddress;

playedu-common/src/main/java/xyz/playedu/common/util/RedisUtil.java

@@ -16,6 +16,7 @@
 package xyz.playedu.common.util;
 
 import jakarta.annotation.Resource;
+
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.core.Cursor;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -23,6 +24,7 @@ import org.springframework.data.redis.core.ScanOptions;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
+
 import xyz.playedu.common.constant.SystemConstant;
 
 import java.util.*;

playedu-common/src/main/java/xyz/playedu/common/util/RequestUtil.java

@@ -17,7 +17,9 @@ package xyz.playedu.common.util;
 
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
+
 import jakarta.servlet.http.HttpServletRequest;
+
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 

playedu-common/src/main/java/xyz/playedu/common/util/StringUtil.java

@@ -16,6 +16,7 @@
 package xyz.playedu.common.util;
 
 import cn.hutool.json.JSONUtil;
+
 import org.springframework.util.AntPathMatcher;
 
 import java.util.*;

playedu-course/src/main/java/xyz/playedu/course/bus/UserBus.java

@@ -18,6 +18,7 @@ package xyz.playedu.course.bus;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.common.domain.User;
 import xyz.playedu.common.service.UserService;
 import xyz.playedu.course.domain.Course;

playedu-course/src/main/java/xyz/playedu/course/caches/CourseCache.java

@@ -17,12 +17,12 @@ package xyz.playedu.course.caches;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.common.exception.NotFoundException;
 import xyz.playedu.common.util.RedisUtil;
 import xyz.playedu.course.domain.Course;
 import xyz.playedu.course.service.CourseService;
 
-
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-course/src/main/java/xyz/playedu/course/caches/UserLastLearnTimeCache.java

@@ -16,8 +16,8 @@
 package xyz.playedu.course.caches;
 
 import org.springframework.stereotype.Component;
-import xyz.playedu.common.util.RedisUtil;
 
+import xyz.playedu.common.util.RedisUtil;
 
 /**
  * @Author 杭州白书科技有限公司

playedu-course/src/main/java/xyz/playedu/course/domain/Course.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.Data;
 
 import java.io.Serializable;

playedu-course/src/main/java/xyz/playedu/course/domain/UserLatestLearn.java

@@ -19,7 +19,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
 
-
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-course/src/main/java/xyz/playedu/course/mapper/CourseAttachmentDownloadLogMapper.java

@@ -19,8 +19,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
-import xyz.playedu.course.domain.CourseAttachmentDownloadLog;
 import xyz.playedu.common.types.paginate.CourseAttachmentDownloadLogPaginateFiler;
+import xyz.playedu.course.domain.CourseAttachmentDownloadLog;
 
 import java.util.List;
 

playedu-course/src/main/java/xyz/playedu/course/mapper/CourseMapper.java

@@ -19,8 +19,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
-import xyz.playedu.course.domain.Course;
 import xyz.playedu.common.types.paginate.CoursePaginateFiler;
+import xyz.playedu.course.domain.Course;
 
 import java.util.List;
 

playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseHourRecordMapper.java

@@ -19,11 +19,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
-import xyz.playedu.course.domain.UserCourseHourRecord;
 import xyz.playedu.common.types.mapper.UserCourseHourRecordCourseCountMapper;
 import xyz.playedu.common.types.mapper.UserCourseHourRecordUserCountMapper;
 import xyz.playedu.common.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper;
 import xyz.playedu.common.types.paginate.UserCourseHourRecordPaginateFilter;
+import xyz.playedu.course.domain.UserCourseHourRecord;
 
 import java.util.List;
 

playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseRecordMapper.java

@@ -19,8 +19,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
-import xyz.playedu.course.domain.UserCourseRecord;
 import xyz.playedu.common.types.paginate.UserCourseRecordPaginateFilter;
+import xyz.playedu.course.domain.UserCourseRecord;
 
 import java.util.List;
 

playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentDownloadLogService.java

@@ -19,9 +19,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 import org.springframework.stereotype.Service;
 
-import xyz.playedu.course.domain.CourseAttachmentDownloadLog;
 import xyz.playedu.common.types.paginate.CourseAttachmentDownloadLogPaginateFiler;
 import xyz.playedu.common.types.paginate.PaginationResult;
+import xyz.playedu.course.domain.CourseAttachmentDownloadLog;
 
 @Service
 public interface CourseAttachmentDownloadLogService extends IService<CourseAttachmentDownloadLog> {

playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentService.java

@@ -17,8 +17,8 @@ package xyz.playedu.course.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import xyz.playedu.course.domain.CourseAttachment;
 import xyz.playedu.common.exception.NotFoundException;
+import xyz.playedu.course.domain.CourseAttachment;
 
 import java.util.List;
 

playedu-course/src/main/java/xyz/playedu/course/service/CourseCategoryService.java

@@ -37,6 +37,4 @@ public interface CourseCategoryService extends IService<CourseCategory> {
     List<Integer> getCategoryIdsByCourseId(Integer courseId);
 
     List<Integer> getCourseIdsByCategoryId(Integer id);
-
-
 }

playedu-course/src/main/java/xyz/playedu/course/service/CourseChapterService.java

@@ -17,8 +17,8 @@ package xyz.playedu.course.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import xyz.playedu.course.domain.CourseChapter;
 import xyz.playedu.common.exception.NotFoundException;
+import xyz.playedu.course.domain.CourseChapter;
 
 import java.util.List;
 

playedu-course/src/main/java/xyz/playedu/course/service/CourseHourService.java

@@ -17,8 +17,8 @@ package xyz.playedu.course.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import xyz.playedu.course.domain.CourseHour;
 import xyz.playedu.common.exception.NotFoundException;
+import xyz.playedu.course.domain.CourseHour;
 
 import java.util.List;
 

playedu-course/src/main/java/xyz/playedu/course/service/CourseService.java

@@ -17,10 +17,10 @@ package xyz.playedu.course.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import xyz.playedu.course.domain.Course;
 import xyz.playedu.common.exception.NotFoundException;
 import xyz.playedu.common.types.paginate.CoursePaginateFiler;
 import xyz.playedu.common.types.paginate.PaginationResult;
+import xyz.playedu.course.domain.Course;
 
 import java.util.List;
 import java.util.Map;

playedu-course/src/main/java/xyz/playedu/course/service/UserCourseHourRecordService.java

@@ -17,12 +17,12 @@ package xyz.playedu.course.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import xyz.playedu.course.domain.UserCourseHourRecord;
 import xyz.playedu.common.types.mapper.UserCourseHourRecordCourseCountMapper;
 import xyz.playedu.common.types.mapper.UserCourseHourRecordUserCountMapper;
 import xyz.playedu.common.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper;
 import xyz.playedu.common.types.paginate.PaginationResult;
 import xyz.playedu.common.types.paginate.UserCourseHourRecordPaginateFilter;
+import xyz.playedu.course.domain.UserCourseHourRecord;
 
 import java.util.List;
 

playedu-course/src/main/java/xyz/playedu/course/service/UserCourseRecordService.java

@@ -17,9 +17,9 @@ package xyz.playedu.course.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import xyz.playedu.course.domain.UserCourseRecord;
 import xyz.playedu.common.types.paginate.PaginationResult;
 import xyz.playedu.common.types.paginate.UserCourseRecordPaginateFilter;
+import xyz.playedu.course.domain.UserCourseRecord;
 
 import java.util.List;
 

playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentDownloadLogServiceImpl.java

@@ -19,11 +19,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import org.springframework.stereotype.Service;
 
+import xyz.playedu.common.types.paginate.CourseAttachmentDownloadLogPaginateFiler;
+import xyz.playedu.common.types.paginate.PaginationResult;
 import xyz.playedu.course.domain.CourseAttachmentDownloadLog;
 import xyz.playedu.course.mapper.CourseAttachmentDownloadLogMapper;
 import xyz.playedu.course.service.CourseAttachmentDownloadLogService;
-import xyz.playedu.common.types.paginate.CourseAttachmentDownloadLogPaginateFiler;
-import xyz.playedu.common.types.paginate.PaginationResult;
 
 @Service
 public class CourseAttachmentDownloadLogServiceImpl

playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentServiceImpl.java

@@ -19,8 +19,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import org.springframework.stereotype.Service;
 
-import xyz.playedu.course.domain.CourseAttachment;
 import xyz.playedu.common.exception.NotFoundException;
+import xyz.playedu.course.domain.CourseAttachment;
 import xyz.playedu.course.mapper.CourseAttachmentMapper;
 import xyz.playedu.course.service.CourseAttachmentService;
 

playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseCategoryServiceImpl.java

@@ -31,8 +31,7 @@ import java.util.List;
  * @createDate 2023-03-09 09:54:22
  */
 @Service
-public class CourseCategoryServiceImpl
+public class CourseCategoryServiceImpl extends ServiceImpl<CourseCategoryMapper, CourseCategory>
-        extends ServiceImpl<CourseCategoryMapper, CourseCategory>
         implements CourseCategoryService {
 
     @Override
@@ -61,8 +60,7 @@ public class CourseCategoryServiceImpl
 
     @Override
     public List<Integer> getCourseIdsByCategoryId(Integer id) {
-        return list(query().getWrapper().eq("category_id", id))
+        return list(query().getWrapper().eq("category_id", id)).stream()
-                .stream()
                 .map(CourseCategory::getCourseId)
                 .toList();
     }

playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseChapterServiceImpl.java

@@ -19,8 +19,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import org.springframework.stereotype.Service;
 
-import xyz.playedu.course.domain.CourseChapter;
 import xyz.playedu.common.exception.NotFoundException;
+import xyz.playedu.course.domain.CourseChapter;
 import xyz.playedu.course.mapper.CourseChapterMapper;
 import xyz.playedu.course.service.CourseChapterService;
 

playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseDepartmentServiceImpl.java

@@ -55,8 +55,7 @@ public class CourseDepartmentServiceImpl
 
     @Override
     public List<Integer> getCourseIdsByDepId(Integer depId) {
-        return list(query().getWrapper().eq("dep_id", depId))
+        return list(query().getWrapper().eq("dep_id", depId)).stream()
-                .stream()
                 .map(CourseDepartment::getCourseId)
                 .toList();
     }

playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseHourServiceImpl.java

@@ -19,8 +19,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import org.springframework.stereotype.Service;
 
-import xyz.playedu.course.domain.CourseHour;
 import xyz.playedu.common.exception.NotFoundException;
+import xyz.playedu.course.domain.CourseHour;
 import xyz.playedu.course.mapper.CourseHourMapper;
 import xyz.playedu.course.service.CourseHourService;
 

playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseServiceImpl.java

@@ -21,16 +21,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import xyz.playedu.course.domain.Course;
-import xyz.playedu.course.domain.CourseDepartment;
-import xyz.playedu.course.domain.CourseCategory;
 import xyz.playedu.common.exception.NotFoundException;
-import xyz.playedu.course.mapper.CourseMapper;
-import xyz.playedu.course.service.CourseDepartmentService;
-import xyz.playedu.course.service.CourseService;
-import xyz.playedu.course.service.CourseCategoryService;
 import xyz.playedu.common.types.paginate.CoursePaginateFiler;
 import xyz.playedu.common.types.paginate.PaginationResult;
+import xyz.playedu.course.domain.Course;
+import xyz.playedu.course.domain.CourseCategory;
+import xyz.playedu.course.domain.CourseDepartment;
+import xyz.playedu.course.mapper.CourseMapper;
+import xyz.playedu.course.service.CourseCategoryService;
+import xyz.playedu.course.service.CourseDepartmentService;
+import xyz.playedu.course.service.CourseService;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -271,8 +271,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         data.forEach(
                 (courseId, records) -> {
                     result.put(
-                            courseId,
+                            courseId, records.stream().map(CourseCategory::getCategoryId).toList());
-                            records.stream().map(CourseCategory::getCategoryId).toList());
                 });
         return result;
     }

playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseHourRecordServiceImpl.java

@@ -19,14 +19,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import org.springframework.stereotype.Service;
 
-import xyz.playedu.course.domain.UserCourseHourRecord;
-import xyz.playedu.course.mapper.UserCourseHourRecordMapper;
-import xyz.playedu.course.service.UserCourseHourRecordService;
 import xyz.playedu.common.types.mapper.UserCourseHourRecordCourseCountMapper;
 import xyz.playedu.common.types.mapper.UserCourseHourRecordUserCountMapper;
 import xyz.playedu.common.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper;
 import xyz.playedu.common.types.paginate.PaginationResult;
 import xyz.playedu.common.types.paginate.UserCourseHourRecordPaginateFilter;
+import xyz.playedu.course.domain.UserCourseHourRecord;
+import xyz.playedu.course.mapper.UserCourseHourRecordMapper;
+import xyz.playedu.course.service.UserCourseHourRecordService;
 
 import java.util.ArrayList;
 import java.util.Date;

playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java

@@ -19,11 +19,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import org.springframework.stereotype.Service;
 
+import xyz.playedu.common.types.paginate.PaginationResult;
+import xyz.playedu.common.types.paginate.UserCourseRecordPaginateFilter;
 import xyz.playedu.course.domain.UserCourseRecord;
 import xyz.playedu.course.mapper.UserCourseRecordMapper;
 import xyz.playedu.course.service.UserCourseRecordService;
-import xyz.playedu.common.types.paginate.PaginationResult;
-import xyz.playedu.common.types.paginate.UserCourseRecordPaginateFilter;
 
 import java.util.ArrayList;
 import java.util.Date;

playedu-resource/src/main/java/xyz/playedu/resource/domain/Resource.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.Data;
 
 import java.io.Serializable;

playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceMapper.java

@@ -19,8 +19,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
-import xyz.playedu.resource.domain.Resource;
 import xyz.playedu.common.types.paginate.ResourcePaginateFilter;
+import xyz.playedu.resource.domain.Resource;
 
 import java.util.List;
 

playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceService.java

@@ -17,10 +17,10 @@ package xyz.playedu.resource.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import xyz.playedu.resource.domain.Resource;
 import xyz.playedu.common.exception.NotFoundException;
 import xyz.playedu.common.types.paginate.PaginationResult;
 import xyz.playedu.common.types.paginate.ResourcePaginateFilter;
+import xyz.playedu.resource.domain.Resource;
 
 import java.util.List;
 

playedu-resource/src/main/java/xyz/playedu/resource/service/UploadService.java

@@ -17,10 +17,10 @@ package xyz.playedu.resource.service;
 
 import org.springframework.web.multipart.MultipartFile;
 
-import xyz.playedu.resource.domain.Resource;
 import xyz.playedu.common.domain.UserUploadImageLog;
 import xyz.playedu.common.exception.ServiceException;
 import xyz.playedu.common.types.UploadFileInfo;
+import xyz.playedu.resource.domain.Resource;
 
 /**
  * @Author 杭州白书科技有限公司

playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceServiceImpl.java

@@ -21,16 +21,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import xyz.playedu.common.exception.NotFoundException;
+import xyz.playedu.common.types.paginate.PaginationResult;
+import xyz.playedu.common.types.paginate.ResourcePaginateFilter;
 import xyz.playedu.resource.domain.Resource;
 import xyz.playedu.resource.domain.ResourceCategory;
 import xyz.playedu.resource.domain.ResourceVideo;
-import xyz.playedu.common.exception.NotFoundException;
 import xyz.playedu.resource.mapper.ResourceMapper;
+import xyz.playedu.resource.service.ResourceCategoryService;
 import xyz.playedu.resource.service.ResourceService;
 import xyz.playedu.resource.service.ResourceVideoService;
-import xyz.playedu.resource.service.ResourceCategoryService;
-import xyz.playedu.common.types.paginate.PaginationResult;
-import xyz.playedu.common.types.paginate.ResourcePaginateFilter;
 
 import java.util.*;
 

playedu-resource/src/main/java/xyz/playedu/resource/service/impl/UploadServiceImpl.java

@@ -24,16 +24,16 @@ import org.springframework.web.multipart.MultipartFile;
 
 import xyz.playedu.common.constant.BackendConstant;
 import xyz.playedu.common.constant.FrontendConstant;
-import xyz.playedu.resource.domain.Resource;
 import xyz.playedu.common.domain.UserUploadImageLog;
 import xyz.playedu.common.exception.ServiceException;
 import xyz.playedu.common.service.MinioService;
-import xyz.playedu.resource.service.ResourceService;
-import xyz.playedu.resource.service.UploadService;
 import xyz.playedu.common.service.UserUploadImageLogService;
 import xyz.playedu.common.types.UploadFileInfo;
 import xyz.playedu.common.util.Base64Util;
 import xyz.playedu.common.util.HelperUtil;
+import xyz.playedu.resource.domain.Resource;
+import xyz.playedu.resource.service.ResourceService;
+import xyz.playedu.resource.service.UploadService;
 
 import java.util.Date;
 

playedu-system/src/main/java/xyz/playedu/system/aspectj/AdminLogAspect.java

@@ -17,8 +17,11 @@ package xyz.playedu.system.aspectj;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+
 import jakarta.servlet.http.HttpServletRequest;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.AfterThrowing;
@@ -27,6 +30,8 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
+import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.SystemConstant;
 import xyz.playedu.common.domain.AdminLog;
 import xyz.playedu.common.domain.AdminUser;
@@ -36,7 +41,6 @@ import xyz.playedu.common.service.BackendAuthService;
 import xyz.playedu.common.util.IpUtil;
 import xyz.playedu.common.util.RequestUtil;
 import xyz.playedu.common.util.StringUtil;
-import xyz.playedu.common.annotation.Log;
 
 import java.lang.reflect.Method;
 import java.util.Date;
@@ -54,7 +58,8 @@ public class AdminLogAspect {
     @Autowired private AdminLogService adminLogService;
 
     /** 排除敏感属性字段 */
-    public static final String EXCLUDE_PROPERTIES = "password,oldPassword,newPassword,confirmPassword,token";
+    public static final String EXCLUDE_PROPERTIES =
+            "password,oldPassword,newPassword,confirmPassword,token";
 
     /** Controller层切点 注解拦截 */
     @Pointcut("@annotation(xyz.playedu.common.annotation.Log)")

playedu-system/src/main/java/xyz/playedu/system/aspectj/BackendPermissionAspect.java

@@ -16,6 +16,7 @@
 package xyz.playedu.system.aspectj;
 
 import lombok.extern.slf4j.Slf4j;
+
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -23,10 +24,11 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import xyz.playedu.common.context.BCtx;
+
-import xyz.playedu.common.bus.BackendBus;
-import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.annotation.BackendPermission;
+import xyz.playedu.common.bus.BackendBus;
+import xyz.playedu.common.context.BCtx;
+import xyz.playedu.common.types.JsonResponse;
 
 import java.util.HashMap;
 
@@ -43,8 +45,7 @@ public class BackendPermissionAspect {
     @Around("doPointcut()")
     public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable {
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        BackendPermission middleware =
+        BackendPermission middleware = signature.getMethod().getAnnotation(BackendPermission.class);
-                signature.getMethod().getAnnotation(BackendPermission.class);
         Integer adminUserId = BCtx.getId();
         HashMap<String, Boolean> permissions = backendBus.adminUserPermissions(adminUserId);
         if (permissions.get(middleware.slug()) == null) {

playedu-system/src/main/java/xyz/playedu/system/aspectj/LockAspect.java

@@ -20,9 +20,10 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
+
+import xyz.playedu.common.annotation.Lock;
 import xyz.playedu.common.exception.LimitException;
 import xyz.playedu.common.util.RedisDistributedLock;
-import xyz.playedu.common.annotation.Lock;
 
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;

playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java

@@ -20,6 +20,7 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.domain.AdminPermission;
 import xyz.playedu.common.service.AdminPermissionService;

playedu-system/src/main/java/xyz/playedu/system/checks/AdminRoleCheck.java

@@ -20,6 +20,7 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.common.constant.BackendConstant;
 import xyz.playedu.common.domain.AdminRole;
 import xyz.playedu.common.service.AdminRoleService;

playedu-system/src/main/java/xyz/playedu/system/checks/AppConfigCheck.java

@@ -20,6 +20,7 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.common.constant.BackendConstant;
 import xyz.playedu.common.constant.ConfigConstant;
 import xyz.playedu.common.domain.AppConfig;

playedu-system/src/main/java/xyz/playedu/system/checks/UpgradeCheck.java

@@ -20,6 +20,7 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.common.domain.AppConfig;
 import xyz.playedu.common.service.AdminPermissionService;
 import xyz.playedu.common.service.AppConfigService;

playedu-system/src/main/java/xyz/playedu/system/interceptor/AdminInterceptor.java

@@ -17,13 +17,16 @@ package xyz.playedu.system.interceptor;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
-import xyz.playedu.common.context.BCtx;
+
 import xyz.playedu.common.bus.BackendBus;
 import xyz.playedu.common.config.PlayEduConfig;
+import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.domain.AdminUser;
 import xyz.playedu.common.service.AdminUserService;
 import xyz.playedu.common.service.AppConfigService;

playedu-system/src/main/java/xyz/playedu/system/interceptor/FrontInterceptor.java

@@ -17,13 +17,16 @@ package xyz.playedu.system.interceptor;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
-import xyz.playedu.common.context.FCtx;
+
 import xyz.playedu.common.config.PlayEduConfig;
 import xyz.playedu.common.constant.FrontendConstant;
+import xyz.playedu.common.context.FCtx;
 import xyz.playedu.common.domain.User;
 import xyz.playedu.common.service.FrontendAuthService;
 import xyz.playedu.common.service.RateLimiterService;

playedu-system/src/main/java/xyz/playedu/system/interceptor/WebMvcConfig.java

@@ -16,7 +16,9 @@
 package xyz.playedu.system.interceptor;
 
 import jakarta.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;

pom.xml

@@ -181,6 +181,24 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.36.0</version>
+                <configuration>
+                    <java>
+                        <googleJavaFormat>
+                            <version>1.16.0</version>
+                            <style>AOSP</style>
+                            <reflowLongStrings>true</reflowLongStrings>
+                        </googleJavaFormat>
+
+                        <licenseHeader>
+                            <file>license-header.txt</file>
+                        </licenseHeader>
+                    </java>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>