将LINK,NEXT_REVALIDATE_SECOND配置提升到NOTION_CONFIG中

lib/lang.js

@@ -123,7 +123,7 @@ export const redirectUserLang = (lang, pageId) => {
     getQueryVariable('locale') ||
     getQueryVariable('lang') ||
     window?.navigator?.language
-  const siteIds = pageId.split(',')
+  const siteIds = pageId?.split(',') || []
 
   // 默认是进首页; 如果检测到有一个多语言匹配了用户浏览器，则自动跳转过去
   for (let index = 0; index < siteIds.length; index++) {

lib/rss.js

@@ -1,15 +1,16 @@
-import fs from 'fs'
-import { Feed } from 'feed'
 import BLOG from '@/blog.config'
-import ReactDOMServer from 'react-dom/server'
-import { getPostBlocks } from '@/lib/db/getSiteData'
 import NotionPage from '@/components/NotionPage'
+import { getPostBlocks } from '@/lib/db/getSiteData'
+import { Feed } from 'feed'
+import fs from 'fs'
+import ReactDOMServer from 'react-dom/server'
+import { siteConfig } from './config'
 
 /**
-     * 生成RSS内容
+ * 生成RSS内容
-     * @param {*} post
+ * @param {*} post
-     * @returns
+ * @returns
-     */
+ */
 const createFeedContent = async post => {
   // 加密的文章内容只返回摘要
   if (post.password && post.password !== '') {
@@ -20,30 +21,35 @@ const createFeedContent = async post => {
     post.blockMap = blockMap
     const content = ReactDOMServer.renderToString(<NotionPage post={post} />)
     const regexExp =
-                /<div class="notion-collection-row"><div class="notion-collection-row-body"><div class="notion-collection-row-property"><div class="notion-collection-column-title"><svg.*?class="notion-collection-column-title-icon">.*?<\/svg><div class="notion-collection-column-title-body">.*?<\/div><\/div><div class="notion-collection-row-value">.*?<\/div><\/div><\/div><\/div>/g
+      /<div class="notion-collection-row"><div class="notion-collection-row-body"><div class="notion-collection-row-property"><div class="notion-collection-column-title"><svg.*?class="notion-collection-column-title-icon">.*?<\/svg><div class="notion-collection-column-title-body">.*?<\/div><\/div><div class="notion-collection-row-value">.*?<\/div><\/div><\/div><\/div>/g
     return content.replace(regexExp, '')
   }
 }
 
-export async function generateRss(posts) {
+export async function generateRss(NOTION_CONFIG, posts) {
+  const link = siteConfig('LINK', BLOG.LINK, NOTION_CONFIG)
+  const author = siteConfig('AUTHOR', BLOG.AUTHOR, NOTION_CONFIG)
+  const lang = siteConfig('LANG', BLOG.LANG, NOTION_CONFIG)
+  const subPath = siteConfig('SUB_PATH', BLOG.SUB_PATH, NOTION_CONFIG)
+
   const year = new Date().getFullYear()
   const feed = new Feed({
     title: BLOG.TITLE,
     description: BLOG.DESCRIPTION,
-    link: `${BLOG.LINK}/${BLOG.SUB_PATH}`,
+    link: `${link}/${subPath}`,
-    language: BLOG.LANG,
+    language: lang,
-    favicon: `${BLOG.LINK}/favicon.png`,
+    favicon: `${link}/favicon.png`,
-    copyright: `All rights reserved ${year}, ${BLOG.AUTHOR}`,
+    copyright: `All rights reserved ${year}, ${author}`,
     author: {
-      name: BLOG.AUTHOR,
+      name: author,
       email: BLOG.CONTACT_EMAIL,
-      link: BLOG.LINK
+      link: link
     }
   })
   for (const post of posts) {
     feed.addItem({
       title: post.title,
-      link: `${BLOG.LINK}/${post.slug}`,
+      link: `${link}/${post.slug}`,
       description: post.summary,
       content: await createFeedContent(post),
       date: new Date(post?.publishDay)

pages/[prefix]/[slug]/[...suffix].js

@@ -82,7 +82,14 @@ export async function getStaticProps({
   // 无法获取文章
   if (!props?.post) {
     props.post = null
-    return { props, revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND) }
+    return {
+      props,
+      revalidate: siteConfig(
+        'REVALIDATE_SECOND',
+        BLOG.NEXT_REVALIDATE_SECOND,
+        props.NOTION_CONFIG
+      )
+    }
   }
 
   // 文章内容加载
@@ -116,7 +123,11 @@ export async function getStaticProps({
   delete props.allPages
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/[prefix]/[slug]/index.js

@@ -66,7 +66,14 @@ export async function getStaticProps({ params: { prefix, slug }, locale }) {
   // 无法获取文章
   if (!props?.post) {
     props.post = null
-    return { props, revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND) }
+    return {
+      props,
+      revalidate: siteConfig(
+        'REVALIDATE_SECOND',
+        BLOG.NEXT_REVALIDATE_SECOND,
+        props.NOTION_CONFIG
+      )
+    }
   }
 
   // 文章内容加载
@@ -100,7 +107,11 @@ export async function getStaticProps({ params: { prefix, slug }, locale }) {
   delete props.allPages
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 function checkSlug(row) {

pages/[prefix]/index.js

@@ -107,7 +107,14 @@ export async function getStaticProps({ params: { prefix }, locale }) {
   // 无法获取文章
   if (!props?.post) {
     props.post = null
-    return { props, revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND) }
+    return {
+      props,
+      revalidate: siteConfig(
+        'REVALIDATE_SECOND',
+        BLOG.NEXT_REVALIDATE_SECOND,
+        props.NOTION_CONFIG
+      )
+    }
   }
 
   // 文章内容加载
@@ -142,7 +149,11 @@ export async function getStaticProps({ params: { prefix }, locale }) {
   delete props.allPages
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/archive/index.js

@@ -61,7 +61,11 @@ export async function getStaticProps({ locale }) {
 
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/category/[category]/index.js

@@ -46,7 +46,11 @@ export async function getStaticProps({ params: { category }, locale }) {
 
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/category/[category]/page/[page].js

@@ -12,7 +12,10 @@ import { useRouter } from 'next/router'
 
 export default function Category(props) {
   // 根据页面路径加载不同Layout文件
-  const Layout = getLayoutByTheme({ theme: siteConfig('THEME'), router: useRouter() })
+  const Layout = getLayoutByTheme({
+    theme: siteConfig('THEME'),
+    router: useRouter()
+  })
 
   return <Layout {...props} />
 }
@@ -28,7 +31,10 @@ export async function getStaticProps({ params: { category, page } }) {
   // 处理文章页数
   props.postCount = props.posts.length
   // 处理分页
-  props.posts = props.posts.slice(siteConfig('POSTS_PER_PAGE') * (page - 1), siteConfig('POSTS_PER_PAGE') * page)
+  props.posts = props.posts.slice(
+    siteConfig('POSTS_PER_PAGE') * (page - 1),
+    siteConfig('POSTS_PER_PAGE') * page
+  )
 
   delete props.allPages
   props.page = page
@@ -37,7 +43,11 @@ export async function getStaticProps({ params: { category, page } }) {
 
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 
@@ -50,7 +60,9 @@ export async function getStaticPaths() {
     // 过滤状态类型
     const categoryPosts = allPages
       ?.filter(page => page.type === 'Post' && page.status === 'Published')
-      .filter(post => post && post.category && post.category.includes(category.name))
+      .filter(
+        post => post && post.category && post.category.includes(category.name)
+      )
     // 处理文章页数
     const postCount = categoryPosts.length
     const totalPages = Math.ceil(postCount / siteConfig('POSTS_PER_PAGE'))

pages/category/index.js

@@ -24,6 +24,10 @@ export async function getStaticProps({ locale }) {
   delete props.allPages
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }

pages/index.js

@@ -59,7 +59,7 @@ export async function getStaticProps(req) {
   generateRobotsTxt()
   // 生成Feed订阅
   if (JSON.parse(BLOG.ENABLE_RSS)) {
-    generateRss(props?.latestPosts || [])
+    generateRss(props?.NOTION_CONFIG, props?.latestPosts || [])
   }
 
   // 生成全文索引 - 仅在 yarn build 时执行 && process.env.npm_lifecycle_event === 'build'
@@ -68,7 +68,11 @@ export async function getStaticProps(req) {
 
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/page/[page].js

@@ -64,7 +64,11 @@ export async function getStaticProps({ params: { page } }) {
   delete props.allPages
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/search/[keyword]/index.js

@@ -40,7 +40,11 @@ export async function getStaticProps({ params: { keyword }, locale }) {
   props.keyword = keyword
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/search/[keyword]/page/[page].js

@@ -44,7 +44,11 @@ export async function getStaticProps({ params: { keyword, page }, locale }) {
   delete props.allPages
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/search/index.js

@@ -54,7 +54,11 @@ export async function getStaticProps({ locale }) {
   )
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/signin.js

@@ -27,7 +27,11 @@ export async function getStaticProps(req) {
   delete props.allPages
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/signup.js

@@ -27,7 +27,11 @@ export async function getStaticProps(req) {
   delete props.allPages
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/sitemap.xml.js

@@ -1,5 +1,6 @@
 // pages/sitemap.xml.js
 import BLOG from '@/blog.config'
+import { siteConfig } from '@/lib/config'
 import { getNotionPageData } from '@/lib/db/getSiteData'
 import { extractLangId, extractLangPrefix } from '@/lib/utils/pageId'
 import { getServerSideSitemap } from 'next-sitemap'
@@ -12,13 +13,12 @@ export const getServerSideProps = async ctx => {
     const id = extractLangId(siteId)
     const locale = extractLangPrefix(siteId)
     // 第一个id站点默认语言
-    const localeFields = generateLocalesSitemap(
+    const siteData = await getNotionPageData({
-      await getNotionPageData({
+      pageId: id,
-        pageId: id,
+      from: 'sitemap.xml'
-        from: 'sitemap.xml'
+    })
-      }).allPages,
+    const link = siteConfig('LINK', BLOG.LINK, siteData.NOTION_CONFIG)
-      locale
+    const localeFields = generateLocalesSitemap(link, siteData.allPages, locale)
-    )
     fields = fields.concat(localeFields)
   }
 
@@ -31,43 +31,43 @@ export const getServerSideProps = async ctx => {
   return getServerSideSitemap(ctx, fields)
 }
 
-function generateLocalesSitemap(allPages, locale) {
+function generateLocalesSitemap(link, allPages, locale) {
   if (locale && locale.length > 0 && locale.indexOf('/') !== 0) {
     locale = '/' + locale
   }
   const defaultFields = [
     {
-      loc: `${BLOG.LINK}${locale}`,
+      loc: `${link}${locale}`,
       lastmod: new Date().toISOString().split('T')[0],
       changefreq: 'daily',
       priority: '0.7'
     },
     {
-      loc: `${BLOG.LINK}${locale}/archive`,
+      loc: `${link}${locale}/archive`,
       lastmod: new Date().toISOString().split('T')[0],
       changefreq: 'daily',
       priority: '0.7'
     },
     {
-      loc: `${BLOG.LINK}${locale}/category`,
+      loc: `${link}${locale}/category`,
       lastmod: new Date().toISOString().split('T')[0],
       changefreq: 'daily',
       priority: '0.7'
     },
     {
-      loc: `${BLOG.LINK}${locale}/feed`,
+      loc: `${link}${locale}/feed`,
       lastmod: new Date().toISOString().split('T')[0],
       changefreq: 'daily',
       priority: '0.7'
     },
     {
-      loc: `${BLOG.LINK}${locale}/search`,
+      loc: `${link}${locale}/search`,
       lastmod: new Date().toISOString().split('T')[0],
       changefreq: 'daily',
       priority: '0.7'
     },
     {
-      loc: `${BLOG.LINK}${locale}/tag`,
+      loc: `${link}${locale}/tag`,
       lastmod: new Date().toISOString().split('T')[0],
       changefreq: 'daily',
       priority: '0.7'
@@ -81,7 +81,7 @@ function generateLocalesSitemap(allPages, locale) {
           ? post?.slug?.slice(1)
           : post.slug
         return {
-          loc: `${BLOG.LINK}${locale}/${slugWithoutLeadingSlash}`,
+          loc: `${link}${locale}/${slugWithoutLeadingSlash}`,
           lastmod: new Date(post?.publishDay).toISOString().split('T')[0],
           changefreq: 'daily',
           priority: '0.7'

pages/tag/[tag]/index.js

@@ -42,7 +42,11 @@ export async function getStaticProps({ params: { tag }, locale }) {
   delete props.allPages
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/tag/[tag]/page/[page].js

@@ -33,7 +33,11 @@ export async function getStaticProps({ params: { tag, page }, locale }) {
   delete props.allPages
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }
 

pages/tag/index.js

@@ -26,7 +26,11 @@ export async function getStaticProps(req) {
   delete props.allPages
   return {
     props,
-    revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
+    revalidate: siteConfig(
+      'REVALIDATE_SECOND',
+      BLOG.NEXT_REVALIDATE_SECOND,
+      props.NOTION_CONFIG
+    )
   }
 }