Merge branch 'dev' of github.com:lzh984294471/solo into dev

CHANGE_LOGS.md

+## v3.9.0 / 2020-02-21
+
+### 引入特性
+
+* [HTML 静态站点生成](https://github.com/88250/solo/issues/19)
+
+### 改进皮肤
+
+* [0 评论应该显示为浏览数](https://github.com/88250/solo/issues/46)
+* [Pinghsu 皮肤 footer.ftl 存在错误 script 标签](https://github.com/88250/solo/issues/50)
+* [next 皮肤目录样式优化](https://github.com/88250/solo/issues/55)
+
+### 改进功能
+
+* [支持代码块行号显示](https://github.com/88250/solo/issues/4)
+
+### 开发重构
+
+* [日志组件迁移到 log4j2](https://github.com/88250/solo/issues/44)
+* [支持 ES6 Module](https://github.com/88250/solo/issues/47)
+
+### 修复缺陷
+
+* [评论插件点击之后自动关闭](https://github.com/88250/solo/issues/48)
+* [解决目录插件偶尔重复加载的问题](https://github.com/88250/solo/issues/53)
+
 ## v3.8.0 / 2020-01-16
 
 ### 引入特性

package.json

 {
   "name": "solo",
-  "version": "3.8.0",
+  "version": "3.9.0",
   "description": " 一款小而美的博客系统，专为程序员设计。",
   "homepage": "https://github.com/88250/solo",
   "repository": {
@@ -49,6 +49,6 @@
     "nprogress": "^0.2.0",
     "uvstat": "^1.0.7",
     "vcmt": "^1.1.1",
-    "vditor": "^2.2.1"
+    "vditor": "^2.2.4"
   }
 }

pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Description: Solo POM.
-    Version: 3.18.3.84, Feb 10, 2020
+    Version: 3.18.3.85, Feb 21, 2020
     Author: <a href="http://88250.b3log.org">Liang Ding</a>
     Author: <a href="http://www.annpeter.cn">Ann Peter</a>
     Author: <a href="http://vanessa.b3log.org">Vanessa</a>
@@ -16,7 +16,7 @@
     <artifactId>solo</artifactId>
     <packaging>jar</packaging>
     <name>Solo</name>
-    <version>3.8.0</version>
+    <version>3.9.0</version>
     <description>
         一款小而美的博客系统，专为程序员设计。
     </description>

src/main/java/org/b3log/solo/Server.java

@@ -47,7 +47,7 @@ import org.json.JSONObject;
  * Server.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 3.0.0.0, Feb 9, 2020
+ * @version 3.0.0.1, Feb 21, 2020
  * @since 1.2.0
  */
 public final class Server extends BaseServer {
@@ -60,7 +60,7 @@ public final class Server extends BaseServer {
     /**
      * Solo version.
      */
-    public static final String VERSION = "3.8.0";
+    public static final String VERSION = "3.9.0";
 
     /**
      * Main.

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

@@ -31,7 +31,7 @@ import org.json.JSONObject;
  * Upgrade service.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.2.1.16, Jan 16, 2020
+ * @version 1.2.1.17, Feb 21, 2020
  * @since 1.2.0
  */
 @Service
@@ -100,6 +100,8 @@ public class UpgradeService {
                     V368_370.perform();
                 case "3.7.0":
                     V370_380.perform();
+                case "3.8.0":
+                    V380_390.perform();
 
                     break;
                 default:

src/main/java/org/b3log/solo/upgrade/V380_390.java

+/*
+ * Solo - A small and beautiful blogging system written in Java.
+ * Copyright (c) 2010-present, b3log.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.b3log.solo.upgrade;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.b3log.latke.ioc.BeanManager;
+import org.b3log.latke.repository.Transaction;
+import org.b3log.solo.model.Option;
+import org.b3log.solo.repository.OptionRepository;
+import org.json.JSONObject;
+
+/**
+ * Upgrade script from v3.8.0 to v3.9.0.
+ *
+ * @author <a href="http://88250.b3log.org">Liang Ding</a>
+ * @version 1.0.0.0, Feb 21, 2020
+ * @since 3.9.0
+ */
+public final class V380_390 {
+
+    /**
+     * Logger.
+     */
+    private static final Logger LOGGER = LogManager.getLogger(V380_390.class);
+
+    /**
+     * Performs upgrade from v3.8.0 to v3.9.0.
+     *
+     * @throws Exception upgrade fails
+     */
+    public static void perform() throws Exception {
+        final String fromVer = "3.8.0";
+        final String toVer = "3.9.0";
+
+        LOGGER.log(Level.INFO, "Upgrading from version [" + fromVer + "] to version [" + toVer + "]....");
+
+        final BeanManager beanManager = BeanManager.getInstance();
+        final OptionRepository optionRepository = beanManager.getReference(OptionRepository.class);
+
+        try {
+            final Transaction transaction = optionRepository.beginTransaction();
+
+            final JSONObject versionOpt = optionRepository.get(Option.ID_C_VERSION);
+            versionOpt.put(Option.OPTION_VALUE, toVer);
+            optionRepository.update(Option.ID_C_VERSION, versionOpt);
+
+            transaction.commit();
+
+            LOGGER.log(Level.INFO, "Upgraded from version [" + fromVer + "] to version [" + toVer + "] successfully");
+        } catch (final Exception e) {
+            LOGGER.log(Level.ERROR, "Upgrade failed!", e);
+
+            throw new Exception("Upgrade failed from version [" + fromVer + "] to version [" + toVer + "]");
+        }
+    }
+}

src/main/resources/CHANGE_LOGS.md

+## v3.9.0 / 2020-02-21
+
+### 引入特性
+
+* [HTML 静态站点生成](https://github.com/88250/solo/issues/19)
+
+### 改进皮肤
+
+* [0 评论应该显示为浏览数](https://github.com/88250/solo/issues/46)
+* [Pinghsu 皮肤 footer.ftl 存在错误 script 标签](https://github.com/88250/solo/issues/50)
+* [next 皮肤目录样式优化](https://github.com/88250/solo/issues/55)
+
+### 改进功能
+
+* [支持代码块行号显示](https://github.com/88250/solo/issues/4)
+
+### 开发重构
+
+* [日志组件迁移到 log4j2](https://github.com/88250/solo/issues/44)
+* [支持 ES6 Module](https://github.com/88250/solo/issues/47)
+
+### 修复缺陷
+
+* [评论插件点击之后自动关闭](https://github.com/88250/solo/issues/48)
+* [解决目录插件偶尔重复加载的问题](https://github.com/88250/solo/issues/53)
+
 ## v3.8.0 / 2020-01-16
 
 ### 引入特性

src/main/resources/js/common.js

@@ -307,7 +307,7 @@ window.Util = {
 (() => {
   $.ajax({
     method: 'GET',
-    url: 'https://cdn.jsdelivr.net/npm/vditor@2.2.1/dist/index.min.js',
+    url: 'https://cdn.jsdelivr.net/npm/vditor@2.2.4/dist/index.min.js',
     dataType: 'script',
     cache: true,
     success: () => {