🔖 发布 v3.6.1

88250 · Jan 25, 2020 · 1b14c3d · 1b14c3d
1 parent da5f35c
commit 1b14c3d
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 602 deletions.
diff --git a/CHANGE_LOGS.md b/CHANGE_LOGS.md
@@ -0,0 +1,17 @@
+## v3.6.1 / 2020-01-25
+
+### 引入特性
+
+* [编辑器 Vditor 所见即所得](https://github.com/88250/symphony/issues/3)
+
+### 改进功能
+
+* [更新项目地址相关链接](https://github.com/88250/symphony/issues/2)
+
+### 开发重构
+
+* [日志组件迁移到 log4j2](https://github.com/88250/symphony/issues/4)
+
+### 修复缺陷
+
+* [命令行参数 server_scheme 失效](https://github.com/88250/symphony/issues/1)
diff --git a/CHANGE_LOGS.html → CHANGE_LOGS_2013-2019.html b/CHANGE_LOGS.html → CHANGE_LOGS_2013-2019.html
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Symphony",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "A modern community (forum/BBS/SNS/blog) platform written in Java. 一款用 Java 实现的现代化社区（论坛/BBS/社交网络/博客）平台。",
   "homepage": "https://sym.b3log.org",
   "repository": {

diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Description: Symphony POM.
-    Version: 2.17.0.17, Jan 16, 2020
+    Version: 2.17.0.18, Jan 25, 2020
     Author: Liang Ding
     Author: Zephyr
 -->
@@ -12,7 +12,7 @@
     <groupId>org.b3log</groupId>
     <artifactId>symphony</artifactId>
     <packaging>jar</packaging>
-    <version>3.6.0</version>
+    <version>3.6.1</version>
     <name>Symphony</name>
     <url>https://sym.b3log.org</url>
     <description>

diff --git a/src/main/java/org/b3log/symphony/Server.java b/src/main/java/org/b3log/symphony/Server.java
@@ -44,7 +44,7 @@
  * Server.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 2.0.1.0, Dec 1, 2019
+ * @version 2.0.1.1, Jan 25, 2020
  * @since 3.4.8
  */
 public final class Server extends BaseServer {
@@ -57,7 +57,7 @@ public final class Server extends BaseServer {
     /**
      * Symphony version.
      */
-    public static final String VERSION = "3.6.0";
+    public static final String VERSION = "3.6.1";
 
     /**
      * Main.

diff --git a/src/main/java/org/b3log/symphony/processor/IndexProcessor.java b/src/main/java/org/b3log/symphony/processor/IndexProcessor.java
@@ -17,6 +17,7 @@
  */
 package org.b3log.symphony.processor;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
@@ -28,6 +29,7 @@
 import org.b3log.latke.http.annotation.RequestProcessing;
 import org.b3log.latke.http.annotation.RequestProcessor;
 import org.b3log.latke.http.renderer.AbstractFreeMarkerRenderer;
+import org.b3log.latke.http.renderer.TextHtmlRenderer;
 import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.model.Pagination;
 import org.b3log.latke.service.LangPropsService;
@@ -45,10 +47,13 @@
 import org.b3log.symphony.service.DataModelService;
 import org.b3log.symphony.service.UserMgmtService;
 import org.b3log.symphony.service.UserQueryService;
+import org.b3log.symphony.util.Markdowns;
 import org.b3log.symphony.util.Sessions;
 import org.b3log.symphony.util.Symphonys;
 import org.json.JSONObject;
 
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 /**
@@ -102,6 +107,25 @@ public class IndexProcessor {
     @Inject
     private LangPropsService langPropsService;
 
+    /**
+     * Show changelogs.
+     *
+     * @param context the specified context
+     */
+    @RequestProcessing("/CHANGE_LOGS.html")
+    public void showChangelogs(final RequestContext context) {
+        try {
+            final TextHtmlRenderer renderer = new TextHtmlRenderer();
+            context.setRenderer(renderer);
+            try (final InputStream resourceAsStream = IndexProcessor.class.getResourceAsStream("/CHANGE_LOGS.md")) {
+                final String content = IOUtils.toString(resourceAsStream, StandardCharsets.UTF_8);
+                renderer.setContent(Markdowns.toHTML(content));
+            }
+        } catch (final Exception e) {
+            context.sendStatus(500);
+        }
+    }
+
     /**
      * Shows question articles.
      *

diff --git a/src/main/resources/CHANGE_LOGS.html b/src/main/resources/CHANGE_LOGS.html
diff --git a/src/main/resources/CHANGE_LOGS.md b/src/main/resources/CHANGE_LOGS.md
@@ -0,0 +1,17 @@
+## v3.6.1 / 2020-01-25
+
+### 引入特性
+
+* [编辑器 Vditor 所见即所得](https://github.com/88250/symphony/issues/3)
+
+### 改进功能
+
+* [更新项目地址相关链接](https://github.com/88250/symphony/issues/2)
+
+### 开发重构
+
+* [日志组件迁移到 log4j2](https://github.com/88250/symphony/issues/4)
+
+### 修复缺陷
+
+* [命令行参数 server_scheme 失效](https://github.com/88250/symphony/issues/1)
diff --git a/src/main/resources/static-resources.xml b/src/main/resources/static-resources.xml
@@ -20,7 +20,7 @@
 -->
 <!--
     Description: Static resources definition.
-    Version: 1.7.0.0, May 24, 2017
+    Version: 1.7.0.1, Jan 25, 2020
     Author: Liang Ding
     Author: Liyuan Li
 -->
@@ -105,5 +105,4 @@
     <include path="/emoji/**/*.*" />
     <include path="/halt.html" />
     <include path="/opensearch.xml" />
-    <include path="/CHANGE_LOGS.html" />
 </static-files>