🔧 更新黑客派新域名 #116

adlered · Sep 9, 2020 · 71df6d1 · 71df6d1
1 parent 2665265
commit 71df6d1
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
     <artifactId>bolo</artifactId>
     <packaging>war</packaging>
     <name>Bolo</name>
-    <version>v2.0-stable</version>
+    <version>v2.1-stable</version>
     <description>
         本地化、稳定精致的 Java 博客系统 - 菠萝博客，基于 Solo。
     </description>

diff --git a/src/main/java/org/b3log/solo/SoloServletListener.java b/src/main/java/org/b3log/solo/SoloServletListener.java
@@ -74,7 +74,7 @@ public final class SoloServletListener extends AbstractServletListener {
     /**
      * Bolo version.
      */
-    public static final String BOLO_VERSION = "v2.0 稳定版";
+    public static final String BOLO_VERSION = "v2.1 稳定版";
     /**
      * Solo version.
      */

diff --git a/src/main/java/org/b3log/solo/bolo/Global.java b/src/main/java/org/b3log/solo/bolo/Global.java
@@ -1,3 +1,20 @@
+/*
+ * Bolo - A stable and beautiful blogging system based in Solo.
+ * Copyright (c) 2020, https://github.com/adlered
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package org.b3log.solo.bolo;
 
 public class Global {

diff --git a/src/main/webapp/admin/admin-main.ftl b/src/main/webapp/admin/admin-main.ftl
@@ -174,7 +174,7 @@
 
     function showTips() {
         var config = {
-            content: "欢迎使用菠萝博客 V2.0 稳定版！<br>" +
+            content: "欢迎使用菠萝博客 " + boloVersion + "！<br>" +
                 "<a href='javascript:neverShowTips()'>不再提醒</a>",
             type: "html",
             alignTo: ["right","top"],

diff --git a/src/main/webapp/common-template/label.ftl b/src/main/webapp/common-template/label.ftl
@@ -26,6 +26,7 @@
         langLabel: "${langLabel}",
         version: "${version}",
         showCodeBlockLn: ${showCodeBlockLn},
+        hacpaiDomain: "${hacpaiDomain}",
     }
     Util.init()
 </script>
diff --git a/src/main/webapp/js/admin/admin.min.js b/src/main/webapp/js/admin/admin.min.js
diff --git a/src/main/webapp/js/admin/editor.js b/src/main/webapp/js/admin/editor.js
@@ -43,7 +43,7 @@ $.extend(SoloEditor.prototype, {
 
     // 编辑器常用表情使用社区端的设置
     $.ajax({
-      url: 'https://hacpai.com/apis/vcomment/users/emotions',
+      url: 'https://' + Label.hacpaiDomain + '/apis/vcomment/users/emotions',
       type: 'GET',
       cache: true,
       async: false,
@@ -116,7 +116,7 @@ $.extend(SoloEditor.prototype, {
       },
       lang: Label.localeString,
       hint: {
-        emojiTail: `<a href="https://hacpai.com/settings/function" target="_blank">设置常用表情</a>`,
+        emojiTail: `<a href="https://` + Label.hacpaiDomain + `/settings/function" target="_blank">设置常用表情</a>`,
         emoji: Label.emoji,
       },
       toolbarConfig: {