From 30806bfdcf370a3b94537585432a8fc30227158d Mon Sep 17 00:00:00 2001 From: xxx Date: Sun, 27 Aug 2023 10:05:18 +0800 Subject: [PATCH] update --- playedu-api/pom.xml | 3 --- .../playedu/api/PlayeduApiApplication.java | 5 ++++- .../api/controller/ExceptionController.java | 1 + .../backend/AdminLogController.java | 4 ++-- .../backend/AdminRoleController.java | 4 ++-- .../backend/AdminUserController.java | 4 ++-- .../backend/AppConfigController.java | 4 ++-- .../backend/CourseAttachmentController.java | 12 +++++----- .../backend/CourseChapterController.java | 14 ++++++------ .../controller/backend/CourseController.java | 10 ++++----- .../backend/CourseHourController.java | 22 +++++++++---------- .../backend/CourseUserController.java | 8 +++---- .../backend/DashboardController.java | 2 +- .../backend/DepartmentController.java | 16 +++++++------- .../controller/backend/LoginController.java | 10 ++++----- .../backend/ResourceCategoryController.java | 20 ++++++++--------- .../backend/ResourceController.java | 14 ++++++------ .../controller/backend/SystemController.java | 2 +- .../controller/backend/UploadController.java | 8 +++---- .../controller/backend/UserController.java | 14 ++++++------ .../controller/frontend/CourseController.java | 3 ++- .../frontend/DepartmentController.java | 2 +- .../controller/frontend/HourController.java | 21 ++++++++++++------ .../controller/frontend/LoginController.java | 4 ++-- .../controller/frontend/SystemController.java | 2 +- .../controller/frontend/UserController.java | 5 +++-- .../api/listener/AdminUserLoginListener.java | 2 +- .../api/listener/CourseDestroyListener.java | 2 +- .../xyz/playedu/common/bus/BackendBus.java | 2 +- .../xyz/playedu/common/config/AuthConfig.java | 1 + .../common/config/MybatisPlusConfig.java | 1 + .../playedu/common/config/PlayEduConfig.java | 1 + .../config/PlayEduMinioClientConfig.java | 1 + .../playedu/common/config/SaTokenConfig.java | 1 + .../xyz/playedu/common/domain/AdminLog.java | 1 + .../xyz/playedu/common/domain/AdminUser.java | 1 + .../java/xyz/playedu/common/domain/User.java | 1 + .../common/domain/UserLoginRecord.java | 1 + .../common/domain/UserUploadImageLog.java | 1 + .../common/service/AdminLogService.java | 4 ++-- .../service/impl/AdminRoleServiceImpl.java | 2 +- .../service/impl/CategoryServiceImpl.java | 7 +++--- .../common/service/impl/MinioServiceImpl.java | 2 +- .../common/service/impl/UserServiceImpl.java | 2 +- .../impl/UserUploadImageLogServiceImpl.java | 2 ++ .../xyz/playedu/common/util/HelperUtil.java | 1 + .../java/xyz/playedu/common/util/IpUtil.java | 2 ++ .../xyz/playedu/common/util/RedisUtil.java | 2 ++ .../xyz/playedu/common/util/RequestUtil.java | 2 ++ .../xyz/playedu/common/util/StringUtil.java | 1 + .../java/xyz/playedu/course/bus/UserBus.java | 3 ++- .../playedu/course/caches/CourseCache.java | 2 +- .../course/caches/UserLastLearnTimeCache.java | 2 +- .../xyz/playedu/course/domain/Course.java | 1 + .../course/domain/UserLatestLearn.java | 1 - .../CourseAttachmentDownloadLogMapper.java | 2 +- .../playedu/course/mapper/CourseMapper.java | 2 +- .../mapper/UserCourseHourRecordMapper.java | 2 +- .../course/mapper/UserCourseRecordMapper.java | 2 +- .../CourseAttachmentDownloadLogService.java | 2 +- .../service/CourseAttachmentService.java | 2 +- .../course/service/CourseCategoryService.java | 2 -- .../course/service/CourseChapterService.java | 2 +- .../course/service/CourseHourService.java | 2 +- .../playedu/course/service/CourseService.java | 2 +- .../service/UserCourseHourRecordService.java | 2 +- .../service/UserCourseRecordService.java | 2 +- ...ourseAttachmentDownloadLogServiceImpl.java | 4 ++-- .../impl/CourseAttachmentServiceImpl.java | 2 +- .../impl/CourseCategoryServiceImpl.java | 6 ++--- .../impl/CourseChapterServiceImpl.java | 2 +- .../impl/CourseDepartmentServiceImpl.java | 3 +-- .../service/impl/CourseHourServiceImpl.java | 2 +- .../service/impl/CourseServiceImpl.java | 17 +++++++------- .../impl/UserCourseHourRecordServiceImpl.java | 6 ++--- .../impl/UserCourseRecordServiceImpl.java | 4 ++-- .../xyz/playedu/resource/domain/Resource.java | 1 + .../resource/mapper/ResourceMapper.java | 2 +- .../resource/service/ResourceService.java | 2 +- .../resource/service/UploadService.java | 2 +- .../service/impl/ResourceServiceImpl.java | 8 +++---- .../service/impl/UploadServiceImpl.java | 6 ++--- .../system/aspectj/AdminLogAspect.java | 13 +++++++---- .../aspectj/BackendPermissionAspect.java | 11 +++++----- .../playedu/system/aspectj/LockAspect.java | 3 ++- .../system/checks/AdminPermissionCheck.java | 1 + .../playedu/system/checks/AdminRoleCheck.java | 1 + .../playedu/system/checks/AppConfigCheck.java | 1 + .../playedu/system/checks/UpgradeCheck.java | 1 + .../system/interceptor/AdminInterceptor.java | 5 ++++- .../system/interceptor/FrontInterceptor.java | 5 ++++- .../system/interceptor/WebMvcConfig.java | 2 ++ pom.xml | 18 +++++++++++++++ 93 files changed, 240 insertions(+), 178 deletions(-) diff --git a/playedu-api/pom.xml b/playedu-api/pom.xml index 4458fd9..95c7dae 100644 --- a/playedu-api/pom.xml +++ b/playedu-api/pom.xml @@ -44,9 +44,6 @@ org.springframework.boot spring-boot-maven-plugin 3.1.2 - - true - diff --git a/playedu-api/src/main/java/xyz/playedu/api/PlayeduApiApplication.java b/playedu-api/src/main/java/xyz/playedu/api/PlayeduApiApplication.java index 021be7a..c78d65b 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/PlayeduApiApplication.java +++ b/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 { diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java index e459cde..a6cc4a4 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java index 8dc8586..7528792 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminRoleController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminRoleController.java index 6dc1dc0..2f29488 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminRoleController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java index 16061c7..6353ad4 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java index 78a60c8..e825384 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentController.java index e44ff45..87471f6 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentController.java +++ b/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.*; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java index 84ef2fd..3a4fad3 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java +++ b/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.api.event.CourseChapterDestroyEvent; +import xyz.playedu.common.context.BCtx; import xyz.playedu.common.exception.NotFoundException; -import xyz.playedu.common.annotation.BackendPermission; -import xyz.playedu.api.request.backend.CourseChapterRequest; -import xyz.playedu.api.request.backend.CourseChapterSortRequest; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.course.domain.CourseChapter; 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") diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseController.java index 0b81a8a..bbfc5f0 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseController.java +++ b/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; @@ -254,7 +254,7 @@ public class CourseController { attachments.forEach( courseAttachment -> { Resource resource = resourceMap.get(courseAttachment.getRid()); - if(null != resource){ + if (null != resource) { courseAttachment.setUrl(resource.getUrl()); courseAttachment.setExt(resource.getExtension()); } diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java index a813136..faacf04 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java +++ b/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.course.domain.CourseHour; -import xyz.playedu.api.event.CourseHourCreatedEvent; -import xyz.playedu.api.event.CourseHourDestroyEvent; +import xyz.playedu.common.context.BCtx; 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.*; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java index 66662be..5017fa6 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/DashboardController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/DashboardController.java index b4b0b30..a90fc37 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/DashboardController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java index 0826228..e08cebf 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/LoginController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/LoginController.java index a85087d..e9a33ba 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/LoginController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java index f7c6a72..e2eacd9 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java +++ b/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.api.request.backend.ResourceCategoryParentRequest; -import xyz.playedu.api.request.backend.ResourceCategoryRequest; -import xyz.playedu.api.request.backend.ResourceCategorySortRequest; +import xyz.playedu.common.service.CategoryService; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.course.service.CourseCategoryService; 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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java index c1d86ad..144e426 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java index 4adf74c..eeaae2b 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UploadController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UploadController.java index 7fa69cc..ab6d6ca 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UploadController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UserController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UserController.java index 1aa9b11..d5df0c7 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UserController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/CourseController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/CourseController.java index 9445903..56f9e2b 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/CourseController.java +++ b/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; @@ -95,7 +96,7 @@ public class CourseController { attachments.forEach( courseAttachment -> { Resource resource = resourceMap.get(courseAttachment.getRid()); - if(null != resource){ + if (null != resource) { courseAttachment.setExt(resource.getExtension()); } }); diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/DepartmentController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/DepartmentController.java index 62c4ef3..985516b 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/DepartmentController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/HourController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/HourController.java index d056e49..67dad3b 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/HourController.java +++ b/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( - FCtx.getId(), course.getId(), hour.getId(), duration, hour.getDuration()); + boolean isFinished = + 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 { // 此处未考虑上面代码执行失败释放锁 diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java index 372be8a..73f175f 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java +++ b/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 diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/SystemController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/SystemController.java index ad75f7c..2dc79a8 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/SystemController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/UserController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/UserController.java index 6a2867d..9994e7f 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/UserController.java +++ b/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; diff --git a/playedu-api/src/main/java/xyz/playedu/api/listener/AdminUserLoginListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/AdminUserLoginListener.java index daa898e..028e055 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/listener/AdminUserLoginListener.java +++ b/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 diff --git a/playedu-api/src/main/java/xyz/playedu/api/listener/CourseDestroyListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/CourseDestroyListener.java index a8447aa..9f869a2 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/listener/CourseDestroyListener.java +++ b/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 杭州白书科技有限公司 diff --git a/playedu-common/src/main/java/xyz/playedu/common/bus/BackendBus.java b/playedu-common/src/main/java/xyz/playedu/common/bus/BackendBus.java index 8d33207..47d3ef8 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/bus/BackendBus.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/config/AuthConfig.java b/playedu-common/src/main/java/xyz/playedu/common/config/AuthConfig.java index 57a320d..b6c8b7b 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/config/AuthConfig.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/config/MybatisPlusConfig.java b/playedu-common/src/main/java/xyz/playedu/common/config/MybatisPlusConfig.java index 251ab05..8b5063e 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/config/MybatisPlusConfig.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/config/PlayEduConfig.java b/playedu-common/src/main/java/xyz/playedu/common/config/PlayEduConfig.java index fedea41..43dfb65 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/config/PlayEduConfig.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/config/PlayEduMinioClientConfig.java b/playedu-common/src/main/java/xyz/playedu/common/config/PlayEduMinioClientConfig.java index f48e8ed..4c4e5c2 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/config/PlayEduMinioClientConfig.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/config/SaTokenConfig.java b/playedu-common/src/main/java/xyz/playedu/common/config/SaTokenConfig.java index 6444e04..ef53c9e 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/config/SaTokenConfig.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/domain/AdminLog.java b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminLog.java index 6a0cd1d..51e31cc 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/domain/AdminLog.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/domain/AdminUser.java b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminUser.java index f30156a..cd481c0 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/domain/AdminUser.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/domain/User.java b/playedu-common/src/main/java/xyz/playedu/common/domain/User.java index 4885427..008e70f 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/domain/User.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/domain/UserLoginRecord.java b/playedu-common/src/main/java/xyz/playedu/common/domain/UserLoginRecord.java index d5a7d3f..de27066 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/domain/UserLoginRecord.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/domain/UserUploadImageLog.java b/playedu-common/src/main/java/xyz/playedu/common/domain/UserUploadImageLog.java index 064e7dd..ad11122 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/domain/UserUploadImageLog.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/service/AdminLogService.java b/playedu-common/src/main/java/xyz/playedu/common/service/AdminLogService.java index 07d8b93..3a8c811 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/service/AdminLogService.java +++ b/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 { PaginationResult paginate(int page, int size, AdminLogPaginateFiler filter); } diff --git a/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminRoleServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminRoleServiceImpl.java index 838a6e5..600147b 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminRoleServiceImpl.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/service/impl/CategoryServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/CategoryServiceImpl.java index 6a7dcf8..33047c2 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/service/impl/CategoryServiceImpl.java +++ b/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 - extends ServiceImpl +public class CategoryServiceImpl extends ServiceImpl implements CategoryService { @Override @@ -217,8 +217,7 @@ public class CategoryServiceImpl @Override public Map id2name() { - return all().stream() - .collect(Collectors.toMap(Category::getId, Category::getName)); + return all().stream().collect(Collectors.toMap(Category::getId, Category::getName)); } @Override diff --git a/playedu-common/src/main/java/xyz/playedu/common/service/impl/MinioServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/MinioServiceImpl.java index 34e338f..99aeea1 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/service/impl/MinioServiceImpl.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserServiceImpl.java index 9bb7a7c..0660dca 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserServiceImpl.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserUploadImageLogServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserUploadImageLogServiceImpl.java index a3bd252..881421c 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserUploadImageLogServiceImpl.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/util/HelperUtil.java b/playedu-common/src/main/java/xyz/playedu/common/util/HelperUtil.java index 1899ad7..aa98643 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/util/HelperUtil.java +++ b/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.*; diff --git a/playedu-common/src/main/java/xyz/playedu/common/util/IpUtil.java b/playedu-common/src/main/java/xyz/playedu/common/util/IpUtil.java index c4e0e51..f50156f 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/util/IpUtil.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/util/RedisUtil.java b/playedu-common/src/main/java/xyz/playedu/common/util/RedisUtil.java index 7a7d5ed..a7864aa 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/util/RedisUtil.java +++ b/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.*; diff --git a/playedu-common/src/main/java/xyz/playedu/common/util/RequestUtil.java b/playedu-common/src/main/java/xyz/playedu/common/util/RequestUtil.java index 0251a8d..3f4bcc9 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/util/RequestUtil.java +++ b/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; diff --git a/playedu-common/src/main/java/xyz/playedu/common/util/StringUtil.java b/playedu-common/src/main/java/xyz/playedu/common/util/StringUtil.java index 19520d0..12f152c 100644 --- a/playedu-common/src/main/java/xyz/playedu/common/util/StringUtil.java +++ b/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.*; diff --git a/playedu-course/src/main/java/xyz/playedu/course/bus/UserBus.java b/playedu-course/src/main/java/xyz/playedu/course/bus/UserBus.java index 73040f4..f89eaf4 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/bus/UserBus.java +++ b/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; @@ -51,7 +52,7 @@ public class UserBus { } // 注意，调用该方法需要考虑到并发写入问题 - /* public void userLearnDurationRecord(User user, Course course, CourseHour hour) { + /* public void userLearnDurationRecord(User user, Course course, CourseHour hour) { Long curTime = System.currentTimeMillis(); // 最近一次学习时间 diff --git a/playedu-course/src/main/java/xyz/playedu/course/caches/CourseCache.java b/playedu-course/src/main/java/xyz/playedu/course/caches/CourseCache.java index ebdf4fa..4896121 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/caches/CourseCache.java +++ b/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 杭州白书科技有限公司 * diff --git a/playedu-course/src/main/java/xyz/playedu/course/caches/UserLastLearnTimeCache.java b/playedu-course/src/main/java/xyz/playedu/course/caches/UserLastLearnTimeCache.java index 01651f5..6394a65 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/caches/UserLastLearnTimeCache.java +++ b/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 杭州白书科技有限公司 diff --git a/playedu-course/src/main/java/xyz/playedu/course/domain/Course.java b/playedu-course/src/main/java/xyz/playedu/course/domain/Course.java index 9a4a618..e4aa174 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/domain/Course.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/domain/UserLatestLearn.java b/playedu-course/src/main/java/xyz/playedu/course/domain/UserLatestLearn.java index 6067b93..9a30c33 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/domain/UserLatestLearn.java +++ b/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 杭州白书科技有限公司 * diff --git a/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseAttachmentDownloadLogMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseAttachmentDownloadLogMapper.java index 18d1ce6..915c703 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseAttachmentDownloadLogMapper.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseMapper.java index 5eef298..14d7b71 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseMapper.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseHourRecordMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseHourRecordMapper.java index fc5528b..467c2c5 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseHourRecordMapper.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseRecordMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseRecordMapper.java index 3a79d66..5d2511a 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseRecordMapper.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentDownloadLogService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentDownloadLogService.java index 8064f9a..daac355 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentDownloadLogService.java +++ b/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 { diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentService.java index 0ff8c58..ddf3124 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentService.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/CourseCategoryService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseCategoryService.java index 64c8185..d26b6f5 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/CourseCategoryService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/CourseCategoryService.java @@ -37,6 +37,4 @@ public interface CourseCategoryService extends IService { List getCategoryIdsByCourseId(Integer courseId); List getCourseIdsByCategoryId(Integer id); - - } diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/CourseChapterService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseChapterService.java index 14a207c..26eade8 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/CourseChapterService.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/CourseHourService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseHourService.java index 60f509f..6ab930c 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/CourseHourService.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/CourseService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseService.java index 9ad76f3..12d2818 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/CourseService.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseHourRecordService.java b/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseHourRecordService.java index 77c2608..35051e5 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseHourRecordService.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseRecordService.java b/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseRecordService.java index 9679023..110edb9 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseRecordService.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentDownloadLogServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentDownloadLogServiceImpl.java index 0e0a4a7..f1148c7 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentDownloadLogServiceImpl.java +++ b/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 diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentServiceImpl.java index a6ffddf..d07dbb5 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentServiceImpl.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseCategoryServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseCategoryServiceImpl.java index a8d059d..629171e 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseCategoryServiceImpl.java +++ b/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 - extends ServiceImpl +public class CourseCategoryServiceImpl extends ServiceImpl implements CourseCategoryService { @Override @@ -61,8 +60,7 @@ public class CourseCategoryServiceImpl @Override public List getCourseIdsByCategoryId(Integer id) { - return list(query().getWrapper().eq("category_id", id)) - .stream() + return list(query().getWrapper().eq("category_id", id)).stream() .map(CourseCategory::getCourseId) .toList(); } diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseChapterServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseChapterServiceImpl.java index f812d49..78d50e4 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseChapterServiceImpl.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseDepartmentServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseDepartmentServiceImpl.java index c3280d6..34190ff 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseDepartmentServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseDepartmentServiceImpl.java @@ -55,8 +55,7 @@ public class CourseDepartmentServiceImpl @Override public List getCourseIdsByDepId(Integer depId) { - return list(query().getWrapper().eq("dep_id", depId)) - .stream() + return list(query().getWrapper().eq("dep_id", depId)).stream() .map(CourseDepartment::getCourseId) .toList(); } diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseHourServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseHourServiceImpl.java index bd72fb1..c0c3b97 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseHourServiceImpl.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseServiceImpl.java index de838f4..bc7e5ec 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseServiceImpl.java +++ b/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 impleme data.forEach( (courseId, records) -> { result.put( - courseId, - records.stream().map(CourseCategory::getCategoryId).toList()); + courseId, records.stream().map(CourseCategory::getCategoryId).toList()); }); return result; } diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseHourRecordServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseHourRecordServiceImpl.java index 207c9cd..ded4555 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseHourRecordServiceImpl.java +++ b/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; diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java index fc84dec..2a67ff7 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java +++ b/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; diff --git a/playedu-resource/src/main/java/xyz/playedu/resource/domain/Resource.java b/playedu-resource/src/main/java/xyz/playedu/resource/domain/Resource.java index ecfbfb5..080feac 100644 --- a/playedu-resource/src/main/java/xyz/playedu/resource/domain/Resource.java +++ b/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; diff --git a/playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceMapper.java b/playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceMapper.java index cc5725d..4a53d50 100644 --- a/playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceMapper.java +++ b/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; diff --git a/playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceService.java b/playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceService.java index 2f128e9..5fc2e55 100644 --- a/playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceService.java +++ b/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; diff --git a/playedu-resource/src/main/java/xyz/playedu/resource/service/UploadService.java b/playedu-resource/src/main/java/xyz/playedu/resource/service/UploadService.java index fff12bc..f3d84e0 100644 --- a/playedu-resource/src/main/java/xyz/playedu/resource/service/UploadService.java +++ b/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 杭州白书科技有限公司 diff --git a/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceServiceImpl.java b/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceServiceImpl.java index c57934f..fa1400d 100644 --- a/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceServiceImpl.java +++ b/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.*; diff --git a/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/UploadServiceImpl.java b/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/UploadServiceImpl.java index e79a6a1..6f7aff1 100644 --- a/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/UploadServiceImpl.java +++ b/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; diff --git a/playedu-system/src/main/java/xyz/playedu/system/aspectj/AdminLogAspect.java b/playedu-system/src/main/java/xyz/playedu/system/aspectj/AdminLogAspect.java index 30e6174..c1e93e1 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/aspectj/AdminLogAspect.java +++ b/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)") @@ -172,9 +177,9 @@ public class AdminLogAspect { jsonObjectResult.put(key, excludeProperties(entry.getValue().toString())); } else { // 如果value是单纯的数据,执行脱敏操作 - if(EXCLUDE_PROPERTIES.contains(key)){ + if (EXCLUDE_PROPERTIES.contains(key)) { jsonObjectResult.put(key, SystemConstant.CONFIG_MASK); - }else { + } else { jsonObjectResult.put(key, value); } } diff --git a/playedu-system/src/main/java/xyz/playedu/system/aspectj/BackendPermissionAspect.java b/playedu-system/src/main/java/xyz/playedu/system/aspectj/BackendPermissionAspect.java index 0800b78..5547caa 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/aspectj/BackendPermissionAspect.java +++ b/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 = - signature.getMethod().getAnnotation(BackendPermission.class); + BackendPermission middleware = signature.getMethod().getAnnotation(BackendPermission.class); Integer adminUserId = BCtx.getId(); HashMap permissions = backendBus.adminUserPermissions(adminUserId); if (permissions.get(middleware.slug()) == null) { diff --git a/playedu-system/src/main/java/xyz/playedu/system/aspectj/LockAspect.java b/playedu-system/src/main/java/xyz/playedu/system/aspectj/LockAspect.java index b59f02b..20608c5 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/aspectj/LockAspect.java +++ b/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; diff --git a/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java b/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java index a6d683c..91845ca 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java +++ b/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; diff --git a/playedu-system/src/main/java/xyz/playedu/system/checks/AdminRoleCheck.java b/playedu-system/src/main/java/xyz/playedu/system/checks/AdminRoleCheck.java index 9e1929e..9257f55 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/checks/AdminRoleCheck.java +++ b/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; diff --git a/playedu-system/src/main/java/xyz/playedu/system/checks/AppConfigCheck.java b/playedu-system/src/main/java/xyz/playedu/system/checks/AppConfigCheck.java index 79f55fd..05d23be 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/checks/AppConfigCheck.java +++ b/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; diff --git a/playedu-system/src/main/java/xyz/playedu/system/checks/UpgradeCheck.java b/playedu-system/src/main/java/xyz/playedu/system/checks/UpgradeCheck.java index 0a94658..6812728 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/checks/UpgradeCheck.java +++ b/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; diff --git a/playedu-system/src/main/java/xyz/playedu/system/interceptor/AdminInterceptor.java b/playedu-system/src/main/java/xyz/playedu/system/interceptor/AdminInterceptor.java index f14374c..e9deec7 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/interceptor/AdminInterceptor.java +++ b/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; diff --git a/playedu-system/src/main/java/xyz/playedu/system/interceptor/FrontInterceptor.java b/playedu-system/src/main/java/xyz/playedu/system/interceptor/FrontInterceptor.java index 96627ce..67b8f31 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/interceptor/FrontInterceptor.java +++ b/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; diff --git a/playedu-system/src/main/java/xyz/playedu/system/interceptor/WebMvcConfig.java b/playedu-system/src/main/java/xyz/playedu/system/interceptor/WebMvcConfig.java index 25a6237..3feef80 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/interceptor/WebMvcConfig.java +++ b/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; diff --git a/pom.xml b/pom.xml index a53b364..ec4f807 100644 --- a/pom.xml +++ b/pom.xml @@ -181,6 +181,24 @@ UTF-8 + + com.diffplug.spotless + spotless-maven-plugin + 2.36.0 + + + + 1.16.0 + + true + + + + license-header.txt + + + +