Skip to content

S
solo
Commit b54b09c7 authored by D's avatar D Committed by GitHub
Browse files
Options

Merge pull request #12141 from b3log/1.5.0-dev 

1.5.0 dev
parents 5f6ecbff 494f86e8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 54 deletions
.gitignore
View file @ b54b09c7
...@@ -14,6 +14,5 @@ ...@@ -14,6 +14,5 @@
src/main/webapp/skins/* src/main/webapp/skins/*
!src/main/webapp/skins/mobile !src/main/webapp/skins/mobile
!src/main/webapp/skins/yilia
!src/main/webapp/skins/next !src/main/webapp/skins/next
**/.DS_Store **/.DS_Store
CHANGE_LOGS.html
View file @ b54b09c7
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head> </head>
<body> <body>
<h2>Release 1.5.0 - Aug 10, 2016</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12130">12130 MySQL 数据导出 SQL 文件</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
<li><a href="https://github.com/b3log/solo/issues/12128">12128 JDBC 驱动反注册</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
<li><a href="https://github.com/b3log/solo/issues/12140">12140 新皮肤 next</a>&nbsp;<span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li>
</ul>
<h2>Release 1.4.0 - Jun 28, 2016</h2> <h2>Release 1.4.0 - Jun 28, 2016</h2>
<ul> <ul>
<li><a href="https://github.com/b3log/solo/issues/12060">12060 前台皮肤切换</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li> <li><a href="https://github.com/b3log/solo/issues/12060">12060 前台皮肤切换</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
......
pom.xml
View file @ b54b09c7
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<artifactId>solo</artifactId> <artifactId>solo</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>Solo</name> <name>Solo</name>
<version>1.4.0</version> <version>1.5.0</version>
<description> <description>
A blogging system written in Java, feel free to create your or your team own blog. 一个用 Java 实现的博客系统，为你或你的团队创建个博客吧。 A blogging system written in Java, feel free to create your or your team own blog. 一个用 Java 实现的博客系统，为你或你的团队创建个博客吧。
</description> </description>
......
src/main/java/org/b3log/solo/SoloServletListener.java
View file @ b54b09c7
...@@ -60,7 +60,7 @@ import org.json.JSONObject; ...@@ -60,7 +60,7 @@ import org.json.JSONObject;
* 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.8.2.14, Jun 28, 2016 * @version 1.8.2.15, Aug 10, 2016
* @since 0.3.1 * @since 0.3.1
*/ */
public final class SoloServletListener extends AbstractServletListener { public final class SoloServletListener extends AbstractServletListener {
...@@ -68,7 +68,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -68,7 +68,7 @@ public final class SoloServletListener extends AbstractServletListener {
/** /**
* Solo version. * Solo version.
*/ */
public static final String VERSION = "1.4.0"; public static final String VERSION = "1.5.0";
/** /**
* Logger. * Logger.
......
src/main/java/org/b3log/solo/model/Option.java
View file @ b54b09c7
...@@ -25,7 +25,7 @@ import org.json.JSONObject; ...@@ -25,7 +25,7 @@ import org.json.JSONObject;
* This class defines option model relevant keys. * This class defines option model relevant keys.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.3.0.1, Nov 20, 2015 * @version 1.3.0.2, Aug 9, 2016
* @since 0.6.0 * @since 0.6.0
*/ */
public final class Option { public final class Option {
...@@ -354,7 +354,7 @@ public final class Option { ...@@ -354,7 +354,7 @@ public final class Option {
/** /**
* Default skin directory name. * Default skin directory name.
*/ */
public static final String DEFAULT_SKIN_DIR_NAME = "yilia"; public static final String DEFAULT_SKIN_DIR_NAME = "next";
/** /**
* Default language. * Default language.
......
src/main/java/org/b3log/solo/processor/InitProcessor.java
View file @ b54b09c7
...@@ -52,7 +52,7 @@ import org.json.JSONObject; ...@@ -52,7 +52,7 @@ import org.json.JSONObject;
* Solo initialization service. * Solo initialization service.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.2.0.9, Apr 15, 2016 * @version 1.2.0.10, Aug 9, 2016
* @since 0.4.0 * @since 0.4.0
*/ */
@RequestProcessor @RequestProcessor
...@@ -152,11 +152,9 @@ public class InitProcessor { ...@@ -152,11 +152,9 @@ public class InitProcessor {
} }
final JSONRenderer renderer = new JSONRenderer(); final JSONRenderer renderer = new JSONRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = QueryResults.defaultResult(); final JSONObject ret = QueryResults.defaultResult();
renderer.setJSONObject(ret); renderer.setJSONObject(ret);
try { try {
...@@ -180,7 +178,6 @@ public class InitProcessor { ...@@ -180,7 +178,6 @@ public class InitProcessor {
} }
final Locale locale = Locales.getLocale(request); final Locale locale = Locales.getLocale(request);
requestJSONObject.put(Keys.LOCALE, locale.toString()); requestJSONObject.put(Keys.LOCALE, locale.toString());
initService.init(requestJSONObject); initService.init(requestJSONObject);
......
src/main/java/org/b3log/solo/service/UpgradeService.java
View file @ b54b09c7
...@@ -46,7 +46,7 @@ import org.json.JSONObject; ...@@ -46,7 +46,7 @@ import org.json.JSONObject;
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a> * @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a>
* @version 1.2.0.5, Jun 28, 2016 * @version 1.2.0.6, Aug 10, 2016
* @since 1.2.0 * @since 1.2.0
*/ */
@Service @Service
...@@ -111,7 +111,7 @@ public class UpgradeService { ...@@ -111,7 +111,7 @@ public class UpgradeService {
/** /**
* Old version. * Old version.
*/ */
private static final String FROM_VER = "1.3.0"; private static final String FROM_VER = "1.4.0";
/** /**
* New version. * New version.
......
src/main/resources/local.properties
View file @ b54b09c7
...@@ -16,25 +16,25 @@ ...@@ -16,25 +16,25 @@
# #
# Description: Solo local environment configurations. # Description: Solo local environment configurations.
# Version: 1.1.2.8, Jan 8, 2016 # Version: 1.1.3.8, Aug 10, 2016
# Author: Liang Ding # Author: Liang Ding
# #
#### H2 runtime #### #### H2 runtime ####
#runtimeDatabase=H2 runtimeDatabase=H2
#jdbc.username=root
#jdbc.password=
#jdbc.driver=org.h2.Driver
#jdbc.URL=jdbc:h2:~/b3log_solo_h2/db
#jdbc.pool=h2
#### MySQL runtime ####
runtimeDatabase=MYSQL
jdbc.username=root jdbc.username=root
jdbc.password= jdbc.password=
jdbc.driver=com.mysql.jdbc.Driver jdbc.driver=org.h2.Driver
jdbc.URL=jdbc:mysql://localhost:3306/b3log?useUnicode=yes&characterEncoding=utf8 jdbc.URL=jdbc:h2:~/b3log_solo_h2/db
jdbc.pool=druid jdbc.pool=h2
#### MySQL runtime ####
#runtimeDatabase=MYSQL
#jdbc.username=root
#jdbc.password=
#jdbc.driver=com.mysql.jdbc.Driver
#jdbc.URL=jdbc:mysql://localhost:3306/b3log?useUnicode=yes&characterEncoding=utf8
#jdbc.pool=druid
# The minConnCnt MUST larger or equal to 3 # The minConnCnt MUST larger or equal to 3
jdbc.minConnCnt=5 jdbc.minConnCnt=5
......
src/main/webapp/CHANGE_LOGS.html
View file @ b54b09c7
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head> </head>
<body> <body>
<h2>Release 1.5.0 - Aug 10, 2016</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12130">12130 MySQL 数据导出 SQL 文件</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
<li><a href="https://github.com/b3log/solo/issues/12128">12128 JDBC 驱动反注册</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
<li><a href="https://github.com/b3log/solo/issues/12140">12140 新皮肤 next</a>&nbsp;<span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li>
</ul>
<h2>Release 1.4.0 - Jun 28, 2016</h2> <h2>Release 1.4.0 - Jun 28, 2016</h2>
<ul> <ul>
<li><a href="https://github.com/b3log/solo/issues/12060">12060 前台皮肤切换</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li> <li><a href="https://github.com/b3log/solo/issues/12060">12060 前台皮肤切换</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
......
src/main/webapp/js/admin/latkeAdmin.js
View file @ b54b09c7
...@@ -2444,7 +2444,7 @@ admin.register["page-list"] = { ...@@ -2444,7 +2444,7 @@ admin.register["page-list"] = {
* *
* @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 1.0.0.8, May 28, 2013 * @version 1.1.0.8, Jul 27, 2016
*/ */
/* oterhs 相关操作 */ /* oterhs 相关操作 */
...@@ -2454,42 +2454,61 @@ admin.others = { ...@@ -2454,42 +2454,61 @@ admin.others = {
*/ */
init: function () { init: function () {
$("#tabOthers").tabs(); $("#tabOthers").tabs();
$.ajax({ $.ajax({
url: latkeConfig.servePath + "/console/reply/notification/template", url: latkeConfig.servePath + "/console/reply/notification/template",
type: "GET", type: "GET",
cache: false, cache: false,
success: function(result, textStatus){ success: function (result, textStatus) {
$("#tipMsg").text(result.msg); $("#tipMsg").text(result.msg);
if (!result.sc) { if (!result.sc) {
$("#loadMsg").text(""); $("#loadMsg").text("");
return; return;
} }
$("#replayEmailTemplateTitle").val(result.replyNotificationTemplate.subject); $("#replayEmailTemplateTitle").val(result.replyNotificationTemplate.subject);
$("#replayEmailTemplateBody").val(result.replyNotificationTemplate.body); $("#replayEmailTemplateBody").val(result.replyNotificationTemplate.body);
$("#loadMsg").text(""); $("#loadMsg").text("");
} }
}); });
}, },
/* /*
* @description 移除未使用的标签。 * @description 移除未使用的标签。
*/ */
removeUnusedTags: function () { removeUnusedTags: function () {
$("#tipMsg").text(""); $("#tipMsg").text("");
$.ajax({ $.ajax({
url: latkeConfig.servePath + "/console/tag/unused", url: latkeConfig.servePath + "/console/tag/unused",
type: "DELETE", type: "DELETE",
cache: false, cache: false,
success: function(result, textStatus){ success: function (result, textStatus) {
$("#tipMsg").text(result.msg); $("#tipMsg").text(result.msg);
}
});
},
/*
* @description 移除未使用的标签。
*/
exportSQL: function () {
$("#tipMsg").text("");
$.ajax({
url: latkeConfig.servePath + "/console/export/sql",
type: "GET",
cache: false,
success: function (result, textStatus) {
// AJAX 下载文件的话这里会发两次请求，用 sc 来判断是否是文件，如果没有 sc 说明文件可以下载（实际上就是 result）
if (!result.sc) {
// 再发一次请求进行正式下载
window.location = latkeConfig.servePath + "/console/export/sql";
} else {
$("#tipMsg").text(result.msg);
}
} }
}); });
}, },
/* /*
* 获取未使用的标签。 * 获取未使用的标签。
* XXX: Not used this function yet. * XXX: Not used this function yet.
...@@ -2499,13 +2518,13 @@ admin.others = { ...@@ -2499,13 +2518,13 @@ admin.others = {
url: latkeConfig.servePath + "/console/tag/unused", url: latkeConfig.servePath + "/console/tag/unused",
type: "GET", type: "GET",
cache: false, cache: false,
success: function(result, textStatus){ success: function (result, textStatus) {
$("#tipMsg").text(result.msg); $("#tipMsg").text(result.msg);
if (!result.sc) { if (!result.sc) {
$("#loadMsg").text(""); $("#loadMsg").text("");
return; return;
} }
var unusedTags = result.unusedTags; var unusedTags = result.unusedTags;
if (0 === unusedTags.length) { if (0 === unusedTags.length) {
return; return;
...@@ -2513,21 +2532,20 @@ admin.others = { ...@@ -2513,21 +2532,20 @@ admin.others = {
} }
}); });
}, },
/* /*
* @description 跟新回复提醒邮件模版 * @description 跟新回复提醒邮件模版
*/ */
update: function () { update: function () {
$("#loadMsg").text(Label.loadingLabel); $("#loadMsg").text(Label.loadingLabel);
$("#tipMsg").text(""); $("#tipMsg").text("");
var requestJSONObject = { var requestJSONObject = {
"replyNotificationTemplate": { "replyNotificationTemplate": {
"subject": $("#replayEmailTemplateTitle").val(), "subject": $("#replayEmailTemplateTitle").val(),
"body": $("#replayEmailTemplateBody").val() "body": $("#replayEmailTemplateBody").val()
} }
}; };
$.ajax({ $.ajax({
url: latkeConfig.servePath + "/console/reply/notification/template", url: latkeConfig.servePath + "/console/reply/notification/template",
type: "PUT", type: "PUT",
...@@ -2537,16 +2555,16 @@ admin.others = { ...@@ -2537,16 +2555,16 @@ admin.others = {
$("#tipMsg").text(result.msg); $("#tipMsg").text(result.msg);
$("#loadMsg").text(""); $("#loadMsg").text("");
} }
}); });
} }
}; };
/* /*
* 注册到 admin 进行管理 * 注册到 admin 进行管理
*/ */
admin.register.others = { admin.register.others = {
"obj": admin.others, "obj": admin.others,
"init":admin.others.init, "init": admin.others.init,
"refresh": function () { "refresh": function () {
admin.clearTip(); admin.clearTip();
} }
......
src/main/webapp/js/admin/latkeAdmin.min.js
View file @ b54b09c7
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/skins/mobile/skin.properties
View file @ b54b09c7
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
# #
# Description: Mobile skin. # Description: Mobile skin.
# Version: 1.0.0.13, Sep 16, 2015 # Version: 1.0.0.14, Aug 10, 2016
# Author: Liang Ding # Author: Liang Ding
# #
name=Mobile name=Mobile
version=0.1.5 version=0.1.5
forSolo=1.4.0 forSolo=1.5.0
memo=\u8bf7\u4e0d\u8981\u4ece\u90e8\u7f72\u76ee\u5f55\u4e2d\u5220\u9664\u8be5\u76ae\u80a4\uff0c\u5426\u5219\u79fb\u52a8\u8bbe\u5907\u8bbf\u95ee\u65f6\u535a\u5ba2\u5c06\u4e0d\u53ef\u7528\u3002 memo=\u8bf7\u4e0d\u8981\u4ece\u90e8\u7f72\u76ee\u5f55\u4e2d\u5220\u9664\u8be5\u76ae\u80a4\uff0c\u5426\u5219\u79fb\u52a8\u8bbe\u5907\u8bbf\u95ee\u65f6\u535a\u5ba2\u5c06\u4e0d\u53ef\u7528\u3002
src/main/webapp/skins/next/css/next.min.css
View file @ b54b09c7
This diff is collapsed.
src/main/webapp/skins/next/footer.ftl
View file @ b54b09c7
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
${footerContent} ${footerContent}
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> •
<a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version} <a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version}
<div class="fn-right">Theme by <a href="http://iissnan.com/" target="_blank">IIssNan</a> & <a href="http://vanessa.b3log.org" target="_blank">Vanessa</a>.</div>
</div> </div>
</footer> </footer>
<div class="back-to-top" onclick="Util.goTop()"></div> <div class="back-to-top" onclick="Util.goTop()"></div>
......
src/main/webapp/skins/next/js/next.min.js
View file @ b54b09c7
/*
* Copyright (c) 2010-2016, b3log.org & hacpai.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
var NexT={init:function(){$(".sidebar-toggle").click(function(){var i=$(".sidebar");$(this).hasClass("sidebar-active")?($(this).removeClass("sidebar-active"),$("body").animate({"padding-right":0}),i.animate({right:-320})):($(this).addClass("sidebar-active"),$("body").animate({"padding-right":320}),i.animate({right:0}))}),$(".site-nav-toggle").click(function(){$(".site-nav").slideToggle()}),$(document).ready(function(){setTimeout(function(){$(".logo-wrap").css("opacity",1),$(".logo-line-before i").animate({left:"0"},function(){$(".site-title").css("opacity",1).animate({top:0},function(){$(".menu").css("opacity",1).animate({"margin-top":"15px"}),$(".main").css("opacity",1).animate({top:"0"})})}),$(".logo-line-after i").animate({right:"0"})},500)})},initArticle:function(){$(".b3-solo-list li").length>0&&$(window).width()>700&&($(".sidebar").html($(".b3-solo-list")),$(".sidebar-toggle").click())}};NexT.init(); var NexT={init:function(){$(".sidebar-toggle").click(function(){var i=$(".sidebar");$(this).hasClass("sidebar-active")?($(this).removeClass("sidebar-active"),$("body").animate({"padding-right":0}),i.animate({right:-320})):($(this).addClass("sidebar-active"),$("body").animate({"padding-right":320}),i.animate({right:0}))}),$(".site-nav-toggle").click(function(){$(".site-nav").slideToggle()}),$(document).ready(function(){setTimeout(function(){$(".logo-wrap").css("opacity",1),$(".logo-line-before i").animate({left:"0"},function(){$(".site-title").css("opacity",1).animate({top:0},function(){$(".menu").css("opacity",1).animate({"margin-top":"15px"}),$(".main").css("opacity",1).animate({top:"0"})})}),$(".logo-line-after i").animate({right:"0"})},500)})},initArticle:function(){$(".b3-solo-list li").length>0&&$(window).width()>700&&($(".sidebar").html($(".b3-solo-list")),$(".sidebar-toggle").click())}};NexT.init();
\ No newline at end of file
src/main/webapp/skins/yilia/skin.properties
View file @ b54b09c7
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
name=yilia name=yilia
version=1.0.0 version=1.0.0
forSolo=1.4.0 forSolo=1.5.0
memo=http://litten.github.io/ memo=http://litten.github.io/
src/test/resources/skins/yilia/skin.properties → src/test/resources/skins/next/skin.properties
View file @ b54b09c7
# #
# Copyright (c) 2010-2015, b3log.org # Copyright (c) 2010-2016, b3log.org & hacpai.com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
# #
# #
# Description: yilia skin. # Description: next skin.
# Version: 0.1.0.0, Nov 1, 2015 # Version: 0.1.1.0, Jun 29, 2016
# Author: Liyuan Li # Author: Liyuan Li
# #
name=yilia name=next
version=1.0.0 version=1.0.0
forSolo=1.2.0 forSolo=1.5.0
memo=http://litten.github.io/ memo=https://github.com/iissnan/hexo-theme-next
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