Skip to content

更新版本冲突解决 #3842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
12434565 wants to merge 23 commits into
base: main
Choose a base branch
from
+494 −26
Open

更新版本冲突解决 #3842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4085710
Add files via upload
12434565 Apr 10, 2024
2c7ec11
Add files via upload
12434565 Apr 10, 2024
f31d713
Add files via upload
12434565 Apr 10, 2024
3e9670a
add new ico
12434565 Apr 11, 2024
47fd35e
Update README.md
12434565 Apr 22, 2024
77136ae
Merge branch 'main' into main
12434565 Mar 9, 2026
3cd3a99
Update blog configuration settings
12434565 Mar 9, 2026
64ec3ba
Fix NOTION_PAGE_ID formatting in blog.config.js
12434565 Mar 9, 2026
d3ff547
Update contact config with GitHub and LinkedIn links
12434565 Mar 9, 2026
6e204f5
Change default for FLUTTERINGRIBBON to true
12434565 Mar 9, 2026
9755c9e
Change default values for widget settings to false
12434565 Mar 9, 2026
b55fd57
Update NOTION_PAGE_ID in blog.config.js
12434565 Mar 9, 2026
94dfe2c
Update NOTION_PAGE_ID format in blog.config.js
12434565 Mar 10, 2026
9883475
Update NOTION_PAGE_ID format in blog.config.js
12434565 Mar 10, 2026
54777b3
Add REDIRECT_LANG option to notion.config.js
12434565 Mar 10, 2026
0f8d2e8
Fix REDIRECT_LANG property syntax in notion.config.js
12434565 Mar 10, 2026
407d876
Disable automatic language redirection
12434565 Mar 10, 2026
eb3c6c7
Clean up notion.config.js by removing REDIRECT_LANG
12434565 Mar 10, 2026
66d58ee
Update blog.config.js
12434565 Mar 10, 2026
9e3b027
Merge branch 'main' of https://github.com/tangly1024/NotionNext
actions-user Mar 27, 2026
1a5ceba
Merge branch 'main' of https://github.com/tangly1024/NotionNext
actions-user Apr 3, 2026
357f6c4
Merge branch 'main' of https://github.com/tangly1024/NotionNext
actions-user Apr 6, 2026
071aef4
Merge branch 'main' of https://github.com/tangly1024/NotionNext
actions-user Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions blog.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ const BLOG = {
// Important page_id！！！Duplicate Template from https://tanghh.notion.site/02ab3b8678004aa69e9e415905ef32a5
NOTION_PAGE_ID:
process.env.NOTION_PAGE_ID ||
'02ab3b8678004aa69e9e415905ef32a5,en:7c1d570661754c8fbc568e00a01fd70e',
THEME: process.env.NEXT_PUBLIC_THEME || 'simple', // 当前主题，在themes文件夹下可找到所有支持的主题；主题名称就是文件夹名，例如 example,fukasawa,gitbook,heo,hexo,landing,matery,medium,next,nobelium,plog,simple
LANG: process.env.NEXT_PUBLIC_LANG || 'zh-CN', // e.g 'zh-CN','en-US' see /lib/lang.js for more.
'e11bcf8c5a2f470a8d4c999095983710,en:31e06d13592280c3a12cda003b0f682e', //?en后面是什么
THEME: process.env.NEXT_PUBLIC_THEME || 'hexo', // 当前主题，在themes文件夹下可找到所有支持的主题；主题名称就是文件夹名，例如 example,fukasawa,gitbook,heo,hexo,landing,matery,medium,next,nobelium,plog,simple
LANG: process.env.NEXT_PUBLIC_LANG || 'en-US', // e.g 'zh-CN','en-US' see /lib/lang.js for more.
SINCE: process.env.NEXT_PUBLIC_SINCE || 2021, // e.g if leave this empty, current year will be used.

PSEUDO_STATIC: process.env.NEXT_PUBLIC_PSEUDO_STATIC || false, // 伪静态路径，开启后所有文章URL都以 .html 结尾。
NEXT_REVALIDATE_SECOND: process.env.NEXT_PUBLIC_REVALIDATE_SECOND || 60, // 更新缓存间隔 单位(秒)；即每个页面有60秒的纯静态期、此期间无论多少次访问都不会抓取notion数据；调大该值有助于节省Vercel资源、同时提升访问速率，但也会使文章更新有延迟。
NEXT_REVALIDATE_SECOND: process.env.NEXT_PUBLIC_REVALIDATE_SECOND || 5, // 更新缓存间隔 单位(秒)；即每个页面有60秒的纯静态期、此期间无论多少次访问都不会抓取notion数据；调大该值有助于节省Vercel资源、同时提升访问速率，但也会使文章更新有延迟。
APPEARANCE: process.env.NEXT_PUBLIC_APPEARANCE || 'light', // ['light', 'dark', 'auto'], // light 日间模式 ， dark夜间模式， auto根据时间和主题自动夜间模式
APPEARANCE_DARK_TIME: process.env.NEXT_PUBLIC_APPEARANCE_DARK_TIME || [18, 6], // 夜间模式起至时间，false时关闭根据时间自动切换夜间模式

AUTHOR: process.env.NEXT_PUBLIC_AUTHOR || 'NotionNext', // 您的昵称 例如 tangly1024
BIO: process.env.NEXT_PUBLIC_BIO || '一个普通的干饭人🍚', // 作者简介
LINK: process.env.NEXT_PUBLIC_LINK || 'https://tangly1024.com', // 网站地址
KEYWORDS: process.env.NEXT_PUBLIC_KEYWORD || 'Notion, 博客', // 网站关键词 英文逗号隔开
AUTHOR: process.env.NEXT_PUBLIC_AUTHOR || 'Lin Liu', // 您的昵称 例如 tangly1024
BIO: process.env.NEXT_PUBLIC_BIO || 'A current master student in bioinformatics.', // 作者简介
LINK: process.env.NEXT_PUBLIC_LINK || 'https://www.notion.so/e11bcf8c5a2f470a8d4c999095983710?v=cc9c7288a32049cba2e03d089ae0f2c7&pvs=4', // 网站地址
KEYWORDS: process.env.NEXT_PUBLIC_KEYWORD || 'Notion, Blog', // 网站关键词 英文逗号隔开
BLOG_FAVICON: process.env.NEXT_PUBLIC_FAVICON || '/favicon.ico', // blog favicon 配置, 默认使用 /public/favicon.ico，支持在线图片，如 https://img.imesong.com/favicon.png
BEI_AN: process.env.NEXT_PUBLIC_BEI_AN || '', // 备案号 闽ICP备XXXXXX
BEI_AN_LINK: process.env.NEXT_PUBLIC_BEI_AN_LINK || 'https://beian.miit.gov.cn/', // 备案查询链接，如果用了萌备等备案请在这里填写
Expand Down Expand Up @@ -65,10 +65,10 @@ const BLOG = {
// 欢迎语打字效果,Hexo,Matery主题支持, 英文逗号隔开多个欢迎语。
GREETING_WORDS:
process.env.NEXT_PUBLIC_GREETING_WORDS ||
'Hi，我是一个程序员, Hi，我是一个打工人,Hi，我是一个干饭人,欢迎来到我的博客🎉',
'Hi，I am Lin Liu. Welcome to my blog🎉',

// uuid重定向至 slug
UUID_REDIRECT: process.env.UUID_REDIRECT || false
}

module.exports = BLOG
module.exports = BLOG
Loading