Merge branch '3.6.1-dev'

src/main/java/org/b3log/solo/processor/console/AdminConsole.java

@@ -66,7 +66,7 @@ import java.util.*;
  * Admin console render processing.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.7.0.13, Mar 19, 2019
+ * @version 1.7.0.14, Apr 24, 2019
  * @since 0.4.1
  */
 @Singleton
@@ -332,6 +332,10 @@ public class AdminConsole {
             outputStream.write(zipData);
             outputStream.flush();
             outputStream.close();
+
+            // 导出 SQL 包后清理临时文件 https://github.com/b3log/solo/issues/12770
+            localFile.delete();
+            zipFile.delete();
         } catch (final Exception e) {
             LOGGER.log(Level.ERROR, "Export failed", e);
             context.renderJSON().renderMsg("Export failed, please check log");

src/main/java/org/b3log/solo/service/CommentQueryService.java

@@ -19,6 +19,7 @@ package org.b3log.solo.service;
 
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
+import org.b3log.latke.ioc.BeanManager;
 import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
@@ -51,7 +52,7 @@ import java.util.List;
  * Comment query service.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.3.2.6, Apr 19, 2019
+ * @version 1.3.2.7, Apr 24, 2019
  * @since 0.3.5
  */
 @Service
@@ -169,6 +170,16 @@ public class CommentQueryService {
 
                 final String onId = comment.getString(Comment.COMMENT_ON_ID);
                 final JSONObject article = articleRepository.get(onId);
+                if (null == article) {
+                    // 某种情况下导致的数据不一致：文章已经被删除了，但是评论还在
+                    // 为了保持数据一致性，需要删除该条评论
+                    // https://hacpai.com/article/1556060195022
+                    final CommentMgmtService commentMgmtService = BeanManager.getInstance().getReference(CommentMgmtService.class);
+                    commentMgmtService.removeArticleComment(onId);
+
+                    continue;
+                }
+
                 title = article.getString(Article.ARTICLE_TITLE);
                 comment.put(Common.TYPE, Common.ARTICLE_COMMENT_TYPE);
                 comment.put(Common.COMMENT_TITLE, title);