Skip to content

Commit

Permalink
🎈 perf(yuque): 改为 Elog 分类同步,且优化缓存大小至 1/10
Browse files Browse the repository at this point in the history
  • Loading branch information
CCKNBC committed May 31, 2023
1 parent 6935f27 commit 05a31b9
Show file tree
Hide file tree
Showing 29 changed files with 3,200 additions and 3,394 deletions.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/Baidu Sitemap Push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: pip install requests

- name: Generate Txt
run: python generate.py
run: python scaffolds/backup/generate.py

- name: Baidu Push
run: curl -H 'Content-Type:text/plain' --data-binary @urls.txt "${{ secrets.BAIDU_TOKEN }}"
Expand Down
23 changes: 12 additions & 11 deletions .github/workflows/Deploy Yuque-Hexo Public To Pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,22 @@ jobs:
run: |
npm ci
- name: Download Yuque Posts
- name: Download Elog Posts
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
branch: master
name: 'Yuque Posts'
name: 'Elog Posts'
path: 'source/_posts'
if_no_artifact_found: warn

- name: Download Yuque Cache
- name: Download Elog Cache
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
branch: master
name: 'Yuque Cache'
path: 'yuque'
name: 'Elog Cache'
path: 'elog'
if_no_artifact_found: warn

- name: Generate
Expand All @@ -68,25 +68,26 @@ jobs:
# mkdir -p yuque
# npx yuque-hexo sync

- name: Upload Yuque Cache
- name: Upload Elog Cache
uses: actions/upload-artifact@v3
with:
name: 'Yuque Cache'
path: yuque
name: 'Elog Cache'
path: elog
retention-days: 90

- name: Upload Yuque Posts
- name: Upload Elog Posts
uses: actions/upload-artifact@v3
with:
name: 'Yuque Posts'
name: 'Elog Posts'
path: 'source/_posts'
retention-days: 90

- name: Deploy Markdown Posts To Branch Posts
uses: JamesIves/github-pages-deploy-action@v4
with:
branch: posts
folder: ./source/_posts/语雀/
folder: ./source/_posts/
force: false
git-config-name: "github-actions[bot]"
git-config-email: "github-actions[bot]@users.noreply.github.com"
commit-message: ${{ github.event.head_commit.message }}
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ themes/butterfly/.git
themes/anzhiyu/.git
source/_posts
yuque
elog.cache.json
elog/.elog.env
elog/elog.cache.notion.json
elog/elog.cache.yuque.json
6 changes: 3 additions & 3 deletions _config.butterfly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ post_meta:
post_head_ai_description:
enable: true
gptName: CC
mode: tianli # 默认模式 可选值: tianli/local
mode: local # 默认模式 可选值: tianli/local
switchBtn: true # 可以配置是否显示切换按钮 以切换tianli/local
btnLink: https://tianli-blog.club/tianligpt/
randomNum: 3 # 按钮最大的随机次数,也就是一篇文章最大随机出来几种
Expand Down Expand Up @@ -846,8 +846,8 @@ aside:
text: 多种订阅更新方式
link: /sub/
card_announcement:
enable: false
content:
enable: true
content: <div id="webpushr-subscription-button" data-background-color="#8fbc8f" data-size="small" data-button-text="订阅更新/通知" data-subscriber-count-text="位用户已订阅"></div> 点击按钮修改您的订阅配置 <span id="webpushr-subscription-toggle-button" data-size="1.5" data-text-when-denied="请点击按钮允许 CC的部落格 通知权限" data-color="#8fbc8f"></span>
# '<center><iframe src="https://cc.instatus.com/embed-status/light-sm" loading="lazy" width="158" height="43" frameBorder="0" scrolling="no" style="border: none;" ></iframe><div id="he-plugin-standard"></div><script>WIDGET = { "CONFIG": { "layout": "2", "width": "230", "height": "290", "background": "1", "dataColor": "FFFFFF", "borderRadius": "5", "key": "dac79a62255345c9b4a31b585c3434a4" }}</script><script src="https://widget.qweather.net/standard/static/js/he-standard-common.js?v=2.0"></script>
# <center>
# <a target="_blank" href="https://hexo.io"><img src="https://img.shields.io/badge/Frame-Hexo 5.3.0-blue?style=flat&logo=hexo" title="博客框架为Hexo"></a><br>
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ webpushr:
# 官方文档参数见 https://docs.webpushr.com/introduction-to-rest-api
# 例如 all,即推送至所有用户;针对测试,可只推送给单个用户即自己,同时设置 sid 选项
# 您也可以将segment 设置为 all-users 对应的ID,同样也可以实现推送至所有用户
# sid: "119810055" # 单个用户ID 可在控制台查看 https://app.webpushr.com/subscribers
# sid: "130391396" # 单个用户ID 可在控制台查看 https://app.webpushr.com/subscribers

sw_self: true

