Skip to content

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

🔖 发布 v3.6.1

parent fdb256a3
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 7 deletions
CHANGE_LOGS.html
View file @ 6359d0d0
......@@ -26,6 +26,18 @@
</style>
</head>
<body>
<h2>Release 3.6.1 - May 21, 2019</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12773">12773</a> 简化皮肤页脚 <span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li>
<li><a href="https://github.com/b3log/solo/issues/12768">12768</a> 放宽自定义导航链接校验 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12769">12769</a> 改进标签文章列表排序 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12770">12770</a> 导出 SQL 包后清理临时文件 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12771">12771</a> 改进后台管理中的分类更新 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12776">12776</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/12777">12777</a> 启动日志加入版本号、容器信息 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12778">12778</a> 评论中的 Emoji 使用原始字符 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12774">12774</a> 升级 npm 中 tar 和 extend 版本 <span style='background: #e102d8 !important;color:#FFFFFF !important;padding: 1px 4px;'>development</span></li>
</ul>
<h2>Release 3.6.0 - Apr 19, 2019</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12748">12748</a> Casper 细节修改 <span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li>
......
package-lock.json
View file @ 6359d0d0
{
"name": "Solo",
"version": "3.6.0",
"version": "3.6.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
package.json
View file @ 6359d0d0
{
"name": "Solo",
"version": "3.6.0",
"version": "3.6.1",
"description": " 一款小而美的博客系统，专为程序员设计。",
"homepage": "https://github.com/b3log/solo",
"repository": {
......
pom.xml
View file @ 6359d0d0
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: Solo POM.
Version: 3.18.3.57, May 9, 2019
Version: 3.18.3.58, May 21, 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>3.6.0</version>
<version>3.6.1</version>
<description>
一款小而美的博客系统，专为程序员设计。
</description>
......
src/main/java/org/b3log/solo/SoloServletListener.java
View file @ 6359d0d0
......@@ -59,7 +59,7 @@ import javax.servlet.http.HttpSessionEvent;
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://vanessa.b3log.org">Vanessa</a>
* @version 1.11.0.18, May 9, 2019
* @version 1.11.0.19, May 21, 2019
* @since 0.3.1
*/
public final class SoloServletListener extends AbstractServletListener {
......@@ -72,7 +72,7 @@ public final class SoloServletListener extends AbstractServletListener {
/**
* Solo version.
*/
public static final String VERSION = "3.6.0";
public static final String VERSION = "3.6.1";
/**
* Bean manager.
......
src/main/java/org/b3log/solo/service/UpgradeService.java
View file @ 6359d0d0
......@@ -30,7 +30,7 @@ import org.json.JSONObject;
* Upgrade service.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.2.1.6, Apr 19, 2019
* @version 1.2.1.7, May 21, 2019
* @since 1.2.0
*/
@Service
......@@ -77,6 +77,8 @@ public class UpgradeService {
V340_350.perform();
case "3.5.0":
V350_360.perform();
case "3.6.0":
V360_361.perform();
break;
default:
......
src/main/java/org/b3log/solo/upgrade/V360_361.java 0 → 100644
View file @ 6359d0d0
/*
* 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.0 to v3.6.1.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.0, May 21, 2019
* @since 3.6.1
*/
public final class V360_361 {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(V360_361.class);
/**
* Performs upgrade from v3.6.0 to v3.6.1.
*
* @throws Exception upgrade fails
*/
public static void perform() throws Exception {
final String fromVer = "3.6.0";
final String toVer = "3.6.1";
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/webapp/CHANGE_LOGS.html
View file @ 6359d0d0
......@@ -26,6 +26,18 @@
</style>
</head>
<body>
<h2>Release 3.6.1 - May 21, 2019</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12773">12773</a> 简化皮肤页脚 <span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li>
<li><a href="https://github.com/b3log/solo/issues/12768">12768</a> 放宽自定义导航链接校验 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12769">12769</a> 改进标签文章列表排序 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12770">12770</a> 导出 SQL 包后清理临时文件 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12771">12771</a> 改进后台管理中的分类更新 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12776">12776</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/12777">12777</a> 启动日志加入版本号、容器信息 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12778">12778</a> 评论中的 Emoji 使用原始字符 <span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
<li><a href="https://github.com/b3log/solo/issues/12774">12774</a> 升级 npm 中 tar 和 extend 版本 <span style='background: #e102d8 !important;color:#FFFFFF !important;padding: 1px 4px;'>development</span></li>
</ul>
<h2>Release 3.6.0 - Apr 19, 2019</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12748">12748</a> Casper 细节修改 <span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</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