From f24c90b51428e0334a8061f51ed6e67f472e4b77 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Sat, 4 Jan 2020 22:21:23 +0800 Subject: [PATCH] fix: content api token name error. --- .../app/controller/admin/api/JournalCommentController.java | 2 +- .../halo/app/security/filter/ApiAuthenticationFilter.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/run/halo/app/controller/admin/api/JournalCommentController.java b/src/main/java/run/halo/app/controller/admin/api/JournalCommentController.java index 96708a5f1..630995ecf 100644 --- a/src/main/java/run/halo/app/controller/admin/api/JournalCommentController.java +++ b/src/main/java/run/halo/app/controller/admin/api/JournalCommentController.java @@ -65,7 +65,7 @@ public class JournalCommentController { public Page listCommentTree(@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)); + return journalCommentService.pageVosAllBy(journalId, PageRequest.of(page, optionService.getCommentPageSize(), sort)); } @GetMapping("{journalId:\\d+}/list_view") diff --git a/src/main/java/run/halo/app/security/filter/ApiAuthenticationFilter.java b/src/main/java/run/halo/app/security/filter/ApiAuthenticationFilter.java index 19164091f..8c4fe35b1 100644 --- a/src/main/java/run/halo/app/security/filter/ApiAuthenticationFilter.java +++ b/src/main/java/run/halo/app/security/filter/ApiAuthenticationFilter.java @@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Optional; -import static run.halo.app.model.support.HaloConst.ADMIN_TOKEN_HEADER_NAME; -import static run.halo.app.model.support.HaloConst.ADMIN_TOKEN_QUERY_NAME; +import static run.halo.app.model.support.HaloConst.API_ACCESS_KEY_HEADER_NAME; +import static run.halo.app.model.support.HaloConst.API_ACCESS_KEY_QUERY_NAME; /** * Api authentication Filter @@ -98,6 +98,6 @@ public class ApiAuthenticationFilter extends AbstractAuthenticationFilter { @Override protected String getTokenFromRequest(@NonNull HttpServletRequest request) { - return getTokenFromRequest(request, ADMIN_TOKEN_QUERY_NAME, ADMIN_TOKEN_HEADER_NAME); + return getTokenFromRequest(request, API_ACCESS_KEY_QUERY_NAME, API_ACCESS_KEY_HEADER_NAME); } }