Commit 8b494ae5 authored by Liang Ding's avatar Liang Ding

🎨 Fix #12703

parent 5dc2e8ab
......@@ -41,10 +41,7 @@ import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
import org.b3log.latke.util.Execs;
import org.b3log.latke.util.Strings;
import org.b3log.solo.SoloServletListener;
import org.b3log.solo.model.Common;
import org.b3log.solo.model.Option;
import org.b3log.solo.model.Skin;
import org.b3log.solo.model.UserExt;
import org.b3log.solo.model.*;
import org.b3log.solo.service.DataModelService;
import org.b3log.solo.service.ExportService;
import org.b3log.solo.service.OptionQueryService;
......@@ -68,7 +65,7 @@ import java.util.*;
* Admin console render processing.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.7.0.11, Feb 6, 2019
* @version 1.7.0.12, Mar 10, 2019
* @since 0.4.1
*/
@Singleton
......@@ -482,7 +479,10 @@ public class AdminConsole {
final String text = article.optString("front") + "---" + Strings.LINE_SEPARATOR + article.optString("content");
try {
FileUtils.writeStringToFile(new File(dirPath + File.separator + filename), text, "UTF-8");
final String date = DateFormatUtils.format(article.optLong("created"), "yyyyMM");
final String dir = dirPath + File.separator + date + File.separator;
new File(dir).mkdirs();
FileUtils.writeStringToFile(new File(dir + filename), text, "UTF-8");
} catch (final Exception e) {
LOGGER.log(Level.ERROR, "Write markdown file failed", e);
}
......
......@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
* Export service.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.0.1, Sep 16, 2018
* @version 1.1.0.2, Mar 10, 2019
* @since 2.5.0
*/
@Service
......@@ -139,7 +139,8 @@ public class ExportService {
* {
* "front": "", // yaml front matter,
* "title": "",
* "content": ""
* "content": "",
* "created": long
* }, ....
* ],
* "passwords": [], // format is same as post
......@@ -175,6 +176,7 @@ public class ExportService {
one.put("front", new Yaml().dump(front));
one.put("title", title);
one.put("content", article.optString(Article.ARTICLE_CONTENT));
one.put("created", article.optLong(Article.ARTICLE_CREATED));
if (StringUtils.isNotBlank(article.optString(Article.ARTICLE_VIEW_PWD))) {
passwords.add(one);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment