From a0779ae11eb696af3ad241cd604ba78b68dc2969 Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Tue, 5 Mar 2019 00:12:18 +0800
Subject: [PATCH] Fix native query error

---
 src/main/java/cc/ryanc/halo/model/domain/Post.java     |  8 +++++---
 .../java/cc/ryanc/halo/repository/PostRepository.java  |  8 --------
 .../cc/ryanc/halo/service/impl/PostServiceImpl.java    | 10 ++++++++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/cc/ryanc/halo/model/domain/Post.java b/src/main/java/cc/ryanc/halo/model/domain/Post.java
index 9516335ad..5d871abd2 100755
--- a/src/main/java/cc/ryanc/halo/model/domain/Post.java
+++ b/src/main/java/cc/ryanc/halo/model/domain/Post.java
@@ -154,13 +154,11 @@ public class Post implements Serializable {
     /**
      * Post priority (default is 0)
      */
-    @ColumnDefault("0")
     private Integer postPriority;
 
     /**
-     * 发布来源
+     * 发布来源 (default is admin)
      */
-    @ColumnDefault("admin")
     private String postSource;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@@ -189,6 +187,10 @@ public class Post implements Serializable {
             postPriority = 0;
         }
 
+        if (postSource == null) {
+            postSource = "admin";
+        }
+
         postId = null;
     }
 }
diff --git a/src/main/java/cc/ryanc/halo/repository/PostRepository.java b/src/main/java/cc/ryanc/halo/repository/PostRepository.java
index 298d1d2dc..c1488651e 100644
--- a/src/main/java/cc/ryanc/halo/repository/PostRepository.java
+++ b/src/main/java/cc/ryanc/halo/repository/PostRepository.java
@@ -24,14 +24,6 @@ import java.util.List;
  */
 public interface PostRepository extends BaseRepository<Post, Long>, JpaSpecificationExecutor<Post> {
 
-    /**
-     * 查询前五条文章
-     *
-     * @return List
-     */
-    @Query(value = "SELECT * FROM halo_post WHERE post_type='post' ORDER BY post_date DESC LIMIT 5", nativeQuery = true)
-    List<Post> findTopFive();
-
     /**
      * 查询所有文章 根据文章类型
      *
diff --git a/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java
index 97f4d013c..e82ff8eb5 100755
--- a/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java
+++ b/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java
@@ -3,10 +3,10 @@ package cc.ryanc.halo.service.impl;
 import cc.ryanc.halo.model.domain.Category;
 import cc.ryanc.halo.model.domain.Post;
 import cc.ryanc.halo.model.domain.Tag;
-import cc.ryanc.halo.model.support.Archive;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.PostStatusEnum;
 import cc.ryanc.halo.model.enums.PostTypeEnum;
+import cc.ryanc.halo.model.support.Archive;
 import cc.ryanc.halo.repository.PostRepository;
 import cc.ryanc.halo.service.CategoryService;
 import cc.ryanc.halo.service.PostService;
@@ -18,7 +18,9 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Service;
@@ -238,7 +240,11 @@ public class PostServiceImpl extends AbstractCrudService<Post, Long> implements
     @Override
     @Cacheable(value = POSTS_CACHE_NAME, key = "'posts_latest'")
     public List<Post> findPostLatest() {
-        return postRepository.findTopFive();
+        Pageable pageable = PageRequest.of(0, 5, Sort.by(Sort.Direction.DESC, "postDate"));
+
+        Page<Post> postPage = postRepository.findAll(pageable);
+
+        return postPage.getContent();
     }
 
     /**