build(deps): bump h2 from 2.0.206 to 2.1.214

Bumps [h2](https://github.com/h2database/h2database) from 2.0.206 to 2.1.214.
- [Release notes](https://github.com/h2database/h2database/releases)
- [Commits](https://github.com/h2database/h2database/compare/version-2.0.206...version-2.1.214)

---
updated-dependencies:
- dependency-name: com.h2database:h2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10

.github/workflows/build.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-
+    if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '.md')" # 如果 commit 信息包含以下关键字则跳过该任务
     runs-on: ubuntu-latest
     env:
       KEY: ${{ secrets.WEB_HOOK_ACCESS_KEY }}
@@ -22,5 +22,16 @@ jobs:
         with:
           java-version: 1.8
 
+      - name: Sync repository
+        uses: x-dr/sync-repo-to-gitee@v1.0
+        env:
+          # 在 Settings->Secrets 配置 GITEE_KEY
+          SSH_KEY: ${{ secrets.GITEE_KEY }}
+        with:
+          # GitHub存储库的SSH URL.
+          github-repo: git@github.com:xiaohai2271/blog-backEnd.git 
+          # Gitee存储库的SSH URL.
+          gitee-repo: git@gitee.com:xiaohai2271/blog-backEnd.git
+    
       - name: Deploy
         run: mvn -B test --file pom.xml && curl http://bt.celess.cn:2271/hook?access_key=$KEY

.github/workflows/test.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-
+    if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '.md')" # 如果 commit 信息包含以下关键字则跳过该任务
     runs-on: ubuntu-latest
     #    env:
     #      APPLICATION_PROPERTIES_TEST: ${{ secrets.APPLICATION_PROPERTIES_TEST }}

pom.xml

@@ -6,7 +6,7 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.1.3.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath/>
     </parent>
     <groupId>cn.celess</groupId>
     <artifactId>blog</artifactId>
@@ -40,14 +40,14 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
-            <version>1.1.14</version>
+            <version>1.2.6</version>
         </dependency>
 
         <!--  lombok  -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.6</version>
+            <version>1.18.20</version>
         </dependency>
 
 
@@ -67,12 +67,12 @@
         <dependency>
             <groupId>com.youbenzi</groupId>
             <artifactId>MDTool</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>net.minidev</groupId>
             <artifactId>json-smart</artifactId>
-            <version>2.3</version>
+            <version>2.4.7</version>
             <scope>compile</scope>
         </dependency>
 
@@ -99,33 +99,33 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.0.1</version>
+            <version>2.2.0</version>
         </dependency>
 
         <!--     pageHelper   -->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.12</version>
+            <version>1.3.0</version>
         </dependency>
 
         <!-- protostuff序列化依赖 -->
         <dependency>
             <groupId>com.dyuproject.protostuff</groupId>
             <artifactId>protostuff-core</artifactId>
-            <version>1.0.8</version>
+            <version>1.1.6</version>
         </dependency>
         <dependency>
             <groupId>com.dyuproject.protostuff</groupId>
             <artifactId>protostuff-runtime</artifactId>
-            <version>1.0.8</version>
+            <version>1.1.6</version>
         </dependency>
 
         <!--  Ua解析-->
         <dependency>
             <groupId>eu.bitwalker</groupId>
             <artifactId>UserAgentUtils</artifactId>
-            <version>1.20</version>
+            <version>1.21</version>
         </dependency>
 
         <dependency>
@@ -145,12 +145,12 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.1</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
-            <version>1.3.72</version>
+            <version>1.4.20</version>
             <scope>compile</scope>
         </dependency>
 
@@ -158,14 +158,14 @@
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.42.0</version>
+            <version>2.45.0</version>
         </dependency>
 
 
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>2.1.214</version>
         </dependency>
         <dependency>
             <groupId>com.github.kstyrc</groupId>
@@ -178,17 +178,17 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.3.0</version>
+            <version>2.3.1</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.3.0</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
-            <version>2.3.0</version>
+            <version>2.3.0.1</version>
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
@@ -214,7 +214,7 @@
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
-                <version>1.3.72</version>
+                <version>1.5.10</version>
                 <executions>
                     <execution>
                         <id>compile</id>

src/main/java/cn/celess/blog/mapper/ArticleTagMapper.java

@@ -1,6 +1,7 @@
 package cn.celess.blog.mapper;
 
 import cn.celess.blog.entity.ArticleTag;
+import cn.celess.blog.entity.Tag;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
@@ -27,6 +28,8 @@ public interface ArticleTagMapper {
 
     List<ArticleTag> findAllByArticleId(Long articleId);
 
+    List<Tag> findTagByArticleId(Long articleId);
+
     int deleteMultiById(List<ArticleTag> articleTags);
 
     List<ArticleTag> findArticleByTag(Long tagId);

src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java

@@ -279,21 +279,20 @@ public class ArticleServiceImpl implements ArticleService {
      */
     @Override
     public PageData<ArticleModel> adminArticles(int count, int page, Boolean deleted) {
+        PageHelper.startPage(page, count);
         List<Article> articleList = articleMapper.findAll();
 
-        PageData<ArticleModel> pageData = new PageData<>(null, 0, count, page);
+        PageData<ArticleModel> pageData = new PageData<>(new PageInfo<>(articleList));
+
         List<Article> collect;
         if (deleted != null) {
             collect = articleList.stream().filter(article -> article.isDeleted() == deleted).collect(Collectors.toList());
         } else {
             collect = articleList;
         }
-        pageData.setTotal(collect.size());
         List<ArticleModel> articleModels = collect.stream()
                 .peek(article -> article.setMdContent(null))
                 .map(ModalTrans::article)
-                .skip((page - 1) * count)
-                .limit(count)
                 .collect(Collectors.toList());
         pageData.setList(articleModels);
 

src/main/java/cn/celess/blog/util/JwtUtil.java

@@ -30,6 +30,8 @@ public class JwtUtil {
      */
     public static final long EXPIRATION_SHORT_TIME = 7200000;
     private static final String CLAIM_KEY_USERNAME = "sub";
+    private static final String BEARER_PREFIX_UPPER = "Bearer";
+    private static final String BEARER_PREFIX_LOWER = "bearer";
     /**
      * JWT 秘钥需自行设置不可泄露
      */
@@ -48,7 +50,7 @@ public class JwtUtil {
     }
 
     public String updateTokenDate(String token) {
-        Claims claims = Jwts.parser().setSigningKey(SECRET).parseClaimsJws(token).getBody();
+        Claims claims = Jwts.parser().setSigningKey(SECRET).parseClaimsJws(getJwtString(token)).getBody();
         return Jwts.builder()
                 .setClaims(claims)
                 .setExpiration(new Date(claims.getExpiration().getTime() + EXPIRATION_SHORT_TIME))
@@ -60,7 +62,7 @@ public class JwtUtil {
      * 获取token是否过期
      */
     public Boolean isTokenExpired(String token) {
-        Date expiration = getExpirationDateFromToken(token);
+        Date expiration = getExpirationDateFromToken(getJwtString(token));
         return expiration == null || expiration.before(new Date());
     }
 
@@ -68,7 +70,7 @@ public class JwtUtil {
      * 根据token获取username
      */
     public String getUsernameFromToken(String token) {
-        Claims claims = getClaimsFromToken(token);
+        Claims claims = getClaimsFromToken(getJwtString(token));
         return claims == null ? null : claims.getSubject();
     }
 
@@ -76,7 +78,7 @@ public class JwtUtil {
      * 获取token的过期时间
      */
     public Date getExpirationDateFromToken(String token) {
-        Claims claims = getClaimsFromToken(token);
+        Claims claims = getClaimsFromToken(getJwtString(token));
         return claims == null ? null : claims.getExpiration();
     }
 
@@ -88,7 +90,7 @@ public class JwtUtil {
         try {
             claims = Jwts.parser()
                     .setSigningKey(SECRET)
-                    .parseClaimsJws(token)
+                    .parseClaimsJws(getJwtString(token))
                     .getBody();
         } catch (ExpiredJwtException e) {
             log.info("JWT令牌过期");
@@ -107,4 +109,9 @@ public class JwtUtil {
         return claims;
     }
 
+    private String getJwtString(String token) {
+        if (token == null) return token;
+        return token.replaceFirst(BEARER_PREFIX_UPPER, "").replace(BEARER_PREFIX_LOWER, "");
+    }
+
 }

src/main/resources/mapper/ArticleTagMapper.xml

@@ -64,6 +64,14 @@
           and article_tag.t_id = tag_category.t_id
     </select>
 
+    <select id="findTagByArticleId" resultMap="cn.celess.blog.mapper.TagMapper.tagResultMap">
+        select tag_category.*
+        from article_tag,
+             tag_category
+        where a_id = #{articleId}
+          and article_tag.t_id = tag_category.t_id
+    </select>
+
     <select id="findOneById" resultMap="articleTagResultMap">
         select *
         from article_tag,
@@ -98,4 +106,4 @@
           and article_tag.a_id = article.a_id
     </select>
 
-</mapper>
+</mapper>

src/main/resources/mapper/articleMapper.xml

@@ -1,185 +1,242 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.celess.blog.mapper.ArticleMapper">
+<mapper namespace="cn.celess.blog.mapper.ArticleMapper">
-    <resultMap id="articleResultMap" type="cn.celess.blog.entity.Article">
+    <resultMap id="articleResultMap" type="cn.celess.blog.entity.Article">
-        <id column="a_id" property="id"/>
+        <id column="a_id" property="id"/>
-        <result column="a_title" property="title"/>
+        <result column="a_title" property="title"/>
-        <result column="a_summary" property="summary"/>
+        <result column="a_summary" property="summary"/>
-        <result column="a_md_content" property="mdContent"/>
+        <result column="a_md_content" property="mdContent"/>
-        <result column="a_url" property="url"/>
+        <result column="a_url" property="url"/>
-        <result column="a_author_id" property="user.id"/>
+        <result column="a_author_id" property="user.id"/>
-        <result column="a_is_open" property="open"/>
+        <result column="a_is_open" property="open"/>
-        <result column="a_is_original" property="type"/>
+        <result column="a_is_original" property="type"/>
-        <!--        <result column="next_a_id" property="nextArticleId"/>-->
+        <!--        <result column="next_a_id" property="nextArticleId"/>-->
-        <!--        <result column="pre_a_id" property="preArticleId"/>-->
+        <!--        <result column="pre_a_id" property="preArticleId"/>-->
-        <result column="a_reading_number" property="readingNumber"/>
+        <result column="a_reading_number" property="readingNumber"/>
-        <result column="a_publish_date" property="publishDate"/>
+        <result column="a_publish_date" property="publishDate"/>
-        <result column="a_update_date" property="updateDate"/>
+        <result column="a_update_date" property="updateDate"/>
-        <result column="is_delete" property="deleted"/>
+        <result column="is_delete" property="deleted"/>
-        <association property="category" column="a_category_id" javaType="cn.celess.blog.entity.TagCategory"
+        <association property="category" column="a_category_id" javaType="cn.celess.blog.entity.TagCategory"
-                     resultMap="cn.celess.blog.mapper.CategoryMapper.categoryResultMap">
+                     resultMap="cn.celess.blog.mapper.CategoryMapper.categoryResultMap">
-        </association>
+        </association>
-        <collection property="tags" ofType="cn.celess.blog.entity.TagCategory"
+        <collection property="tags" ofType="cn.celess.blog.entity.Tag"
-                    resultMap="cn.celess.blog.mapper.CategoryMapper.categoryResultMap">
+                    select="cn.celess.blog.mapper.ArticleTagMapper.findTagByArticleId" column="a_id">
-        </collection>
+            <id column="tagId" property="id"/>
-    </resultMap>
+            <result column="tagName" property="name"/>
-
+        </collection>
-
+    </resultMap>
-    <resultMap id="articleViewResultMap" type="cn.celess.blog.entity.Article">
+
-        <id column="articleId" property="id"/>
+
-        <result column="title" property="title"/>
+    <resultMap id="articleViewResultMap" type="cn.celess.blog.entity.Article">
-        <result column="summary" property="summary"/>
+        <id column="articleId" property="id"/>
-        <result column="mdContent" property="mdContent"/>
+        <result column="title" property="title"/>
-        <result column="url" property="url"/>
+        <result column="summary" property="summary"/>
-        <result column="isOpen" property="open"/>
+        <result column="mdContent" property="mdContent"/>
-        <result column="isOriginal" property="type"/>
+        <result column="url" property="url"/>
-        <result column="likeCount" property="likeCount"/>
+        <result column="isOpen" property="open"/>
-        <result column="dislikeCount" property="dislikeCount"/>
+        <result column="isOriginal" property="type"/>
-        <result column="readingCount" property="readingNumber"/>
+        <result column="likeCount" property="likeCount"/>
-        <result column="publishDate" property="publishDate"/>
+        <result column="dislikeCount" property="dislikeCount"/>
-        <result column="updateDate" property="updateDate"/>
+        <result column="readingCount" property="readingNumber"/>
-        <result column="isDelete" property="deleted"/>
+        <result column="publishDate" property="publishDate"/>
-        <association property="category" column="categoryId" javaType="cn.celess.blog.entity.Category">
+        <result column="updateDate" property="updateDate"/>
-            <id column="categoryId" property="id"/>
+        <result column="isDelete" property="deleted"/>
-            <result column="categoryName" property="name"/>
+        <association property="category" column="categoryId" javaType="cn.celess.blog.entity.Category">
-        </association>
+            <id column="categoryId" property="id"/>
-        <association property="user" column="authorId" javaType="cn.celess.blog.entity.User">
+            <result column="categoryName" property="name"/>
-            <id column="authorId" property="id"/>
+        </association>
-            <result column="userEmail" property="email"/>
+        <association property="user" column="authorId" javaType="cn.celess.blog.entity.User">
-            <result column="userAvatar" property="avatarImgUrl"/>
+            <id column="authorId" property="id"/>
-            <result column="userDisplayName" property="displayName"/>
+            <result column="userEmail" property="email"/>
-        </association>
+            <result column="userAvatar" property="avatarImgUrl"/>
-        <collection property="tags" ofType="cn.celess.blog.entity.Tag">
+            <result column="userDisplayName" property="displayName"/>
-            <id column="tagId" property="id"/>
+        </association>
-            <result column="tagName" property="name"/>
+        <collection property="tags" ofType="cn.celess.blog.entity.Tag"
-        </collection>
+                    select="cn.celess.blog.mapper.ArticleTagMapper.findTagByArticleId" column="{articleId=articleId}">
-
+            <id column="tagId" property="id"/>
-    </resultMap>
+            <result column="tagName" property="name"/>
-
+        </collection>
-    <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="cn.celess.blog.entity.Article">
+
-        insert into article (a_author_id, a_category_id, a_md_content, a_is_original,
+    </resultMap>
-                             a_summary, a_title, a_url)
+
-        values (#{user.id}, #{category.id}, #{mdContent}, #{type}, #{summary}, #{title}, #{url})
+    <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="cn.celess.blog.entity.Article">
-    </insert>
+        insert into article (a_author_id, a_category_id, a_md_content, a_is_original,
-    <update id="delete">
+                             a_summary, a_title, a_url)
-        update article
+        values (#{user.id}, #{category.id}, #{mdContent}, #{type}, #{summary}, #{title}, #{url})
-        set is_delete = true
+    </insert>
-        where a_id = #{id}
+    <update id="delete">
-    </update>
+        update article
-
+        set is_delete = true
-    <update id="update">
+        where a_id = #{id}
-        update article
+    </update>
-        set a_update_date=now(),
+
-        <if test="title!=null">a_title=#{title},</if>
+    <update id="update">
-        <if test="mdContent!=null">a_md_content=#{mdContent},</if>
+        update article
-        <if test="summary!=null">a_summary=#{summary},</if>
+        set a_update_date=now(),
-        <if test="type!=null">a_is_original=#{type},</if>
+        <if test="title!=null">a_title=#{title},</if>
-        <if test="url!=null">a_url=#{url},</if>
+        <if test="mdContent!=null">a_md_content=#{mdContent},</if>
-        <if test="category!=null">a_category_id=#{category.id},</if>
+        <if test="summary!=null">a_summary=#{summary},</if>
-        <if test="open!=null">a_is_open=#{open}</if>
+        <if test="type!=null">a_is_original=#{type},</if>
-        where a_id = #{id}
+        <if test="url!=null">a_url=#{url},</if>
-    </update>
+        <if test="category!=null">a_category_id=#{category.id},</if>
-
+        <if test="open!=null">a_is_open=#{open}</if>
-    <update id="updateReadingNumber">
+        where a_id = #{id}
-        update article
+    </update>
-        set a_reading_number=a_reading_number + 1
+
-        where a_id = #{id}
+    <update id="updateReadingNumber">
-    </update>
+        update article
-
+        set a_reading_number=a_reading_number + 1
-    <select id="getLastestArticle" resultMap="articleViewResultMap" resultType="cn.celess.blog.entity.Article">
+        where a_id = #{id}
-        select *
+    </update>
-        from articleView
+
-        order by articleId desc
+    <select id="getLastestArticle" resultMap="articleViewResultMap" resultType="cn.celess.blog.entity.Article">
-        limit 1
+        select *
-    </select>
+        from articleView
-
+        order by articleId desc
-
+        limit 1
-    <select id="findArticleById" resultMap="articleViewResultMap">
+    </select>
-        select *
+
-        from articleView
+
-        where articleId = #{id}
+    <select id="findArticleById" resultMap="articleViewResultMap">
-    </select>
+        select *
-
+        from articleView
-    <select id="existsByTitle" resultType="boolean">
+        where articleId = #{id}
-        SELECT EXISTS(SELECT * FROM article WHERE a_title = #{title})
+    </select>
-    </select>
+
-
+    <select id="existsByTitle" resultType="boolean">
-    <select id="isDeletedById" resultType="boolean">
+        SELECT EXISTS(SELECT * FROM article WHERE a_title = #{title})
-        select is_delete
+    </select>
-        from article
+
-        WHERE a_id = #{id}
+    <select id="isDeletedById" resultType="boolean">
-    </select>
+        select is_delete
-
+        from article
-    <select id="findAllByAuthorId" resultMap="articleViewResultMap">
+        WHERE a_id = #{id}
-        select *
+    </select>
-        from articleView
+
-        where authorId = #{authorId}
+    <select id="findAllByAuthorId" resultMap="articleViewResultMap">
-          and isDelete = false
+        select *
-        order by articleId desc
+        from articleView
-    </select>
+        where authorId = #{authorId}
-
+          and isDelete = false
-    <select id="findAllByOpen" resultMap="articleViewResultMap">
+        order by articleId desc
-        select *
+    </select>
-        from articleView
+
-        where isOpen = #{isOpen}
+    <select id="findAllByOpen" resultMap="articleViewResultMap">
-          and isDelete = false
+        select article.a_id             as articleId,
-        order by articleId desc
+               article.a_title          as title,
-    </select>
+               article.a_summary        as summary,
-
+               article.a_md_content     as mdContent,
-
+               article.a_url            as url,
-    <select id="getTitleById" resultType="string">
+               article.a_is_original    as isOriginal,
-        SELECT title
+               article.a_reading_number as readingCount,
-        from articleView
+               article.a_like           as likeCount,
-        where articleId = #{id}
+               article.a_dislike        as dislikeCount,
-    </select>
+               article.a_publish_date   as publishDate,
-
+               article.a_update_date    as updateDate,
-    <select id="findAllByCategoryId" resultMap="articleViewResultMap">
+               article.a_is_open        as isOpen,
-        select *
+               category.t_id            as categoryId,
-        from articleView
+               category.t_name          as categoryName,
-        where categoryId = #{id}
+               user.u_id                as authorId,
-          and isDelete = false
+               user.u_email             as userEmail,
-        order by articleId desc
+               user.u_avatar            as userAvatar,
-    </select>
+               user.u_display_name      as userDisplayName,
-
+               article.is_delete        as isDelete
-    <select id="findAllByCategoryIdAndOpen" resultMap="articleViewResultMap">
+        from article,
-        select *
+             tag_category as category,
-        from articleView
+             article_tag,
-        where categoryId = #{id}
+             user
-          and isDelete = false
+        where article.a_is_open = #{isOpen}
-          and isOpen = true
+          and article.is_delete = false
-        order by articleId desc
+          and article.a_id = article_tag.a_id
-    </select>
+          and article.a_category_id = category.t_id
-
+          and category.is_category = true
-
+          and article.a_author_id = user.u_id
-    <select id="findAll" resultMap="articleViewResultMap">
+        group by article.a_id
-        select *
+        order by article.a_id desc
-        from articleView
+    </select>
-        order by articleId desc
+
-    </select>
+
-
+    <select id="getTitleById" resultType="string">
-
+        SELECT title
-    <select id="count" resultType="long">
+        from articleView
-        select count(*)
+        where articleId = #{id}
-        from article
+    </select>
-        where is_delete = false;
+
-    </select>
+    <select id="findAllByCategoryId" resultMap="articleViewResultMap">
-
+        select *
-    <select id="getPreArticle" resultMap="articleViewResultMap">
+        from articleView
-        select *
+        where categoryId = #{id}
-        from articleView
+          and isDelete = false
-        where articleId = (select max(articleId)
+        order by articleId desc
-                           from articleView
+    </select>
-                           where articleId &lt; #{id}
+
-        )
+    <select id="findAllByCategoryIdAndOpen" resultMap="articleViewResultMap">
-    </select>
+        select *
-    <select id="getNextArticle" resultMap="articleViewResultMap">
+        from articleView
-        select *
+        where categoryId = #{id}
-        from articleView
+          and isDelete = false
-        where articleId = (select min(articleId)
+          and isOpen = true
-                           from articleView
+        order by articleId desc
-                           where articleId &gt; #{id}
+    </select>
-        )
+
-    </select>
+
-
+    <select id="findAll" resultMap="articleViewResultMap">
-
+        select article.a_id             as articleId,
-</mapper>
+               article.a_title          as title,
+               article.a_summary        as summary,
+               article.a_md_content     as mdContent,
+               article.a_url            as url,
+               article.a_is_original    as isOriginal,
+               article.a_reading_number as readingCount,
+               article.a_like           as likeCount,
+               article.a_dislike        as dislikeCount,
+               article.a_publish_date   as publishDate,
+               article.a_update_date    as updateDate,
+               article.a_is_open        as isOpen,
+               category.t_id            as categoryId,
+               category.t_name          as categoryName,
+               user.u_id                as authorId,
+               user.u_email             as userEmail,
+               user.u_avatar            as userAvatar,
+               user.u_display_name      as userDisplayName,
+               article.is_delete        as isDelete
+        from article,
+             tag_category as category,
+             article_tag,
+             user
+        where article.a_id = article_tag.a_id
+          and article.a_category_id = category.t_id
+          and category.is_category = true
+          and article.a_author_id = user.u_id
+        group by article.a_id
+        order by article.a_id desc
+    </select>
+
+
+    <select id="count" resultType="long">
+        select count(*)
+        from article
+        where is_delete = false;
+    </select>
+
+    <select id="getPreArticle" resultMap="articleViewResultMap">
+        select *
+        from articleView
+        where articleId = (select max(articleId)
+                           from articleView
+                           where isOpen = true
+                             and articleId &lt; #{id}
+        )
+    </select>
+    <select id="getNextArticle" resultMap="articleViewResultMap">
+        select *
+        from articleView
+        where articleId = (select min(articleId)
+                           from articleView
+                           where isOpen = true
+                             and articleId &gt; #{id}
+        )
+    </select>
+
+
+</mapper>

src/test/java/cn/celess/blog/BaseTest.java

@@ -219,7 +219,7 @@ public class BaseTest {
     protected ResultActions getMockData(MockHttpServletRequestBuilder builder, String token, Object content) throws Exception {
         //        MockHttpServletRequestBuilder mockHttpServletRequestBuilder = get(url);
         if (token != null) {
-            builder.header("Authorization", token);
+            builder.header("Authorization", "Bearer "+token);
         }
         if (content != null) {
             builder.content(mapper.writeValueAsString(content)).contentType(MediaType.APPLICATION_JSON);

src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java

@@ -134,4 +134,13 @@ public class ArticleTagMapperTest extends BaseTest {
 
         return articleTag;
     }
-}
+
+    @Test
+    public void findTagByArticleId() {
+        Article article = articleMapper.findAll().get(0);
+        assertNotNull(article);
+
+        List<Tag> tagByArticleId = articleTagMapper.findTagByArticleId(article.getId());
+        assertNotEquals(0, tagByArticleId.size());
+    }
+}

src/test/java/cn/celess/blog/service/ArticleServiceTest.java

@@ -3,6 +3,8 @@ package cn.celess.blog.service;
 import cn.celess.blog.BaseTest;
 import cn.celess.blog.entity.model.ArticleModel;
 import cn.celess.blog.entity.model.PageData;
+import cn.celess.blog.mapper.ArticleMapper;
+import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -12,6 +14,8 @@ public class ArticleServiceTest extends BaseTest {
 
     @Autowired
     ArticleService articleService;
+    @Autowired
+    ArticleMapper articleMapper;
 
     @Test
     public void adminArticles() {
@@ -24,4 +28,25 @@ public class ArticleServiceTest extends BaseTest {
         assertTrue(pageData.getList().stream().anyMatch(ArticleModel::isDeleted));
         assertTrue(pageData.getList().stream().anyMatch(articleModel -> !articleModel.isDeleted()));
     }
-}
+
+    @Test
+    public void retrievePageForOpen() {
+        PageData<ArticleModel> articleModelPageData = articleService.retrievePageForOpen(10, 1);
+        assertEquals(10, articleModelPageData.getPageSize());
+        assertEquals(1, articleModelPageData.getPageNum());
+        assertEquals(10, articleModelPageData.getList().size());
+        articleModelPageData.getList().forEach(Assert::assertNotNull);
+
+        // 测试open字段
+        articleModelPageData.getList().forEach(articleModel -> {
+            // 当前文章
+            assertTrue(articleMapper.findArticleById(articleModel.getId()).getOpen());
+            if (articleModel.getPreArticle() != null) {
+                assertTrue(articleMapper.findArticleById(articleModel.getPreArticle().getId()).getOpen());
+            }
+            if (articleModel.getNextArticle() != null) {
+                assertTrue(articleMapper.findArticleById(articleModel.getNextArticle().getId()).getOpen());
+            }
+        });
+    }
+}