diff --git a/playedu-api/pom.xml b/playedu-api/pom.xml new file mode 100644 index 0000000..4458fd9 --- /dev/null +++ b/playedu-api/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + xyz.playedu + playedu + 1.2 + + + playedu-api + + + 17 + + + + + xyz.playedu + playedu-common + 1.2 + + + xyz.playedu + playedu-system + 1.2 + + + xyz.playedu + playedu-course + 1.2 + + + xyz.playedu + playedu-resource + 1.2 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 3.1.2 + + true + + + + + repackage + + + + + + + \ No newline at end of file diff --git a/src/main/java/xyz/playedu/api/PlayeduApiApplication.java b/playedu-api/src/main/java/xyz/playedu/api/PlayeduApiApplication.java similarity index 81% rename from src/main/java/xyz/playedu/api/PlayeduApiApplication.java rename to playedu-api/src/main/java/xyz/playedu/api/PlayeduApiApplication.java index 92e0b70..021be7a 100644 --- a/src/main/java/xyz/playedu/api/PlayeduApiApplication.java +++ b/playedu-api/src/main/java/xyz/playedu/api/PlayeduApiApplication.java @@ -15,16 +15,17 @@ */ package xyz.playedu.api; +import org.mybatis.spring.annotation.MapperScan; 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.api.config.UniqueNameGenerator; +import xyz.playedu.common.config.UniqueNameGeneratorConfig; @SpringBootApplication @EnableAsync -@ComponentScan(nameGenerator = UniqueNameGenerator.class) +@ComponentScan(basePackages = {"xyz.playedu"}, nameGenerator = UniqueNameGeneratorConfig.class) +@MapperScan("xyz.playedu.**.mapper") public class PlayeduApiApplication { public static void main(String[] args) { diff --git a/src/main/java/xyz/playedu/api/controller/ExceptionController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java similarity index 94% rename from src/main/java/xyz/playedu/api/controller/ExceptionController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java index 7c8c379..e459cde 100644 --- a/src/main/java/xyz/playedu/api/controller/ExceptionController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java @@ -25,11 +25,10 @@ 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.api.exception.LimitException; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.exception.ServiceException; -import xyz.playedu.api.types.JsonResponse; +import xyz.playedu.common.exception.LimitException; +import xyz.playedu.common.exception.NotFoundException; +import xyz.playedu.common.exception.ServiceException; +import xyz.playedu.common.types.JsonResponse; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java similarity index 79% rename from src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java index 3ea4bed..8dc8586 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java @@ -24,23 +24,19 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import xyz.playedu.api.BCtx; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.bus.BackendBus; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.*; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; -import xyz.playedu.api.service.AdminLogService; -import xyz.playedu.api.service.AdminUserService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.paginate.AdminLogPaginateFiler; -import xyz.playedu.api.types.paginate.PaginationResult; +import xyz.playedu.common.context.BCtx; +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.domain.AdminLog; +import xyz.playedu.common.service.AdminLogService; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.common.types.paginate.AdminLogPaginateFiler; +import xyz.playedu.common.types.paginate.PaginationResult; import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; @RestController @Slf4j @@ -49,13 +45,11 @@ public class AdminLogController { @Autowired private AdminLogService adminLogService; - @Autowired private AdminUserService adminUserService; - @Autowired private BackendBus backendBus; - @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_LOG) + @BackendPermission(slug = BPermissionConstant.ADMIN_LOG) @GetMapping("/index") - @Log(title = "管理员日志-列表", businessType = BusinessType.GET) + @Log(title = "管理员日志-列表", businessType = BusinessTypeConstant.GET) public JsonResponse index(@RequestParam HashMap params) { Integer page = MapUtils.getInteger(params, "page", 1); Integer size = MapUtils.getInteger(params, "size", 10); diff --git a/src/main/java/xyz/playedu/api/controller/backend/AdminRoleController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminRoleController.java similarity index 82% rename from src/main/java/xyz/playedu/api/controller/backend/AdminRoleController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminRoleController.java index 24e0d42..6dc1dc0 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/AdminRoleController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminRoleController.java @@ -21,18 +21,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BackendConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.AdminPermission; -import xyz.playedu.api.domain.AdminRole; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; +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.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.api.service.AdminPermissionService; -import xyz.playedu.api.service.AdminRoleService; -import xyz.playedu.api.types.JsonResponse; +import xyz.playedu.common.service.AdminPermissionService; +import xyz.playedu.common.service.AdminRoleService; +import xyz.playedu.common.types.JsonResponse; import java.util.ArrayList; import java.util.HashMap; @@ -50,15 +50,15 @@ public class AdminRoleController { @Autowired private AdminPermissionService permissionService; @GetMapping("/index") - @Log(title = "管理员角色-列表", businessType = BusinessType.GET) + @Log(title = "管理员角色-列表", businessType = BusinessTypeConstant.GET) public JsonResponse index() { List data = roleService.list(); return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_ROLE) + @BackendPermission(slug = BPermissionConstant.ADMIN_ROLE) @GetMapping("/create") - @Log(title = "管理员角色-新建", businessType = BusinessType.GET) + @Log(title = "管理员角色-新建", businessType = BusinessTypeConstant.GET) public JsonResponse create() { List permissions = permissionService.listOrderBySortAsc(); @@ -70,17 +70,17 @@ public class AdminRoleController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_ROLE) + @BackendPermission(slug = BPermissionConstant.ADMIN_ROLE) @PostMapping("/create") - @Log(title = "管理员角色-新建", businessType = BusinessType.INSERT) + @Log(title = "管理员角色-新建", businessType = BusinessTypeConstant.INSERT) public JsonResponse store(@RequestBody @Validated AdminRoleRequest request) { roleService.createWithPermissionIds(request.getName(), request.getPermissionIds()); return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_ROLE) + @BackendPermission(slug = BPermissionConstant.ADMIN_ROLE) @GetMapping("/{id}") - @Log(title = "管理员角色-编辑", businessType = BusinessType.GET) + @Log(title = "管理员角色-编辑", businessType = BusinessTypeConstant.GET) public JsonResponse edit(@PathVariable(name = "id") Integer id) throws NotFoundException { AdminRole role = roleService.findOrFail(id); @@ -112,9 +112,9 @@ public class AdminRoleController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_ROLE) + @BackendPermission(slug = BPermissionConstant.ADMIN_ROLE) @PutMapping("/{id}") - @Log(title = "管理员角色-编辑", businessType = BusinessType.UPDATE) + @Log(title = "管理员角色-编辑", businessType = BusinessTypeConstant.UPDATE) public JsonResponse update( @PathVariable(name = "id") Integer id, @RequestBody @Validated AdminRoleRequest request) throws NotFoundException { @@ -128,9 +128,9 @@ public class AdminRoleController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_ROLE) + @BackendPermission(slug = BPermissionConstant.ADMIN_ROLE) @DeleteMapping("/{id}") - @Log(title = "管理员角色-删除", businessType = BusinessType.DELETE) + @Log(title = "管理员角色-删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroy(@PathVariable(name = "id") Integer id) throws NotFoundException { AdminRole role = roleService.findOrFail(id); diff --git a/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java similarity index 80% rename from src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java index bc1f7d9..16061c7 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java @@ -22,20 +22,20 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.AdminRole; -import xyz.playedu.api.domain.AdminUser; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.exception.ServiceException; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; +import xyz.playedu.common.annotation.Log; +import xyz.playedu.common.constant.BPermissionConstant; +import xyz.playedu.common.constant.BusinessTypeConstant; +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.api.service.AdminRoleService; -import xyz.playedu.api.service.AdminUserService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.paginate.AdminUserPaginateFilter; -import xyz.playedu.api.types.paginate.PaginationResult; +import xyz.playedu.common.service.AdminRoleService; +import xyz.playedu.common.service.AdminUserService; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.common.types.paginate.AdminUserPaginateFilter; +import xyz.playedu.common.types.paginate.PaginationResult; import java.util.HashMap; import java.util.List; @@ -51,9 +51,9 @@ public class AdminUserController { @Autowired private AdminRoleService roleService; - @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_INDEX) + @BackendPermission(slug = BPermissionConstant.ADMIN_USER_INDEX) @GetMapping("/index") - @Log(title = "管理员-列表", businessType = BusinessType.GET) + @Log(title = "管理员-列表", businessType = BusinessTypeConstant.GET) public JsonResponse Index(@RequestParam HashMap params) { Integer page = MapUtils.getInteger(params, "page", 1); Integer size = MapUtils.getInteger(params, "size", 10); @@ -84,9 +84,9 @@ public class AdminUserController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_CUD) + @BackendPermission(slug = BPermissionConstant.ADMIN_USER_CUD) @GetMapping("/create") - @Log(title = "管理员-新建", businessType = BusinessType.GET) + @Log(title = "管理员-新建", businessType = BusinessTypeConstant.GET) public JsonResponse create() { List roles = roleService.list(); @@ -96,9 +96,9 @@ public class AdminUserController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_CUD) + @BackendPermission(slug = BPermissionConstant.ADMIN_USER_CUD) @PostMapping("/create") - @Log(title = "管理员-新建", businessType = BusinessType.INSERT) + @Log(title = "管理员-新建", businessType = BusinessTypeConstant.INSERT) public JsonResponse store(@RequestBody @Validated AdminUserRequest req) throws ServiceException { if (req.getPassword().length() == 0) { @@ -115,9 +115,9 @@ public class AdminUserController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_CUD) + @BackendPermission(slug = BPermissionConstant.ADMIN_USER_CUD) @GetMapping("/{id}") - @Log(title = "管理员-编辑", businessType = BusinessType.GET) + @Log(title = "管理员-编辑", businessType = BusinessTypeConstant.GET) public JsonResponse edit(@PathVariable Integer id) throws NotFoundException { AdminUser adminUser = adminUserService.findOrFail(id); List roleIds = adminUserService.getRoleIdsByUserId(adminUser.getId()); @@ -129,9 +129,9 @@ public class AdminUserController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_CUD) + @BackendPermission(slug = BPermissionConstant.ADMIN_USER_CUD) @PutMapping("/{id}") - @Log(title = "管理员-编辑", businessType = BusinessType.UPDATE) + @Log(title = "管理员-编辑", businessType = BusinessTypeConstant.UPDATE) public JsonResponse update( @PathVariable Integer id, @RequestBody @Validated AdminUserRequest req) throws NotFoundException, ServiceException { @@ -146,9 +146,9 @@ public class AdminUserController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_CUD) + @BackendPermission(slug = BPermissionConstant.ADMIN_USER_CUD) @DeleteMapping("/{id}") - @Log(title = "管理员-删除", businessType = BusinessType.DELETE) + @Log(title = "管理员-删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroy(@PathVariable Integer id) { adminUserService.removeWithRoleIds(id); return JsonResponse.success(); diff --git a/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java similarity index 78% rename from src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java index 80080a9..78a60c8 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java @@ -18,15 +18,15 @@ package xyz.playedu.api.controller.backend; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.constant.SystemConstant; -import xyz.playedu.api.domain.AppConfig; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; +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.api.service.AppConfigService; -import xyz.playedu.api.types.JsonResponse; +import xyz.playedu.common.service.AppConfigService; +import xyz.playedu.common.types.JsonResponse; import java.util.ArrayList; import java.util.HashMap; @@ -38,9 +38,9 @@ public class AppConfigController { @Autowired private AppConfigService configService; - @BackendPermissionMiddleware(slug = BPermissionConstant.SYSTEM_CONFIG) + @BackendPermission(slug = BPermissionConstant.SYSTEM_CONFIG) @GetMapping("") - @Log(title = "系统配置-读取", businessType = BusinessType.GET) + @Log(title = "系统配置-读取", businessType = BusinessTypeConstant.GET) public JsonResponse index() { List configs = configService.allShow(); List data = new ArrayList<>(); @@ -53,9 +53,9 @@ public class AppConfigController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.SYSTEM_CONFIG) + @BackendPermission(slug = BPermissionConstant.SYSTEM_CONFIG) @PutMapping("") - @Log(title = "系统配置-保存", businessType = BusinessType.UPDATE) + @Log(title = "系统配置-保存", businessType = BusinessTypeConstant.UPDATE) public JsonResponse save(@RequestBody AppConfigRequest req) { HashMap data = new HashMap<>(); req.getData() diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentController.java similarity index 85% rename from src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentController.java index b21e677..e44ff45 100644 --- a/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.annotation.Log; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BackendConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.CourseAttachment; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; +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.api.service.CourseAttachmentService; -import xyz.playedu.api.types.JsonResponse; +import xyz.playedu.course.service.CourseAttachmentService; +import xyz.playedu.common.types.JsonResponse; import java.util.*; @@ -44,9 +44,9 @@ public class CourseAttachmentController { @Autowired private CourseAttachmentService attachmentService; - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @PostMapping("/create") - @Log(title = "线上课-附件-新建", businessType = BusinessType.INSERT) + @Log(title = "线上课-附件-新建", businessType = BusinessTypeConstant.INSERT) public JsonResponse store( @PathVariable(name = "courseId") Integer courseId, @RequestBody @Validated CourseAttachmentRequest req) @@ -71,10 +71,10 @@ public class CourseAttachmentController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @PostMapping("/create-batch") @Transactional - @Log(title = "线上课-附件-批量新建", businessType = BusinessType.INSERT) + @Log(title = "线上课-附件-批量新建", businessType = BusinessTypeConstant.INSERT) public JsonResponse storeMulti( @PathVariable(name = "courseId") Integer courseId, @RequestBody @Validated CourseAttachmentMultiRequest req) { @@ -109,9 +109,9 @@ public class CourseAttachmentController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @GetMapping("/{id}") - @Log(title = "线上课-附件-编辑", businessType = BusinessType.GET) + @Log(title = "线上课-附件-编辑", businessType = BusinessTypeConstant.GET) public JsonResponse edit( @PathVariable(name = "courseId") Integer courseId, @PathVariable(name = "id") Integer id) @@ -120,9 +120,9 @@ public class CourseAttachmentController { return JsonResponse.data(courseAttachment); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @PutMapping("/{id}") - @Log(title = "线上课-附件-编辑", businessType = BusinessType.UPDATE) + @Log(title = "线上课-附件-编辑", businessType = BusinessTypeConstant.UPDATE) public JsonResponse update( @PathVariable(name = "courseId") Integer courseId, @PathVariable(name = "id") Integer id, @@ -133,9 +133,9 @@ public class CourseAttachmentController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @DeleteMapping("/{id}") - @Log(title = "线上课-附件-删除", businessType = BusinessType.DELETE) + @Log(title = "线上课-附件-删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroy( @PathVariable(name = "courseId") Integer courseId, @PathVariable(name = "id") Integer id) @@ -146,7 +146,7 @@ public class CourseAttachmentController { } @PutMapping("/update/sort") - @Log(title = "线上课-附件-排序调整", businessType = BusinessType.UPDATE) + @Log(title = "线上课-附件-排序调整", businessType = BusinessTypeConstant.UPDATE) public JsonResponse updateSort( @PathVariable(name = "courseId") Integer courseId, @RequestBody @Validated CourseAttachmentSortRequest req) { diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentDownloadLogController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentDownloadLogController.java similarity index 85% rename from src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentDownloadLogController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentDownloadLogController.java index 69a05fd..1012f24 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentDownloadLogController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentDownloadLogController.java @@ -21,13 +21,13 @@ import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.*; -import xyz.playedu.api.service.*; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.paginate.CourseAttachmentDownloadLogPaginateFiler; -import xyz.playedu.api.types.paginate.PaginationResult; +import xyz.playedu.common.annotation.Log; +import xyz.playedu.common.constant.BusinessTypeConstant; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.common.types.paginate.CourseAttachmentDownloadLogPaginateFiler; +import xyz.playedu.common.types.paginate.PaginationResult; +import xyz.playedu.course.domain.CourseAttachmentDownloadLog; +import xyz.playedu.course.service.CourseAttachmentDownloadLogService; import java.util.*; @@ -39,7 +39,7 @@ public class CourseAttachmentDownloadLogController { @Autowired private CourseAttachmentDownloadLogService courseAttachmentDownloadLogService; @GetMapping("/index") - @Log(title = "学员下载课件记录-列表", businessType = BusinessType.GET) + @Log(title = "学员下载课件记录-列表", businessType = BusinessTypeConstant.GET) public JsonResponse index(@RequestParam HashMap params) { Integer page = MapUtils.getInteger(params, "page", 1); Integer size = MapUtils.getInteger(params, "size", 10); diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java similarity index 81% rename from src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java index fcee8ba..84ef2fd 100644 --- a/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.api.BCtx; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.CourseChapter; +import xyz.playedu.common.context.BCtx; +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.api.exception.NotFoundException; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; +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.api.service.CourseChapterService; -import xyz.playedu.api.service.CourseHourService; -import xyz.playedu.api.types.JsonResponse; +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") @@ -44,9 +44,9 @@ public class CourseChapterController { @Autowired private ApplicationContext ctx; - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @PostMapping("/create") - @Log(title = "线上课-章节-新建", businessType = BusinessType.GET) + @Log(title = "线上课-章节-新建", businessType = BusinessTypeConstant.GET) public JsonResponse store( @PathVariable(name = "courseId") Integer courseId, @RequestBody @Validated CourseChapterRequest req) { @@ -54,9 +54,9 @@ public class CourseChapterController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @GetMapping("/{id}") - @Log(title = "线上课-章节-编辑", businessType = BusinessType.GET) + @Log(title = "线上课-章节-编辑", businessType = BusinessTypeConstant.GET) public JsonResponse edit( @PathVariable(name = "courseId") Integer courseId, @PathVariable(name = "id") Integer id) @@ -65,9 +65,9 @@ public class CourseChapterController { return JsonResponse.data(chapter); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @PutMapping("/{id}") - @Log(title = "线上课-章节-编辑", businessType = BusinessType.UPDATE) + @Log(title = "线上课-章节-编辑", businessType = BusinessTypeConstant.UPDATE) public JsonResponse update( @PathVariable(name = "courseId") Integer courseId, @PathVariable(name = "id") Integer id, @@ -78,9 +78,9 @@ public class CourseChapterController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @DeleteMapping("/{id}") - @Log(title = "线上课-章节-删除", businessType = BusinessType.DELETE) + @Log(title = "线上课-章节-删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroy( @PathVariable(name = "courseId") Integer courseId, @PathVariable(name = "id") Integer id) @@ -97,7 +97,7 @@ public class CourseChapterController { } @PutMapping("/update/sort") - @Log(title = "线上课-章节-更新排序", businessType = BusinessType.UPDATE) + @Log(title = "线上课-章节-更新排序", businessType = BusinessTypeConstant.UPDATE) public JsonResponse updateSort( @PathVariable(name = "courseId") Integer courseId, @RequestBody @Validated CourseChapterSortRequest req) { diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseController.java similarity index 88% rename from src/main/java/xyz/playedu/api/controller/backend/CourseController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseController.java index 2aae042..0b81a8a 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/CourseController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseController.java @@ -24,19 +24,28 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import xyz.playedu.api.BCtx; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.*; +import xyz.playedu.common.context.BCtx; +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.api.exception.NotFoundException; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; +import xyz.playedu.common.exception.NotFoundException; +import xyz.playedu.common.annotation.BackendPermission; import xyz.playedu.api.request.backend.CourseRequest; -import xyz.playedu.api.service.*; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.paginate.CoursePaginateFiler; -import xyz.playedu.api.types.paginate.PaginationResult; +import xyz.playedu.common.service.*; +import xyz.playedu.common.types.JsonResponse; +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.CourseAttachment; +import xyz.playedu.course.domain.CourseChapter; +import xyz.playedu.course.domain.CourseHour; +import xyz.playedu.course.service.CourseAttachmentService; +import xyz.playedu.course.service.CourseChapterService; +import xyz.playedu.course.service.CourseHourService; +import xyz.playedu.course.service.CourseService; +import xyz.playedu.resource.domain.Resource; +import xyz.playedu.resource.service.ResourceService; import java.text.ParseException; import java.util.*; @@ -50,7 +59,7 @@ public class CourseController { @Autowired private CourseService courseService; - @Autowired private ResourceCategoryService categoryService; + @Autowired private CategoryService categoryService; @Autowired private CourseChapterService chapterService; @@ -65,7 +74,7 @@ public class CourseController { @Autowired private ApplicationContext ctx; @GetMapping("/index") - @Log(title = "线上课-列表", businessType = BusinessType.GET) + @Log(title = "线上课-列表", businessType = BusinessTypeConstant.GET) public JsonResponse index(@RequestParam HashMap params) { Integer page = MapUtils.getInteger(params, "page", 1); Integer size = MapUtils.getInteger(params, "size", 10); @@ -100,7 +109,7 @@ public class CourseController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @GetMapping("/create") public JsonResponse create() { HashMap data = new HashMap<>(); @@ -108,10 +117,10 @@ public class CourseController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @PostMapping("/create") @Transactional - @Log(title = "线上课-新建", businessType = BusinessType.INSERT) + @Log(title = "线上课-新建", businessType = BusinessTypeConstant.INSERT) public JsonResponse store(@RequestBody @Validated CourseRequest req) throws ParseException { if (req.getShortDesc().length() > 200) { return JsonResponse.error("课程简短介绍不能超过200字"); @@ -225,9 +234,9 @@ public class CourseController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @GetMapping("/{id}") - @Log(title = "线上课-编辑", businessType = BusinessType.GET) + @Log(title = "线上课-编辑", businessType = BusinessTypeConstant.GET) public JsonResponse edit(@PathVariable(name = "id") Integer id) throws NotFoundException { Course course = courseService.findOrFail(id); List depIds = courseService.getDepIdsByCourseId(course.getId()); @@ -262,10 +271,10 @@ public class CourseController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @PutMapping("/{id}") @Transactional - @Log(title = "线上课-编辑", businessType = BusinessType.UPDATE) + @Log(title = "线上课-编辑", businessType = BusinessTypeConstant.UPDATE) public JsonResponse update( @PathVariable(name = "id") Integer id, @RequestBody @Validated CourseRequest req) throws NotFoundException { @@ -282,9 +291,9 @@ public class CourseController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @DeleteMapping("/{id}") - @Log(title = "线上课-删除", businessType = BusinessType.DELETE) + @Log(title = "线上课-删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroy(@PathVariable(name = "id") Integer id) { courseService.removeById(id); ctx.publishEvent(new CourseDestroyEvent(this, BCtx.getId(), id)); diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java similarity index 87% rename from src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java index e4ca5ec..a813136 100644 --- a/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.api.BCtx; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BackendConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.CourseChapter; -import xyz.playedu.api.domain.CourseHour; +import xyz.playedu.common.context.BCtx; +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.api.exception.NotFoundException; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; +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.api.service.CourseChapterService; -import xyz.playedu.api.service.CourseHourService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.SelectOption; +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 java.util.*; @@ -60,9 +60,9 @@ public class CourseHourController { @Autowired private ApplicationContext ctx; - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @GetMapping("/create") - @Log(title = "线上课-课时-新建", businessType = BusinessType.GET) + @Log(title = "线上课-课时-新建", businessType = BusinessTypeConstant.GET) public JsonResponse create(@PathVariable(name = "courseId") Integer courseId) { // 课时类型 List> typeItems = new ArrayList<>(); @@ -84,9 +84,9 @@ public class CourseHourController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @PostMapping("/create") - @Log(title = "线上课-课时-新建", businessType = BusinessType.INSERT) + @Log(title = "线上课-课时-新建", businessType = BusinessTypeConstant.INSERT) public JsonResponse store( @PathVariable(name = "courseId") Integer courseId, @RequestBody @Validated CourseHourRequest req) @@ -128,10 +128,10 @@ public class CourseHourController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @PostMapping("/create-batch") @Transactional - @Log(title = "线上课-课时-批量导入", businessType = BusinessType.INSERT) + @Log(title = "线上课-课时-批量导入", businessType = BusinessTypeConstant.INSERT) public JsonResponse storeMulti( @PathVariable(name = "courseId") Integer courseId, @RequestBody @Validated CourseHourMultiRequest req) { @@ -180,9 +180,9 @@ public class CourseHourController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @GetMapping("/{id}") - @Log(title = "线上课-课时-编辑", businessType = BusinessType.GET) + @Log(title = "线上课-课时-编辑", businessType = BusinessTypeConstant.GET) public JsonResponse edit( @PathVariable(name = "courseId") Integer courseId, @PathVariable(name = "id") Integer id) @@ -191,9 +191,9 @@ public class CourseHourController { return JsonResponse.data(courseHour); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @PutMapping("/{id}") - @Log(title = "线上课-课时-编辑", businessType = BusinessType.UPDATE) + @Log(title = "线上课-课时-编辑", businessType = BusinessTypeConstant.UPDATE) public JsonResponse update( @PathVariable(name = "courseId") Integer courseId, @PathVariable(name = "id") Integer id, @@ -208,9 +208,9 @@ public class CourseHourController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) + @BackendPermission(slug = BPermissionConstant.COURSE) @DeleteMapping("/{id}") - @Log(title = "线上课-课时-删除", businessType = BusinessType.DELETE) + @Log(title = "线上课-课时-删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroy( @PathVariable(name = "courseId") Integer courseId, @PathVariable(name = "id") Integer id) @@ -228,7 +228,7 @@ public class CourseHourController { } @PutMapping("/update/sort") - @Log(title = "线上课-课时-更新排序", businessType = BusinessType.UPDATE) + @Log(title = "线上课-课时-更新排序", businessType = BusinessTypeConstant.UPDATE) public JsonResponse updateSort( @PathVariable(name = "courseId") Integer courseId, @RequestBody @Validated CourseHourSortRequest req) { diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java similarity index 86% rename from src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java index 42f3bf2..66662be 100644 --- a/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,22 @@ import org.springframework.context.ApplicationContext; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.User; -import xyz.playedu.api.domain.UserCourseRecord; +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.api.middleware.BackendPermissionMiddleware; +import xyz.playedu.common.annotation.BackendPermission; import xyz.playedu.api.request.backend.CourseUserDestroyRequest; -import xyz.playedu.api.service.*; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.types.paginate.UserPaginateFilter; +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.service.CourseService; +import xyz.playedu.course.service.UserCourseHourRecordService; +import xyz.playedu.course.service.UserCourseRecordService; import java.util.ArrayList; import java.util.HashMap; @@ -65,10 +68,10 @@ public class CourseUserController { @Autowired private ApplicationContext ctx; - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE_USER) + @BackendPermission(slug = BPermissionConstant.COURSE_USER) @GetMapping("/index") @SneakyThrows - @Log(title = "线上课-学习记录-列表", businessType = BusinessType.GET) + @Log(title = "线上课-学习记录-列表", businessType = BusinessTypeConstant.GET) public JsonResponse index( @PathVariable(name = "courseId") Integer courseId, @RequestParam HashMap params) { @@ -141,9 +144,9 @@ public class CourseUserController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE_USER_DESTROY) + @BackendPermission(slug = BPermissionConstant.COURSE_USER_DESTROY) @PostMapping("/destroy") - @Log(title = "线上课-学习记录-删除", businessType = BusinessType.DELETE) + @Log(title = "线上课-学习记录-删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroy( @PathVariable(name = "courseId") Integer courseId, @RequestBody @Validated CourseUserDestroyRequest req) { diff --git a/src/main/java/xyz/playedu/api/controller/backend/DashboardController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/DashboardController.java similarity index 83% rename from src/main/java/xyz/playedu/api/controller/backend/DashboardController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/DashboardController.java index f6b55ae..b4b0b30 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/DashboardController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/DashboardController.java @@ -20,14 +20,17 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BackendConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.constant.SystemConstant; -import xyz.playedu.api.domain.User; -import xyz.playedu.api.domain.UserLearnDurationStats; -import xyz.playedu.api.service.*; -import xyz.playedu.api.types.JsonResponse; +import xyz.playedu.common.annotation.Log; +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.service.CourseService; +import xyz.playedu.course.service.UserLearnDurationStatsService; +import xyz.playedu.resource.service.ResourceService; import java.util.ArrayList; import java.util.HashMap; @@ -46,7 +49,7 @@ public class DashboardController { @Autowired private AdminUserService adminUserService; - @Autowired private ResourceCategoryService resourceCategoryService; + @Autowired private CategoryService categoryService; @Autowired private UserService userService; @@ -59,7 +62,7 @@ public class DashboardController { @Autowired private UserLearnDurationStatsService userLearnDurationStatsService; @GetMapping("/index") - @Log(title = "主面板", businessType = BusinessType.GET) + @Log(title = "主面板", businessType = BusinessTypeConstant.GET) public JsonResponse index() { HashMap data = new HashMap<>(); data.put("version", SystemConstant.VERSION); @@ -71,7 +74,7 @@ public class DashboardController { data.put("course_total", courseService.total()); // 线上课数量 data.put("department_total", departmentService.total()); - data.put("resource_category_total", resourceCategoryService.total()); + data.put("resource_category_total", categoryService.total()); data.put("admin_user_total", adminUserService.total()); data.put( diff --git a/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java similarity index 80% rename from src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java index 25afe5f..0826228 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java @@ -23,25 +23,28 @@ import org.springframework.context.ApplicationContext; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import xyz.playedu.api.BCtx; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.Course; -import xyz.playedu.api.domain.Department; -import xyz.playedu.api.domain.User; -import xyz.playedu.api.domain.UserCourseRecord; +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.Log; +import xyz.playedu.common.constant.BPermissionConstant; +import xyz.playedu.common.constant.BusinessTypeConstant; +import xyz.playedu.course.domain.Course; +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.api.exception.NotFoundException; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; -import xyz.playedu.api.request.backend.*; -import xyz.playedu.api.service.CourseService; -import xyz.playedu.api.service.DepartmentService; -import xyz.playedu.api.service.UserCourseRecordService; -import xyz.playedu.api.service.UserService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.types.paginate.UserPaginateFilter; +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 java.util.*; import java.util.stream.Collectors; @@ -53,6 +56,8 @@ public class DepartmentController { @Autowired private DepartmentService departmentService; + @Autowired private CourseDepartmentService courseDepartmentService; + @Autowired private UserService userService; @Autowired private CourseService courseService; @@ -62,7 +67,7 @@ public class DepartmentController { @Autowired private ApplicationContext ctx; @GetMapping("/index") - @Log(title = "部门-列表", businessType = BusinessType.GET) + @Log(title = "部门-列表", businessType = BusinessTypeConstant.GET) public JsonResponse index() { HashMap data = new HashMap<>(); data.put("departments", departmentService.groupByParent()); @@ -72,42 +77,42 @@ public class DepartmentController { } @GetMapping("/departments") - @Log(title = "部门-全部部门", businessType = BusinessType.GET) + @Log(title = "部门-全部部门", businessType = BusinessTypeConstant.GET) public JsonResponse index( @RequestParam(name = "parent_id", defaultValue = "0") Integer parentId) { List departments = departmentService.listByParentId(parentId); return JsonResponse.data(departments); } - @BackendPermissionMiddleware(slug = BPermissionConstant.DEPARTMENT_CUD) + @BackendPermission(slug = BPermissionConstant.DEPARTMENT_CUD) @GetMapping("/create") - @Log(title = "部门-新建", businessType = BusinessType.GET) + @Log(title = "部门-新建", businessType = BusinessTypeConstant.GET) public JsonResponse create() { HashMap data = new HashMap<>(); data.put("departments", departmentService.groupByParent()); return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.DEPARTMENT_CUD) + @BackendPermission(slug = BPermissionConstant.DEPARTMENT_CUD) @PostMapping("/create") - @Log(title = "部门-新建", businessType = BusinessType.INSERT) + @Log(title = "部门-新建", businessType = BusinessTypeConstant.INSERT) public JsonResponse store(@RequestBody @Validated DepartmentRequest req) throws NotFoundException { departmentService.create(req.getName(), req.getParentId(), req.getSort()); return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.DEPARTMENT_CUD) + @BackendPermission(slug = BPermissionConstant.DEPARTMENT_CUD) @GetMapping("/{id}") - @Log(title = "部门-编辑", businessType = BusinessType.GET) + @Log(title = "部门-编辑", businessType = BusinessTypeConstant.GET) public JsonResponse edit(@PathVariable Integer id) throws NotFoundException { Department department = departmentService.findOrFail(id); return JsonResponse.data(department); } - @BackendPermissionMiddleware(slug = BPermissionConstant.DEPARTMENT_CUD) + @BackendPermission(slug = BPermissionConstant.DEPARTMENT_CUD) @PutMapping("/{id}") - @Log(title = "部门-编辑", businessType = BusinessType.UPDATE) + @Log(title = "部门-编辑", businessType = BusinessTypeConstant.UPDATE) public JsonResponse update(@PathVariable Integer id, @RequestBody DepartmentRequest req) throws NotFoundException { Department department = departmentService.findOrFail(id); @@ -115,11 +120,11 @@ public class DepartmentController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.DEPARTMENT_CUD) + @BackendPermission(slug = BPermissionConstant.DEPARTMENT_CUD) @GetMapping("/{id}/destroy") - @Log(title = "部门-批量删除", businessType = BusinessType.DELETE) + @Log(title = "部门-批量删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse preDestroy(@PathVariable Integer id) { - List courseIds = departmentService.getCourseIdsByDepId(id); + List courseIds = courseDepartmentService.getCourseIdsByDepId(id); List userIds = departmentService.getUserIdsByDepId(id); HashMap data = new HashMap<>(); @@ -156,9 +161,9 @@ public class DepartmentController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.DEPARTMENT_CUD) + @BackendPermission(slug = BPermissionConstant.DEPARTMENT_CUD) @DeleteMapping("/{id}") - @Log(title = "部门-删除", businessType = BusinessType.DELETE) + @Log(title = "部门-删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroy(@PathVariable Integer id) throws NotFoundException { Department department = departmentService.findOrFail(id); departmentService.destroy(department.getId()); @@ -166,26 +171,26 @@ public class DepartmentController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.DEPARTMENT_CUD) + @BackendPermission(slug = BPermissionConstant.DEPARTMENT_CUD) @PutMapping("/update/sort") - @Log(title = "部门-更新排序", businessType = BusinessType.UPDATE) + @Log(title = "部门-更新排序", businessType = BusinessTypeConstant.UPDATE) public JsonResponse resort(@RequestBody @Validated DepartmentSortRequest req) { departmentService.resetSort(req.getIds()); return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.DEPARTMENT_CUD) + @BackendPermission(slug = BPermissionConstant.DEPARTMENT_CUD) @PutMapping("/update/parent") - @Log(title = "部门-更新父级", businessType = BusinessType.UPDATE) + @Log(title = "部门-更新父级", businessType = BusinessTypeConstant.UPDATE) public JsonResponse updateParent(@RequestBody @Validated DepartmentParentRequest req) throws NotFoundException { departmentService.changeParent(req.getId(), req.getParentId(), req.getIds()); return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.DEPARTMENT_USER_LEARN) + @BackendPermission(slug = BPermissionConstant.DEPARTMENT_USER_LEARN) @GetMapping("/{id}/users") - @Log(title = "部门-学员", businessType = BusinessType.GET) + @Log(title = "部门-学员", businessType = BusinessTypeConstant.GET) public JsonResponse users( @PathVariable(name = "id") Integer id, @RequestParam HashMap params) { Integer page = MapUtils.getInteger(params, "page", 1); diff --git a/src/main/java/xyz/playedu/api/controller/backend/LoginController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/LoginController.java similarity index 83% rename from src/main/java/xyz/playedu/api/controller/backend/LoginController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/LoginController.java index 0630fe7..a85087d 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/LoginController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/LoginController.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.api.BCtx; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.bus.BackendBus; -import xyz.playedu.api.config.PlayEduConfig; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.AdminUser; +import xyz.playedu.common.context.BCtx; +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.domain.AdminUser; import xyz.playedu.api.event.AdminUserLoginEvent; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; +import xyz.playedu.common.annotation.BackendPermission; import xyz.playedu.api.request.backend.LoginRequest; import xyz.playedu.api.request.backend.PasswordChangeRequest; -import xyz.playedu.api.service.AdminUserService; -import xyz.playedu.api.service.BackendAuthService; -import xyz.playedu.api.service.RateLimiterService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.util.HelperUtil; -import xyz.playedu.api.util.IpUtil; -import xyz.playedu.api.util.RedisUtil; -import xyz.playedu.api.util.RequestUtil; +import xyz.playedu.common.service.AdminUserService; +import xyz.playedu.common.service.BackendAuthService; +import xyz.playedu.common.service.RateLimiterService; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.common.util.HelperUtil; +import xyz.playedu.common.util.IpUtil; +import xyz.playedu.common.util.RedisUtil; +import xyz.playedu.common.util.RequestUtil; import java.util.HashMap; @@ -59,7 +59,7 @@ public class LoginController { @Autowired private PlayEduConfig playEduConfig; @PostMapping("/login") - @Log(title = "管理员-登录", businessType = BusinessType.LOGIN) + @Log(title = "管理员-登录", businessType = BusinessTypeConstant.LOGIN) public JsonResponse login(@RequestBody @Validated LoginRequest loginRequest) { AdminUser adminUser = adminUserService.findByEmail(loginRequest.email); if (adminUser == null) { @@ -103,14 +103,14 @@ public class LoginController { } @PostMapping("/logout") - @Log(title = "管理员-登出", businessType = BusinessType.LOGOUT) + @Log(title = "管理员-登出", businessType = BusinessTypeConstant.LOGOUT) public JsonResponse logout() { authService.logout(); return JsonResponse.success("success"); } @GetMapping("/detail") - @Log(title = "管理员-详情", businessType = BusinessType.GET) + @Log(title = "管理员-详情", businessType = BusinessTypeConstant.GET) public JsonResponse detail() { AdminUser user = BCtx.getAdminUser(); HashMap permissions = backendBus.adminUserPermissions(user.getId()); @@ -122,9 +122,9 @@ public class LoginController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.PASSWORD_CHANGE) + @BackendPermission(slug = BPermissionConstant.PASSWORD_CHANGE) @PutMapping("/password") - @Log(title = "管理员-密码修改", businessType = BusinessType.UPDATE) + @Log(title = "管理员-密码修改", businessType = BusinessTypeConstant.UPDATE) public JsonResponse changePassword(@RequestBody @Validated PasswordChangeRequest req) { AdminUser user = BCtx.getAdminUser(); String password = HelperUtil.MD5(req.getOldPassword() + user.getSalt()); diff --git a/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java similarity index 76% rename from src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java index c3a7e46..f7c6a72 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java @@ -20,23 +20,25 @@ import org.springframework.context.ApplicationContext; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import xyz.playedu.api.BCtx; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BackendConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.Resource; -import xyz.playedu.api.domain.ResourceCategory; +import xyz.playedu.common.context.BCtx; +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.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.api.exception.NotFoundException; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; +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.api.service.CourseService; -import xyz.playedu.api.service.ResourceCategoryService; -import xyz.playedu.api.service.ResourceService; -import xyz.playedu.api.types.JsonResponse; +import xyz.playedu.course.service.CourseService; +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; @@ -50,16 +52,20 @@ import java.util.stream.Collectors; @RequestMapping("/backend/v1/resource-category") public class ResourceCategoryController { - @Autowired private ResourceCategoryService categoryService; + @Autowired private CategoryService categoryService; @Autowired private CourseService courseService; @Autowired private ResourceService resourceService; + @Autowired private ResourceCategoryService resourceCategoryService; + + @Autowired private CourseCategoryService courseCategoryService; + @Autowired private ApplicationContext ctx; @GetMapping("/index") - @Log(title = "资源-分类-列表", businessType = BusinessType.GET) + @Log(title = "资源-分类-列表", businessType = BusinessTypeConstant.GET) public JsonResponse index() { HashMap data = new HashMap<>(); data.put("categories", categoryService.groupByParent()); @@ -67,54 +73,54 @@ public class ResourceCategoryController { } @GetMapping("/categories") - @Log(title = "资源-分类-全部分类", businessType = BusinessType.GET) + @Log(title = "资源-分类-全部分类", businessType = BusinessTypeConstant.GET) public JsonResponse index( @RequestParam(name = "parent_id", defaultValue = "0") Integer parentId) { - List categories = categoryService.listByParentId(parentId); + List categories = categoryService.listByParentId(parentId); return JsonResponse.data(categories); } @GetMapping("/create") - @Log(title = "资源-分类-新建", businessType = BusinessType.GET) + @Log(title = "资源-分类-新建", businessType = BusinessTypeConstant.GET) public JsonResponse create() { HashMap data = new HashMap<>(); data.put("categories", categoryService.groupByParent()); return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.RESOURCE_CATEGORY) + @BackendPermission(slug = BPermissionConstant.RESOURCE_CATEGORY) @PostMapping("/create") - @Log(title = "资源-分类-新建", businessType = BusinessType.INSERT) + @Log(title = "资源-分类-新建", businessType = BusinessTypeConstant.INSERT) public JsonResponse store(@RequestBody @Validated ResourceCategoryRequest req) throws NotFoundException { categoryService.create(req.getName(), req.getParentId(), req.getSort()); return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.RESOURCE_CATEGORY) + @BackendPermission(slug = BPermissionConstant.RESOURCE_CATEGORY) @GetMapping("/{id}") - @Log(title = "资源-分类-编辑", businessType = BusinessType.GET) + @Log(title = "资源-分类-编辑", businessType = BusinessTypeConstant.GET) public JsonResponse edit(@PathVariable Integer id) throws NotFoundException { - ResourceCategory category = categoryService.findOrFail(id); + Category category = categoryService.findOrFail(id); return JsonResponse.data(category); } - @BackendPermissionMiddleware(slug = BPermissionConstant.RESOURCE_CATEGORY) + @BackendPermission(slug = BPermissionConstant.RESOURCE_CATEGORY) @PutMapping("/{id}") - @Log(title = "资源-分类-编辑", businessType = BusinessType.UPDATE) + @Log(title = "资源-分类-编辑", businessType = BusinessTypeConstant.UPDATE) public JsonResponse update(@PathVariable Integer id, @RequestBody ResourceCategoryRequest req) throws NotFoundException { - ResourceCategory category = categoryService.findOrFail(id); + Category category = categoryService.findOrFail(id); categoryService.update(category, req.getName(), req.getParentId(), req.getSort()); return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.RESOURCE_CATEGORY) + @BackendPermission(slug = BPermissionConstant.RESOURCE_CATEGORY) @GetMapping("/{id}/destroy") - @Log(title = "资源-分类-批量删除", businessType = BusinessType.DELETE) + @Log(title = "资源-分类-批量删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse preDestroy(@PathVariable Integer id) { - List courseIds = categoryService.getCourseIdsById(id); - List rids = categoryService.getRidsById(id); + List courseIds = courseCategoryService.getCourseIdsByCategoryId(id); + List rids = resourceCategoryService.getRidsByCategoryId(id); HashMap data = new HashMap<>(); data.put("children", categoryService.listByParentId(id)); @@ -158,25 +164,25 @@ public class ResourceCategoryController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.RESOURCE_CATEGORY) + @BackendPermission(slug = BPermissionConstant.RESOURCE_CATEGORY) @DeleteMapping("/{id}") - @Log(title = "资源-分类-删除", businessType = BusinessType.DELETE) + @Log(title = "资源-分类-删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroy(@PathVariable Integer id) throws NotFoundException { - ResourceCategory category = categoryService.findOrFail(id); + Category category = categoryService.findOrFail(id); categoryService.deleteById(category.getId()); ctx.publishEvent(new ResourceCategoryDestroyEvent(this, BCtx.getId(), category.getId())); return JsonResponse.success(); } @PutMapping("/update/sort") - @Log(title = "资源-分类-更新排序", businessType = BusinessType.UPDATE) + @Log(title = "资源-分类-更新排序", businessType = BusinessTypeConstant.UPDATE) public JsonResponse resort(@RequestBody @Validated ResourceCategorySortRequest req) { categoryService.resetSort(req.getIds()); return JsonResponse.success(); } @PutMapping("/update/parent") - @Log(title = "资源-分类-更新父级", businessType = BusinessType.UPDATE) + @Log(title = "资源-分类-更新父级", businessType = BusinessTypeConstant.UPDATE) public JsonResponse updateParent(@RequestBody @Validated ResourceCategoryParentRequest req) throws NotFoundException { categoryService.changeParent(req.getId(), req.getParentId(), req.getIds()); diff --git a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java similarity index 86% rename from src/main/java/xyz/playedu/api/controller/backend/ResourceController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java index 5608462..c1d86ad 100644 --- a/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.api.BCtx; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.bus.BackendBus; -import xyz.playedu.api.constant.BackendConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.AdminUser; -import xyz.playedu.api.domain.Resource; -import xyz.playedu.api.domain.ResourceVideo; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.exception.ServiceException; +import xyz.playedu.common.context.BCtx; +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.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.api.service.AdminUserService; -import xyz.playedu.api.service.MinioService; -import xyz.playedu.api.service.ResourceService; -import xyz.playedu.api.service.ResourceVideoService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.types.paginate.ResourcePaginateFilter; +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 java.util.*; import java.util.stream.Collectors; @@ -61,7 +61,7 @@ public class ResourceController { @Autowired private BackendBus backendBus; @GetMapping("/index") - @Log(title = "资源-列表", businessType = BusinessType.GET) + @Log(title = "资源-列表", businessType = BusinessTypeConstant.GET) public JsonResponse index(@RequestParam HashMap params) { Integer page = MapUtils.getInteger(params, "page", 1); Integer size = MapUtils.getInteger(params, "size", 10); @@ -123,7 +123,7 @@ public class ResourceController { @DeleteMapping("/{id}") @Transactional @SneakyThrows - @Log(title = "资源-删除", businessType = BusinessType.DELETE) + @Log(title = "资源-删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroy(@PathVariable(name = "id") Integer id) throws NotFoundException { Resource resource = resourceService.findOrFail(id); @@ -146,7 +146,7 @@ public class ResourceController { @PostMapping("/destroy-multi") @SneakyThrows - @Log(title = "资源-批量列表", businessType = BusinessType.DELETE) + @Log(title = "资源-批量列表", businessType = BusinessTypeConstant.DELETE) public JsonResponse multiDestroy(@RequestBody ResourceDestroyMultiRequest req) { if (req.getIds() == null || req.getIds().size() == 0) { return JsonResponse.error("请选择需要删除的资源"); @@ -179,7 +179,7 @@ public class ResourceController { @GetMapping("/{id}") @SneakyThrows - @Log(title = "资源-编辑", businessType = BusinessType.GET) + @Log(title = "资源-编辑", businessType = BusinessTypeConstant.GET) public JsonResponse edit(@PathVariable(name = "id") Integer id) { Resource resource = resourceService.findOrFail(id); @@ -197,7 +197,7 @@ public class ResourceController { @PutMapping("/{id}") @SneakyThrows - @Log(title = "资源-编辑", businessType = BusinessType.UPDATE) + @Log(title = "资源-编辑", businessType = BusinessTypeConstant.UPDATE) public JsonResponse update( @RequestBody @Validated ResourceUpdateRequest req, @PathVariable(name = "id") Integer id) { diff --git a/src/main/java/xyz/playedu/api/controller/backend/SystemController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java similarity index 67% rename from src/main/java/xyz/playedu/api/controller/backend/SystemController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java index 13523ec..4adf74c 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/SystemController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java @@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import xyz.playedu.api.BCtx; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.constant.CConfig; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.util.RequestUtil; +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.types.JsonResponse; +import xyz.playedu.common.util.RequestUtil; import java.util.ArrayList; import java.util.HashMap; @@ -39,11 +39,11 @@ import java.util.Map; public class SystemController { @GetMapping("/config") - @Log(title = "其它-系统配置", businessType = BusinessType.GET) + @Log(title = "其它-系统配置", businessType = BusinessTypeConstant.GET) public JsonResponse config() { Map configData = BCtx.getConfig(); - String apiUrl = configData.get(CConfig.SYSTEM_API_URL); + String apiUrl = configData.get(ConfigConstant.SYSTEM_API_URL); if (apiUrl == null || apiUrl.trim().length() == 0) { apiUrl = RequestUtil.uriWithProtocol(); } else { @@ -54,18 +54,18 @@ public class SystemController { HashMap data = new HashMap<>(); - data.put(CConfig.SYSTEM_NAME, configData.get(CConfig.SYSTEM_NAME)); - data.put(CConfig.SYSTEM_LOGO, configData.get(CConfig.SYSTEM_LOGO)); - data.put(CConfig.SYSTEM_API_URL, apiUrl); - data.put(CConfig.SYSTEM_PC_URL, configData.get(CConfig.SYSTEM_PC_URL)); - data.put(CConfig.SYSTEM_H5_URL, configData.get(CConfig.SYSTEM_H5_URL)); + data.put(ConfigConstant.SYSTEM_NAME, configData.get(ConfigConstant.SYSTEM_NAME)); + data.put(ConfigConstant.SYSTEM_LOGO, configData.get(ConfigConstant.SYSTEM_LOGO)); + data.put(ConfigConstant.SYSTEM_API_URL, apiUrl); + data.put(ConfigConstant.SYSTEM_PC_URL, configData.get(ConfigConstant.SYSTEM_PC_URL)); + data.put(ConfigConstant.SYSTEM_H5_URL, configData.get(ConfigConstant.SYSTEM_H5_URL)); // 学员的默认头像 - String memberDefaultAvatar = configData.get(CConfig.MEMBER_DEFAULT_AVATAR); + String memberDefaultAvatar = configData.get(ConfigConstant.MEMBER_DEFAULT_AVATAR); if (memberDefaultAvatar == null || memberDefaultAvatar.trim().length() == 0) { - data.put(CConfig.MEMBER_DEFAULT_AVATAR, apiUrl + "/images/default_avatar.png"); + data.put(ConfigConstant.MEMBER_DEFAULT_AVATAR, apiUrl + "/images/default_avatar.png"); } else { - data.put(CConfig.MEMBER_DEFAULT_AVATAR, memberDefaultAvatar); + data.put(ConfigConstant.MEMBER_DEFAULT_AVATAR, memberDefaultAvatar); } // 内置的三个线上课封面 diff --git a/src/main/java/xyz/playedu/api/controller/backend/UploadController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UploadController.java similarity index 89% rename from src/main/java/xyz/playedu/api/controller/backend/UploadController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/UploadController.java index f65b2e4..7fa69cc 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/UploadController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UploadController.java @@ -23,18 +23,18 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import xyz.playedu.api.BCtx; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BackendConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.domain.Resource; -import xyz.playedu.api.exception.ServiceException; +import xyz.playedu.common.context.BCtx; +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.exception.ServiceException; import xyz.playedu.api.request.backend.UploadFileMergeRequest; -import xyz.playedu.api.service.MinioService; -import xyz.playedu.api.service.ResourceService; -import xyz.playedu.api.service.UploadService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.util.HelperUtil; +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.service.UploadService; import java.util.HashMap; @@ -49,7 +49,7 @@ public class UploadController { @Autowired private ResourceService resourceService; @PostMapping("/minio") - @Log(title = "上传-MinIO", businessType = BusinessType.UPLOAD) + @Log(title = "上传-MinIO", businessType = BusinessTypeConstant.UPLOAD) public JsonResponse uploadMinio( @RequestParam HashMap params, MultipartFile file) throws ServiceException { @@ -59,7 +59,7 @@ public class UploadController { } @GetMapping("/minio/upload-id") - @Log(title = "上传-MinIO-uploadId", businessType = BusinessType.UPLOAD) + @Log(title = "上传-MinIO-uploadId", businessType = BusinessTypeConstant.UPLOAD) public JsonResponse minioUploadId(@RequestParam HashMap params) { String extension = MapUtils.getString(params, "extension"); if (extension == null || extension.trim().length() == 0) { @@ -83,7 +83,7 @@ public class UploadController { } @GetMapping("/minio/pre-sign-url") - @Log(title = "上传-MinIO-签名URL", businessType = BusinessType.UPLOAD) + @Log(title = "上传-MinIO-签名URL", businessType = BusinessTypeConstant.UPLOAD) public JsonResponse minioPreSignUrl(@RequestParam HashMap params) { String uploadId = MapUtils.getString(params, "upload_id"); Integer partNumber = MapUtils.getInteger(params, "part_number"); @@ -98,7 +98,7 @@ public class UploadController { } @PostMapping("/minio/merge-file") - @Log(title = "上传-MinIO-文件合并", businessType = BusinessType.UPLOAD) + @Log(title = "上传-MinIO-文件合并", businessType = BusinessTypeConstant.UPLOAD) public JsonResponse minioMergeFile(@RequestBody @Validated UploadFileMergeRequest req) throws ServiceException { String type = BackendConstant.RESOURCE_EXT_2_TYPE.get(req.getExtension()); @@ -144,7 +144,7 @@ public class UploadController { } @GetMapping("/minio/merge") - @Log(title = "上传-MinIO-文件合并", businessType = BusinessType.UPLOAD) + @Log(title = "上传-MinIO-文件合并", businessType = BusinessTypeConstant.UPLOAD) public JsonResponse minioMerge(@RequestParam HashMap params) { String filename = MapUtils.getString(params, "filename"); String uploadId = MapUtils.getString(params, "upload_id"); diff --git a/src/main/java/xyz/playedu/api/controller/backend/UserController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UserController.java similarity index 89% rename from src/main/java/xyz/playedu/api/controller/backend/UserController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/backend/UserController.java index 8db89dc..1aa9b11 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/UserController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UserController.java @@ -28,29 +28,31 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import xyz.playedu.api.BCtx; -import xyz.playedu.api.annotation.Log; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BusinessType; -import xyz.playedu.api.constant.CConfig; -import xyz.playedu.api.constant.SystemConstant; -import xyz.playedu.api.domain.*; +import xyz.playedu.common.context.BCtx; +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.domain.*; import xyz.playedu.api.event.UserCourseHourRecordDestroyEvent; import xyz.playedu.api.event.UserCourseRecordDestroyEvent; import xyz.playedu.api.event.UserDestroyEvent; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; +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.api.service.*; -import xyz.playedu.api.service.internal.UserDepartmentService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.mapper.UserCourseHourRecordCourseCountMapper; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.types.paginate.UserCourseHourRecordPaginateFilter; -import xyz.playedu.api.types.paginate.UserCourseRecordPaginateFilter; -import xyz.playedu.api.types.paginate.UserPaginateFilter; -import xyz.playedu.api.util.HelperUtil; +import xyz.playedu.common.service.*; +import xyz.playedu.common.service.UserDepartmentService; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.common.types.mapper.UserCourseHourRecordCourseCountMapper; +import xyz.playedu.common.types.paginate.PaginationResult; +import xyz.playedu.common.types.paginate.UserCourseHourRecordPaginateFilter; +import xyz.playedu.common.types.paginate.UserCourseRecordPaginateFilter; +import xyz.playedu.common.types.paginate.UserPaginateFilter; +import xyz.playedu.common.util.HelperUtil; +import xyz.playedu.course.domain.*; +import xyz.playedu.course.service.*; import java.util.*; import java.util.stream.Collectors; @@ -85,9 +87,9 @@ public class UserController { @Autowired private ApplicationContext ctx; - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_INDEX) + @BackendPermission(slug = BPermissionConstant.USER_INDEX) @GetMapping("/index") - @Log(title = "学员-列表", businessType = BusinessType.GET) + @Log(title = "学员-列表", businessType = BusinessTypeConstant.GET) public JsonResponse index(@RequestParam HashMap params) { Integer page = MapUtils.getInteger(params, "page", 1); Integer size = MapUtils.getInteger(params, "size", 10); @@ -147,16 +149,16 @@ public class UserController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_STORE) + @BackendPermission(slug = BPermissionConstant.USER_STORE) @GetMapping("/create") - @Log(title = "学员-新建", businessType = BusinessType.GET) + @Log(title = "学员-新建", businessType = BusinessTypeConstant.GET) public JsonResponse create() { return JsonResponse.data(null); } - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_STORE) + @BackendPermission(slug = BPermissionConstant.USER_STORE) @PostMapping("/create") - @Log(title = "学员-新建", businessType = BusinessType.INSERT) + @Log(title = "学员-新建", businessType = BusinessTypeConstant.INSERT) public JsonResponse store(@RequestBody @Validated UserRequest req) { String email = req.getEmail(); if (userService.emailIsExists(email)) { @@ -176,9 +178,9 @@ public class UserController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_UPDATE) + @BackendPermission(slug = BPermissionConstant.USER_UPDATE) @GetMapping("/{id}") - @Log(title = "学员-编辑", businessType = BusinessType.GET) + @Log(title = "学员-编辑", businessType = BusinessTypeConstant.GET) public JsonResponse edit(@PathVariable(name = "id") Integer id) throws NotFoundException { User user = userService.findOrFail(id); @@ -191,10 +193,10 @@ public class UserController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_UPDATE) + @BackendPermission(slug = BPermissionConstant.USER_UPDATE) @PutMapping("/{id}") @Transactional - @Log(title = "学员-编辑", businessType = BusinessType.UPDATE) + @Log(title = "学员-编辑", businessType = BusinessTypeConstant.UPDATE) public JsonResponse update( @PathVariable(name = "id") Integer id, @RequestBody @Validated UserRequest req) throws NotFoundException { @@ -216,9 +218,9 @@ public class UserController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_DESTROY) + @BackendPermission(slug = BPermissionConstant.USER_DESTROY) @DeleteMapping("/{id}") - @Log(title = "学员-删除", businessType = BusinessType.DELETE) + @Log(title = "学员-删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroy(@PathVariable(name = "id") Integer id) throws NotFoundException { User user = userService.findOrFail(id); userService.removeById(user.getId()); @@ -228,7 +230,7 @@ public class UserController { @PostMapping("/store-batch") @Transactional - @Log(title = "学员-批量导入", businessType = BusinessType.INSERT) + @Log(title = "学员-批量导入", businessType = BusinessTypeConstant.INSERT) public JsonResponse batchStore(@RequestBody @Validated UserImportRequest req) { List users = req.getUsers(); if (users.size() == 0) { @@ -242,7 +244,7 @@ public class UserController { Integer startLine = req.getStartLine(); // 默认的学员头像 - String defaultAvatar = BCtx.getConfig().get(CConfig.MEMBER_DEFAULT_AVATAR); + String defaultAvatar = BCtx.getConfig().get(ConfigConstant.MEMBER_DEFAULT_AVATAR); List errorLines = new ArrayList<>(); errorLines.add(new String[] {"错误行", "错误信息"}); // 错误表-表头 @@ -390,10 +392,10 @@ public class UserController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_LEARN) + @BackendPermission(slug = BPermissionConstant.USER_LEARN) @GetMapping("/{id}/learn-hours") @SneakyThrows - @Log(title = "学员-已学习课时列表", businessType = BusinessType.GET) + @Log(title = "学员-已学习课时列表", businessType = BusinessTypeConstant.GET) public JsonResponse learnHours( @PathVariable(name = "id") Integer id, @RequestParam HashMap params) { Integer page = MapUtils.getInteger(params, "page", 1); @@ -427,9 +429,9 @@ public class UserController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_LEARN) + @BackendPermission(slug = BPermissionConstant.USER_LEARN) @GetMapping("/{id}/learn-courses") - @Log(title = "学员-已学习课程列表", businessType = BusinessType.GET) + @Log(title = "学员-已学习课程列表", businessType = BusinessTypeConstant.GET) public JsonResponse latestLearnCourses( @PathVariable(name = "id") Integer id, @RequestParam HashMap params) { Integer page = MapUtils.getInteger(params, "page", 1); @@ -463,9 +465,9 @@ public class UserController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_LEARN) + @BackendPermission(slug = BPermissionConstant.USER_LEARN) @GetMapping("/{id}/all-courses") - @Log(title = "学员-课程", businessType = BusinessType.GET) + @Log(title = "学员-课程", businessType = BusinessTypeConstant.GET) public JsonResponse allCourses(@PathVariable(name = "id") Integer id) { // 读取学员关联的部门 List depIds = userService.getDepIdsByUserId(id); @@ -525,10 +527,10 @@ public class UserController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_LEARN) + @BackendPermission(slug = BPermissionConstant.USER_LEARN) @GetMapping("/{id}/learn-course/{courseId}") @SneakyThrows - @Log(title = "学员-单个课程的学习记录", businessType = BusinessType.GET) + @Log(title = "学员-单个课程的学习记录", businessType = BusinessTypeConstant.GET) public JsonResponse learnCourseDetail( @PathVariable(name = "id") Integer id, @PathVariable(name = "courseId") Integer courseId) { @@ -547,10 +549,10 @@ public class UserController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_LEARN) + @BackendPermission(slug = BPermissionConstant.USER_LEARN) @GetMapping("/{id}/learn-stats") @SneakyThrows - @Log(title = "学员-学习统计", businessType = BusinessType.GET) + @Log(title = "学员-学习统计", businessType = BusinessTypeConstant.GET) public JsonResponse learn(@PathVariable(name = "id") Integer id) { // 最近一个月的每天学习时长 String todayStr = DateTime.now().toDateStr(); @@ -595,10 +597,10 @@ public class UserController { return JsonResponse.data(data); } - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_LEARN_DESTROY) + @BackendPermission(slug = BPermissionConstant.USER_LEARN_DESTROY) @DeleteMapping("/{id}/learn-course/{courseId}") @SneakyThrows - @Log(title = "学员-线上课学习记录删除", businessType = BusinessType.DELETE) + @Log(title = "学员-线上课学习记录删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroyUserCourse( @PathVariable(name = "id") Integer id, @PathVariable(name = "courseId") Integer courseId) { @@ -607,10 +609,10 @@ public class UserController { return JsonResponse.success(); } - @BackendPermissionMiddleware(slug = BPermissionConstant.USER_LEARN_DESTROY) + @BackendPermission(slug = BPermissionConstant.USER_LEARN_DESTROY) @DeleteMapping("/{id}/learn-course/{courseId}/hour/{hourId}") @SneakyThrows - @Log(title = "学员-线上课课时学习记录删除", businessType = BusinessType.DELETE) + @Log(title = "学员-线上课课时学习记录删除", businessType = BusinessTypeConstant.DELETE) public JsonResponse destroyUserHour( @PathVariable(name = "id") Integer id, @PathVariable(name = "courseId") Integer courseId, diff --git a/src/main/java/xyz/playedu/api/controller/frontend/CategoryController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/CategoryController.java similarity index 80% rename from src/main/java/xyz/playedu/api/controller/frontend/CategoryController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/frontend/CategoryController.java index 3afdaa9..f3da055 100644 --- a/src/main/java/xyz/playedu/api/controller/frontend/CategoryController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/CategoryController.java @@ -20,9 +20,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import xyz.playedu.api.domain.ResourceCategory; -import xyz.playedu.api.service.ResourceCategoryService; -import xyz.playedu.api.types.JsonResponse; +import xyz.playedu.common.domain.Category; +import xyz.playedu.common.service.CategoryService; +import xyz.playedu.common.types.JsonResponse; import java.util.HashMap; import java.util.List; @@ -32,15 +32,15 @@ import java.util.stream.Collectors; @RequestMapping("/api/v1/category") public class CategoryController { - @Autowired private ResourceCategoryService resourceCategoryService; + @Autowired private CategoryService categoryService; @GetMapping("/all") public JsonResponse all() { - List categories = resourceCategoryService.all(); + List categories = categoryService.all(); HashMap data = new HashMap<>(); data.put( "categories", - categories.stream().collect(Collectors.groupingBy(ResourceCategory::getParentId))); + categories.stream().collect(Collectors.groupingBy(Category::getParentId))); return JsonResponse.data(data); } } diff --git a/src/main/java/xyz/playedu/api/controller/frontend/CourseController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/CourseController.java similarity index 92% rename from src/main/java/xyz/playedu/api/controller/frontend/CourseController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/frontend/CourseController.java index bfe5582..9445903 100644 --- a/src/main/java/xyz/playedu/api/controller/frontend/CourseController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/CourseController.java @@ -20,14 +20,15 @@ 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.api.FCtx; -import xyz.playedu.api.domain.*; -import xyz.playedu.api.service.*; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.paginate.CoursePaginateFiler; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.util.IpUtil; +import xyz.playedu.common.context.FCtx; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.common.types.paginate.CoursePaginateFiler; +import xyz.playedu.common.types.paginate.PaginationResult; +import xyz.playedu.common.util.IpUtil; +import xyz.playedu.course.domain.*; +import xyz.playedu.course.service.*; +import xyz.playedu.resource.domain.Resource; +import xyz.playedu.resource.service.ResourceService; import java.util.Date; import java.util.HashMap; diff --git a/src/main/java/xyz/playedu/api/controller/frontend/DepartmentController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/DepartmentController.java similarity index 85% rename from src/main/java/xyz/playedu/api/controller/frontend/DepartmentController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/frontend/DepartmentController.java index 79c14aa..62c4ef3 100644 --- a/src/main/java/xyz/playedu/api/controller/frontend/DepartmentController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/DepartmentController.java @@ -18,15 +18,15 @@ 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; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.common.types.paginate.CoursePaginateFiler; +import xyz.playedu.common.types.paginate.PaginationResult; +import xyz.playedu.course.domain.Course; +import xyz.playedu.course.service.CourseService; -import xyz.playedu.api.domain.Course; -import xyz.playedu.api.domain.Department; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.service.CourseService; -import xyz.playedu.api.service.DepartmentService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.paginate.CoursePaginateFiler; -import xyz.playedu.api.types.paginate.PaginationResult; import java.util.HashMap; import java.util.stream.Collectors; diff --git a/src/main/java/xyz/playedu/api/controller/frontend/HourController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/HourController.java similarity index 68% rename from src/main/java/xyz/playedu/api/controller/frontend/HourController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/frontend/HourController.java index 2c1c958..d056e49 100644 --- a/src/main/java/xyz/playedu/api/controller/frontend/HourController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/HourController.java @@ -18,21 +18,28 @@ package xyz.playedu.api.controller.frontend; import lombok.SneakyThrows; 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.FCtx; -import xyz.playedu.api.bus.UserBus; -import xyz.playedu.api.caches.CourseCache; -import xyz.playedu.api.caches.UserCanSeeCourseCache; -import xyz.playedu.api.domain.*; +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.api.service.CourseHourService; -import xyz.playedu.api.service.CourseService; -import xyz.playedu.api.service.ResourceService; -import xyz.playedu.api.service.UserCourseHourRecordService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.util.RedisDistributedLock; +import xyz.playedu.common.context.FCtx; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.common.util.RedisDistributedLock; +import xyz.playedu.course.caches.UserLastLearnTimeCache; +import xyz.playedu.course.domain.Course; +import xyz.playedu.course.domain.CourseHour; +import xyz.playedu.course.domain.UserCourseHourRecord; +import xyz.playedu.course.service.CourseHourService; +import xyz.playedu.course.service.CourseService; +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; @@ -62,6 +69,10 @@ public class HourController { @Autowired private RedisDistributedLock redisDistributedLock; + @Autowired private UserLastLearnTimeCache userLastLearnTimeCache; + + @Autowired private ApplicationContext ctx; + @GetMapping("/{id}") @SneakyThrows public JsonResponse detail( @@ -124,11 +135,16 @@ public class HourController { return JsonResponse.error("请稍后再试"); } - userCourseHourRecordService.storeOrUpdate( - FCtx.getId(), course.getId(), hour.getId(), duration, hour.getDuration()); - - // 此处未考虑上面代码执行失败释放锁 - redisDistributedLock.releaseLock(lockKey); + try { + 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())); + } + } finally { + // 此处未考虑上面代码执行失败释放锁 + redisDistributedLock.releaseLock(lockKey); + } return JsonResponse.success(); } @@ -149,10 +165,25 @@ public class HourController { return JsonResponse.error("请稍后再试"); } - userBus.userLearnDurationRecord(FCtx.getUser(), course, hour); + try { + Long curTime = System.currentTimeMillis(); - // 此处未考虑上面代码执行失败释放锁 - redisDistributedLock.releaseLock(lockKey); + // 最近一次学习时间 + Long lastTime = userLastLearnTimeCache.get(FCtx.getId()); + // 最大周期为10s+0.5s的网络延迟 + if (lastTime == null || curTime - lastTime > 10500) { + lastTime = curTime - 10000; + } + + userLastLearnTimeCache.put(FCtx.getId(), curTime); + + ctx.publishEvent( + new UserLearnCourseUpdateEvent( + this, FCtx.getId(), course.getId(), hour.getId(), lastTime, curTime)); + } finally { + // 此处未考虑上面代码执行失败释放锁 + redisDistributedLock.releaseLock(lockKey); + } return JsonResponse.success(); } diff --git a/src/main/java/xyz/playedu/api/controller/frontend/IndexController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/IndexController.java similarity index 100% rename from src/main/java/xyz/playedu/api/controller/frontend/IndexController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/frontend/IndexController.java diff --git a/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java similarity index 86% rename from src/main/java/xyz/playedu/api/controller/frontend/LoginController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java index 3c0f56f..372be8a 100644 --- a/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java @@ -22,22 +22,22 @@ 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.FCtx; -import xyz.playedu.api.config.PlayEduConfig; -import xyz.playedu.api.domain.User; import xyz.playedu.api.event.UserLoginEvent; import xyz.playedu.api.event.UserLogoutEvent; -import xyz.playedu.api.exception.LimitException; import xyz.playedu.api.request.frontend.LoginPasswordRequest; -import xyz.playedu.api.service.FrontendAuthService; -import xyz.playedu.api.service.RateLimiterService; -import xyz.playedu.api.service.UserService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.util.HelperUtil; -import xyz.playedu.api.util.IpUtil; -import xyz.playedu.api.util.RedisUtil; -import xyz.playedu.api.util.RequestUtil; +import xyz.playedu.common.context.FCtx; +import xyz.playedu.common.config.PlayEduConfig; +import xyz.playedu.common.domain.User; +import xyz.playedu.common.exception.LimitException; +import xyz.playedu.common.service.FrontendAuthService; +import xyz.playedu.common.service.RateLimiterService; +import xyz.playedu.common.service.UserService; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.common.util.HelperUtil; +import xyz.playedu.common.util.IpUtil; +import xyz.playedu.common.util.RedisUtil; +import xyz.playedu.common.util.RequestUtil; + import java.util.HashMap; diff --git a/src/main/java/xyz/playedu/api/controller/frontend/SystemController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/SystemController.java similarity index 78% rename from src/main/java/xyz/playedu/api/controller/frontend/SystemController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/frontend/SystemController.java index 49c5d36..ad75f7c 100644 --- a/src/main/java/xyz/playedu/api/controller/frontend/SystemController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/SystemController.java @@ -19,10 +19,10 @@ 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 xyz.playedu.api.constant.CConfig; -import xyz.playedu.api.service.AppConfigService; -import xyz.playedu.api.types.JsonResponse; import java.util.HashMap; import java.util.Map; @@ -39,11 +39,11 @@ public class SystemController { HashMap data = new HashMap<>(); - data.put("system-name", configs.get(CConfig.SYSTEM_NAME)); - data.put("system-logo", configs.get(CConfig.SYSTEM_LOGO)); - data.put("system-api-url", configs.get(CConfig.SYSTEM_API_URL)); - data.put("system-pc-url", configs.get(CConfig.SYSTEM_PC_URL)); - data.put("system-h5-url", configs.get(CConfig.SYSTEM_H5_URL)); + data.put("system-name", configs.get(ConfigConstant.SYSTEM_NAME)); + data.put("system-logo", configs.get(ConfigConstant.SYSTEM_LOGO)); + data.put("system-api-url", configs.get(ConfigConstant.SYSTEM_API_URL)); + data.put("system-pc-url", configs.get(ConfigConstant.SYSTEM_PC_URL)); + data.put("system-h5-url", configs.get(ConfigConstant.SYSTEM_H5_URL)); data.put("system-pc-index-footer-msg", configs.get("system.pc_index_footer_msg")); data.put("player-poster", configs.get("player.poster")); diff --git a/src/main/java/xyz/playedu/api/controller/frontend/UserController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/UserController.java similarity index 94% rename from src/main/java/xyz/playedu/api/controller/frontend/UserController.java rename to playedu-api/src/main/java/xyz/playedu/api/controller/frontend/UserController.java index 8acf4f1..6a2867d 100644 --- a/src/main/java/xyz/playedu/api/controller/frontend/UserController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/UserController.java @@ -22,17 +22,21 @@ 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.FCtx; -import xyz.playedu.api.constant.FrontendConstant; -import xyz.playedu.api.domain.*; -import xyz.playedu.api.exception.ServiceException; import xyz.playedu.api.request.frontend.ChangePasswordRequest; -import xyz.playedu.api.service.*; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.mapper.UserCourseHourRecordCourseCountMapper; -import xyz.playedu.api.types.response.UserLatestLearn; -import xyz.playedu.api.util.PrivacyUtil; +import xyz.playedu.common.context.FCtx; +import xyz.playedu.common.constant.FrontendConstant; +import xyz.playedu.common.domain.Department; +import xyz.playedu.common.domain.User; +import xyz.playedu.common.domain.UserUploadImageLog; +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.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/src/main/java/xyz/playedu/api/event/AdminUserLoginEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/AdminUserLoginEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/AdminUserLoginEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/AdminUserLoginEvent.java diff --git a/src/main/java/xyz/playedu/api/event/CourseCategoryDestroyEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/CourseCategoryDestroyEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/CourseCategoryDestroyEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/CourseCategoryDestroyEvent.java diff --git a/src/main/java/xyz/playedu/api/event/CourseChapterDestroyEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/CourseChapterDestroyEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/CourseChapterDestroyEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/CourseChapterDestroyEvent.java diff --git a/src/main/java/xyz/playedu/api/event/CourseDestroyEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/CourseDestroyEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/CourseDestroyEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/CourseDestroyEvent.java diff --git a/src/main/java/xyz/playedu/api/event/CourseHourCreatedEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/CourseHourCreatedEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/CourseHourCreatedEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/CourseHourCreatedEvent.java diff --git a/src/main/java/xyz/playedu/api/event/CourseHourDestroyEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/CourseHourDestroyEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/CourseHourDestroyEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/CourseHourDestroyEvent.java diff --git a/src/main/java/xyz/playedu/api/event/DepartmentDestroyEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/DepartmentDestroyEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/DepartmentDestroyEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/DepartmentDestroyEvent.java diff --git a/src/main/java/xyz/playedu/api/event/ResourceCategoryDestroyEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/ResourceCategoryDestroyEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/ResourceCategoryDestroyEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/ResourceCategoryDestroyEvent.java diff --git a/src/main/java/xyz/playedu/api/event/UserCourseHourFinishedEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/UserCourseHourFinishedEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/UserCourseHourFinishedEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/UserCourseHourFinishedEvent.java diff --git a/src/main/java/xyz/playedu/api/event/UserCourseHourRecordDestroyEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/UserCourseHourRecordDestroyEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/UserCourseHourRecordDestroyEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/UserCourseHourRecordDestroyEvent.java diff --git a/src/main/java/xyz/playedu/api/event/UserCourseRecordDestroyEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/UserCourseRecordDestroyEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/UserCourseRecordDestroyEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/UserCourseRecordDestroyEvent.java diff --git a/src/main/java/xyz/playedu/api/event/UserDestroyEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/UserDestroyEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/UserDestroyEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/UserDestroyEvent.java diff --git a/src/main/java/xyz/playedu/api/event/UserLearnCourseUpdateEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/UserLearnCourseUpdateEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/UserLearnCourseUpdateEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/UserLearnCourseUpdateEvent.java diff --git a/src/main/java/xyz/playedu/api/event/UserLoginEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/UserLoginEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/UserLoginEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/UserLoginEvent.java diff --git a/src/main/java/xyz/playedu/api/event/UserLogoutEvent.java b/playedu-api/src/main/java/xyz/playedu/api/event/UserLogoutEvent.java similarity index 100% rename from src/main/java/xyz/playedu/api/event/UserLogoutEvent.java rename to playedu-api/src/main/java/xyz/playedu/api/event/UserLogoutEvent.java diff --git a/src/main/java/xyz/playedu/api/listener/AdminUserLoginListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/AdminUserLoginListener.java similarity index 93% rename from src/main/java/xyz/playedu/api/listener/AdminUserLoginListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/AdminUserLoginListener.java index 72ce4f5..daa898e 100644 --- a/src/main/java/xyz/playedu/api/listener/AdminUserLoginListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/AdminUserLoginListener.java @@ -21,9 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; -import xyz.playedu.api.domain.AdminUser; +import xyz.playedu.common.domain.AdminUser; import xyz.playedu.api.event.AdminUserLoginEvent; -import xyz.playedu.api.service.AdminUserService; +import xyz.playedu.common.service.AdminUserService; @Component @Slf4j diff --git a/src/main/java/xyz/playedu/api/listener/CourseCategoryDestroyListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/CourseCategoryDestroyListener.java similarity index 96% rename from src/main/java/xyz/playedu/api/listener/CourseCategoryDestroyListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/CourseCategoryDestroyListener.java index 8ecbcce..a3e5ce2 100644 --- a/src/main/java/xyz/playedu/api/listener/CourseCategoryDestroyListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/CourseCategoryDestroyListener.java @@ -20,7 +20,7 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import xyz.playedu.api.event.CourseCategoryDestroyEvent; -import xyz.playedu.api.service.CourseService; +import xyz.playedu.course.service.CourseService; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/listener/CourseChapterDestroyListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/CourseChapterDestroyListener.java similarity index 95% rename from src/main/java/xyz/playedu/api/listener/CourseChapterDestroyListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/CourseChapterDestroyListener.java index e508d04..0b61720 100644 --- a/src/main/java/xyz/playedu/api/listener/CourseChapterDestroyListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/CourseChapterDestroyListener.java @@ -20,7 +20,7 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import xyz.playedu.api.event.CourseChapterDestroyEvent; -import xyz.playedu.api.service.CourseHourService; +import xyz.playedu.course.service.CourseHourService; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/listener/CourseDestroyListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/CourseDestroyListener.java similarity index 84% rename from src/main/java/xyz/playedu/api/listener/CourseDestroyListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/CourseDestroyListener.java index c9ece1e..a8447aa 100644 --- a/src/main/java/xyz/playedu/api/listener/CourseDestroyListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/CourseDestroyListener.java @@ -20,11 +20,11 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import xyz.playedu.api.event.CourseDestroyEvent; -import xyz.playedu.api.service.CourseAttachmentService; -import xyz.playedu.api.service.CourseDepartmentService; -import xyz.playedu.api.service.UserCourseHourRecordService; -import xyz.playedu.api.service.UserCourseRecordService; -import xyz.playedu.api.service.internal.ResourceCourseCategoryService; +import xyz.playedu.course.service.CourseAttachmentService; +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 杭州白书科技有限公司 @@ -36,7 +36,7 @@ public class CourseDestroyListener { @Autowired private CourseDepartmentService courseDepartmentService; - @Autowired private ResourceCourseCategoryService courseCategoryService; + @Autowired private CourseCategoryService courseCategoryService; @Autowired private UserCourseRecordService userCourseRecordService; diff --git a/src/main/java/xyz/playedu/api/listener/CourseHourCreatedListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/CourseHourCreatedListener.java similarity index 93% rename from src/main/java/xyz/playedu/api/listener/CourseHourCreatedListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/CourseHourCreatedListener.java index a91d993..af0ebb0 100644 --- a/src/main/java/xyz/playedu/api/listener/CourseHourCreatedListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/CourseHourCreatedListener.java @@ -20,8 +20,8 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import xyz.playedu.api.event.CourseHourCreatedEvent; -import xyz.playedu.api.service.CourseHourService; -import xyz.playedu.api.service.CourseService; +import xyz.playedu.course.service.CourseHourService; +import xyz.playedu.course.service.CourseService; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/listener/CourseHourDestroyListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/CourseHourDestroyListener.java similarity index 93% rename from src/main/java/xyz/playedu/api/listener/CourseHourDestroyListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/CourseHourDestroyListener.java index fddc721..37dfd0b 100644 --- a/src/main/java/xyz/playedu/api/listener/CourseHourDestroyListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/CourseHourDestroyListener.java @@ -20,8 +20,8 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import xyz.playedu.api.event.CourseHourDestroyEvent; -import xyz.playedu.api.service.CourseHourService; -import xyz.playedu.api.service.CourseService; +import xyz.playedu.course.service.CourseHourService; +import xyz.playedu.course.service.CourseService; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/listener/DepartmentDestroyListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/DepartmentDestroyListener.java similarity index 95% rename from src/main/java/xyz/playedu/api/listener/DepartmentDestroyListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/DepartmentDestroyListener.java index 1bf3c12..1eae3f6 100644 --- a/src/main/java/xyz/playedu/api/listener/DepartmentDestroyListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/DepartmentDestroyListener.java @@ -20,7 +20,7 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import xyz.playedu.api.event.DepartmentDestroyEvent; -import xyz.playedu.api.service.DepartmentService; +import xyz.playedu.common.service.DepartmentService; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/listener/UserCourseHourFinishedListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourFinishedListener.java similarity index 90% rename from src/main/java/xyz/playedu/api/listener/UserCourseHourFinishedListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourFinishedListener.java index 6dcfcea..e0d6088 100644 --- a/src/main/java/xyz/playedu/api/listener/UserCourseHourFinishedListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourFinishedListener.java @@ -20,9 +20,9 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import xyz.playedu.api.event.UserCourseHourFinishedEvent; -import xyz.playedu.api.service.CourseHourService; -import xyz.playedu.api.service.UserCourseHourRecordService; -import xyz.playedu.api.service.UserCourseRecordService; +import xyz.playedu.course.service.CourseHourService; +import xyz.playedu.course.service.UserCourseHourRecordService; +import xyz.playedu.course.service.UserCourseRecordService; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/listener/UserCourseHourRecordDestroyListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourRecordDestroyListener.java similarity index 95% rename from src/main/java/xyz/playedu/api/listener/UserCourseHourRecordDestroyListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourRecordDestroyListener.java index 5fb1351..002794e 100644 --- a/src/main/java/xyz/playedu/api/listener/UserCourseHourRecordDestroyListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourRecordDestroyListener.java @@ -22,7 +22,7 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import xyz.playedu.api.event.UserCourseHourRecordDestroyEvent; -import xyz.playedu.api.service.UserCourseRecordService; +import xyz.playedu.course.service.UserCourseRecordService; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/listener/UserCourseRecordDestroyListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseRecordDestroyListener.java similarity index 95% rename from src/main/java/xyz/playedu/api/listener/UserCourseRecordDestroyListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseRecordDestroyListener.java index 6721d03..b2c7c7d 100644 --- a/src/main/java/xyz/playedu/api/listener/UserCourseRecordDestroyListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseRecordDestroyListener.java @@ -20,7 +20,7 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import xyz.playedu.api.event.UserCourseRecordDestroyEvent; -import xyz.playedu.api.service.UserCourseHourRecordService; +import xyz.playedu.course.service.UserCourseHourRecordService; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/listener/UserDestroyListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/UserDestroyListener.java similarity index 84% rename from src/main/java/xyz/playedu/api/listener/UserDestroyListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/UserDestroyListener.java index 8ef78a4..dd8a95c 100644 --- a/src/main/java/xyz/playedu/api/listener/UserDestroyListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/UserDestroyListener.java @@ -22,7 +22,12 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import xyz.playedu.api.event.UserDestroyEvent; -import xyz.playedu.api.service.*; +import xyz.playedu.common.service.UserLoginRecordService; +import xyz.playedu.common.service.UserService; +import xyz.playedu.course.service.UserCourseHourRecordService; +import xyz.playedu.course.service.UserCourseRecordService; +import xyz.playedu.course.service.UserLearnDurationRecordService; +import xyz.playedu.course.service.UserLearnDurationStatsService; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/listener/UserLearnCourseUpdateListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/UserLearnCourseUpdateListener.java similarity index 92% rename from src/main/java/xyz/playedu/api/listener/UserLearnCourseUpdateListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/UserLearnCourseUpdateListener.java index 88b828b..b43c02a 100644 --- a/src/main/java/xyz/playedu/api/listener/UserLearnCourseUpdateListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/UserLearnCourseUpdateListener.java @@ -22,8 +22,8 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import xyz.playedu.api.event.UserLearnCourseUpdateEvent; -import xyz.playedu.api.service.UserLearnDurationRecordService; -import xyz.playedu.api.service.UserLearnDurationStatsService; +import xyz.playedu.course.service.UserLearnDurationRecordService; +import xyz.playedu.course.service.UserLearnDurationStatsService; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/listener/UserLoginListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/UserLoginListener.java similarity index 92% rename from src/main/java/xyz/playedu/api/listener/UserLoginListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/UserLoginListener.java index 7ad380a..89c2479 100644 --- a/src/main/java/xyz/playedu/api/listener/UserLoginListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/UserLoginListener.java @@ -23,9 +23,9 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import xyz.playedu.api.event.UserLoginEvent; -import xyz.playedu.api.service.FrontendAuthService; -import xyz.playedu.api.service.UserLoginRecordService; -import xyz.playedu.api.util.IpUtil; +import xyz.playedu.common.service.FrontendAuthService; +import xyz.playedu.common.service.UserLoginRecordService; +import xyz.playedu.common.util.IpUtil; import java.util.HashMap; diff --git a/src/main/java/xyz/playedu/api/listener/UserLogoutListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/UserLogoutListener.java similarity index 95% rename from src/main/java/xyz/playedu/api/listener/UserLogoutListener.java rename to playedu-api/src/main/java/xyz/playedu/api/listener/UserLogoutListener.java index 11a08fe..e2b9e4a 100644 --- a/src/main/java/xyz/playedu/api/listener/UserLogoutListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/UserLogoutListener.java @@ -23,7 +23,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import xyz.playedu.api.event.UserLogoutEvent; -import xyz.playedu.api.service.UserLoginRecordService; +import xyz.playedu.common.service.UserLoginRecordService; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/request/backend/AdminRoleRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/AdminRoleRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/AdminRoleRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/AdminRoleRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/AdminUserRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/AdminUserRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/AdminUserRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/AdminUserRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/AppConfigRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/AppConfigRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/AppConfigRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/AppConfigRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/CourseAttachmentMultiRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseAttachmentMultiRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/CourseAttachmentMultiRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseAttachmentMultiRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/CourseAttachmentRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseAttachmentRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/CourseAttachmentRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseAttachmentRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/CourseAttachmentSortRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseAttachmentSortRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/CourseAttachmentSortRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseAttachmentSortRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/CourseCategoryRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseCategoryRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/CourseCategoryRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseCategoryRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/CourseChapterRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseChapterRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/CourseChapterRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseChapterRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/CourseChapterSortRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseChapterSortRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/CourseChapterSortRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseChapterSortRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/CourseHourMultiRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseHourMultiRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/CourseHourMultiRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseHourMultiRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/CourseHourRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseHourRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/CourseHourRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseHourRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/CourseHourSortRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseHourSortRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/CourseHourSortRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseHourSortRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/CourseRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/CourseRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/CourseUserDestroyRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseUserDestroyRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/CourseUserDestroyRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseUserDestroyRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/DepartmentParentRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/DepartmentParentRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/DepartmentParentRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/DepartmentParentRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/DepartmentRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/DepartmentRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/DepartmentRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/DepartmentRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/DepartmentSortRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/DepartmentSortRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/DepartmentSortRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/DepartmentSortRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/LoginRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/LoginRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/LoginRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/LoginRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/PasswordChangeRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/PasswordChangeRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/PasswordChangeRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/PasswordChangeRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryChangeRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryChangeRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/ResourceCategoryChangeRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryChangeRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryParentRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryParentRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/ResourceCategoryParentRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryParentRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/ResourceCategoryRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/ResourceCategorySortRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceCategorySortRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/ResourceCategorySortRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceCategorySortRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/ResourceDestroyMultiRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceDestroyMultiRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/ResourceDestroyMultiRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceDestroyMultiRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/ResourceRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/ResourceRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/ResourceUpdateRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceUpdateRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/ResourceUpdateRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceUpdateRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/UploadFileMergeRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/UploadFileMergeRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/UploadFileMergeRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/UploadFileMergeRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/UserImportRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/UserImportRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/UserImportRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/UserImportRequest.java diff --git a/src/main/java/xyz/playedu/api/request/backend/UserRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/backend/UserRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/backend/UserRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/backend/UserRequest.java diff --git a/src/main/java/xyz/playedu/api/request/frontend/ChangePasswordRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/frontend/ChangePasswordRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/frontend/ChangePasswordRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/frontend/ChangePasswordRequest.java diff --git a/src/main/java/xyz/playedu/api/request/frontend/CourseHourRecordRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/frontend/CourseHourRecordRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/frontend/CourseHourRecordRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/frontend/CourseHourRecordRequest.java diff --git a/src/main/java/xyz/playedu/api/request/frontend/LoginPasswordRequest.java b/playedu-api/src/main/java/xyz/playedu/api/request/frontend/LoginPasswordRequest.java similarity index 100% rename from src/main/java/xyz/playedu/api/request/frontend/LoginPasswordRequest.java rename to playedu-api/src/main/java/xyz/playedu/api/request/frontend/LoginPasswordRequest.java diff --git a/src/main/resources/application.yml b/playedu-api/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to playedu-api/src/main/resources/application.yml diff --git a/src/main/resources/static/images/courses/thumb1.png b/playedu-api/src/main/resources/static/images/courses/thumb1.png similarity index 100% rename from src/main/resources/static/images/courses/thumb1.png rename to playedu-api/src/main/resources/static/images/courses/thumb1.png diff --git a/src/main/resources/static/images/courses/thumb2.png b/playedu-api/src/main/resources/static/images/courses/thumb2.png similarity index 100% rename from src/main/resources/static/images/courses/thumb2.png rename to playedu-api/src/main/resources/static/images/courses/thumb2.png diff --git a/src/main/resources/static/images/courses/thumb3.png b/playedu-api/src/main/resources/static/images/courses/thumb3.png similarity index 100% rename from src/main/resources/static/images/courses/thumb3.png rename to playedu-api/src/main/resources/static/images/courses/thumb3.png diff --git a/src/main/resources/static/images/default_avatar.png b/playedu-api/src/main/resources/static/images/default_avatar.png similarity index 100% rename from src/main/resources/static/images/default_avatar.png rename to playedu-api/src/main/resources/static/images/default_avatar.png diff --git a/playedu-common/pom.xml b/playedu-common/pom.xml new file mode 100644 index 0000000..7a09466 --- /dev/null +++ b/playedu-common/pom.xml @@ -0,0 +1,13 @@ + + + 4.0.0 + + xyz.playedu + playedu + 1.2 + + + playedu-common + \ No newline at end of file diff --git a/src/main/java/xyz/playedu/api/middleware/BackendPermissionMiddleware.java b/playedu-common/src/main/java/xyz/playedu/common/annotation/BackendPermission.java similarity index 90% rename from src/main/java/xyz/playedu/api/middleware/BackendPermissionMiddleware.java rename to playedu-common/src/main/java/xyz/playedu/common/annotation/BackendPermission.java index 92aea9a..4164924 100644 --- a/src/main/java/xyz/playedu/api/middleware/BackendPermissionMiddleware.java +++ b/playedu-common/src/main/java/xyz/playedu/common/annotation/BackendPermission.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.middleware; +package xyz.playedu.common.annotation; import java.lang.annotation.*; @Documented @Target({ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) -public @interface BackendPermissionMiddleware { +public @interface BackendPermission { String slug() default ""; } diff --git a/src/main/java/xyz/playedu/api/middleware/Lock.java b/playedu-common/src/main/java/xyz/playedu/common/annotation/Lock.java similarity index 96% rename from src/main/java/xyz/playedu/api/middleware/Lock.java rename to playedu-common/src/main/java/xyz/playedu/common/annotation/Lock.java index a309560..8bce329 100644 --- a/src/main/java/xyz/playedu/api/middleware/Lock.java +++ b/playedu-common/src/main/java/xyz/playedu/common/annotation/Lock.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.middleware; +package xyz.playedu.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/xyz/playedu/api/annotation/Log.java b/playedu-common/src/main/java/xyz/playedu/common/annotation/Log.java similarity index 82% rename from src/main/java/xyz/playedu/api/annotation/Log.java rename to playedu-common/src/main/java/xyz/playedu/common/annotation/Log.java index 948f35a..78821aa 100644 --- a/src/main/java/xyz/playedu/api/annotation/Log.java +++ b/playedu-common/src/main/java/xyz/playedu/common/annotation/Log.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.annotation; +package xyz.playedu.common.annotation; -import xyz.playedu.api.constant.BusinessType; +import xyz.playedu.common.constant.BusinessTypeConstant; import java.lang.annotation.*; @@ -27,5 +27,5 @@ public @interface Log { public String title() default ""; /** 功能 */ - public BusinessType businessType() default BusinessType.OTHER; + public BusinessTypeConstant businessType() default BusinessTypeConstant.OTHER; } diff --git a/src/main/java/xyz/playedu/api/bus/BackendBus.java b/playedu-common/src/main/java/xyz/playedu/common/bus/BackendBus.java similarity index 90% rename from src/main/java/xyz/playedu/api/bus/BackendBus.java rename to playedu-common/src/main/java/xyz/playedu/common/bus/BackendBus.java index 15019e5..8d33207 100644 --- a/src/main/java/xyz/playedu/api/bus/BackendBus.java +++ b/playedu-common/src/main/java/xyz/playedu/common/bus/BackendBus.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.bus; +package xyz.playedu.common.bus; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import xyz.playedu.api.BCtx; -import xyz.playedu.api.constant.BackendConstant; -import xyz.playedu.api.domain.AdminRole; -import xyz.playedu.api.service.AdminPermissionService; -import xyz.playedu.api.service.AdminRoleService; -import xyz.playedu.api.service.AdminUserService; -import xyz.playedu.api.util.PrivacyUtil; +import xyz.playedu.common.context.BCtx; +import xyz.playedu.common.constant.BackendConstant; +import xyz.playedu.common.domain.AdminRole; +import xyz.playedu.common.service.AdminPermissionService; +import xyz.playedu.common.service.AdminRoleService; +import xyz.playedu.common.service.AdminUserService; +import xyz.playedu.common.util.PrivacyUtil; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/config/AuthConfig.java b/playedu-common/src/main/java/xyz/playedu/common/config/AuthConfig.java similarity index 96% rename from src/main/java/xyz/playedu/api/config/AuthConfig.java rename to playedu-common/src/main/java/xyz/playedu/common/config/AuthConfig.java index 66ce28d..57a320d 100644 --- a/src/main/java/xyz/playedu/api/config/AuthConfig.java +++ b/playedu-common/src/main/java/xyz/playedu/common/config/AuthConfig.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.config; +package xyz.playedu.common.config; import lombok.Data; - import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/xyz/playedu/api/config/MybatisPlusConfig.java b/playedu-common/src/main/java/xyz/playedu/common/config/MybatisPlusConfig.java similarity index 97% rename from src/main/java/xyz/playedu/api/config/MybatisPlusConfig.java rename to playedu-common/src/main/java/xyz/playedu/common/config/MybatisPlusConfig.java index 6fcc0ad..251ab05 100644 --- a/src/main/java/xyz/playedu/api/config/MybatisPlusConfig.java +++ b/playedu-common/src/main/java/xyz/playedu/common/config/MybatisPlusConfig.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.config; +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/src/main/java/xyz/playedu/api/config/PlayEduConfig.java b/playedu-common/src/main/java/xyz/playedu/common/config/PlayEduConfig.java similarity index 96% rename from src/main/java/xyz/playedu/api/config/PlayEduConfig.java rename to playedu-common/src/main/java/xyz/playedu/common/config/PlayEduConfig.java index 4e8f15b..fedea41 100644 --- a/src/main/java/xyz/playedu/api/config/PlayEduConfig.java +++ b/playedu-common/src/main/java/xyz/playedu/common/config/PlayEduConfig.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.config; +package xyz.playedu.common.config; import lombok.Data; - import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/xyz/playedu/api/vendor/PlayEduMinioClient.java b/playedu-common/src/main/java/xyz/playedu/common/config/PlayEduMinioClientConfig.java similarity index 91% rename from src/main/java/xyz/playedu/api/vendor/PlayEduMinioClient.java rename to playedu-common/src/main/java/xyz/playedu/common/config/PlayEduMinioClientConfig.java index 4a8f9ae..f48e8ed 100644 --- a/src/main/java/xyz/playedu/api/vendor/PlayEduMinioClient.java +++ b/playedu-common/src/main/java/xyz/playedu/common/config/PlayEduMinioClientConfig.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.vendor; +package xyz.playedu.common.config; import io.minio.CreateMultipartUploadResponse; import io.minio.ListPartsResponse; import io.minio.MinioAsyncClient; import io.minio.messages.Part; - import lombok.SneakyThrows; import java.util.List; @@ -29,8 +28,8 @@ import java.util.List; * * @create 2023/3/6 16:12 */ -public class PlayEduMinioClient extends MinioAsyncClient { - public PlayEduMinioClient(MinioAsyncClient client) { +public class PlayEduMinioClientConfig extends MinioAsyncClient { + public PlayEduMinioClientConfig(MinioAsyncClient client) { super(client); } diff --git a/src/main/java/xyz/playedu/api/config/RedisConfig.java b/playedu-common/src/main/java/xyz/playedu/common/config/RedisConfig.java similarity index 98% rename from src/main/java/xyz/playedu/api/config/RedisConfig.java rename to playedu-common/src/main/java/xyz/playedu/common/config/RedisConfig.java index cbcc1d6..35e8a58 100644 --- a/src/main/java/xyz/playedu/api/config/RedisConfig.java +++ b/playedu-common/src/main/java/xyz/playedu/common/config/RedisConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.config; +package xyz.playedu.common.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/xyz/playedu/api/config/SaTokenConfigure.java b/playedu-common/src/main/java/xyz/playedu/common/config/SaTokenConfig.java similarity index 93% rename from src/main/java/xyz/playedu/api/config/SaTokenConfigure.java rename to playedu-common/src/main/java/xyz/playedu/common/config/SaTokenConfig.java index cad6c62..6444e04 100644 --- a/src/main/java/xyz/playedu/api/config/SaTokenConfigure.java +++ b/playedu-common/src/main/java/xyz/playedu/common/config/SaTokenConfig.java @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.config; +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; @Configuration -public class SaTokenConfigure { +public class SaTokenConfig { // Sa-Token 整合 jwt (Simple 简单模式) @Bean public StpLogic getStpLogicJwt() { diff --git a/src/main/java/xyz/playedu/api/config/UniqueNameGenerator.java b/playedu-common/src/main/java/xyz/playedu/common/config/UniqueNameGeneratorConfig.java similarity index 90% rename from src/main/java/xyz/playedu/api/config/UniqueNameGenerator.java rename to playedu-common/src/main/java/xyz/playedu/common/config/UniqueNameGeneratorConfig.java index 4c08869..dc24aed 100644 --- a/src/main/java/xyz/playedu/api/config/UniqueNameGenerator.java +++ b/playedu-common/src/main/java/xyz/playedu/common/config/UniqueNameGeneratorConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.config; +package xyz.playedu.common.config; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionRegistry; @@ -24,7 +24,7 @@ import org.springframework.context.annotation.AnnotationBeanNameGenerator; * * @create 2023/3/2 21:53 */ -public class UniqueNameGenerator extends AnnotationBeanNameGenerator { +public class UniqueNameGeneratorConfig extends AnnotationBeanNameGenerator { @Override public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) { return definition.getBeanClassName(); diff --git a/src/main/java/xyz/playedu/api/constant/BPermissionConstant.java b/playedu-common/src/main/java/xyz/playedu/common/constant/BPermissionConstant.java similarity index 98% rename from src/main/java/xyz/playedu/api/constant/BPermissionConstant.java rename to playedu-common/src/main/java/xyz/playedu/common/constant/BPermissionConstant.java index a4e3a7f..31f8d74 100644 --- a/src/main/java/xyz/playedu/api/constant/BPermissionConstant.java +++ b/playedu-common/src/main/java/xyz/playedu/common/constant/BPermissionConstant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.constant; +package xyz.playedu.common.constant; public class BPermissionConstant { diff --git a/src/main/java/xyz/playedu/api/constant/BackendConstant.java b/playedu-common/src/main/java/xyz/playedu/common/constant/BackendConstant.java similarity index 99% rename from src/main/java/xyz/playedu/api/constant/BackendConstant.java rename to playedu-common/src/main/java/xyz/playedu/common/constant/BackendConstant.java index 1701091..24de46d 100644 --- a/src/main/java/xyz/playedu/api/constant/BackendConstant.java +++ b/playedu-common/src/main/java/xyz/playedu/common/constant/BackendConstant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.constant; +package xyz.playedu.common.constant; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/xyz/playedu/api/constant/BusinessType.java b/playedu-common/src/main/java/xyz/playedu/common/constant/BusinessTypeConstant.java similarity index 92% rename from src/main/java/xyz/playedu/api/constant/BusinessType.java rename to playedu-common/src/main/java/xyz/playedu/common/constant/BusinessTypeConstant.java index 1f46c6c..7a8aff3 100644 --- a/src/main/java/xyz/playedu/api/constant/BusinessType.java +++ b/playedu-common/src/main/java/xyz/playedu/common/constant/BusinessTypeConstant.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.constant; +package xyz.playedu.common.constant; -public enum BusinessType { +public enum BusinessTypeConstant { /** 其它 */ OTHER, diff --git a/src/main/java/xyz/playedu/api/constant/CConfig.java b/playedu-common/src/main/java/xyz/playedu/common/constant/ConfigConstant.java similarity index 95% rename from src/main/java/xyz/playedu/api/constant/CConfig.java rename to playedu-common/src/main/java/xyz/playedu/common/constant/ConfigConstant.java index 750b388..42ae992 100644 --- a/src/main/java/xyz/playedu/api/constant/CConfig.java +++ b/playedu-common/src/main/java/xyz/playedu/common/constant/ConfigConstant.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.constant; +package xyz.playedu.common.constant; /** * @Author 杭州白书科技有限公司 * * @create 2023/4/11 10:12 */ -public class CConfig { +public class ConfigConstant { public static final String SYSTEM_NAME = "system.name"; public static final String SYSTEM_LOGO = "system.logo"; diff --git a/src/main/java/xyz/playedu/api/constant/FrontendConstant.java b/playedu-common/src/main/java/xyz/playedu/common/constant/FrontendConstant.java similarity index 97% rename from src/main/java/xyz/playedu/api/constant/FrontendConstant.java rename to playedu-common/src/main/java/xyz/playedu/common/constant/FrontendConstant.java index 3bf18d3..05788b3 100644 --- a/src/main/java/xyz/playedu/api/constant/FrontendConstant.java +++ b/playedu-common/src/main/java/xyz/playedu/common/constant/FrontendConstant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.constant; +package xyz.playedu.common.constant; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/constant/SystemConstant.java b/playedu-common/src/main/java/xyz/playedu/common/constant/SystemConstant.java similarity index 97% rename from src/main/java/xyz/playedu/api/constant/SystemConstant.java rename to playedu-common/src/main/java/xyz/playedu/common/constant/SystemConstant.java index f80125f..765e5c7 100644 --- a/src/main/java/xyz/playedu/api/constant/SystemConstant.java +++ b/playedu-common/src/main/java/xyz/playedu/common/constant/SystemConstant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.constant; +package xyz.playedu.common.constant; public class SystemConstant { diff --git a/src/main/java/xyz/playedu/api/BCtx.java b/playedu-common/src/main/java/xyz/playedu/common/context/BCtx.java similarity index 92% rename from src/main/java/xyz/playedu/api/BCtx.java rename to playedu-common/src/main/java/xyz/playedu/common/context/BCtx.java index cf3c057..e826238 100644 --- a/src/main/java/xyz/playedu/api/BCtx.java +++ b/playedu-common/src/main/java/xyz/playedu/common/context/BCtx.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api; +package xyz.playedu.common.context; -import xyz.playedu.api.domain.AdminUser; +import xyz.playedu.common.domain.AdminUser; import java.util.HashMap; import java.util.LinkedHashMap; @@ -23,8 +23,8 @@ import java.util.Map; public class BCtx { - private static final java.lang.ThreadLocal> THREAD_LOCAL = - new java.lang.ThreadLocal<>(); + private static final ThreadLocal> THREAD_LOCAL = + new ThreadLocal<>(); public static final String KEY_ADMIN_USER_ID = "admin_id"; public static final String KEY_ADMIN_USER = "admin_user"; diff --git a/src/main/java/xyz/playedu/api/FCtx.java b/playedu-common/src/main/java/xyz/playedu/common/context/FCtx.java similarity index 90% rename from src/main/java/xyz/playedu/api/FCtx.java rename to playedu-common/src/main/java/xyz/playedu/common/context/FCtx.java index dc9188c..28aca14 100644 --- a/src/main/java/xyz/playedu/api/FCtx.java +++ b/playedu-common/src/main/java/xyz/playedu/common/context/FCtx.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api; +package xyz.playedu.common.context; -import xyz.playedu.api.domain.User; +import xyz.playedu.common.domain.User; import java.util.LinkedHashMap; public class FCtx { - private static final java.lang.ThreadLocal> THREAD_LOCAL = - new java.lang.ThreadLocal<>(); + private static final ThreadLocal> THREAD_LOCAL = + new ThreadLocal<>(); private static final String KEY_USER_ID = "user_id"; private static final String KEY_USER = "user"; diff --git a/src/main/java/xyz/playedu/api/domain/AdminLog.java b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminLog.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/AdminLog.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/AdminLog.java index 953ab22..6a0cd1d 100644 --- a/src/main/java/xyz/playedu/api/domain/AdminLog.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminLog.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; 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 com.fasterxml.jackson.annotation.JsonProperty; - import lombok.Data; import java.io.Serializable; diff --git a/src/main/java/xyz/playedu/api/domain/AdminPermission.java b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminPermission.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/AdminPermission.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/AdminPermission.java index 902ebcf..4321435 100644 --- a/src/main/java/xyz/playedu/api/domain/AdminPermission.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminPermission.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/xyz/playedu/api/domain/AdminRole.java b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminRole.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/AdminRole.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/AdminRole.java index 7f0f926..7ee85a8 100644 --- a/src/main/java/xyz/playedu/api/domain/AdminRole.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminRole.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/xyz/playedu/api/domain/AdminRolePermission.java b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminRolePermission.java similarity index 98% rename from src/main/java/xyz/playedu/api/domain/AdminRolePermission.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/AdminRolePermission.java index e8fe3b3..e027152 100644 --- a/src/main/java/xyz/playedu/api/domain/AdminRolePermission.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminRolePermission.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/xyz/playedu/api/domain/AdminUser.java b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminUser.java similarity index 97% rename from src/main/java/xyz/playedu/api/domain/AdminUser.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/AdminUser.java index b370643..f30156a 100644 --- a/src/main/java/xyz/playedu/api/domain/AdminUser.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminUser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -25,10 +25,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.extern.slf4j.Slf4j; - -import xyz.playedu.api.bus.BackendBus; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BackendConstant; +import xyz.playedu.common.bus.BackendBus; +import xyz.playedu.common.constant.BPermissionConstant; +import xyz.playedu.common.constant.BackendConstant; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/xyz/playedu/api/domain/AdminUserRole.java b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminUserRole.java similarity index 98% rename from src/main/java/xyz/playedu/api/domain/AdminUserRole.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/AdminUserRole.java index b35c8a2..dd24ade 100644 --- a/src/main/java/xyz/playedu/api/domain/AdminUserRole.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/AdminUserRole.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/xyz/playedu/api/domain/AppConfig.java b/playedu-common/src/main/java/xyz/playedu/common/domain/AppConfig.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/AppConfig.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/AppConfig.java index 69a450b..32e6066 100644 --- a/src/main/java/xyz/playedu/api/domain/AppConfig.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/AppConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/xyz/playedu/api/domain/ResourceCategory.java b/playedu-common/src/main/java/xyz/playedu/common/domain/Category.java similarity index 96% rename from src/main/java/xyz/playedu/api/domain/ResourceCategory.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/Category.java index 4a601c6..684ec35 100644 --- a/src/main/java/xyz/playedu/api/domain/ResourceCategory.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/Category.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -32,7 +32,7 @@ import java.util.Date; */ @TableName(value = "resource_categories") @Data -public class ResourceCategory implements Serializable { +public class Category implements Serializable { /** */ @TableId(type = IdType.AUTO) private Integer id; @@ -71,7 +71,7 @@ public class ResourceCategory implements Serializable { if (getClass() != that.getClass()) { return false; } - ResourceCategory other = (ResourceCategory) that; + Category other = (Category) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getParentId() == null ? other.getParentId() == null diff --git a/src/main/java/xyz/playedu/api/domain/Department.java b/playedu-common/src/main/java/xyz/playedu/common/domain/Department.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/Department.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/Department.java index 412bdaa..791335d 100644 --- a/src/main/java/xyz/playedu/api/domain/Department.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/Department.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/xyz/playedu/api/domain/User.java b/playedu-common/src/main/java/xyz/playedu/common/domain/User.java similarity index 98% rename from src/main/java/xyz/playedu/api/domain/User.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/User.java index 7c3b986..4885427 100644 --- a/src/main/java/xyz/playedu/api/domain/User.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/User.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -24,10 +24,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; - -import xyz.playedu.api.bus.BackendBus; -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.constant.BackendConstant; +import xyz.playedu.common.bus.BackendBus; +import xyz.playedu.common.constant.BPermissionConstant; +import xyz.playedu.common.constant.BackendConstant; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/xyz/playedu/api/domain/UserDepartment.java b/playedu-common/src/main/java/xyz/playedu/common/domain/UserDepartment.java similarity index 98% rename from src/main/java/xyz/playedu/api/domain/UserDepartment.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/UserDepartment.java index 2c736b1..aac2003 100644 --- a/src/main/java/xyz/playedu/api/domain/UserDepartment.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/UserDepartment.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/xyz/playedu/api/domain/UserLoginRecord.java b/playedu-common/src/main/java/xyz/playedu/common/domain/UserLoginRecord.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/UserLoginRecord.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/UserLoginRecord.java index d95ad27..d5a7d3f 100644 --- a/src/main/java/xyz/playedu/api/domain/UserLoginRecord.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/UserLoginRecord.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; 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/src/main/java/xyz/playedu/api/domain/UserUploadImageLog.java b/playedu-common/src/main/java/xyz/playedu/common/domain/UserUploadImageLog.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/UserUploadImageLog.java rename to playedu-common/src/main/java/xyz/playedu/common/domain/UserUploadImageLog.java index 392c6bd..064e7dd 100644 --- a/src/main/java/xyz/playedu/api/domain/UserUploadImageLog.java +++ b/playedu-common/src/main/java/xyz/playedu/common/domain/UserUploadImageLog.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.common.domain; 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 com.fasterxml.jackson.annotation.JsonProperty; - import lombok.Data; import java.io.Serializable; diff --git a/src/main/java/xyz/playedu/api/exception/LimitException.java b/playedu-common/src/main/java/xyz/playedu/common/exception/LimitException.java similarity index 97% rename from src/main/java/xyz/playedu/api/exception/LimitException.java rename to playedu-common/src/main/java/xyz/playedu/common/exception/LimitException.java index be9069d..c2a4cb7 100644 --- a/src/main/java/xyz/playedu/api/exception/LimitException.java +++ b/playedu-common/src/main/java/xyz/playedu/common/exception/LimitException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.exception; +package xyz.playedu.common.exception; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/exception/NotFoundException.java b/playedu-common/src/main/java/xyz/playedu/common/exception/NotFoundException.java similarity index 97% rename from src/main/java/xyz/playedu/api/exception/NotFoundException.java rename to playedu-common/src/main/java/xyz/playedu/common/exception/NotFoundException.java index 55ef707..adb9dfb 100644 --- a/src/main/java/xyz/playedu/api/exception/NotFoundException.java +++ b/playedu-common/src/main/java/xyz/playedu/common/exception/NotFoundException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.exception; +package xyz.playedu.common.exception; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/exception/ServiceException.java b/playedu-common/src/main/java/xyz/playedu/common/exception/ServiceException.java similarity index 96% rename from src/main/java/xyz/playedu/api/exception/ServiceException.java rename to playedu-common/src/main/java/xyz/playedu/common/exception/ServiceException.java index 53da30f..e000724 100644 --- a/src/main/java/xyz/playedu/api/exception/ServiceException.java +++ b/playedu-common/src/main/java/xyz/playedu/common/exception/ServiceException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.exception; +package xyz.playedu.common.exception; public class ServiceException extends Exception { public ServiceException() {} diff --git a/src/main/java/xyz/playedu/api/mapper/AdminLogMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/AdminLogMapper.java similarity index 83% rename from src/main/java/xyz/playedu/api/mapper/AdminLogMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/AdminLogMapper.java index d60713c..ff9e907 100644 --- a/src/main/java/xyz/playedu/api/mapper/AdminLogMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/AdminLogMapper.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.AdminLog; -import xyz.playedu.api.types.paginate.AdminLogPaginateFiler; +import xyz.playedu.common.domain.AdminLog; +import xyz.playedu.common.types.paginate.AdminLogPaginateFiler; import java.util.List; /** * @author tengteng * @description 针对表【admin_logs】的数据库操作Mapper - * @createDate 2023-02-17 15:40:31 @Entity xyz.playedu.api.domain.AdminLog + * @createDate 2023-02-17 15:40:31 */ @Mapper public interface AdminLogMapper extends BaseMapper { diff --git a/src/main/java/xyz/playedu/api/mapper/AdminPermissionMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/AdminPermissionMapper.java similarity index 84% rename from src/main/java/xyz/playedu/api/mapper/AdminPermissionMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/AdminPermissionMapper.java index 82fa850..f9399b2 100644 --- a/src/main/java/xyz/playedu/api/mapper/AdminPermissionMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/AdminPermissionMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.AdminPermission; +import xyz.playedu.common.domain.AdminPermission; /** * @author tengteng * @description 针对表【admin_permissions】的数据库操作Mapper - * @createDate 2023-02-21 15:37:02 @Entity xyz.playedu.api.domain.AdminPermission + * @createDate 2023-02-21 15:37:02 */ @Mapper public interface AdminPermissionMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/AdminRoleMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/AdminRoleMapper.java similarity index 85% rename from src/main/java/xyz/playedu/api/mapper/AdminRoleMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/AdminRoleMapper.java index b2d37b1..162757c 100644 --- a/src/main/java/xyz/playedu/api/mapper/AdminRoleMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/AdminRoleMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.AdminRole; +import xyz.playedu.common.domain.AdminRole; /** * @author tengteng * @description 针对表【admin_roles】的数据库操作Mapper - * @createDate 2023-02-21 15:53:27 @Entity xyz.playedu.api.domain.AdminRole + * @createDate 2023-02-21 15:53:27 */ @Mapper public interface AdminRoleMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/AdminRolePermissionMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/AdminRolePermissionMapper.java similarity index 84% rename from src/main/java/xyz/playedu/api/mapper/AdminRolePermissionMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/AdminRolePermissionMapper.java index b7a2a43..4ce7795 100644 --- a/src/main/java/xyz/playedu/api/mapper/AdminRolePermissionMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/AdminRolePermissionMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.AdminRolePermission; +import xyz.playedu.common.domain.AdminRolePermission; /** * @author tengteng * @description 针对表【admin_role_permission】的数据库操作Mapper - * @createDate 2023-02-21 16:07:01 @Entity xyz.playedu.api.domain.AdminRolePermission + * @createDate 2023-02-21 16:07:01 */ @Mapper public interface AdminRolePermissionMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/AdminUserMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/AdminUserMapper.java similarity index 85% rename from src/main/java/xyz/playedu/api/mapper/AdminUserMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/AdminUserMapper.java index 453cf4d..a5569e2 100644 --- a/src/main/java/xyz/playedu/api/mapper/AdminUserMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/AdminUserMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.AdminUser; +import xyz.playedu.common.domain.AdminUser; @Mapper /** * @author tengteng * @description 针对表【admin_users】的数据库操作Mapper - * @createDate 2023-02-11 10:58:52 @Entity xyz.playedu.api.domain.AdminUser + * @createDate 2023-02-11 10:58:52 */ public interface AdminUserMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/AdminUserRoleMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/AdminUserRoleMapper.java similarity index 85% rename from src/main/java/xyz/playedu/api/mapper/AdminUserRoleMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/AdminUserRoleMapper.java index 1a4a02c..43adf66 100644 --- a/src/main/java/xyz/playedu/api/mapper/AdminUserRoleMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/AdminUserRoleMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.AdminUserRole; +import xyz.playedu.common.domain.AdminUserRole; /** * @author tengteng * @description 针对表【admin_user_role】的数据库操作Mapper - * @createDate 2023-02-21 16:25:43 @Entity xyz.playedu.api.domain.AdminUserRole + * @createDate 2023-02-21 16:25:43 */ @Mapper public interface AdminUserRoleMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/AppConfigMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/AppConfigMapper.java similarity index 85% rename from src/main/java/xyz/playedu/api/mapper/AppConfigMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/AppConfigMapper.java index ed52a14..bbf5bd9 100644 --- a/src/main/java/xyz/playedu/api/mapper/AppConfigMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/AppConfigMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.AppConfig; +import xyz.playedu.common.domain.AppConfig; /** * @author tengteng * @description 针对表【app_config】的数据库操作Mapper - * @createDate 2023-03-09 13:55:39 @Entity xyz.playedu.api.domain.AppConfig + * @createDate 2023-03-09 13:55:39 */ @Mapper public interface AppConfigMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/ResourceCourseCategoryMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/CategoryMapper.java similarity index 68% rename from src/main/java/xyz/playedu/api/mapper/ResourceCourseCategoryMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/CategoryMapper.java index 2fc4746..fa534c4 100644 --- a/src/main/java/xyz/playedu/api/mapper/ResourceCourseCategoryMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/CategoryMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.ResourceCourseCategory; +import xyz.playedu.common.domain.Category; /** * @author tengteng - * @description 针对表【resource_course_category】的数据库操作Mapper - * @createDate 2023-03-09 09:54:22 @Entity xyz.playedu.api.domain.ResourceCourseCategory + * @description 针对表【resource_categories】的数据库操作Mapper + * @createDate 2023-03-08 16:50:54 */ @Mapper -public interface ResourceCourseCategoryMapper extends BaseMapper {} +public interface CategoryMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/DepartmentMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/DepartmentMapper.java similarity index 82% rename from src/main/java/xyz/playedu/api/mapper/DepartmentMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/DepartmentMapper.java index 2257bb0..a9f06bd 100644 --- a/src/main/java/xyz/playedu/api/mapper/DepartmentMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/DepartmentMapper.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.Department; -import xyz.playedu.api.types.mapper.DepartmentsUserCountMapRes; +import xyz.playedu.common.domain.Department; +import xyz.playedu.common.types.mapper.DepartmentsUserCountMapRes; import java.util.List; /** * @author tengteng * @description 针对表【departments】的数据库操作Mapper - * @createDate 2023-02-19 12:19:45 @Entity xyz.playedu.api.domain.Department + * @createDate 2023-02-19 12:19:45 */ @Mapper public interface DepartmentMapper extends BaseMapper { diff --git a/src/main/java/xyz/playedu/api/mapper/UserDepartmentMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/UserDepartmentMapper.java similarity index 85% rename from src/main/java/xyz/playedu/api/mapper/UserDepartmentMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/UserDepartmentMapper.java index 65028b2..da20975 100644 --- a/src/main/java/xyz/playedu/api/mapper/UserDepartmentMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/UserDepartmentMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.UserDepartment; +import xyz.playedu.common.domain.UserDepartment; /** * @author tengteng * @description 针对表【user_department】的数据库操作Mapper - * @createDate 2023-02-23 15:08:38 @Entity xyz.playedu.api.domain.UserDepartment + * @createDate 2023-02-23 15:08:38 */ @Mapper public interface UserDepartmentMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/UserLoginRecordMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/UserLoginRecordMapper.java similarity index 84% rename from src/main/java/xyz/playedu/api/mapper/UserLoginRecordMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/UserLoginRecordMapper.java index 5cdb973..b4ea1d1 100644 --- a/src/main/java/xyz/playedu/api/mapper/UserLoginRecordMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/UserLoginRecordMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.UserLoginRecord; +import xyz.playedu.common.domain.UserLoginRecord; /** * @author tengteng * @description 针对表【user_login_records】的数据库操作Mapper - * @createDate 2023-03-10 14:06:55 @Entity xyz.playedu.api.domain.UserLoginRecord + * @createDate 2023-03-10 14:06:55 */ @Mapper public interface UserLoginRecordMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/UserMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/UserMapper.java similarity index 83% rename from src/main/java/xyz/playedu/api/mapper/UserMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/UserMapper.java index f97c021..3f14e13 100644 --- a/src/main/java/xyz/playedu/api/mapper/UserMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/UserMapper.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.User; -import xyz.playedu.api.types.paginate.UserPaginateFilter; +import xyz.playedu.common.domain.User; +import xyz.playedu.common.types.paginate.UserPaginateFilter; import java.util.List; /** * @author tengteng * @description 针对表【users】的数据库操作Mapper - * @createDate 2023-03-20 13:37:33 @Entity xyz.playedu.api.domain.User + * @createDate 2023-03-20 13:37:33 */ @Mapper public interface UserMapper extends BaseMapper { diff --git a/src/main/java/xyz/playedu/api/mapper/UserUploadImageLogMapper.java b/playedu-common/src/main/java/xyz/playedu/common/mapper/UserUploadImageLogMapper.java similarity index 84% rename from src/main/java/xyz/playedu/api/mapper/UserUploadImageLogMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/mapper/UserUploadImageLogMapper.java index 5ea3a97..6cd7dc8 100644 --- a/src/main/java/xyz/playedu/api/mapper/UserUploadImageLogMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/mapper/UserUploadImageLogMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.UserUploadImageLog; +import xyz.playedu.common.domain.UserUploadImageLog; /** * @author tengteng * @description 针对表【user_upload_image_logs】的数据库操作Mapper - * @createDate 2023-03-24 14:32:48 @Entity xyz.playedu.api.domain.UserUploadImageLog + * @createDate 2023-03-24 14:32:48 */ @Mapper public interface UserUploadImageLogMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/service/AdminLogService.java b/playedu-common/src/main/java/xyz/playedu/common/service/AdminLogService.java similarity index 79% rename from src/main/java/xyz/playedu/api/service/AdminLogService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/AdminLogService.java index 0b35ed7..07d8b93 100644 --- a/src/main/java/xyz/playedu/api/service/AdminLogService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/AdminLogService.java @@ -13,22 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; - -import org.springframework.stereotype.Service; - -import xyz.playedu.api.domain.AdminLog; -import xyz.playedu.api.types.paginate.AdminLogPaginateFiler; -import xyz.playedu.api.types.paginate.PaginationResult; +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 */ -@Service + public interface AdminLogService extends IService { PaginationResult paginate(int page, int size, AdminLogPaginateFiler filter); } diff --git a/src/main/java/xyz/playedu/api/service/AdminPermissionService.java b/playedu-common/src/main/java/xyz/playedu/common/service/AdminPermissionService.java similarity index 93% rename from src/main/java/xyz/playedu/api/service/AdminPermissionService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/AdminPermissionService.java index 75a57fb..2eb8cc9 100644 --- a/src/main/java/xyz/playedu/api/service/AdminPermissionService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/AdminPermissionService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.AdminPermission; +import xyz.playedu.common.domain.AdminPermission; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/internal/AdminRolePermissionService.java b/playedu-common/src/main/java/xyz/playedu/common/service/AdminRolePermissionService.java similarity index 90% rename from src/main/java/xyz/playedu/api/service/internal/AdminRolePermissionService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/AdminRolePermissionService.java index 9144406..a4639e3 100644 --- a/src/main/java/xyz/playedu/api/service/internal/AdminRolePermissionService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/AdminRolePermissionService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.internal; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.AdminRolePermission; +import xyz.playedu.common.domain.AdminRolePermission; /** * @author tengteng diff --git a/src/main/java/xyz/playedu/api/service/AdminRoleService.java b/playedu-common/src/main/java/xyz/playedu/common/service/AdminRoleService.java similarity index 91% rename from src/main/java/xyz/playedu/api/service/AdminRoleService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/AdminRoleService.java index 4d168c0..b9b415b 100644 --- a/src/main/java/xyz/playedu/api/service/AdminRoleService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/AdminRoleService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.AdminRole; -import xyz.playedu.api.exception.NotFoundException; +import xyz.playedu.common.domain.AdminRole; +import xyz.playedu.common.exception.NotFoundException; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/internal/AdminUserRoleService.java b/playedu-common/src/main/java/xyz/playedu/common/service/AdminUserRoleService.java similarity index 91% rename from src/main/java/xyz/playedu/api/service/internal/AdminUserRoleService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/AdminUserRoleService.java index a13a3bd..22ca247 100644 --- a/src/main/java/xyz/playedu/api/service/internal/AdminUserRoleService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/AdminUserRoleService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.internal; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.AdminUserRole; +import xyz.playedu.common.domain.AdminUserRole; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/AdminUserService.java b/playedu-common/src/main/java/xyz/playedu/common/service/AdminUserService.java similarity index 86% rename from src/main/java/xyz/playedu/api/service/AdminUserService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/AdminUserService.java index 599220d..17bae01 100644 --- a/src/main/java/xyz/playedu/api/service/AdminUserService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/AdminUserService.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.AdminUser; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.exception.ServiceException; -import xyz.playedu.api.types.paginate.AdminUserPaginateFilter; -import xyz.playedu.api.types.paginate.PaginationResult; +import xyz.playedu.common.domain.AdminUser; +import xyz.playedu.common.exception.NotFoundException; +import xyz.playedu.common.exception.ServiceException; +import xyz.playedu.common.types.paginate.AdminUserPaginateFilter; +import xyz.playedu.common.types.paginate.PaginationResult; import java.util.List; import java.util.Map; diff --git a/src/main/java/xyz/playedu/api/service/AppConfigService.java b/playedu-common/src/main/java/xyz/playedu/common/service/AppConfigService.java similarity index 88% rename from src/main/java/xyz/playedu/api/service/AppConfigService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/AppConfigService.java index a2d7ec7..a1f8370 100644 --- a/src/main/java/xyz/playedu/api/service/AppConfigService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/AppConfigService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.AppConfig; -import xyz.playedu.api.types.config.MinioConfig; +import xyz.playedu.common.domain.AppConfig; +import xyz.playedu.common.types.config.MinioConfig; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/AuthService.java b/playedu-common/src/main/java/xyz/playedu/common/service/AuthService.java similarity index 96% rename from src/main/java/xyz/playedu/api/service/AuthService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/AuthService.java index c3d13c1..fde169d 100644 --- a/src/main/java/xyz/playedu/api/service/AuthService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/AuthService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import java.util.HashMap; diff --git a/src/main/java/xyz/playedu/api/service/BackendAuthService.java b/playedu-common/src/main/java/xyz/playedu/common/service/BackendAuthService.java similarity index 96% rename from src/main/java/xyz/playedu/api/service/BackendAuthService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/BackendAuthService.java index 0c6e688..dace22b 100644 --- a/src/main/java/xyz/playedu/api/service/BackendAuthService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/BackendAuthService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import java.util.HashMap; diff --git a/src/main/java/xyz/playedu/api/service/ResourceCategoryService.java b/playedu-common/src/main/java/xyz/playedu/common/service/CategoryService.java similarity index 66% rename from src/main/java/xyz/playedu/api/service/ResourceCategoryService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/CategoryService.java index 69f7c91..29bd45a 100644 --- a/src/main/java/xyz/playedu/api/service/ResourceCategoryService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/CategoryService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.ResourceCategory; -import xyz.playedu.api.exception.NotFoundException; +import xyz.playedu.common.domain.Category; +import xyz.playedu.common.exception.NotFoundException; import java.util.List; import java.util.Map; @@ -28,34 +28,30 @@ import java.util.Map; * @description 针对表【resource_categories】的数据库操作Service * @createDate 2023-02-23 09:50:18 */ -public interface ResourceCategoryService extends IService { +public interface CategoryService extends IService { - List listByParentId(Integer id); + List listByParentId(Integer id); - List all(); + List all(); - ResourceCategory findOrFail(Integer id) throws NotFoundException; + Category findOrFail(Integer id) throws NotFoundException; void deleteById(Integer id) throws NotFoundException; - void update(ResourceCategory category, String name, Integer parentId, Integer sort) + void update(Category category, String name, Integer parentId, Integer sort) throws NotFoundException; void create(String name, Integer parentId, Integer sort) throws NotFoundException; - String childrenParentChain(ResourceCategory category); + String childrenParentChain(Category category); String compParentChain(Integer parentId) throws NotFoundException; - List getCourseIdsById(Integer id); - - List getRidsById(Integer id); - void resetSort(List ids); void changeParent(Integer id, Integer parentId, List ids) throws NotFoundException; - Map> groupByParent(); + Map> groupByParent(); Map id2name(); diff --git a/src/main/java/xyz/playedu/api/service/DepartmentService.java b/playedu-common/src/main/java/xyz/playedu/common/service/DepartmentService.java similarity index 91% rename from src/main/java/xyz/playedu/api/service/DepartmentService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/DepartmentService.java index 963d492..b50606f 100644 --- a/src/main/java/xyz/playedu/api/service/DepartmentService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/DepartmentService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.Department; -import xyz.playedu.api.exception.NotFoundException; +import xyz.playedu.common.domain.Department; +import xyz.playedu.common.exception.NotFoundException; import java.util.List; import java.util.Map; @@ -51,8 +51,6 @@ public interface DepartmentService extends IService { List getUserIdsByDepId(Integer depId); - List getCourseIdsByDepId(Integer depId); - void changeParent(Integer id, Integer parentId, List ids) throws NotFoundException; void resetSort(List ids); diff --git a/src/main/java/xyz/playedu/api/service/FrontendAuthService.java b/playedu-common/src/main/java/xyz/playedu/common/service/FrontendAuthService.java similarity index 96% rename from src/main/java/xyz/playedu/api/service/FrontendAuthService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/FrontendAuthService.java index 9a6111e..13feb27 100644 --- a/src/main/java/xyz/playedu/api/service/FrontendAuthService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/FrontendAuthService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import java.util.HashMap; diff --git a/src/main/java/xyz/playedu/api/service/MinioService.java b/playedu-common/src/main/java/xyz/playedu/common/service/MinioService.java similarity index 97% rename from src/main/java/xyz/playedu/api/service/MinioService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/MinioService.java index 8bd0eb7..bc196e1 100644 --- a/src/main/java/xyz/playedu/api/service/MinioService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/MinioService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/xyz/playedu/api/service/RateLimiterService.java b/playedu-common/src/main/java/xyz/playedu/common/service/RateLimiterService.java similarity index 95% rename from src/main/java/xyz/playedu/api/service/RateLimiterService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/RateLimiterService.java index 16d3097..3e918f0 100644 --- a/src/main/java/xyz/playedu/api/service/RateLimiterService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/RateLimiterService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; public interface RateLimiterService { diff --git a/src/main/java/xyz/playedu/api/service/internal/UserDepartmentService.java b/playedu-common/src/main/java/xyz/playedu/common/service/UserDepartmentService.java similarity index 92% rename from src/main/java/xyz/playedu/api/service/internal/UserDepartmentService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/UserDepartmentService.java index 382560d..b624c34 100644 --- a/src/main/java/xyz/playedu/api/service/internal/UserDepartmentService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/UserDepartmentService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.internal; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.UserDepartment; +import xyz.playedu.common.domain.UserDepartment; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/UserLoginRecordService.java b/playedu-common/src/main/java/xyz/playedu/common/service/UserLoginRecordService.java similarity index 92% rename from src/main/java/xyz/playedu/api/service/UserLoginRecordService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/UserLoginRecordService.java index d3acfb4..149242f 100644 --- a/src/main/java/xyz/playedu/api/service/UserLoginRecordService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/UserLoginRecordService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.UserLoginRecord; +import xyz.playedu.common.domain.UserLoginRecord; public interface UserLoginRecordService extends IService { UserLoginRecord store( diff --git a/src/main/java/xyz/playedu/api/service/UserService.java b/playedu-common/src/main/java/xyz/playedu/common/service/UserService.java similarity index 87% rename from src/main/java/xyz/playedu/api/service/UserService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/UserService.java index 25d984d..1b200ed 100644 --- a/src/main/java/xyz/playedu/api/service/UserService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/UserService.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.User; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.exception.ServiceException; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.types.paginate.UserPaginateFilter; +import xyz.playedu.common.domain.User; +import xyz.playedu.common.exception.NotFoundException; +import xyz.playedu.common.exception.ServiceException; +import xyz.playedu.common.types.paginate.PaginationResult; +import xyz.playedu.common.types.paginate.UserPaginateFilter; import java.util.List; import java.util.Map; diff --git a/src/main/java/xyz/playedu/api/service/UserUploadImageLogService.java b/playedu-common/src/main/java/xyz/playedu/common/service/UserUploadImageLogService.java similarity index 91% rename from src/main/java/xyz/playedu/api/service/UserUploadImageLogService.java rename to playedu-common/src/main/java/xyz/playedu/common/service/UserUploadImageLogService.java index c96fc35..860d918 100644 --- a/src/main/java/xyz/playedu/api/service/UserUploadImageLogService.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/UserUploadImageLogService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.UserUploadImageLog; +import xyz.playedu.common.domain.UserUploadImageLog; /** * @author tengteng diff --git a/src/main/java/xyz/playedu/api/service/impl/AdminLogServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminLogServiceImpl.java similarity index 82% rename from src/main/java/xyz/playedu/api/service/impl/AdminLogServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminLogServiceImpl.java index 81f39b3..411efe8 100644 --- a/src/main/java/xyz/playedu/api/service/impl/AdminLogServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminLogServiceImpl.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.AdminLog; -import xyz.playedu.api.mapper.AdminLogMapper; -import xyz.playedu.api.service.AdminLogService; -import xyz.playedu.api.types.paginate.AdminLogPaginateFiler; -import xyz.playedu.api.types.paginate.PaginationResult; +import xyz.playedu.common.domain.AdminLog; +import xyz.playedu.common.mapper.AdminLogMapper; +import xyz.playedu.common.service.AdminLogService; +import xyz.playedu.common.types.paginate.AdminLogPaginateFiler; +import xyz.playedu.common.types.paginate.PaginationResult; /** * @author tengteng diff --git a/src/main/java/xyz/playedu/api/service/impl/AdminPermissionServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminPermissionServiceImpl.java similarity index 92% rename from src/main/java/xyz/playedu/api/service/impl/AdminPermissionServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminPermissionServiceImpl.java index b4dbfda..d88a557 100644 --- a/src/main/java/xyz/playedu/api/service/impl/AdminPermissionServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminPermissionServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.AdminPermission; -import xyz.playedu.api.mapper.AdminPermissionMapper; -import xyz.playedu.api.service.AdminPermissionService; +import xyz.playedu.common.domain.AdminPermission; +import xyz.playedu.common.mapper.AdminPermissionMapper; +import xyz.playedu.common.service.AdminPermissionService; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/xyz/playedu/api/service/impl/internal/AdminRolePermissionServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminRolePermissionServiceImpl.java similarity index 82% rename from src/main/java/xyz/playedu/api/service/impl/internal/AdminRolePermissionServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminRolePermissionServiceImpl.java index f5ca819..490d37e 100644 --- a/src/main/java/xyz/playedu/api/service/impl/internal/AdminRolePermissionServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminRolePermissionServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl.internal; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.AdminRolePermission; -import xyz.playedu.api.mapper.AdminRolePermissionMapper; -import xyz.playedu.api.service.internal.AdminRolePermissionService; +import xyz.playedu.common.domain.AdminRolePermission; +import xyz.playedu.common.mapper.AdminRolePermissionMapper; +import xyz.playedu.common.service.AdminRolePermissionService; /** * @author tengteng diff --git a/src/main/java/xyz/playedu/api/service/impl/AdminRoleServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminRoleServiceImpl.java similarity index 91% rename from src/main/java/xyz/playedu/api/service/impl/AdminRoleServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminRoleServiceImpl.java index 85210f0..838a6e5 100644 --- a/src/main/java/xyz/playedu/api/service/impl/AdminRoleServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminRoleServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -22,14 +22,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import xyz.playedu.api.domain.AdminRole; -import xyz.playedu.api.domain.AdminRolePermission; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.mapper.AdminRoleMapper; -import xyz.playedu.api.service.AdminRoleService; -import xyz.playedu.api.service.internal.AdminRolePermissionService; -import xyz.playedu.api.service.internal.AdminUserRoleService; -import xyz.playedu.api.util.HelperUtil; +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.AdminUserRoleService; +import xyz.playedu.common.util.HelperUtil; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/xyz/playedu/api/service/impl/internal/AdminUserRoleServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminUserRoleServiceImpl.java similarity index 86% rename from src/main/java/xyz/playedu/api/service/impl/internal/AdminUserRoleServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminUserRoleServiceImpl.java index a10c52d..d58d020 100644 --- a/src/main/java/xyz/playedu/api/service/impl/internal/AdminUserRoleServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminUserRoleServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl.internal; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.AdminUserRole; -import xyz.playedu.api.mapper.AdminUserRoleMapper; -import xyz.playedu.api.service.internal.AdminUserRoleService; +import xyz.playedu.common.domain.AdminUserRole; +import xyz.playedu.common.mapper.AdminUserRoleMapper; +import xyz.playedu.common.service.AdminUserRoleService; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminUserServiceImpl.java similarity index 92% rename from src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminUserServiceImpl.java index 97d139c..34c834a 100644 --- a/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminUserServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,16 +24,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import xyz.playedu.api.domain.AdminUser; -import xyz.playedu.api.domain.AdminUserRole; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.exception.ServiceException; -import xyz.playedu.api.mapper.AdminUserMapper; -import xyz.playedu.api.service.AdminUserService; -import xyz.playedu.api.service.internal.AdminUserRoleService; -import xyz.playedu.api.types.paginate.AdminUserPaginateFilter; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.util.HelperUtil; +import xyz.playedu.common.domain.AdminUser; +import xyz.playedu.common.domain.AdminUserRole; +import xyz.playedu.common.exception.NotFoundException; +import xyz.playedu.common.exception.ServiceException; +import xyz.playedu.common.mapper.AdminUserMapper; +import xyz.playedu.common.service.AdminUserRoleService; +import xyz.playedu.common.service.AdminUserService; +import xyz.playedu.common.types.paginate.AdminUserPaginateFilter; +import xyz.playedu.common.types.paginate.PaginationResult; +import xyz.playedu.common.util.HelperUtil; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/xyz/playedu/api/service/impl/AppConfigServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AppConfigServiceImpl.java similarity index 82% rename from src/main/java/xyz/playedu/api/service/impl/AppConfigServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/AppConfigServiceImpl.java index 782c56d..c9b991f 100644 --- a/src/main/java/xyz/playedu/api/service/impl/AppConfigServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AppConfigServiceImpl.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.constant.CConfig; -import xyz.playedu.api.domain.AppConfig; -import xyz.playedu.api.mapper.AppConfigMapper; -import xyz.playedu.api.service.AppConfigService; -import xyz.playedu.api.types.config.MinioConfig; +import xyz.playedu.common.constant.ConfigConstant; +import xyz.playedu.common.domain.AppConfig; +import xyz.playedu.common.mapper.AppConfigMapper; +import xyz.playedu.common.service.AppConfigService; +import xyz.playedu.common.types.config.MinioConfig; import java.util.ArrayList; import java.util.HashMap; @@ -96,11 +96,11 @@ public class AppConfigServiceImpl extends ServiceImpl config = keyValues(); - minioConfig.setAccessKey(config.get(CConfig.MINIO_ACCESS_KEY)); - minioConfig.setSecretKey(config.get(CConfig.MINIO_SECRET_KEY)); - minioConfig.setBucket(config.get(CConfig.MINIO_BUCKET)); - minioConfig.setEndpoint(config.get(CConfig.MINIO_ENDPOINT)); - minioConfig.setDomain(config.get(CConfig.MINIO_DOMAIN)); + minioConfig.setAccessKey(config.get(ConfigConstant.MINIO_ACCESS_KEY)); + minioConfig.setSecretKey(config.get(ConfigConstant.MINIO_SECRET_KEY)); + minioConfig.setBucket(config.get(ConfigConstant.MINIO_BUCKET)); + minioConfig.setEndpoint(config.get(ConfigConstant.MINIO_ENDPOINT)); + minioConfig.setDomain(config.get(ConfigConstant.MINIO_DOMAIN)); return minioConfig; } } diff --git a/src/main/java/xyz/playedu/api/service/impl/AuthServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AuthServiceImpl.java similarity index 94% rename from src/main/java/xyz/playedu/api/service/impl/AuthServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/AuthServiceImpl.java index 3e45371..7d37aac 100644 --- a/src/main/java/xyz/playedu/api/service/impl/AuthServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AuthServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import cn.dev33.satoken.stp.SaLoginConfig; import cn.dev33.satoken.stp.StpUtil; @@ -23,8 +23,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.playedu.api.config.AuthConfig; -import xyz.playedu.api.service.AuthService; +import xyz.playedu.common.config.AuthConfig; +import xyz.playedu.common.service.AuthService; import java.util.HashMap; diff --git a/src/main/java/xyz/playedu/api/service/impl/BackendAuthServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/BackendAuthServiceImpl.java similarity index 89% rename from src/main/java/xyz/playedu/api/service/impl/BackendAuthServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/BackendAuthServiceImpl.java index 4deed43..e92c88e 100644 --- a/src/main/java/xyz/playedu/api/service/impl/BackendAuthServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/BackendAuthServiceImpl.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.playedu.api.constant.SystemConstant; -import xyz.playedu.api.service.AuthService; -import xyz.playedu.api.service.BackendAuthService; +import xyz.playedu.common.constant.SystemConstant; +import xyz.playedu.common.service.AuthService; +import xyz.playedu.common.service.BackendAuthService; import java.util.HashMap; diff --git a/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/CategoryServiceImpl.java similarity index 67% rename from src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/CategoryServiceImpl.java index e03ae17..6a7dcf8 100644 --- a/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/CategoryServiceImpl.java @@ -13,23 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import xyz.playedu.api.domain.ResourceCategory; -import xyz.playedu.api.domain.ResourceCategoryRelation; -import xyz.playedu.api.domain.ResourceCourseCategory; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.mapper.ResourceCategoryMapper; -import xyz.playedu.api.service.ResourceCategoryService; -import xyz.playedu.api.service.internal.ResourceCategoryRelationService; -import xyz.playedu.api.service.internal.ResourceCourseCategoryService; - +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; @@ -42,27 +36,23 @@ import java.util.stream.Collectors; * @createDate 2023-02-23 09:50:18 */ @Service -public class ResourceCategoryServiceImpl - extends ServiceImpl - implements ResourceCategoryService { - - @Autowired private ResourceCourseCategoryService resourceCourseCategoryService; - - @Autowired private ResourceCategoryRelationService resourceCategoryRelationService; +public class CategoryServiceImpl + extends ServiceImpl + implements CategoryService { @Override - public List listByParentId(Integer id) { + public List listByParentId(Integer id) { return list(query().getWrapper().eq("parent_id", id).orderByAsc("sort")); } @Override - public List all() { + public List all() { return list(query().getWrapper().orderByAsc("sort")); } @Override - public ResourceCategory findOrFail(Integer id) throws NotFoundException { - ResourceCategory category = getById(id); + public Category findOrFail(Integer id) throws NotFoundException { + Category category = getById(id); if (category == null) { throw new NotFoundException("分类不存在"); } @@ -72,7 +62,7 @@ public class ResourceCategoryServiceImpl @Override @Transactional public void deleteById(Integer id) throws NotFoundException { - ResourceCategory category = findOrFail(id); + Category category = findOrFail(id); // 更新parent_chain updateParentChain(category.getParentChain(), childrenParentChain(category)); // 删除记录 @@ -81,11 +71,11 @@ public class ResourceCategoryServiceImpl @Override @Transactional - public void update(ResourceCategory category, String name, Integer parentId, Integer sort) + public void update(Category category, String name, Integer parentId, Integer sort) throws NotFoundException { String childrenChainPrefix = childrenParentChain(category); - ResourceCategory data = new ResourceCategory(); + Category data = new Category(); data.setId(category.getId()); data.setName(name); @@ -94,7 +84,7 @@ public class ResourceCategoryServiceImpl if (parentId.equals(0)) { data.setParentChain(""); } else { - ResourceCategory parentResourceCategory = findOrFail(parentId); + Category parentResourceCategory = findOrFail(parentId); data.setParentChain(childrenParentChain(parentResourceCategory)); } } @@ -110,15 +100,15 @@ public class ResourceCategoryServiceImpl } private void updateParentChain(String newChildrenPC, String oldChildrenPC) { - List children = + List children = list(query().getWrapper().like("parent_chain", oldChildrenPC + "%")); if (children.size() == 0) { return; } - ArrayList updateRows = new ArrayList<>(); - for (ResourceCategory tmpResourceCategory : children) { - ResourceCategory tmpUpdateResourceCategory = new ResourceCategory(); + ArrayList updateRows = new ArrayList<>(); + for (Category tmpResourceCategory : children) { + Category tmpUpdateResourceCategory = new Category(); tmpUpdateResourceCategory.setId(tmpResourceCategory.getId()); // parentChain计算 @@ -155,7 +145,7 @@ public class ResourceCategoryServiceImpl parentChain = compParentChain(parentId); } - ResourceCategory category = new ResourceCategory(); + Category category = new Category(); category.setName(name); category.setParentId(parentId); category.setParentChain(parentChain); @@ -167,7 +157,7 @@ public class ResourceCategoryServiceImpl } @Override - public String childrenParentChain(ResourceCategory category) { + public String childrenParentChain(Category category) { String prefix = category.getId() + ""; if (category.getParentChain() != null && category.getParentChain().length() > 0) { prefix = category.getParentChain() + "," + prefix; @@ -179,7 +169,7 @@ public class ResourceCategoryServiceImpl public String compParentChain(Integer parentId) throws NotFoundException { String parentChain = ""; if (parentId != 0) { - ResourceCategory parentResourceCategory = getById(parentId); + Category parentResourceCategory = getById(parentId); if (parentResourceCategory == null) { throw new NotFoundException("父级分类不存在"); } @@ -189,35 +179,17 @@ public class ResourceCategoryServiceImpl return parentChain; } - @Override - public List getCourseIdsById(Integer id) { - return resourceCourseCategoryService - .list(resourceCourseCategoryService.query().getWrapper().eq("category_id", id)) - .stream() - .map(ResourceCourseCategory::getCourseId) - .toList(); - } - - @Override - public List getRidsById(Integer id) { - return resourceCategoryRelationService - .list(resourceCategoryRelationService.query().getWrapper().eq("cid", id)) - .stream() - .map(ResourceCategoryRelation::getRid) - .toList(); - } - @Override public void resetSort(List ids) { if (ids == null || ids.size() == 0) { return; } - List categories = new ArrayList<>(); + List categories = new ArrayList<>(); int sortVal = 0; for (Integer idItem : ids) { Integer finalSortVal = ++sortVal; categories.add( - new ResourceCategory() { + new Category() { { setId(idItem); setSort(finalSortVal); @@ -231,22 +203,22 @@ public class ResourceCategoryServiceImpl @Transactional public void changeParent(Integer id, Integer parentId, List ids) throws NotFoundException { - ResourceCategory category = findOrFail(id); + Category category = findOrFail(id); update(category, category.getName(), parentId, category.getSort()); // 重置排序 resetSort(ids); } @Override - public Map> groupByParent() { + public Map> groupByParent() { return list(query().getWrapper().orderByAsc("sort")).stream() - .collect(Collectors.groupingBy(ResourceCategory::getParentId)); + .collect(Collectors.groupingBy(Category::getParentId)); } @Override public Map id2name() { return all().stream() - .collect(Collectors.toMap(ResourceCategory::getId, ResourceCategory::getName)); + .collect(Collectors.toMap(Category::getId, Category::getName)); } @Override diff --git a/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/DepartmentServiceImpl.java similarity index 90% rename from src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/DepartmentServiceImpl.java index e05a6c5..03fdc0f 100644 --- a/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/DepartmentServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -24,15 +24,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import xyz.playedu.api.domain.CourseDepartment; -import xyz.playedu.api.domain.Department; -import xyz.playedu.api.domain.UserDepartment; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.mapper.DepartmentMapper; -import xyz.playedu.api.service.CourseDepartmentService; -import xyz.playedu.api.service.DepartmentService; -import xyz.playedu.api.service.internal.UserDepartmentService; -import xyz.playedu.api.types.mapper.DepartmentsUserCountMapRes; +import xyz.playedu.common.domain.Department; +import xyz.playedu.common.domain.UserDepartment; +import xyz.playedu.common.exception.NotFoundException; +import xyz.playedu.common.mapper.DepartmentMapper; +import xyz.playedu.common.service.DepartmentService; +import xyz.playedu.common.service.UserDepartmentService; +import xyz.playedu.common.types.mapper.DepartmentsUserCountMapRes; import java.util.*; import java.util.stream.Collectors; @@ -49,8 +47,6 @@ public class DepartmentServiceImpl extends ServiceImpl listByParentId(Integer id) { return list(query().getWrapper().eq("parent_id", id).orderByAsc("sort")); @@ -205,15 +201,6 @@ public class DepartmentServiceImpl extends ServiceImpl getCourseIdsByDepId(Integer depId) { - return courseDepartmentService - .list(courseDepartmentService.query().getWrapper().eq("dep_id", depId)) - .stream() - .map(CourseDepartment::getCourseId) - .toList(); - } - @Override @Transactional public void changeParent(Integer id, Integer parentId, List ids) diff --git a/src/main/java/xyz/playedu/api/service/impl/FrontendAuthServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/FrontendAuthServiceImpl.java similarity index 88% rename from src/main/java/xyz/playedu/api/service/impl/FrontendAuthServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/FrontendAuthServiceImpl.java index efb11b7..1351d80 100644 --- a/src/main/java/xyz/playedu/api/service/impl/FrontendAuthServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/FrontendAuthServiceImpl.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.playedu.api.constant.SystemConstant; -import xyz.playedu.api.service.AuthService; -import xyz.playedu.api.service.FrontendAuthService; +import xyz.playedu.common.constant.SystemConstant; +import xyz.playedu.common.service.AuthService; +import xyz.playedu.common.service.FrontendAuthService; import java.util.HashMap; diff --git a/src/main/java/xyz/playedu/api/service/impl/MinioServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/MinioServiceImpl.java similarity index 90% rename from src/main/java/xyz/playedu/api/service/impl/MinioServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/MinioServiceImpl.java index 7cc9c36..34e338f 100644 --- a/src/main/java/xyz/playedu/api/service/impl/MinioServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/MinioServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import io.minio.*; import io.minio.http.Method; @@ -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.api.exception.ServiceException; -import xyz.playedu.api.service.AppConfigService; -import xyz.playedu.api.service.MinioService; -import xyz.playedu.api.types.config.MinioConfig; -import xyz.playedu.api.vendor.PlayEduMinioClient; +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; @@ -66,16 +66,16 @@ public class MinioServiceImpl implements MinioService { .build(); } - public PlayEduMinioClient getPlayEduMinioClient() { + public PlayEduMinioClientConfig getPlayEduMinioClient() { MinioConfig c = getMinioConfig(); MinioAsyncClient client = - PlayEduMinioClient.builder() + PlayEduMinioClientConfig.builder() .endpoint(c.getEndpoint()) .credentials(c.getAccessKey(), c.getSecretKey()) .build(); - return new PlayEduMinioClient(client); + return new PlayEduMinioClientConfig(client); } @Override diff --git a/src/main/java/xyz/playedu/api/service/impl/RateLimiterServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/RateLimiterServiceImpl.java similarity index 90% rename from src/main/java/xyz/playedu/api/service/impl/RateLimiterServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/RateLimiterServiceImpl.java index 09648c5..00eee8a 100644 --- a/src/main/java/xyz/playedu/api/service/impl/RateLimiterServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/RateLimiterServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import lombok.extern.slf4j.Slf4j; @@ -22,8 +22,8 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.redis.core.script.RedisScript; import org.springframework.stereotype.Component; -import xyz.playedu.api.service.RateLimiterService; -import xyz.playedu.api.util.RedisUtil; +import xyz.playedu.common.service.RateLimiterService; +import xyz.playedu.common.util.RedisUtil; import java.util.Arrays; diff --git a/src/main/java/xyz/playedu/api/service/impl/internal/UserDepartmentServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserDepartmentServiceImpl.java similarity index 90% rename from src/main/java/xyz/playedu/api/service/impl/internal/UserDepartmentServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/UserDepartmentServiceImpl.java index a4de834..c50676f 100644 --- a/src/main/java/xyz/playedu/api/service/impl/internal/UserDepartmentServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserDepartmentServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl.internal; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.UserDepartment; -import xyz.playedu.api.mapper.UserDepartmentMapper; -import xyz.playedu.api.service.internal.UserDepartmentService; +import xyz.playedu.common.domain.UserDepartment; +import xyz.playedu.common.mapper.UserDepartmentMapper; +import xyz.playedu.common.service.UserDepartmentService; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/impl/UserLoginRecordServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserLoginRecordServiceImpl.java similarity index 92% rename from src/main/java/xyz/playedu/api/service/impl/UserLoginRecordServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/UserLoginRecordServiceImpl.java index e392d2d..ceef6aa 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UserLoginRecordServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserLoginRecordServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.UserLoginRecord; -import xyz.playedu.api.mapper.UserLoginRecordMapper; -import xyz.playedu.api.service.UserLoginRecordService; +import xyz.playedu.common.domain.UserLoginRecord; +import xyz.playedu.common.mapper.UserLoginRecordMapper; +import xyz.playedu.common.service.UserLoginRecordService; /** * @author tengteng diff --git a/src/main/java/xyz/playedu/api/service/impl/UserServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserServiceImpl.java similarity index 93% rename from src/main/java/xyz/playedu/api/service/impl/UserServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/UserServiceImpl.java index 665db06..9bb7a7c 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UserServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -23,17 +23,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import xyz.playedu.api.constant.SystemConstant; -import xyz.playedu.api.domain.User; -import xyz.playedu.api.domain.UserDepartment; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.exception.ServiceException; -import xyz.playedu.api.mapper.UserMapper; -import xyz.playedu.api.service.UserService; -import xyz.playedu.api.service.internal.UserDepartmentService; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.types.paginate.UserPaginateFilter; -import xyz.playedu.api.util.HelperUtil; +import xyz.playedu.common.constant.SystemConstant; +import xyz.playedu.common.domain.User; +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.types.paginate.PaginationResult; +import xyz.playedu.common.types.paginate.UserPaginateFilter; +import xyz.playedu.common.util.HelperUtil; import java.text.SimpleDateFormat; import java.util.*; diff --git a/src/main/java/xyz/playedu/api/service/impl/UserUploadImageLogServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserUploadImageLogServiceImpl.java similarity index 83% rename from src/main/java/xyz/playedu/api/service/impl/UserUploadImageLogServiceImpl.java rename to playedu-common/src/main/java/xyz/playedu/common/service/impl/UserUploadImageLogServiceImpl.java index 6b77237..a3bd252 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UserUploadImageLogServiceImpl.java +++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/UserUploadImageLogServiceImpl.java @@ -13,15 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.common.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import org.springframework.stereotype.Service; - -import xyz.playedu.api.domain.UserUploadImageLog; -import xyz.playedu.api.mapper.UserUploadImageLogMapper; -import xyz.playedu.api.service.UserUploadImageLogService; +import xyz.playedu.common.domain.UserUploadImageLog; +import xyz.playedu.common.mapper.UserUploadImageLogMapper; +import xyz.playedu.common.service.UserUploadImageLogService; /** * @author tengteng diff --git a/src/main/java/xyz/playedu/api/types/ImageCaptchaResult.java b/playedu-common/src/main/java/xyz/playedu/common/types/ImageCaptchaResult.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/ImageCaptchaResult.java rename to playedu-common/src/main/java/xyz/playedu/common/types/ImageCaptchaResult.java index ee069fd..58b9ba0 100644 --- a/src/main/java/xyz/playedu/api/types/ImageCaptchaResult.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/ImageCaptchaResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types; +package xyz.playedu.common.types; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/JsonResponse.java b/playedu-common/src/main/java/xyz/playedu/common/types/JsonResponse.java similarity index 97% rename from src/main/java/xyz/playedu/api/types/JsonResponse.java rename to playedu-common/src/main/java/xyz/playedu/common/types/JsonResponse.java index e052e1d..508fd96 100644 --- a/src/main/java/xyz/playedu/api/types/JsonResponse.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/JsonResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types; +package xyz.playedu.common.types; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/SelectOption.java b/playedu-common/src/main/java/xyz/playedu/common/types/SelectOption.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/SelectOption.java rename to playedu-common/src/main/java/xyz/playedu/common/types/SelectOption.java index 54e517f..d1443a3 100644 --- a/src/main/java/xyz/playedu/api/types/SelectOption.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/SelectOption.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types; +package xyz.playedu.common.types; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/UploadFileInfo.java b/playedu-common/src/main/java/xyz/playedu/common/types/UploadFileInfo.java similarity index 96% rename from src/main/java/xyz/playedu/api/types/UploadFileInfo.java rename to playedu-common/src/main/java/xyz/playedu/common/types/UploadFileInfo.java index e187a12..b1b6eb6 100644 --- a/src/main/java/xyz/playedu/api/types/UploadFileInfo.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/UploadFileInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types; +package xyz.playedu.common.types; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/config/MinioConfig.java b/playedu-common/src/main/java/xyz/playedu/common/types/config/MinioConfig.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/config/MinioConfig.java rename to playedu-common/src/main/java/xyz/playedu/common/types/config/MinioConfig.java index e7481df..4e9e369 100644 --- a/src/main/java/xyz/playedu/api/types/config/MinioConfig.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/config/MinioConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.config; +package xyz.playedu.common.types.config; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/mapper/CourseCategoryCountMapper.java b/playedu-common/src/main/java/xyz/playedu/common/types/mapper/CourseCategoryCountMapper.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/mapper/CourseCategoryCountMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/types/mapper/CourseCategoryCountMapper.java index 47de9d5..0935014 100644 --- a/src/main/java/xyz/playedu/api/types/mapper/CourseCategoryCountMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/mapper/CourseCategoryCountMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.mapper; +package xyz.playedu.common.types.mapper; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/mapper/DepartmentsUserCountMapRes.java b/playedu-common/src/main/java/xyz/playedu/common/types/mapper/DepartmentsUserCountMapRes.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/mapper/DepartmentsUserCountMapRes.java rename to playedu-common/src/main/java/xyz/playedu/common/types/mapper/DepartmentsUserCountMapRes.java index 85d59be..738f816 100644 --- a/src/main/java/xyz/playedu/api/types/mapper/DepartmentsUserCountMapRes.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/mapper/DepartmentsUserCountMapRes.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.mapper; +package xyz.playedu.common.types.mapper; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/mapper/ResourceCategoryCountMapper.java b/playedu-common/src/main/java/xyz/playedu/common/types/mapper/ResourceCategoryCountMapper.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/mapper/ResourceCategoryCountMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/types/mapper/ResourceCategoryCountMapper.java index 7de26cc..0f46566 100644 --- a/src/main/java/xyz/playedu/api/types/mapper/ResourceCategoryCountMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/mapper/ResourceCategoryCountMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.mapper; +package xyz.playedu.common.types.mapper; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/mapper/UserCourseHourRecordCourseCountMapper.java b/playedu-common/src/main/java/xyz/playedu/common/types/mapper/UserCourseHourRecordCourseCountMapper.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/mapper/UserCourseHourRecordCourseCountMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/types/mapper/UserCourseHourRecordCourseCountMapper.java index 1edb9f1..9190b64 100644 --- a/src/main/java/xyz/playedu/api/types/mapper/UserCourseHourRecordCourseCountMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/mapper/UserCourseHourRecordCourseCountMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.mapper; +package xyz.playedu.common.types.mapper; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/xyz/playedu/api/types/mapper/UserCourseHourRecordUserCountMapper.java b/playedu-common/src/main/java/xyz/playedu/common/types/mapper/UserCourseHourRecordUserCountMapper.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/mapper/UserCourseHourRecordUserCountMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/types/mapper/UserCourseHourRecordUserCountMapper.java index 84e8a93..4c4f5ba 100644 --- a/src/main/java/xyz/playedu/api/types/mapper/UserCourseHourRecordUserCountMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/mapper/UserCourseHourRecordUserCountMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.mapper; +package xyz.playedu.common.types.mapper; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/xyz/playedu/api/types/mapper/UserCourseHourRecordUserFirstCreatedAtMapper.java b/playedu-common/src/main/java/xyz/playedu/common/types/mapper/UserCourseHourRecordUserFirstCreatedAtMapper.java similarity index 96% rename from src/main/java/xyz/playedu/api/types/mapper/UserCourseHourRecordUserFirstCreatedAtMapper.java rename to playedu-common/src/main/java/xyz/playedu/common/types/mapper/UserCourseHourRecordUserFirstCreatedAtMapper.java index d348254..a4a35da 100644 --- a/src/main/java/xyz/playedu/api/types/mapper/UserCourseHourRecordUserFirstCreatedAtMapper.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/mapper/UserCourseHourRecordUserFirstCreatedAtMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.mapper; +package xyz.playedu.common.types.mapper; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/xyz/playedu/api/types/paginate/AdminLogPaginateFiler.java b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/AdminLogPaginateFiler.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/paginate/AdminLogPaginateFiler.java rename to playedu-common/src/main/java/xyz/playedu/common/types/paginate/AdminLogPaginateFiler.java index e0e5e02..022fab3 100644 --- a/src/main/java/xyz/playedu/api/types/paginate/AdminLogPaginateFiler.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/AdminLogPaginateFiler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.paginate; +package xyz.playedu.common.types.paginate; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/paginate/AdminUserPaginateFilter.java b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/AdminUserPaginateFilter.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/paginate/AdminUserPaginateFilter.java rename to playedu-common/src/main/java/xyz/playedu/common/types/paginate/AdminUserPaginateFilter.java index da6e41a..525a1f2 100644 --- a/src/main/java/xyz/playedu/api/types/paginate/AdminUserPaginateFilter.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/AdminUserPaginateFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.paginate; +package xyz.playedu.common.types.paginate; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/paginate/CourseAttachmentDownloadLogPaginateFiler.java b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/CourseAttachmentDownloadLogPaginateFiler.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/paginate/CourseAttachmentDownloadLogPaginateFiler.java rename to playedu-common/src/main/java/xyz/playedu/common/types/paginate/CourseAttachmentDownloadLogPaginateFiler.java index 093448d..aa72d88 100644 --- a/src/main/java/xyz/playedu/api/types/paginate/CourseAttachmentDownloadLogPaginateFiler.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/CourseAttachmentDownloadLogPaginateFiler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.paginate; +package xyz.playedu.common.types.paginate; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/paginate/CoursePaginateFiler.java b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/CoursePaginateFiler.java similarity index 96% rename from src/main/java/xyz/playedu/api/types/paginate/CoursePaginateFiler.java rename to playedu-common/src/main/java/xyz/playedu/common/types/paginate/CoursePaginateFiler.java index 8166744..d6db3f9 100644 --- a/src/main/java/xyz/playedu/api/types/paginate/CoursePaginateFiler.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/CoursePaginateFiler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.paginate; +package xyz.playedu.common.types.paginate; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/paginate/PaginationResult.java b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/PaginationResult.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/paginate/PaginationResult.java rename to playedu-common/src/main/java/xyz/playedu/common/types/paginate/PaginationResult.java index f8247de..b1e290e 100644 --- a/src/main/java/xyz/playedu/api/types/paginate/PaginationResult.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/PaginationResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.paginate; +package xyz.playedu.common.types.paginate; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/types/paginate/ResourcePaginateFilter.java b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/ResourcePaginateFilter.java similarity index 96% rename from src/main/java/xyz/playedu/api/types/paginate/ResourcePaginateFilter.java rename to playedu-common/src/main/java/xyz/playedu/common/types/paginate/ResourcePaginateFilter.java index 2a78545..97258ff 100644 --- a/src/main/java/xyz/playedu/api/types/paginate/ResourcePaginateFilter.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/ResourcePaginateFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.paginate; +package xyz.playedu.common.types.paginate; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/paginate/UserCourseHourRecordPaginateFilter.java b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/UserCourseHourRecordPaginateFilter.java similarity index 95% rename from src/main/java/xyz/playedu/api/types/paginate/UserCourseHourRecordPaginateFilter.java rename to playedu-common/src/main/java/xyz/playedu/common/types/paginate/UserCourseHourRecordPaginateFilter.java index 3d49996..7e2b494 100644 --- a/src/main/java/xyz/playedu/api/types/paginate/UserCourseHourRecordPaginateFilter.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/UserCourseHourRecordPaginateFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.paginate; +package xyz.playedu.common.types.paginate; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/paginate/UserCourseRecordPaginateFilter.java b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/UserCourseRecordPaginateFilter.java similarity index 96% rename from src/main/java/xyz/playedu/api/types/paginate/UserCourseRecordPaginateFilter.java rename to playedu-common/src/main/java/xyz/playedu/common/types/paginate/UserCourseRecordPaginateFilter.java index 3ef30e8..6e11996 100644 --- a/src/main/java/xyz/playedu/api/types/paginate/UserCourseRecordPaginateFilter.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/UserCourseRecordPaginateFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.paginate; +package xyz.playedu.common.types.paginate; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/types/paginate/UserPaginateFilter.java b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/UserPaginateFilter.java similarity index 96% rename from src/main/java/xyz/playedu/api/types/paginate/UserPaginateFilter.java rename to playedu-common/src/main/java/xyz/playedu/common/types/paginate/UserPaginateFilter.java index ba1dc72..95dc92e 100644 --- a/src/main/java/xyz/playedu/api/types/paginate/UserPaginateFilter.java +++ b/playedu-common/src/main/java/xyz/playedu/common/types/paginate/UserPaginateFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.paginate; +package xyz.playedu.common.types.paginate; import lombok.Data; diff --git a/src/main/java/xyz/playedu/api/util/Base64Util.java b/playedu-common/src/main/java/xyz/playedu/common/util/Base64Util.java similarity index 99% rename from src/main/java/xyz/playedu/api/util/Base64Util.java rename to playedu-common/src/main/java/xyz/playedu/common/util/Base64Util.java index a4e90cf..97b9c00 100644 --- a/src/main/java/xyz/playedu/api/util/Base64Util.java +++ b/playedu-common/src/main/java/xyz/playedu/common/util/Base64Util.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.util; +package xyz.playedu.common.util; /** Base64工具类 */ public final class Base64Util { diff --git a/src/main/java/xyz/playedu/api/util/HelperUtil.java b/playedu-common/src/main/java/xyz/playedu/common/util/HelperUtil.java similarity index 99% rename from src/main/java/xyz/playedu/api/util/HelperUtil.java rename to playedu-common/src/main/java/xyz/playedu/common/util/HelperUtil.java index 824ca78..1899ad7 100644 --- a/src/main/java/xyz/playedu/api/util/HelperUtil.java +++ b/playedu-common/src/main/java/xyz/playedu/common/util/HelperUtil.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.util; +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/src/main/java/xyz/playedu/api/util/IpUtil.java b/playedu-common/src/main/java/xyz/playedu/common/util/IpUtil.java similarity index 99% rename from src/main/java/xyz/playedu/api/util/IpUtil.java rename to playedu-common/src/main/java/xyz/playedu/common/util/IpUtil.java index 6c78ae8..c4e0e51 100644 --- a/src/main/java/xyz/playedu/api/util/IpUtil.java +++ b/playedu-common/src/main/java/xyz/playedu/common/util/IpUtil.java @@ -13,14 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.util; +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/src/main/java/xyz/playedu/api/util/PrivacyUtil.java b/playedu-common/src/main/java/xyz/playedu/common/util/PrivacyUtil.java similarity index 98% rename from src/main/java/xyz/playedu/api/util/PrivacyUtil.java rename to playedu-common/src/main/java/xyz/playedu/common/util/PrivacyUtil.java index f9ccfe6..28a5271 100644 --- a/src/main/java/xyz/playedu/api/util/PrivacyUtil.java +++ b/playedu-common/src/main/java/xyz/playedu/common/util/PrivacyUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.util; +package xyz.playedu.common.util; public class PrivacyUtil { diff --git a/src/main/java/xyz/playedu/api/util/RedisDistributedLock.java b/playedu-common/src/main/java/xyz/playedu/common/util/RedisDistributedLock.java similarity index 98% rename from src/main/java/xyz/playedu/api/util/RedisDistributedLock.java rename to playedu-common/src/main/java/xyz/playedu/common/util/RedisDistributedLock.java index 77f99e7..da0ad98 100644 --- a/src/main/java/xyz/playedu/api/util/RedisDistributedLock.java +++ b/playedu-common/src/main/java/xyz/playedu/common/util/RedisDistributedLock.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.util; +package xyz.playedu.common.util; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.script.DefaultRedisScript; diff --git a/src/main/java/xyz/playedu/api/util/RedisUtil.java b/playedu-common/src/main/java/xyz/playedu/common/util/RedisUtil.java similarity index 99% rename from src/main/java/xyz/playedu/api/util/RedisUtil.java rename to playedu-common/src/main/java/xyz/playedu/common/util/RedisUtil.java index a8001c6..7a7d5ed 100644 --- a/src/main/java/xyz/playedu/api/util/RedisUtil.java +++ b/playedu-common/src/main/java/xyz/playedu/common/util/RedisUtil.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.util; +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; @@ -24,8 +23,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.api.constant.SystemConstant; +import xyz.playedu.common.constant.SystemConstant; import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/xyz/playedu/api/util/RequestUtil.java b/playedu-common/src/main/java/xyz/playedu/common/util/RequestUtil.java similarity index 99% rename from src/main/java/xyz/playedu/api/util/RequestUtil.java rename to playedu-common/src/main/java/xyz/playedu/common/util/RequestUtil.java index da76c2a..0251a8d 100644 --- a/src/main/java/xyz/playedu/api/util/RequestUtil.java +++ b/playedu-common/src/main/java/xyz/playedu/common/util/RequestUtil.java @@ -13,13 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.util; +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/src/main/java/xyz/playedu/api/util/StringUtil.java b/playedu-common/src/main/java/xyz/playedu/common/util/StringUtil.java similarity index 99% rename from src/main/java/xyz/playedu/api/util/StringUtil.java rename to playedu-common/src/main/java/xyz/playedu/common/util/StringUtil.java index f09603d..19520d0 100644 --- a/src/main/java/xyz/playedu/api/util/StringUtil.java +++ b/playedu-common/src/main/java/xyz/playedu/common/util/StringUtil.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.util; +package xyz.playedu.common.util; import cn.hutool.json.JSONUtil; - import org.springframework.util.AntPathMatcher; import java.util.*; diff --git a/src/main/resources/lua/RateLimiterScript.lua b/playedu-common/src/main/resources/lua/RateLimiterScript.lua similarity index 100% rename from src/main/resources/lua/RateLimiterScript.lua rename to playedu-common/src/main/resources/lua/RateLimiterScript.lua diff --git a/src/main/resources/mapper/AdminPermissionMapper.xml b/playedu-common/src/main/resources/mapper/AdminPermissionMapper.xml similarity index 83% rename from src/main/resources/mapper/AdminPermissionMapper.xml rename to playedu-common/src/main/resources/mapper/AdminPermissionMapper.xml index 93225d6..1207413 100644 --- a/src/main/resources/mapper/AdminPermissionMapper.xml +++ b/playedu-common/src/main/resources/mapper/AdminPermissionMapper.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + id,type,group_name, sort,name,slug, - created_at - - + created_at + + diff --git a/src/main/resources/mapper/AdminRoleMapper.xml b/playedu-common/src/main/resources/mapper/AdminRoleMapper.xml similarity index 81% rename from src/main/resources/mapper/AdminRoleMapper.xml rename to playedu-common/src/main/resources/mapper/AdminRoleMapper.xml index 52634a7..85a6d4c 100644 --- a/src/main/resources/mapper/AdminRoleMapper.xml +++ b/playedu-common/src/main/resources/mapper/AdminRoleMapper.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + id,name,slug, - created_at,updated_at - - + created_at,updated_at + + diff --git a/src/main/resources/mapper/AdminRolePermissionMapper.xml b/playedu-common/src/main/resources/mapper/AdminRolePermissionMapper.xml similarity index 70% rename from src/main/resources/mapper/AdminRolePermissionMapper.xml rename to playedu-common/src/main/resources/mapper/AdminRolePermissionMapper.xml index 45c04ca..46c92e7 100644 --- a/src/main/resources/mapper/AdminRolePermissionMapper.xml +++ b/playedu-common/src/main/resources/mapper/AdminRolePermissionMapper.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - role_id,perm_id - - + + + + + + + + + + + role_id,perm_id + + diff --git a/src/main/resources/mapper/AdminUserMapper.xml b/playedu-common/src/main/resources/mapper/AdminUserMapper.xml similarity index 87% rename from src/main/resources/mapper/AdminUserMapper.xml rename to playedu-common/src/main/resources/mapper/AdminUserMapper.xml index f10ca17..a94db43 100644 --- a/src/main/resources/mapper/AdminUserMapper.xml +++ b/playedu-common/src/main/resources/mapper/AdminUserMapper.xml @@ -1,28 +1,28 @@ - - - - - - - - - - - - - - - - - - - - id - ,name,email, - password,salt,login_ip, - login_at,is_ban_login,login_times, - created_at,updated_at - - + + + + + + + + + + + + + + + + + + + + id + ,name,email, + password,salt,login_ip, + login_at,is_ban_login,login_times, + created_at,updated_at + + diff --git a/src/main/resources/mapper/AdminUserRoleMapper.xml b/playedu-common/src/main/resources/mapper/AdminUserRoleMapper.xml similarity index 72% rename from src/main/resources/mapper/AdminUserRoleMapper.xml rename to playedu-common/src/main/resources/mapper/AdminUserRoleMapper.xml index 9af2f73..6cfc994 100644 --- a/src/main/resources/mapper/AdminUserRoleMapper.xml +++ b/playedu-common/src/main/resources/mapper/AdminUserRoleMapper.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - admin_id,role_id - - + + + + + + + + + + + admin_id,role_id + + diff --git a/src/main/resources/mapper/AppConfigMapper.xml b/playedu-common/src/main/resources/mapper/AppConfigMapper.xml similarity index 89% rename from src/main/resources/mapper/AppConfigMapper.xml rename to playedu-common/src/main/resources/mapper/AppConfigMapper.xml index 212a3e4..4ad9025 100644 --- a/src/main/resources/mapper/AppConfigMapper.xml +++ b/playedu-common/src/main/resources/mapper/AppConfigMapper.xml @@ -1,28 +1,28 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + id,group_name,name, sort,field_type,key_name, key_value,option_value,is_private, - help,created_at,is_hidden - - + help,created_at,is_hidden + + diff --git a/src/main/resources/mapper/ResourceCategoryMapper.xml b/playedu-common/src/main/resources/mapper/CategoryMapper.xml similarity index 83% rename from src/main/resources/mapper/ResourceCategoryMapper.xml rename to playedu-common/src/main/resources/mapper/CategoryMapper.xml index 888eb87..249afaf 100644 --- a/src/main/resources/mapper/ResourceCategoryMapper.xml +++ b/playedu-common/src/main/resources/mapper/CategoryMapper.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + id,parent_id,parent_chain, name,sort,created_at, - updated_at - - + updated_at + + diff --git a/src/main/resources/mapper/DepartmentMapper.xml b/playedu-common/src/main/resources/mapper/DepartmentMapper.xml similarity index 83% rename from src/main/resources/mapper/DepartmentMapper.xml rename to playedu-common/src/main/resources/mapper/DepartmentMapper.xml index f79032c..b5c5bc1 100644 --- a/src/main/resources/mapper/DepartmentMapper.xml +++ b/playedu-common/src/main/resources/mapper/DepartmentMapper.xml @@ -1,27 +1,27 @@ - - - - - - - - - - - - - - - - id,name,parent_id, - parent_chain,sort,created_at, - updated_at - - - + + + + + + + + + + + + + + + + id,name,parent_id, + parent_chain,sort,created_at, + updated_at + + + diff --git a/src/main/resources/mapper/UserDepartmentMapper.xml b/playedu-common/src/main/resources/mapper/UserDepartmentMapper.xml similarity index 71% rename from src/main/resources/mapper/UserDepartmentMapper.xml rename to playedu-common/src/main/resources/mapper/UserDepartmentMapper.xml index b2ae779..e9d0e81 100644 --- a/src/main/resources/mapper/UserDepartmentMapper.xml +++ b/playedu-common/src/main/resources/mapper/UserDepartmentMapper.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - user_id,dep_id - - + + + + + + + + + + + user_id,dep_id + + diff --git a/src/main/resources/mapper/UserLoginRecordMapper.xml b/playedu-common/src/main/resources/mapper/UserLoginRecordMapper.xml similarity index 87% rename from src/main/resources/mapper/UserLoginRecordMapper.xml rename to playedu-common/src/main/resources/mapper/UserLoginRecordMapper.xml index a0d9371..a927505 100644 --- a/src/main/resources/mapper/UserLoginRecordMapper.xml +++ b/playedu-common/src/main/resources/mapper/UserLoginRecordMapper.xml @@ -1,27 +1,27 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + id,user_id,jti, ip,ip_area,browser, browser_version,os,expired, - is_logout,created_at - - + is_logout,created_at + + diff --git a/src/main/resources/mapper/UserMapper.xml b/playedu-common/src/main/resources/mapper/UserMapper.xml similarity index 95% rename from src/main/resources/mapper/UserMapper.xml rename to playedu-common/src/main/resources/mapper/UserMapper.xml index f72f9ae..35b0414 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/playedu-common/src/main/resources/mapper/UserMapper.xml @@ -1,170 +1,170 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - id,email,name, - avatar,password,salt, - id_card,credit1,create_ip, - create_city,is_active,is_lock, - is_verify,verify_at,is_set_password, - login_at,created_at,updated_at - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + id,email,name, + avatar,password,salt, + id_card,credit1,create_ip, + create_city,is_active,is_lock, + is_verify,verify_at,is_set_password, + login_at,created_at,updated_at + + + + + diff --git a/src/main/resources/mapper/UserUploadImageLogMapper.xml b/playedu-common/src/main/resources/mapper/UserUploadImageLogMapper.xml similarity index 85% rename from src/main/resources/mapper/UserUploadImageLogMapper.xml rename to playedu-common/src/main/resources/mapper/UserUploadImageLogMapper.xml index 15b8603..01362ae 100644 --- a/src/main/resources/mapper/UserUploadImageLogMapper.xml +++ b/playedu-common/src/main/resources/mapper/UserUploadImageLogMapper.xml @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + id,user_id,typed, scene,driver,path, url,size,name, - created_at - - + created_at + + diff --git a/playedu-course/pom.xml b/playedu-course/pom.xml new file mode 100644 index 0000000..8be026a --- /dev/null +++ b/playedu-course/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + xyz.playedu + playedu + 1.2 + + + playedu-course + + + + xyz.playedu + playedu-common + 1.2 + + + xyz.playedu + playedu-resource + 1.2 + + + \ No newline at end of file diff --git a/src/main/java/xyz/playedu/api/bus/UserBus.java b/playedu-course/src/main/java/xyz/playedu/course/bus/UserBus.java similarity index 77% rename from src/main/java/xyz/playedu/api/bus/UserBus.java rename to playedu-course/src/main/java/xyz/playedu/course/bus/UserBus.java index ae90478..73040f4 100644 --- a/src/main/java/xyz/playedu/api/bus/UserBus.java +++ b/playedu-course/src/main/java/xyz/playedu/course/bus/UserBus.java @@ -13,21 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.bus; +package xyz.playedu.course.bus; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; - -import xyz.playedu.api.FCtx; -import xyz.playedu.api.caches.UserLastLearnTimeCache; -import xyz.playedu.api.domain.Course; -import xyz.playedu.api.domain.CourseHour; -import xyz.playedu.api.domain.User; -import xyz.playedu.api.event.UserLearnCourseUpdateEvent; -import xyz.playedu.api.service.CourseService; -import xyz.playedu.api.service.UserService; +import xyz.playedu.common.domain.User; +import xyz.playedu.common.service.UserService; +import xyz.playedu.course.domain.Course; +import xyz.playedu.course.service.CourseService; import java.util.List; @@ -43,10 +37,6 @@ public class UserBus { @Autowired private UserService userService; - @Autowired private UserLastLearnTimeCache userLastLearnTimeCache; - - @Autowired private ApplicationContext ctx; - public boolean canSeeCourse(User user, Course course) { List courseDepIds = courseService.getDepIdsByCourseId(course.getId()); if (courseDepIds == null || courseDepIds.size() == 0) { @@ -61,7 +51,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(); // 最近一次学习时间 @@ -76,5 +66,5 @@ public class UserBus { ctx.publishEvent( new UserLearnCourseUpdateEvent( this, user.getId(), course.getId(), hour.getId(), lastTime, curTime)); - } + }*/ } diff --git a/src/main/java/xyz/playedu/api/caches/CourseCache.java b/playedu-course/src/main/java/xyz/playedu/course/caches/CourseCache.java similarity index 87% rename from src/main/java/xyz/playedu/api/caches/CourseCache.java rename to playedu-course/src/main/java/xyz/playedu/course/caches/CourseCache.java index b75cb6e..ebdf4fa 100644 --- a/src/main/java/xyz/playedu/api/caches/CourseCache.java +++ b/playedu-course/src/main/java/xyz/playedu/course/caches/CourseCache.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.caches; +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; -import xyz.playedu.api.domain.Course; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.service.CourseService; -import xyz.playedu.api.util.RedisUtil; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/caches/UserCanSeeCourseCache.java b/playedu-course/src/main/java/xyz/playedu/course/caches/UserCanSeeCourseCache.java similarity index 88% rename from src/main/java/xyz/playedu/api/caches/UserCanSeeCourseCache.java rename to playedu-course/src/main/java/xyz/playedu/course/caches/UserCanSeeCourseCache.java index bc9c4d8..022fa57 100644 --- a/src/main/java/xyz/playedu/api/caches/UserCanSeeCourseCache.java +++ b/playedu-course/src/main/java/xyz/playedu/course/caches/UserCanSeeCourseCache.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.caches; +package xyz.playedu.course.caches; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import xyz.playedu.api.bus.UserBus; -import xyz.playedu.api.domain.Course; -import xyz.playedu.api.domain.User; -import xyz.playedu.api.exception.ServiceException; -import xyz.playedu.api.util.RedisUtil; +import xyz.playedu.common.domain.User; +import xyz.playedu.common.exception.ServiceException; +import xyz.playedu.common.util.RedisUtil; +import xyz.playedu.course.bus.UserBus; +import xyz.playedu.course.domain.Course; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/caches/UserLastLearnTimeCache.java b/playedu-course/src/main/java/xyz/playedu/course/caches/UserLastLearnTimeCache.java similarity index 93% rename from src/main/java/xyz/playedu/api/caches/UserLastLearnTimeCache.java rename to playedu-course/src/main/java/xyz/playedu/course/caches/UserLastLearnTimeCache.java index b13fc7d..01651f5 100644 --- a/src/main/java/xyz/playedu/api/caches/UserLastLearnTimeCache.java +++ b/playedu-course/src/main/java/xyz/playedu/course/caches/UserLastLearnTimeCache.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.caches; +package xyz.playedu.course.caches; import org.springframework.stereotype.Component; +import xyz.playedu.common.util.RedisUtil; -import xyz.playedu.api.util.RedisUtil; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/domain/Course.java b/playedu-course/src/main/java/xyz/playedu/course/domain/Course.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/Course.java rename to playedu-course/src/main/java/xyz/playedu/course/domain/Course.java index 0d16fc0..9a4a618 100644 --- a/src/main/java/xyz/playedu/api/domain/Course.java +++ b/playedu-course/src/main/java/xyz/playedu/course/domain/Course.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.course.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -21,7 +21,6 @@ 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/src/main/java/xyz/playedu/api/domain/CourseAttachment.java b/playedu-course/src/main/java/xyz/playedu/course/domain/CourseAttachment.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/CourseAttachment.java rename to playedu-course/src/main/java/xyz/playedu/course/domain/CourseAttachment.java index c9113f5..6aeeefa 100644 --- a/src/main/java/xyz/playedu/api/domain/CourseAttachment.java +++ b/playedu-course/src/main/java/xyz/playedu/course/domain/CourseAttachment.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.course.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/xyz/playedu/api/domain/CourseAttachmentDownloadLog.java b/playedu-course/src/main/java/xyz/playedu/course/domain/CourseAttachmentDownloadLog.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/CourseAttachmentDownloadLog.java rename to playedu-course/src/main/java/xyz/playedu/course/domain/CourseAttachmentDownloadLog.java index c62a1ec..a3afc5d 100644 --- a/src/main/java/xyz/playedu/api/domain/CourseAttachmentDownloadLog.java +++ b/playedu-course/src/main/java/xyz/playedu/course/domain/CourseAttachmentDownloadLog.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.course.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/xyz/playedu/api/domain/ResourceCourseCategory.java b/playedu-course/src/main/java/xyz/playedu/course/domain/CourseCategory.java similarity index 93% rename from src/main/java/xyz/playedu/api/domain/ResourceCourseCategory.java rename to playedu-course/src/main/java/xyz/playedu/course/domain/CourseCategory.java index 57729da..81a066e 100644 --- a/src/main/java/xyz/playedu/api/domain/ResourceCourseCategory.java +++ b/playedu-course/src/main/java/xyz/playedu/course/domain/CourseCategory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.course.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -28,7 +28,7 @@ import java.io.Serializable; */ @TableName(value = "resource_course_category") @Data -public class ResourceCourseCategory implements Serializable { +public class CourseCategory implements Serializable { /** */ @JsonProperty("course_id") private Integer courseId; @@ -51,7 +51,7 @@ public class ResourceCourseCategory implements Serializable { if (getClass() != that.getClass()) { return false; } - ResourceCourseCategory other = (ResourceCourseCategory) that; + CourseCategory other = (CourseCategory) that; return (this.getCourseId() == null ? other.getCourseId() == null : this.getCourseId().equals(other.getCourseId())) diff --git a/src/main/java/xyz/playedu/api/domain/CourseChapter.java b/playedu-course/src/main/java/xyz/playedu/course/domain/CourseChapter.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/CourseChapter.java rename to playedu-course/src/main/java/xyz/playedu/course/domain/CourseChapter.java index 488afe4..eaa5699 100644 --- a/src/main/java/xyz/playedu/api/domain/CourseChapter.java +++ b/playedu-course/src/main/java/xyz/playedu/course/domain/CourseChapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.course.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/xyz/playedu/api/domain/CourseDepartment.java b/playedu-course/src/main/java/xyz/playedu/course/domain/CourseDepartment.java similarity index 98% rename from src/main/java/xyz/playedu/api/domain/CourseDepartment.java rename to playedu-course/src/main/java/xyz/playedu/course/domain/CourseDepartment.java index 9a3237d..d1396a8 100644 --- a/src/main/java/xyz/playedu/api/domain/CourseDepartment.java +++ b/playedu-course/src/main/java/xyz/playedu/course/domain/CourseDepartment.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.course.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/xyz/playedu/api/domain/CourseHour.java b/playedu-course/src/main/java/xyz/playedu/course/domain/CourseHour.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/CourseHour.java rename to playedu-course/src/main/java/xyz/playedu/course/domain/CourseHour.java index e99041c..443b392 100644 --- a/src/main/java/xyz/playedu/api/domain/CourseHour.java +++ b/playedu-course/src/main/java/xyz/playedu/course/domain/CourseHour.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.course.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/xyz/playedu/api/domain/UserCourseHourRecord.java b/playedu-course/src/main/java/xyz/playedu/course/domain/UserCourseHourRecord.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/UserCourseHourRecord.java rename to playedu-course/src/main/java/xyz/playedu/course/domain/UserCourseHourRecord.java index c8e6d32..01607d9 100644 --- a/src/main/java/xyz/playedu/api/domain/UserCourseHourRecord.java +++ b/playedu-course/src/main/java/xyz/playedu/course/domain/UserCourseHourRecord.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.course.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/xyz/playedu/api/domain/UserCourseRecord.java b/playedu-course/src/main/java/xyz/playedu/course/domain/UserCourseRecord.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/UserCourseRecord.java rename to playedu-course/src/main/java/xyz/playedu/course/domain/UserCourseRecord.java index b11ed46..924643e 100644 --- a/src/main/java/xyz/playedu/api/domain/UserCourseRecord.java +++ b/playedu-course/src/main/java/xyz/playedu/course/domain/UserCourseRecord.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.course.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/xyz/playedu/api/types/response/UserLatestLearn.java b/playedu-course/src/main/java/xyz/playedu/course/domain/UserLatestLearn.java similarity index 83% rename from src/main/java/xyz/playedu/api/types/response/UserLatestLearn.java rename to playedu-course/src/main/java/xyz/playedu/course/domain/UserLatestLearn.java index 10b09d8..6067b93 100644 --- a/src/main/java/xyz/playedu/api/types/response/UserLatestLearn.java +++ b/playedu-course/src/main/java/xyz/playedu/course/domain/UserLatestLearn.java @@ -13,16 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.types.response; +package xyz.playedu.course.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; -import xyz.playedu.api.domain.Course; -import xyz.playedu.api.domain.CourseHour; -import xyz.playedu.api.domain.UserCourseHourRecord; -import xyz.playedu.api.domain.UserCourseRecord; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/domain/UserLearnDurationRecord.java b/playedu-course/src/main/java/xyz/playedu/course/domain/UserLearnDurationRecord.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/UserLearnDurationRecord.java rename to playedu-course/src/main/java/xyz/playedu/course/domain/UserLearnDurationRecord.java index f159102..ccca068 100644 --- a/src/main/java/xyz/playedu/api/domain/UserLearnDurationRecord.java +++ b/playedu-course/src/main/java/xyz/playedu/course/domain/UserLearnDurationRecord.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.course.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/xyz/playedu/api/domain/UserLearnDurationStats.java b/playedu-course/src/main/java/xyz/playedu/course/domain/UserLearnDurationStats.java similarity index 98% rename from src/main/java/xyz/playedu/api/domain/UserLearnDurationStats.java rename to playedu-course/src/main/java/xyz/playedu/course/domain/UserLearnDurationStats.java index dea8b56..662f5d9 100644 --- a/src/main/java/xyz/playedu/api/domain/UserLearnDurationStats.java +++ b/playedu-course/src/main/java/xyz/playedu/course/domain/UserLearnDurationStats.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.course.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/xyz/playedu/api/mapper/CourseAttachmentDownloadLogMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseAttachmentDownloadLogMapper.java similarity index 75% rename from src/main/java/xyz/playedu/api/mapper/CourseAttachmentDownloadLogMapper.java rename to playedu-course/src/main/java/xyz/playedu/course/mapper/CourseAttachmentDownloadLogMapper.java index 882c47d..18d1ce6 100644 --- a/src/main/java/xyz/playedu/api/mapper/CourseAttachmentDownloadLogMapper.java +++ b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseAttachmentDownloadLogMapper.java @@ -13,17 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.CourseAttachmentDownloadLog; -import xyz.playedu.api.types.paginate.CourseAttachmentDownloadLogPaginateFiler; +import xyz.playedu.course.domain.CourseAttachmentDownloadLog; +import xyz.playedu.common.types.paginate.CourseAttachmentDownloadLogPaginateFiler; import java.util.List; +/** + * @author tengteng + * @description 针对表【course_attachment_download_log】的数据库操作Mapper + * @createDate 2023-08-02 17:34:01 + */ @Mapper public interface CourseAttachmentDownloadLogMapper extends BaseMapper { diff --git a/src/main/java/xyz/playedu/api/mapper/CourseAttachmentMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseAttachmentMapper.java similarity index 78% rename from src/main/java/xyz/playedu/api/mapper/CourseAttachmentMapper.java rename to playedu-course/src/main/java/xyz/playedu/course/mapper/CourseAttachmentMapper.java index 9b3b183..af22afc 100644 --- a/src/main/java/xyz/playedu/api/mapper/CourseAttachmentMapper.java +++ b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseAttachmentMapper.java @@ -13,13 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.CourseAttachment; +import xyz.playedu.course.domain.CourseAttachment; +/** + * @author tengteng + * @description 针对表【course_attachment】的数据库操作Mapper + * @createDate 2023-08-02 17:34:01 + */ @Mapper public interface CourseAttachmentMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/CategoryCourseMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseCategoryMapper.java similarity index 71% rename from src/main/java/xyz/playedu/api/mapper/CategoryCourseMapper.java rename to playedu-course/src/main/java/xyz/playedu/course/mapper/CourseCategoryMapper.java index edc4b12..20298c6 100644 --- a/src/main/java/xyz/playedu/api/mapper/CategoryCourseMapper.java +++ b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseCategoryMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.CategoryCourse; +import xyz.playedu.course.domain.CourseCategory; /** * @author tengteng - * @description 针对表【category_course】的数据库操作Mapper - * @createDate 2023-02-24 14:48:26 @Entity xyz.playedu.api.domain.CategoryCourse + * @description 针对表【course_category】的数据库操作Mapper + * @createDate 2023-03-09 09:54:22 */ @Mapper -public interface CategoryCourseMapper extends BaseMapper {} +public interface CourseCategoryMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/CourseChapterMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseChapterMapper.java similarity index 85% rename from src/main/java/xyz/playedu/api/mapper/CourseChapterMapper.java rename to playedu-course/src/main/java/xyz/playedu/course/mapper/CourseChapterMapper.java index 554a8d0..d4c7eb7 100644 --- a/src/main/java/xyz/playedu/api/mapper/CourseChapterMapper.java +++ b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseChapterMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.CourseChapter; +import xyz.playedu.course.domain.CourseChapter; /** * @author tengteng * @description 针对表【course_chapters】的数据库操作Mapper - * @createDate 2023-02-26 17:34:01 @Entity xyz.playedu.api.domain.CourseChapter + * @createDate 2023-02-26 17:34:01 */ @Mapper public interface CourseChapterMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/CourseDepartmentMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseDepartmentMapper.java similarity index 84% rename from src/main/java/xyz/playedu/api/mapper/CourseDepartmentMapper.java rename to playedu-course/src/main/java/xyz/playedu/course/mapper/CourseDepartmentMapper.java index b67acf5..0487c8b 100644 --- a/src/main/java/xyz/playedu/api/mapper/CourseDepartmentMapper.java +++ b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseDepartmentMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.CourseDepartment; +import xyz.playedu.course.domain.CourseDepartment; /** * @author tengteng * @description 针对表【course_department】的数据库操作Mapper - * @createDate 2023-02-24 14:53:52 @Entity xyz.playedu.api.domain.CourseDepartment + * @createDate 2023-02-24 14:53:52 */ @Mapper public interface CourseDepartmentMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/CourseHourMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseHourMapper.java similarity index 85% rename from src/main/java/xyz/playedu/api/mapper/CourseHourMapper.java rename to playedu-course/src/main/java/xyz/playedu/course/mapper/CourseHourMapper.java index 050acf9..dd28885 100644 --- a/src/main/java/xyz/playedu/api/mapper/CourseHourMapper.java +++ b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseHourMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.CourseHour; +import xyz.playedu.course.domain.CourseHour; /** * @author tengteng * @description 针对表【course_hour】的数据库操作Mapper - * @createDate 2023-03-15 10:16:45 @Entity xyz.playedu.api.domain.CourseHour + * @createDate 2023-03-15 10:16:45 */ @Mapper public interface CourseHourMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/CourseMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseMapper.java similarity index 84% rename from src/main/java/xyz/playedu/api/mapper/CourseMapper.java rename to playedu-course/src/main/java/xyz/playedu/course/mapper/CourseMapper.java index cfb2a0a..5eef298 100644 --- a/src/main/java/xyz/playedu/api/mapper/CourseMapper.java +++ b/playedu-course/src/main/java/xyz/playedu/course/mapper/CourseMapper.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.Course; -import xyz.playedu.api.types.paginate.CoursePaginateFiler; +import xyz.playedu.course.domain.Course; +import xyz.playedu.common.types.paginate.CoursePaginateFiler; import java.util.List; /** * @author tengteng * @description 针对表【courses】的数据库操作Mapper - * @createDate 2023-03-20 14:25:31 @Entity xyz.playedu.api.domain.Course + * @createDate 2023-03-20 14:25:31 */ @Mapper public interface CourseMapper extends BaseMapper { diff --git a/src/main/java/xyz/playedu/api/mapper/UserCourseHourRecordMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseHourRecordMapper.java similarity index 77% rename from src/main/java/xyz/playedu/api/mapper/UserCourseHourRecordMapper.java rename to playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseHourRecordMapper.java index 14792ac..fc5528b 100644 --- a/src/main/java/xyz/playedu/api/mapper/UserCourseHourRecordMapper.java +++ b/playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseHourRecordMapper.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.UserCourseHourRecord; -import xyz.playedu.api.types.mapper.UserCourseHourRecordCourseCountMapper; -import xyz.playedu.api.types.mapper.UserCourseHourRecordUserCountMapper; -import xyz.playedu.api.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper; -import xyz.playedu.api.types.paginate.UserCourseHourRecordPaginateFilter; +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 java.util.List; /** * @author tengteng * @description 针对表【user_course_hour_records】的数据库操作Mapper - * @createDate 2023-03-20 16:41:08 @Entity xyz.playedu.api.domain.UserCourseHourRecord + * @createDate 2023-03-20 16:41:08 */ @Mapper public interface UserCourseHourRecordMapper extends BaseMapper { diff --git a/src/main/java/xyz/playedu/api/mapper/UserCourseRecordMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseRecordMapper.java similarity index 82% rename from src/main/java/xyz/playedu/api/mapper/UserCourseRecordMapper.java rename to playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseRecordMapper.java index 84d97de..3a79d66 100644 --- a/src/main/java/xyz/playedu/api/mapper/UserCourseRecordMapper.java +++ b/playedu-course/src/main/java/xyz/playedu/course/mapper/UserCourseRecordMapper.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.UserCourseRecord; -import xyz.playedu.api.types.paginate.UserCourseRecordPaginateFilter; +import xyz.playedu.course.domain.UserCourseRecord; +import xyz.playedu.common.types.paginate.UserCourseRecordPaginateFilter; import java.util.List; /** * @author tengteng * @description 针对表【user_course_records】的数据库操作Mapper - * @createDate 2023-03-20 16:41:04 @Entity xyz.playedu.api.domain.UserCourseRecord + * @createDate 2023-03-20 16:41:04 */ @Mapper public interface UserCourseRecordMapper extends BaseMapper { diff --git a/src/main/java/xyz/playedu/api/mapper/UserLearnDurationRecordMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/UserLearnDurationRecordMapper.java similarity index 84% rename from src/main/java/xyz/playedu/api/mapper/UserLearnDurationRecordMapper.java rename to playedu-course/src/main/java/xyz/playedu/course/mapper/UserLearnDurationRecordMapper.java index 2f2be73..cf683d2 100644 --- a/src/main/java/xyz/playedu/api/mapper/UserLearnDurationRecordMapper.java +++ b/playedu-course/src/main/java/xyz/playedu/course/mapper/UserLearnDurationRecordMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.UserLearnDurationRecord; +import xyz.playedu.course.domain.UserLearnDurationRecord; /** * @author tengteng * @description 针对表【user_learn_duration_records】的数据库操作Mapper - * @createDate 2023-03-22 13:55:17 @Entity xyz.playedu.api.domain.UserLearnDurationRecord + * @createDate 2023-03-22 13:55:17 */ @Mapper public interface UserLearnDurationRecordMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/UserLearnDurationStatsMapper.java b/playedu-course/src/main/java/xyz/playedu/course/mapper/UserLearnDurationStatsMapper.java similarity index 84% rename from src/main/java/xyz/playedu/api/mapper/UserLearnDurationStatsMapper.java rename to playedu-course/src/main/java/xyz/playedu/course/mapper/UserLearnDurationStatsMapper.java index 6914e13..836bb60 100644 --- a/src/main/java/xyz/playedu/api/mapper/UserLearnDurationStatsMapper.java +++ b/playedu-course/src/main/java/xyz/playedu/course/mapper/UserLearnDurationStatsMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.UserLearnDurationStats; +import xyz.playedu.course.domain.UserLearnDurationStats; /** * @author tengteng * @description 针对表【user_learn_duration_stats】的数据库操作Mapper - * @createDate 2023-03-22 13:55:29 @Entity xyz.playedu.api.domain.UserLearnDurationStats + * @createDate 2023-03-22 13:55:29 */ @Mapper public interface UserLearnDurationStatsMapper extends BaseMapper { diff --git a/src/main/java/xyz/playedu/api/service/CourseAttachmentDownloadLogService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentDownloadLogService.java similarity index 80% rename from src/main/java/xyz/playedu/api/service/CourseAttachmentDownloadLogService.java rename to playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentDownloadLogService.java index 89c4b60..8064f9a 100644 --- a/src/main/java/xyz/playedu/api/service/CourseAttachmentDownloadLogService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentDownloadLogService.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.course.service; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.CourseAttachmentDownloadLog; -import xyz.playedu.api.types.paginate.CourseAttachmentDownloadLogPaginateFiler; -import xyz.playedu.api.types.paginate.PaginationResult; +import xyz.playedu.course.domain.CourseAttachmentDownloadLog; +import xyz.playedu.common.types.paginate.CourseAttachmentDownloadLogPaginateFiler; +import xyz.playedu.common.types.paginate.PaginationResult; @Service public interface CourseAttachmentDownloadLogService extends IService { diff --git a/src/main/java/xyz/playedu/api/service/CourseAttachmentService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentService.java similarity index 90% rename from src/main/java/xyz/playedu/api/service/CourseAttachmentService.java rename to playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentService.java index f55371d..0ff8c58 100644 --- a/src/main/java/xyz/playedu/api/service/CourseAttachmentService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/CourseAttachmentService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.course.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.CourseAttachment; -import xyz.playedu.api.exception.NotFoundException; +import xyz.playedu.course.domain.CourseAttachment; +import xyz.playedu.common.exception.NotFoundException; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/internal/ResourceCourseCategoryService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseCategoryService.java similarity index 83% rename from src/main/java/xyz/playedu/api/service/internal/ResourceCourseCategoryService.java rename to playedu-course/src/main/java/xyz/playedu/course/service/CourseCategoryService.java index c01e895..64c8185 100644 --- a/src/main/java/xyz/playedu/api/service/internal/ResourceCourseCategoryService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/CourseCategoryService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.internal; +package xyz.playedu.course.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.ResourceCourseCategory; +import xyz.playedu.course.domain.CourseCategory; import java.util.List; @@ -26,7 +26,7 @@ import java.util.List; * @description 针对表【resource_course_category】的数据库操作Service * @createDate 2023-03-09 09:54:22 */ -public interface ResourceCourseCategoryService extends IService { +public interface CourseCategoryService extends IService { List getCourseIdsByCategoryIds(List categoryIds); @@ -35,4 +35,8 @@ public interface ResourceCourseCategoryService extends IService getCategoryIdsByCourseId(Integer courseId); + + List getCourseIdsByCategoryId(Integer id); + + } diff --git a/src/main/java/xyz/playedu/api/service/CourseChapterService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseChapterService.java similarity index 90% rename from src/main/java/xyz/playedu/api/service/CourseChapterService.java rename to playedu-course/src/main/java/xyz/playedu/course/service/CourseChapterService.java index 022cc5d..14a207c 100644 --- a/src/main/java/xyz/playedu/api/service/CourseChapterService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/CourseChapterService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.course.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.CourseChapter; -import xyz.playedu.api.exception.NotFoundException; +import xyz.playedu.course.domain.CourseChapter; +import xyz.playedu.common.exception.NotFoundException; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/CourseDepartmentService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseDepartmentService.java similarity index 88% rename from src/main/java/xyz/playedu/api/service/CourseDepartmentService.java rename to playedu-course/src/main/java/xyz/playedu/course/service/CourseDepartmentService.java index 66f513f..064334a 100644 --- a/src/main/java/xyz/playedu/api/service/CourseDepartmentService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/CourseDepartmentService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.course.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.CourseDepartment; +import xyz.playedu.course.domain.CourseDepartment; import java.util.List; @@ -33,4 +33,6 @@ public interface CourseDepartmentService extends IService { List getDepIdsByCourseId(Integer courseId); void removeByCourseId(Integer courseId); + + List getCourseIdsByDepId(Integer depId); } diff --git a/src/main/java/xyz/playedu/api/service/CourseHourService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseHourService.java similarity index 92% rename from src/main/java/xyz/playedu/api/service/CourseHourService.java rename to playedu-course/src/main/java/xyz/playedu/course/service/CourseHourService.java index 4e0c402..60f509f 100644 --- a/src/main/java/xyz/playedu/api/service/CourseHourService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/CourseHourService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.course.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.CourseHour; -import xyz.playedu.api.exception.NotFoundException; +import xyz.playedu.course.domain.CourseHour; +import xyz.playedu.common.exception.NotFoundException; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/CourseService.java b/playedu-course/src/main/java/xyz/playedu/course/service/CourseService.java similarity index 91% rename from src/main/java/xyz/playedu/api/service/CourseService.java rename to playedu-course/src/main/java/xyz/playedu/course/service/CourseService.java index bdb721c..9ad76f3 100644 --- a/src/main/java/xyz/playedu/api/service/CourseService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/CourseService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.course.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.Course; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.types.paginate.CoursePaginateFiler; -import xyz.playedu.api.types.paginate.PaginationResult; +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 java.util.List; import java.util.Map; diff --git a/src/main/java/xyz/playedu/api/service/UserCourseHourRecordService.java b/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseHourRecordService.java similarity index 81% rename from src/main/java/xyz/playedu/api/service/UserCourseHourRecordService.java rename to playedu-course/src/main/java/xyz/playedu/course/service/UserCourseHourRecordService.java index 621f3c1..77c2608 100644 --- a/src/main/java/xyz/playedu/api/service/UserCourseHourRecordService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseHourRecordService.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.course.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.UserCourseHourRecord; -import xyz.playedu.api.types.mapper.UserCourseHourRecordCourseCountMapper; -import xyz.playedu.api.types.mapper.UserCourseHourRecordUserCountMapper; -import xyz.playedu.api.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.types.paginate.UserCourseHourRecordPaginateFilter; +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 java.util.List; @@ -34,7 +34,7 @@ import java.util.List; public interface UserCourseHourRecordService extends IService { UserCourseHourRecord find(Integer userId, Integer courseId, Integer hourId); - void storeOrUpdate( + boolean storeOrUpdate( Integer userId, Integer courseId, Integer hourId, diff --git a/src/main/java/xyz/playedu/api/service/UserCourseRecordService.java b/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseRecordService.java similarity index 88% rename from src/main/java/xyz/playedu/api/service/UserCourseRecordService.java rename to playedu-course/src/main/java/xyz/playedu/course/service/UserCourseRecordService.java index 828e721..9679023 100644 --- a/src/main/java/xyz/playedu/api/service/UserCourseRecordService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseRecordService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.course.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.UserCourseRecord; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.types.paginate.UserCourseRecordPaginateFilter; +import xyz.playedu.course.domain.UserCourseRecord; +import xyz.playedu.common.types.paginate.PaginationResult; +import xyz.playedu.common.types.paginate.UserCourseRecordPaginateFilter; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/UserLearnDurationRecordService.java b/playedu-course/src/main/java/xyz/playedu/course/service/UserLearnDurationRecordService.java similarity index 91% rename from src/main/java/xyz/playedu/api/service/UserLearnDurationRecordService.java rename to playedu-course/src/main/java/xyz/playedu/course/service/UserLearnDurationRecordService.java index 9df4e28..4f3d847 100644 --- a/src/main/java/xyz/playedu/api/service/UserLearnDurationRecordService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/UserLearnDurationRecordService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.course.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.UserLearnDurationRecord; +import xyz.playedu.course.domain.UserLearnDurationRecord; /** * @author tengteng diff --git a/src/main/java/xyz/playedu/api/service/UserLearnDurationStatsService.java b/playedu-course/src/main/java/xyz/playedu/course/service/UserLearnDurationStatsService.java similarity index 93% rename from src/main/java/xyz/playedu/api/service/UserLearnDurationStatsService.java rename to playedu-course/src/main/java/xyz/playedu/course/service/UserLearnDurationStatsService.java index 75319d9..54a2b21 100644 --- a/src/main/java/xyz/playedu/api/service/UserLearnDurationStatsService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/UserLearnDurationStatsService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.course.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.UserLearnDurationStats; +import xyz.playedu.course.domain.UserLearnDurationStats; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/impl/CourseAttachmentDownloadLogServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentDownloadLogServiceImpl.java similarity index 79% rename from src/main/java/xyz/playedu/api/service/impl/CourseAttachmentDownloadLogServiceImpl.java rename to playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentDownloadLogServiceImpl.java index ff25d69..0e0a4a7 100644 --- a/src/main/java/xyz/playedu/api/service/impl/CourseAttachmentDownloadLogServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentDownloadLogServiceImpl.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.course.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.CourseAttachmentDownloadLog; -import xyz.playedu.api.mapper.CourseAttachmentDownloadLogMapper; -import xyz.playedu.api.service.CourseAttachmentDownloadLogService; -import xyz.playedu.api.types.paginate.CourseAttachmentDownloadLogPaginateFiler; -import xyz.playedu.api.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/src/main/java/xyz/playedu/api/service/impl/internal/CourseAttachmentServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentServiceImpl.java similarity index 93% rename from src/main/java/xyz/playedu/api/service/impl/internal/CourseAttachmentServiceImpl.java rename to playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentServiceImpl.java index 01be726..a6ffddf 100644 --- a/src/main/java/xyz/playedu/api/service/impl/internal/CourseAttachmentServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseAttachmentServiceImpl.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl.internal; +package xyz.playedu.course.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.CourseAttachment; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.mapper.CourseAttachmentMapper; -import xyz.playedu.api.service.CourseAttachmentService; +import xyz.playedu.course.domain.CourseAttachment; +import xyz.playedu.common.exception.NotFoundException; +import xyz.playedu.course.mapper.CourseAttachmentMapper; +import xyz.playedu.course.service.CourseAttachmentService; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/xyz/playedu/api/service/impl/internal/ResourceCourseCategoryServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseCategoryServiceImpl.java similarity index 69% rename from src/main/java/xyz/playedu/api/service/impl/internal/ResourceCourseCategoryServiceImpl.java rename to playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseCategoryServiceImpl.java index b3f05c5..a8d059d 100644 --- a/src/main/java/xyz/playedu/api/service/impl/internal/ResourceCourseCategoryServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseCategoryServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl.internal; +package xyz.playedu.course.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.ResourceCourseCategory; -import xyz.playedu.api.mapper.ResourceCourseCategoryMapper; -import xyz.playedu.api.service.internal.ResourceCourseCategoryService; +import xyz.playedu.course.domain.CourseCategory; +import xyz.playedu.course.mapper.CourseCategoryMapper; +import xyz.playedu.course.service.CourseCategoryService; import java.util.List; @@ -31,14 +31,14 @@ import java.util.List; * @createDate 2023-03-09 09:54:22 */ @Service -public class ResourceCourseCategoryServiceImpl - extends ServiceImpl - implements ResourceCourseCategoryService { +public class CourseCategoryServiceImpl + extends ServiceImpl + implements CourseCategoryService { @Override public List getCourseIdsByCategoryIds(List categoryIds) { return list(query().getWrapper().in("category_id", categoryIds)).stream() - .map(ResourceCourseCategory::getCourseId) + .map(CourseCategory::getCourseId) .toList(); } @@ -55,7 +55,15 @@ public class ResourceCourseCategoryServiceImpl @Override public List getCategoryIdsByCourseId(Integer courseId) { return list(query().getWrapper().eq("course_id", courseId)).stream() - .map(ResourceCourseCategory::getCategoryId) + .map(CourseCategory::getCategoryId) + .toList(); + } + + @Override + public List getCourseIdsByCategoryId(Integer id) { + return list(query().getWrapper().eq("category_id", id)) + .stream() + .map(CourseCategory::getCourseId) .toList(); } } diff --git a/src/main/java/xyz/playedu/api/service/impl/CourseChapterServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseChapterServiceImpl.java similarity index 92% rename from src/main/java/xyz/playedu/api/service/impl/CourseChapterServiceImpl.java rename to playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseChapterServiceImpl.java index 3532954..f812d49 100644 --- a/src/main/java/xyz/playedu/api/service/impl/CourseChapterServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseChapterServiceImpl.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.course.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.CourseChapter; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.mapper.CourseChapterMapper; -import xyz.playedu.api.service.CourseChapterService; +import xyz.playedu.course.domain.CourseChapter; +import xyz.playedu.common.exception.NotFoundException; +import xyz.playedu.course.mapper.CourseChapterMapper; +import xyz.playedu.course.service.CourseChapterService; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/xyz/playedu/api/service/impl/CourseDepartmentServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseDepartmentServiceImpl.java similarity index 78% rename from src/main/java/xyz/playedu/api/service/impl/CourseDepartmentServiceImpl.java rename to playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseDepartmentServiceImpl.java index 91aa947..c3280d6 100644 --- a/src/main/java/xyz/playedu/api/service/impl/CourseDepartmentServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseDepartmentServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.course.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.CourseDepartment; -import xyz.playedu.api.mapper.CourseDepartmentMapper; -import xyz.playedu.api.service.CourseDepartmentService; +import xyz.playedu.course.domain.CourseDepartment; +import xyz.playedu.course.mapper.CourseDepartmentMapper; +import xyz.playedu.course.service.CourseDepartmentService; import java.util.List; @@ -52,4 +52,12 @@ public class CourseDepartmentServiceImpl public void removeByCourseId(Integer courseId) { remove(query().getWrapper().eq("course_id", courseId)); } + + @Override + public List getCourseIdsByDepId(Integer depId) { + return list(query().getWrapper().eq("dep_id", depId)) + .stream() + .map(CourseDepartment::getCourseId) + .toList(); + } } diff --git a/src/main/java/xyz/playedu/api/service/impl/CourseHourServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseHourServiceImpl.java similarity index 94% rename from src/main/java/xyz/playedu/api/service/impl/CourseHourServiceImpl.java rename to playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseHourServiceImpl.java index 976e114..bd72fb1 100644 --- a/src/main/java/xyz/playedu/api/service/impl/CourseHourServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseHourServiceImpl.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.course.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.CourseHour; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.mapper.CourseHourMapper; -import xyz.playedu.api.service.CourseHourService; +import xyz.playedu.course.domain.CourseHour; +import xyz.playedu.common.exception.NotFoundException; +import xyz.playedu.course.mapper.CourseHourMapper; +import xyz.playedu.course.service.CourseHourService; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseServiceImpl.java similarity index 89% rename from src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java rename to playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseServiceImpl.java index 3e86693..de838f4 100644 --- a/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/CourseServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.course.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -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.api.domain.Course; -import xyz.playedu.api.domain.CourseDepartment; -import xyz.playedu.api.domain.ResourceCourseCategory; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.mapper.CourseMapper; -import xyz.playedu.api.service.CourseDepartmentService; -import xyz.playedu.api.service.CourseService; -import xyz.playedu.api.service.internal.ResourceCourseCategoryService; -import xyz.playedu.api.types.paginate.CoursePaginateFiler; -import xyz.playedu.api.types.paginate.PaginationResult; +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 java.util.*; import java.util.stream.Collectors; @@ -45,7 +45,7 @@ public class CourseServiceImpl extends ServiceImpl impleme @Autowired private CourseDepartmentService courseDepartmentService; - @Autowired private ResourceCourseCategoryService courseCategoryService; + @Autowired private CourseCategoryService courseCategoryService; @Override public PaginationResult paginate(int page, int size, CoursePaginateFiler filter) { @@ -117,18 +117,18 @@ public class CourseServiceImpl extends ServiceImpl impleme if (categoryIds == null || categoryIds.length == 0) { return; } - List resourceCourseCategories = new ArrayList<>(); + List courseCategories = new ArrayList<>(); for (int i = 0; i < categoryIds.length; i++) { Integer tmpCategoryId = categoryIds[i]; - resourceCourseCategories.add( - new ResourceCourseCategory() { + courseCategories.add( + new CourseCategory() { { setCategoryId(tmpCategoryId); setCourseId(course.getId()); } }); } - courseCategoryService.saveBatch(resourceCourseCategories); + courseCategoryService.saveBatch(courseCategories); } @Override @@ -262,17 +262,17 @@ public class CourseServiceImpl extends ServiceImpl impleme if (courseIds == null || courseIds.size() == 0) { return null; } - Map> data = + Map> data = courseCategoryService .list(courseCategoryService.query().getWrapper().in("course_id", courseIds)) .stream() - .collect(Collectors.groupingBy(ResourceCourseCategory::getCourseId)); + .collect(Collectors.groupingBy(CourseCategory::getCourseId)); Map> result = new HashMap<>(); data.forEach( (courseId, records) -> { result.put( courseId, - records.stream().map(ResourceCourseCategory::getCategoryId).toList()); + records.stream().map(CourseCategory::getCategoryId).toList()); }); return result; } diff --git a/src/main/java/xyz/playedu/api/service/impl/UserCourseHourRecordServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseHourRecordServiceImpl.java similarity index 86% rename from src/main/java/xyz/playedu/api/service/impl/UserCourseHourRecordServiceImpl.java rename to playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseHourRecordServiceImpl.java index 0e7eb5b..207c9cd 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UserCourseHourRecordServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseHourRecordServiceImpl.java @@ -13,23 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.course.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.UserCourseHourRecord; -import xyz.playedu.api.event.UserCourseHourFinishedEvent; -import xyz.playedu.api.mapper.UserCourseHourRecordMapper; -import xyz.playedu.api.service.UserCourseHourRecordService; -import xyz.playedu.api.types.mapper.UserCourseHourRecordCourseCountMapper; -import xyz.playedu.api.types.mapper.UserCourseHourRecordUserCountMapper; -import xyz.playedu.api.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.types.paginate.UserCourseHourRecordPaginateFilter; +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 java.util.ArrayList; import java.util.Date; @@ -45,8 +42,6 @@ public class UserCourseHourRecordServiceImpl extends ServiceImpl implements UserCourseHourRecordService { - @Autowired private ApplicationContext ctx; - @Override public UserCourseHourRecord find(Integer userId, Integer courseId, Integer hourId) { return getOne( @@ -57,7 +52,7 @@ public class UserCourseHourRecordServiceImpl } @Override - public void storeOrUpdate( + public boolean storeOrUpdate( Integer userId, Integer courseId, Integer hourId, @@ -67,7 +62,7 @@ public class UserCourseHourRecordServiceImpl // 记录存在 && 已看完 => 跳过处理 if (record != null && record.getIsFinished() == 1) { - return; + return false; } // 是否看完 @@ -97,10 +92,7 @@ public class UserCourseHourRecordServiceImpl updateById(updateRecord); } - - if (isFinished) { - ctx.publishEvent(new UserCourseHourFinishedEvent(this, userId, courseId, hourId)); - } + return isFinished; } @Override diff --git a/src/main/java/xyz/playedu/api/service/impl/UserCourseRecordServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java similarity index 94% rename from src/main/java/xyz/playedu/api/service/impl/UserCourseRecordServiceImpl.java rename to playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java index 5448b73..fc84dec 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UserCourseRecordServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.course.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.UserCourseRecord; -import xyz.playedu.api.mapper.UserCourseRecordMapper; -import xyz.playedu.api.service.UserCourseRecordService; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.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/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationRecordServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserLearnDurationRecordServiceImpl.java similarity index 89% rename from src/main/java/xyz/playedu/api/service/impl/UserLearnDurationRecordServiceImpl.java rename to playedu-course/src/main/java/xyz/playedu/course/service/impl/UserLearnDurationRecordServiceImpl.java index 599d483..c357f8b 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationRecordServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserLearnDurationRecordServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.course.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -21,9 +21,9 @@ import lombok.SneakyThrows; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.UserLearnDurationRecord; -import xyz.playedu.api.mapper.UserLearnDurationRecordMapper; -import xyz.playedu.api.service.UserLearnDurationRecordService; +import xyz.playedu.course.domain.UserLearnDurationRecord; +import xyz.playedu.course.mapper.UserLearnDurationRecordMapper; +import xyz.playedu.course.service.UserLearnDurationRecordService; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserLearnDurationStatsServiceImpl.java similarity index 94% rename from src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java rename to playedu-course/src/main/java/xyz/playedu/course/service/impl/UserLearnDurationStatsServiceImpl.java index f436987..f32f39e 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserLearnDurationStatsServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.course.service.impl; import cn.hutool.core.date.DateTime; @@ -23,9 +23,9 @@ import lombok.SneakyThrows; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.UserLearnDurationStats; -import xyz.playedu.api.mapper.UserLearnDurationStatsMapper; -import xyz.playedu.api.service.UserLearnDurationStatsService; +import xyz.playedu.course.domain.UserLearnDurationStats; +import xyz.playedu.course.mapper.UserLearnDurationStatsMapper; +import xyz.playedu.course.service.UserLearnDurationStatsService; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/resources/mapper/UserLearnDurationRecordMapper.xml b/playedu-course/src/main/resources/mapper/BackendPermission.xml similarity index 83% rename from src/main/resources/mapper/UserLearnDurationRecordMapper.xml rename to playedu-course/src/main/resources/mapper/BackendPermission.xml index 368218e..83550c0 100644 --- a/src/main/resources/mapper/UserLearnDurationRecordMapper.xml +++ b/playedu-course/src/main/resources/mapper/BackendPermission.xml @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + id,user_id,created_date, duration,start_at,end_at, - course_id,hour_id - - + course_id,hour_id + + diff --git a/src/main/resources/mapper/CourseAttachmentDownloadLogMapper.xml b/playedu-course/src/main/resources/mapper/CourseAttachmentDownloadLogMapper.xml similarity index 92% rename from src/main/resources/mapper/CourseAttachmentDownloadLogMapper.xml rename to playedu-course/src/main/resources/mapper/CourseAttachmentDownloadLogMapper.xml index 2bb841a..f508edf 100644 --- a/src/main/resources/mapper/CourseAttachmentDownloadLogMapper.xml +++ b/playedu-course/src/main/resources/mapper/CourseAttachmentDownloadLogMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -21,7 +21,7 @@ ip,created_at - SELECT `course_attachment_download_log`.* FROM `course_attachment_download_log` diff --git a/src/main/resources/mapper/CourseAttachmentMapper.xml b/playedu-course/src/main/resources/mapper/CourseAttachmentMapper.xml similarity index 84% rename from src/main/resources/mapper/CourseAttachmentMapper.xml rename to playedu-course/src/main/resources/mapper/CourseAttachmentMapper.xml index 77065cd..168200f 100644 --- a/src/main/resources/mapper/CourseAttachmentMapper.xml +++ b/playedu-course/src/main/resources/mapper/CourseAttachmentMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/ResourceCourseCategoryMapper.xml b/playedu-course/src/main/resources/mapper/CourseCategoryMapper.xml similarity index 70% rename from src/main/resources/mapper/ResourceCourseCategoryMapper.xml rename to playedu-course/src/main/resources/mapper/CourseCategoryMapper.xml index c9b8b65..22cfab5 100644 --- a/src/main/resources/mapper/ResourceCourseCategoryMapper.xml +++ b/playedu-course/src/main/resources/mapper/CourseCategoryMapper.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - course_id,category_id - - + + + + + + + + + + + course_id,category_id + + diff --git a/src/main/resources/mapper/CourseChapterMapper.xml b/playedu-course/src/main/resources/mapper/CourseChapterMapper.xml similarity index 82% rename from src/main/resources/mapper/CourseChapterMapper.xml rename to playedu-course/src/main/resources/mapper/CourseChapterMapper.xml index b3a5b24..564185e 100644 --- a/src/main/resources/mapper/CourseChapterMapper.xml +++ b/playedu-course/src/main/resources/mapper/CourseChapterMapper.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + id,course_id,name, - sort,created_at,updated_at - - + sort,created_at,updated_at + + diff --git a/src/main/resources/mapper/CourseDepartmentMapper.xml b/playedu-course/src/main/resources/mapper/CourseDepartmentMapper.xml similarity index 71% rename from src/main/resources/mapper/CourseDepartmentMapper.xml rename to playedu-course/src/main/resources/mapper/CourseDepartmentMapper.xml index 6976e5a..5f24962 100644 --- a/src/main/resources/mapper/CourseDepartmentMapper.xml +++ b/playedu-course/src/main/resources/mapper/CourseDepartmentMapper.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - course_id,dep_id - - + + + + + + + + + + + course_id,dep_id + + diff --git a/src/main/resources/mapper/CourseHourMapper.xml b/playedu-course/src/main/resources/mapper/CourseHourMapper.xml similarity index 86% rename from src/main/resources/mapper/CourseHourMapper.xml rename to playedu-course/src/main/resources/mapper/CourseHourMapper.xml index 913710e..55c6581 100644 --- a/src/main/resources/mapper/CourseHourMapper.xml +++ b/playedu-course/src/main/resources/mapper/CourseHourMapper.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + id,course_id,chapter_id, sort,title,type, - rid,duration,created_at - - + rid,duration,created_at + + diff --git a/src/main/resources/mapper/CourseMapper.xml b/playedu-course/src/main/resources/mapper/CourseMapper.xml similarity index 94% rename from src/main/resources/mapper/CourseMapper.xml rename to playedu-course/src/main/resources/mapper/CourseMapper.xml index 45b095d..6d86571 100644 --- a/src/main/resources/mapper/CourseMapper.xml +++ b/playedu-course/src/main/resources/mapper/CourseMapper.xml @@ -1,185 +1,185 @@ - - - - - - - - - - - - - - - - - - - - id,title,thumb,short_desc, - charge,class_hour,is_show, - is_required,created_at,updated_at, - deleted_at - - - - - - - + + + + + + + + + + + + + + + + + + + + id,title,thumb,short_desc, + charge,class_hour,is_show, + is_required,created_at,updated_at, + deleted_at + + + + + + + diff --git a/src/main/resources/mapper/UserCourseHourRecordMapper.xml b/playedu-course/src/main/resources/mapper/UserCourseHourRecordMapper.xml similarity index 88% rename from src/main/resources/mapper/UserCourseHourRecordMapper.xml rename to playedu-course/src/main/resources/mapper/UserCourseHourRecordMapper.xml index f2038dc..a172583 100644 --- a/src/main/resources/mapper/UserCourseHourRecordMapper.xml +++ b/playedu-course/src/main/resources/mapper/UserCourseHourRecordMapper.xml @@ -1,149 +1,149 @@ - - - - - - - - - - - - - - - - - - - - id,user_id,course_id, - hour_id,total_duration,finished_duration, - real_duration,is_finished,finished_at, - created_at,updated_at - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + id,user_id,course_id, + hour_id,total_duration,finished_duration, + real_duration,is_finished,finished_at, + created_at,updated_at + + + + + + + + + + + diff --git a/src/main/resources/mapper/UserCourseRecordMapper.xml b/playedu-course/src/main/resources/mapper/UserCourseRecordMapper.xml similarity index 93% rename from src/main/resources/mapper/UserCourseRecordMapper.xml rename to playedu-course/src/main/resources/mapper/UserCourseRecordMapper.xml index 0273eb8..434b0a1 100644 --- a/src/main/resources/mapper/UserCourseRecordMapper.xml +++ b/playedu-course/src/main/resources/mapper/UserCourseRecordMapper.xml @@ -1,115 +1,115 @@ - - - - - - - - - - - - - - - - - - - id,user_id,course_id, - hour_count,finished_count,progress, - is_finished,finished_at,created_at, - updated_at - - - - + + + + + + + + + + + + + + + + + + + id,user_id,course_id, + hour_count,finished_count,progress, + is_finished,finished_at,created_at, + updated_at + + + + diff --git a/src/main/resources/mapper/UserLearnDurationStatsMapper.xml b/playedu-course/src/main/resources/mapper/UserLearnDurationStatsMapper.xml similarity index 80% rename from src/main/resources/mapper/UserLearnDurationStatsMapper.xml rename to playedu-course/src/main/resources/mapper/UserLearnDurationStatsMapper.xml index 7b32623..e532b09 100644 --- a/src/main/resources/mapper/UserLearnDurationStatsMapper.xml +++ b/playedu-course/src/main/resources/mapper/UserLearnDurationStatsMapper.xml @@ -1,23 +1,23 @@ - - - - - - - - - - - - - id,user_id,duration, - created_date - - - + + + + + + + + + + + + + id,user_id,duration, + created_date + + + diff --git a/playedu-resource/pom.xml b/playedu-resource/pom.xml new file mode 100644 index 0000000..9cd6dd0 --- /dev/null +++ b/playedu-resource/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + xyz.playedu + playedu + 1.2 + + + playedu-resource + + + + xyz.playedu + playedu-common + 1.2 + + + \ No newline at end of file diff --git a/src/main/java/xyz/playedu/api/domain/Resource.java b/playedu-resource/src/main/java/xyz/playedu/resource/domain/Resource.java similarity index 99% rename from src/main/java/xyz/playedu/api/domain/Resource.java rename to playedu-resource/src/main/java/xyz/playedu/resource/domain/Resource.java index e794e6f..ecfbfb5 100644 --- a/src/main/java/xyz/playedu/api/domain/Resource.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/domain/Resource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.resource.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -21,7 +21,6 @@ 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/src/main/java/xyz/playedu/api/domain/ResourceCategoryRelation.java b/playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceCategory.java similarity index 93% rename from src/main/java/xyz/playedu/api/domain/ResourceCategoryRelation.java rename to playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceCategory.java index 8870d78..e83a746 100644 --- a/src/main/java/xyz/playedu/api/domain/ResourceCategoryRelation.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceCategory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.resource.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -27,7 +27,7 @@ import java.io.Serializable; */ @TableName(value = "resource_category") @Data -public class ResourceCategoryRelation implements Serializable { +public class ResourceCategory implements Serializable { /** */ private Integer cid; @@ -48,7 +48,7 @@ public class ResourceCategoryRelation implements Serializable { if (getClass() != that.getClass()) { return false; } - ResourceCategoryRelation other = (ResourceCategoryRelation) that; + ResourceCategory other = (ResourceCategory) that; return (this.getCid() == null ? other.getCid() == null : this.getCid().equals(other.getCid())) diff --git a/src/main/java/xyz/playedu/api/domain/ResourceVideo.java b/playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceVideo.java similarity index 98% rename from src/main/java/xyz/playedu/api/domain/ResourceVideo.java rename to playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceVideo.java index 6a7f273..a5d3914 100644 --- a/src/main/java/xyz/playedu/api/domain/ResourceVideo.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceVideo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.domain; +package xyz.playedu.resource.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/xyz/playedu/api/mapper/ResourceCategoryMapper.java b/playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceCategoryMapper.java similarity index 77% rename from src/main/java/xyz/playedu/api/mapper/ResourceCategoryMapper.java rename to playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceCategoryMapper.java index 0e3f6c3..1034520 100644 --- a/src/main/java/xyz/playedu/api/mapper/ResourceCategoryMapper.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceCategoryMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.resource.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.ResourceCategory; +import xyz.playedu.resource.domain.ResourceCategory; /** * @author tengteng - * @description 针对表【resource_categories】的数据库操作Mapper - * @createDate 2023-03-08 16:50:54 @Entity xyz.playedu.api.domain.ResourceCategory + * @description 针对表【resource_category】的数据库操作Mapper + * @createDate 2023-03-08 16:54:56 */ @Mapper public interface ResourceCategoryMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java b/playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceMapper.java similarity index 83% rename from src/main/java/xyz/playedu/api/mapper/ResourceMapper.java rename to playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceMapper.java index 1e6f459..cc5725d 100644 --- a/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceMapper.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.resource.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.Resource; -import xyz.playedu.api.types.paginate.ResourcePaginateFilter; +import xyz.playedu.resource.domain.Resource; +import xyz.playedu.common.types.paginate.ResourcePaginateFilter; import java.util.List; /** * @author tengteng * @description 针对表【resources】的数据库操作Mapper - * @createDate 2023-03-13 10:25:30 @Entity xyz.playedu.api.domain.Resource + * @createDate 2023-03-13 10:25:30 */ @Mapper public interface ResourceMapper extends BaseMapper { diff --git a/src/main/java/xyz/playedu/api/mapper/ResourceVideoMapper.java b/playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceVideoMapper.java similarity index 85% rename from src/main/java/xyz/playedu/api/mapper/ResourceVideoMapper.java rename to playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceVideoMapper.java index 1389ac7..7c8357f 100644 --- a/src/main/java/xyz/playedu/api/mapper/ResourceVideoMapper.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/mapper/ResourceVideoMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.mapper; +package xyz.playedu.resource.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xyz.playedu.api.domain.ResourceVideo; +import xyz.playedu.resource.domain.ResourceVideo; /** * @author tengteng * @description 针对表【resource_videos】的数据库操作Mapper - * @createDate 2023-03-08 13:39:06 @Entity xyz.playedu.api.domain.ResourceVideo + * @createDate 2023-03-08 13:39:06 */ @Mapper public interface ResourceVideoMapper extends BaseMapper {} diff --git a/src/main/java/xyz/playedu/api/service/internal/ResourceCategoryRelationService.java b/playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceCategoryService.java similarity index 77% rename from src/main/java/xyz/playedu/api/service/internal/ResourceCategoryRelationService.java rename to playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceCategoryService.java index d29395c..9bea696 100644 --- a/src/main/java/xyz/playedu/api/service/internal/ResourceCategoryRelationService.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceCategoryService.java @@ -13,14 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.internal; +package xyz.playedu.resource.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.ResourceCategoryRelation; +import xyz.playedu.resource.domain.ResourceCategory; import java.util.List; -public interface ResourceCategoryRelationService extends IService { +public interface ResourceCategoryService extends IService { void rebuild(Integer resourceId, List categoryIds); + + List getRidsByCategoryId(Integer id); } diff --git a/src/main/java/xyz/playedu/api/service/ResourceService.java b/playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceService.java similarity index 86% rename from src/main/java/xyz/playedu/api/service/ResourceService.java rename to playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceService.java index 28d4aab..2f128e9 100644 --- a/src/main/java/xyz/playedu/api/service/ResourceService.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.resource.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.Resource; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.types.paginate.ResourcePaginateFilter; +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 java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/ResourceVideoService.java b/playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceVideoService.java similarity index 92% rename from src/main/java/xyz/playedu/api/service/ResourceVideoService.java rename to playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceVideoService.java index aaccced..dd128b0 100644 --- a/src/main/java/xyz/playedu/api/service/ResourceVideoService.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/service/ResourceVideoService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.resource.service; import com.baomidou.mybatisplus.extension.service.IService; -import xyz.playedu.api.domain.ResourceVideo; +import xyz.playedu.resource.domain.ResourceVideo; import java.util.List; diff --git a/src/main/java/xyz/playedu/api/service/UploadService.java b/playedu-resource/src/main/java/xyz/playedu/resource/service/UploadService.java similarity index 83% rename from src/main/java/xyz/playedu/api/service/UploadService.java rename to playedu-resource/src/main/java/xyz/playedu/resource/service/UploadService.java index 717e154..fff12bc 100644 --- a/src/main/java/xyz/playedu/api/service/UploadService.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/service/UploadService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service; +package xyz.playedu.resource.service; import org.springframework.web.multipart.MultipartFile; -import xyz.playedu.api.domain.Resource; -import xyz.playedu.api.domain.UserUploadImageLog; -import xyz.playedu.api.exception.ServiceException; -import xyz.playedu.api.types.UploadFileInfo; +import xyz.playedu.resource.domain.Resource; +import xyz.playedu.common.domain.UserUploadImageLog; +import xyz.playedu.common.exception.ServiceException; +import xyz.playedu.common.types.UploadFileInfo; /** * @Author 杭州白书科技有限公司 diff --git a/src/main/java/xyz/playedu/api/service/impl/internal/ResourceCategoryRelationServiceImpl.java b/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceCategoryServiceImpl.java similarity index 65% rename from src/main/java/xyz/playedu/api/service/impl/internal/ResourceCategoryRelationServiceImpl.java rename to playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceCategoryServiceImpl.java index 450c064..0dc7273 100644 --- a/src/main/java/xyz/playedu/api/service/impl/internal/ResourceCategoryRelationServiceImpl.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceCategoryServiceImpl.java @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl.internal; +package xyz.playedu.resource.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.ResourceCategoryRelation; -import xyz.playedu.api.mapper.ResourceCategoryRelationMapper; -import xyz.playedu.api.service.internal.ResourceCategoryRelationService; +import xyz.playedu.resource.domain.ResourceCategory; +import xyz.playedu.resource.mapper.ResourceCategoryMapper; +import xyz.playedu.resource.service.ResourceCategoryService; import java.util.ArrayList; import java.util.List; @Service -public class ResourceCategoryRelationServiceImpl - extends ServiceImpl - implements ResourceCategoryRelationService { +public class ResourceCategoryServiceImpl + extends ServiceImpl + implements ResourceCategoryService { @Override public void rebuild(Integer resourceId, List categoryIds) { remove(query().getWrapper().eq("rid", resourceId)); - List data = new ArrayList<>(); + List data = new ArrayList<>(); categoryIds.forEach( categoryId -> { data.add( - new ResourceCategoryRelation() { + new ResourceCategory() { { setCid(categoryId); setRid(resourceId); @@ -48,4 +48,11 @@ public class ResourceCategoryRelationServiceImpl saveBatch(data); } + + @Override + public List getRidsByCategoryId(Integer id) { + return list(query().getWrapper().in("cid", id)).stream() + .map(ResourceCategory::getRid) + .toList(); + } } diff --git a/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java b/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceServiceImpl.java similarity index 86% rename from src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java rename to playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceServiceImpl.java index 5d64d85..c57934f 100644 --- a/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.resource.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -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.api.domain.Resource; -import xyz.playedu.api.domain.ResourceCategoryRelation; -import xyz.playedu.api.domain.ResourceVideo; -import xyz.playedu.api.exception.NotFoundException; -import xyz.playedu.api.mapper.ResourceMapper; -import xyz.playedu.api.service.ResourceService; -import xyz.playedu.api.service.ResourceVideoService; -import xyz.playedu.api.service.internal.ResourceCategoryRelationService; -import xyz.playedu.api.types.paginate.PaginationResult; -import xyz.playedu.api.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.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.*; @@ -45,7 +45,7 @@ public class ResourceServiceImpl extends ServiceImpl @Autowired private ResourceVideoService resourceVideoService; - @Autowired private ResourceCategoryRelationService relationService; + @Autowired private ResourceCategoryService relationService; @Override public PaginationResult paginate(int page, int size, ResourcePaginateFilter filter) { @@ -93,14 +93,14 @@ public class ResourceServiceImpl extends ServiceImpl if (categoryIds != null && categoryIds.trim().length() > 0) { String[] idArray = categoryIds.split(","); - List relations = new ArrayList<>(); + List relations = new ArrayList<>(); for (String s : idArray) { int tmpId = Integer.parseInt(s); if (tmpId == 0) { continue; } relations.add( - new ResourceCategoryRelation() { + new ResourceCategory() { { setCid(tmpId); setRid(resource.getId()); @@ -183,7 +183,7 @@ public class ResourceServiceImpl extends ServiceImpl return relationService .list(relationService.query().getWrapper().eq("rid", resourceId)) .stream() - .map(ResourceCategoryRelation::getCid) + .map(ResourceCategory::getCid) .toList(); } } diff --git a/src/main/java/xyz/playedu/api/service/impl/ResourceVideoServiceImpl.java b/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceVideoServiceImpl.java similarity index 89% rename from src/main/java/xyz/playedu/api/service/impl/ResourceVideoServiceImpl.java rename to playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceVideoServiceImpl.java index 82ea306..f1c0c65 100644 --- a/src/main/java/xyz/playedu/api/service/impl/ResourceVideoServiceImpl.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/ResourceVideoServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.resource.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import xyz.playedu.api.domain.ResourceVideo; -import xyz.playedu.api.mapper.ResourceVideoMapper; -import xyz.playedu.api.service.ResourceVideoService; +import xyz.playedu.resource.domain.ResourceVideo; +import xyz.playedu.resource.mapper.ResourceVideoMapper; +import xyz.playedu.resource.service.ResourceVideoService; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/xyz/playedu/api/service/impl/UploadServiceImpl.java b/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/UploadServiceImpl.java similarity index 89% rename from src/main/java/xyz/playedu/api/service/impl/UploadServiceImpl.java rename to playedu-resource/src/main/java/xyz/playedu/resource/service/impl/UploadServiceImpl.java index f9fde7f..e79a6a1 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UploadServiceImpl.java +++ b/playedu-resource/src/main/java/xyz/playedu/resource/service/impl/UploadServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.service.impl; +package xyz.playedu.resource.service.impl; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -22,18 +22,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import xyz.playedu.api.constant.BackendConstant; -import xyz.playedu.api.constant.FrontendConstant; -import xyz.playedu.api.domain.Resource; -import xyz.playedu.api.domain.UserUploadImageLog; -import xyz.playedu.api.exception.ServiceException; -import xyz.playedu.api.service.MinioService; -import xyz.playedu.api.service.ResourceService; -import xyz.playedu.api.service.UploadService; -import xyz.playedu.api.service.UserUploadImageLogService; -import xyz.playedu.api.types.UploadFileInfo; -import xyz.playedu.api.util.Base64Util; -import xyz.playedu.api.util.HelperUtil; +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 java.util.Date; diff --git a/src/main/resources/mapper/ResourceCategoryRelationMapper.xml b/playedu-resource/src/main/resources/mapper/ResourceCategoryMapper.xml similarity index 68% rename from src/main/resources/mapper/ResourceCategoryRelationMapper.xml rename to playedu-resource/src/main/resources/mapper/ResourceCategoryMapper.xml index c5ce37f..7a21860 100644 --- a/src/main/resources/mapper/ResourceCategoryRelationMapper.xml +++ b/playedu-resource/src/main/resources/mapper/ResourceCategoryMapper.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - cid,rid - - + + + + + + + + + + + cid,rid + + diff --git a/src/main/resources/mapper/ResourceMapper.xml b/playedu-resource/src/main/resources/mapper/ResourceMapper.xml similarity index 95% rename from src/main/resources/mapper/ResourceMapper.xml rename to playedu-resource/src/main/resources/mapper/ResourceMapper.xml index 77d0df5..4d95ef1 100644 --- a/src/main/resources/mapper/ResourceMapper.xml +++ b/playedu-resource/src/main/resources/mapper/ResourceMapper.xml @@ -1,185 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - id - ,admin_id,type, - name,extension,size, - disk,file_id,path, - url,created_at,parent_id, - is_hidden - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + id + ,admin_id,type, + name,extension,size, + disk,file_id,path, + url,created_at,parent_id, + is_hidden + + + + + + + + + diff --git a/src/main/resources/mapper/ResourceVideoMapper.xml b/playedu-resource/src/main/resources/mapper/ResourceVideoMapper.xml similarity index 78% rename from src/main/resources/mapper/ResourceVideoMapper.xml rename to playedu-resource/src/main/resources/mapper/ResourceVideoMapper.xml index 2b6e507..63f7997 100644 --- a/src/main/resources/mapper/ResourceVideoMapper.xml +++ b/playedu-resource/src/main/resources/mapper/ResourceVideoMapper.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + rid,poster,duration, - created_at - - + created_at + + diff --git a/playedu-system/pom.xml b/playedu-system/pom.xml new file mode 100644 index 0000000..beebece --- /dev/null +++ b/playedu-system/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + xyz.playedu + playedu + 1.2 + + + playedu-system + + + + xyz.playedu + playedu-common + 1.2 + + + \ No newline at end of file diff --git a/src/main/java/xyz/playedu/api/aspectj/AdminLogAspect.java b/playedu-system/src/main/java/xyz/playedu/system/aspectj/AdminLogAspect.java similarity index 84% rename from src/main/java/xyz/playedu/api/aspectj/AdminLogAspect.java rename to playedu-system/src/main/java/xyz/playedu/system/aspectj/AdminLogAspect.java index f181c84..30e6174 100644 --- a/src/main/java/xyz/playedu/api/aspectj/AdminLogAspect.java +++ b/playedu-system/src/main/java/xyz/playedu/system/aspectj/AdminLogAspect.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.aspectj; +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.*; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.AfterThrowing; +import org.aspectj.lang.annotation.Aspect; +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.api.annotation.Log; -import xyz.playedu.api.domain.AdminLog; -import xyz.playedu.api.domain.AdminUser; -import xyz.playedu.api.service.AdminLogService; -import xyz.playedu.api.service.AdminUserService; -import xyz.playedu.api.service.BackendAuthService; -import xyz.playedu.api.util.IpUtil; -import xyz.playedu.api.util.RequestUtil; -import xyz.playedu.api.util.StringUtil; +import xyz.playedu.common.constant.SystemConstant; +import xyz.playedu.common.domain.AdminLog; +import xyz.playedu.common.domain.AdminUser; +import xyz.playedu.common.service.AdminLogService; +import xyz.playedu.common.service.AdminUserService; +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,12 +54,10 @@ 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.api.annotation.Log)") + @Pointcut("@annotation(xyz.playedu.common.annotation.Log)") public void logPointCut() {} /** @@ -174,12 +172,10 @@ public class AdminLogAspect { jsonObjectResult.put(key, excludeProperties(entry.getValue().toString())); } else { // 如果value是单纯的数据,执行脱敏操作 - for (String i : EXCLUDE_PROPERTIES) { - if (key.equals(i)) { - jsonObjectResult.put(key, "******"); - }else { - jsonObjectResult.put(key, value); - } + if(EXCLUDE_PROPERTIES.contains(key)){ + jsonObjectResult.put(key, SystemConstant.CONFIG_MASK); + }else { + jsonObjectResult.put(key, value); } } } diff --git a/src/main/java/xyz/playedu/api/middleware/impl/BackendPermissionMiddlewareImpl.java b/playedu-system/src/main/java/xyz/playedu/system/aspectj/BackendPermissionAspect.java similarity index 79% rename from src/main/java/xyz/playedu/api/middleware/impl/BackendPermissionMiddlewareImpl.java rename to playedu-system/src/main/java/xyz/playedu/system/aspectj/BackendPermissionAspect.java index 69ce647..0800b78 100644 --- a/src/main/java/xyz/playedu/api/middleware/impl/BackendPermissionMiddlewareImpl.java +++ b/playedu-system/src/main/java/xyz/playedu/system/aspectj/BackendPermissionAspect.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.middleware.impl; +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; @@ -24,29 +23,28 @@ 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.api.BCtx; -import xyz.playedu.api.bus.BackendBus; -import xyz.playedu.api.middleware.BackendPermissionMiddleware; -import xyz.playedu.api.types.JsonResponse; +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 java.util.HashMap; @Aspect @Component @Slf4j -public class BackendPermissionMiddlewareImpl { +public class BackendPermissionAspect { @Autowired private BackendBus backendBus; - @Pointcut("@annotation(xyz.playedu.api.middleware.BackendPermissionMiddleware)") + @Pointcut("@annotation(xyz.playedu.common.annotation.BackendPermission)") private void doPointcut() {} @Around("doPointcut()") public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable { MethodSignature signature = (MethodSignature) joinPoint.getSignature(); - BackendPermissionMiddleware middleware = - signature.getMethod().getAnnotation(BackendPermissionMiddleware.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/src/main/java/xyz/playedu/api/middleware/impl/LockImpl.java b/playedu-system/src/main/java/xyz/playedu/system/aspectj/LockAspect.java similarity index 84% rename from src/main/java/xyz/playedu/api/middleware/impl/LockImpl.java rename to playedu-system/src/main/java/xyz/playedu/system/aspectj/LockAspect.java index 93ae682..b59f02b 100644 --- a/src/main/java/xyz/playedu/api/middleware/impl/LockImpl.java +++ b/playedu-system/src/main/java/xyz/playedu/system/aspectj/LockAspect.java @@ -13,31 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.middleware.impl; +package xyz.playedu.system.aspectj; import org.aspectj.lang.ProceedingJoinPoint; 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.api.exception.LimitException; -import xyz.playedu.api.middleware.Lock; -import xyz.playedu.api.util.RedisDistributedLock; +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; @Aspect @Component -public class LockImpl { +public class LockAspect { private final RedisDistributedLock redisDistributedLock; - public LockImpl(RedisDistributedLock redisDistributedLock) { + public LockAspect(RedisDistributedLock redisDistributedLock) { this.redisDistributedLock = redisDistributedLock; } - @Around("@annotation(xyz.playedu.api.middleware.Lock)") + @Around("@annotation(xyz.playedu.common.annotation.Lock)") public Object around(ProceedingJoinPoint joinPoint) throws Throwable { MethodSignature signature = (MethodSignature) joinPoint.getSignature(); Method method = signature.getMethod(); diff --git a/src/main/java/xyz/playedu/api/checks/AdminPermissionCheck.java b/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java similarity index 98% rename from src/main/java/xyz/playedu/api/checks/AdminPermissionCheck.java rename to playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java index 5299aa8..a6d683c 100644 --- a/src/main/java/xyz/playedu/api/checks/AdminPermissionCheck.java +++ b/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.checks; +package xyz.playedu.system.checks; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; - -import xyz.playedu.api.constant.BPermissionConstant; -import xyz.playedu.api.domain.AdminPermission; -import xyz.playedu.api.service.AdminPermissionService; +import xyz.playedu.common.constant.BPermissionConstant; +import xyz.playedu.common.domain.AdminPermission; +import xyz.playedu.common.service.AdminPermissionService; import java.util.*; diff --git a/src/main/java/xyz/playedu/api/checks/AdminRoleCheck.java b/playedu-system/src/main/java/xyz/playedu/system/checks/AdminRoleCheck.java similarity index 90% rename from src/main/java/xyz/playedu/api/checks/AdminRoleCheck.java rename to playedu-system/src/main/java/xyz/playedu/system/checks/AdminRoleCheck.java index 460eef1..9e1929e 100644 --- a/src/main/java/xyz/playedu/api/checks/AdminRoleCheck.java +++ b/playedu-system/src/main/java/xyz/playedu/system/checks/AdminRoleCheck.java @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.checks; +package xyz.playedu.system.checks; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; - -import xyz.playedu.api.constant.BackendConstant; -import xyz.playedu.api.domain.AdminRole; -import xyz.playedu.api.service.AdminRoleService; +import xyz.playedu.common.constant.BackendConstant; +import xyz.playedu.common.domain.AdminRole; +import xyz.playedu.common.service.AdminRoleService; import java.util.Date; diff --git a/src/main/java/xyz/playedu/api/checks/AppConfigCheck.java b/playedu-system/src/main/java/xyz/playedu/system/checks/AppConfigCheck.java similarity index 91% rename from src/main/java/xyz/playedu/api/checks/AppConfigCheck.java rename to playedu-system/src/main/java/xyz/playedu/system/checks/AppConfigCheck.java index a7643c5..79f55fd 100644 --- a/src/main/java/xyz/playedu/api/checks/AppConfigCheck.java +++ b/playedu-system/src/main/java/xyz/playedu/system/checks/AppConfigCheck.java @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.checks; +package xyz.playedu.system.checks; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; - -import xyz.playedu.api.constant.BackendConstant; -import xyz.playedu.api.constant.CConfig; -import xyz.playedu.api.domain.AppConfig; -import xyz.playedu.api.service.AppConfigService; +import xyz.playedu.common.constant.BackendConstant; +import xyz.playedu.common.constant.ConfigConstant; +import xyz.playedu.common.domain.AppConfig; +import xyz.playedu.common.service.AppConfigService; import java.util.*; @@ -44,7 +43,7 @@ public class AppConfigCheck implements ApplicationRunner { setName("网站名"); setSort(10); setFieldType(BackendConstant.APP_CONFIG_FIELD_TYPE_INPUT); - setKeyName(CConfig.SYSTEM_NAME); + setKeyName(ConfigConstant.SYSTEM_NAME); setKeyValue(""); setHelp("请输入网站名"); } @@ -54,7 +53,7 @@ public class AppConfigCheck implements ApplicationRunner { setName("Logo"); setSort(20); setFieldType(BackendConstant.APP_CONFIG_FIELD_TYPE_IMAGE); - setKeyName(CConfig.SYSTEM_LOGO); + setKeyName(ConfigConstant.SYSTEM_LOGO); setKeyValue(""); } }, @@ -63,7 +62,7 @@ public class AppConfigCheck implements ApplicationRunner { setName("API访问地址"); setSort(30); setFieldType(BackendConstant.APP_CONFIG_FIELD_TYPE_INPUT); - setKeyName(CConfig.SYSTEM_API_URL); + setKeyName(ConfigConstant.SYSTEM_API_URL); setKeyValue(""); setHelp("请输入API访问地址"); } @@ -73,7 +72,7 @@ public class AppConfigCheck implements ApplicationRunner { setName("PC端口访问地址"); setSort(40); setFieldType(BackendConstant.APP_CONFIG_FIELD_TYPE_INPUT); - setKeyName(CConfig.SYSTEM_PC_URL); + setKeyName(ConfigConstant.SYSTEM_PC_URL); setKeyValue(""); setHelp("请输入PC端访问地址"); } @@ -83,7 +82,7 @@ public class AppConfigCheck implements ApplicationRunner { setName("H5端口访问地址"); setSort(50); setFieldType(BackendConstant.APP_CONFIG_FIELD_TYPE_INPUT); - setKeyName(CConfig.SYSTEM_H5_URL); + setKeyName(ConfigConstant.SYSTEM_H5_URL); setKeyValue(""); setHelp("请输入H5端访问地址"); } @@ -169,7 +168,7 @@ public class AppConfigCheck implements ApplicationRunner { setName("默认头像"); setSort(10); setFieldType(BackendConstant.APP_CONFIG_FIELD_TYPE_IMAGE); - setKeyName(CConfig.MEMBER_DEFAULT_AVATAR); + setKeyName(ConfigConstant.MEMBER_DEFAULT_AVATAR); setKeyValue(""); } }, @@ -182,7 +181,7 @@ public class AppConfigCheck implements ApplicationRunner { setName("AccessKey"); setSort(10); setFieldType(BackendConstant.APP_CONFIG_FIELD_TYPE_TEXT); - setKeyName(CConfig.MINIO_ACCESS_KEY); + setKeyName(ConfigConstant.MINIO_ACCESS_KEY); setKeyValue(""); } }, @@ -191,7 +190,7 @@ public class AppConfigCheck implements ApplicationRunner { setName("SecretKey"); setSort(20); setFieldType(BackendConstant.APP_CONFIG_FIELD_TYPE_TEXT); - setKeyName(CConfig.MINIO_SECRET_KEY); + setKeyName(ConfigConstant.MINIO_SECRET_KEY); setKeyValue(""); setIsPrivate(1); } @@ -201,7 +200,7 @@ public class AppConfigCheck implements ApplicationRunner { setName("Bucket"); setSort(30); setFieldType(BackendConstant.APP_CONFIG_FIELD_TYPE_TEXT); - setKeyName(CConfig.MINIO_BUCKET); + setKeyName(ConfigConstant.MINIO_BUCKET); setKeyValue(""); } }, @@ -210,7 +209,7 @@ public class AppConfigCheck implements ApplicationRunner { setName("Endpoint"); setSort(40); setFieldType(BackendConstant.APP_CONFIG_FIELD_TYPE_TEXT); - setKeyName(CConfig.MINIO_ENDPOINT); + setKeyName(ConfigConstant.MINIO_ENDPOINT); setKeyValue(""); } }, @@ -219,7 +218,7 @@ public class AppConfigCheck implements ApplicationRunner { setName("Domain"); setSort(50); setFieldType(BackendConstant.APP_CONFIG_FIELD_TYPE_TEXT); - setKeyName(CConfig.MINIO_DOMAIN); + setKeyName(ConfigConstant.MINIO_DOMAIN); setKeyValue(""); } }, diff --git a/src/main/java/xyz/playedu/api/checks/UpgradeCheck.java b/playedu-system/src/main/java/xyz/playedu/system/checks/UpgradeCheck.java similarity index 91% rename from src/main/java/xyz/playedu/api/checks/UpgradeCheck.java rename to playedu-system/src/main/java/xyz/playedu/system/checks/UpgradeCheck.java index 5eec804..0a94658 100644 --- a/src/main/java/xyz/playedu/api/checks/UpgradeCheck.java +++ b/playedu-system/src/main/java/xyz/playedu/system/checks/UpgradeCheck.java @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.checks; +package xyz.playedu.system.checks; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; - -import xyz.playedu.api.domain.AppConfig; -import xyz.playedu.api.service.AdminPermissionService; -import xyz.playedu.api.service.AppConfigService; +import xyz.playedu.common.domain.AppConfig; +import xyz.playedu.common.service.AdminPermissionService; +import xyz.playedu.common.service.AppConfigService; import java.util.ArrayList; diff --git a/src/main/java/xyz/playedu/api/middleware/AdminMiddleware.java b/playedu-system/src/main/java/xyz/playedu/system/interceptor/AdminInterceptor.java similarity index 85% rename from src/main/java/xyz/playedu/api/middleware/AdminMiddleware.java rename to playedu-system/src/main/java/xyz/playedu/system/interceptor/AdminInterceptor.java index 359d365..f14374c 100644 --- a/src/main/java/xyz/playedu/api/middleware/AdminMiddleware.java +++ b/playedu-system/src/main/java/xyz/playedu/system/interceptor/AdminInterceptor.java @@ -13,35 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.middleware; +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.api.BCtx; -import xyz.playedu.api.bus.BackendBus; -import xyz.playedu.api.config.PlayEduConfig; -import xyz.playedu.api.domain.AdminUser; -import xyz.playedu.api.service.AdminUserService; -import xyz.playedu.api.service.AppConfigService; -import xyz.playedu.api.service.BackendAuthService; -import xyz.playedu.api.service.RateLimiterService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.util.HelperUtil; -import xyz.playedu.api.util.IpUtil; +import xyz.playedu.common.context.BCtx; +import xyz.playedu.common.bus.BackendBus; +import xyz.playedu.common.config.PlayEduConfig; +import xyz.playedu.common.domain.AdminUser; +import xyz.playedu.common.service.AdminUserService; +import xyz.playedu.common.service.AppConfigService; +import xyz.playedu.common.service.BackendAuthService; +import xyz.playedu.common.service.RateLimiterService; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.common.util.HelperUtil; +import xyz.playedu.common.util.IpUtil; import java.io.IOException; import java.util.Map; @Component @Slf4j -public class AdminMiddleware implements HandlerInterceptor { +public class AdminInterceptor implements HandlerInterceptor { @Autowired private BackendAuthService authService; diff --git a/src/main/java/xyz/playedu/api/middleware/FrontMiddleware.java b/playedu-system/src/main/java/xyz/playedu/system/interceptor/FrontInterceptor.java similarity index 85% rename from src/main/java/xyz/playedu/api/middleware/FrontMiddleware.java rename to playedu-system/src/main/java/xyz/playedu/system/interceptor/FrontInterceptor.java index dd52ba9..96627ce 100644 --- a/src/main/java/xyz/playedu/api/middleware/FrontMiddleware.java +++ b/playedu-system/src/main/java/xyz/playedu/system/interceptor/FrontInterceptor.java @@ -13,33 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.middleware; +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.api.FCtx; -import xyz.playedu.api.config.PlayEduConfig; -import xyz.playedu.api.constant.FrontendConstant; -import xyz.playedu.api.domain.User; -import xyz.playedu.api.service.FrontendAuthService; -import xyz.playedu.api.service.RateLimiterService; -import xyz.playedu.api.service.UserService; -import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.util.HelperUtil; -import xyz.playedu.api.util.IpUtil; +import xyz.playedu.common.context.FCtx; +import xyz.playedu.common.config.PlayEduConfig; +import xyz.playedu.common.constant.FrontendConstant; +import xyz.playedu.common.domain.User; +import xyz.playedu.common.service.FrontendAuthService; +import xyz.playedu.common.service.RateLimiterService; +import xyz.playedu.common.service.UserService; +import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.common.util.HelperUtil; +import xyz.playedu.common.util.IpUtil; import java.io.IOException; @Component @Slf4j -public class FrontMiddleware implements HandlerInterceptor { +public class FrontInterceptor implements HandlerInterceptor { @Autowired private FrontendAuthService authService; diff --git a/src/main/java/xyz/playedu/api/config/WebMvcConfig.java b/playedu-system/src/main/java/xyz/playedu/system/interceptor/WebMvcConfig.java similarity index 78% rename from src/main/java/xyz/playedu/api/config/WebMvcConfig.java rename to playedu-system/src/main/java/xyz/playedu/system/interceptor/WebMvcConfig.java index 226873a..25a6237 100644 --- a/src/main/java/xyz/playedu/api/config/WebMvcConfig.java +++ b/playedu-system/src/main/java/xyz/playedu/system/interceptor/WebMvcConfig.java @@ -13,33 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package xyz.playedu.api.config; +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; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import xyz.playedu.api.middleware.AdminMiddleware; -import xyz.playedu.api.middleware.FrontMiddleware; - @Configuration @Slf4j public class WebMvcConfig implements WebMvcConfigurer { - @Resource private AdminMiddleware adminMiddleware; + @Resource private AdminInterceptor adminInterceptor; - @Autowired private FrontMiddleware frontMiddleware; + @Autowired private FrontInterceptor frontInterceptor; @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(adminMiddleware).addPathPatterns("/backend/**"); - registry.addInterceptor(frontMiddleware).addPathPatterns("/api/v1/**"); + registry.addInterceptor(adminInterceptor).addPathPatterns("/backend/**"); + registry.addInterceptor(frontInterceptor).addPathPatterns("/api/v1/**"); } @Override diff --git a/pom.xml b/pom.xml index 67366cb..a53b364 100644 --- a/pom.xml +++ b/pom.xml @@ -9,10 +9,20 @@ xyz.playedu - playedu-api - 1.1 - playedu-api - playedu-api + playedu + 1.2 + pom + playedu + playedu + + + playedu-api + playedu-common + playedu-system + playedu-course + playedu-resource + + 17 @@ -162,36 +172,15 @@ - org.springframework.boot - spring-boot-maven-plugin + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 - - - org.projectlombok - lombok - - - - - - com.diffplug.spotless - spotless-maven-plugin - 2.36.0 - - - - 1.16.0 - - true - - - - ${project.basedir}/license-header.txt - - + ${java.version} + ${java.version} + UTF-8 - diff --git a/src/main/java/xyz/playedu/api/constant/BackendLogConstant.java b/src/main/java/xyz/playedu/api/constant/BackendLogConstant.java deleted file mode 100644 index 893e814..0000000 --- a/src/main/java/xyz/playedu/api/constant/BackendLogConstant.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2023 杭州白书科技有限公司 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package xyz.playedu.api.constant; - -/** - * @Author 杭州白书科技有限公司 - * - * @create 2023/2/17 15:42 - */ -public class BackendLogConstant { - - public static final String OPT_LOGIN = "LOGIN"; - - public static final String MODULE_LOGIN = "LOGIN"; -} diff --git a/src/main/java/xyz/playedu/api/domain/CategoryCourse.java b/src/main/java/xyz/playedu/api/domain/CategoryCourse.java deleted file mode 100644 index 1a72662..0000000 --- a/src/main/java/xyz/playedu/api/domain/CategoryCourse.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2023 杭州白书科技有限公司 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package xyz.playedu.api.domain; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonProperty; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @TableName category_course - */ -@TableName(value = "category_course") -@Data -public class CategoryCourse implements Serializable { - @JsonProperty("course_id") - private Integer courseId; - - @JsonProperty("category_id") - private Integer categoryId; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - CategoryCourse other = (CategoryCourse) that; - return (this.getCourseId() == null - ? other.getCourseId() == null - : this.getCourseId().equals(other.getCourseId())) - && (this.getCategoryId() == null - ? other.getCategoryId() == null - : this.getCategoryId().equals(other.getCategoryId())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getCourseId() == null) ? 0 : getCourseId().hashCode()); - result = prime * result + ((getCategoryId() == null) ? 0 : getCategoryId().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", courseId=").append(courseId); - sb.append(", categoryId=").append(categoryId); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} diff --git a/src/main/java/xyz/playedu/api/mapper/ResourceCategoryRelationMapper.java b/src/main/java/xyz/playedu/api/mapper/ResourceCategoryRelationMapper.java deleted file mode 100644 index e846417..0000000 --- a/src/main/java/xyz/playedu/api/mapper/ResourceCategoryRelationMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2023 杭州白书科技有限公司 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package xyz.playedu.api.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -import xyz.playedu.api.domain.ResourceCategoryRelation; - -/** - * @author tengteng - * @description 针对表【resource_category】的数据库操作Mapper - * @createDate 2023-03-08 16:54:56 @Entity xyz.playedu.api.domain.ResourceCategoryRelation - */ -@Mapper -public interface ResourceCategoryRelationMapper extends BaseMapper {} diff --git a/src/main/resources/mapper/AdminLogMapper.xml b/src/main/resources/mapper/AdminLogMapper.xml deleted file mode 100644 index 3411ab7..0000000 --- a/src/main/resources/mapper/AdminLogMapper.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id,admin_id,admin_name,module,title, - opt,method,request_method,url,param,result, - ip,ip_area,error_msg,created_at - - - - - -