Skip to content

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

🎨 Fix #12551

parent e1e2f7e7
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 27 deletions
src/main/java/org/b3log/solo/processor/console/PreferenceConsole.java
View file @ 2cc18228
...@@ -43,12 +43,13 @@ import org.json.JSONObject; ...@@ -43,12 +43,13 @@ import org.json.JSONObject;
import javax.servlet.http.Cookie; import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/** /**
* Preference console request processing. * Preference console request processing.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.2.0.13, Sep 25, 2018 * @version 1.2.0.14, Oct 17, 2018
* @since 0.4.0 * @since 0.4.0
*/ */
@RequestProcessor @RequestProcessor
...@@ -446,19 +447,20 @@ public class PreferenceConsole { ...@@ -446,19 +447,20 @@ public class PreferenceConsole {
final HTTPRequestContext context, final JSONObject requestJSONObject) { final HTTPRequestContext context, final JSONObject requestJSONObject) {
final JSONRenderer renderer = new JSONRenderer(); final JSONRenderer renderer = new JSONRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret);
try { try {
final String accessKey = requestJSONObject.optString(Option.ID_C_QINIU_ACCESS_KEY).trim(); final String accessKey = requestJSONObject.optString(Option.ID_C_QINIU_ACCESS_KEY).trim();
final String secretKey = requestJSONObject.optString(Option.ID_C_QINIU_SECRET_KEY).trim(); final String secretKey = requestJSONObject.optString(Option.ID_C_QINIU_SECRET_KEY).trim();
String domain = requestJSONObject.optString(Option.ID_C_QINIU_DOMAIN).trim(); String domain = requestJSONObject.optString(Option.ID_C_QINIU_DOMAIN).trim();
domain = StringUtils.lowerCase(domain);
final String bucket = requestJSONObject.optString(Option.ID_C_QINIU_BUCKET).trim(); final String bucket = requestJSONObject.optString(Option.ID_C_QINIU_BUCKET).trim();
final JSONObject ret = new JSONObject();
renderer.setJSONObject(ret);
if (StringUtils.isNotBlank(domain) && !StringUtils.endsWith(domain, "/")) { if (StringUtils.isNotBlank(domain) && !StringUtils.endsWith(domain, "/")) {
domain += "/"; domain += "/";
} }
if (StringUtils.isNotBlank(domain) && !StringUtils.startsWithAny(domain, new String[]{"http", "https"})) {
domain = "http://" + domain;
}
final JSONObject accessKeyOpt = new JSONObject(); final JSONObject accessKeyOpt = new JSONObject();
accessKeyOpt.put(Keys.OBJECT_ID, Option.ID_C_QINIU_ACCESS_KEY); accessKeyOpt.put(Keys.OBJECT_ID, Option.ID_C_QINIU_ACCESS_KEY);
...@@ -484,6 +486,9 @@ public class PreferenceConsole { ...@@ -484,6 +486,9 @@ public class PreferenceConsole {
ret.put(Keys.STATUS_CODE, true); ret.put(Keys.STATUS_CODE, true);
ret.put(Keys.MSG, langPropsService.get("updateSuccLabel")); ret.put(Keys.MSG, langPropsService.get("updateSuccLabel"));
if (isQiniuTestDomain(domain)) {
ret.put(Keys.MSG, langPropsService.get("donotUseQiniuTestDoaminLabel"));
}
} catch (final ServiceException e) { } catch (final ServiceException e) {
LOGGER.log(Level.ERROR, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
...@@ -602,4 +607,15 @@ public class PreferenceConsole { ...@@ -602,4 +607,15 @@ public class PreferenceConsole {
return false; return false;
} }
} }
/**
* Checks whether the specified domain is a qiniu test domain.
*
* @param domain the specified domain
* @return {@code true} if it is, returns {@code false} otherwise
*/
private boolean isQiniuTestDomain(final String domain) {
return Arrays.asList("clouddn.com", "qiniucdn.com", "qiniudn.com", "qnssl.com", "qbox.me").stream().
anyMatch(testDomain -> StringUtils.containsIgnoreCase(domain, testDomain));
}
} }
src/main/resources/lang_en_US.properties
View file @ 2cc18228
...@@ -18,12 +18,13 @@ ...@@ -18,12 +18,13 @@
# #
# Description: Solo language configurations(en_US). # Description: Solo language configurations(en_US).
# Version: 2.23.0.0, Sep 21, 2018 # Version: 2.24.0.0, Oct 17, 2018
# Author: Liang Ding # Author: Liang Ding
# Author: Liyuan Li # Author: Liyuan Li
# Author: Dongxu Wang # Author: Dongxu Wang
# #
donotUseQiniuTestDoaminLabel=Do not use Qiniu test domain in production env, see <a href="https://developer.qiniu.com/fusion/kb/1319/test-domain-access-restriction-rules" target="_blank">\u4E03\u725B\u4E91\u6D4B\u8BD5\u57DF\u540D\u4F7F\u7528\u89C4\u8303</a> for more details.
cntLabel= cntLabel=
reply1Label=Reply reply1Label=Reply
nextArticleLabel=Next Article nextArticleLabel=Next Article
......
src/main/resources/lang_zh_CN.properties
View file @ 2cc18228
...@@ -18,12 +18,13 @@ ...@@ -18,12 +18,13 @@
# #
# Description: Solo default language configurations(zh_CN). # Description: Solo default language configurations(zh_CN).
# Version: 2.23.0.0, Sep 21, 2018 # Version: 2.24.0.0, Oct 17, 2018
# Author: Liang Ding # Author: Liang Ding
# Author: Liyuan Li # Author: Liyuan Li
# Author: Dongxu Wang # Author: Dongxu Wang
# #
donotUseQiniuTestDoaminLabel=\u751F\u4EA7\u73AF\u5883\u8BF7\u52FF\u4F7F\u7528\u4E03\u725B\u4E91\u6D4B\u8BD5\u57DF\u540D\uFF0C\u7EC6\u8282\u8BF7\u6D4F\u89C8<a href="https://developer.qiniu.com/fusion/kb/1319/test-domain-access-restriction-rules" target="_blank">\u4E03\u725B\u4E91\u6D4B\u8BD5\u57DF\u540D\u4F7F\u7528\u89C4\u8303</a>
cntLabel=\u4E2A cntLabel=\u4E2A
reply1Label=\u56DE\u590D reply1Label=\u56DE\u590D
nextArticleLabel=\u4E0B\u4E00\u7BC7 nextArticleLabel=\u4E0B\u4E00\u7BC7
......
src/main/webapp/js/admin/latkeAdmin.js
View file @ 2cc18228
...@@ -3124,7 +3124,7 @@ admin.register["link-list"] = { ...@@ -3124,7 +3124,7 @@ admin.register["link-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.2.1.10, Nov 15, 2016 * @version 1.2.1.11, Oct 17, 2018
*/ */
/* preference 相关操作 */ /* preference 相关操作 */
...@@ -3169,7 +3169,7 @@ admin.preference = { ...@@ -3169,7 +3169,7 @@ admin.preference = {
$("#relevantArticlesDisplayCount").val(preference.relevantArticlesDisplayCount); $("#relevantArticlesDisplayCount").val(preference.relevantArticlesDisplayCount);
$("#randomArticlesDisplayCount").val(preference.randomArticlesDisplayCount); $("#randomArticlesDisplayCount").val(preference.randomArticlesDisplayCount);
$("#keyOfSolo").val(preference.keyOfSolo); $("#keyOfSolo").val(preference.keyOfSolo);
"true" === preference.enableArticleUpdateHint ? $("#enableArticleUpdateHint").attr("checked", "checked") : $("#enableArticleUpdateHint").removeAttr("checked"); "true" === preference.enableArticleUpdateHint ? $("#enableArticleUpdateHint").attr("checked", "checked") : $("#enableArticleUpdateHint").removeAttr("checked");
"true" === preference.allowVisitDraftViaPermalink ? $("#allowVisitDraftViaPermalink").attr("checked", "checked") : $("allowVisitDraftViaPermalink").removeAttr("checked"); "true" === preference.allowVisitDraftViaPermalink ? $("#allowVisitDraftViaPermalink").attr("checked", "checked") : $("allowVisitDraftViaPermalink").removeAttr("checked");
"true" === preference.allowRegister ? $("#allowRegister").attr("checked", "checked") : $("#allowRegister").removeAttr("checked"); "true" === preference.allowRegister ? $("#allowRegister").attr("checked", "checked") : $("#allowRegister").removeAttr("checked");
...@@ -3211,7 +3211,7 @@ admin.preference = { ...@@ -3211,7 +3211,7 @@ admin.preference = {
$("#editorType").val(preference.editorType); $("#editorType").val(preference.editorType);
$("#feedOutputMode").val(preference.feedOutputMode); $("#feedOutputMode").val(preference.feedOutputMode);
$("#feedOutputCnt").val(preference.feedOutputCnt); $("#feedOutputCnt").val(preference.feedOutputCnt);
$("#loadMsg").text(""); $("#loadMsg").text("");
} }
}); });
...@@ -3234,7 +3234,7 @@ admin.preference = { ...@@ -3234,7 +3234,7 @@ admin.preference = {
} }
}); });
}, },
/* /*
* @description 参数校验 * @description 参数校验
*/ */
validate: function () { validate: function () {
...@@ -3384,11 +3384,7 @@ admin.preference = { ...@@ -3384,11 +3384,7 @@ admin.preference = {
cache: false, cache: false,
data: JSON.stringify(requestJSONObject), data: JSON.stringify(requestJSONObject),
success: function (result, textStatus) { success: function (result, textStatus) {
if (result.sc) { $("#tipMsg").html(result.msg);
window.location.reload();
}
$("#tipMsg").text(result.msg);
$("#loadMsg").text(""); $("#loadMsg").text("");
} }
}); });
......
src/main/webapp/js/admin/latkeAdmin.min.js
View file @ 2cc18228
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/js/admin/preference.js
View file @ 2cc18228
...@@ -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 1.2.1.10, Nov 15, 2016 * @version 1.2.1.11, Oct 17, 2018
*/ */
/* preference 相关操作 */ /* preference 相关操作 */
...@@ -65,7 +65,7 @@ admin.preference = { ...@@ -65,7 +65,7 @@ admin.preference = {
$("#relevantArticlesDisplayCount").val(preference.relevantArticlesDisplayCount); $("#relevantArticlesDisplayCount").val(preference.relevantArticlesDisplayCount);
$("#randomArticlesDisplayCount").val(preference.randomArticlesDisplayCount); $("#randomArticlesDisplayCount").val(preference.randomArticlesDisplayCount);
$("#keyOfSolo").val(preference.keyOfSolo); $("#keyOfSolo").val(preference.keyOfSolo);
"true" === preference.enableArticleUpdateHint ? $("#enableArticleUpdateHint").attr("checked", "checked") : $("#enableArticleUpdateHint").removeAttr("checked"); "true" === preference.enableArticleUpdateHint ? $("#enableArticleUpdateHint").attr("checked", "checked") : $("#enableArticleUpdateHint").removeAttr("checked");
"true" === preference.allowVisitDraftViaPermalink ? $("#allowVisitDraftViaPermalink").attr("checked", "checked") : $("allowVisitDraftViaPermalink").removeAttr("checked"); "true" === preference.allowVisitDraftViaPermalink ? $("#allowVisitDraftViaPermalink").attr("checked", "checked") : $("allowVisitDraftViaPermalink").removeAttr("checked");
"true" === preference.allowRegister ? $("#allowRegister").attr("checked", "checked") : $("#allowRegister").removeAttr("checked"); "true" === preference.allowRegister ? $("#allowRegister").attr("checked", "checked") : $("#allowRegister").removeAttr("checked");
...@@ -107,7 +107,7 @@ admin.preference = { ...@@ -107,7 +107,7 @@ admin.preference = {
$("#editorType").val(preference.editorType); $("#editorType").val(preference.editorType);
$("#feedOutputMode").val(preference.feedOutputMode); $("#feedOutputMode").val(preference.feedOutputMode);
$("#feedOutputCnt").val(preference.feedOutputCnt); $("#feedOutputCnt").val(preference.feedOutputCnt);
$("#loadMsg").text(""); $("#loadMsg").text("");
} }
}); });
...@@ -130,7 +130,7 @@ admin.preference = { ...@@ -130,7 +130,7 @@ admin.preference = {
} }
}); });
}, },
/* /*
* @description 参数校验 * @description 参数校验
*/ */
validate: function () { validate: function () {
...@@ -280,11 +280,7 @@ admin.preference = { ...@@ -280,11 +280,7 @@ admin.preference = {
cache: false, cache: false,
data: JSON.stringify(requestJSONObject), data: JSON.stringify(requestJSONObject),
success: function (result, textStatus) { success: function (result, textStatus) {
if (result.sc) { $("#tipMsg").html(result.msg);
window.location.reload();
}
$("#tipMsg").text(result.msg);
$("#loadMsg").text(""); $("#loadMsg").text("");
} }
}); });
......
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