Skip to content

S
solo-1
Commit ed5f3325 authored by Liang Ding's avatar Liang Ding
Browse files
Options

🔖 发布 v2.9.9

parent 69fd1cda
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 25 deletions
CHANGE_LOGS.html
View file @ ed5f3325
......@@ -26,6 +26,15 @@
</style>
</head>
<body>
<h2>Release 2.9.9 - Jan 30, 2019</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12514">12514</a> 同步 GitHub 仓库 <span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
<li><a href="https://github.com/b3log/solo/issues/12627">12627</a> 皮肤 Jane 增加目录 <span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li>
<li><a href="https://github.com/b3log/solo/issues/12625">12625</a> 改进导出功能导航 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12630">12630</a> 仅支持 GitHub 登录 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12631">12631</a> Google SEO <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12633">12633</a> 重构数据统计计数 <span style='background: #e102d8 !important;color:#FFFFFF !important;padding: 1px 4px;'>development</span></li>
</ul>
<h2>Release 2.9.8 - Jan 16, 2019</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12497">12497</a> 支持阿里云 OSS <span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
......
package-lock.json
View file @ ed5f3325
{
"name": "Solo",
"version": "2.9.8",
"version": "2.9.9",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
package.json
View file @ ed5f3325
{
"name": "Solo",
"version": "2.9.8",
"version": "2.9.9",
"description": "A blogging system written in Java, feel free to create your or your team own blog. 一个用 Java 实现的博客系统，为你或你的团队创建个博客吧！",
"homepage": "https://github.com/b3log/solo",
"repository": {
......@@ -10,7 +10,7 @@
"bugs": {
"url": "https://github.com/b3log/solo/issues"
},
"license": "GPLv3",
"license": "AGPLv3",
"private": true,
"scripts": {
"dev": "gulp watch",
......
pom.xml
View file @ ed5f3325
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: Solo POM.
Version: 3.18.3.44, Jan 16, 2019
Version: 3.18.3.45, Jan 30, 2019
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>war</packaging>
<name>Solo</name>
<version>2.9.8</version>
<version>2.9.9</version>
<description>
一款小而美的 Java 博客系统。
</description>
......
src/main/java/org/b3log/solo/SoloServletListener.java
View file @ ed5f3325
......@@ -66,7 +66,7 @@ public final class SoloServletListener extends AbstractServletListener {
/**
* Solo version.
*/
public static final String VERSION = "2.9.8";
public static final String VERSION = "2.9.9";
/**
* Bean manager.
......
src/main/java/org/b3log/solo/service/UpgradeService.java
View file @ ed5f3325
......@@ -56,7 +56,7 @@ import java.util.List;
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a>
* @version 1.2.0.33, Jan 15, 2019
* @version 1.2.0.34, Jan 30, 2019
* @since 1.2.0
*/
@Service
......@@ -80,7 +80,7 @@ public class UpgradeService {
/**
* Old version.
*/
private static final String FROM_VER = "2.9.7";
private static final String FROM_VER = "2.9.8";
/**
* New version.
......@@ -185,16 +185,24 @@ public class UpgradeService {
private void perform() throws Exception {
LOGGER.log(Level.INFO, "Upgrading from version [{0}] to version [{1}]....", FROM_VER, TO_VER);
try {
final Transaction transaction = optionRepository.beginTransaction();
try {
final JSONObject versionOpt = optionRepository.get(Option.ID_C_VERSION);
versionOpt.put(Option.OPTION_VALUE, TO_VER);
optionRepository.update(Option.ID_C_VERSION, versionOpt);
optionRepository.remove("statisticBlogArticleCount");
optionRepository.remove("statisticBlogCommentCount");
optionRepository.remove("statisticPublishedBlogArticleCount");
optionRepository.remove("statisticPublishedBlogCommentCount");
transaction.commit();
dropColumns();
LOGGER.log(Level.INFO, "Upgraded from version [{0}] to version [{1}] successfully :-)", FROM_VER, TO_VER);
} catch (final Exception e) {
if (transaction.isActive()) {
transaction.rollback();
}
LOGGER.log(Level.ERROR, "Upgrade failed!", e);
throw new Exception("Upgrade failed from version [" + FROM_VER + "] to version [" + TO_VER + ']');
......@@ -224,10 +232,12 @@ public class UpgradeService {
final Statement statement = connection.createStatement();
final String tablePrefix = Latkes.getLocalProperty("jdbc.tablePrefix") + "_";
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "article` DROP COLUMN `articleAuthorEmail`");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "article` DROP COLUMN `articleCreateDate`");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "article` DROP COLUMN `articleUpdateDate`");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "comment` DROP COLUMN `commentDate`");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "user` DROP COLUMN `userArticleCount`");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "user` DROP COLUMN `userPublishedArticleCount`");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "archivedate` DROP COLUMN `archiveDateArticleCount`");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "archivedate` DROP COLUMN `archiveDatePublishedArticleCount`");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "tag` DROP COLUMN `tagPublishedRefCount`");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "tag` DROP COLUMN `tagReferenceCount`");
statement.close();
connection.commit();
connection.close();
......
src/main/resources/local.properties
View file @ ed5f3325
......@@ -17,24 +17,24 @@
#
#
# Description: Solo local environment configurations for test.
# Description: Solo local environment configurations.
# Version: 1.1.3.12, Oct 8, 2018
# Author: Liang Ding
#
#### H2 runtime ####
runtimeDatabase=H2
jdbc.username=root
jdbc.password=
jdbc.driver=org.h2.Driver
jdbc.URL=jdbc:h2:~/solo_h2/db
#runtimeDatabase=H2
#jdbc.username=root
#jdbc.password=
#jdbc.driver=org.h2.Driver
#jdbc.URL=jdbc:h2:~/solo_h2/db
#### MySQL runtime ####
#runtimeDatabase=MYSQL
#jdbc.username=root
#jdbc.password=123456
#jdbc.driver=com.mysql.cj.jdbc.Driver
#jdbc.URL=jdbc:mysql://localhost:3306/solo?useUnicode=yes&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
runtimeDatabase=MYSQL
jdbc.username=root
jdbc.password=123456
jdbc.driver=com.mysql.cj.jdbc.Driver
jdbc.URL=jdbc:mysql://localhost:3306/solo?useUnicode=yes&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
# The minConnCnt MUST larger or equal to 3
jdbc.minConnCnt=5
......
src/main/webapp/CHANGE_LOGS.html
View file @ ed5f3325
......@@ -26,6 +26,15 @@
</style>
</head>
<body>
<h2>Release 2.9.9 - Jan 30, 2019</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12514">12514</a> 同步 GitHub 仓库 <span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
<li><a href="https://github.com/b3log/solo/issues/12627">12627</a> 皮肤 Jane 增加目录 <span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li>
<li><a href="https://github.com/b3log/solo/issues/12625">12625</a> 改进导出功能导航 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12630">12630</a> 仅支持 GitHub 登录 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12631">12631</a> Google SEO <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12633">12633</a> 重构数据统计计数 <span style='background: #e102d8 !important;color:#FFFFFF !important;padding: 1px 4px;'>development</span></li>
</ul>
<h2>Release 2.9.8 - Jan 16, 2019</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12497">12497</a> 支持阿里云 OSS <span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
......
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