mirror of
https://github.com/d0zingcat/NotionNext.git
synced 2026-05-13 23:16:47 +00:00
Merge pull request #3287 from LooseLi/dev
修复sitemap多个斜杠导致无法自动编入索引#3260;修复自定义备案链接不生效#3267 #3244
This commit is contained in:
@@ -6,7 +6,11 @@ import { siteConfig } from './config'
|
||||
* @param {*} param0
|
||||
*/
|
||||
export async function generateSitemapXml({ allPages, NOTION_CONFIG }) {
|
||||
const link = siteConfig('LINK', BLOG.LINK, NOTION_CONFIG)
|
||||
let link = siteConfig('LINK', BLOG.LINK, NOTION_CONFIG)
|
||||
// 确保链接不以斜杠结尾
|
||||
if (link && link.endsWith('/')) {
|
||||
link = link.slice(0, -1)
|
||||
}
|
||||
const urls = [
|
||||
{
|
||||
loc: `${link}`,
|
||||
|
||||
@@ -38,6 +38,11 @@ export const getServerSideProps = async ctx => {
|
||||
}
|
||||
|
||||
function generateLocalesSitemap(link, allPages, locale) {
|
||||
// 确保链接不以斜杠结尾
|
||||
if (link && link.endsWith('/')) {
|
||||
link = link.slice(0, -1)
|
||||
}
|
||||
|
||||
if (locale && locale.length > 0 && locale.indexOf('/') !== 0) {
|
||||
locale = '/' + locale
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ function SiteInfo({ title }) {
|
||||
{siteConfig('BEI_AN') && (
|
||||
<>
|
||||
<i className='fas fa-shield-alt' />
|
||||
<a href='https://beian.miit.gov.cn/' className='mr-2'>
|
||||
<a href={siteConfig('BEI_AN_LINK')} className='mr-2'>
|
||||
{siteConfig('BEI_AN')}
|
||||
</a>
|
||||
<br />
|
||||
|
||||
@@ -33,7 +33,7 @@ const Footer = ({ siteInfo }) => {
|
||||
{siteConfig('BEI_AN') && (
|
||||
<>
|
||||
<i className='fas fa-shield-alt' />{' '}
|
||||
<a href='https://beian.miit.gov.cn/' className='mr-2'>
|
||||
<a href={siteConfig('BEI_AN_LINK')} className='mr-2'>
|
||||
{siteConfig('BEI_AN')}
|
||||
</a>
|
||||
<BeiAnGongAn />
|
||||
|
||||
@@ -9,6 +9,7 @@ import SocialButton from './SocialButton'
|
||||
*/
|
||||
const Footer = () => {
|
||||
const BEI_AN = siteConfig('BEI_AN')
|
||||
const BEI_AN_LINK = siteConfig('BEI_AN_LINK')
|
||||
const BIO = siteConfig('BIO')
|
||||
return (
|
||||
<footer className='relative flex-shrink-0 bg-white dark:bg-[#1a191d] justify-center text-center m-auto w-full leading-6 text-gray-600 dark:text-gray-100 text-sm'>
|
||||
@@ -46,7 +47,7 @@ const Footer = () => {
|
||||
{BEI_AN && (
|
||||
<>
|
||||
<i className='fas fa-shield-alt' />{' '}
|
||||
<a href='https://beian.miit.gov.cn/' className='mr-2'>
|
||||
<a href={BEI_AN_LINK} className='mr-2'>
|
||||
{siteConfig('BEI_AN')}
|
||||
</a>
|
||||
</>
|
||||
|
||||
@@ -31,7 +31,7 @@ const Footer = ({ title }) => {
|
||||
{siteConfig('BEI_AN') && (
|
||||
<>
|
||||
<i className='fas fa-shield-alt' />{' '}
|
||||
<a href='https://beian.miit.gov.cn/' className='mr-2'>
|
||||
<a href={siteConfig('BEI_AN_LINK')} className='mr-2'>
|
||||
{siteConfig('BEI_AN')}
|
||||
</a>
|
||||
<br />
|
||||
|
||||
@@ -24,7 +24,7 @@ const Footer = ({ title }) => {
|
||||
{siteConfig('BEI_AN') && (
|
||||
<>
|
||||
<i className='fas fa-shield-alt' />
|
||||
<a href='https://beian.miit.gov.cn/' className='mr-2'>
|
||||
<a href={siteConfig('BEI_AN_LINK')} className='mr-2'>
|
||||
{siteConfig('BEI_AN')}
|
||||
</a>
|
||||
<br />
|
||||
|
||||
@@ -27,7 +27,7 @@ export const Footer = props => {
|
||||
{/* <a href="#" className="text-black no-underline hover:underline">Privacy Policy</a> */}
|
||||
{siteConfig('BEI_AN') && (
|
||||
<a
|
||||
href='https://beian.miit.gov.cn/'
|
||||
href={siteConfig('BEI_AN_LINK')}
|
||||
className='text-black dark:text-gray-200 no-underline hover:underline ml-4'>
|
||||
{siteConfig('BEI_AN')}
|
||||
</a>
|
||||
|
||||
@@ -37,7 +37,7 @@ const Footer = ({ siteInfo }) => {
|
||||
{siteConfig('BEI_AN') && (
|
||||
<>
|
||||
<i className='fas fa-shield-alt' />{' '}
|
||||
<a href='https://beian.miit.gov.cn/' className='mr-2'>
|
||||
<a href={siteConfig('BEI_AN_LINK')} className='mr-2'>
|
||||
{siteConfig('BEI_AN')}
|
||||
</a>
|
||||
<br />
|
||||
|
||||
@@ -24,7 +24,7 @@ const Footer = ({ title }) => {
|
||||
{siteConfig('BEI_AN') && (
|
||||
<>
|
||||
<i className='fas fa-shield-alt' />{' '}
|
||||
<a href='https://beian.miit.gov.cn/' className='mr-2'>
|
||||
<a href={siteConfig('BEI_AN_LINK')} className='mr-2'>
|
||||
{siteConfig('BEI_AN')}
|
||||
</a>
|
||||
<br />
|
||||
|
||||
@@ -27,7 +27,7 @@ export const Footer = props => {
|
||||
{/* <a href="#" className="text-black no-underline hover:underline">Privacy Policy</a> */}
|
||||
{siteConfig('BEI_AN') && (
|
||||
<a
|
||||
href='https://beian.miit.gov.cn/'
|
||||
href={siteConfig('BEI_AN_LINK')}
|
||||
className='text-black dark:text-gray-200 no-underline hover:underline ml-4'>
|
||||
{siteConfig('BEI_AN')}
|
||||
</a>
|
||||
|
||||
Reference in New Issue
Block a user