build(deps): bump pagehelper-spring-boot-starter from 1.4.1 to 1.4.6

Bumps [pagehelper-spring-boot-starter](https://github.com/pagehelper/pagehelper-spring-boot) from 1.4.1 to 1.4.6.
- [Release notes](https://github.com/pagehelper/pagehelper-spring-boot/releases)
- [Commits](https://github.com/pagehelper/pagehelper-spring-boot/compare/1.4.1...1.4.6)

---
updated-dependencies:
- dependency-name: com.github.pagehelper:pagehelper-spring-boot-starter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.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/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '0 14 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['java']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file. 
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.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 }}

doc/Build.md

@@ -9,7 +9,8 @@
 ### 2. 拉取项目到本地
 ``` shell script
 git clone https://github.com/xiaohai2271/blog-backEnd.git
-或 git clone git@github.com:xiaohai2271/blog-backEnd.git
+# 或
+git clone git@github.com:xiaohai2271/blog-backEnd.git
 ```
  
 ### 3. maven构建
@@ -26,7 +27,7 @@ java -jar target/blog-0.0.1-SNAPSHOT.jar
 ```shell script
 mvn clean # 清理项目资源
 mvn clean package # 清理项目资源并重新打包
-mvn clean package -DskipTest # 清理项目资源,重新打包并跳过测试
+mvn clean package -DskipTests # 清理项目资源,重新打包并跳过测试
 mvn 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,39 +99,39 @@
         <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.4.6</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>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
         </dependency>
 
         <!--    JJwt    -->
@@ -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,7 +158,7 @@
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.42.0</version>
+            <version>2.45.0</version>
         </dependency>
 
 
@@ -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/controller/CommonController.java

@@ -7,6 +7,7 @@ import cn.celess.blog.exception.MyException;
 import cn.celess.blog.service.CountService;
 import cn.celess.blog.service.QiniuService;
 import cn.celess.blog.util.HttpUtil;
+import cn.celess.blog.util.RedisUserUtil;
 import cn.celess.blog.util.RedisUtil;
 import cn.celess.blog.util.VeriCodeUtil;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -27,9 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -47,7 +46,7 @@ public class CommonController {
     @Autowired
     RedisUtil redisUtil;
     @Autowired
-    HttpServletRequest request;
+    RedisUserUtil redisUserUtil;
 
 
     @GetMapping("/counts")
@@ -89,7 +88,7 @@ public class CommonController {
      * @throws IOException IOException
      */
     @GetMapping(value = "/imgCode", produces = MediaType.IMAGE_PNG_VALUE)
-    public void getImg(HttpServletResponse response) throws IOException {
+    public void getImg(HttpServletRequest request, HttpServletResponse response) throws IOException {
         Object[] obj = VeriCodeUtil.createImage();
         request.getSession().setAttribute("code", obj[0]);
         //将图片输出给浏览器
@@ -133,9 +132,10 @@ public class CommonController {
      * FIXME :: 单张图片多次上传的问题
      * editor.md图片上传的接口
      * FUCK !!!
-     *
+     * !! 推荐使用 fileUpload(/fileUpload) 接口
      * @param file 文件
      */
+    @Deprecated
     @PostMapping("/imgUpload")
     public void upload(HttpServletRequest request, HttpServletResponse response, @RequestParam("editormd-image-file") MultipartFile file) throws IOException {
         Map<String, Object> map = new HashMap<>();
@@ -186,4 +186,37 @@ public class CommonController {
         JsonNode images = root.get("images").elements().next();
         return Response.success("https://cn.bing.com" + images.get("url").asText());
     }
+
+    @PostMapping("/fileUpload")
+    public Response<List<Map<String, Object>>> fileUpload(@RequestParam("file[]") MultipartFile[] files) throws IOException {
+        List<Map<String, Object>> result = new ArrayList<>();
+        String uploadTimesStr = redisUtil.get(redisUserUtil.get().getEmail() + "-fileUploadTimes");
+        int uploadTimes = 0;
+        if (uploadTimesStr != null) {
+            uploadTimes = Integer.parseInt(uploadTimesStr);
+        }
+        if (uploadTimes == 10) {
+            throw new MyException(ResponseEnum.FAILURE.getCode(), "上传次数已达10次，请2小时后在上传");
+        }
+        if (files.length == 0) {
+            throw new MyException(ResponseEnum.NO_FILE);
+        }
+        for (MultipartFile file : files) {
+            Map<String, Object> resp = new HashMap<>(4);
+
+            String fileName = file.getOriginalFilename();
+            assert fileName != null;
+            String mime = fileName.substring(fileName.lastIndexOf("."));
+            String name = fileName.replace(mime, "").replaceAll(" ", "");
+            QiniuResponse qiniuResponse = qiniuService.uploadFile(file.getInputStream(), "file_" + name + '_' + System.currentTimeMillis() + mime);
+            resp.put("originalFilename", fileName);
+            resp.put("success", qiniuResponse != null);
+            if (qiniuResponse != null) {
+                resp.put("host", "http://cdn.celess.cn/");
+                resp.put("path", qiniuResponse.key);
+            }
+            result.add(resp);
+        }
+        return Response.success(result);
+    }
 }

src/main/java/cn/celess/blog/enmu/ResponseEnum.java

@@ -62,6 +62,8 @@ public enum ResponseEnum {
     APPLY_LINK_NO_ADD_THIS_SITE(7200, "暂未在您的网站中抓取到本站链接"),
     DATA_EXPIRED(7300, "数据过期"),
     CANNOT_GET_DATA(7400, "暂无法获取到数据"),
+    NO_FILE(7500, "未选择文件，请重新选择"),
+
 
     //提交更新之前，没有获取数据/,
     DID_NOT_GET_THE_DATA(8020, "非法访问"),

src/main/java/cn/celess/blog/entity/Response.java

@@ -32,8 +32,8 @@ public class Response<T> implements Serializable {
      * @param result 结果
      * @return Response
      */
-    public static Response success(Object result) {
-        return new Response(ResponseEnum.SUCCESS.getCode(), ResponseEnum.SUCCESS.getMsg(), result);
+    public static <T> Response<T> success(T result) {
+        return new Response<T>(ResponseEnum.SUCCESS.getCode(), ResponseEnum.SUCCESS.getMsg(), result);
     }
 
     /**
@@ -42,8 +42,8 @@ public class Response<T> implements Serializable {
      * @param result 结果
      * @return Response
      */
-    public static Response failure(String result) {
-        return new Response(ResponseEnum.FAILURE.getCode(), ResponseEnum.FAILURE.getMsg(), result);
+    public static Response<String> failure(String result) {
+        return new Response<String>(ResponseEnum.FAILURE.getCode(), ResponseEnum.FAILURE.getMsg(), result);
     }
 
     /**
@@ -53,8 +53,8 @@ public class Response<T> implements Serializable {
      * @param result 结果
      * @return Response
      */
-    public static Response response(ResponseEnum r, String result) {
-        return new Response(r.getCode(), r.getMsg(), result);
+    public static <T> Response<T> response(ResponseEnum r, T result) {
+        return new Response<T>(r.getCode(), r.getMsg(), result);
     }
 
     @SneakyThrows

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,

src/main/resources/mapper/articleMapper.xml

@@ -19,8 +19,10 @@
         <association property="category" column="a_category_id" javaType="cn.celess.blog.entity.TagCategory"
                      resultMap="cn.celess.blog.mapper.CategoryMapper.categoryResultMap">
         </association>
-        <collection property="tags" ofType="cn.celess.blog.entity.TagCategory"
-                    resultMap="cn.celess.blog.mapper.CategoryMapper.categoryResultMap">
+        <collection property="tags" ofType="cn.celess.blog.entity.Tag"
+                    select="cn.celess.blog.mapper.ArticleTagMapper.findTagByArticleId" column="a_id">
+            <id column="tagId" property="id"/>
+            <result column="tagName" property="name"/>
         </collection>
     </resultMap>
 
@@ -49,7 +51,8 @@
             <result column="userAvatar" property="avatarImgUrl"/>
             <result column="userDisplayName" property="displayName"/>
         </association>
-        <collection property="tags" ofType="cn.celess.blog.entity.Tag">
+        <collection property="tags" ofType="cn.celess.blog.entity.Tag"
+                    select="cn.celess.blog.mapper.ArticleTagMapper.findTagByArticleId" column="{articleId=articleId}">
             <id column="tagId" property="id"/>
             <result column="tagName" property="name"/>
         </collection>
@@ -119,11 +122,37 @@
     </select>
 
     <select id="findAllByOpen" resultMap="articleViewResultMap">
-        select *
-        from articleView
-        where isOpen = #{isOpen}
-          and isDelete = false
-        order by articleId desc
+        select article.a_id             as articleId,
+               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_is_open = #{isOpen}
+          and article.is_delete = false
+          and 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>
 
 
@@ -152,9 +181,35 @@
 
 
     <select id="findAll" resultMap="articleViewResultMap">
-        select *
-        from articleView
-        order by articleId desc
+        select article.a_id             as articleId,
+               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>
 
 
@@ -169,7 +224,8 @@
         from articleView
         where articleId = (select max(articleId)
                            from articleView
-                           where articleId &lt; #{id}
+                           where isOpen = true
+                             and articleId &lt; #{id}
         )
     </select>
     <select id="getNextArticle" resultMap="articleViewResultMap">
@@ -177,7 +233,8 @@
         from articleView
         where articleId = (select min(articleId)
                            from articleView
-                           where articleId &gt; #{id}
+                           where isOpen = true
+                             and articleId &gt; #{id}
         )
     </select>
 

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());
+            }
+        });
+    }
 }