From 4a4c0159d9c5098fd1bc0f2ba6a1f0b93d8224c4 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 23 Apr 2020 16:45:12 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E5=AF=BC=E5=85=A5=20Markdown=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AD=98=E6=A1=A3=E6=97=B6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20Fix=20#112?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/b3log/solo/service/ImportService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/b3log/solo/service/ImportService.java b/src/main/java/org/b3log/solo/service/ImportService.java index 24081605d..454221a80 100644 --- a/src/main/java/org/b3log/solo/service/ImportService.java +++ b/src/main/java/org/b3log/solo/service/ImportService.java @@ -35,7 +35,7 @@ * Import service. * * @author Liang Ding - * @version 1.0.1.6, Nov 22, 2019 + * @version 1.0.1.6, Apr 23, 2020 * @since 2.2.0 */ @Service @@ -92,7 +92,7 @@ public void importMarkdowns() { int succCnt = 0, failCnt = 0; final Set failSet = new TreeSet<>(); final Collection mds = FileUtils.listFiles(markdownsPath, new String[]{"md"}, true); - if (null == mds || mds.isEmpty()) { + if (mds.isEmpty()) { return; } @@ -187,6 +187,10 @@ private JSONObject parseArticle(final String fileName, String fileContent) { final Date date = parseDate(elems); ret.put(Article.ARTICLE_CREATED, date.getTime()); + // 文章 id 必须使用存档时间戳，否则生成的存档时间会是当前时间 + // 导入 Markdown 文件存档时间问题 https://github.com/88250/solo/issues/112 + ret.put(Keys.OBJECT_ID, String.valueOf(date.getTime())); + final String permalink = (String) elems.get("permalink"); if (StringUtils.isNotBlank(permalink)) { ret.put(Article.ARTICLE_PERMALINK, permalink);