diff --git a/src/main/java/cc/ryanc/halo/service/CommentService.java b/src/main/java/cc/ryanc/halo/service/CommentService.java index 723aad7d3..e2326c4b8 100644 --- a/src/main/java/cc/ryanc/halo/service/CommentService.java +++ b/src/main/java/cc/ryanc/halo/service/CommentService.java @@ -19,15 +19,6 @@ import java.util.Optional; */ public interface CommentService extends CrudService { - /** - * 删除评论 - * - * @param commentId commentId - * @return Optional - */ - @Deprecated - Optional remove(Long commentId); - /** * 查询所有的评论,用于后台管理 * diff --git a/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java index 8aae694eb..0af6e6550 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java @@ -48,20 +48,6 @@ public class CommentServiceImpl extends AbstractCrudService imple return super.create(comment); } - /** - * 删除评论 - * - * @param commentId commentId - * @return Optional - */ - @Override - @CacheEvict(value = {COMMENTS_CACHE_NAME, POSTS_CACHE_NAME}, allEntries = true, beforeInvocation = true) - public Optional remove(Long commentId) { - final Optional comment = this.fetchById(commentId); - commentRepository.delete(comment.orElse(null)); - return comment; - } - /** * 查询所有的评论,用于后台管理 * diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java index c968d8dc5..a81b65b41 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java @@ -128,7 +128,7 @@ public class CommentController extends BaseController { @RequestParam("status") Integer status, @PageableDefault Pageable pageable) { try { - commentService.remove(commentId); + commentService.removeById(commentId); } catch (Exception e) { log.error("Delete comment failed: {}", e.getMessage()); }