From 9a703696cb007c638b01988210b84d2074edf2b1 Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Sun, 30 Jul 2023 19:31:58 +0800
Subject: [PATCH] =?UTF-8?q?cdn=20https://npm.elemecdn.com=20=E6=8D=A2?=
=?UTF-8?q?=E6=88=90=20https://npm.onmicrosoft.cn=EF=BC=8C=20=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC1.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
settings.yaml | 8 ++++----
templates/modules/head.html | 4 ++--
templates/modules/layouts/layout.html | 2 +-
theme.yaml | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/package.json b/package.json
index 78d285a1..8ad6756a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "halo-theme-hao",
- "version": "1.2.0",
+ "version": "1.3.0",
"dependencies": {
}
}
diff --git a/settings.yaml b/settings.yaml
index 0d02da29..c7575997 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -2443,8 +2443,8 @@ spec:
options:
- label: 本地
value: local
- - label: elemecdn
- value: elemecdn
+ - label: onmicrosoft
+ value: onmicrosoft
- label: 自定义
value: custom
- $formkit: url
@@ -2452,8 +2452,8 @@ spec:
if: "$get(use).value == 'custom'"
label: cdn地址，外链地址
validation: required
- value: 'https://npm.elemecdn.com/hao-theme-static@1.1.5/templates/assets'
- help: '默认为npmJs的elemecdn加速地址，如果你有自己的cdn地址（请确保链接下assets文件夹下主题静态资源文件），可以填写，否则请勿修改！ '
+ value: 'https://npm.onmicrosoft.cn/hao-theme-static@1.3.0/templates/assets'
+ help: '默认为npmJs的onmicrosoft加速地址，如果你有自己的cdn地址（请确保链接下assets文件夹下主题静态资源文件），可以填写，否则请勿修改！ '
- $formkit: group
name: diytitle
label: 动态标题
diff --git a/templates/modules/head.html b/templates/modules/head.html
index 2f45baa1..69bfa14a 100644
--- a/templates/modules/head.html
+++ b/templates/modules/head.html
@@ -178,7 +178,7 @@
th:src="${assets_link + '/libs/welcome/welcome.js'}">
-
+
@@ -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: '/themes/theme-hao/assets/libs/twikoo/twikoo.all.min.js',
+ js: [[${assets_link}]]+'/libs/twikoo/twikoo.all.min.js',
maxBarrage: [[${ theme.config.comments.twikoos.maxBarrage }]],
barrageTime: [[${ theme.config.comments.twikoos.barrageTime }]],
twikooUrl: "[(${theme.config.comments.twikoos.envId})]",
diff --git a/templates/modules/layouts/layout.html b/templates/modules/layouts/layout.html
index 55185f40..59201104 100644
--- a/templates/modules/layouts/layout.html
+++ b/templates/modules/layouts/layout.html
@@ -1,6 +1,6 @@
diff --git a/theme.yaml b/theme.yaml
index 989bb5d9..c4b958db 100644
--- a/theme.yaml
+++ b/theme.yaml
@@ -51,5 +51,5 @@ spec:
repo: https://github.com/liuzhihang/halo-theme-hao
settingName: "theme-hao-setting"
configMapName: "theme-hao-configMap"
- version: "1.2.0"
+ version: "1.3.0"
require: ">=2.6.0"