⬆️ vditor and https://ld246.com/article/1702535619033

88250 · Dec 14, 2023 · 43431a2 · 43431a2
1 parent 16948da
commit 43431a2
Show file tree

Hide file tree

Showing 20 changed files with 737 additions and 713 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/main/resources/admin/admin-index.ftl b/src/main/resources/admin/admin-index.ftl
@@ -16,7 +16,6 @@
 <html>
 <head>
     <@head title="${adminConsoleLabel} - ${blogTitle}">
-
         <link type="text/css" rel="stylesheet" href="${staticServePath}/less/admin.css?${staticResourceVersion}"/>
         <meta name="robots" content="fn__none"/>
     </@head>
@@ -160,7 +159,7 @@
     </div>
 </div>
 <#include "admin-label.ftl">
-<script src="https://unpkg.com/vditor@3.8.15/dist/index.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/vditor@3.9.7/dist/index.min.js"></script>
 <script src="${staticServePath}/js/admin/admin.min.js?${staticResourceVersion}"></script>
 ${plugins}
 <script>

diff --git a/src/main/resources/common-template/macro-common_head.ftl b/src/main/resources/common-template/macro-common_head.ftl
@@ -1 +1 @@
-<#--    Solo - A small and beautiful blogging system written in Java.    Copyright (c) 2010-present, b3log.org    Solo is licensed under Mulan PSL v2.    You can use this software according to the terms and conditions of the Mulan PSL v2.    You may obtain a copy of Mulan PSL v2 at:            http://license.coscl.org.cn/MulanPSL2    THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.    See the Mulan PSL v2 for more details.--><#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="https://unpkg.com"/><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><script src="https://unpkg.com/[email protected]/dist/js/icons/ant.js" async="" id="vditorIconScript"></script></#macro>
+<#--    Solo - A small and beautiful blogging system written in Java.    Copyright (c) 2010-present, b3log.org    Solo is licensed under Mulan PSL v2.    You can use this software according to the terms and conditions of the Mulan PSL v2.    You may obtain a copy of Mulan PSL v2 at:            http://license.coscl.org.cn/MulanPSL2    THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.    See the Mulan PSL v2 for more details.--><#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="https://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><script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/icons/ant.js" async="" id="vditorIconScript"></script></#macro>

diff --git a/src/main/resources/js/admin/admin.min.js b/src/main/resources/js/admin/admin.min.js
diff --git a/src/main/resources/js/common.js b/src/main/resources/js/common.js
@@ -306,7 +306,7 @@ window.Util = {
   loadVditor: function (cb) {
     $.ajax({
       method: 'GET',
-      url: 'https://unpkg.com/vditor@3.8.15/dist/index.min.js',
+      url: 'https://cdn.jsdelivr.net/npm/vditor@3.9.7/dist/index.min.js',
       dataType: 'script',
       cache: true,
       success: () => {

diff --git a/src/main/resources/js/common.min.js b/src/main/resources/js/common.min.js
diff --git a/src/main/resources/plugins/kanbanniang/plugin.ftl b/src/main/resources/plugins/kanbanniang/plugin.ftl
@@ -11,8 +11,8 @@
     See the Mulan PSL v2 for more details.
 
 -->
-<link type="text/css" rel="stylesheet" href="https://unpkg.com/[email protected].12/index.css"/>
-<script async src="https://unpkg.com/[email protected].12/index.js"></script>
+<link type="text/css" rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].10/index.css"/>
+<script async src="https://cdn.jsdelivr.net/npm/[email protected].10/index.js"></script>
 <div class="solo-kanbanniang">
     <div class="solo-kanbanniang__tip"></div>
     <canvas id="soloKanbanniang" width="280" height="250"></canvas>

diff --git a/src/main/resources/skins/9IPHP/js/common.min.js b/src/main/resources/skins/9IPHP/js/common.min.js
diff --git a/src/main/resources/skins/Bubble/js/common.min.js b/src/main/resources/skins/Bubble/js/common.min.js
diff --git a/src/main/resources/skins/Casper/js/common.min.js b/src/main/resources/skins/Casper/js/common.min.js
diff --git a/src/main/resources/skins/Finding/js/common.min.js b/src/main/resources/skins/Finding/js/common.min.js
diff --git a/src/main/resources/skins/Jane/js/common.min.js b/src/main/resources/skins/Jane/js/common.min.js
diff --git a/src/main/resources/skins/Medium/js/common.min.js b/src/main/resources/skins/Medium/js/common.min.js
diff --git a/src/main/resources/skins/NeoEase/js/common.min.js b/src/main/resources/skins/NeoEase/js/common.min.js
diff --git a/src/main/resources/skins/Pinghsu/js/common.min.js b/src/main/resources/skins/Pinghsu/js/common.min.js
diff --git a/src/main/resources/skins/metro-hot/js/common.min.js b/src/main/resources/skins/metro-hot/js/common.min.js
diff --git a/src/main/resources/skins/next/js/common.min.js b/src/main/resources/skins/next/js/common.min.js
diff --git a/src/main/resources/skins/nijigen/js/common.min.js b/src/main/resources/skins/nijigen/js/common.min.js
diff --git a/src/main/resources/skins/timeline/js/common.min.js b/src/main/resources/skins/timeline/js/common.min.js
diff --git a/src/main/resources/skins/yilia/js/common.min.js b/src/main/resources/skins/yilia/js/common.min.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<#-- Solo - A small and beautiful blogging system written in Java. Copyright (c) 2010-present, b3log.org Solo is licensed under Mulan PSL v2. You can use this software according to the terms and conditions of the Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at: http://license.coscl.org.cn/MulanPSL2 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details.--><#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="https://unpkg.com"/><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><script src="https://unpkg.com/[email protected]/dist/js/icons/ant.js" async="" id="vditorIconScript"></script></#macro>
		<#-- Solo - A small and beautiful blogging system written in Java. Copyright (c) 2010-present, b3log.org Solo is licensed under Mulan PSL v2. You can use this software according to the terms and conditions of the Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at: http://license.coscl.org.cn/MulanPSL2 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details.--><#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="https://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><script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/icons/ant.js" async="" id="vditorIconScript"></script></#macro>
Expand Down