Skip to content

Commit

Permalink
Merge pull request #1075 from terwer/feature/hotfix
Browse files Browse the repository at this point in the history
feat: #58 #1009 全面适配 docker(实验性)
  • Loading branch information
terwer committed Mar 4, 2024
2 parents ac807a0 + c5efd75 commit 3f96038
Show file tree
Hide file tree
Showing 82 changed files with 2,408 additions and 787 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -23,6 +23,7 @@ venv
__pycache__
cookie.txt
token.txt
pageId.txt

# ext
extension
Expand Down
4 changes: 4 additions & 0 deletions README.md
Expand Up @@ -190,6 +190,10 @@ more useful tools~
<img src="https://static-rs-terwer.oss-cn-beijing.aliyuncs.com/donate/alipay.jpg" alt="alipay" style="width:280px;height:375px;" />
</div>

### Afdian

https://afdian.net/a/terwer

# Thanks

- Thanks to the third-party framework for supporting the bottom layer of this project
Expand Down
5 changes: 5 additions & 0 deletions README_zh_CN.md
Expand Up @@ -17,6 +17,7 @@
- #1053 新增发布平台 telegra.ph
- **注意:此功能需要科学上网,请自行解决科学上网的问题。**
- #1054 新增文章管理功能:目前是简单版,后续会继续优化
- 文章管理重命名为仪表盘。关于名称,可在 issue 讨论,作者会根据反馈进行调整。
- `1.20.0` 主要修复以下缺陷:
- #990 修复发布到简书时部分格式显示不正常的问题
- `1.20.0` 主要优化以下方面:
Expand Down Expand Up @@ -184,6 +185,10 @@
<img src="https://static-rs-terwer.oss-cn-beijing.aliyuncs.com/donate/alipay.jpg" alt="alipay" style="width:280px;height:375px;" />
</div>

### 爱发电

https://afdian.net/a/terwer

# 感谢

感谢第三方框架对本项目底层的支持
Expand Down
3 changes: 2 additions & 1 deletion auto-imports.d.ts
Expand Up @@ -5,5 +5,6 @@
// Generated by unplugin-auto-import
export {}
declare global {

const ElMessage: typeof import('element-plus/es')['ElMessage']
const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
}
3 changes: 2 additions & 1 deletion custom.d.ts
Expand Up @@ -24,4 +24,5 @@
*/

declare module "zhi-notion-markdown"
declare module "uuid"
declare module "uuid"
declare module "cookie-parse"
40 changes: 22 additions & 18 deletions package.json
Expand Up @@ -26,12 +26,15 @@
"syncWidgetRepo": "python scripts/sync_widget_repo.py"
},
"devDependencies": {
"@halo-dev/api-client": "^2.12.0",
"@halo-dev/api-client": "^2.13.0",
"@terwer/esbuild-config-custom": "2.0.0",
"@terwer/eslint-config-custom": "^1.3.6",
"@types/crypto-js": "^4.2.2",
"@types/iframe-resizer": "^3.5.13",
"@types/katex": "^0.16.7",
"@types/lodash": "^4.14.202",
"@types/node": "^18.19.18",
"@types/minimist": "^1.2.5",
"@types/node": "^18.19.21",
"@vitejs/plugin-vue": "^5.0.4",
"@vitest/coverage-v8": "^1.3.1",
"@vue/test-utils": "^2.4.4",
Expand All @@ -45,7 +48,7 @@
"typescript": "^5.3.3",
"unplugin-auto-import": "^0.17.5",
"unplugin-vue-components": "^0.26.0",
"vercel": "^33.5.2",
"vercel": "^33.5.3",
"vite": "^5.1.4",
"vite-plugin-html": "^3.2.2",
"vite-plugin-node-polyfills": "^0.21.0",
Expand All @@ -54,16 +57,17 @@
},
"dependencies": {
"@element-plus/icons-vue": "^2.3.1",
"@iconify/json": "^2.2.187",
"@terwer/esbuild-config-custom": "2.0.0",
"@vueuse/components": "^10.8.0",
"@vueuse/core": "^10.8.0",
"@iconify/json": "^2.2.188",
"@vueuse/components": "^10.9.0",
"@vueuse/core": "^10.9.0",
"chatgpt": "^5.2.5",
"cheerio": "1.0.0-rc.12",
"cookie-parse": "^0.4.0",
"cross-fetch": "^3.1.8",
"crypto-js": "^4.2.0",
"element-plus": "^2.5.6",
"element-plus": "^2.6.0",
"gray-matter": "^4.0.3",
"iframe-resizer": "^4.3.9",
"js-base64": "^3.7.7",
"js-yaml": "^4.1.0",
"katex": "^0.16.9",
Expand All @@ -75,19 +79,19 @@
"siyuan-plugin-picgo": "^1.4.4",
"unplugin-icons": "^0.18.5",
"uuid": "^9.0.1",
"vue": "^3.4.20",
"vue-i18n": "^9.9.1",
"vue": "^3.4.21",
"vue-i18n": "^9.10.1",
"vue-router": "^4.3.0",
"xmlbuilder2": "^3.1.1",
"zhi-blog-api": "^1.53.2",
"zhi-common": "^1.30.0",
"zhi-device": "^2.10.0",
"zhi-fetch-middleware": "^0.7.17",
"zhi-github-middleware": "^0.4.14",
"zhi-gitlab-middleware": "^0.6.24",
"zhi-blog-api": "^1.56.1",
"zhi-common": "^1.31.0",
"zhi-device": "^2.11.0",
"zhi-fetch-middleware": "^0.8.0",
"zhi-github-middleware": "^0.4.15",
"zhi-gitlab-middleware": "^0.6.26",
"zhi-lib-base": "^0.8.0",
"zhi-notion-markdown": "^0.1.4",
"zhi-siyuan-api": "^2.16.0",
"zhi-xmlrpc-middleware": "^0.6.17"
"zhi-siyuan-api": "^2.18.4",
"zhi-xmlrpc-middleware": "^0.6.19"
}
}

0 comments on commit 3f96038

Please sign in to comment.