github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: content api token name error.

pull/467/head
ruibaby 2020-01-04 22:21:23 +08:00
parent 28b4d384dd
commit f24c90b514
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/run/halo/app/controller/admin/api/JournalCommentController.java
View File

@ -65,7 +65,7 @@ public class JournalCommentController {
public Page<BaseCommentVO> listCommentTree(@PathVariable("journalId") Integer journalId, public Page<BaseCommentVO> listCommentTree(@PathVariable("journalId") Integer journalId,
@RequestParam(name = "page", required = false, defaultValue = "0") int page, @RequestParam(name = "page", required = false, defaultValue = "0") int page,
@SortDefault(sort = "createTime", direction = DESC) Sort sort) { @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") @GetMapping("{journalId:\\d+}/list_view")

6
src/main/java/run/halo/app/security/filter/ApiAuthenticationFilter.java
View File

@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.Optional; import java.util.Optional;
import static run.halo.app.model.support.HaloConst.ADMIN_TOKEN_HEADER_NAME; import static run.halo.app.model.support.HaloConst.API_ACCESS_KEY_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_QUERY_NAME;
/** /**
* Api authentication Filter * Api authentication Filter
@ -98,6 +98,6 @@ public class ApiAuthenticationFilter extends AbstractAuthenticationFilter {
@Override @Override
protected String getTokenFromRequest(@NonNull HttpServletRequest request) { 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);
} }
} }