👽 干掉部分bug

.gitignore

@@ -33,5 +33,3 @@ nbdist/
 ### VS Code ###
 *.project
 *.factorypath
-
-~/

src/main/java/cc/ryanc/halo/Application.java

@@ -11,8 +11,8 @@
 @Slf4j
 @SpringBootApplication
 public class Application {
-	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
-		log.info("Halo started at http://localhost:8090");
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+        log.info("Halo started at http://localhost:8090");
+    }
 }

src/main/java/cc/ryanc/halo/repository/AttachmentRepository.java

@@ -19,7 +19,7 @@ public interface AttachmentRepository extends JpaRepository<Attachment, Long> {
      * 查询所有附件，分页
      *
      * @param pageable pageable
-     * @return page
+     * @return Page
      */
     @Override
     Page<Attachment> findAll(Pageable pageable);

src/main/java/cc/ryanc/halo/repository/CategoryRepository.java

@@ -17,7 +17,7 @@ public interface CategoryRepository extends JpaRepository<Category, Long> {
      * 根据分类目录路径查询，用于验证是否已经存在该路径
      *
      * @param cateUrl cateUrl 文章url
-     * @return category
+     * @return Category
      */
     Category findCategoryByCateUrl(String cateUrl);
 }

src/main/java/cc/ryanc/halo/repository/CommentRepository.java

@@ -24,15 +24,15 @@ public interface CommentRepository extends JpaRepository<Comment, Long> {
      *
      * @param status   文章状态
      * @param pageable 分页信息
-     * @return page
+     * @return Page
      */
     Page<Comment> findCommentsByCommentStatus(Integer status, Pageable pageable);
 
     /**
      * 根据评论状态查询所有评论 不分页
      *
      * @param status 文章状态
-     * @return list
+     * @return List
      */
     List<Comment> findCommentsByCommentStatus(Integer status);
 
@@ -41,7 +41,7 @@ public interface CommentRepository extends JpaRepository<Comment, Long> {
      *
      * @param post     post
      * @param pageable pageable
-     * @return page
+     * @return Page
      */
     Page<Comment> findCommentsByPost(Post post, Pageable pageable);
 
@@ -51,14 +51,14 @@ public interface CommentRepository extends JpaRepository<Comment, Long> {
      * @param post     post
      * @param pageable pageable
      * @param status   status
-     * @return page
+     * @return Page
      */
     Page<Comment> findCommentsByPostAndCommentStatus(Post post, Pageable pageable, Integer status);
 
     /**
      * 查询最新的前五条评论
      *
-     * @return list
+     * @return List
      */
     @Query(value = "SELECT * FROM halo_comment ORDER BY comment_date DESC LIMIT 5", nativeQuery = true)
     List<Comment> findTopFive();

src/main/java/cc/ryanc/halo/repository/LogsRepository.java

@@ -19,7 +19,7 @@ public interface LogsRepository extends JpaRepository<Logs, Long> {
     /**
      * 查询最新的五条数据
      *
-     * @return list
+     * @return List
      */
     @Query(value = "SELECT * FROM halo_logs ORDER BY log_created DESC LIMIT 5", nativeQuery = true)
     List<Logs> findTopFive();

src/main/java/cc/ryanc/halo/repository/OptionsRepository.java

@@ -17,7 +17,7 @@ public interface OptionsRepository extends JpaRepository<Options, Long> {
      * 根据key查询单个option
      *
      * @param key key
-     * @return String
+     * @return Options
      */
     Options findOptionsByOptionName(String key);
 }

src/main/java/cc/ryanc/halo/repository/PostRepository.java

@@ -25,7 +25,7 @@ public interface PostRepository extends JpaRepository<Post, Long> {
     /**
      * 查询前五条文章
      *
-     * @return list
+     * @return List
      */
     @Query(value = "SELECT * FROM halo_post where post_type='post' ORDER BY post_date DESC LIMIT 5", nativeQuery = true)
     List<Post> findTopFive();
@@ -34,7 +34,7 @@ public interface PostRepository extends JpaRepository<Post, Long> {
      * 查询所有文章 根据文章类型
      *
      * @param postType post or page
-     * @return List<Post></>
+     * @return List
      */
     List<Post> findPostsByPostType(String postType);
 
@@ -43,7 +43,7 @@ public interface PostRepository extends JpaRepository<Post, Long> {
      *
      * @param postType post or page
      * @param pageable 分页信息
-     * @return Page<Post></>
+     * @return Page
      */
     Page<Post> findPostsByPostType(String postType, Pageable pageable);
 
@@ -52,7 +52,7 @@ public interface PostRepository extends JpaRepository<Post, Long> {
      *
      * @param keyWord  keyword
      * @param pageable pageable
-     * @return list
+     * @return List
      */
     List<Post> findByPostTitleLike(String keyWord, Pageable pageable);
 
@@ -62,7 +62,7 @@ public interface PostRepository extends JpaRepository<Post, Long> {
      * @param status   0，1，2
      * @param postType post or page
      * @param pageable 分页信息
-     * @return Page<Post></>
+     * @return Page
      */
     Page<Post> findPostsByPostStatusAndPostType(Integer status, String postType, Pageable pageable);
 
@@ -71,7 +71,7 @@ public interface PostRepository extends JpaRepository<Post, Long> {
      *
      * @param status   0,1,2
      * @param postType post or page
-     * @return List<Post></>
+     * @return List
      */
     List<Post> findPostsByPostStatusAndPostType(Integer status, String postType);
 
@@ -90,7 +90,7 @@ public interface PostRepository extends JpaRepository<Post, Long> {
      * @param postDate   发布时间
      * @param postStatus 0，1，2
      * @param postType   post or page
-     * @return List<Post></>
+     * @return List
      */
     List<Post> findByPostDateAfterAndPostStatusAndPostTypeOrderByPostDateDesc(Date postDate, Integer postStatus, String postType);
 
@@ -101,22 +101,22 @@ public interface PostRepository extends JpaRepository<Post, Long> {
      * @param postDate   发布时间
      * @param postStatus 0，1，2
      * @param postType   post or page
-     * @return List<Post></>
+     * @return List
      */
     List<Post> findByPostDateBeforeAndPostStatusAndPostTypeOrderByPostDateAsc(Date postDate, Integer postStatus, String postType);
 
     /**
      * 查询文章归档信息 根据年份和月份
      *
-     * @return List<Object [ ]></>
+     * @return List
      */
     @Query(value = "select year(post_date) as year,month(post_date) as month,count(*) as count from halo_post where post_status=0 and post_type='post' group by year(post_date),month(post_date) order by year desc,month desc", nativeQuery = true)
     List<Object[]> findPostGroupByYearAndMonth();
 
     /**
      * 查询文章归档信息 根据年份
      *
-     * @return List<Object   [   ]></>
+     * @return List
      */
     @Query(value = "select year(post_date) as year,count(*) as count from halo_post where post_status=0 and post_type='post' group by year(post_date) order by year desc", nativeQuery = true)
     List<Object[]> findPostGroupByYear();
@@ -126,7 +126,7 @@ public interface PostRepository extends JpaRepository<Post, Long> {
      *
      * @param year  year
      * @param month month
-     * @return List<Post></>
+     * @return List
      */
     @Query(value = "select *,year(post_date) as year,month(post_date) as month from halo_post where post_status=0 and post_type='post' and year(post_date)=:year and month(post_date)=:month order by post_date desc", nativeQuery = true)
     List<Post> findPostByYearAndMonth(@Param("year") String year, @Param("month") String month);
@@ -135,7 +135,7 @@ public interface PostRepository extends JpaRepository<Post, Long> {
      * 根据年份查询文章
      *
      * @param year year
-     * @return List<Post></>
+     * @return List
      */
     @Query(value = "select *,year(post_date) as year from halo_post where post_status=0 and post_type='post' and year(post_date)=:year order by post_date desc", nativeQuery = true)
     List<Post> findPostByYear(@Param("year") String year);
@@ -146,7 +146,7 @@ public interface PostRepository extends JpaRepository<Post, Long> {
      * @param year     year
      * @param month    month
      * @param pageable pageable
-     * @return Page<Post></>
+     * @return Page
      */
     @Query(value = "select * from halo_post where post_status=0 and post_type='post' and year(post_date)=:year and month(post_date)=:month order by post_date desc", countQuery = "select count(*) from halo_post where post_status=0 and year(post_date)=:year and month(post_date)=:month", nativeQuery = true)
     Page<Post> findPostByYearAndMonth(@Param("year") String year, @Param("month") String month, Pageable pageable);
@@ -156,27 +156,33 @@ public interface PostRepository extends JpaRepository<Post, Long> {
      *
      * @param category category
      * @param pageable pageable
-     * @return Page<Post></>
+     * @return Page
      */
     Page<Post> findPostByCategories(Category category, Pageable pageable);
 
     /**
-     * 根据标签查询文章
+     * 根据标签查询文章，分页
      *
      * @param tag      tag
      * @param pageable pageable
-     * @return Page<Post></>
+     * @return Page
      */
     Page<Post> findPostsByTags(Tag tag, Pageable pageable);
 
+    /**
+     * 根据标签查询文章
+     *
+     * @param tag tag
+     * @return List
+     */
+    List<Post> findPostsByTags(Tag tag);
+
     /**
      * 模糊查询文章
      *
-     * @param postType   文章类型，post or page
-     * @param postStatus 0，1，2
      * @param keyword    关键词
      * @param pageable   分页信息
-     * @return Page<Post></>
+     * @return Page
      */
     @Query(value = "select * from halo_post where post_status = 0 and post_type='post' and post_title like '%=:keyword%' or post_content like '%=:keyword%'", nativeQuery = true)
     Page<Post> findPostByPostTitleLikeOrPostContentLikeAndPostTypeAndPostStatus(String keyword, Pageable pageable);

src/main/java/cc/ryanc/halo/repository/TagRepository.java

@@ -17,15 +17,15 @@ public interface TagRepository extends JpaRepository<Tag, Long> {
      * 根据标签路径查询，用于验证是否已经存在该路径
      *
      * @param tagUrl tagUrl
-     * @return tag
+     * @return Tag
      */
     Tag findTagByTagUrl(String tagUrl);
 
     /**
      * 根据标签名称查询
      *
      * @param tagName 标签名
-     * @return tag
+     * @return Tag
      */
     Tag findTagByTagName(String tagName);
 }

src/main/java/cc/ryanc/halo/repository/UserRepository.java

@@ -18,7 +18,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
      *
      * @param userName userName
      * @param userPass userPass
-     * @return list
+     * @return User
      */
     User findByUserNameAndUserPass(String userName, String userPass);
 
@@ -27,7 +27,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
      *
      * @param userEmail userEmail
      * @param userPass  userPass
-     * @return list
+     * @return User
      */
     User findByUserEmailAndUserPass(String userEmail, String userPass);
 

src/main/java/cc/ryanc/halo/service/AttachmentService.java

@@ -24,15 +24,15 @@ public interface AttachmentService {
     /**
      * 查询所有附件信息
      *
-     * @return list
+     * @return List
      */
     List<Attachment> findAllAttachments();
 
     /**
      * 查询所有附件，分页
      *
      * @param pageable pageable
-     * @return page
+     * @return Page
      */
     Page<Attachment> findAllAttachments(Pageable pageable);
 

src/main/java/cc/ryanc/halo/service/CommentService.java

@@ -25,7 +25,7 @@ public interface CommentService {
      * 删除评论
      *
      * @param commentId commentId
-     * @return comment
+     * @return Optional
      */
     Optional<Comment> removeByCommentId(Long commentId);
 
@@ -34,22 +34,22 @@ public interface CommentService {
      *
      * @param status   status
      * @param pageable pageable
-     * @return page
+     * @return Page
      */
     Page<Comment> findAllComments(Integer status, Pageable pageable);
 
     /**
      * 根据评论状态查询评论
      *
      * @param status 评论状态
-     * @return list
+     * @return List
      */
     List<Comment> findAllComments(Integer status);
 
     /**
      * 查询所有评论，不分页
      *
-     * @return list
+     * @return List
      */
     List<Comment> findAllComments();
 
@@ -58,15 +58,15 @@ public interface CommentService {
      *
      * @param commentId commentId
      * @param status    status
-     * @return comment
+     * @return Comment
      */
     Comment updateCommentStatus(Long commentId, Integer status);
 
     /**
      * 根据评论编号查询评论
      *
      * @param commentId commentId
-     * @return comment
+     * @return Optional
      */
     Optional<Comment> findCommentById(Long commentId);
 
@@ -75,7 +75,7 @@ public interface CommentService {
      *
      * @param post     post
      * @param pageable pageable
-     * @return page
+     * @return Page
      */
     Page<Comment> findCommentsByPost(Post post, Pageable pageable);
 
@@ -85,14 +85,14 @@ public interface CommentService {
      * @param post     post
      * @param pageable pageable
      * @param status   status
-     * @return page
+     * @return Page
      */
     Page<Comment> findCommentsByPostAndCommentStatus(Post post, Pageable pageable, Integer status);
 
     /**
      * 查询最新的前五条评论
      *
-     * @return list
+     * @return List
      */
     List<Comment> findCommentsLatest();
 }