github
/
halo-theme-hao
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #355 from chengzhongxue/main 

优化版本更新有静态资源缓存问题
This commit is contained in:
困困鱼 2023-08-02 21:49:21 +08:00 committed by GitHub
parent 06326d5c02 d8fbfbec60
commit 31b4abf436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
settings.yaml
View File

@ -121,20 +121,20 @@ spec:
value: false
- $formkit: attachment
name: index_video
if: $get(enable_above).value
if: $get(enable_above).value && $get(enable_above_video).value
label: 动态壁纸
placeholder: 请填写动态壁纸地址
value:
help: http(s)://xxx.mp4
- $formkit: attachment
name: index_img
if: $get(enable_above).value
if: $get(enable_above).value && $get(enable_above_video).value == false
label: PC背景图
placeholder: 请填写背景图地址
value: https://www.dmoe.cc/random.php
- $formkit: attachment
name: phone_index_img
if: $get(enable_above).value
if: $get(enable_above).value && $get(enable_above_video).value == false
label: 移动端背景图
placeholder: 请填写移动端背景图地址
value: https://imgapi.kouseki.cn/random?sort=mp

10
templates/macro/prism-code.html
View File

@ -3,14 +3,14 @@
<th:block th:fragment="prism-code">
<th:block th:if="${theme.config.code.enable}">
<link rel="preload" as="style" onload="this.rel='stylesheet'"
th:href="${assets_link+'/libs/prism/prism.min.css'}">
th:href="${assets_link+'/libs/prism/prism.min.css' + theme_version}">
<link rel="preload" as="style" onload="this.rel='stylesheet'"
th:href="${assets_link+'/libs/prism/code.css'}">
th:href="${assets_link+'/libs/prism/code.css' + theme_version}">
<link rel="preload" as="style" onload="this.rel='stylesheet'" data-code-theme="light"
th:href="${assets_link+ '/libs/prism/themes/prism-'+theme.config.code.theme_light+'.css'}">
th:href="${assets_link+ '/libs/prism/themes/prism-'+theme.config.code.theme_light+'.css' + theme_version}">
<link rel="preload" as="style" onload="this.rel='stylesheet'" data-code-theme="dark"
th:href="${assets_link+'/libs/prism/themes/prism-'+theme.config.code.theme_dark+'.css'}">
<script data-pjax type="text/javascript" th:src="${assets_link+'/libs/prism/prism.min.js'}"></script>
th:href="${assets_link+'/libs/prism/themes/prism-'+theme.config.code.theme_dark+'.css' + theme_version}">
<script data-pjax type="text/javascript" th:src="${assets_link+'/libs/prism/prism.min.js' + theme_version}"></script>
<style>

2
templates/modules/common/code.html
View File

@ -19,7 +19,7 @@
<!-- 自动识别语言 -->
<th:block th:if="${theme.config.code.enable}">
<script th:src="${assets_link+'/libs/prism/highlight.min.js'}"></script>
<script th:src="${assets_link+'/libs/prism/highlight.min.js' + theme_version}"></script>
<script>

4
templates/modules/common/toc-bot.html
View File

