Commit 20593ba1 authored by Liang Ding's avatar Liang Ding

🔖 发布 v3.3.0

parent 01b99fec
{ {
"name": "Solo", "name": "Solo",
"version": "3.2.0", "version": "3.3.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
...@@ -1954,8 +1954,7 @@ ...@@ -1954,8 +1954,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -1998,8 +1997,7 @@ ...@@ -1998,8 +1997,7 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
...@@ -2010,8 +2008,7 @@ ...@@ -2010,8 +2008,7 @@
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -2128,8 +2125,7 @@ ...@@ -2128,8 +2125,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -2141,7 +2137,6 @@ ...@@ -2141,7 +2137,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -2171,7 +2166,6 @@ ...@@ -2171,7 +2166,6 @@
"version": "2.2.4", "version": "2.2.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.1", "safe-buffer": "^5.1.1",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -2190,7 +2184,6 @@ ...@@ -2190,7 +2184,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -2284,7 +2277,6 @@ ...@@ -2284,7 +2277,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -2370,8 +2362,7 @@ ...@@ -2370,8 +2362,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.1", "version": "5.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -2407,7 +2398,6 @@ ...@@ -2407,7 +2398,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -2427,7 +2417,6 @@ ...@@ -2427,7 +2417,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -2471,14 +2460,12 @@ ...@@ -2471,14 +2460,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.2", "version": "3.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
......
{ {
"name": "Solo", "name": "Solo",
"version": "3.2.0", "version": "3.3.0",
"description": " 一款小而美的博客系统,专为程序员设计。", "description": " 一款小而美的博客系统,专为程序员设计。",
"homepage": "https://github.com/b3log/solo", "homepage": "https://github.com/b3log/solo",
"repository": { "repository": {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<artifactId>solo</artifactId> <artifactId>solo</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>Solo</name> <name>Solo</name>
<version>3.2.0</version> <version>3.3.0</version>
<description> <description>
一款小而美的博客系统,专为程序员设计。 一款小而美的博客系统,专为程序员设计。
</description> </description>
......
...@@ -58,7 +58,7 @@ import javax.servlet.http.HttpSessionEvent; ...@@ -58,7 +58,7 @@ import javax.servlet.http.HttpSessionEvent;
* Solo Servlet listener. * Solo Servlet listener.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.10.0.10, Feb 16, 2019 * @version 1.10.0.11, Mar 17, 2019
* @since 0.3.1 * @since 0.3.1
*/ */
public final class SoloServletListener extends AbstractServletListener { public final class SoloServletListener extends AbstractServletListener {
...@@ -71,7 +71,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -71,7 +71,7 @@ public final class SoloServletListener extends AbstractServletListener {
/** /**
* Solo version. * Solo version.
*/ */
public static final String VERSION = "3.2.0"; public static final String VERSION = "3.3.0";
/** /**
* Bean manager. * Bean manager.
......
...@@ -26,13 +26,14 @@ import org.b3log.solo.model.Option; ...@@ -26,13 +26,14 @@ import org.b3log.solo.model.Option;
import org.b3log.solo.upgrade.V299_300; import org.b3log.solo.upgrade.V299_300;
import org.b3log.solo.upgrade.V300_310; import org.b3log.solo.upgrade.V300_310;
import org.b3log.solo.upgrade.V310_320; import org.b3log.solo.upgrade.V310_320;
import org.b3log.solo.upgrade.V320_330;
import org.json.JSONObject; import org.json.JSONObject;
/** /**
* Upgrade service. * Upgrade service.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.2.1.2, Mar 3, 2019 * @version 1.2.1.3, Mar 17, 2019
* @since 1.2.0 * @since 1.2.0
*/ */
@Service @Service
...@@ -71,6 +72,8 @@ public class UpgradeService { ...@@ -71,6 +72,8 @@ public class UpgradeService {
V300_310.perform(); V300_310.perform();
case "3.1.0": case "3.1.0":
V310_320.perform(); V310_320.perform();
case "3.2.0":
V320_330.perform();
break; break;
default: default:
......
...@@ -18,25 +18,14 @@ ...@@ -18,25 +18,14 @@
package org.b3log.solo.upgrade; package org.b3log.solo.upgrade;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes;
import org.b3log.latke.ioc.BeanManager; import org.b3log.latke.ioc.BeanManager;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.FilterOperator;
import org.b3log.latke.repository.PropertyFilter;
import org.b3log.latke.repository.Query;
import org.b3log.latke.repository.Transaction; import org.b3log.latke.repository.Transaction;
import org.b3log.latke.repository.jdbc.util.Connections;
import org.b3log.solo.model.Article;
import org.b3log.solo.model.Option; import org.b3log.solo.model.Option;
import org.b3log.solo.repository.ArticleRepository;
import org.b3log.solo.repository.OptionRepository; import org.b3log.solo.repository.OptionRepository;
import org.json.JSONObject; import org.json.JSONObject;
import java.sql.Connection;
import java.sql.Statement;
import java.util.List;
/** /**
* Upgrade script from v3.2.0 to v3.3.0. * Upgrade script from v3.2.0 to v3.3.0.
* *
...@@ -64,13 +53,21 @@ public final class V320_330 { ...@@ -64,13 +53,21 @@ public final class V320_330 {
final BeanManager beanManager = BeanManager.getInstance(); final BeanManager beanManager = BeanManager.getInstance();
final OptionRepository optionRepository = beanManager.getReference(OptionRepository.class); final OptionRepository optionRepository = beanManager.getReference(OptionRepository.class);
final ArticleRepository articleRepository = beanManager.getReference(ArticleRepository.class);
try { try {
final Transaction transaction = optionRepository.beginTransaction(); final Transaction transaction = optionRepository.beginTransaction();
optionRepository.remove("allowRegister"); optionRepository.remove("allowRegister");
JSONObject faviconURLOpt = optionRepository.get(Option.ID_C_FAVICON_URL);
if (null == faviconURLOpt) {
faviconURLOpt = new JSONObject();
faviconURLOpt.put(Keys.OBJECT_ID, Option.ID_C_FAVICON_URL);
faviconURLOpt.put(Option.OPTION_CATEGORY, Option.CATEGORY_C_PREFERENCE);
faviconURLOpt.put(Option.OPTION_VALUE, Option.DefaultPreference.DEFAULT_FAVICON_URL);
optionRepository.add(faviconURLOpt);
}
final JSONObject versionOpt = optionRepository.get(Option.ID_C_VERSION); final JSONObject versionOpt = optionRepository.get(Option.ID_C_VERSION);
versionOpt.put(Option.OPTION_VALUE, toVer); versionOpt.put(Option.OPTION_VALUE, toVer);
optionRepository.update(Option.ID_C_VERSION, versionOpt); optionRepository.update(Option.ID_C_VERSION, versionOpt);
......
This diff is collapsed.
This diff is collapsed.
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 2.0.0.3, Mar 16, 2019 * @version 2.0.0.4, Mar 17, 2019
*/ */
@import "reset"; @import "reset";
...@@ -262,7 +262,7 @@ input[type=text]:focus { ...@@ -262,7 +262,7 @@ input[type=text]:focus {
} }
.search__header a { .search__header a {
line-height: 44px; line-height: 32px;
} }
.search__input { .search__input {
...@@ -273,12 +273,12 @@ input[type=text]:focus { ...@@ -273,12 +273,12 @@ input[type=text]:focus {
.search__input input { .search__input input {
margin: 0 10px 0 20px; margin: 0 10px 0 20px;
width: 523px; width: 523px;
height: 44px; height: 32px;
line-height: 44px; line-height: 32px;
} }
.search__input button { .search__input button {
height: 44px; height: 32px;
margin: 0; margin: 0;
} }
......
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