fix(cdn): 新增公共免费 cdn 地址,使用 cloudflare。望善待。

This commit is contained in:
LIlGG 2022-04-04 19:05:45 +08:00
parent 79b006c91d
commit 8374720788
6 changed files with 21 additions and 27 deletions

View File

@ -1,7 +1,7 @@
<#--
@package Akina
-->
<#global res_base_url = settings.cdn?then("//cdn.jsdelivr.net/gh/LIlGG/halo-theme-sakura@1.3.3", theme_base)/>
<#global res_base_url = settings.cdn?then(settings.cdn_href + theme.version, theme_base)/>
<html lang="zh-CN">
<head>
<meta charset="UTF-8">
@ -43,8 +43,8 @@
}
</script>
<script src="${res_base_url!}/source/js/404.js" type="text/javascript"></script>
<script type='text/javascript' src='${res_base_url!}/script/utils.min.js?ver=1.3.3'></script>
<script type='text/javascript' src='${res_base_url!}/script/i18n.min.js?ver=1.3.3'></script>
<script type='text/javascript' src='${res_base_url!}/script/utils.min.js?ver=${theme.version!}'></script>
<script type='text/javascript' src='${res_base_url!}/script/i18n.min.js?ver=${theme.version!}'></script>
<script>
var Poi = {
"themeBase": "${res_base_url!}",

View File

@ -1,15 +1,3 @@
<#--
/**
* The template for displaying the footer.
*
* Contains the closing of the #content div and all content after.
*
* @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
*
* @package Akina
*/
-->
<#global res_base_url = settings.cdn?then("//cdn.jsdelivr.net/gh/LIlGG/halo-theme-sakura@1.3.3", theme_base)/>
<#macro footer>
</div><!-- #content -->
<#include "comments.ftl">
@ -256,7 +244,7 @@
};
/* ]]> */
</script>
<script type='text/javascript' src='${res_base_url!}/script/utils.min.js?ver=1.3.3'></script>
<script type='text/javascript' src='${res_base_url!}/script/utils.min.js?ver=${theme.version!}'></script>
<script type="text/javascript" src="${res_base_url!}/source/lib/lazysizes/lazysizes.min.js" async></script>
<script type="text/javascript" src="${res_base_url!}/source/js/lib.js"></script>
<!-- 相册 -->
@ -307,8 +295,8 @@
</#if>
<script type='text/javascript' src='${res_base_url!}/source/js/qrcode.min.js' defer></script>
<script type='text/javascript' src='${res_base_url!}/source/lib/flv.min/index.js' defer></script>
<script type='text/javascript' src='${res_base_url!}/script/i18n.min.js?ver=1.3.3' defer></script>
<script type='text/javascript' src='${theme_base!}/script/app.min.js?ver=1.3.3'></script>
<script type='text/javascript' src='${res_base_url!}/script/i18n.min.js?ver=${theme.version!}' defer></script>
<script type='text/javascript' src='${theme_base!}/script/app.js?ver=${theme.version!}'></script>
<#nested />
<#if settings.live2d_switch!true>
<script src="${res_base_url!}/source/lib/jquery-ui/jquery-ui.min.js" async defer></script>

View File

@ -1,7 +1,7 @@
<#--
@package Akina
-->
<#global res_base_url = settings.cdn?then("//cdn.jsdelivr.net/gh/LIlGG/halo-theme-sakura@1.3.3", theme_base)/>
<#global res_base_url = settings.cdn?then(settings.cdn_href + theme.version, theme_base)/>
<#macro header title>
<!DOCTYPE html>
<html lang="zh-CN">
@ -11,10 +11,9 @@
<title itemprop="name">${title!}</title>
<meta name="description" content="${meta_description!}"/>
<meta name="keywords" content="${meta_keywords!}"/>
<link rel="dns-prefetch" href="//cdn.jsdelivr.net">
<@global.head />
<link rel='stylesheet' href='${theme_base!}/styles/style.min.css?ver=1.3.3' type='text/css' media='all'>
<link rel='stylesheet' href='${theme_base!}/styles/style.min.css?ver=${theme.version!}' type='text/css' media='all'>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noto+SerifMerriweather|Merriweather+Sans|Source+Code+Pro|Ubuntu:400,700|Noto+Serif+SC&display=swap" media="noexist" onload="this.media='all'">
<link rel="stylesheet" href="//at.alicdn.com/t/font_2010950_sh9o0r7ahar.css" media="noexist" onload="this.media='all'">
<link rel="stylesheet" href="${res_base_url!}/source/css/lib.css" media="noexist" onload="this.media='all'">

View File

@ -1,8 +1,6 @@
<#--
@package Akina
-->
<#global res_base_url = settings.cdn?then("//cdn.jsdelivr.net/gh/LIlGG/halo-theme-sakura@1.3.3", theme_base)/>
<#include "header.ftl">
<@header title="${blog_title!}">
<div class="blank"></div>

View File

@ -1,5 +1,4 @@
<#global res_base_url = settings.cdn?then("//cdn.jsdelivr.net/gh/LIlGG/halo-theme-sakura@1.3.3", theme_base)/>
<#global res_base_url = settings.cdn?then(settings.cdn_href + theme.version, theme_base)/>
<div style="background: white;
width: 95%;
max-width: 800px;

View File

@ -1949,13 +1949,23 @@ others:
label: 资源使用 CDN
type: radio
data-type: bool
default: false
default: true
options:
- value: true
label: 开启
- value: false
label: 关闭
description: '开启后静态资源将使用免费的 jsDelivr CDN 加载,关闭后使用服务器网络加载'
description: '开启后静态资源将使用免费 CDN 加载,关闭后使用服务器网络加载'
cdn_href:
name: cdn_href
label: CDN 地址
type: select
default: "//takagi-api.com/file/1/halo-theme-sakura/"
options:
- value: "//takagi-api.com/file/1/halo-theme-sakura/"
label: takagiの公共资源库
- value: "//cdn.jsdelivr.net/gh/LIlGG/halo-theme-sakura@"
label: jsdelivr
i18n:
name: i18n
label: 主题语言