From 738d3e6cd8a9ee362e0c3a27fadb6d4efc619d66 Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 30 May 2019 03:12:41 +0800 Subject: [PATCH] Apply filter ip address service --- .../content/api/JournalController.java | 12 ++++++++---- .../controller/content/api/PostController.java | 16 ++++++++++++---- .../controller/content/api/SheetController.java | 12 ++++++++---- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/main/java/run/halo/app/controller/content/api/JournalController.java b/src/main/java/run/halo/app/controller/content/api/JournalController.java index 3605185bf..06c0a9c93 100644 --- a/src/main/java/run/halo/app/controller/content/api/JournalController.java +++ b/src/main/java/run/halo/app/controller/content/api/JournalController.java @@ -48,7 +48,8 @@ public class JournalController { public Page listTopComments(@PathVariable("journalId") Integer journalId, @RequestParam(name = "page", required = false, defaultValue = "0") int page, @SortDefault(sort = "createTime", direction = DESC) Sort sort) { - return journalCommentService.pageTopCommentsBy(journalId, CommentStatus.PUBLISHED, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + Page result = journalCommentService.pageTopCommentsBy(journalId, CommentStatus.PUBLISHED, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + return journalCommentService.filterIpAddress(result); } @GetMapping("{journalId:\\d+}/comments/{commentParentId:\\d+}/children") @@ -58,7 +59,8 @@ public class JournalController { // Find all children comments List postComments = journalCommentService.listChildrenBy(journalId, commentParentId, CommentStatus.PUBLISHED, sort); // Convert to base comment dto - return journalCommentService.convertTo(postComments); + List result = journalCommentService.convertTo(postComments); + return journalCommentService.filterIpAddress(result); } @GetMapping("{journalId:\\d+}/comments/tree_view") @@ -66,7 +68,8 @@ public class JournalController { public Page listCommentsTree(@PathVariable("journalId") Integer journalId, @RequestParam(name = "page", required = false, defaultValue = "0") int page, @SortDefault(sort = "createTime", direction = DESC) Sort sort) { - return journalCommentService.pageVosBy(journalId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + Page result = journalCommentService.pageVosBy(journalId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + return journalCommentService.filterIpAddress(result); } @GetMapping("{journalId:\\d+}/comments/list_view") @@ -74,7 +77,8 @@ public class JournalController { public Page listComments(@PathVariable("journalId") Integer journalId, @RequestParam(name = "page", required = false, defaultValue = "0") int page, @SortDefault(sort = "createTime", direction = DESC) Sort sort) { - return journalCommentService.pageWithParentVoBy(journalId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + Page result = journalCommentService.pageWithParentVoBy(journalId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + return journalCommentService.filterIpAddress(result); } @PostMapping("comments") diff --git a/src/main/java/run/halo/app/controller/content/api/PostController.java b/src/main/java/run/halo/app/controller/content/api/PostController.java index 8cdfadb22..ae8fbff0f 100644 --- a/src/main/java/run/halo/app/controller/content/api/PostController.java +++ b/src/main/java/run/halo/app/controller/content/api/PostController.java @@ -83,7 +83,10 @@ public class PostController { public Page listTopComments(@PathVariable("postId") Integer postId, @RequestParam(name = "page", required = false, defaultValue = "0") int page, @SortDefault(sort = "createTime", direction = DESC) Sort sort) { - return postCommentService.pageTopCommentsBy(postId, CommentStatus.PUBLISHED, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + + Page result = postCommentService.pageTopCommentsBy(postId, CommentStatus.PUBLISHED, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + + return postCommentService.filterIpAddress(result); } @@ -94,7 +97,10 @@ public class PostController { // Find all children comments List postComments = postCommentService.listChildrenBy(postId, commentParentId, CommentStatus.PUBLISHED, sort); // Convert to base comment dto - return postCommentService.convertTo(postComments); + + List result = postCommentService.convertTo(postComments); + + return postCommentService.filterIpAddress(result); } @GetMapping("{postId:\\d+}/comments/tree_view") @@ -102,7 +108,8 @@ public class PostController { public Page listCommentsTree(@PathVariable("postId") Integer postId, @RequestParam(name = "page", required = false, defaultValue = "0") int page, @SortDefault(sort = "createTime", direction = DESC) Sort sort) { - return postCommentService.pageVosBy(postId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + Page result = postCommentService.pageVosBy(postId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + return postCommentService.filterIpAddress(result); } @GetMapping("{postId:\\d+}/comments/list_view") @@ -110,7 +117,8 @@ public class PostController { public Page listComments(@PathVariable("postId") Integer postId, @RequestParam(name = "page", required = false, defaultValue = "0") int page, @SortDefault(sort = "createTime", direction = DESC) Sort sort) { - return postCommentService.pageWithParentVoBy(postId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + Page result = postCommentService.pageWithParentVoBy(postId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + return postCommentService.filterIpAddress(result); } @PostMapping("comments") diff --git a/src/main/java/run/halo/app/controller/content/api/SheetController.java b/src/main/java/run/halo/app/controller/content/api/SheetController.java index 46a129909..2fab00766 100644 --- a/src/main/java/run/halo/app/controller/content/api/SheetController.java +++ b/src/main/java/run/halo/app/controller/content/api/SheetController.java @@ -48,7 +48,8 @@ public class SheetController { public Page listTopComments(@PathVariable("sheetId") Integer sheetId, @RequestParam(name = "page", required = false, defaultValue = "0") int page, @SortDefault(sort = "createTime", direction = DESC) Sort sort) { - return sheetCommentService.pageTopCommentsBy(sheetId, CommentStatus.PUBLISHED, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + Page result = sheetCommentService.pageTopCommentsBy(sheetId, CommentStatus.PUBLISHED, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + return sheetCommentService.filterIpAddress(result); } @GetMapping("{sheetId:\\d+}/comments/{commentParentId:\\d+}/children") @@ -58,7 +59,8 @@ public class SheetController { // Find all children comments List sheetComments = sheetCommentService.listChildrenBy(sheetId, commentParentId, CommentStatus.PUBLISHED, sort); // Convert to base comment dto - return sheetCommentService.convertTo(sheetComments); + List result = sheetCommentService.convertTo(sheetComments); + return sheetCommentService.filterIpAddress(result); } @@ -67,7 +69,8 @@ public class SheetController { public Page listCommentsTree(@PathVariable("sheetId") Integer sheetId, @RequestParam(name = "page", required = false, defaultValue = "0") int page, @SortDefault(sort = "createTime", direction = DESC) Sort sort) { - return sheetCommentService.pageVosBy(sheetId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + Page result = sheetCommentService.pageVosBy(sheetId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + return sheetCommentService.filterIpAddress(result); } @GetMapping("{sheetId:\\d+}/comments/list_view") @@ -75,7 +78,8 @@ public class SheetController { public Page listComments(@PathVariable("sheetId") Integer sheetId, @RequestParam(name = "page", required = false, defaultValue = "0") int page, @SortDefault(sort = "createTime", direction = DESC) Sort sort) { - return sheetCommentService.pageWithParentVoBy(sheetId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + Page result = sheetCommentService.pageWithParentVoBy(sheetId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); + return sheetCommentService.filterIpAddress(result); } @PostMapping("comments")