Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/resources/css/base.css
#	src/main/resources/css/mobile-base.css

README.md

@@ -31,7 +31,7 @@
 
 ## 💡 简介
 
-[Symphony](https://sym.b3log.org)（[ˈs ɪmf əni]，n.交响乐）是一个现代化的社区平台，因为它：
+[Symphony](https://b3log.org/sym)（[ˈs ɪmf əni]，n.交响乐）是一个现代化的社区平台，因为它：
 
 * 实现了面向内容讨论的论坛
 * 实现了面向知识问答的社区
@@ -40,7 +40,7 @@
 
 欢迎到 [Sym 官方讨论区](https://hacpai.com/tag/sym)了解更多。同时也欢迎关注 B3log 开源社区微信公众号 `B3log开源`：
 
-![b3logos.png](https://img.hacpai.com/file/2019/10/image-d3c00d78.png)
+![b3logos.jpg](https://b3logfile.com/file/2020/08/b3logos-032af045.jpg)
 
 ## ⚡ 动机
 
@@ -75,7 +75,7 @@
 
 ## ✨  特性
 
-* [Sym 简介幻灯片](https://sym.b3log.org/syme-intro.pptx)
+* [Sym 简介幻灯片](https://b3log.org/sym/syme-intro.pptx)
 * [Sym 功能点脑图](http://naotu.baidu.com/file/cd31354ac9abc047569c73c560a5a913?token=b9750ae13f39ef9a)
 
 ```
@@ -725,7 +725,7 @@ API
 ## 📄 授权
 
 * 社区版：使用 AGPLv3 开源，如果你选择使用社区版，则必须完全遵守 AGPLv3 的相关条款；公司使用必须购买商用授权
-* 商业版：提供完整源码以便二开，报价 ¥20000，详情请看[这里](https://sym.b3log.org/pricing.html)
+* 商业版：提供完整源码以便二开，报价 ¥20000，详情请看[这里](https://b3log.org/sym/pricing.html)
 * 云服务：提供开箱即用的云端服务，每年 ¥5000（暂时售罄）
 
 **关于商业版和社区版的对比请看[这里](https://hacpai.com/article/1500543226433)，企业网站、经营性网站、以营利为目的或实现盈利的网站请购买商业版。**

README_en_US.md

@@ -439,7 +439,7 @@ notification
 -------
 ```
 
-* [Sym Introduction PPT](https://sym.b3log.org/syme-intro.pptx)
+* [Sym Introduction PPT](https://b3log.org/sym/syme-intro.pptx)
 * [Sym Function Mind Map](http://naotu.baidu.com/file/cd31354ac9abc047569c73c560a5a913?token=b9750ae13f39ef9a)
 
 [![Sym功能.png](https://b3logfile.com/file/2020/07/Sym功能-5f8c0fed.png)](http://naotu.baidu.com/file/cd31354ac9abc047569c73c560a5a913?token=b9750ae13f39ef9a)

package.json

@@ -2,7 +2,7 @@
   "name": "symphony",
   "version": "3.6.3",
   "description": "A modern community (forum/BBS/SNS/blog) platform written in Java. 一款用 Java 实现的现代化社区（论坛/BBS/社交网络/博客）系统平台。",
-  "homepage": "https://sym.b3log.org",
+  "homepage": "https://b3log.org/sym",
   "repository": {
     "type": "git",
     "url": "git://github.com/88250/symphony.git"

pom.xml

@@ -14,7 +14,7 @@
     <packaging>jar</packaging>
     <version>3.6.3</version>
     <name>Symphony</name>
-    <url>https://sym.b3log.org</url>
+    <url>https://b3log.org/sym</url>
     <description>
         一款用 Java 实现的现代化社区（论坛/BBS/社交网络/博客）系统平台。
     </description>

src/main/java/org/b3log/symphony/model/UserExt.java

@@ -625,12 +625,12 @@ public static boolean isReservedUserName(final String userName) {
     }
 
     /**
-     * Checks whether the specified user finshed guide.
+     * Checks whether the specified user finished guide.
      *
      * @param user the specified user
-     * @return {@code true} if the specified user finshed guide, returns {@code false} otherwise
+     * @return {@code true} if the specified user finished guide, returns {@code false} otherwise
      */
-    public static boolean finshedGuide(final JSONObject user) {
+    public static boolean finishedGuide(final JSONObject user) {
         return UserExt.USER_GUIDE_STEP_FIN == user.optInt(UserExt.USER_GUIDE_STEP);
     }
 

src/main/java/org/b3log/symphony/processor/BreezemoonProcessor.java

@@ -127,7 +127,7 @@ public void showWatchBreezemoon(final RequestContext context) {
         if (null != user) {
             pageSize = user.optInt(UserExt.USER_LIST_PAGE_SIZE);
 
-            if (!UserExt.finshedGuide(user)) {
+            if (!UserExt.finishedGuide(user)) {
                 context.sendRedirect(Latkes.getServePath() + "/guide");
                 return;
             }

src/main/java/org/b3log/symphony/processor/CityProcessor.java

@@ -120,7 +120,7 @@ public void showCityArticles(final RequestContext context) {
         dataModel.put(Common.SELECTED, Common.CITY);
 
         final JSONObject user = Sessions.getUser();
-        if (!UserExt.finshedGuide(user)) {
+        if (!UserExt.finishedGuide(user)) {
             context.sendRedirect(Latkes.getServePath() + "/guide");
             return;
         }
@@ -198,7 +198,7 @@ public void showCityUsers(final RequestContext context) {
         dataModel.put(Common.SELECTED, Common.CITY);
 
         final JSONObject user = Sessions.getUser();
-        if (!UserExt.finshedGuide(user)) {
+        if (!UserExt.finishedGuide(user)) {
             context.sendRedirect(Latkes.getServePath() + "/guide");
             return;
         }

src/main/java/org/b3log/symphony/processor/DomainProcessor.java

@@ -97,7 +97,7 @@ public void showDomainArticles(final RequestContext context) {
         if (null != user) {
             pageSize = user.optInt(UserExt.USER_LIST_PAGE_SIZE);
 
-            if (!UserExt.finshedGuide(user)) {
+            if (!UserExt.finishedGuide(user)) {
                 context.sendRedirect(Latkes.getServePath() + "/guide");
                 return;
             }

src/main/java/org/b3log/symphony/processor/FeedProcessor.java

@@ -117,7 +117,7 @@ public void genRecentRSS(final RequestContext context) {
             channel.setLastBuildDate(new Date());
             channel.setLink(Latkes.getServePath());
             channel.setAtomLink(Latkes.getServePath() + "/rss/recent.xml");
-            channel.setGenerator("Symphony v" + Server.VERSION + ", https://sym.b3log.org");
+            channel.setGenerator("Symphony v" + Server.VERSION + ", https://b3log.org/sym");
             final String localeString = optionQueryService.getOption("miscLanguage").optString(Option.OPTION_VALUE);
             final String country = Locales.getCountry(localeString).toLowerCase();
             final String language = Locales.getLanguage(localeString).toLowerCase();
@@ -160,7 +160,7 @@ public void genDomainRSS(final RequestContext context) {
             channel.setLastBuildDate(new Date());
             channel.setLink(Latkes.getServePath());
             channel.setAtomLink(Latkes.getServePath() + "/rss/" + domainURI + ".xml");
-            channel.setGenerator("Symphony v" + Server.VERSION + ", https://sym.b3log.org");
+            channel.setGenerator("Symphony v" + Server.VERSION + ", https://b3log.org/sym");
             final String localeString = optionQueryService.getOption("miscLanguage").optString(Option.OPTION_VALUE);
             final String country = Locales.getCountry(localeString).toLowerCase();
             final String language = Locales.getLanguage(localeString).toLowerCase();

src/main/java/org/b3log/symphony/processor/IndexProcessor.java

@@ -160,7 +160,7 @@ public void showQnA(final RequestContext context) {
         if (null != user) {
             pageSize = user.optInt(UserExt.USER_LIST_PAGE_SIZE);
 
-            if (!UserExt.finshedGuide(user)) {
+            if (!UserExt.finishedGuide(user)) {
                 context.sendRedirect(Latkes.getServePath() + "/guide");
                 return;
             }
@@ -225,7 +225,7 @@ public void showWatch(final RequestContext context) {
         if (null != user) {
             pageSize = user.optInt(UserExt.USER_LIST_PAGE_SIZE);
 
-            if (!UserExt.finshedGuide(user)) {
+            if (!UserExt.finishedGuide(user)) {
                 context.sendRedirect(Latkes.getServePath() + "/guide");
                 return;
             }
@@ -305,7 +305,7 @@ public void showRecent(final RequestContext context) {
         if (null != user) {
             pageSize = user.optInt(UserExt.USER_LIST_PAGE_SIZE);
 
-            if (!UserExt.finshedGuide(user)) {
+            if (!UserExt.finishedGuide(user)) {
                 context.sendRedirect(Latkes.getServePath() + "/guide");
                 return;
             }
@@ -415,7 +415,7 @@ public void showPerfectArticles(final RequestContext context) {
         final JSONObject user = Sessions.getUser();
         if (null != user) {
             pageSize = user.optInt(UserExt.USER_LIST_PAGE_SIZE);
-            if (!UserExt.finshedGuide(user)) {
+            if (!UserExt.finishedGuide(user)) {
                 context.sendRedirect(Latkes.getServePath() + "/guide");
                 return;
             }

src/main/java/org/b3log/symphony/processor/SettingsProcessor.java

@@ -75,7 +75,7 @@
  * </ul>
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 2.0.0.1, May 30, 2020
+ * @version 2.0.1.0, Aug 17, 2020
  * @since 2.4.0
  */
 @Singleton
@@ -693,7 +693,7 @@ public void updateFunction(final RequestContext context) {
      */
     public void updateProfiles(final RequestContext context) {
         context.renderJSON(StatusCodes.ERR);
-        final JSONObject requestJSONObject = (JSONObject) context.attr(Keys.REQUEST);
+        final JSONObject requestJSONObject = context.requestJSON();
         final String userTags = requestJSONObject.optString(UserExt.USER_TAGS);
         final String userURL = requestJSONObject.optString(User.USER_URL);
         final String userQQ = requestJSONObject.optString(UserExt.USER_QQ);
@@ -825,7 +825,7 @@ public void pointTransfer(final RequestContext context) {
         final JSONObject ret = new JSONObject().put(Keys.CODE, StatusCodes.ERR);
         context.renderJSON(ret);
 
-        final JSONObject requestJSONObject = (JSONObject) context.attr(Keys.REQUEST);
+        final JSONObject requestJSONObject = context.requestJSON();
 
         final int amount = requestJSONObject.optInt(Common.AMOUNT);
         final JSONObject toUser = (JSONObject) context.attr(Common.TO_USER);

src/main/java/org/b3log/symphony/processor/TagProcessor.java

@@ -171,7 +171,7 @@ public void showTagArticles(final RequestContext context) {
         if (null != user) {
             pageSize = user.optInt(UserExt.USER_LIST_PAGE_SIZE);
 
-            if (!UserExt.finshedGuide(user)) {
+            if (!UserExt.finishedGuide(user)) {
                 context.sendRedirect(Latkes.getServePath() + "/guide");
                 return;
             }

src/main/resources/lang_en_US.properties

@@ -1008,7 +1008,7 @@ menuAdminReportsPermissionLabel=Report admin
 smallTipLabel=Tips
 # Tips
 tips0Label=\u2728 This site is built with <a href="https://github.com/88250/symphony" target="_blank">Sym</a>!
-tips1Label=\u2728 Welcome to use <a href="https://sym.b3log.org" target="_blank">Sym</a> to build your own community!
+tips1Label=\u2728 Welcome to use <a href="https://b3log.org/sym" target="_blank">Sym</a> to build your own community!
 tips2Label=\uD83D\uDE0F Can use GIF dynamic picture as avatar, to <a href="${servePath}/settings/avatar" target="_blank">try it </a>
 tips3Label=\uD83C\uDF71 List layout could be changed in <a href="${servePath}/settings/function" target="_blank">function</a>
 tips4Label=\uD83C\uDF71 UI theme could be changed in <a href="${servePath}/settings/function" target="_blank">function</a>

src/main/resources/lang_zh_CN.properties

@@ -1008,7 +1008,7 @@ menuAdminReportsPermissionLabel=\u4E3E\u62A5\u7BA1\u7406\u5165\u53E3
 smallTipLabel=\u5C0F\u8D34\u58EB
 # Tips
 tips0Label=\u2728 \u672C\u7AD9\u4F7F\u7528 <a href="https://github.com/88250/symphony" target="_blank">Sym</a> \u642D\u5EFA\uFF0C\u8BF7\u4E3A\u5B83\u70B9\u8D5E\uFF01
-tips1Label=\u2728 \u6B22\u8FCE\u4F7F\u7528 <a href="https://sym.b3log.org" target="_blank">Sym</a> \u6765\u642D\u5EFA\u81EA\u5DF1\u7684\u793E\u533A\uFF01
+tips1Label=\u2728 \u6B22\u8FCE\u4F7F\u7528 <a href="https://b3log.org/sym" target="_blank">Sym</a> \u6765\u642D\u5EFA\u81EA\u5DF1\u7684\u793E\u533A\uFF01
 tips2Label=\uD83D\uDE0F \u53EF\u4EE5\u4F7F\u7528 GIF \u52A8\u56FE\u4F5C\u4E3A\u5934\u50CF\uFF0C\u6765<a href="${servePath}/settings/avatar" target="_blank">\u8BD5\u8BD5</a>\u5427
 tips3Label=\uD83C\uDF71 \u5217\u8868\u5E03\u5C40\u53EF\u4EE5\u5728<a href="${servePath}/settings/function" target="_blank">\u529F\u80FD\u8BBE\u7F6E</a>\u4E2D\u5207\u6362
 tips4Label=\uD83C\uDF71 \u53EF\u4EE5\u5728<a href="${servePath}/settings/function" target="_blank">\u529F\u80FD\u8BBE\u7F6E</a>\u4E2D\u9009\u62E9\u4F60\u4E2D\u610F\u7684\u4E3B\u9898

src/main/resources/skins/classic/admin/index.ftl

@@ -32,7 +32,7 @@
         <div class="module-panel vditor-reset ft-red fn-content">
             <ul>
                 <li>Sym 社区版使用 AGPL 开源协议，请务必保证所有代码及其衍生代码开源，并在页脚放置开源库地址</li>
-                <li>企业使用请购买商业授权，详情请看 <a href="https://sym.b3log.org/pricing.html" target="_blank">https://sym.b3log.org/pricing.html</a></li>
+                <li>企业使用请购买商业授权，详情请看 <a href="https://b3log.org/sym/pricing.html" target="_blank">https://sym.b3log.org/pricing.html</a></li>
             </ul>
         </div>
     </div>

src/main/resources/skins/classic/footer.ftl

@@ -46,7 +46,7 @@
                         <a href="http://www.miitbeian.gov.cn/" target="_blank">${footerBeiAnHao}</a> •
                     </#if>
                     © 2012-present <a href="https://b3log.org" target="_blank">B3log 开源</a> •
-                    <a href="https://sym.b3log.org" target="_blank">Sym</a>
+                    <a href="https://b3log.org/sym" target="_blank">Sym</a>
                 ${version}
                 </div>
             </div>

src/main/resources/skins/mobile/admin/index.ftl

@@ -23,7 +23,7 @@
     <div class="vditor-reset ft-red">
         <ul>
             <li>Sym 社区版使用 AGPL 开源协议，请务必保证所有代码及其衍生代码开源，并在页脚放置开源库地址</li>
-            <li>企业使用请购买商业授权，详情请看 <a href="https://sym.b3log.org/pricing.html" target="_blank">https://sym.b3log.org/pricing.html</a></li>
+            <li>企业使用请购买商业授权，详情请看 <a href="https://b3log.org/sym/pricing.html" target="_blank">https://sym.b3log.org/pricing.html</a></li>
         </ul>
     </div>
     <div class="fn-hr10"></div>

src/main/resources/skins/mobile/footer.ftl

@@ -30,7 +30,7 @@
         <div>
             © 2012-present <a href="https://b3log.org" target="_blank">B3log 开源</a>
             <div class="fn-hr5"></div>
-            <a href="https://sym.b3log.org" target="_blank">Sym</a>
+            <a href="https://b3log.org/sym" target="_blank">Sym</a>
             ${version}
         </div>
         <#if footerBeiAnHao != ''>