Merge pull request #12211 from b3log/1.8.0-dev

1.8.0 dev

src/main/java/org/b3log/solo/processor/console/AdminConsole.java

@@ -69,7 +69,7 @@ import org.json.JSONObject;
  * Admin console render processing.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.3.2.9, Aug 10, 2016
+ * @version 1.3.2.10, Nov 15, 2016
  * @since 0.4.1
  */
 @RequestProcessor
@@ -169,7 +169,8 @@ public class AdminConsole {
                     final Auth auth = Auth.create(qiniu.optString(Option.ID_C_QINIU_ACCESS_KEY),
                             qiniu.optString(Option.ID_C_QINIU_SECRET_KEY));
 
-                    final String uploadToken = auth.uploadToken(qiniu.optString(Option.ID_C_QINIU_BUCKET));
+                    final String uploadToken = auth.uploadToken(qiniu.optString(Option.ID_C_QINIU_BUCKET),
+                            null, 3600 * 6, null);
                     dataModel.put("qiniuUploadToken", uploadToken);
                     dataModel.put(Option.ID_C_QINIU_DOMAIN, qiniu.optString(Option.ID_C_QINIU_DOMAIN));
                 } catch (final Exception e) {

src/main/java/org/b3log/solo/processor/console/PreferenceConsole.java

@@ -47,7 +47,7 @@ import org.json.JSONObject;
  * Preference console request processing.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.2.0.8, Nov 20, 2015
+ * @version 1.2.0.9, Nov 15, 2016
  * @since 0.4.0
  */
 @RequestProcessor
@@ -542,10 +542,10 @@ public class PreferenceConsole {
         try {
             final JSONObject requestJSONObject = Requests.parseRequestJSONObject(request, response);
 
-            final String accessKey = requestJSONObject.optString(Option.ID_C_QINIU_ACCESS_KEY);
-            final String secretKey = requestJSONObject.optString(Option.ID_C_QINIU_SECRET_KEY);
-            String domain = requestJSONObject.optString(Option.ID_C_QINIU_DOMAIN);
-            final String bucket = requestJSONObject.optString(Option.ID_C_QINIU_BUCKET);
+            final String accessKey = requestJSONObject.optString(Option.ID_C_QINIU_ACCESS_KEY).trim();
+            final String secretKey = requestJSONObject.optString(Option.ID_C_QINIU_SECRET_KEY).trim();
+            String domain = requestJSONObject.optString(Option.ID_C_QINIU_DOMAIN).trim();
+            final String bucket = requestJSONObject.optString(Option.ID_C_QINIU_BUCKET).trim();
 
             final JSONObject ret = new JSONObject();
             renderer.setJSONObject(ret);

src/main/webapp/js/admin/article.js

@@ -18,7 +18,7 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.3.5.5, Nov 9, 2016
+ * @version 1.3.5.6, Nov 15, 2016
  */
 admin.article = {
     currentEditorType: '',
@@ -462,7 +462,7 @@ admin.article = {
             done: function (e, data) {
                 var qiniuKey = data.result.key;
                 if (!qiniuKey) {
-                    alert("Upload error");
+                    alert("Upload error, please check Qiniu configurations");
 
                     return;
                 }
@@ -471,7 +471,7 @@ admin.article = {
                         + qiniu.qiniuDomain + qiniuKey + ')</div>');
             },
             fail: function (e, data) {
-                alert("Upload error: " + data.errorThrown);
+                alert("Upload error, please check Qiniu configurations [" + data.errorThrown + "]");
             }
         }).on('fileuploadprocessalways', function (e, data) {
             var currentFile = data.files[data.index];

src/main/webapp/js/admin/preference.js

@@ -18,7 +18,7 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.2.1.9, Nov 20, 2015
+ * @version 1.2.1.10, Nov 15, 2016
  */
 
 /* preference 相关操作 */
@@ -278,8 +278,11 @@ admin.preference = {
             cache: false,
             data: JSON.stringify(requestJSONObject),
             success: function (result, textStatus) {
-                $("#tipMsg").text(result.msg);
+                if (result.sc) {
+                    window.location.reload();
+                }
                 
+                $("#tipMsg").text(result.msg);
                 $("#loadMsg").text("");
             }
         });

src/main/webapp/skins/next/css/next.css

-/*!
+/**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");