From c0d11d987ea7f8e4b55568e4662209c2531c2801 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Mon, 13 Jan 2020 20:31:20 +0800
Subject: [PATCH] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=83=20v3.7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGE_LOGS.md                                | 18 +++++
 package-lock.json                             |  2 +-
 package.json                                  |  2 +-
 pom.xml                                       |  4 +-
 src/main/java/org/b3log/solo/Server.java      |  4 +-
 .../b3log/solo/service/UpgradeService.java    |  4 +-
 .../java/org/b3log/solo/upgrade/V368_370.java | 72 +++++++++++++++++++
 src/main/resources/CHANGE_LOGS.md             | 18 +++++
 8 files changed, 117 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/org/b3log/solo/upgrade/V368_370.java

diff --git a/CHANGE_LOGS.md b/CHANGE_LOGS.md
index 8175ede82..c63349d4d 100644
--- a/CHANGE_LOGS.md
+++ b/CHANGE_LOGS.md
@@ -1,3 +1,21 @@
+## v3.7.0 / 2020-01-13
+
+### 引入特性
+
+* [浏览计数插件化](https://github.com/88250/solo/issues/17)
+* [加入社区 IP 黑名单防护](https://github.com/88250/solo/issues/36)
+
+### 改进功能
+
+* [看板娘资源移至社区](https://github.com/88250/solo/issues/34)
+* [密码文章后台不允许其他用户查看](https://github.com/88250/solo/issues/35)
+* [社区备份全部文章](https://github.com/88250/solo/issues/37)
+
+### 修复缺陷
+
+* [pjax 到文章页面，访问数不会 +1](https://github.com/88250/solo/issues/38)
+* [在未开启“允许通过链接访问草稿”时访问草稿报错](https://github.com/88250/solo/issues/40)
+
 ## v3.6.8 / 2020-01-03
 
 ### 引入特性
diff --git a/package-lock.json b/package-lock.json
index be450b74f..8226906b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Solo",
-  "version": "3.6.8",
+  "version": "3.7.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5ff38423e..c0eff6bd0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Solo",
-  "version": "3.6.8",
+  "version": "3.7.0",
   "description": " 一款小而美的博客系统，专为程序员设计。",
   "homepage": "https://github.com/88250/solo",
   "repository": {
diff --git a/pom.xml b/pom.xml
index b356d87cd..181585f3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Description: Solo POM.
-    Version: 3.18.3.78, Jan 7, 2020
+    Version: 3.18.3.79, Jan 13, 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.6.8</version>
+    <version>3.7.0</version>
     <description>
         一款小而美的博客系统，专为程序员设计。
     </description>
diff --git a/src/main/java/org/b3log/solo/Server.java b/src/main/java/org/b3log/solo/Server.java
index 3bd919b9d..c869f5fce 100644
--- a/src/main/java/org/b3log/solo/Server.java
+++ b/src/main/java/org/b3log/solo/Server.java
@@ -46,7 +46,7 @@
  * Server.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 2.0.0.7, Jan 13, 2020
+ * @version 2.0.0.8, Jan 13, 2020
  * @since 1.2.0
  */
 public final class Server extends BaseServer {
@@ -59,7 +59,7 @@ public final class Server extends BaseServer {
     /**
      * Solo version.
      */
-    public static final String VERSION = "3.6.8";
+    public static final String VERSION = "3.7.0";
 
     /**
      * Main.
diff --git a/src/main/java/org/b3log/solo/service/UpgradeService.java b/src/main/java/org/b3log/solo/service/UpgradeService.java
index 4d736c0d3..61ffc9502 100644
--- a/src/main/java/org/b3log/solo/service/UpgradeService.java
+++ b/src/main/java/org/b3log/solo/service/UpgradeService.java
@@ -30,7 +30,7 @@
  * Upgrade service.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.2.1.14, Jan 3, 2020
+ * @version 1.2.1.15, Jan 13, 2020
  * @since 1.2.0
  */
 @Service
@@ -95,6 +95,8 @@ public void upgrade() {
                     V366_367.perform();
                 case "3.6.7":
                     V367_368.perform();
+                case "3.6.8":
+                    V368_370.perform();
 
                     break;
                 default:
diff --git a/src/main/java/org/b3log/solo/upgrade/V368_370.java b/src/main/java/org/b3log/solo/upgrade/V368_370.java
new file mode 100644
index 000000000..92b5808e8
--- /dev/null
+++ b/src/main/java/org/b3log/solo/upgrade/V368_370.java
@@ -0,0 +1,72 @@
+/*
+ * 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.b3log.latke.ioc.BeanManager;
+import org.b3log.latke.logging.Level;
+import org.b3log.latke.logging.Logger;
+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.6.8 to v3.7.0.
+ *
+ * @author <a href="http://88250.b3log.org">Liang Ding</a>
+ * @version 1.0.0.0, Jan 13, 2020
+ * @since 3.7.0
+ */
+public final class V368_370 {
+
+    /**
+     * Logger.
+     */
+    private static final Logger LOGGER = Logger.getLogger(V368_370.class);
+
+    /**
+     * Performs upgrade from v3.6.8 to v3.7.0.
+     *
+     * @throws Exception upgrade fails
+     */
+    public static void perform() throws Exception {
+        final String fromVer = "3.6.8";
+        final String toVer = "3.7.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 + "]");
+        }
+    }
+}
diff --git a/src/main/resources/CHANGE_LOGS.md b/src/main/resources/CHANGE_LOGS.md
index 8175ede82..c63349d4d 100644
--- a/src/main/resources/CHANGE_LOGS.md
+++ b/src/main/resources/CHANGE_LOGS.md
@@ -1,3 +1,21 @@
+## v3.7.0 / 2020-01-13
+
+### 引入特性
+
+* [浏览计数插件化](https://github.com/88250/solo/issues/17)
+* [加入社区 IP 黑名单防护](https://github.com/88250/solo/issues/36)
+
+### 改进功能
+
+* [看板娘资源移至社区](https://github.com/88250/solo/issues/34)
+* [密码文章后台不允许其他用户查看](https://github.com/88250/solo/issues/35)
+* [社区备份全部文章](https://github.com/88250/solo/issues/37)
+
+### 修复缺陷
+
+* [pjax 到文章页面，访问数不会 +1](https://github.com/88250/solo/issues/38)
+* [在未开启“允许通过链接访问草稿”时访问草稿报错](https://github.com/88250/solo/issues/40)
+
 ## v3.6.8 / 2020-01-03
 
 ### 引入特性