diff --git a/components/ExternalPlugins.js b/components/ExternalPlugins.js index 616792e8..7ee54a10 100644 --- a/components/ExternalPlugins.js +++ b/components/ExternalPlugins.js @@ -5,7 +5,6 @@ import LA51 from './LA51' import TianLiGPT from './TianliGPT' import WebWhiz from './Webwhiz' -import { CUSTOM_EXTERNAL_CSS, CUSTOM_EXTERNAL_JS } from '@/blog.config' import { convertInnerUrl } from '@/lib/notion/convertInnerUrl' import { isBrowser, loadExternalResource } from '@/lib/utils' import { useRouter } from 'next/router' @@ -44,8 +43,6 @@ const ExternalPlugin = props => { const CHATBASE_ID = siteConfig('CHATBASE_ID') const COMMENT_DAO_VOICE_ID = siteConfig('COMMENT_DAO_VOICE_ID') const AD_WWADS_ID = siteConfig('AD_WWADS_ID') - // const COMMENT_TWIKOO_ENV_ID = siteConfig('COMMENT_TWIKOO_ENV_ID') - // const COMMENT_TWIKOO_CDN_URL = siteConfig('COMMENT_TWIKOO_CDN_URL') const COMMENT_ARTALK_SERVER = siteConfig('COMMENT_ARTALK_SERVER') const COMMENT_ARTALK_JS = siteConfig('COMMENT_ARTALK_JS') const COMMENT_TIDIO_ID = siteConfig('COMMENT_TIDIO_ID') @@ -64,6 +61,8 @@ const ExternalPlugin = props => { const IMG_SHADOW = siteConfig('IMG_SHADOW') const ANIMATE_CSS_URL = siteConfig('ANIMATE_CSS_URL') const MOUSE_FOLLOW = siteConfig('MOUSE_FOLLOW') + const CUSTOM_EXTERNAL_CSS = siteConfig('CUSTOM_EXTERNAL_CSS') + const CUSTOM_EXTERNAL_JS = siteConfig('CUSTOM_EXTERNAL_JS') // 自定义样式css和js引入 if (isBrowser) { diff --git a/lib/config.js b/lib/config.js index 3d71f245..bef4dcd0 100644 --- a/lib/config.js +++ b/lib/config.js @@ -122,7 +122,7 @@ export const convertVal = val => { } // 配置值前可能有污染的空格 - if (!val.indexOf('[') > 0 || val.indexOf('{')) { + if (val.indexOf('[') < 0 && val.indexOf('{') < 0) { return val } diff --git a/lib/utils/index.js b/lib/utils/index.js index 0b3f46c2..70122b12 100644 --- a/lib/utils/index.js +++ b/lib/utils/index.js @@ -97,7 +97,7 @@ export function isUrl(str) { // 检查是否外链 export function checkStartWithHttp(str) { // 检查字符串是否包含http - if (str?.includes('http:') || str?.includes('https:')) { + if (str?.indexOf('http:') === 0 || str?.indexOf('https:') === 0) { // 如果包含,找到http的位置 return str?.indexOf('http') > -1 } else {