Expand Down
53 changes: 27 additions & 26 deletions elog.config.js → elog/elog.config.notion.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module.exports = {
write: {
platform: 'yuque',
platform: "notion",
yuque: {
token: process.env.YUQUE_TOKEN,
baseUrl: '',
baseUrl: "",
login: process.env.YUQUE_LOGIN,
repo: process.env.YUQUE_REPO,
onlyPublic: false,
Expand All @@ -12,78 +12,79 @@ module.exports = {
notion: {
token: process.env.NOTION_TOKEN,
databaseId: process.env.NOTION_DATABASE_ID,
filter: false, // {property: 'status', select: {equals: '已发布'}}
sorts: true // [{property: 'date', direction: 'descending'}],
filter: true, // {property: 'status', select: {equals: '已发布'}}
sorts: true, // [{timestamp: 'created_time', direction: 'descending'}],
catalog: false,
},
},
deploy: {
platform: 'local',
platform: "local",
local: {
outputDir: './source/_posts/语雀/',
filename: 'title',
format: 'matter-markdown',
outputDir: "./source/_posts/语雀/",
filename: "title",
format: "matter-markdown",
catalog: true,
formatExt: '',
formatExt: "",
},
confluence: {
user: process.env.CONFLUENCE_USER,
password: process.env.CONFLUENCE_PASSWORD,
baseUrl: process.env.CONFLUENCE_BASE_URL,
spaceKey: process.env.CONFLUENCE_SPACE_KEY,
rootPageId: process.env.CONFLUENCE_ROOT_PAGE_ID, // 可选
formatExt: '', // 可选
formatExt: "", // 可选
},
},
image: {
enable: false,
platform: 'local',
platform: "local",
local: {
outputDir: '',
prefixKey: '',
outputDir: "",
prefixKey: "",
},
oss: {
secretId: process.env.OSS_SECRET_ID,
secretKey: process.env.OSS_SECRET_KEY,
bucket: process.env.OSS_BUCKET,
region: process.env.OSS_REGION,
host: process.env.OSS_HOST,
prefixKey: '',
secretExt: '', // 可选
prefixKey: "",
secretExt: "", // 可选
},
cos: {
secretId: process.env.COS_SECRET_ID,
secretKey: process.env.COS_SECRET_KEY,
bucket: process.env.COS_BUCKET,
region: process.env.COS_REGION,
host: process.env.COS_HOST,
prefixKey: '',
secretExt: '', // 可选
prefixKey: "",
secretExt: "", // 可选
},
qiniu: {
secretId: process.env.QINIU_SECRET_ID,
secretKey: process.env.QINIU_SECRET_KEY,
bucket: process.env.QINIU_BUCKET,
region: process.env.QINIU_REGION,
host: process.env.QINIU_HOST,
prefixKey: '',
secretExt: '', // 可选
prefixKey: "",
secretExt: "", // 可选
},
upyun: {
user: process.env.UPYUN_USER,
password: process.env.UPYUN_PASSWORD,
bucket: process.env.UPYUN_BUCKET,
host: process.env.UPYUN_HOST,
prefixKey: '',
secretExt: '', // 可选
prefixKey: "",
secretExt: "", // 可选
},
github: {
user: process.env.GITHUB_USER,
token: process.env.GITHUB_TOKEN,
repo: process.env.GITHUB_REPO,
branch: '',
host: '',
prefixKey: '',
secretExt: '', // 可选
branch: "",
host: "",
prefixKey: "",
secretExt: "", // 可选
},
},
}
};
90 changes: 90 additions & 0 deletions elog/elog.config.yuque.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
module.exports = {
write: {
platform: "yuque",
yuque: {
token: process.env.YUQUE_TOKEN,
baseUrl: "",
login: "ccknbc",
repo: "blog",
onlyPublic: false,
onlyPublished: true,
},
notion: {
token: process.env.NOTION_TOKEN,
databaseId: process.env.NOTION_DATABASE_ID,
filter: true, // {property: 'status', select: {equals: '已发布'}}
sorts: true, // [{timestamp: 'created_time', direction: 'descending'}],
catalog: false,
},
},
deploy: {
platform: "local",
local: {
outputDir: "./source/_posts/语雀/",
filename: "title",
format: "matter-markdown",
catalog: true,
formatExt: "",
},
confluence: {
user: process.env.CONFLUENCE_USER,
password: process.env.CONFLUENCE_PASSWORD,
baseUrl: process.env.CONFLUENCE_BASE_URL,
spaceKey: process.env.CONFLUENCE_SPACE_KEY,
rootPageId: process.env.CONFLUENCE_ROOT_PAGE_ID, // 可选
formatExt: "", // 可选
},
},
image: {
enable: false,
platform: "local",
local: {
outputDir: "",
prefixKey: "",
},
oss: {
secretId: process.env.OSS_SECRET_ID,
secretKey: process.env.OSS_SECRET_KEY,
bucket: process.env.OSS_BUCKET,
region: process.env.OSS_REGION,
host: process.env.OSS_HOST,
prefixKey: "",
secretExt: "", // 可选
},
cos: {
secretId: process.env.COS_SECRET_ID,
secretKey: process.env.COS_SECRET_KEY,
bucket: process.env.COS_BUCKET,
region: process.env.COS_REGION,
host: process.env.COS_HOST,
prefixKey: "",
secretExt: "", // 可选
},
qiniu: {
secretId: process.env.QINIU_SECRET_ID,
secretKey: process.env.QINIU_SECRET_KEY,
bucket: process.env.QINIU_BUCKET,
region: process.env.QINIU_REGION,
host: process.env.QINIU_HOST,
prefixKey: "",
secretExt: "", // 可选
},
upyun: {
user: process.env.UPYUN_USER,
password: process.env.UPYUN_PASSWORD,
bucket: process.env.UPYUN_BUCKET,
host: process.env.UPYUN_HOST,
prefixKey: "",
secretExt: "", // 可选
},
github: {
user: process.env.GITHUB_USER,
token: process.env.GITHUB_TOKEN,
repo: process.env.GITHUB_REPO,
branch: "",
host: "",
prefixKey: "",
secretExt: "", // 可选
},
},
};
Loading

0 comments on commit 05a31b9

Please sign in to comment.