🐛 jsd消除计划之-Vditor

adlered · May 28, 2022 · 172ba7f · 172ba7f
1 parent 4d5ba90
commit 172ba7f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 26 deletions.
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
diff --git a/src/main/java/org/b3log/solo/Starter.java b/src/main/java/org/b3log/solo/Starter.java
@@ -211,4 +211,4 @@ public static void main(final String[] args) throws Exception {
      */
     private Starter() {
     }
-}
+}
diff --git a/src/main/java/org/b3log/solo/util/Emotions.java b/src/main/java/org/b3log/solo/util/Emotions.java
@@ -62,7 +62,7 @@ public static String convert(final String content) {
 
         ret = toUnicode(ret);
         for (final String emojiCode : EMOJIS) {
-            String repl = "<img alt=\"" + emojiCode + "\" class=\"emoji\" src=\"https://cdn.jsdelivr.net/npm/vditor/dist/images/emoji/" + emojiCode;
+            String repl = "<img alt=\"" + emojiCode + "\" class=\"emoji\" src=\"https://file.fishpi.cn/vditor/3.8.13/dist/images/emoji/" + emojiCode;
             final String suffix = "huaji".equals(emojiCode) ? ".gif" : ".png";
             repl += suffix + "\" title=\"" + emojiCode + "\" />";
             ret = ret.replace(":" + emojiCode + ":", repl);

diff --git a/src/main/webapp/common-template/macro-common_head.ftl b/src/main/webapp/common-template/macro-common_head.ftl
@@ -1,20 +1 @@
-<#--
-
-    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/>.
-
--->
-<#--    Solo - A small and beautiful blogging system written in Java.    Copyright (c) 2010-present, b3log.org    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/>.--><#macro head title description=''><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/><meta name="theme-color" content="#3b3e43"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="mobile-web-app-capable" content="yes"/><meta name="apple-mobile-web-app-status-bar-style" content="black"><meta name="format-detection" content="telephone=no"/><title>${title}</title>    <#if description != ''><meta name="description" content="${description}"/><meta property="og:description" content="${description}"/>    <#elseif metaDescription??><meta name="description" content="${metaDescription}"/><meta property="og:description" content="${metaDescription}"/>    <#else>    <#if !blogSubtitle??>        <#assign blogSubtitle = ''>    </#if><meta name="description" content="${blogTitle?html}。${blogSubtitle?html}"/><meta property="og:description" content="${blogTitle?html}。${blogSubtitle?html}"/>    </#if>    <#if metaKeywords??>    <meta name="keywords" content="${metaKeywords}"/>    </#if><link rel="dns-prefetch" href="${staticServePath}"/><link rel="dns-prefetch" href="//cdn.jsdelivr.net"/><link rel="preconnect" href="${staticServePath}"><link rel="icon" type="image/png" href="${faviconURL}"/><link rel="apple-touch-icon" href="${faviconURL}"><link rel="shortcut icon" type="image/x-icon" href="${faviconURL}"><meta name="copyright" content="B3log"/><meta http-equiv="Window-target" content="_top"/><meta property="og:locale" content="${langLabel}"/><meta property="og:title" content="${title}"/><meta property="og:site_name" content="${blogTitle?html}"/><meta property="og:url"      content="${servePath}${request.requestURI}<#if request.queryString??>?${request.queryString}</#if>"/><meta property="og:image" content="${faviconURL}"/><link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml"><link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate"/><link rel="manifest" href="${servePath}/manifest.json">    <#if paginationCurrentPageNum??>        <#if paginationCurrentPageNum == 1>            <link rel="canonical" href="${servePath}${request.requestURI}">        <#else>            <link rel="canonical" href="${servePath}${request.requestURI}<#if request.queryString??>?${request.queryString}</#if>">        </#if>    <#else>        <link rel="canonical" href="${servePath}${request.requestURI}">    </#if>    <#nested><#if htmlHead??>    ${htmlHead}</#if></#macro>
+<#--    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/>.--><#--    Solo - A small and beautiful blogging system written in Java.    Copyright (c) 2010-present, b3log.org    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/>.--><#macro head title description=''><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/><meta name="theme-color" content="#3b3e43"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="mobile-web-app-capable" content="yes"/><meta name="apple-mobile-web-app-status-bar-style" content="black"><meta name="format-detection" content="telephone=no"/><title>${title}</title>    <#if description != ''><meta name="description" content="${description}"/><meta property="og:description" content="${description}"/>    <#elseif metaDescription??><meta name="description" content="${metaDescription}"/><meta property="og:description" content="${metaDescription}"/>    <#else>    <#if !blogSubtitle??>        <#assign blogSubtitle = ''>    </#if><meta name="description" content="${blogTitle?html}。${blogSubtitle?html}"/><meta property="og:description" content="${blogTitle?html}。${blogSubtitle?html}"/>    </#if>    <#if metaKeywords??>    <meta name="keywords" content="${metaKeywords}"/>    </#if><link rel="dns-prefetch" href="${staticServePath}"/><link rel="preconnect" href="${staticServePath}"><link rel="icon" type="image/png" href="${faviconURL}"/><link rel="apple-touch-icon" href="${faviconURL}"><link rel="shortcut icon" type="image/x-icon" href="${faviconURL}"><meta name="copyright" content="B3log"/><meta http-equiv="Window-target" content="_top"/><meta property="og:locale" content="${langLabel}"/><meta property="og:title" content="${title}"/><meta property="og:site_name" content="${blogTitle?html}"/><meta property="og:url"      content="${servePath}${request.requestURI}<#if request.queryString??>?${request.queryString}</#if>"/><meta property="og:image" content="${faviconURL}"/><link rel="search" type="application/opensearchdescription+xml" title="${title}" href="/opensearch.xml"><link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate"/><link rel="manifest" href="${servePath}/manifest.json">    <#if paginationCurrentPageNum??>        <#if paginationCurrentPageNum == 1>            <link rel="canonical" href="${servePath}${request.requestURI}">        <#else>            <link rel="canonical" href="${servePath}${request.requestURI}<#if request.queryString??>?${request.queryString}</#if>">        </#if>    <#else>        <link rel="canonical" href="${servePath}${request.requestURI}">    </#if>    <#nested><#if htmlHead??>    ${htmlHead}</#if></#macro>
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         private Starter() {
         }
-    }
+    }