+### Afdian
+
+https://afdian.net/a/terwer
+
# Thanks
- Thanks to the third-party framework for supporting the bottom layer of this project
@@ -177,7 +292,7 @@ more useful tools~
Names not listed in order
| Name | version |vendor|
- |:-----------:|:-------:| :---------: |
+ |:-----------:|:-------:| :---------: |
| turbo | 1.9+ |Vercel|
| Vue | 3.3.4+ |Evan You|
| Vite | 4.2+ |Evan You|
@@ -188,15 +303,15 @@ more useful tools~
* Thanks to the enthusiastic support of the following users, I will continue to update and maintain the project!
- - 2023-09-04 *Xia Donate to [Publish Tool]
- - 2023-08-31 *Cheng Donate to [Publishing Tool] Thanks for providing the note posting tool, reminder change
- - 2023-08-31 *? Donated to [Publish Tool] Thanks for providing the siyuan-note Publish Tool.
- - 2023-08-14 *? Donated to [Publish Tool]
- - 2023-08-10 *f Donated to [Publish Tool] for liking the release plugin.
- - 2023-08-10 *2 Donated to [Publish Tool] to support the development of Source Release Plugin.
- - 2023-07-13 *Liang Donated to [Document Alias] Is it possible to expand the functionality to H1?
- - 2023-07-09 *z Donated to [Online Sharing] The online sharing plugin is great, thanks!
- - 2023-06-14 *Jun Donated to [Document Roaming] Thanks for the Document Roaming feature.
- - 2023-01-16 *Zhan Donated to [Import Tool] Finally, we can import epub files.
-
- If you do not want to display donation information, you can send an email directly to youweics@163.com.
+ - 2023-09-04 *Xia Donate to [Publish Tool]
+ - 2023-08-31 *Cheng Donate to [Publishing Tool] Thanks for providing the note posting tool, reminder change
+ - 2023-08-31 *? Donated to [Publish Tool] Thanks for providing the siyuan-note Publish Tool.
+ - 2023-08-14 *? Donated to [Publish Tool]
+ - 2023-08-10 *f Donated to [Publish Tool] for liking the release plugin.
+ - 2023-08-10 *2 Donated to [Publish Tool] to support the development of Source Release Plugin.
+ - 2023-07-13 *Liang Donated to [Document Alias] Is it possible to expand the functionality to H1?
+ - 2023-07-09 *z Donated to [Online Sharing] The online sharing plugin is great, thanks!
+ - 2023-06-14 *Jun Donated to [Document Roaming] Thanks for the Document Roaming feature.
+ - 2023-01-16 *Zhan Donated to [Import Tool] Finally, we can import epub files.
+
+ If you do not want to display donation information, you can send an email directly to youweics@163.com.
diff --git a/README_zh_CN.md b/README_zh_CN.md
index 87e5d46..e7daeaa 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -4,79 +4,154 @@
-将思源笔记的文章发布到语雀、Notion、Cnblogs、WordPress、Typecho、Hexo、知乎 等平台，支持极速发布、图床管理、平台扩展、智能标签等特色功能。
+将思源笔记的文章发布到语雀等平台，`开源`、`免费` 。
+
+如果您对 [增值功能](https://github.com/terwer/siyuan-plugin-publisher/issues/846) 感兴趣，请移步 ➡️
+收费的 [发布工具专业版](https://github.com/terwer/siyuan-plugin-publisher-pro)
+
+> 最近的新版本：🎉 发布工具新版本 `1.20.0` 发布，可能是插件发布以来，革命性变更最大的版本之一👀
+
+- `1.20.0` 新增部分发布平台，初步支持 docker 版本，同时对用户的使用体验进行了优化。
+- `1.20.0` 主要新增以下特性：
+ - #958 #1009 支持 docker 版本的思源笔记实验性
+ - 此版本初步支持了 docker 版本的思源笔记，如果某些情况下发布异常，欢迎GitHub 新增 issue 反馈。
+ - **注意：如果未配置 CORS 代理，功能将不可用！！！**
+ - Picgo 插件的图片功能目前在 docker 版本不可用，1.20.1 会支持
+ - #1053 新增发布平台 telegra.ph
+ - **注意：如果未配置 CORS 代理，功能将不可用！！！，而且文章预览需要科学上网，请自行解决科学上网的问题。**
+ - CORS 代理问题可加群讨论或者私聊作者 youweics@163.com
+ - 目前仅支持匿名发布和更新，登录将在 1.20.1 实现
+ - #1054 新增文章管理功能new
+ - 文章管理重命名为仪表盘。关于名称，可在 issue 讨论，作者会根据反馈进行调整。
+ - 支持显示所有平台发布图标
+ - 支持显示发布平台数量
+ - 支持筛选已发布文章
+- `1.20.0` 主要优化以下方面：
+ - 新增开发文档，新增下版本开发计划预告
+ - 优化插件商店体验new
+ - 优化导入体验，现在支持自定义导入了实验性
+ - 深度优化挂件版本
+- 咳咳，另外，在 `1.14.0` 版本之后，作者还悄悄开发了导入功能。您可以使用 `设置` -> `发布设置` -> `平台导入` 功能快速导入内置平台
+ 😄
-> 最近的Bug修复 `1.14.1`
- - 本次更新新增了特性：notion支持根页面搜索。同时修复了非Github平台发布错误的问题以及修复一键导入平台时未导入WordPress的问题。
- - **如果您之前出现无法发布的问题，那么本次更新应该能解决您的问题，建议所有用户升级。**
+> [猛击这里](https://blog.terwer.space/s/20230810132040-nn4q7vs)，查看最新帮助文档。
-> 最近的新特性版本：🎉 发布工具新版本 `1.14.0` 发布
+**遇到其他问题或者需求建议？请加 QQ 群 `895063267` 讨论。**
- - 本次更新新增多个平台，包括简书、掘金以及 Hugo、Jekyll、Vuepress、Vuepress2、Vitepress，后面几个平台同时兼容 `Github` 和 `Gitlab`
- - 咳咳，另外，在本版本中，作者还悄悄开发了导入功能。您可以使用 `设置` -> `发布设置` -> `导入预定义平台` 功能快速导入内置平台😄
+## 版本预告
-> 平台限制说明
+### 1.20.1-preview - 截止到 2024 年 Q1
- - 所有平台：发布工具每次都会获取思源笔记最新编辑的正文进行覆盖发布。每次发布都会覆盖正文，每次发布都会覆盖正文，每次发布都会覆盖正文。因此，请勿在平台自行修改正文。
- - **微信公众号**：目前，发布工具在 `1.13.0+` 已经支持发布文章到微信公众号草稿箱。但是由于微信平台在 Electron 上有限制，无法正常进行登录操作。因此，只能自己访问 `https://mp.weixin.qq.com/` ，登录完成之后，复制cookie然后粘贴到配置选项。
- - **Notion**: 由于Notion是基于块的，不是整篇文档，受限于技术，notion不支持更新。如需更新，目前只能删除后重新发布。
- - **掘金**：由于掘金平台强制要求，必须填写标签和分类，如果发布不选择默认会加上一个后端分类、程序员标签，否则将无法发布。
- - **掘金**：**掘金每次发布文章都需要审核** ，因此发布文章之后马上预览可能会404，此时可修改链接的 `/post` 为 `/spost` 临时查看，或者耐心等待审核通过。
+- docker 版本支持 Picgo 插件上传图片
+- telegra.ph 支持上传图片
+ - 参考 https://www.npmjs.com/package/telegraph-uploader
+- 支持 telegra.ph 登录
+- 解决部分平台在某些场景下重复上传图片的问题
+- 修复微信公众号排版问题
+- #990 修复发布到简书时部分格式显示不正常的问题
+- #989 部分文章发布到 Notion 失败
+- 修复部分场景发布到微信公众号报错的问题
+- #948 #905 halo 平台相关问题修复
+- vuepress2 相关问题
-**遇到问题或者需求建议？请加QQ群 `895063267` 讨论。或者查看下面的在线文档：**
+### 1.21.0-preview - 截止到 2024 年 Q1
-> [猛击这里](https://blog.terwer.space/s/20230810132040-nn4q7vs)，查看最新帮助文档。
+- 支持 B 站、小红书
+
+### 1.22.0-preview - 截止到 2024 年 Q2
+
+- 支持 Evernote、Antora（包括 GitHub 和 gitlab）
+
+### 1.23.0-preview - 截止到 2024 年 Q2
+
+- 支持 Docsify（包括 GitHub 和 gitlab）、Douban
+
+### 1.24.0-preview - 截止到 2024 年 Q2
+
+- 支持 flowus
+
+### 1.25.0-preview - 截止到 2024 年 Q2
+
+- 支持 Xlog、mdnice、zola
+
+### 1.26.0-preview - 截止到 2024 年 Q3
+
+- #956 和 OceanPress 联动
## 更新历史
请直接查看 [CHANGELOG](./CHANGELOG.md)
+## 开发
+
+请参考 [DEVELOPMENT](./DEVELOPMENT.md)
+
## 平台列表
排名不分先后
-- [X] 语雀
-- [X] Notion
-- [X] Github
- - [X] Hexo
- - [X] Hugo
- - [X] Jekyll
- - [X] Vuepress
- - [X] Vuepress2
- - [X] Vitepress
-- [X] Gitlab
- - [X] Gitlabhexo
- - [X] Gitlabhugo
- - [X] Gitlabjekyll
- - [X] Gitlabvuepress
- - [X] Gitlabvuepress2
- - [X] Gitlabvitepress
-- [X] Metaweblog
-- [X] 博客园
-- [X] Typecho
-- [X] WordPress
-- [X] 知乎
-- [X] CSDN
-- [X] 微信公众号
-- [X] 简书
-- [X] 掘金
+| 类型 | 平台 | 状态 | PC 客户端 | PC 图片上传 | Docker | Docker 图片上传 | 备注 |
+|:-------:|:---------------:|:----:|:------:|:-------:|:---------------:|:-----------:|:--------------------------------------------:|
+| 通用 | 语雀 | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://yuque.com) |
+| 通用 | Notion | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://www.notion.so) |
+| 通用 | Halo | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://halo.run) |
+| 通用 | 印象笔记 | TODO | TODO | TODO | TODO | TODO | [官网](https://www.yinxiang.com) |
+| 通用 | Github | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://github.com) |
+| 静态网站生成器 | Hexo | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://hexo.io/zh-cn/) |
+| 静态网站生成器 | Hugo | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://gohugo.io/) |
+| 静态网站生成器 | Jekyll | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://jekyllrb.com/) |
+| 静态网站生成器 | Vuepress | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://vuepress.vuejs.org/) |
+| 静态网站生成器 | Vuepress2 | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://v2.vuepress.vuejs.org/) |
+| 静态网站生成器 | Vitepress | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://vitepress.vuejs.org/) |
+| 静态网站生成器 | Antora | TODO | TODO | TODO | TODO | TODO | [官网](https://antora.org/) |
+| 静态网站生成器 | Docsify | TODO | TODO | TODO | TODO | TODO | [官网](https://docsify.js.org/) |
+| Git 托管 | Gitlab | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://gitlab.com/) |
+| Git 托管 | Gitlabhexo | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://gitlab.com/) |
+| Git 托管 | Gitlabhugo | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://gitlab.com/) |
+| Git 托管 | Gitlabjekyll | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://gitlab.com/) |
+| Git 托管 | Gitlabvuepress | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://gitlab.com/) |
+| Git 托管 | Gitlabvuepress2 | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://gitlab.com/) |
+| Git 托管 | Gitlabvitepress | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://gitlab.com/) |
+| Git 托管 | Gitlabantora | TODO | TODO | TODO | TODO | TODO | [官网](https://gitlab.com/) |
+| Git 托管 | Gitlabdocsify | TODO | TODO | TODO | TODO | TODO | [官网](https://gitlab.com/) |
+| 博客 | Metaweblog | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](http://xmlrpc.scripting.com/metaWeblog) |
+| 博客 | CnBlogs | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://cnblogs.com) |
+| 博客 | Typecho | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://typecho.org/) |
+| 博客 | Jvue | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://github.com/terwer/jvue) |
+| 博客 | WordPress | ✔ | 完全兼容 | ✔ | 部分兼容 | ✖ | [官网](https://wordpress.org/) |
+| 社交媒体 | 知乎 | ✔ | 完全兼容 | ✔ | 部分兼容，需 PC 端账号验证 | ✖ | [官网](https://www.zhihu.com/) |
+| 社交媒体 | CSDN | ✔ | 完全兼容 | ✔ | 部分兼容，需 PC 端账号验证 | ✖ | [官网](https://www.csdn.net/) |
+| 社交媒体 | 微信公众号 | ✔ | 完全兼容 | ✔ | 部分兼容，需 PC 端账号验证 | ✖ | [官网](https://mp.weixin.qq.com/) |
+| 社交媒体 | 简书 | ✔ | 完全兼容 | ✔ | 部分兼容，需 PC 端账号验证 | ✖ | [官网](https://www.jianshu.com/) |
+| 社交媒体 | 掘金 | ✔ | 完全兼容 | ✔ | 部分兼容，需 PC 端账号验证 | ✖ | [官网](https://juejin.cn/) |
+| 社区 | 52破解 | TODO | TODO | TODO | TODO | TODO | [官网](https://www.52pojie.cn/) |
+| 社区 | Bilibili | TODO | TODO | TODO | TODO | TODO | [官网](https://www.bilibili.com/) |
+| 社区 | 小红书 | TODO | TODO | TODO | TODO | TODO | [官网](https://www.xiaohongshu.com/) |
+| 社区 | 豆瓣 | TODO | TODO | TODO | TODO | TODO | [官网](https://www.douban.com/) |
+| 其他 | Xlog | TODO | TODO | TODO | TODO | TODO | [官网](https://xlog.cn/) |
+| 其他 | Mdnice | TODO | TODO | TODO | TODO | TODO | [官网](https://mdnice.com/) |
+| 其他 | Flowus | TODO | TODO | TODO | TODO | TODO | [官网](https://www.flowus.com/) |
+| 其他 | telegra.ph | ✔ | 部分兼容 | ✖ | 部分兼容 | ✖ | [官网](https://telegra.ph) |
## 核心特色
-- [X] **极速发布**：一次配置，一键发布
-- [X] **图床管理**：集成 PicGO 图床，支持 s3、minio、水印插件，需要在集市安装 [Picgo插件](https://github.com/terwer/siyuan-plugin-picgo) ，**目前仅支持PC客户端**
-- [X] **支持扩展**：基于统一的博客 API 规范，内置 metaweblogAPI 、 WordPress 、Wechatsync 和 Github 支持，并提供了统一的适配器，理论上可支持扩展到任何平台
-- [X] **平台开关**：所有平台均支持启用禁用
-- [X] **动态新增**：支持自定义添加平台
-- [X] **AI集成**：集成自由聊天和基于当前文档上下文的聊天
-- [X] **智能分类**：支持智能 slug 别名、智能标题、智能摘要、智能标签、智能分类
-- [X] **文章绑定**：支持关联已有的平台文章到思源笔记，方便后续管理，支持思源-> 平台单向同步
-- [X] **适应主题**：自动适配暗黑模式与浅色模式
-- [X] **语言支持**：多语言支持，支持中文版和英文版
-- [X] **发布视图**：支持多种发布视图，简单模式、详细模式和源码模式
-- [X] **多种部署**：支持思源笔记插件强烈推荐、Chrome 浏览器扩展、自部署
-
-本插件承诺，**插件本身的基础功能永久免费** ，第三方平台提供的相关服务的可能需要自己注册账号或者购买服务。如果您想支持开发者，请在这里 [随意打赏](https://github.com/terwer/siyuan-plugin-publisher/blob/main/README_zh_CN.md#捐赠)。
+- [x] **极速发布**：一次配置，一键发布
+- [x] **图床管理**：集成 PicGO 图床，支持
+ s3、minio、水印插件，需要在集市安装 [Picgo 插件](https://github.com/terwer/siyuan-plugin-picgo) ，**目前仅支持 PC 客户端**
+- [x] **支持扩展**：基于统一的博客 API 规范，内置 metaweblogAPI 、 WordPress 、Wechatsync 和 Github
+ 支持，并提供了统一的适配器，理论上可支持扩展到任何平台
+- [x] **平台开关**：所有平台均支持启用禁用
+- [x] **动态新增**：支持自定义添加平台
+- [x] **AI 集成**：集成自由聊天和基于当前文档上下文的聊天
+- [x] **智能分类**：支持智能 slug 别名、智能标题、智能摘要、智能标签、智能分类
+- [x] **文章绑定**：支持关联已有的平台文章到思源笔记，方便后续管理，支持思源-> 平台单向同步
+- [x] **适应主题**：自动适配暗黑模式与浅色模式
+- [x] **语言支持**：多语言支持，支持中文版和英文版
+- [x] **发布视图**：支持多种发布视图，简单模式、详细模式和源码模式
+- [x] **多种部署**：支持思源笔记插件强烈推荐、Chrome 浏览器扩展、自部署
+
+本插件承诺，**插件本身的基础功能永久免费**
+，第三方平台提供的相关服务的可能需要自己注册账号或者购买服务。如果您想支持开发者，请在这里 [随意打赏](https://github.com/terwer/siyuan-plugin-publisher/blob/main/README_zh_CN.md#捐赠)。
> 🌹 温馨提示：这个插件是原 `思源笔记发布工具` 挂件的插件升级版，功能包含原有挂件提供的所有功能，同时提供了方便的菜单操作入口，并进行了一系列问题修复和体验优化。
>
@@ -88,18 +163,21 @@
## 支持的分类体系
-- [X] 分类
- - [X] 多选分类
+- [x] 分类
+
+ - [x] 多选分类
-- [X] 知识空间
- - [X] 单选知识空间
- - [X] 树形单选知识空间
+- [x] 知识空间
-- [X] 标签
- - [X] 多选标签
+ - [x] 单选知识空间
+ - [x] 树形单选知识空间
-- [X] 标签别名
- - [X] 单选标签别名
+- [x] 标签
+
+ - [x] 多选标签
+
+- [x] 标签别名
+ - [x] 单选标签别名
## 平台适配计划
@@ -110,7 +188,7 @@
## FAQ
-* Q1：发布工具插件怎么安装？安装之后在哪里找到他的入口？
+- Q1：发布工具插件怎么安装？安装之后在哪里找到他的入口？
A1：找到 **`集市->插件->发布工具`** 下载启用即可。
@@ -118,19 +196,19 @@
安装完成后，在顶部右侧工具栏找到 ✈️ 图标，点击菜单，按照对应说明操作使用即可。
-* Q2：装了发布工具插件之后，还需要安装挂件吗？
+- Q2：装了发布工具插件之后，还需要安装挂件吗？
A2：**不需要。**
插件版包含挂件版的所有功能。
-* Q3：我不习惯新版操作，想继续使用以前的挂件，可以吗？
+- Q3：我不习惯新版操作，想继续使用以前的挂件，可以吗？
A3：**可以但是不推荐。**
**我们强烈推荐您直接使用插件版，因为插件版将是以后长久维护的主要版本，挂架版本已废弃，仅作为修复问题以及兼容历史用户。**
-* Q4：我以前是通过 `自定义JS片段 ` 或者 直接添加 `挂件` 来使用的，现在还需要下载该插件吗？
+- Q4：我以前是通过 `自定义JS片段 ` 或者 直接添加 `挂件` 来使用的，现在还需要下载该插件吗？
A4：**可选。** 但是我们强烈推荐您删除 JS 片段和挂件，下载插件版使用。
@@ -138,15 +216,17 @@
如果您想使用插件版，那么我们强烈建议您删除之前添加的 `自定义JS片段` 和 `挂件`，直接下载插件版，启用即可。无需其他额外操作。
-* Q5：我的历史配置数据项迁移到插件，可以吗？
-* A5：**可以。** 注意：数据迁移将在后续版本提供。
+- Q5：我的历史配置数据项迁移到插件，可以吗？
+- A5：**可以。** 注意：数据迁移将在后续版本提供。
请在 `发布设置->检测并迁移历史配置。` 操作。
注意：挂件版配置数据导入仅支持 `sy-p-cfg-v0.8.1.json` 。
-* Q6：我需要发布的平台，发布工具没有提供怎么办？
-* A6：参考：[平台适配计划](https://github.com/terwer/siyuan-plugin-publisher/blob/main/README_zh_CN.md#平台适配计划 "平台适配计划")
+- Q6：我需要发布的平台，发布工具没有提供怎么办？
+-
+
+A6：参考：[平台适配计划](https://github.com/terwer/siyuan-plugin-publisher/blob/main/README_zh_CN.md#平台适配计划 "平台适配计划")
## 捐赠
@@ -164,33 +244,37 @@
元素
+ // // $("div.language-math").each((index, element) => {
+ // // // 获取元素的文本内容
+ // // const mathContent = $(element).text()
+ // //
+ // // // 创建替代的![]()
标签
+ // // const imgTag = `![]()
标签替换原始元素
+ // // $(element).replaceWith(imgTag)
+ // // })
+ //
+ // // 处理两个$符号包裹的公式
+ // const doubleDollarRegex = /\$\$([^$]+)\$\$/g
+ // $("*:not(pre)").each((index, element) => {
+ // const content = $(element).html()
+ // const newContent = content.replace(doubleDollarRegex, (match, mathContent) => {
+ // return `})
`
+ // })
+ // $(element).html(newContent)
+ // })
+ //
+ // // 处理一个$符号包裹的公式
+ // const singleDollarRegex = /\$([^$]+)\$/g
+ // $("*:not(pre)").each((index, element) => {
+ // const content = $(element).html()
+ // const newContent = content.replace(singleDollarRegex, (match, mathContent) => {
+ // return ``
+ // })
+ // $(element).html(newContent)
+ // })
+ //
+ // // 输出修改后的HTML
+ // return $.html()
+ }
+}
+
+export default ZhihuUtils
diff --git a/src/adaptors/web/zhihu/zhihuWebAdaptor.ts b/src/adaptors/web/zhihu/zhihuWebAdaptor.ts
index 8ce21f9..31a5c27 100644
--- a/src/adaptors/web/zhihu/zhihuWebAdaptor.ts
+++ b/src/adaptors/web/zhihu/zhihuWebAdaptor.ts
@@ -24,12 +24,14 @@
*/
import { BaseWebApi } from "~/src/adaptors/web/base/baseWebApi.ts"
-import { CategoryInfo, Post, UserBlog } from "zhi-blog-api"
+import { BlogConfig, CategoryInfo, PageTypeEnum, Post, UserBlog } from "zhi-blog-api"
import * as cheerio from "cheerio"
import { JsonUtil, StrUtil } from "zhi-common"
import CryptoJS from "crypto-js"
import { arrayToBuffer } from "~/src/utils/polyfillUtils.ts"
import { getAliOssClient } from "~/src/vendors/alioss/s3oss.ts"
+import _ from "lodash-es"
+import ZhihuUtils from "~/src/adaptors/web/zhihu/zhihuUtils.ts"
/**
* 知乎网页授权适配器
@@ -98,6 +100,38 @@ class ZhihuWebAdaptor extends BaseWebApi {
return result
}
+ public override async preEditPost(post: Post, id?: string, publishCfg?: any): Promise {
+ // 公共的属性预处理
+ const doc = await super.preEditPost(post, id, publishCfg)
+
+ // 知乎自定义的处理
+ const cfg: BlogConfig = publishCfg?.cfg
+ const updatedPost = _.cloneDeep(doc) as Post
+ const html = updatedPost.html
+ this.logger.info("准备处理知乎正文")
+ this.logger.debug("html =>", { html: html })
+ let updatedHtml = html
+
+ // 处理表格
+ updatedHtml = ZhihuUtils.processZHTable(updatedHtml)
+ // 处理数学公式
+ updatedHtml = ZhihuUtils.processZHMath(updatedHtml)
+
+ // 处理完毕
+ updatedPost.html = updatedHtml
+ this.logger.info("知乎正文处理完毕")
+ this.logger.debug("updatedHtml =>", { updatedHtml: updatedHtml })
+
+ // 发布格式
+ if (cfg?.pageType == PageTypeEnum.Markdown) {
+ updatedPost.description = updatedPost.markdown
+ } else {
+ updatedPost.description = updatedPost.html
+ }
+
+ return updatedPost
+ }
+
public async addPost(post: Post) {
const params = JSON.stringify({
title: post.title,
diff --git a/src/ai/AiConstants.ts b/src/ai/AiConstants.ts
new file mode 100644
index 0000000..ea74968
--- /dev/null
+++ b/src/ai/AiConstants.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2023, Terwer . All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Terwer designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Terwer in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Terwer, Shenzhen, Guangdong, China, youweics@163.com
+ * or visit www.terwer.space if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * AI 常量
+ *
+ * https://github.com/transitive-bullshit/chatgpt-api/blob/main/src/chatgpt-api.ts#L443
+ *
+ * Use up to 4096 tokens (prompt + response), but try to leave 1000 tokens
+ * for the response.
+ */
+enum AiConstants {
+ /**
+ * 最大输入长度
+ */
+ MAX_INPUT_TOKEN_LENGTH = 3000,
+
+ /**
+ * 最大指令长度
+ */
+ // MAX_PROMPT_LENGTH = 96,
+
+ /**
+ * 标题返回字符限制
+ */
+ // MAX_RESP_TITLE_LENGTH = 255,
+}
+
+export { AiConstants }
diff --git a/src/ai/prompt.ts b/src/ai/prompt.ts
new file mode 100644
index 0000000..d176aa6
--- /dev/null
+++ b/src/ai/prompt.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2023, Terwer . All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Terwer designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Terwer in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Terwer, Shenzhen, Guangdong, China, youweics@163.com
+ * or visit www.terwer.space if you need additional information or have any
+ * questions.
+ */
+
+import { AiPrompt } from "~/src/models/aiPrompt.ts"
+
+/**
+ * 智能提取信息的自动化工具
+ */
+
+/**
+ * 提取标题的配置信息
+ */
+const titlePrompt = {
+ title: "自动提取标题",
+ description: "从文章内容中生成有意义的标题",
+ key: "title",
+ content:
+ "请为这篇文章生成简洁且完整概括的标题，只处理文本，尽量返回中文标题。" +
+ "标题长度不超过100个中文字符或255个英文字符。" +
+ "输出为 JSON 格式，键名为 title，结果需放在 {} 内。" +
+ "完整结果必须是合法JSON，不得包含非法 JSON 字符。",
+}
+export type TitleAIResult = {
+ title: string
+}
+
+/**
+ * 提取摘要的配置信息
+ */
+const shortDescPrompt = {
+ title: "自动提取摘要",
+ description: "从文章内容生成文章摘要",
+ key: "desc",
+ content:
+ "请为这篇文章生成简明扼要的摘要，只处理文本，尽量返回中文摘要。" +
+ "摘要长度不超过255个中文字符或512个英文字符。" +
+ "输出为 JSON 格式，键名为 desc，结果需放在 {} 内。" +
+ "完整结果必须是合法JSON，不得包含非法 JSON 字符。",
+}
+export type ShortDescAIResult = {
+ desc: string
+}
+
+/**
+ * 提取标签的配置信息
+ */
+const tagPrompt = {
+ title: "自动提取标签",
+ description: "为文章添加标签",
+ key: "tags",
+ content:
+ "请为这篇文章生成标签，只处理文本，尽量返回中文标签。" +
+ "单个标签不超过6个字符，多个标签用英文逗号分隔，最多返回5个标签。" +
+ "如果单个标签是英文，英文字母必须全部小写并且每个单词之间用-拼接。" +
+ "标签名称不能重复，不能包含任何除英文字母、-以及汉字以外的字符。" +
+ "输出为 JSON 格式，键名为 tags，指令放在数组内，结果需放在 {} 内。" +
+ "完整结果必须是合法JSON，不得包含非法 JSON 字符。",
+}
+export type TagAIResult = {
+ tags: string[]
+}
+
+/**
+ * 提取分类的配置信息
+ */
+const categoryPrompt = {
+ title: "自动提取分类",
+ description: "对文章内容进行分类",
+ key: "categories",
+ content:
+ "请为这篇文章文章内容进行分类，只处理文本，尽量返回中文分类。" +
+ "每个分类名称不超过6个字符，最多返回3个分类。" +
+ "如果分类是英文，需要使用驼峰命名并且首字母大写。" +
+ "输出为 JSON 格式，键名为 categories，结果需放在 {} 内。" +
+ "完整结果必须是合法JSON，不得包含非法 JSON 字符。",
+}
+export type CategoryAIResult = {
+ categories: string[]
+}
+
+/**
+ * 自动提取工具的配置集合
+ */
+const prompt = {
+ titlePrompt,
+ shortDescPrompt,
+ tagPrompt,
+ categoryPrompt,
+}
+
+export { prompt }
diff --git a/src/assets/style.css b/src/assets/style.css
index 5d8da85..afdfdbb 100644
--- a/src/assets/style.css
+++ b/src/assets/style.css
@@ -36,15 +36,16 @@ html {
body {
margin: 0;
font-size: 100%;
- height: 97.5%;
+ height: 100%;
}
#app {
color: var(--custom-app-color);
background: var(--custom-app-bg-color);
padding: 10px 0;
- min-width: 600px;
+ min-width: 768px;
min-height: 99%;
+ font-family: var(--g-font-family);
}
a {
diff --git a/src/bootstrap.ts b/src/bootstrap.ts
new file mode 100644
index 0000000..fd7b779
--- /dev/null
+++ b/src/bootstrap.ts
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2023-2024, Terwer . All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Terwer designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Terwer in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Terwer, Shenzhen, Guangdong, China, youweics@163.com
+ * or visit www.terwer.space if you need additional information or have any
+ * questions.
+ */
+
+import { createApp } from "vue"
+import App from "./App.vue"
+import { createAppLogger } from "./utils/appLogger.ts"
+import { useVueRouter } from "./composables/useVueRouter.ts"
+import i18n from "./locales"
+import { createPinia } from "pinia"
+import iframeResize from "./utils/directives/iframeResize.ts";
+
+/**
+ * Vue 入口
+ *
+ * @author terwer
+ * @version 0.9.0
+ * @since 0.0.1
+ */
+const createVueApp = async (isMount?: boolean) => {
+ const logger = createAppLogger("vue-main-entry")
+
+ // https://stackoverflow.com/a/62383325/4037224
+ const app = createApp(App)
+
+ // 国际化
+ app.use(i18n)
+
+ // pinia
+ const pinia = createPinia()
+ app.use(pinia)
+
+ // router
+ const router = useVueRouter()
+ app.use(router)
+
+ // ElementPlus 包太大，需要改成按需引入
+ // https://element-plus.org/zh-CN/guide/quickstart.html#%E6%8C%89%E9%9C%80%E5%AF%BC%E5%85%A5
+ // app.use(ElementPlus)
+
+ // ifreme resizere
+ app.directive('resize', iframeResize)
+
+ return { i18n, router, app }
+}
+
+export { createVueApp }
diff --git a/src/components/common/DrawerBoxBridge.vue b/src/components/common/DrawerBoxBridge.vue
new file mode 100644
index 0000000..cda348e
--- /dev/null
+++ b/src/components/common/DrawerBoxBridge.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+ [],
- failBatchResults: [],
+ successBatchResults: [] as any[],
+ failBatchResults: [] as any[],
// 单个平台信息
siyuanPost: {} as Post,
@@ -111,6 +113,8 @@ const formData = reactive({
const handlePublish = async () => {
try {
formData.isPublishLoading = true
+ isTimerInit.value = false
+
if (formData.dynList.length === 0) {
throw new Error("必须选择一个分发平台")
}
@@ -177,6 +181,7 @@ const handlePublish = async () => {
})
} finally {
formData.isPublishLoading = false
+ isTimerInit.value = true
}
}
@@ -330,6 +335,10 @@ const checkChatGPTEnabled = () => {
return flag
}
+// 计时器
+const isTimerInit = ref(false)
+const { loadingTime } = useLoadingTimer(isTimerInit)
+
onMounted(async () => {
// ==================
// 初始化开始
@@ -348,16 +357,24 @@ onMounted(async () => {
// 这里可以控制一些功能开关
formData.useAi = checkChatGPTEnabled()
formData.editType = PageEditMode.EditMode_simple
+
+ formData.isInit = true
+ isTimerInit.value = true
})
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/common/LoadingTimer.vue b/src/components/common/LoadingTimer.vue
new file mode 100644
index 0000000..552275a
--- /dev/null
+++ b/src/components/common/LoadingTimer.vue
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/src/components/publish/BatchPublishIndex.vue b/src/components/publish/BatchPublishIndex.vue
index 526375a..97a2c4c 100644
--- a/src/components/publish/BatchPublishIndex.vue
+++ b/src/components/publish/BatchPublishIndex.vue
@@ -27,27 +27,27 @@
import { createAppLogger } from "~/src/utils/appLogger.ts"
import PublishTips from "~/src/components/publish/form/PublishTips.vue"
import PublishPlatform from "~/src/components/publish/form/PublishPlatform.vue"
-import { markRaw, onMounted, reactive, toRaw } from "vue"
+import { markRaw, onMounted, reactive, ref, toRaw } from "vue"
import { usePublish } from "~/src/composables/usePublish.ts"
import { useSiyuanApi } from "~/src/composables/useSiyuanApi.ts"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
import { ElMessage, ElMessageBox } from "element-plus"
import { StrUtil } from "zhi-common"
-import { pre } from "~/src/utils/import/pre.ts"
+import { pre } from "~/src/platforms/pre.ts"
import { Delete } from "@element-plus/icons-vue"
import { BrowserUtil } from "zhi-device"
import { usePublishConfig } from "~/src/composables/usePublishConfig.ts"
-import { Post } from "zhi-blog-api"
+import { PageEditMode, Post } from "zhi-blog-api"
import { IPublishCfg } from "~/src/types/IPublishCfg.ts"
-import { PageEditMode } from "~/src/models/pageEditMode.ts"
import EditModeSelect from "~/src/components/publish/form/EditModeSelect.vue"
import PublishTime from "~/src/components/publish/form/PublishTime.vue"
import { ICategoryConfig } from "~/src/types/ICategoryConfig.ts"
import { SiyuanAttr } from "zhi-siyuan-api"
import { DistributionPattern } from "~/src/models/distributionPattern.ts"
-import _ from "lodash"
+import _ from "lodash-es"
import PublishTitle from "~/src/components/publish/form/PublishTitle.vue"
import { useChatGPT } from "~/src/composables/useChatGPT.ts"
+import { useLoadingTimer } from "~/src/composables/useLoadingTimer.ts"
const logger = createAppLogger("publisher-index")
@@ -72,6 +72,8 @@ const sysKeys = pre.systemCfg.map((item) => {
})
const id = StrUtil.isEmptyString(props.id) ? process.env.VITE_DEV_PAGE_ID : props.id
const formData = reactive({
+ isInit: false,
+
// loading
isPublishLoading: false,
isDeleteLoading: false,
@@ -79,8 +81,8 @@ const formData = reactive({
// process
showProcessResult: false,
errCount: 0,
- successBatchResults:
+ {{ t("loading.cost") }}: {{ loadingTime }} ms
+ 😍
+ 😄
+ 😊
+ 🤔
+ 😒
+ 😭
+
+ {
class="top-tip"
:title="t('category.ai.enabled')"
type="success"
- :closable="false"
+ :closable="true"
/>
- 覆盖
- 合并
+ 覆盖
+ 合并
@@ -539,6 +556,7 @@ onMounted(async () => {
.batch-result
margin 16px 0
font-size 14px
+
.platform
color var(--el-color-info)
@@ -553,6 +571,7 @@ onMounted(async () => {
.success-tips
color var(--el-color-success)
+
.fail-tips
color var(--el-color-error)
@@ -562,10 +581,13 @@ onMounted(async () => {
.distri-type
:deep(.el-form-item)
margin-bottom -16px
+
.distri-type-check
margin-top -3px
+
.distri-tip
margin-top 10px
+
.distri-tip-alert
margin 10px 0
padding: 2px 0
diff --git a/src/components/publish/QuickPublishSelectPlatform.vue b/src/components/publish/QuickPublishSelectPlatform.vue
new file mode 100644
index 0000000..a43a826
--- /dev/null
+++ b/src/components/publish/QuickPublishSelectPlatform.vue
@@ -0,0 +1,283 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/publish/SinglePublishDoPublish.vue b/src/components/publish/SinglePublishDoPublish.vue
index 946f5c8..ccc4659 100644
--- a/src/components/publish/SinglePublishDoPublish.vue
+++ b/src/components/publish/SinglePublishDoPublish.vue
@@ -24,12 +24,12 @@
-->
@@ -439,13 +468,22 @@ onMounted(async () => {
+ {{ pageTitle }}
+
+
+
+
+
+ 一键预览
+
+
+
+
+
+
+
+ {{ CrossPageUtils.longPlatformName(cfg?.platformName, 11) }}
+
+
+
+
+
+
@@ -467,6 +505,7 @@ onMounted(async () => {
:page-id="id"
:cfg="formData.publishCfg.cfg"
@emitSyncPost="syncPost"
+ @edmtSyncToSiyuan="handleSyncToSiyuan"
/>
@@ -480,7 +519,7 @@ onMounted(async () => {
{
{
v-model:tags="formData.mergedPost.mt_keywords"
v-model:md="formData.mergedPost.markdown"
v-model:html="formData.mergedPost.html"
+ v-model:tag-config="formData.tagConfig"
@emitSyncTags="syncTags"
/>
@@ -585,7 +625,11 @@ onMounted(async () => {
>
{{ t("main.force.cancel") }}
-
+
同步修改到思源笔记
@@ -618,9 +662,10 @@ onMounted(async () => {
diff --git a/src/components/publish/form/CommonCategories.vue b/src/components/publish/form/CommonCategories.vue
index 6b4f43f..d4d9a32 100644
--- a/src/components/publish/form/CommonCategories.vue
+++ b/src/components/publish/form/CommonCategories.vue
@@ -26,13 +26,11 @@
@@ -182,6 +240,32 @@ const tagMethods = {
{{ t("main.tag.new") }}
+
+ {{ formData.tag.selectVisible ? t("main.tag.close") : t("main.tag.select") }}
+
+
+
+
+
diff --git a/src/components/publish/form/PublishTips.vue b/src/components/publish/form/PublishTips.vue
index 40facb7..da09c62 100644
--- a/src/components/publish/form/PublishTips.vue
+++ b/src/components/publish/form/PublishTips.vue
@@ -37,5 +37,4 @@
diff --git a/src/components/publish/form/PublishTitle.vue b/src/components/publish/form/PublishTitle.vue
index b60aaf4..e26dd60 100644
--- a/src/components/publish/form/PublishTitle.vue
+++ b/src/components/publish/form/PublishTitle.vue
@@ -26,12 +26,11 @@
diff --git a/src/components/publish/form/tagslug/SingleTagSlug.vue b/src/components/publish/form/tagslug/SingleTagSlug.vue
index ac9cf3e..73fd81f 100644
--- a/src/components/publish/form/tagslug/SingleTagSlug.vue
+++ b/src/components/publish/form/tagslug/SingleTagSlug.vue
@@ -30,7 +30,6 @@ import { TagInfo } from "zhi-blog-api"
import Adaptors from "~/src/adaptors"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
-import { computed } from "vue/dist/vue"
const logger = createAppLogger("single-tag-slugs")
const { t } = useVueI18n()
@@ -165,4 +164,4 @@ onMounted(async () => {
box-sizing border-box
white-space nowrap
--el-icon-size 14px
-
+
\ No newline at end of file
diff --git a/src/components/set/PublishSetting.vue b/src/components/set/PublishSetting.vue
index b19fe3f..7e54712 100644
--- a/src/components/set/PublishSetting.vue
+++ b/src/components/set/PublishSetting.vue
@@ -24,814 +24,62 @@
-->
diff --git a/src/components/set/SiyuanSetting.vue b/src/components/set/SiyuanSetting.vue
index 4f241c6..cf8afa9 100644
--- a/src/components/set/SiyuanSetting.vue
+++ b/src/components/set/SiyuanSetting.vue
@@ -25,10 +25,10 @@
diff --git a/src/components/set/preference/AiSetting.vue b/src/components/set/preference/AiSetting.vue
index 3242d8b..6b81eb9 100644
--- a/src/components/set/preference/AiSetting.vue
+++ b/src/components/set/preference/AiSetting.vue
@@ -25,10 +25,10 @@
diff --git a/src/components/set/preference/ChangeLocal.vue b/src/components/set/preference/ChangeLocal.vue
index de422b5..dadd408 100644
--- a/src/components/set/preference/ChangeLocal.vue
+++ b/src/components/set/preference/ChangeLocal.vue
@@ -26,11 +26,11 @@
-
+
-
-
- {{ t("post.bind.conf.save") }}
+
-
+
+
+ {{ t("post.bind.conf.save") }}
+ {{ t("post.bind.conf.v081") }}
+
+
+
diff --git a/src/components/set/preference/PreferenceSetting.vue b/src/components/set/preference/PreferenceSetting.vue
index dcd56c9..27db1b5 100644
--- a/src/components/set/preference/PreferenceSetting.vue
+++ b/src/components/set/preference/PreferenceSetting.vue
@@ -25,12 +25,17 @@
@@ -47,5 +52,40 @@ const publishPreferenceSettingForm = getPublishPreferenceSetting()
+
+
+
+
+
+
+
+
+ {{ formData.dynCfg.platformKey }}
+
+
+
+ {{ formData.dynCfg.platformName }}
+
+
+
+
+
+
+
+
+
+ {{ formData.dynCfg.authMode === AuthMode.API ? "API授权" : "网页授权" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t("dynamic.platform.opt.add") }}
+
+
+
+
+
+
diff --git a/src/components/set/publish/form/PlatformQuickAdd.vue b/src/components/set/publish/form/PlatformQuickAdd.vue
new file mode 100644
index 0000000..1081c77
--- /dev/null
+++ b/src/components/set/publish/form/PlatformQuickAdd.vue
@@ -0,0 +1,244 @@
+
+
+
+
+
+
+
+
+ {{ formData.dynCfg.platformKey }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t("dynamic.platform.opt.add") }}
+
+
+
+
+
+
diff --git a/src/components/set/publish/platform/PublishPlatformImport.vue b/src/components/set/publish/platform/PublishPlatformImport.vue
new file mode 100644
index 0000000..7f3617d
--- /dev/null
+++ b/src/components/set/publish/platform/PublishPlatformImport.vue
@@ -0,0 +1,367 @@
+
+
+
+
+
+
-
{
- Markdown
- HTML
+ Markdown
+ HTML
@@ -388,6 +430,33 @@ onMounted(async () => {
type="info"
>
+
+
+
+
+
@@ -418,10 +487,11 @@ onMounted(async () => {
\ No newline at end of file
+
diff --git a/src/components/set/publish/singleplatform/base/CookieSetting.vue b/src/components/set/publish/singleplatform/base/CookieSetting.vue
index 41c3c3d..1bff5f8 100644
--- a/src/components/set/publish/singleplatform/base/CookieSetting.vue
+++ b/src/components/set/publish/singleplatform/base/CookieSetting.vue
@@ -28,7 +28,7 @@ import { reactive, ref, watch } from "vue"
import { ElMessage, FormRules } from "element-plus"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
import { createAppLogger } from "~/src/utils/appLogger.ts"
-import { useSettingStore } from "~/src/stores/useSettingStore.ts"
+import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts"
import { StrUtil } from "zhi-common"
const logger = createAppLogger("cookie-setting")
@@ -44,7 +44,7 @@ const emit = defineEmits(["emitHideDlg"])
// uses
const { t } = useVueI18n()
-const { updateSetting } = useSettingStore()
+const { updateSetting } = usePublishSettingStore()
// datas
const formRef = ref()
@@ -136,5 +136,4 @@ const submitForm = async (formEl) => {
diff --git a/src/components/set/publish/singleplatform/base/impl/CommonGithubSetting.vue b/src/components/set/publish/singleplatform/base/impl/CommonGithubSetting.vue
index 8f99b9c..590c45e 100644
--- a/src/components/set/publish/singleplatform/base/impl/CommonGithubSetting.vue
+++ b/src/components/set/publish/singleplatform/base/impl/CommonGithubSetting.vue
@@ -80,9 +80,6 @@ const syncDefaultPath = (cfg: any) => {
-
- {{ formData.advanceBtnText }}
-
{
:placeholder="t('setting.blog.type.github.default.path.tip')"
/>
+
+
+
+
+
+
+
+ {{ formData.advanceBtnText }}
+
@@ -111,17 +119,9 @@ const syncDefaultPath = (cfg: any) => {
-
-
-
-
-
-
+
+
diff --git a/src/components/set/publish/singleplatform/gitlab/GitlabhexoSetting.vue b/src/components/set/publish/singleplatform/gitlab/GitlabhexoSetting.vue
index 6ad8810..1fe3956 100644
--- a/src/components/set/publish/singleplatform/gitlab/GitlabhexoSetting.vue
+++ b/src/components/set/publish/singleplatform/gitlab/GitlabhexoSetting.vue
@@ -26,7 +26,7 @@
-
+
diff --git a/src/components/set/publish/singleplatform/metaweblog/JvueSetting.vue b/src/components/set/publish/singleplatform/metaweblog/JvueSetting.vue
new file mode 100644
index 0000000..c24e051
--- /dev/null
+++ b/src/components/set/publish/singleplatform/metaweblog/JvueSetting.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+ => {
try {
+ const api = await getAPI()
// 使用 ChatGPTAPI 实例进行聊天操作
logger.debug("chat q =>", { q, opts })
const res = await api.sendMessage(q, opts)
@@ -96,7 +102,20 @@ const useChatGPT = () => {
}
}
+ /**
+ * 获取聊天输入
+ *
+ * @param input1 可能为空的输入1，优先级高
+ * @param input2 不为空的输入2，优先级低
+ */
+ const getChatInput = (input1: string, input2: string) => {
+ const md = input1.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH)
+ const html = HtmlUtil.parseHtml(input2, AiConstants.MAX_INPUT_TOKEN_LENGTH, true)
+ return Utils.emptyOrDefault(md, html)
+ }
+
return {
+ getChatInput,
chat,
}
}
diff --git a/src/composables/useLoadingTimer.ts b/src/composables/useLoadingTimer.ts
new file mode 100644
index 0000000..df6756d
--- /dev/null
+++ b/src/composables/useLoadingTimer.ts
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2023, Terwer . All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Terwer designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Terwer in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Terwer, Shenzhen, Guangdong, China, youweics@163.com
+ * or visit www.terwer.space if you need additional information or have any
+ * questions.
+ */
+
+import { onBeforeMount, ref, Ref, watch } from "vue"
+
+/**
+ * 自定义加载计时器
+ *
+ * @param isTimerInit - 一个 ref，表示计时器是否初始启动
+ * @returns loadingTime - 用于跟踪当前加载时间的 ref
+ * @author terwer
+ * @since 1.17.3
+ */
+export const useLoadingTimer = (isTimerInit: Ref) => {
+ const startTime = ref(0)
+ const loadingTime = ref(0)
+
+ // 开启计时器
+ const startTimer = () => {
+ startTime.value = new Date().getTime()
+ }
+
+ // 结束计时器
+ const stopTimer = () => {
+ const currentTime = new Date().getTime()
+ loadingTime.value = currentTime - startTime.value
+ // const totalLoadingTime = currentTime - startTime.value
+ // const loadingTimeInSeconds = (totalLoadingTime / 1000).toFixed(3)
+ // loadingTime.value = Number(loadingTimeInSeconds)
+ }
+
+ // ====================================
+
+ // 加载前开启计时器
+ onBeforeMount(() => {
+ startTimer()
+ })
+
+ // 有变化停止
+ watch(isTimerInit, (newIsInit) => {
+ if (isTimerInit.value) {
+ stopTimer()
+ } else {
+ startTimer()
+ }
+ })
+
+ return { loadingTime }
+}
diff --git a/src/composables/usePicgoBridge.ts b/src/composables/usePicgoBridge.ts
index c84cbd2..afd0132 100644
--- a/src/composables/usePicgoBridge.ts
+++ b/src/composables/usePicgoBridge.ts
@@ -63,14 +63,15 @@ const usePicgoBridge = () => {
md = siyuanPost.markdown
}
- const picgoImageTip = `使用 PicGO 自动上传图片，若图片较多可能会较慢请耐心等待`
- await kernelApi.pushMsg({
- msg: picgoImageTip,
- timeout: 3000,
- })
+
const picgoPostResult = await picgoPostApi.uploadPostImagesToBed(siyuanData.pageId, siyuanData.meta, md)
// 有图片才上传
if (picgoPostResult.hasImages) {
+ // const picgoImageTip = `检测到图片，将使用 PicGO 自动上传图片，若图片较多可能会较慢请耐心等待`
+ // await kernelApi.pushMsg({
+ // msg: picgoImageTip,
+ // timeout: 3000,
+ // })
if (picgoPostResult.flag) {
md = picgoPostResult.mdContent
} else {
diff --git a/src/composables/usePlatformDefine.ts b/src/composables/usePlatformDefine.ts
index d89a9c2..79bf330 100644
--- a/src/composables/usePlatformDefine.ts
+++ b/src/composables/usePlatformDefine.ts
@@ -25,7 +25,7 @@
import { DynamicConfig, PlatformType } from "~/src/platforms/dynamicConfig.ts"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
-import { mainPre, pre } from "~/src/utils/import/pre.ts"
+import { mainPre, pre } from "~/src/platforms/pre.ts"
/**
* 通用平台定义。包含平台类型列表、getPlatformType函数和getPrePlatform函数的对象。
@@ -68,9 +68,29 @@ export const usePlatformDefine = () => {
return prePlatformList.find((platform) => platform.platformKey === key)
}
+ /**
+ * 根据所有预定义平台 key 集合
+ */
+ const getPrePlatformKeys = (): string[] => {
+ return prePlatformList.map((platform) => {
+ return platform.platformKey
+ })
+ }
+
+ /**
+ * 获取所有平台
+ *
+ * @since 1.20.0
+ */
+ const getAllPrePlatformList = (): DynamicConfig[] => {
+ return prePlatformList
+ }
+
return {
+ getPrePlatformKeys,
platformTypeList,
getPlatformType,
+ getAllPrePlatformList,
getPrePlatformList,
getPrePlatform,
}
diff --git a/src/composables/useProxy.ts b/src/composables/useProxy.ts
index d248244..92e54e6 100644
--- a/src/composables/useProxy.ts
+++ b/src/composables/useProxy.ts
@@ -26,7 +26,7 @@
import { useSiyuanApi } from "~/src/composables/useSiyuanApi.ts"
import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
import { CommonFetchClient } from "zhi-fetch-middleware"
-import { isDev } from "~/src/utils/constants.ts"
+import { CORS_PROXT_URL, isDev, LEGENCY_SHARED_PROXT_MIDDLEWARE } from "~/src/utils/constants.ts"
import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { Deserializer, Serializer, XmlrpcUtil } from "simple-xmlrpc"
@@ -35,11 +35,12 @@ import { Deserializer, Serializer, XmlrpcUtil } from "simple-xmlrpc"
* 用于处理代理请求的自定义 hook
*
* @param middlewareUrl - 可选，如果使用 CommonFetchClient 需要传递，否则可留空
+ * @param corsProxyUrl - 可选，可留空
* @author terwer
* @version 1.7.0
* @since 1.7.0
*/
-const useProxy = (middlewareUrl?: string) => {
+const useProxy = (middlewareUrl?: string, corsProxyUrl?: string) => {
const logger = createAppLogger("use-proxy")
const { kernelApi, isUseSiyuanProxy } = useSiyuanApi()
@@ -48,7 +49,8 @@ const useProxy = (middlewareUrl?: string) => {
*/
const appInstance = new PublisherAppInstance()
const apiUrl = ""
- middlewareUrl = middlewareUrl ?? "https://api.terwer.space/api/middleware"
+ middlewareUrl = middlewareUrl ?? LEGENCY_SHARED_PROXT_MIDDLEWARE
+ corsProxyUrl = corsProxyUrl ?? CORS_PROXT_URL
const commonFetchClient = new CommonFetchClient(appInstance, apiUrl, middlewareUrl, isDev)
const serializer = new Serializer(appInstance)
@@ -60,6 +62,8 @@ const useProxy = (middlewareUrl?: string) => {
* @param params - 请求的参数
* @param method - 请求的 HTTP 方法
* @param contentType - 请求的内容类型
+ * @param forceProxy - 是否强制使用代理
+ *
* @returns 返回一个 Promise，解析为响应结果
*/
const proxyFetch = async (
@@ -67,10 +71,11 @@ const useProxy = (middlewareUrl?: string) => {
headers: any[] = [],
params: any = {},
method: "GET" | "POST" | "PUT" | "DELETE" | "PATCH" = "GET",
- contentType: string = "application/json"
+ contentType: string = "application/json",
+ forceProxy: boolean = false
) => {
const siyuanSupported = ["application/json", "text/html", "text/xml", ""]
- if (isUseSiyuanProxy && siyuanSupported.includes(contentType)) {
+ if (!forceProxy && isUseSiyuanProxy && siyuanSupported.includes(contentType)) {
logger.info("Using Siyuan forwardProxy, contentType=>", contentType)
let body: any
if (typeof params === "string" && !StrUtil.isEmptyString(params)) {
@@ -99,7 +104,16 @@ const useProxy = (middlewareUrl?: string) => {
logger.debug("proxyFetch result =>", fetchResult)
if (!(fetchResult.status >= 200 && fetchResult.status < 300)) {
- throw new Error(fetchResult?.body)
+ // 兼容 CSDN 错误提示
+ const bodyJson = JsonUtil.safeParse(fetchResult?.body, {})
+ if (!StrUtil.isEmptyString(bodyJson?.msg)) {
+ throw new Error(bodyJson?.msg)
+ }
+ throw new Error(
+ StrUtil.decodeUnicodeToChinese(
+ StrUtil.isEmptyString(fetchResult?.body) ? `请求异常：${fetchResult.status}` : fetchResult?.body
+ )
+ )
}
if (contentType === "application/json") {
@@ -128,7 +142,7 @@ const useProxy = (middlewareUrl?: string) => {
}
logger.info("commonFetchClient url in proxyFetch =>", url)
logger.info("commonFetchClient fetchOptions in proxyFetch =>", fetchOptions)
- const res = await commonFetchClient.fetchCall(url, fetchOptions)
+ const res = await commonFetchClient.fetchCall(url, fetchOptions, forceProxy)
logger.debug("Result of proxyFetch in commonFetchClient =>", res)
return res
}
@@ -152,7 +166,76 @@ const useProxy = (middlewareUrl?: string) => {
return resJson
}
- return { proxyFetch, proxyXmlrpc }
+ /**
+ * 向 Telegraph 发送表单数据
+ *
+ * @param url 请求地址
+ * @param headers 请求头，默认为{}
+ * @param params 表单数据，默认为undefined，支持 ReadableStream、Blob | BufferSource | FormData | URLSearchParams | string
+ * @param method 请求方法，默认为GET
+ */
+ const corsFetch = async (
+ url: string,
+ headers: any[] = [],
+ params: BodyInit = undefined,
+ method: "GET" | "POST" | "PUT" | "DELETE" = "GET"
+ ) => {
+ // 如果corsProxyUrl结尾有/，则直接使用，否则在url前加上/
+ const apiUrl = `${corsProxyUrl.endsWith("/") ? corsProxyUrl : corsProxyUrl + "/"}${url}`
+ const header = headers.length > 0 ? headers[0] : {}
+
+ // 处理不安全的 header
+ const UNSAFE_HEADERS = ["Origin", "Referer", "Cookie"]
+ const xCorsHeaderString = ObjectUtil.getProperty(header, "x-cors-headers")
+ let xCorsHeaders = JsonUtil.safeParse(xCorsHeaderString, {})
+ for (const [key, value] of Object.entries(header)) {
+ const lowercaseKey = key.toLowerCase()
+ if (UNSAFE_HEADERS.map((unsafeHeaderItem) => unsafeHeaderItem.toLowerCase()).includes(lowercaseKey)) {
+ logger.warn(`corsFetch header ${key} is not allowed`)
+ xCorsHeaders[key] = value
+ delete header[key]
+ }
+ }
+ header["x-cors-headers"] = JSON.stringify(xCorsHeaders)
+
+ const options: RequestInit = {
+ method: method,
+ headers: header,
+ body: params,
+ }
+
+ logger.debug("corsFetch url =>", apiUrl)
+ logger.debug("corsFetch options =>", options)
+
+ const res = await fetch(apiUrl, options)
+
+ // 处理返回 header
+ const corsRespHeaders = {} as any
+ const respHeaderObj = JsonUtil.safeParse(res.headers.get("cors-received-headers"), {})
+ for (const [resp_key, resp_value] of Object.entries(respHeaderObj)) {
+ if (resp_key === "cors-received-headers") {
+ const corsRecv = respHeaderObj["cors-received-headers"]
+ for (const [cors_key, cors_value] of Object.entries(corsRecv)) {
+ corsRespHeaders[cors_key] = cors_value
+ }
+ delete respHeaderObj[resp_key]
+ } else {
+ corsRespHeaders[resp_key] = resp_value
+ }
+ }
+ logger.debug("corsFetch corsRespHeaders =>", corsRespHeaders)
+
+ const resText = await res.text()
+ logger.debug("corsFetch resText =>", resText)
+
+ const resJson = JsonUtil.safeParse(resText, {})
+ resJson["cors-received-headers"] = JSON.stringify(corsRespHeaders)
+ logger.debug("corsFetch resJson =>", resJson)
+
+ return resJson
+ }
+
+ return { proxyFetch, proxyXmlrpc, corsFetch }
}
export { useProxy }
diff --git a/src/composables/usePublish.ts b/src/composables/usePublish.ts
index 30ab95c..6fb7ee1 100644
--- a/src/composables/usePublish.ts
+++ b/src/composables/usePublish.ts
@@ -28,26 +28,27 @@ import { reactive, toRaw } from "vue"
import { SypConfig } from "~/syp.config.ts"
import { AliasTranslator, ObjectUtil, StrUtil, YamlUtil } from "zhi-common"
import {
- BlogAdaptor,
BlogConfig,
Post,
PostStatusEnum,
PostUtil,
YamlConvertAdaptor,
YamlFormatObj,
+ YamlStrategy,
} from "zhi-blog-api"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
-import { useSettingStore } from "~/src/stores/useSettingStore.ts"
+import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts"
import { useSiyuanApi } from "~/src/composables/useSiyuanApi.ts"
-import { pre } from "~/src/utils/import/pre.ts"
+import { pre } from "~/src/platforms/pre.ts"
import { MethodEnum } from "~/src/models/methodEnum.ts"
import { DynamicConfig, getDynYamlKey } from "~/src/platforms/dynamicConfig.ts"
import { IPublishCfg } from "~/src/types/IPublishCfg.ts"
import { usePublishConfig } from "~/src/composables/usePublishConfig.ts"
import { ElMessage } from "element-plus"
import { SiyuanAttr } from "zhi-siyuan-api"
-import _ from "lodash"
+import _ from "lodash-es"
import Adaptors from "~/src/adaptors"
+import { usePlatformMetadataStore } from "~/src/stores/usePlatformMetadataStore.ts"
/**
* 通用发布组件
@@ -61,9 +62,10 @@ const usePublish = () => {
// uses
const { t } = useVueI18n()
- const { updateSetting } = useSettingStore()
+ const { updateSetting } = usePublishSettingStore()
const { kernelApi, blogApi } = useSiyuanApi()
const { getPublishApi } = usePublishConfig()
+ const { updatePlatformMetadata } = usePlatformMetadataStore()
// datas
const singleFormData = reactive({
@@ -158,6 +160,7 @@ const usePublish = () => {
// 写入属性到配置
// 这里更新 slug 的原因是历史文章有可能没有生成过别名
const postMeta = ObjectUtil.getProperty(setting, id, {})
+ // eslint-disable-next-line no-prototype-builtins
if (!postMeta.hasOwnProperty(SiyuanAttr.Custom_slug)) {
logger.info("检测到未生成过别名，准备更新别名")
postMeta[SiyuanAttr.Custom_slug] = finalPost.wp_slug
@@ -172,18 +175,26 @@ const usePublish = () => {
logger.info("文章更新成功")
}
- logger.info("发布完成，准备处理文章属性")
+ logger.info("发布完成，准备处理文章属性、元数据")
// 保存属性用于初始化
if (isSys) {
logger.info("内置平台，忽略保存属性")
} else {
+ // 保存属性
const yamlKey = getDynYamlKey(key)
await kernelApi.setSingleBlockAttr(id, yamlKey, finalPost.yaml)
+
+ // 保存元数据
+ const metadataPost = _.cloneDeep(finalPost) as Post
+ const tags = metadataPost.mt_keywords?.split(",") ?? []
+ const cates = metadataPost?.categories ?? []
+ const templates = []
+ updatePlatformMetadata(key, tags, cates, templates)
}
logger.info("文章属性处理完成")
// 更新预览链接
- postPreviewUrl = await getPostPreviewUrl(api, postid, cfg)
+ postPreviewUrl = await getPostPreviewUrl(api, id, cfg)
singleFormData.publishProcessStatus = true
} catch (e) {
@@ -302,6 +313,11 @@ const usePublish = () => {
setting[id] = updatedPostMeta
await updateSetting(setting)
+ // 清空属性
+ const yamlKey = getDynYamlKey(key)
+ await kernelApi.setSingleBlockAttr(id, yamlKey, "")
+ logger.info(`[${key}] [${id}] 属性已移除`)
+
await kernelApi.pushMsg({
msg: t("main.opt.ok"),
timeout: 2000,
@@ -319,10 +335,16 @@ const usePublish = () => {
}
}
- const getPostPreviewUrl = async (api: BlogAdaptor, postid: string, cfg: BlogConfig) => {
- const previewUrl = await api.getPreviewUrl(postid)
- const isAbsoluteUrl = /^http/.test(previewUrl)
- return isAbsoluteUrl ? previewUrl : `${cfg?.home ?? ""}${previewUrl}`
+ const getPostPreviewUrl = async (api: any, id: string, cfg: BlogConfig) => {
+ // 获取最新id，兼容某些平台自定义行为
+ const { getSetting } = usePublishSettingStore()
+ const setting = await getSetting()
+ const posidKey = cfg.posidKey
+ const postMeta = ObjectUtil.getProperty(setting, id, {})
+ const newPostid = postMeta[posidKey]
+ let previewUrl = await api.getPreviewUrl(newPostid)
+ const isAbsoluteUrl = /^[a-z]+:\/\//.test(previewUrl)
+ return isAbsoluteUrl ? previewUrl : StrUtil.pathJoin(cfg?.home ?? "", previewUrl)
}
/**
@@ -369,7 +391,6 @@ const usePublish = () => {
// 其他属性初始化
let post = _.cloneDeep(slugedPost) as Post
- const title = post.title
if (!isSys) {
// 平台相关自定义属性（摘要、标签、分类）
const yamlKey = getDynYamlKey(key)
@@ -380,39 +401,35 @@ const usePublish = () => {
const yamlAdaptor: YamlConvertAdaptor = await Adaptors.getYamlAdaptor(key, cfg)
if (null !== yamlAdaptor) {
// 有适配器
- let yamlFormatObj: YamlFormatObj
if (StrUtil.isEmptyString(checkYaml)) {
- yamlFormatObj = yamlAdaptor.convertToYaml(post, cfg)
+ const yamlFormatObj = yamlAdaptor.convertToYaml(post, undefined , cfg)
logger.info("YAML未保存，使用适配器生成默认的yamlFormatObj", { yamlFormatObj: toRaw(yamlFormatObj) })
- post.yaml = yaml
post = yamlAdaptor.convertToAttr(post, yamlFormatObj, cfg)
+ post.yamlType = YamlStrategy.Yaml_custom_auto
logger.debug("使用适配器初始化转换yamlObj到post完成 =>", { post: toRaw(post) })
} else {
- // yamlFormatObj = new YamlFormatObj()
- // const yamlObj = await YamlUtil.yaml2ObjAsync(yaml)
- // yamlFormatObj.yamlObj = yamlFormatObj
- // getPost以已经处理过了
- logger.info("有适配器且YAML已保存，无需处理")
+ const yamlFormatObj = new YamlFormatObj()
+ const yamlObj = await YamlUtil.yaml2ObjAsync(yaml)
+ yamlFormatObj.yamlObj = yamlObj
+ post = yamlAdaptor.convertToAttr(post, yamlFormatObj, cfg)
+ post.yamlType = YamlStrategy.Yaml_custom_hand
+ logger.info("有适配器且YAML已保存，始终保持最新的 YAML", { post: toRaw(post) })
}
} else {
+ post.yamlType = YamlStrategy.YAML_default
// 无适配器
if (!StrUtil.isEmptyString(checkYaml)) {
const yamlObj = await YamlUtil.yaml2ObjAsync(yaml)
post.yaml = yaml
PostUtil.fromYaml(post, yamlObj)
- logger.info("读取已经存在的YAML，无适配器，使用fromYaml生成默认的yamlObj")
+ logger.info("读取已经存在的YAML，无适配器，使用fromYaml生成默认的yamlObj", { post: toRaw(post) })
} else {
// 未保存过，默认不处理
- logger.info("未保存过YAML，未找到适配器，默认不处理")
+ logger.info("未保存过YAML，未找到适配器，默认不处理", { post: toRaw(post) })
}
}
}
- // 文件名
- if (cfg.useMdFilename && post?.mdFilename.includes(".md")) {
- post.title = post.mdFilename
- }
-
return post
},
@@ -462,15 +479,16 @@ const usePublish = () => {
mergedPost = _.cloneDeep(platformPost) as Post
logger.debug("get init platformPost ok =>", mergedPost)
mergedPost.title = platformPost.title
+ // 链接需要使用思源笔记的
+ mergedPost.originalId = siyuanPost.originalId
+ mergedPost.link = siyuanPost.link
// 正文需要使用思源笔记的
mergedPost.markdown = siyuanPost.markdown
mergedPost.html = siyuanPost.html
mergedPost.description = siyuanPost.description
- // 标签分类需要合并
- mergedPost = initPublishMethods.doMergeBatchPost(siyuanPost, mergedPost)
// 更新预览链接
- postPreviewUrl = await getPostPreviewUrl(api, postid, cfg)
+ postPreviewUrl = await getPostPreviewUrl(api, id, cfg)
}
logger.debug("doInitPage finished mergedPost =>", toRaw(mergedPost))
@@ -486,7 +504,10 @@ const usePublish = () => {
const mergedPost = _.cloneDeep(newPost) as Post
mergedPost.title = post.title
+ mergedPost.originalId = post.originalId
+ mergedPost.link = post.link
mergedPost.shortDesc = post.shortDesc
+ mergedPost.mt_excerpt = post.mt_excerpt
mergedPost.mt_keywords = post.mt_keywords
mergedPost.categories = post.categories
@@ -497,6 +518,10 @@ const usePublish = () => {
// 复制原始 newPost 对象以避免直接修改它
const mergedPost = _.cloneDeep(newPost) as Post
+ // 这两个属性需要保持
+ mergedPost.originalId = post.originalId
+ mergedPost.link = post.link
+
// 摘要
if (StrUtil.isEmptyString(mergedPost.shortDesc)) {
mergedPost.shortDesc = mergedPost.mt_excerpt
@@ -508,13 +533,18 @@ const usePublish = () => {
const postKeywords = post?.mt_keywords?.split(",") ?? []
const newPostKeywords = newPost?.mt_keywords?.split(",") ?? []
// 合并并去重关键词
- const mergedKeywords = [...new Set([...postKeywords, ...newPostKeywords])].filter((tag) => tag.trim() !== "")
+ const mergedKeywords = [
+ ...new Set([...postKeywords.map((tag) => tag.trim()), ...newPostKeywords.map((tag) => tag.trim())]),
+ ].filter((tag) => tag.trim() !== "")
mergedPost.mt_keywords = mergedKeywords.join(",")
// 合并并去重分类
- const mergedCategories = [...new Set([...(post?.categories ?? []), ...(newPost?.categories ?? [])])].filter(
- (cate) => cate.trim() !== ""
- )
+ const mergedCategories = [
+ ...new Set([
+ ...(post?.categories ?? []).map((cate) => cate.trim()),
+ ...(newPost?.categories ?? []).map((cate) => cate.trim()),
+ ]),
+ ].filter((cate) => cate.trim() !== "")
mergedPost.categories = mergedCategories
return mergedPost
@@ -527,6 +557,7 @@ const usePublish = () => {
doSingleDelete,
doForceSingleDelete,
initPublishMethods,
+ getPostPreviewUrl,
}
}
diff --git a/src/composables/usePublishConfig.spec.ts b/src/composables/usePublishConfig.spec.ts
index 8c8c15d..009f7bc 100644
--- a/src/composables/usePublishConfig.spec.ts
+++ b/src/composables/usePublishConfig.spec.ts
@@ -27,7 +27,7 @@ import { beforeEach, describe, it } from "vitest"
import { usePublishConfig } from "~/src/composables/usePublishConfig.ts"
import { config, mount } from "@vue/test-utils"
import App from "~/src/App.vue"
-import { createVueApp } from "~/src/utils/vueUtils.ts"
+import { createVueApp } from "~/src/bootstrap.ts"
describe("test usePublishConfig", async () => {
const instance = await createVueApp()
diff --git a/src/composables/usePublishConfig.ts b/src/composables/usePublishConfig.ts
index 0e8a732..ff5564e 100644
--- a/src/composables/usePublishConfig.ts
+++ b/src/composables/usePublishConfig.ts
@@ -28,7 +28,7 @@ import { JsonUtil } from "zhi-common"
import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
import Adaptors from "~/src/adaptors"
import { Utils } from "~/src/utils/utils.ts"
-import { useSettingStore } from "~/src/stores/useSettingStore.ts"
+import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts"
import { DynamicJsonCfg, getDynCfgByKey } from "~/src/platforms/dynamicConfig.ts"
import { DYNAMIC_CONFIG_KEY } from "~/src/utils/constants.ts"
import { BlogAdaptor, BlogConfig, WebAdaptor } from "zhi-blog-api"
@@ -40,7 +40,7 @@ import { BlogAdaptor, BlogConfig, WebAdaptor } from "zhi-blog-api"
* @since 1.3.2
*/
const usePublishConfig = () => {
- const { getSetting } = useSettingStore()
+ const { getSetting } = usePublishSettingStore()
const appInstance = new PublisherAppInstance()
/**
diff --git a/src/composables/useSiyuanApi.ts b/src/composables/useSiyuanApi.ts
index 92e652f..42f8f3f 100644
--- a/src/composables/useSiyuanApi.ts
+++ b/src/composables/useSiyuanApi.ts
@@ -26,29 +26,30 @@
import { SiYuanApiAdaptor, SiyuanConfig, SiyuanKernelApi } from "zhi-siyuan-api"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { useSiyuanDevice } from "~/src/composables/useSiyuanDevice.ts"
-import { useSiyuanSetting } from "~/src/stores/useSiyuanSetting"
+import { useSiyuanSettingStore } from "~/src/stores/useSiyuanSettingStore.ts"
import { Utils } from "~/src/utils/utils.ts"
-import { usePublishPreferenceSetting } from "~/src/stores/usePublishPreferenceSetting.ts"
+import { usePreferenceSettingStore } from "~/src/stores/usePreferenceSettingStore.ts"
/**
* 通用 Siyuan API 封装
*/
export const useSiyuanApi = () => {
const logger = createAppLogger("use-siyuan-api")
- const { getReadOnlySiyuanSetting } = useSiyuanSetting()
- const { getReadOnlyPublishPreferenceSetting } = usePublishPreferenceSetting()
+ const { getReadOnlySiyuanSetting } = useSiyuanSettingStore()
+ const { getReadOnlyPublishPreferenceSetting } = usePreferenceSettingStore()
+ // 环境变量
const envSiyuanApiUrl = Utils.emptyOrDefault(process.env.VITE_SIYUAN_API_URL, "")
const envSiyuanAuthToken = Utils.emptyOrDefault(process.env.VITE_SIYUAN_AUTH_TOKEN, "")
const envSiyuanCookie = Utils.emptyOrDefault(process.env.VITE_SIYUAN_COOKIE, "")
-
+ // 获取配置
const pref = getReadOnlyPublishPreferenceSetting()
const siyuanSetting = getReadOnlySiyuanSetting()
-
- const siyuanApiUrl = siyuanSetting.value.apiUrl ?? envSiyuanApiUrl
- const siyuanAuthToken = siyuanSetting.value.password ?? envSiyuanAuthToken
+ // 设置
+ const siyuanApiUrl = Utils.emptyOrDefault(siyuanSetting.value.apiUrl, envSiyuanApiUrl)
+ const siyuanAuthToken = Utils.emptyOrDefault(siyuanSetting.value.password, envSiyuanAuthToken)
const siyuanConfig = new SiyuanConfig(siyuanApiUrl, siyuanAuthToken)
- siyuanConfig.cookie = siyuanSetting.value.cookie ?? envSiyuanCookie
+ siyuanConfig.cookie = Utils.emptyOrDefault(siyuanSetting.value.cookie, envSiyuanCookie)
siyuanConfig.preferenceConfig.fixTitle = pref.value.fixTitle
siyuanConfig.preferenceConfig.keepTitle = pref.value.keepTitle
siyuanConfig.preferenceConfig.removeFirstH1 = pref.value.removeFirstH1
diff --git a/src/composables/useSiyuanDevice.ts b/src/composables/useSiyuanDevice.ts
index 30c5d02..a3442e6 100644
--- a/src/composables/useSiyuanDevice.ts
+++ b/src/composables/useSiyuanDevice.ts
@@ -35,24 +35,32 @@ export const useSiyuanDevice = () => {
const isInSiyuanMainWin = () => {
const deviceType = DeviceDetection.getDevice()
const isSiyuanMainWin = deviceType === DeviceTypeEnum.DeviceType_Siyuan_MainWin
- logger.debug("deviceType=>", deviceType)
- logger.debug("isSiyuanMainWin=>", String(isSiyuanMainWin))
+ // logger.debug("deviceType=>", deviceType)
+ // logger.debug("isSiyuanMainWin=>", String(isSiyuanMainWin))
return isSiyuanMainWin
}
const isInSiyuanWidget = () => {
const deviceType = DeviceDetection.getDevice()
const isSiyuanWidget = deviceType === DeviceTypeEnum.DeviceType_Siyuan_Widget
- logger.debug("deviceType=>", deviceType)
- logger.debug("isSiyuanWidget=>", String(isSiyuanWidget))
+ // logger.debug("deviceType=>", deviceType)
+ // logger.debug("isSiyuanWidget=>", String(isSiyuanWidget))
+ return isSiyuanWidget
+ }
+
+ const isInSiyuanBrowser = () => {
+ const deviceType = DeviceDetection.getDevice()
+ const isSiyuanWidget = deviceType === DeviceTypeEnum.DeviceType_Siyuan_Browser
+ // logger.debug("deviceType=>", deviceType)
+ // logger.debug("isInSiyuanBrowser=>", String(isSiyuanWidget))
return isSiyuanWidget
}
const isInChromeExtension = () => {
const deviceType = DeviceDetection.getDevice()
const isChromeExtension = deviceType === DeviceTypeEnum.DeviceType_Chrome_Extension
- logger.debug("deviceType=>", deviceType)
- logger.debug("isChromeExtension=>", String(isChromeExtension))
+ // logger.debug("deviceType=>", deviceType)
+ // logger.debug("isChromeExtension=>", String(isChromeExtension))
return isChromeExtension
}
@@ -61,12 +69,30 @@ export const useSiyuanDevice = () => {
// 三种情况，主窗口、挂件、新窗口
const isSiyuanOrSiyuanNewWin =
deviceType === DeviceTypeEnum.DeviceType_Siyuan_MainWin ||
- deviceType === DeviceTypeEnum.DeviceType_Siyuan_NewWin ||
+ deviceType === DeviceTypeEnum.DeviceType_Siyuan_RendererWin ||
deviceType === DeviceTypeEnum.DeviceType_Siyuan_Widget
- logger.debug("deviceType=>", deviceType)
- logger.debug("isSiyuanOrSiyuanNewWin=>", String(isSiyuanOrSiyuanNewWin))
+ // logger.debug("deviceType=>", deviceType)
+ // logger.debug("isSiyuanOrSiyuanNewWin=>", String(isSiyuanOrSiyuanNewWin))
+ return isSiyuanOrSiyuanNewWin
+ }
+
+ const isInSiyuanPlugin = () => {
+ const deviceType = DeviceDetection.getDevice()
+ // 三种情况，主窗口、挂件、新窗口
+ const isSiyuanOrSiyuanNewWin =
+ deviceType === DeviceTypeEnum.DeviceType_Siyuan_MainWin ||
+ deviceType === DeviceTypeEnum.DeviceType_Siyuan_RendererWin
+ // logger.debug("deviceType=>", deviceType)
+ // logger.debug("isSiyuanOrSiyuanNewWin=>", String(isSiyuanOrSiyuanNewWin))
return isSiyuanOrSiyuanNewWin
}
- return { isInSiyuanMainWin, isInSiyuanWidget, isInChromeExtension, isInSiyuanOrSiyuanNewWin }
+ return {
+ isInSiyuanMainWin,
+ isInSiyuanWidget,
+ isInSiyuanBrowser,
+ isInChromeExtension,
+ isInSiyuanOrSiyuanNewWin,
+ isInSiyuanPlugin,
+ }
}
diff --git a/src/composables/useVueRouter.ts b/src/composables/useVueRouter.ts
index 86f3be3..126d640 100644
--- a/src/composables/useVueRouter.ts
+++ b/src/composables/useVueRouter.ts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Terwer . All rights reserved.
+ * Copyright (c) 2023-2024, Terwer . All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,143 +23,12 @@
* questions.
*/
-import { createRouter, createWebHashHistory, Router, RouteRecordRaw } from "vue-router"
-import BatchPublish from "~/src/pages/BatchPublish.vue"
-import SinglePublish from "~/src/pages/SinglePublish.vue"
-import SinglePublishDoPublish from "~/src/components/publish/SinglePublishDoPublish.vue"
-import Setting from "~/src/pages/Setting.vue"
-import GeneralSetting from "~/src/components/set/GeneralSetting.vue"
-import PublishSetting from "~/src/components/set/PublishSetting.vue"
-import SettingEntry from "~/src/components/set/publish/singleplatform/SingleSettingIndex.vue"
-import PlatformAddForm from "~/src/components/set/publish/PlatformAddForm.vue"
-import PlatformUpdateForm from "~/src/components/set/publish/PlatformUpdateForm.vue"
-import PlatformQuickAdd from "~/src/components/set/publish/PlatformQuickAdd.vue"
-import QuickPublish from "~/src/workers/QuickPublish.vue"
-import SiyuanSetting from "~/src/components/set/SiyuanSetting.vue"
-import OtherTest from "~/src/components/test/OtherTest.vue"
-import PicgoTest from "~/src/components/test/PicgoTest.vue"
-import CnblogsTest from "~/src/components/test/CnblogsTest.vue"
-import SiyuanTest from "~/src/components/test/SiyuanTest.vue"
-import WordpressTest from "~/src/components/test/WordpressTest.vue"
-import TypechoTest from "~/src/components/test/TypechoTest.vue"
-import YuqueTest from "~/src/components/test/YuqueTest.vue"
-import ZhihuTest from "~/src/components/test/ZhihuTest.vue"
-import Test from "~/src/pages/Test.vue"
-import About from "~/src/pages/About.vue"
-import ChatgptTest from "~/src/components/test/ChatgptTest.vue"
-import AiChat from "~/src/pages/AiChat.vue"
-import CsdnTest from "~/src/components/test/CsdnTest.vue"
-
-const routes: RouteRecordRaw[] = [
- // 极速发布
- { path: "/workers/quickPublish/:key/:id", component: QuickPublish },
- // 常规发布
- // ?id=
- { path: "/publish/singlePublish", component: SinglePublish },
- { path: "/publish/singlePublish/doPublish/:key/:id", component: SinglePublishDoPublish },
- // 批量分发
- // /?id=
- { path: "/", component: BatchPublish },
- { path: "/publish/batchPublish", component: BatchPublish },
-
- // AI
- {
- path: "/ai/chat",
- component: AiChat,
- },
-
- // 测试
- {
- path: "/test",
- component: Test,
- },
- {
- path: "/test/siyuan",
- component: SiyuanTest,
- },
- {
- path: "/test/cnblogs",
- component: CnblogsTest,
- },
- {
- path: "/test/wordpress",
- component: WordpressTest,
- },
- {
- path: "/test/typecho",
- component: TypechoTest,
- },
- {
- path: "/test/yuque",
- component: YuqueTest,
- },
- {
- path: "/test/zhihu",
- component: ZhihuTest,
- },
- {
- path: "/test/csdn",
- component: CsdnTest,
- },
- {
- path: "/test/picgo",
- component: PicgoTest,
- },
- {
- path: "/test/other",
- component: OtherTest,
- },
- {
- path: "/test/chat",
- component: ChatgptTest,
- },
-
- // 设置
- {
- path: "/setting",
- component: Setting,
- },
- {
- path: "/setting/publish",
- component: PublishSetting,
- },
- {
- path: "/setting/platform/quickadd/:type",
- component: PlatformQuickAdd,
- },
- {
- path: "/setting/platform/add/:type",
- component: PlatformAddForm,
- },
- {
- path: "/setting/platform/update/:key",
- component: PlatformUpdateForm,
- },
- {
- name: "setting-platform-single",
- path: "/setting/platform/single/:key",
- component: SettingEntry,
- },
- // /?id=
- {
- path: "/setting/general",
- component: GeneralSetting,
- },
- {
- path: "/setting/siyuan",
- component: SiyuanSetting,
- },
-
- // 关于
- {
- path: "/about",
- component: About,
- },
-]
+import { createRouter, createWebHashHistory, Router } from "vue-router"
+import { routeConfig } from "~/src/routes/routeConfig.ts"
export const useVueRouter = (): Router => {
return createRouter({
history: createWebHashHistory(),
- routes,
+ routes: routeConfig,
})
}
diff --git a/src/extensions/manifest.json b/src/extensions/manifest.json
index 7b1c0db..8e40bf4 100644
--- a/src/extensions/manifest.json
+++ b/src/extensions/manifest.json
@@ -1,6 +1,6 @@
{
"name": "思源笔记发布辅助工具",
- "version": "0.11.0",
+ "version": "1.20.0",
"manifest_version": 3,
"author": "terwer",
"icons": {
@@ -36,6 +36,6 @@
"default_popup": "index.html"
},
"content_security_policy": {
- "extension_pages": "script-src 'self'; object-src 'self'"
+ "extension_pages": "script-src 'self' 'wasm-unsafe-eval';font-src 'self' https://static-rs-terwer.oss-cn-beijing.aliyuncs.com;"
}
}
\ No newline at end of file
diff --git a/src/extensions/mv2/manifest-v2-for-firefox.json b/src/extensions/mv2/manifest-v2-for-firefox.json
index 8ddcb49..046d2ca 100644
--- a/src/extensions/mv2/manifest-v2-for-firefox.json
+++ b/src/extensions/mv2/manifest-v2-for-firefox.json
@@ -1,6 +1,6 @@
{
"name": "开发版 - 思源笔记发布辅助工具",
- "version": "0.11.0",
+ "version": "1.20.0",
"manifest_version": 2,
"author": "terwer",
"icons": {
diff --git a/src/layouts/default/DefaultFooter.vue b/src/layouts/default/DefaultFooter.vue
index 4d57a7d..4d89f35 100644
--- a/src/layouts/default/DefaultFooter.vue
+++ b/src/layouts/default/DefaultFooter.vue
@@ -34,6 +34,11 @@
{{ t("syp.about") }}
+ .
+
+ {{ t("service.tab.manage") }}
+
+
.
{{
isDark ? t("theme.mode.light") : t("theme.mode.dark")
@@ -89,8 +94,13 @@ const goGithub = () => {
window.open("https://github.com/terwer/siyuan-plugin-publisher")
}
+const handleGoHome = async () => {
+ await router.push({
+ path: "/",
+ })
+}
const goAbout = async () => {
- // window.open("https://blog.terwer.space/about")
+ // window.open("https://blog.terwergreen.com/guestbook.html")
await router.push({
path: "/about",
query: { showBack: "true" },
diff --git a/src/locales/en_US.ts b/src/locales/en_US.ts
index 5ee5523..563ebd3 100644
--- a/src/locales/en_US.ts
+++ b/src/locales/en_US.ts
@@ -24,11 +24,12 @@
*/
export default {
- "lang.choose": "Choose lang",
+ "lang.choose": "Language",
"lang.choose.placeholder": "Please select language",
"theme.mode.choose": "Mode",
"theme.mode.dark": "Dark mode",
"theme.mode.light": "Light mode",
+ "service.tab.manage": "Post manage",
"service.tab.publish.service": "Publish service",
"service.tab.publish.setting": "Publish setting",
"service.tab.platform.setting": "Platform setting",
@@ -77,7 +78,10 @@ export default {
"main.update.time.placeholder": "Please select time",
"main.tag": "Post tag",
"main.tag.new": "New tag",
+ "main.tag.close": "Close tag",
+ "main.tag.select": "Select tag",
"main.auto.fetch.tag": "Auto fetch tag",
+ "main.tag.empty": "No tags",
"main.tag.auto.switch": "Tag switch",
"main.tag.auto.switch.no.tip": "Auto tag is closed",
"main.cat": "Category",
@@ -147,6 +151,9 @@ export default {
"setting.blog.type.github.author.tip": "Author, eg:terwer",
"setting.blog.type.github.email": "Email",
"setting.blog.type.github.email.tip": "Email",
+ "setting.blog.type.github.site": "Author's Page",
+ "setting.blog.type.github.site.tip":
+ "Author's page, defaults to: [GitHub URL]/[Username] if left empty. Please do not change the key, translate the value to English.",
"setting.blog.url": "Blog addr",
"setting.blog.github.url.tip": "Github homepage address",
"setting.blog.github.apiurl.tip": "Github's REST API address, typically: https://api.github.com",
@@ -158,7 +165,7 @@ export default {
"MD file preview rules (place occupied: [user] [repo] [Branch] [docpath]), for example:/[user]/[repo]/blob/[branch]/[docpath]",
"setting.blog.mdFilenameRule": "File rule",
"setting.blog.mdFilenameRule.tip":
- "Markdown File Name Rules (Plasma: [yyyy] [MM] [dd] [slug] [filename]), for example: [filename].md or [yyyy]-[MM]-[dd]-[slug].md",
+ "Markdown File Name Rules (Plasma: [yyyy] [MM] [dd] [slug] [filename]), for example: [filename].md or [slug].md or [yyyy]-[MM]-[dd]-[slug].md",
"setting.blog.username": "Username",
"setting.blog.password": "Password",
"setting.blog.apiurl": "API Url",
@@ -218,6 +225,9 @@ export default {
"post.bind.yuque.postid": "Yuque ID",
"post.bind.kms.postid": "KMS ID",
"post.bind.conf.save": "Save",
+ "post.bind.conf.v081": "Examine the v0.8.1 metadata and import it",
+ "post.bind.auto.error": "No ID detected, kindly input the document root ID manually, before proceeding with the repair.",
+ "post.bind.auto.empty": "This document has never been published, hence no repair is necessary",
"post.bind.conf.cancel": "Cancel",
"form.validate.name.required": "Please input name",
"form.validate.name.length": "Length should be 0 to 1",
@@ -268,6 +278,13 @@ export default {
"blog.newwin.open": "Open in a new window",
"blog.change.siyuan.api": "Modify Siyuan API address",
"setting.blog.siyuan.current.apiurl": "Current apiUrl=>",
+ "setting.blog.middlewareUrl.tip":
+ "In certain scenarios, a necessity might arise (as seen in self-hosting environments, Nginx server setups, Vite development environments, etc.), while other situations could warrant overlooking this requirement.",
+ "setting.blog.middlewareUrl.my.tip":
+ "In most cases, it is unnecessary, yet in specific contexts within 'browser environments,' 'docker environments,' 'Nginx server' setups, and the like, it might become essential. If a proxy deployment is absent, one can utilize my shared address: https://api.terwer.space/api/middleware. For performance considerations, I recommend self-deployment; kindly employ https://github.com/terwer/node-metaweblog-api-adaptor for deployment.",
+ "setting.blog.middlewareUrl.my.fee.tip":
+ "🤝Due to substantial costs associated with shared proxies or potential unforeseeable circumstances that may lead to its discontinuation, for the sake of service continuity, deploying one's instance is advised. Alternatively, consider inviting the author for a coffee to support ongoing sharing endeavors🌹.",
+ "setting.blog.middlewareUrl.my.coffee": "Sponsor a coffee☕️",
"setting.conf.export": "Export config",
"setting.conf.import": "Import config",
"setting.conf.transport": "Transport",
@@ -413,7 +430,7 @@ export default {
"setting.jvue.username.tip": "Jvue platform login name",
"setting.jvue.password.tip": "Jvue platform password",
"setting.jvue.apiUrl.tip":
- "The XMLRPC remote release address of the JVUE platform is usually fixed: https: // /xmlrpc",
+ "The XMLRPC remote release address of the Jvue platform is usually fixed: https: // /xmlrpc",
"setting.jvue.previewUrl.tip": "The preview rules of the Jvue platform are usually:/post/[postid] .html",
"setting.conf.home.tip":
@@ -449,6 +466,19 @@ export default {
"setting.juejin.apiUrl.tip": "Usually fixed, do not modify",
"setting.juejin.previewUrl.tip": "Juejin platform article preview rules",
+ "setting.halo.home.tip":
+ "Halo homepage address, should include the domain and port, for example: http://localhost:8090",
+ "setting.halo.username.tip": "Halo blog login name",
+ "setting.halo.password.tip": "Halo blog login password",
+ "setting.halo.apiUrl.tip": "Halo blog API address, typically the same as the Halo homepage",
+ "setting.halo.previewUrl.tip":
+ "Halo blog article preview rule, default /archives/{slug}, with placeholders {slug} {name} {year} {month} {day}, can be set in [halo-home-url]/console/settings?tab=routeRules",
+
+ "setting.flowus.home.tip": "Flowus homepage address, usually fixed",
+ "setting.flowus.password.tip": "Flowus cookie, do not modify",
+ "setting.flowus.apiUrl.tip": "Usually fixed, do not modify",
+ "setting.flowus.previewUrl.tip": "Flowus platform article preview rules",
+
"setting.picgo.refer.to": "For details, please refer to:",
"setting.picgo.refer.to.online.doc": "Picgo configuration online documentation",
"setting.picgo.picbed": "Picbed setting",
@@ -533,6 +563,8 @@ export default {
"setting.platform.gitlab.desc":
"Gitlab is basically similar to Github, except that Gitlab supports its own on-premises or cloud server deployment",
"setting.picgo.manage": "Picture manage",
+ "setting.platform.import": "Platform import",
+ "setting.platform.store": "Plugin store",
"setting.platform.add": "Add platform",
"setting.platform.add.this": "Add this platform",
"setting.platform.universal": "Universal platform",
@@ -576,7 +608,7 @@ export default {
"post.bind.auto.tips":
"The ID here is automatically saved by the publishing tool, if you are not clear about the principle, please do not modify it",
"siyuan.config.setting": "Source settings",
- "setting.blog.siyuan.apiurl": "Siyuan API address",
+ "setting.blog.siyuan.apiurl": "Siyuan API",
"setting.blog.siyuan.apiurl.tip":
"The API address of Siyuan Note, including ports, The default address of Siyuan API is: http://127.0.0.1;6806",
"setting.blog.siyuan.password": "Siyuan Token",
@@ -603,17 +635,47 @@ export default {
"Due to inconsistent classification systems across platforms, classifications need to be calibrated manually and are not automatically saved",
"category.ai.enabled": "AI is available, please go to the detailed mode to operate",
"sys.config.ai": "AI configuration",
- "config.ai.use.siyuan": "Inside Siyuan notes, you can directly use Siyuan notes to configure, no configuration is required",
+ "config.ai.use.siyuan":
+ "Inside Siyuan notes, you can directly use Siyuan notes to configure, no configuration is required",
"setting.blog.yamlLinkEnabled": "YAML permalink",
"distri.type.overide.warn": "Note: Please use caution when overwriting the selected platform with the current data.",
- "distri.type.merge.warn": "Note: In merge mode, the title and abstract changes are not valid, and the labels and categories are merged with the selected platform data.",
+ "distri.type.merge.warn":
+ "Note: In merge mode, the title and abstract changes are not valid, and the labels and categories are merged with the selected platform data.",
"preference.setting.keepTitle": "Do not update the original title",
"setting.blog.gitlab.url.tip": "GitLab homepage, e.g., http://localhost:8002",
"setting.blog.type.gitlab.user.tip": "Username for GitLab",
- "setting.blog.type.gitlab.token.tip": "Token for GitLab, please refer to the link below for setup and ensure API permissions are granted",
+ "setting.blog.type.gitlab.token.tip":
+ "Token for GitLab, please refer to the link below for setup and ensure API permissions are granted",
"setting.blog.gitlab.apiurl.tip": "GitLab API address, usually the same as the homepage",
"setting.blog.gitlab.previewUrl.tip": "Article preview address, usually the default",
- "main.force.cancel": "Force delete"
+ "main.force.cancel": "Force delete",
+ "loading.cost": "Loading cost",
+
+ "preference.setting.showDocQuickMenu": "Show doc menu",
+ "preference.setting.showQuickMenu": "Show quick publish",
+ "preference.setting.showSingleMenu": "Show normal publish",
+ "preference.setting.showBatchMenu": "Show batch publish",
+ "preference.setting.showAIMenu": "Show AI menu",
+ "preference.setting.showExtendMenu": "Show extend menu",
+ "preference.setting.showArticleManageMenu": "Show artile manage menu",
+
+ "message.publish.notShared":
+ "The article has not been shared and therefore cannot be viewed externally. Kindly share the article or preview it within the PC client through the plugin menu.",
+
+ "page.loading": "Page is loading...",
+
+ "setting.blog.middlewareUrl.new": "Fresh Proxy (Recommended)",
+ "setting.blog.corsAnywhereUrl.tip":
+ "CORS Global Proxy, once configured, helps alleviate browser cross-origin issues.",
+ "setting.blog.middlewareUrl.my.new.tip":
+ "Enhanced CORS proxy, enabling comprehensive cross-origin requests. It is advisable to deploy independently. For deployment guidance, kindly refer to https://github.com/Zibri/cloudflare-cors-anywhere.",
+ "reminder.blog.middlewareUrl.my.warning":
+ "A special note: Request limits are set at '100,000 times/day' and '1,000 times/10 minutes'. For the benefit of all, kindly refrain from malicious requests; otherwise, we reserve the right to terminate this proxy service.",
+
+ "platform.new.platform":
+ "It has been observed that there are still [count] internal platforms [platform] awaiting importation. You may utilize the platform importation tool for a bulk import, or alternatively, manually add them from the plugin store.",
+
+ "import.v081.warn": "Given that v0.8.1 is considered a significantly antiquated iteration, this feature may no longer be pertinent. Should you find yourself in need of this functionality, please direct your feedback to youweics@qq.com, and we shall deliberate on its implementation based on demand."
}
diff --git a/src/locales/zh_CN.ts b/src/locales/zh_CN.ts
index 100b34e..9782c13 100644
--- a/src/locales/zh_CN.ts
+++ b/src/locales/zh_CN.ts
@@ -29,6 +29,7 @@ export default {
"theme.mode.choose": "切换模式",
"theme.mode.dark": "暗黑模式",
"theme.mode.light": "浅色模式",
+ "service.tab.manage": "文章管理",
"service.tab.publish.service": "发布服务",
"service.tab.publish.setting": "发布配置",
"service.tab.platform.setting": "平台配置",
@@ -45,7 +46,7 @@ export default {
"main.publish.github": "发布页面",
"main.publish.github.tip": "自动将文章的markdown文本发布到Vuepress对应的Github仓库（需要先进行相关配置）",
"main.publish.github.no.tip": "您未开启Github pages发布，请切换源码模式复制YAML以及Markdown文本",
- "main.publish.github.choose.path": "选择目录",
+ "main.publish.github.choose.path": "发布目录",
"main.publish.github.published.path": "发布路径",
"main.publish.github.choose.path.use.default": "默认目录",
"main.publish.github.choose.path.use.default.tip":
@@ -75,9 +76,12 @@ export default {
"main.update.time.placeholder": "请选择更新时间",
"main.tag": "文章标签",
"main.tag.new": "新标签",
+ "main.tag.select": "请选择标签",
"main.auto.fetch.tag": "自动提取标签",
"main.tag.auto.switch": "自动标签",
"main.tag.auto.switch.no.tip": "自动标签已关闭，将不会自动生成标签",
+ "main.tag.empty": "暂无标签",
+ "main.tag.close": "收起选项",
"main.cat": "文章分类",
"main.cat.empty": "暂无分类",
"main.cat.select": "请选择分类",
@@ -142,13 +146,15 @@ export default {
"setting.blog.type.github.default.branch.tip": "默认分支（旧版仓库为master，新版仓库默认为main），例如：main",
"setting.blog.type.github.default.path": "存储目录",
"setting.blog.type.github.default.path.tip":
- "存储目录（相对于仓库根目录的相对路径，默认所有文章都发布在这里），例如：docs/_posts",
+ "存储目录例如：docs，部分平台可使用[auto]作为特殊占位符，代表自动映射层级目录，例如：docs/[auto]",
"setting.blog.type.github.msg": "提交信息",
"setting.blog.type.github.msg.tip": "提交信息，例如：auto published by siyuan-publish-publisher",
"setting.blog.type.github.author": "作者",
"setting.blog.type.github.author.tip": "作者，例如：terwer",
"setting.blog.type.github.email": "邮箱",
"setting.blog.type.github.email.tip": "邮箱",
+ "setting.blog.type.github.site": "作者主页",
+ "setting.blog.type.github.site.tip": "作者主页，如果为空默认为：[GitHub地址]/[用户名]",
"setting.blog.url": "博客网址",
"setting.blog.github.url.tip": "Github首页地址",
"setting.blog.username": "账号",
@@ -163,7 +169,7 @@ export default {
"如果不明白原理，请勿修改此选项。MD文件预览规则（占位符：[user] [repo] [branch] [docpath]），通常是：/[user]/[repo]/blob/[branch]/[docpath]",
"setting.blog.mdFilenameRule": "文件规则",
"setting.blog.mdFilenameRule.tip":
- "Markdown文件名规则（占位符：[yyyy] [MM] [dd] [slug] [filename] ），例如：[filename].md 或者 [yyyy]-[mm]-[dd]-[slug].md",
+ "Markdown文件名规则(占位符：[yyyy] [MM] [dd] [slug] [filename])，例如：[filename].md、[slug].md、[yyyy]-[mm]-[dd]-[slug].md",
"setting.blog.pageType": "发布格式",
"setting.blog.validate": "验证",
"setting.blog.save": "保存",
@@ -219,6 +225,9 @@ export default {
"post.bind.yuque.postid": "语雀的ID",
"post.bind.kms.postid": "KMS的ID",
"post.bind.conf.save": "保存",
+ "post.bind.conf.v081": "检测 v0.8.1 元数据并导入",
+ "post.bind.auto.error": "未检测到ID，请手动输入文档根 ID ，然后再进行修复",
+ "post.bind.auto.empty": "该文档未发布过，无需修复",
"post.bind.conf.cancel": "取消",
"form.validate.name.required": "请输入名称",
"form.validate.name.length": "长度必须在0到1之间",
@@ -255,13 +264,13 @@ export default {
"setting.common.password": "密码",
"setting.blog.platform.support.common": "您当前操作的平台是：",
"platform.must.select.one":
- "哇哦，离使用就差一步啦 o(╥﹏╥)o ，您必须添加并启用至少一个平台。如果列出的平台没有你想要的，可以点击新增按钮添加。有任何疑问欢迎邮件 youweics#163.com ",
+ "哇哦，离使用就差一步啦 o(╥﹏╥)o ，您必须添加并启用至少一个平台。可通过「平台导入」获取去插件闪商店自定义添加。",
"blog.list.toptip": "温馨提示：单击表格行可以进入文章详情页，详情页有发布按钮哦! (〃'▽'〃)",
"config.error.msg": "配置错误，请前往对应发布配置修改",
"config.platform.none": "没有启用的发布平台，请前往服务开关开启",
"post.delete.by.platform": "文章已被平台自行删除，请点击取消强制解除关联",
"blog.top-data-tip":
- "温馨提示：1. 0.1.0+ 以后，可通过【偏好设置->思源地址】来修改默认伺服配置，支持本地和远程；如果是远程还需要设置token，如果使用浏览器插件或者挂件之外的访问方式还需要设置跨域请求代理。 2、升级新版之前强烈建议导出配置，防止配置丢失。 3、如果出现新版本不兼容的异常情况，建议清空配置。此操作不可恢复，请谨慎操作！",
+ "温馨提示：1. 0.1.0+ 以后，可通过【偏好设置->思源设置】来修改默认伺服配置，支持本地和远程；如果是远程还需要设置token，如果使用浏览器插件或者挂件之外的访问方式还需要设置跨域请求代理。 2、升级新版之前强烈建议导出配置，防止配置丢失。 3、如果出现新版本不兼容的异常情况，建议清空配置。此操作不可恢复，请谨慎操作！",
"blog.top-data-tip.siyuan":
"温馨提示：1、当前处于挂件模式，从 0.1.0 版本开始，无需在所有页面引用挂件了，只需要在父级页面引用一个挂件即可。具体规则如下：(1). 如果检测到没有子文档，会兼容 0.0.3 版本以前的方式，展示当前文档的发布页面。 (2). 如果检测到有子文档，会以列表加分页的方式展示所有子文档列表。可单独选择某个子文档进行发布操作。 2、升级新版之前强烈建议导出配置，防止配置丢失。 3、如果出现新版本不兼容的异常情况，建议清空配置。此操作不可恢复，请谨慎操作！",
"blog.newwin.open": "页签模式",
@@ -270,7 +279,10 @@ export default {
"setting.blog.middlewareUrl": "跨域请求代理",
"setting.blog.middlewareUrl.tip": "某些场景下需要（例如自部署模式，Nginx伺服等、vite开发环境伺服等），其他情况可忽略",
"setting.blog.middlewareUrl.my.tip":
- "大部分情况下不需要，部分场景在浏览器环境下可能需要。如果没有部署代理，可以使用我的共享地址：https://api.terwer.space/api/middleware 。出于性能考虑，建议自己部署一份，请使用 https://github.com/terwer/node-metaweblog-api-adaptor 进行部署。",
+ "部分跨域场景可用（不支持绕过浏览器拒绝的 header ，例如 origin、referer 等；请求体不支持 FormData 等二进制格式，仅支持字符串），出于性能考虑，建议自己部署一份，请使用 https://github.com/terwer/node-metaweblog-api-adaptor 进行部署。",
+ "setting.blog.middlewareUrl.my.fee.tip":
+ "🤝由于共享代理占用巨大的成本，或者因为不可抗力原因可能会取消共享，为了保证服务可用性，建议自己部署一份，或者请作者喝一杯咖啡，鼓励我们持续共享🌹。参考之前的前辈大佬倒下的故事：https://linux.do/t/topic/1051",
+ "setting.blog.middlewareUrl.my.coffee": "赞助咖啡☕️",
"setting.conf.export": "导出配置",
"setting.conf.import": "导入配置",
"setting.conf.transport": "导入导出",
@@ -404,11 +416,12 @@ export default {
"setting.metaweblog.apiUrl.tip": "Metaweblog平台的xmlrpc远程发布地址",
"setting.metaweblog.previewUrl.tip": "Metaweblog平台的文章预览规则，[postid]可作文文章ID占位符",
- "setting.jvue.home.tip": "JVue平台的首页",
- "setting.jvue.username.tip": "JVue平台登录名",
- "setting.jvue.password.tip": "JVue平台密码",
- "setting.jvue.apiUrl.tip": "JVue平台的xmlrpc远程发布地址，通常固定是：https://<平台地址>/xmlrpc",
- "setting.jvue.previewUrl.tip": "JVue平台的文章预览规则，通常是：/post/[postid].html",
+ "setting.jvue.home.tip": "Jvue平台的首页，例如：http://localhost:3000",
+ "setting.jvue.username.tip": "Jvue平台登录名",
+ "setting.jvue.password.tip": "Jvue平台密码",
+ "setting.jvue.apiUrl.tip":
+ "Jvue平台的xmlrpc远程发布地址，通常固定是：https://<平台地址>/xmlrpc，例如：http://localhost:8008/xmlrpc",
+ "setting.jvue.previewUrl.tip": "Jvue平台的文章预览规则，通常是：/post/[postid].html",
"setting.conf.home.tip": "Confluence Cloud，首页，通常是：https://<您的用户名>.atlassian.net/wiki/spaces/<空间名>",
"setting.conf.username.tip": "Confluence登录名，可前往您的atlassian账户获取",
@@ -443,6 +456,18 @@ export default {
"setting.juejin.apiUrl.tip": "通常固定，请勿修改",
"setting.juejin.previewUrl.tip": "掘金平台文章预览规则",
+ "setting.halo.home.tip": "Halo首页地址，需要包括域名端口，例如：http://localhost:8090",
+ "setting.halo.username.tip": "Halo博客登录名",
+ "setting.halo.password.tip": "Halo博客登录密码",
+ "setting.halo.apiUrl.tip": "Halo博客API地址，一般与Halo首页相同",
+ "setting.halo.previewUrl.tip":
+ "Halo博客文章预览规则，默认 /archives/{slug}，占位符有 {slug} {name} {year} {month} {day}，可在 [halo-home-url]/console/settings?tab=routeRules设置",
+
+ "setting.flowus.home.tip": "Flowus首页地址，通常固定",
+ "setting.flowus.password.tip": "Flowus的Cookie，请勿修改",
+ "setting.flowus.apiUrl.tip": "通常固定，请勿修改",
+ "setting.flowus.previewUrl.tip": "Flowus平台文章预览规则",
+
"setting.picgo.refer.to": "详情请参考：",
"setting.picgo.refer.to.online.doc": "PicGO配置在线文档",
"setting.picgo.picbed": "图床设置",
@@ -518,6 +543,8 @@ export default {
"setting.main.background": "挂件背景",
"setting.main.background.tip": "支持16进制和rgb，例如：#000000，未设置或者留空不变。如果新窗口设置，请重新刷新文档。",
"setting.picgo.manage": "图床管理",
+ "setting.platform.import": "平台导入",
+ "setting.platform.store": "插件商店",
"setting.platform.add": "新增平台",
"setting.platform.add.this": "新增此平台",
"setting.platform.universal": "通用平台",
@@ -540,7 +567,7 @@ export default {
"目前支持自定义HTTP协议的平台有：知乎等，采用网页授权。自定义HTTP协议通过类似 WeChatSync 的方式实现。",
"setting.platform.right.tips0": "特别提示：",
"setting.platform.right.tips1": "1、在这里可以进行发布配置，直接点击 [设置图标] 即可进行配置。",
- "setting.platform.right.tips2": "2、如需新增平台，直接点击左侧 + 按钮即可。",
+ "setting.platform.right.tips2": "2、如需新增平台，直接点击「平台导入」或者「插件商店」进行添加。",
"setting.platform.right.tips3":
"3、目前支持 网页授权 和 API 授权两种方式，API授权 复杂点但是相对稳定，网页授权简单但是可能会失效。网页授权模式实现思路类似 wechatsync 。",
"setting.platform.right.tips4": "4、如需兼容其他平台，请联系我：youweics@163.com 或者填写下面的表单。",
@@ -572,7 +599,7 @@ export default {
"yuque.edit.cate.no.change":
"由于语雀平台的限制，暂时不支持编辑所属知识库。如果您想移动文档，请先点击取消删除该文档，然后重新选择新的知识库发布",
"main.commonn.cate.title": "公共分类",
- "main.cate.new": "新增分类",
+ "main.cate.new": "新分类",
"pref.setting.aicode": "ChatGPT请求key",
"pref.setting.aicode.tip": "ChatGPT请求key或者第三方代理key，如果是代理key，请设置请求地址",
"pref.setting.ai.baseurl": "ChatGPT请求地址",
@@ -583,12 +610,14 @@ export default {
"main.auto.fetch.title": "自动提取标题",
"main.auto.fetch.cate": "自动提取分类",
"category.ai.hand": "由于各平台分类体系不一致，分类需要手动进行校准，不会自动保存",
- "category.ai.enabled": "检测到您已经配置AI，可请前往详细模式进行操作",
- "sys.config.ai": "AI设置",
+ "category.ai.enabled":
+ "检测到您已经配置AI，可请前往详细模式进行操作。小贴士：由于网络或者其他问题，如果第一次失败生成，多试几次或许就能出结果哟~😄",
+ "sys.config.ai": "AI 设置",
"config.ai.use.siyuan": "思源笔记内部，直接使用思源笔记配置，无需配置",
"setting.blog.yamlLinkEnabled": "YAML永久链接",
"distri.type.overide.warn": "注意：覆盖模式下会用当前数据覆盖所有选择的平台，请谨慎操作。",
- "distri.type.merge.warn": "注意：为了保留平台数据，合并模式下，标题和摘要的修改无效，您可在在常规发布单独修改对应平台的标题和摘要，标签和分类会与所选择的平台数据合并。",
+ "distri.type.merge.warn":
+ "注意：为了保留平台数据，合并模式下，标题和摘要的修改无效，您可在在常规发布单独修改对应平台的标题和摘要，标签和分类会与所选择的平台数据合并。",
"preference.setting.keepTitle": "不更新原始标题",
"setting.blog.gitlab.url.tip": "Gitlab首页，例如：http://localhost:8002",
@@ -597,5 +626,42 @@ export default {
"setting.blog.gitlab.apiurl.tip": "Gitlab的API地址，一般与首页相同",
"setting.blog.gitlab.previewUrl.tip": "文章预览地址，一般默认即可",
- "main.force.cancel": "强制删除"
+ "main.force.cancel": "强制删除",
+ "loading.cost": "操作耗时",
+
+ "preference.setting.showDocQuickMenu": "显示文档菜单",
+ "preference.setting.showQuickMenu": "显示极速发布",
+ "preference.setting.showSingleMenu": "显示常规发布",
+ "preference.setting.showBatchMenu": "显示批量分发",
+ "preference.setting.showAIMenu": "显示AI菜单",
+ "preference.setting.showExtendMenu": "显示扩展菜单",
+ "preference.setting.showArticleManageMenu": "显示文章管理菜单",
+
+ "message.publish.notShared": "文章尚未分享，无法在外部查看。请分享文章或者在PC 客户端内部通过插件菜单进行预览。",
+
+ "setting.telegraph.home.tip": "telegra.ph平台首页，通常固定是：https://telegra.ph/",
+ "setting.telegraph.username.tip": "作者，会显示在文章详情，可自行设置，默认为空",
+ "setting.telegraph.password.tip": "设备hash，会自动获取，无需填写",
+ "setting.telegraph.apiurl.tip": "telegra.ph的API地址，通常固定是：https://telegra.ph/",
+ "setting.telegraph.previewUrl.tip": "telegra.ph的文章预览规则，通常是：/[notebook]/[postid]",
+
+ "page.loading": "页面加载中...",
+
+ "setting.blog.middlewareUrl.new": "新代理(推荐)",
+ "setting.blog.corsAnywhereUrl.tip":
+ "1.20.0+ 全新CORS全局代理，优先级高，设置之后会忽略上面旧的代理地址。设置之后可彻底解决浏览器跨域、科学上网问题",
+ "setting.blog.middlewareUrl.my.new.tip":
+ "1.20.0+ 新版CORS代理，彻底解决「科学上网」、「CORS 跨域」两大问题，" +
+ "支持全局跨域请求（支持绕过 header、请求体支持 FormData）。受限于 CORS 策略，「Docker 版本」必须设置 CORS 代理，" +
+ "否则大部分场景将无法使用。技术细节可参考 MDN：https://developer.mozilla.org/zh-CN/docs/Web/HTTP/CORS " +
+ "以及 https://developer.mozilla.org/zh-CN/docs/Glossary/CORS。可私发邮件到 youweics@163.com 提供捐赠截图获取部署方案。" +
+ "之前捐助过的也可以私发截图给我，免费提供部署指导🤝。",
+ "setting.blog.middlewareUrl.my.warn.tip":
+ "⚠️特别提醒：请求限制为 「10万次/天」、「1000次/10分钟」，频次为「所有人共享」，因此资源十分珍贵。为了大家的利益，请勿恶意请求，否则，我们会关闭此共享代理。",
+
+ "platform.new.platform":
+ "检测到还有 [count] 个内置平台 [platform] 尚未导入，您可以使用平台导入批量导入，或者去插件商店自行添加。",
+
+ "import.v081.warn":
+ "考虑到 v0.8.1 已经是很早的版本了，此功能可能不再需要。如果您需要此功能，可反馈至 youweics@163.com ，我们会根据需求决定是否实现此功能。",
}
diff --git a/src/main.ts b/src/main.ts
index 5754710..81ba03c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -23,19 +23,15 @@
* questions.
*/
-import { createVueApp } from "./utils/vueUtils"
-import { createAppLogger } from "./utils/appLogger"
+import { createVueApp } from "./bootstrap"
import "element-plus/dist/index.css"
import "element-plus/theme-chalk/dark/css-vars.css"
;(async () => {
- const logger = createAppLogger("main")
-
const instance = await createVueApp()
const app = instance.app
// 挂载 vue app
app.mount("#app")
- logger.info("vue app created")
})()
diff --git a/src/models/platformMetadata.ts b/src/models/platformMetadata.ts
new file mode 100644
index 0000000..3e6911c
--- /dev/null
+++ b/src/models/platformMetadata.ts
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2023, Terwer . All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Terwer designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Terwer in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Terwer, Shenzhen, Guangdong, China, youweics@163.com
+ * or visit www.terwer.space if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * 表示与平台相关的元数据
+ *
+ * @author terwer
+ * @since 1.18.0
+ */
+class PlatformMetadata {
+ metadata: Record
+}
+
+/**
+ * 表示元数据项
+ *
+ * @author terwer
+ * @since 1.18.0
+ */
+class MetadataItem {
+ /**
+ * 标签列表
+ */
+ public tags: string[]
+
+ /**
+ * 分类列表
+ */
+ public categories: string[]
+
+ /**
+ * 模板列表
+ */
+ public templates: string[]
+
+ constructor() {
+ this.tags = []
+ this.categories = []
+ this.templates = []
+ }
+}
+
+export { PlatformMetadata, MetadataItem }
diff --git a/src/models/publishPreferenceCfg.ts b/src/models/publishPreferenceCfg.ts
index aaf612d..053d723 100644
--- a/src/models/publishPreferenceCfg.ts
+++ b/src/models/publishPreferenceCfg.ts
@@ -58,10 +58,36 @@ class PublishPreferenceCfg extends PreferenceConfig {
*/
public experimentalAIProxyUrl?: string
+ // 文档菜单
+ /**
+ * 是否展示文档快捷菜单
+ */
+ public showDocQuickMenu?: boolean
+
+ // 顶栏菜单
+ public showQuickMenu?: boolean
+ public showSingleMenu?: boolean
+ public showBatchMenu?: boolean
+ public showAIMenu?: boolean
+ public showExtendMenu?: boolean
+
+ // 文章管理
+ public showArticleManageMenu?: boolean
+
constructor() {
super()
this.experimentalUseSiyuanNoteAIConfig = true
this.experimentalAIEnabled = false
+
+ this.showDocQuickMenu = true
+
+ this.showQuickMenu = true
+ this.showSingleMenu = true
+ this.showBatchMenu = true
+ this.showAIMenu = true
+ this.showExtendMenu = true
+
+ this.showArticleManageMenu = true
}
}
diff --git a/src/pages/About.vue b/src/pages/About.vue
index a786cba..1dedc0a 100644
--- a/src/pages/About.vue
+++ b/src/pages/About.vue
@@ -27,6 +27,7 @@
import { reactive } from "vue"
import { dependencies, version } from "../../package.json"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
+import { aboutUrl } from "~/src/utils/constants.ts"
const { t } = useVueI18n()
@@ -49,7 +50,7 @@ const formData = reactive({
{{ t("slogan.make.written.fun") }}
-
-
-
-
-
-
- {{ t("service.tab.publish.setting") }}
-
-
-
-
- + {{ t("setting.platform.add") }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
-
-
-
- ![]()
-
-
-
-
-
- {{ p.title }}
-
-
-
- {{ p.description }}
-
- {{ t("setting.platform.add.this") }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ platform.platformName }}
-
-
-
-
- {{ platform.authMode === AuthMode.API ? "API授权" : "网页授权" }}
-
-
-
-
-
-
-
- 设置
-
-
-
-
-
- 设置
-
-
-
-
-
- {{ platform.isAuth ? "再次授权" : "授权" }}
-
-
-
-
-
- 验证
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
- 导入预定义平台
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t("setting.platform.right.tips0") }}
- {{ t("setting.platform.right.tips1") }}
- {{ t("setting.platform.right.tips2") }}
- {{ t("setting.platform.right.tips3") }}
- {{ t("setting.platform.right.tips4") }}
- FAQ:
-
- 不会配置，或者配置遇到问题？请点击这里查看完整版平台配置指南
-
-
-
- 我想要的平台这里没有？
- 点击这里提交发布工具平台适配跟踪表
-
-
-
-
- 我还有其他问题或者想私下沟通作者？
- 直接发邮件到：youweics@163.com
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/set/publish/form/PlatformAddForm.vue b/src/components/set/publish/form/PlatformAddForm.vue
new file mode 100644
index 0000000..857a524
--- /dev/null
+++ b/src/components/set/publish/form/PlatformAddForm.vue
@@ -0,0 +1,305 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/set/publish/form/PlatformUpdateForm.vue b/src/components/set/publish/form/PlatformUpdateForm.vue
new file mode 100644
index 0000000..20f2921
--- /dev/null
+++ b/src/components/set/publish/form/PlatformUpdateForm.vue
@@ -0,0 +1,224 @@
+
+
+
+
+
+ {{ type === "all" ? "全部" : formData.platformGroup?.title ?? type }}
+
+
+ {{ formData.platformGroup?.description ?? "" }}
+
+
+
+
+
+
+
+
+ {{ CrossPageUtils.shortPlatformName(preItem.platformName, 11) }}
+
+
+
+
+ 添加自定义 {{ formData.platformGroup?.title ?? type }} 对接
+
+
+
+ 一键全部导入
+ 自定义导入
+
+ 从旧版 v0.8.1 版本「思源笔记挂件」导入
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/set/publish/platform/PublishPlatformSettingList.vue b/src/components/set/publish/platform/PublishPlatformSettingList.vue
new file mode 100644
index 0000000..b025f53
--- /dev/null
+++ b/src/components/set/publish/platform/PublishPlatformSettingList.vue
@@ -0,0 +1,588 @@
+
+
+
+
+
+
+
+
+
+
+ 开始导入
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/set/publish/platform/PublishPlatformStore.vue b/src/components/set/publish/platform/PublishPlatformStore.vue
new file mode 100644
index 0000000..673e5aa
--- /dev/null
+++ b/src/components/set/publish/platform/PublishPlatformStore.vue
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ CrossPageUtils.longPlatformName(platform.platformName, 11) }}
+
+
+
+
+
+ {{ platform.authMode === AuthMode.API ? "API授权" : "网页授权" }}
+
+
+
+
+
+
+
+ 设置
+
+
+
+
+
+ 设置
+
+
+
+
+
+ {{ platform.isAuth ? "再次授权" : "授权" }}
+
+
+
+
+
+ 验证
+
+
+
+
+ 删除
+
+
+
+
+ 全部
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
diff --git a/src/components/set/publish/platform/PublishSettingTips.vue b/src/components/set/publish/platform/PublishSettingTips.vue
new file mode 100644
index 0000000..d42ca71
--- /dev/null
+++ b/src/components/set/publish/platform/PublishSettingTips.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/set/publish/singleplatform/SingleSettingIndex.vue b/src/components/set/publish/singleplatform/SingleSettingIndex.vue
index 9c2925c..6912f97 100644
--- a/src/components/set/publish/singleplatform/SingleSettingIndex.vue
+++ b/src/components/set/publish/singleplatform/SingleSettingIndex.vue
@@ -29,8 +29,7 @@ import { reactive } from "vue"
import { useRoute } from "vue-router"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
import { getSubPlatformTypeByKey, SubPlatformType } from "~/src/platforms/dynamicConfig.ts"
-import VuepressSetting from "~/src/components/set/publish/singleplatform/github/VuepressSetting.vue"
-import GitlabvuepressSetting from "~/src/components/set/publish/singleplatform/gitlab/GitlabvuepressSetting.vue"
+import TelegraphSetting from "~/src/components/set/publish/singleplatform/commonblog/TelegraphSetting.vue"
// uses
const { t } = useVueI18n()
@@ -46,6 +45,8 @@ const subtype = getSubPlatformTypeByKey(apiType)
+
+
+
+
+
+
+ {{ t("setting.platform.right.tips0") }}
+ {{ t("setting.platform.right.tips1") }}
+ {{ t("setting.platform.right.tips2") }}
+ {{ t("setting.platform.right.tips3") }}
+ {{ t("setting.platform.right.tips4") }}
+ FAQ:
+
+ 不会配置，或者配置遇到问题？ 请加QQ群
+
+
+ 895063267
+
+
+ 讨论。
+
+
+
+ 需要详细的配置指导？请查看在线文档
+ 平台配置指南
+
+
+
+ 我想要的平台这里没有？
+ 点击这里提交发布工具平台适配跟踪表
+
+
+
+
+ 我还有其他问题或者想私下沟通作者？ 直接发邮件到：youweics@163.com
+
+ Created by terwer
+ Created by terwer
@@ -83,7 +84,7 @@ const formData = reactive({
display inline-block
vertical-align top
padding-left 20px
- width 80%
+ width calc(100% - 250px)
.param
padding 10px 0
.space
diff --git a/src/pages/Admin.vue b/src/pages/Admin.vue
new file mode 100644
index 0000000..f4ed331
--- /dev/null
+++ b/src/pages/Admin.vue
@@ -0,0 +1,617 @@
+
+
+
+
+
+ ]+href=")([^"]+(\.css|\.js))"/g, (match, p1, p2) => `${p1}${p2}?v=${timestamp}"`)
- html = html.replace(/(]+href=")([^"]+\.svg)"/g, `$1$2?v=${timestamp}"`)
- html = html.replace(/(]+src=")([^"]+\.(jpe?g|gif|webp|bmp|png))"/g, `$1$2?v=${timestamp}"`)
- return html
- },
- },
+ // {
+ // name: "add-query-param",
+ // transformIndexHtml(html) {
+ // const timestamp = Date.now()
+ // html = html.replace(/(]+href=")([^"]+(\.css|\.js))"/g, (match, p1, p2) => `${p1}${p2}?v=${timestamp}"`)
+ // // html = html.replace(/(]+href=")([^"]+(\.css))"/g, (match, p1, p2) => `${p1}${p2}?v=${timestamp}"`)
+ // html = html.replace(/(]+href=")([^"]+\.svg)"/g, `$1$2?v=${timestamp}"`)
+ // html = html.replace(/(]+src=")([^"]+\.(jpe?g|gif|webp|bmp|png))"/g, `$1$2?v=${timestamp}"`)
+ // return html
+ // },
+ // },
// 在浏览器中polyfill node
// https://github.com/davidmyersdev/vite-plugin-node-polyfills/blob/main/test/src/main.ts
@@ -169,7 +175,7 @@ export default defineConfig({
// can also be 'build', 'dev', or false
Buffer: true,
global: true,
- process: true
+ process: true,
},
protocolImports: true,
}),
@@ -207,7 +213,7 @@ export default defineConfig({
plugins: [
...(isWatch
? [
- livereload(devDistDir),
+ livereload(distDir),
{
//监听静态资源文件
name: "watch-external",
@@ -225,28 +231,28 @@ export default defineConfig({
// make sure to externalize deps that shouldn't be bundled into your library
external: [],
- output: {
- // add a query parameter to all JS and CSS file URLs
- chunkFileNames: "chunks/chunk.[name].js",
- entryFileNames: "entry.[name].js",
- assetFileNames: "assets/[name].[ext]",
- manualChunks(id) {
- if (id.includes("node_modules")) {
- let arr = id.toString().split("node_modules/")[1].split("/")
- // pnpm单独处理
- if (id.includes(".pnpm")) {
- arr = id.toString().split(".pnpm/")[1].split("/")
- }
- const dep = arr[0].split("@")[0].replace(/\./g, "-")
- // console.log("id=>", id)
- // console.log("dep=>", dep)
- if (dep !== "") {
- return "vendor_" + dep
- }
- return "vendor"
- }
- },
- },
+ // output: {
+ // // add a query parameter to all JS and CSS file URLs
+ // chunkFileNames: "chunks/chunk.[name].js",
+ // entryFileNames: "entry.[name].js",
+ // assetFileNames: "assets/[name].[ext]",
+ // // manualChunks(id) {
+ // // if (id.includes("node_modules")) {
+ // // let arr = id.toString().split("node_modules/")[1].split("/")
+ // // // pnpm单独处理
+ // // if (id.includes(".pnpm")) {
+ // // arr = id.toString().split(".pnpm/")[1].split("/")
+ // // }
+ // // const dep = arr[0].split("@")[0].replace(/\./g, "-")
+ // // // console.log("id=>", id)
+ // // // console.log("dep=>", dep)
+ // // if (dep !== "") {
+ // // return "vendor_" + dep
+ // // }
+ // // return "vendor"
+ // // }
+ // // },
+ // },
},
},
@@ -256,7 +262,10 @@ export default defineConfig({
// environment: "node",
// environment: "happy-dom",
setupFiles: ["./src/setup.ts"],
- include: ["src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
+ include: [
+ "src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}",
+ "cross/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}",
+ ],
server: {
deps: {
inline: ["element-plus"],
diff --git a/widget.json b/widget.json
index dcc40c1..669b14e 100644
--- a/widget.json
+++ b/widget.json
@@ -2,7 +2,7 @@
"name": "sy-post-publisher",
"author": "terwer",
"url": "https://github.com/terwer/sy-post-publisher",
- "version": "0.11.0",
+ "version": "1.20.0",
"minAppVersion": "2.9.0",
"backends": [
"windows",
+
+
+
+
+
+
+
diff --git a/src/pages/AiChat.vue b/src/pages/AiChat.vue
index 30df4d1..482616b 100644
--- a/src/pages/AiChat.vue
+++ b/src/pages/AiChat.vue
@@ -139,7 +139,6 @@ onMounted(async () => {
diff --git a/tsconfig.json b/tsconfig.json
index a3315f7..b3ba5bb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -25,7 +25,10 @@
"paths": {
"~/*": ["./*"]
- }
+ },
+ "types": [
+ "unplugin-icons/types/vue"
+ ]
},
"include": ["*.ts", "*.vue", "*.d.ts", "**/**/*.ts", "**/**/*.d.ts", "**/**/*.vue", "custom.d.ts"],
"references": [{ "path": "./tsconfig.node.json" }]
diff --git a/vite.config.ts b/vite.config.ts
index b3260d0..a90b24c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -9,15 +9,16 @@ import AutoImport from "unplugin-auto-import/vite"
import Components from "unplugin-vue-components/vite"
import { ElementPlusResolver } from "unplugin-vue-components/resolvers"
import { nodePolyfills } from "vite-plugin-node-polyfills"
+import Icons from "unplugin-icons/vite"
// methods start
-const getAppBase = (isSiyuanBuild: boolean, isWidgetBuild: boolean, isStaticBuild: boolean): string => {
+const getAppBase = (isSiyuanBuild: boolean, isWidgetBuild: boolean, isNginxBuild): string => {
if (isSiyuanBuild) {
return "/plugins/siyuan-plugin-publisher/"
} else if (isWidgetBuild) {
return "/widgets/sy-post-publisher/"
- } else if (isStaticBuild) {
- return "/dist/"
+ } else if (isNginxBuild) {
+ return "/"
} else {
return "/"
}
@@ -25,12 +26,13 @@ const getAppBase = (isSiyuanBuild: boolean, isWidgetBuild: boolean, isStaticBuil
const getDefineEnv = (isDevMode: boolean, debugMode: boolean) => {
const mode = process.env.NODE_ENV
+ const isTest = mode === "test"
console.log("isServe=>", isServe)
console.log("mode=>", mode)
const defaultEnv = {
- DEV_MODE: `${isDevMode}`,
- DEBUG_MODE: `${debugMode}`,
+ DEV_MODE: `${isDevMode || isTest}`,
+ DEBUG_MODE: `${debugMode || isTest}`,
APP_BASE: `${appBase}`,
NODE_ENV: "development",
VITE_DEFAULT_TYPE: `siyuan`,
@@ -61,27 +63,20 @@ const debugMode = process.env.DEBUG_MODE === "true"
const isServe = process.env.IS_SERVE
const isWatch = args.watch || args.w || false
const isDev = isServe || isWatch || debugMode
-const isWindows = process.platform === "win32"
-let devDistDir = "/Users/terwer/Documents/mydocs/SiYuanWorkspace/test/data/plugins/siyuan-plugin-publisher"
-// let devDistDir = "/Users/zhangyue/Documents/terwer/SiyuanWorkspace/test/data/plugins/siyuan-plugin-publisher"
-// let devDistDir = "/Users/terwer/Documents/mydocs/SiYuanWorkspace/public/data/plugins/siyuan-plugin-publisher"
-if (isWindows) {
- devDistDir = "C:\\Users\\terwer\\Documents\\mydocs\\SiyuanWorkspace\\test\\data\\plugins\\siyuan-plugin-publisher"
- // devDistDir = "C:\\Users\\terwer\\Documents\\mydocs\\SiyuanWorkspace\\public\plugins\siyuan-plugin-publisher"
-}
+const outDir = args.o || args.outDir
+
+const buildType = process.env.BUILD_TYPE
const isSiyuanBuild = process.env.BUILD_TYPE === "siyuan"
const isWidgetBuild = process.env.BUILD_TYPE === "widget"
-const isStaticBuild = process.env.BUILD_TYPE === "static"
-// const isChromeBuild = process.env.BUILD_TYPE === "chrome"
-const distDir = isWatch ? devDistDir : isWidgetBuild ? "widget" : "./dist"
-const appBase = getAppBase(isSiyuanBuild, isWidgetBuild, isStaticBuild)
+const isNginxBuild = process.env.BUILD_TYPE === "nginx"
+const distDir = outDir || (isWidgetBuild ? "widget" : "./dist")
+const appBase = getAppBase(isSiyuanBuild, isWidgetBuild, isNginxBuild)
console.log("isWatch=>", isWatch)
console.log("debugMode=>", debugMode)
console.log("isDev=>", isDev)
console.log("distDir=>", distDir)
-console.log("isSiyuanBuild=>", isSiyuanBuild)
-console.log("isStaticBuild=>", isStaticBuild)
+console.log("buildType=>", buildType)
// https://github.com/vuejs/vue-cli/issues/1198
// https://vitejs.dev/config/
@@ -90,6 +85,10 @@ export default defineConfig({
plugins: [
vue(),
+ Icons({
+ autoInstall: true,
+ }),
+
AutoImport({
resolvers: [ElementPlusResolver()],
}),
@@ -114,6 +113,7 @@ export default defineConfig({
{
tag: "script",
attrs: {
+ async: true,
src: "./libs/lute/lute-1.7.5-20230410.min.js",
},
injectTo: "head",
@@ -121,6 +121,7 @@ export default defineConfig({
{
tag: "script",
attrs: {
+ async: true,
src: "./libs/alioss/aliyun-oss-sdk-6.16.0.min.js",
},
injectTo: "head",
@@ -130,6 +131,7 @@ export default defineConfig({
{
tag: "script",
attrs: {
+ async: true,
src: "./libs/lute/lute-1.7.5-20230410.min.js",
},
injectTo: "head",
@@ -137,6 +139,7 @@ export default defineConfig({
{
tag: "script",
attrs: {
+ async: true,
src: "./libs/alioss/aliyun-oss-sdk-6.16.0.min.js",
},
injectTo: "head",
@@ -149,17 +152,20 @@ export default defineConfig({
},
}),
- {
- name: "add-query-param",
- transformIndexHtml(html) {
- const timestamp = Date.now()
- html = html.replace(/(
+
+
+
+
+
+
+
+
+ 搜索
+ 已发布
+
+
+
+
+ {{ item.value }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.title }}
+
+ {{ scope.row.yamlCount }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID: {{ props.row.postid }}
+发布时间: {{ props.row.dateCreated }}
+标题: {{ props.row.title }}
++ 标签: + {{ props.row.mt_keywords === "" ? "暂无标签" : props.row.mt_keywords }} +
+摘要: {{ props.row.shortDesc }}
+
+ 平台:
+
+
+
+
标题
+
+
+ 操作
+
+
+
+