fix[all]:修复部署到生产后的问题

Author: llldddbbb

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/entity/article/Article.java

@@ -76,5 +76,7 @@ public class Article implements Serializable {
     @ApiModelProperty(value = "发布状态")
     private Boolean publish;
 
+    @ApiModelProperty(value = "是否置顶")
+    private Boolean top;
 
 }

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/entity/book/BookNote.java

@@ -82,5 +82,9 @@ public class BookNote implements Serializable {
     @ApiModelProperty(value = "封面类型")
     private Integer coverType;
 
+    @ApiModelProperty(value = "是否置顶")
+    private Boolean top;
+
+
 
 }

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/mapper/article/ArticleMapper.java

@@ -57,4 +57,11 @@ public interface ArticleMapper extends BaseMapper<Article> {
      * @param parseInt
      */
     void updateLikeNum(int parseInt);
+
+    /**
+     * 判断类别下是否有文章
+     * @param categoryId
+     * @return
+     */
+    int checkByCategory(Integer categoryId);
 }

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/mapper/book/BookMapper.java

@@ -48,4 +48,11 @@ public interface BookMapper extends BaseMapper<Book> {
      * @param parseInt
      */
     void updateLikeNum(int parseInt);
+
+    /**
+     * 判断类别下是否有图书
+     * @param categoryId
+     * @return
+     */
+    int checkByCategory(Integer categoryId);
 }

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/mapper/book/BookNoteMapper.java

@@ -63,4 +63,11 @@ public interface BookNoteMapper extends BaseMapper<BookNote> {
      * @param parseInt
      */
     void updateLikeNum(int parseInt);
+
+    /**
+     * 判断该类别下是否有笔记
+     * @param categoryId
+     * @return
+     */
+    int checkByCategory(Integer categoryId);
 }

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/mapper/operation/TagMapper.java

@@ -20,15 +20,15 @@
 public interface TagMapper extends BaseMapper<Tag> {
 
     /**
-     * 根据foreignId获取Tag列表
+     * 根据linkId获取Tag列表
      * @param linkId
      * @param type
      * @return
      */
     List<Tag> listByLinkId(@Param("linkId") Integer linkId, @Param("type") Integer type);
 
     /**
-     * 根据foreignId删除多对多关联
+     * 根据linkId删除多对多关联
      * @param linkId
      * @param type
      */

dbblog-backend/dbblog-core/src/main/resources/application-prod.yml

@@ -40,6 +40,6 @@ oss:
   qiniu:
     domain: http://oss.dblearn.cn
     prefix: dbblog
-    accessKey: ENC(pVGOa/io1AnqiEKkDTVORO3W8nzn+vbOl53TeRBIGgCuWvqUEzOAdIBLmdpoYVmsDHESGVc2QzY=)
-    secretKey: ENC(UXM3TEuaIuLrPdKuDASHoZExQyOrgGl7PqV/iB0EbHOFhnUSF3bMol8D2qh+QlthccS5QD0fHbM=)
-    bucketName: dbblog
+    accessKey: tn86cySoW7wAY2dj8T1OBCwR4UeUPAi5MXPU-4vS
+    secretKey: IODztoTbbgmXxiO26CxM_8o4wpLX42Q8DYu9Wj2l
+    bucketName: dbblog

dbblog-backend/dbblog-core/src/main/resources/application.yml

@@ -15,7 +15,7 @@ server:
 spring:
   profiles:
     # 环境 开发dev，测试test，生产prod
-    active: dev
+    active: prod
   jackson:
     serialization:
       # jackson返回时间戳

dbblog-backend/dbblog-core/src/main/resources/logback-spring.xml

@@ -13,9 +13,12 @@
 
     <!-- 生产环境 -->
     <springProfile name="prod">
-        <logger name="org.springframework.web" level="ERROR"/>
-        <logger name="org.springboot.sample" level="ERROR" />
-        <logger name="cn.dblearn.blog" level="ERROR" />
+        <!--<logger name="org.springframework.web" level="ERROR"/>-->
+        <!--<logger name="org.springboot.sample" level="ERROR" />-->
+        <!--<logger name="cn.dblearn.blog" level="ERROR" />-->
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO" />
+        <logger name="cn.dblearn.blog" level="DEBUG" />
     </springProfile>
 
 </configuration>

dbblog-backend/dbblog-core/src/main/resources/mapper/article/ArticleMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="cn.dblearn.blog.mapper.article.ArticleMapper">
 
     <sql id="homeArticleColumn">
-        id,title,description,author,read_num,comment_num,like_num,cover,cover_type,create_time
+        id,title,description,author,read_num,comment_num,like_num,cover,cover_type,create_time,top
     </sql>
 
     <select id="listArticleVo" resultType="cn.dblearn.blog.entity.article.vo.ArticleVo">
@@ -24,18 +24,19 @@
             <if test="params.categoryId !=null and params.categoryId != ''">
                 and find_in_set(#{params.categoryId},category_id)
             </if>
+            and publish = true
         </where>
         <if test="params.recommend !=null and params.recommend != ''">
-            order by create_time desc
+            order by top desc, recommend desc
         </if>
         <if test="params.latest !=null and params.latest != ''">
-            order by create_time desc
+            order by top desc,create_time desc
         </if>
         <if test="params.favorite !=null and params.favorite != ''">
-            order by like_num desc
+            order by top desc,like_num desc
         </if>
         <if test="params.commentMost !=null and params.commentMost != ''">
-            order by comment_num desc
+            order by top desc,comment_num desc
         </if>
 
     </select>
@@ -51,4 +52,8 @@
     <update id="updateLikeNum">
         update article set like_num = like_num + 1 where id = #{id}
     </update>
+
+    <select id="checkByCategory" resultType="Integer">
+        select count(*) from article where category_id = #{categoryId}
+    </select>
 </mapper>