From de6a9718f45b01b66a921d027cebb4447963b22d Mon Sep 17 00:00:00 2001 From: none Date: Fri, 24 Mar 2023 15:03:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/xyz/playedu/api/BCtx.java | 4 ++-- src/main/java/xyz/playedu/api/bus/BackendBus.java | 2 +- .../api/controller/backend/CourseChapterController.java | 2 +- .../playedu/api/controller/backend/CourseController.java | 2 +- .../api/controller/backend/CourseHourController.java | 6 +++--- .../api/controller/backend/DepartmentController.java | 2 +- .../api/controller/backend/ResourceCategoryController.java | 2 +- .../playedu/api/controller/backend/ResourceController.java | 2 +- .../playedu/api/controller/backend/UploadController.java | 6 +++--- .../java/xyz/playedu/api/middleware/AdminMiddleware.java | 2 +- .../middleware/impl/BackendPermissionMiddlewareImpl.java | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/xyz/playedu/api/BCtx.java b/src/main/java/xyz/playedu/api/BCtx.java index ee5c52f..831d416 100644 --- a/src/main/java/xyz/playedu/api/BCtx.java +++ b/src/main/java/xyz/playedu/api/BCtx.java @@ -42,11 +42,11 @@ public class BCtx { THREAD_LOCAL.remove(); } - public static Integer getAdminUserID() { + public static Integer getId() { return (Integer) get(KEY_ADMIN_USER_ID); } - public static void setAdminUserId(Integer userId) { + public static void setId(Integer userId) { put(KEY_ADMIN_USER_ID, userId); } diff --git a/src/main/java/xyz/playedu/api/bus/BackendBus.java b/src/main/java/xyz/playedu/api/bus/BackendBus.java index ad77d84..fec36ec 100644 --- a/src/main/java/xyz/playedu/api/bus/BackendBus.java +++ b/src/main/java/xyz/playedu/api/bus/BackendBus.java @@ -78,7 +78,7 @@ public class BackendBus { if (superRole == null) { return false; } - List roleIds = adminUserService.getRoleIdsByUserId(BCtx.getAdminUserID()); + List roleIds = adminUserService.getRoleIdsByUserId(BCtx.getId()); if (roleIds.size() == 0) { return false; } diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java b/src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java index bb8c8a6..915b721 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java @@ -63,7 +63,7 @@ public class CourseChapterController { return JsonResponse.error("当前章节下面存在课时无法删除"); } chapterService.removeById(chapter.getId()); - ctx.publishEvent(new CourseChapterDestroyEvent(this, BCtx.getAdminUserID(), chapter.getCourseId(), chapter.getId())); + ctx.publishEvent(new CourseChapterDestroyEvent(this, BCtx.getId(), chapter.getCourseId(), chapter.getId())); return JsonResponse.success(); } diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseController.java b/src/main/java/xyz/playedu/api/controller/backend/CourseController.java index 7b17a4f..e249c6d 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/CourseController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/CourseController.java @@ -191,7 +191,7 @@ public class CourseController { @DeleteMapping("/{id}") public JsonResponse destroy(@PathVariable(name = "id") Integer id) { courseService.removeById(id); - ctx.publishEvent(new CourseDestroyEvent(this, BCtx.getAdminUserID(), id)); + ctx.publishEvent(new CourseDestroyEvent(this, BCtx.getId(), id)); return JsonResponse.success(); } diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java b/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java index c44ac3b..5ba575d 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java @@ -87,7 +87,7 @@ public class CourseHourController { } CourseHour courseHour = hourService.create(courseId, chapterId, req.getSort(), req.getTitle(), type, req.getRid(), req.getDuration()); - ctx.publishEvent(new CourseHourCreatedEvent(this, BCtx.getAdminUserID(), courseHour.getCourseId(), courseHour.getChapterId(), courseHour.getId())); + ctx.publishEvent(new CourseHourCreatedEvent(this, BCtx.getId(), courseHour.getCourseId(), courseHour.getChapterId(), courseHour.getId())); return JsonResponse.success(); } @@ -125,7 +125,7 @@ public class CourseHourController { // 只需要发布一次event就可以了 CourseHour firstHour = hours.get(0); - ctx.publishEvent(new CourseHourCreatedEvent(this, BCtx.getAdminUserID(), firstHour.getCourseId(), firstHour.getChapterId(), firstHour.getId())); + ctx.publishEvent(new CourseHourCreatedEvent(this, BCtx.getId(), firstHour.getCourseId(), firstHour.getChapterId(), firstHour.getId())); return JsonResponse.success(); } @@ -154,7 +154,7 @@ public class CourseHourController { public JsonResponse destroy(@PathVariable(name = "courseId") Integer courseId, @PathVariable(name = "id") Integer id) throws NotFoundException { CourseHour courseHour = hourService.findOrFail(id, courseId); hourService.removeById(courseHour.getId()); - ctx.publishEvent(new CourseHourDestroyEvent(this, BCtx.getAdminUserID(), courseHour.getCourseId(), courseHour.getChapterId(), courseHour.getId())); + ctx.publishEvent(new CourseHourDestroyEvent(this, BCtx.getId(), courseHour.getCourseId(), courseHour.getChapterId(), courseHour.getId())); return JsonResponse.success(); } diff --git a/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java b/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java index ccb9107..4eaa706 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java @@ -117,7 +117,7 @@ public class DepartmentController { public JsonResponse destroy(@PathVariable Integer id) throws NotFoundException { Department department = departmentService.findOrFail(id); departmentService.deleteById(department.getId()); - ctx.publishEvent(new DepartmentDestroyEvent(this, BCtx.getAdminUserID(), department.getId())); + ctx.publishEvent(new DepartmentDestroyEvent(this, BCtx.getId(), department.getId())); return JsonResponse.success(); } diff --git a/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java b/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java index 57be6f2..1727f98 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java @@ -124,7 +124,7 @@ public class ResourceCategoryController { public JsonResponse destroy(@PathVariable Integer id) throws NotFoundException { ResourceCategory category = categoryService.findOrFail(id); categoryService.deleteById(category.getId()); - ctx.publishEvent(new ResourceCategoryDestroyEvent(this, BCtx.getAdminUserID(), category.getId())); + ctx.publishEvent(new ResourceCategoryDestroyEvent(this, BCtx.getId(), category.getId())); return JsonResponse.success(); } diff --git a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java b/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java index aae7df5..a98281a 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java @@ -70,7 +70,7 @@ public class ResourceController { filter.setName(name); if (!backendBus.isSuperAdmin()) {// 非超管只能读取它自己上传的资源 - filter.setAdminId(BCtx.getAdminUserID()); + filter.setAdminId(BCtx.getId()); } PaginationResult result = resourceService.paginate(page, size, filter); diff --git a/src/main/java/xyz/playedu/api/controller/backend/UploadController.java b/src/main/java/xyz/playedu/api/controller/backend/UploadController.java index e134d86..3587fc8 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/UploadController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/UploadController.java @@ -40,7 +40,7 @@ public class UploadController { @PostMapping("/minio") public JsonResponse uploadMinio(@RequestParam HashMap params, MultipartFile file) throws ServiceException { String categoryIds = MapUtils.getString(params, "category_ids"); - Resource res = uploadService.storeMinio(BCtx.getAdminUserID(), file, categoryIds); + Resource res = uploadService.storeMinio(BCtx.getId(), file, categoryIds); return JsonResponse.data(res); } @@ -92,7 +92,7 @@ public class UploadController { // 视频素材保存 Resource videoResource = resourceService.create( - BCtx.getAdminUserID(), + BCtx.getId(), req.getCategoryIds(), type, req.getOriginalFilename(), @@ -104,7 +104,7 @@ public class UploadController { url ); // 视频封面素材保存 - Resource posterResource = uploadService.storeBase64Image(BCtx.getAdminUserID(), req.getPoster(), null); + Resource posterResource = uploadService.storeBase64Image(BCtx.getId(), req.getPoster(), null); // 视频的封面素材改为[隐藏 && 属于视频的子素材] resourceService.changeParentId(posterResource.getId(), videoResource.getId()); // 视频信息 diff --git a/src/main/java/xyz/playedu/api/middleware/AdminMiddleware.java b/src/main/java/xyz/playedu/api/middleware/AdminMiddleware.java index 94c5223..af14bcd 100644 --- a/src/main/java/xyz/playedu/api/middleware/AdminMiddleware.java +++ b/src/main/java/xyz/playedu/api/middleware/AdminMiddleware.java @@ -71,7 +71,7 @@ public class AdminMiddleware implements HandlerInterceptor { return responseTransform(response, 403, "当前管理员禁止登录"); } - BCtx.setAdminUserId(payload.getSub()); + BCtx.setId(payload.getSub()); BCtx.setAdminUser(adminUser); BCtx.setAdminPer(backendBus.adminUserPermissions(adminUser.getId())); diff --git a/src/main/java/xyz/playedu/api/middleware/impl/BackendPermissionMiddlewareImpl.java b/src/main/java/xyz/playedu/api/middleware/impl/BackendPermissionMiddlewareImpl.java index 448fe4d..c4030a1 100644 --- a/src/main/java/xyz/playedu/api/middleware/impl/BackendPermissionMiddlewareImpl.java +++ b/src/main/java/xyz/playedu/api/middleware/impl/BackendPermissionMiddlewareImpl.java @@ -35,7 +35,7 @@ public class BackendPermissionMiddlewareImpl { public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable { MethodSignature signature = (MethodSignature) joinPoint.getSignature(); BackendPermissionMiddleware middleware = signature.getMethod().getAnnotation(BackendPermissionMiddleware.class); - Integer adminUserId = BCtx.getAdminUserID(); + Integer adminUserId = BCtx.getId(); HashMap permissions = backendBus.adminUserPermissions(adminUserId); if (permissions.get(middleware.slug()) == null) { return JsonResponse.error("权限不足", 403);