@ -2,8 +2,8 @@
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<!-- Tocbot 目录生成 start -->
<th:block th:fragment="toc-bot">
<script th:src="${assets_link + '/libs/tocbot/4.18.2/tocbot.min.js'}"></script>
<link th:href="${assets_link + '/libs/tocbot/4.18.2/tocbot.css'}" rel="stylesheet">
<script th:src="${assets_link + '/libs/tocbot/4.18.2/tocbot.min.js' + theme_version}"></script>
<link th:href="${assets_link + '/libs/tocbot/4.18.2/tocbot.css' + theme_version}" rel="stylesheet">
<script>
document.addEventListener("DOMContentLoaded", function() {

22
templates/modules/head.html
View File

@ -12,15 +12,15 @@
<link rel="shortcut icon"
th:href="@{${#strings.isEmpty(site.favicon) ? assets_link + '/images/hao-logo.jpg' : site.favicon}}"/>
<script th:src="${assets_link + '/js/heo.js'}"></script>
<script th:src="${assets_link + '/js/heo.js' + theme_version}"></script>
<script th:src="${assets_link + '/js/halo.js'}"></script>
<script th:src="${assets_link + '/js/halo.js' + theme_version}"></script>
<link rel="stylesheet" th:href="${assets_link + '/zhheo/zhheoblog.css'}">
<link rel="stylesheet" th:href="${assets_link + '/zhheo/zhheoblog.css' + theme_version}">
<link rel="stylesheet" th:href="${assets_link + '/zhheo/custom.css'}">
<link rel="stylesheet" th:href="${assets_link + '/zhheo/custom.css' + theme_version}">
<link rel="stylesheet" th:href="${assets_link + '/zhheo/commentBarrage.css'}">
<link rel="stylesheet" th:href="${assets_link + '/zhheo/commentBarrage.css' + theme_version}">
<style th:if="${theme.config.other.scrollbarLinearGradientEnable}">
*::-webkit-scrollbar-thumb {
@ -33,7 +33,7 @@
<link media="print"
onload='this.media="all"'
rel="stylesheet"
th:href="${assets_link + '/libs/iconfont/iconfont.css'}">
th:href="${assets_link + '/libs/iconfont/iconfont.css' + theme_version}">
<!-- swiper 在瞬间滚动时会使用 -->
<link rel="stylesheet" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/Swiper/8.0.6/swiper-bundle.min.css"/>
@ -152,12 +152,12 @@
<!-- 动态加载条 -->
<script data-pace-options='{ "restartOnRequestAfter":false,"eventLag":false}'
th:src="${assets_link + '/libs/pace/pace.min.js'}"
th:src="${assets_link + '/libs/pace/pace.min.js' + theme_version}"
th:if="${theme.config.other.loadingBoxs.loadProgressBar}">
</script>
<!-- 复制 https://github.com/zenorocha/clipboard.js -->
<script th:src="${assets_link + '/libs/clipboard/clipboard.min.js'}"></script>
<script th:src="${assets_link + '/libs/clipboard/clipboard.min.js' + theme_version}"></script>
<!-- 全局图片预览-->
<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/fancybox/3.5.7/jquery.fancybox.min.js"></script>
@ -167,7 +167,7 @@
<script src="https://map.qq.com/api/gljs?v=1.exp&key=YZOBZ-34HLF-K3OJV-JV6IN-OALJ5-7MBAC"></script>
<!-- 关于统计-->
<script th:src="${assets_link + '/libs/countup/countup.js'}"></script>
<script th:src="${assets_link + '/libs/countup/countup.js' + theme_version}"></script>
<!-- 小板报 -->
<script defer th:if="${not #strings.isEmpty(theme.config.sidebar.welcome.key) &&
@ -175,7 +175,7 @@
#strings.contains(theme.config.sidebar.widgetss.postWidgets,'welcome') ||
#strings.contains(theme.config.sidebar.widgetss.tagWidgets,'welcome') ||
#strings.contains(theme.config.sidebar.widgetss.categoryWidgets,'welcome')}"
th:src="${assets_link + '/libs/welcome/welcome.js'}"></script>
th:src="${assets_link + '/libs/welcome/welcome.js' + theme_version}"></script>
<!-- icon图标 -->
<link rel="stylesheet" th:href="'https://npm.onmicrosoft.cn/hao-theme-static@'+${theme.spec.version}+'/icon/iconfont.css'">
@ -223,7 +223,7 @@
css: 'https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/fancybox/3.5.7/jquery.fancybox.min.css'
},
twikoo:{
js: [[${assets_link}]]+'/libs/twikoo/twikoo.all.min.js',
js: [[${assets_link}]]+'/libs/twikoo/twikoo.all.min.js' + [[${theme_version}]],
maxBarrage: [[${ theme.config.comments.twikoos.maxBarrage }]],
barrageTime: [[${ theme.config.comments.twikoos.barrageTime }]],
twikooUrl: "[(${theme.config.comments.twikoos.envId})]",

2
templates/modules/header/index-img.html
View File

@ -27,7 +27,7 @@
</div>
<div id="scroll-down"><i class="haofont hao-icon-angle-down scroll-down-effects"></i></div>
<link rel="stylesheet" th:href="${assets_link + '/css/fullPage.css'}">
<link rel="stylesheet" th:href="${assets_link + '/css/fullPage.css' + theme_version}">
<style>
#site-title {

33
templates/modules/layouts/layout.html
View File

@ -1,7 +1,8 @@
<!DOCTYPE html>
<html lang="en" th:fragment="layout(content, htmlType)" xmlns:th="http://www.thymeleaf.org"
th:with="assets_link=${theme.config.other.staticResource.use == 'onmicrosoft' ? 'https://npm.onmicrosoft.cn/hao-theme-static@' + theme.spec.version +'/templates/assets' :
theme.config.other.staticResource.use == 'custom' ? theme.config.other.staticResource.cdn_link : #theme.assets('/')}">
theme.config.other.staticResource.use == 'custom' ? theme.config.other.staticResource.cdn_link : #theme.assets('/')},
theme_version = ${ theme.config.other.staticResource.use == 'local' ? '?v='+ theme.spec.version : ''}">
<!-- head 中自定义的 -->
@ -50,9 +51,9 @@
<div th:replace="~{modules/right-menu :: right-menu}"></div>
<div>
<script th:src="${assets_link + '/js/utils.js'}"></script>
<script th:src="${assets_link + '/js/main.js'}"></script>
<script charset="utf-8" data-pjax th:src="${assets_link + '/zhheo/blogex.js'}"></script>
<script th:src="${assets_link + '/js/utils.js' + theme_version}"></script>
<script th:src="${assets_link + '/js/main.js' + theme_version}"></script>
<script charset="utf-8" data-pjax th:src="${assets_link + '/zhheo/blogex.js' + theme_version}"></script>
<!-- https://instant.page/ 网站预加载， 放在 </body> 之前 -->
<script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/instant.page/5.1.0/instantpage.min.js" type="module"></script>
@ -65,31 +66,31 @@
<!-- 深色模式下添加粒子效果canvas -->
<canvas th:if="${theme.config.style.universe}" id="universe" width="1312" height="880"></canvas>
<script th:if="${theme.config.style.universe}" async="" th:src="${assets_link + '/libs/canvas/dark.js'}"></script>
<script th:if="${theme.config.style.universe}" async="" th:src="${assets_link + '/libs/canvas/dark.js' + theme_version}"></script>
<!-- https://davidshimjs.github.io/qrcodejs/ 生成二维码 -->
<!-- 应该是文章页分享使用 -->
<script data-pjax src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/qrcodejs/1.0.0/qrcode.min.js"></script>
<!-- https://raphamorim.io/waterfall.js/ 应该是这个 还有相关的 js 代码 是否可以调整-->
<script th:src="${assets_link + '/libs/waterfall/waterfall.min.js'}"></script>
<script th:src="${assets_link + '/libs/waterfall/waterfall.min.js' + theme_version}"></script>
<!-- 获取主色 https://lokeshdhakar.com/projects/color-thief/ -->
<!--<script th:src="@{/assets/libs/color-thief/color-thief.umd.js}"></script>-->
<script th:src="${assets_link + '/libs/fast-average-color/index.browser.min.js'}"></script>
<script th:src="${assets_link + '/libs/fast-average-color/index.browser.min.js' + theme_version}"></script>
<script th:src="${assets_link + '/libs/view-image/view-image.min.js'}"></script>
<script th:src="${assets_link + '/libs/view-image/view-image.min.js' + theme_version}"></script>
<!--左下角音乐-->
<script>var meting_api = '[[${theme.config.tool.nav_music.meting_api}]]'; </script>
<link rel="stylesheet" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/aplayer/1.10.1/APlayer.min.css" media="all" onload="this.media='all'">
<script th:src="${assets_link + '/libs/aplayer/APlayer.min.js'}"></script>
<script th:src="${assets_link + '/libs/aplayer/APlayer.min.js' + theme_version}"></script>
<script th:src="${assets_link + '/libs/aplayer/Meting2.min.js'}"></script>
<script th:src="${assets_link + '/libs/aplayer/Meting2.min.js' + theme_version}"></script>
<script th:src="${assets_link + '/libs/pjax/pjax.min.js'}"></script>
<script th:src="${assets_link + '/libs/pjax/pjax.min.js' + theme_version}"></script>
<!-- swiper 在瞬间滚动时会使用 -->
<script data-pjax src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/Swiper/6.6.2/swiper-bundle.min.js"></script>
@ -98,7 +99,7 @@
<script th:if="${theme.config.comments.twikooEnable && #strings.equals(theme.config.comments.use, 'Twikoo') &&
not #strings.isEmpty(theme.config.comments.twikoos.envId) &&
not #strings.isEmpty(theme.config.comments.twikoos.accessToken)}" data-pjax=""
th:src="${assets_link + '/libs/twikoo/commentBarrage.js'}"></script>
th:src="${assets_link + '/libs/twikoo/commentBarrage.js' + theme_version}"></script>
<!-- Tocbot 目录生成 start -->
<th:block th:replace="~{modules/common/toc-bot :: toc-bot}"></th:block>
@ -111,7 +112,7 @@
<div id="js-pjax"></div>
<script th:if="${theme.config.envelope_comment.enable_danmu}" th:src="${assets_link + '/libs/twikoo/easy-Danmaku.js'}" id="Danmaku"></script>
<script th:if="${theme.config.envelope_comment.enable_danmu}" th:src="${assets_link + '/libs/twikoo/easy-Danmaku.js' + theme_version}" id="Danmaku"></script>
<script>
@ -135,9 +136,9 @@
window.removeEventListener('scroll', window.tocScrollFn)
typeof preloader === 'object' && preloader.initLoading()
heo.initIndexEssay()
heo.initIndexEssay()
if (window.aplayers) {
for (let i = 0; i < window.aplayers.length; i++) {
if (!window.aplayers[i].options.fixed) {

2
templates/modules/post/copyright/copyright-default.html
View File

@ -98,7 +98,7 @@
</div>
</div>
<link rel="stylesheet" th:href="${assets_link + '/css/post-copyright.css'}">
<link rel="stylesheet" th:href="${assets_link + '/css/post-copyright.css' + theme_version}">
</th:block>

2
templates/modules/post/copyright/copyright-one.html
View File

@ -89,7 +89,7 @@
</div>
</div>
</div>
<link rel="stylesheet" th:href="${assets_link + '/css/post-copyright-one.css'}">
<link rel="stylesheet" th:href="${assets_link + '/css/post-copyright-one.css' + theme_version}">
</th:block>