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

Fix the problem post and sheet contents are empty in the content API (#1686) 

* fix: Post and sheet content is empty in the Content API
pull/1692/head
扶醉 2022-02-27 15:47:54 +08:00 committed by GitHub
parent c306586778
commit 5064837cf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/run/halo/app/controller/content/api/PostController.java
View File

@ -25,6 +25,7 @@ import run.halo.app.cache.lock.CacheParam;
import run.halo.app.exception.NotFoundException; import run.halo.app.exception.NotFoundException;
import run.halo.app.model.dto.BaseCommentDTO; import run.halo.app.model.dto.BaseCommentDTO;
import run.halo.app.model.dto.post.BasePostSimpleDTO; import run.halo.app.model.dto.post.BasePostSimpleDTO;
import run.halo.app.model.entity.Content;
import run.halo.app.model.entity.Post; import run.halo.app.model.entity.Post;
import run.halo.app.model.entity.PostComment; import run.halo.app.model.entity.PostComment;
import run.halo.app.model.enums.CommentStatus; import run.halo.app.model.enums.CommentStatus;
@ -105,7 +106,9 @@ public class PostController {
Boolean formatDisabled, Boolean formatDisabled,
@RequestParam(value = "sourceDisabled", required = false, defaultValue = "false") @RequestParam(value = "sourceDisabled", required = false, defaultValue = "false")
Boolean sourceDisabled) { Boolean sourceDisabled) {
PostDetailVO postDetailVO = postService.convertToDetailVo(postService.getById(postId)); Post post = postService.getById(postId);
post.setContent(Content.PatchedContent.of(postService.getContentById(postId)));
PostDetailVO postDetailVO = postService.convertToDetailVo(post);
if (formatDisabled) { if (formatDisabled) {
// Clear the format content // Clear the format content
@ -129,7 +132,9 @@ public class PostController {
Boolean formatDisabled, Boolean formatDisabled,
@RequestParam(value = "sourceDisabled", required = false, defaultValue = "false") @RequestParam(value = "sourceDisabled", required = false, defaultValue = "false")
Boolean sourceDisabled) { Boolean sourceDisabled) {
PostDetailVO postDetailVO = postService.convertToDetailVo(postService.getBySlug(slug)); Post post = postService.getBySlug(slug);
post.setContent(Content.PatchedContent.of(postService.getContentById(post.getId())));
PostDetailVO postDetailVO = postService.convertToDetailVo(post);
if (formatDisabled) { if (formatDisabled) {
// Clear the format content // Clear the format content
@ -152,6 +157,8 @@ public class PostController {
Post post = postService.getById(postId); Post post = postService.getById(postId);
Post prevPost = Post prevPost =
postService.getPrevPost(post).orElseThrow(() -> new NotFoundException("查询不到该文章的信息")); postService.getPrevPost(post).orElseThrow(() -> new NotFoundException("查询不到该文章的信息"));
prevPost.setContent(
Content.PatchedContent.of(postService.getContentById(prevPost.getId())));
return postService.convertToDetailVo(prevPost); return postService.convertToDetailVo(prevPost);
} }
@ -161,6 +168,8 @@ public class PostController {
Post post = postService.getById(postId); Post post = postService.getById(postId);
Post nextPost = Post nextPost =
postService.getNextPost(post).orElseThrow(() -> new NotFoundException("查询不到该文章的信息")); postService.getNextPost(post).orElseThrow(() -> new NotFoundException("查询不到该文章的信息"));
nextPost.setContent(
Content.PatchedContent.of(postService.getContentById(nextPost.getId())));
return postService.convertToDetailVo(nextPost); return postService.convertToDetailVo(nextPost);
} }

9
src/main/java/run/halo/app/controller/content/api/SheetController.java
View File

@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.util.HtmlUtils; import org.springframework.web.util.HtmlUtils;
import run.halo.app.cache.lock.CacheLock; import run.halo.app.cache.lock.CacheLock;
import run.halo.app.model.dto.BaseCommentDTO; import run.halo.app.model.dto.BaseCommentDTO;
import run.halo.app.model.entity.Content;
import run.halo.app.model.entity.Sheet; import run.halo.app.model.entity.Sheet;
import run.halo.app.model.entity.SheetComment; import run.halo.app.model.entity.SheetComment;
import run.halo.app.model.enums.CommentStatus; import run.halo.app.model.enums.CommentStatus;
@ -74,7 +75,9 @@ public class SheetController {
Boolean formatDisabled, Boolean formatDisabled,
@RequestParam(value = "sourceDisabled", required = false, defaultValue = "false") @RequestParam(value = "sourceDisabled", required = false, defaultValue = "false")
Boolean sourceDisabled) { Boolean sourceDisabled) {
SheetDetailVO sheetDetailVO = sheetService.convertToDetailVo(sheetService.getById(sheetId)); Sheet sheet = sheetService.getById(sheetId);
sheet.setContent(Content.PatchedContent.of(sheetService.getContentById(sheetId)));
SheetDetailVO sheetDetailVO = sheetService.convertToDetailVo(sheet);
if (formatDisabled) { if (formatDisabled) {
// Clear the format content // Clear the format content
@ -98,7 +101,9 @@ public class SheetController {
Boolean formatDisabled, Boolean formatDisabled,
@RequestParam(value = "sourceDisabled", required = false, defaultValue = "false") @RequestParam(value = "sourceDisabled", required = false, defaultValue = "false")
Boolean sourceDisabled) { Boolean sourceDisabled) {
SheetDetailVO sheetDetailVO = sheetService.convertToDetailVo(sheetService.getBySlug(slug)); Sheet sheet = sheetService.getBySlug(slug);
sheet.setContent(Content.PatchedContent.of(sheetService.getContentById(sheet.getId())));
SheetDetailVO sheetDetailVO = sheetService.convertToDetailVo(sheet);
if (formatDisabled) { if (formatDisabled) {
// Clear the format content // Clear the format content