v1.34.1

# Conflicts:
#	packages/ui/certd-server/export-plugin-yaml.js

CHANGELOG.md

@@ -3,6 +3,97 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/certd/certd/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+### Bug Fixes
+
+* 根据SOA记录判断子域名托管有缺陷，改回手动配置子域名托管记录的方式 ([1b280a2](https://github.com/certd/certd/commit/1b280a2940f9e2d919b0bf23b89cc185be1fa498))
+* 修复宝塔授权测试按钮显示错误的bug ([048696e](https://github.com/certd/certd/commit/048696ee9386491bb68592fb3a47d1c900bb68bf))
+
+### Performance Improvements
+
+* 支持部署证书到火山dcdn ([5f85219](https://github.com/certd/certd/commit/5f852194953dc1b4e6336770f417507b8f5a33ad))
+* 支持部署证书到unicloud ([a63d687](https://github.com/certd/certd/commit/a63d687f1c573159f0857693f37602b0e1e44072))
+
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+### Bug Fixes
+
+* 修复二次认证登录进入错误账号的bug ([e3930e0](https://github.com/certd/certd/commit/e3930e07172dd7903cb0f6ff26e0e3e828ba3e77))
+
+### Features
+
+* 从yaml文件注册插件 ([deb3893](https://github.com/certd/certd/commit/deb38938204b29543f36d3266249958faaaa6b66))
+
+### Performance Improvements
+
+* 优化cdnfly插件，支持自动匹配域名部署 ([afd59e9](https://github.com/certd/certd/commit/afd59e9933b2650f41c5d47684c171b93b962065))
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+### Bug Fixes
+
+* 服务器时间获取不准确的bug ([5d10cbf](https://github.com/certd/certd/commit/5d10cbf18daf94a90a7551641a3b13e3c5fec611))
+* 修复复制流水线无效的bug ([3df20a9](https://github.com/certd/certd/commit/3df20a924f32970b052e2588ea20de095f0ea693))
+* 修复http上传方式无法清除记录文件的bug ([72a7b51](https://github.com/certd/certd/commit/72a7b51d479602b2c54c6c3ac8d8a0dcb9664e73))
+* 修复token过期后，疯狂打印token过期信息的bug ([50a5fa1](https://github.com/certd/certd/commit/50a5fa15bb240a125bbc91d2ce1ff3c835888a77))
+
+### Performance Improvements
+
+* 从域名的soa获取主域名，子域名托管无需额外配置 ([a586a92](https://github.com/certd/certd/commit/a586a92d5e32ea846ac37be52a7ad8c328d89966))
+* 七牛oss支持删除过期备份 ([b7113bd](https://github.com/certd/certd/commit/b7113bda2378116d6c116dc583f563cce7cf9f00))
+* 数据库备份支持oss ([308d460](https://github.com/certd/certd/commit/308d4600efe2002f199c33b4594d3071784e58ea))
+* 支持阿里云中文域名申请 ([b3468cf](https://github.com/certd/certd/commit/b3468cf7f28228d7c9cf68de6b5a9bbeb67f2c6d))
+* 支持反向代理增加contextPath路径 ([0088929](https://github.com/certd/certd/commit/0088929622160cc922995de9a563e8061686ff34))
+* 支持中文域名 ([162ebfd](https://github.com/certd/certd/commit/162ebfd4e0c25727efb33952d3bbf7420a02e2c3))
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+### Performance Improvements
+
+* 添加部署证书至火山 Live ([abea80e](https://github.com/certd/certd/commit/abea80e3ab9b1672aebe1c5d5e856693b29931a8))
+* 优化首页插件列表展示 ([9b8f60b](https://github.com/certd/certd/commit/9b8f60b64b5f9a3db7dfa9b3dcbd9201984358d0))
+* 证书申请支持51dns ([8638fc9](https://github.com/certd/certd/commit/8638fc91ff34fccaf12ff9874fd3fa9d2a8c18b7))
+* 支持51dns ([96a0900](https://github.com/certd/certd/commit/96a0900edc95dcfd9acccf9d13592f12f5a09b3d))
+* ssh PTY模式登录设置 ([8385bcc](https://github.com/certd/certd/commit/8385bcc2d7f2411a07748bb5c53f9eaf4d38d7cc))
+* ssh伪终端模式优化，windows下不开启 ([42dfe93](https://github.com/certd/certd/commit/42dfe936b773b7bdd82ca3378363252ffffd7b71))
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+### Bug Fixes
+
+* 上传商用证书，直接粘贴文本报错的问题；修复无法上传ec加密证书的bug ([5750bb7](https://github.com/certd/certd/commit/5750bb706779da274d8e7a87e71416cb64d2df79))
+* 修复下载证书时提示token已过期的问题 ([0e07ae6](https://github.com/certd/certd/commit/0e07ae6ce84dcb9279d3c44060d621566afa593c))
+
+### Performance Improvements
+
+* 更新license时同时绑定url ([78367af](https://github.com/certd/certd/commit/78367af8307f801e778c76d49f0918c21ffe032f))
+* 切换到不同的分组后再打开创建对话框，会自动选择分组 ([893dcd4](https://github.com/certd/certd/commit/893dcd4f2487891199ed3e5a3d47a79a75efc942))
+* 新增部署到火山引擎ALB/CLB、上传到证书中心 ([c9a3e3d](https://github.com/certd/certd/commit/c9a3e3d9d26f964c7af7b56667936f1414fbf42a))
+* 优化/api缓存为0 ([dc05cd4](https://github.com/certd/certd/commit/dc05cd481f186b13375192be965000e6b4b429a5))
+* 优化华为cdn插件引用ccm证书 ([b565b4b](https://github.com/certd/certd/commit/b565b4b3b919b71b98ea2517670bc1ef00e00dc9))
+* 优化证书流水线创建，支持选择分组 ([d613aa8](https://github.com/certd/certd/commit/d613aa8f3e85d8dc475ef1b62d49394ce7fd7d24))
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+### Performance Improvements
+
+* 登录支持双重认证 ([48aef25](https://github.com/certd/certd/commit/48aef25b3f6499d674ca4e4ef16f4c62399fb735))
+* 多重认证登录 ([0f82cf4](https://github.com/certd/certd/commit/0f82cf409bc60706ab07e4ca4f272b9a1ca7eecb))
+* 优化部署到华为云CDN，支持先上传到ccm，再使用证书id部署，修复offline状态下导致部署报错的bug ([79df39a](https://github.com/certd/certd/commit/79df39acabab10ae7e1864dadcdc186bb007a3c5))
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+### Bug Fixes
+
+* 补充类型断言 ([2143dff](https://github.com/certd/certd/commit/2143dff2ae96e6a78bef9f0498e36f8cd9e6941f))
+* 修复腾讯云部署到任意资源插件，无法使用之前已上传的腾讯云证书问题 ([32c714d](https://github.com/certd/certd/commit/32c714d1b6e68c71a74a7452115040c87ac4bfdc))
+
+### Performance Improvements
+
+* 插件支持导入导出 ([cf8abb4](https://github.com/certd/certd/commit/cf8abb45282070c8ba91469f93fd379fabf1f74a))
+* 支持上传证书到华为云CCM ([cfd3b66](https://github.com/certd/certd/commit/cfd3b66be9ebf53a26693057e70ed60c3f116be9))
+
 ## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 ### Bug Fixes

README.md

@@ -9,13 +9,16 @@ Certd 是一个免费全自动申请和自动部署更新SSL证书的管理系
 本项目不仅支持证书申请过程自动化，还可以自动化部署更新证书，让你的证书永不过期。     
 
 * 全自动申请证书（支持所有注册商注册的域名）
-* 全自动部署更新证书（目前支持部署到主机、阿里云、腾讯云等，目前已支持60+部署插件）
+* 全自动部署更新证书（目前支持部署到主机、阿里云、腾讯云等70+部署插件）
 * 支持DNS-01、HTTP-01、CNAME代理等多种域名验证方式
 * 支持通配符域名/泛域名，支持多个域名打到一个证书上，支持pem、pfx、der、jks等多种证书格式
 * 邮件通知、webhook通知
 * 私有化部署，数据保存本地，授权信息加密存储，镜像由Github Actions构建，过程公开透明
 * 支持SQLite，PostgreSQL、MySQL数据库
 
+
+  ![](./docs/images/intro/intro.svg)
+
 >
 > 流水线数量现已调整为无限制，欢迎大家使用
 >
@@ -23,7 +26,7 @@ Certd 是一个免费全自动申请和自动部署更新SSL证书的管理系
 > 关于证书续期：
  >* 实际上没有办法不改变证书文件本身情况下直接续期或者续签。
  >* 我们所说的续期，其实就是按照全套流程重新申请一份新证书，然后重新部署上去。
-
+ >* 免费证书过期时间90天，以后可能还会缩短，所以自动化部署必不可少
  
 ## 二、在线体验
 
@@ -62,7 +65,7 @@ https://certd.handfree.work/
 -------> [点我查看详细使用步骤演示](./step.md)   <--------      
 ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑     
 
-更多教程请访问文档网站 [certd.docmirror.cn](https://certd.docmirror.cn/)
+更多教程请访问官方文档 [certd.docmirror.cn](https://certd.docmirror.cn/guide/)
 
 
 
@@ -72,10 +75,10 @@ https://certd.handfree.work/
 
 您可以根据实际情况从如下方式中选择一种方式进行私有化部署：
 
-1. [宝塔面板方式部署](https://certd.docmirror.cn/guide/install/docker/)
-2. [1Panel面板方式部署](https://certd.docmirror.cn/guide/install/1panel/)
-3. [Docker方式部署](https://certd.docmirror.cn/guide/install/docker/)
-4. [源码方式部署](https://certd.docmirror.cn/guide/install/source/)
+1. [宝塔面板方式部署 推荐](https://certd.docmirror.cn/guide/install/docker/)
+2. [1Panel面板方式部署 推荐](https://certd.docmirror.cn/guide/install/1panel/)
+3. [Docker方式部署 推荐](https://certd.docmirror.cn/guide/install/docker/)
+4. [源码方式部署 不建议](https://certd.docmirror.cn/guide/install/source/)
 
 #### Docker镜像说明：
 * 国内镜像地址:
@@ -101,86 +104,20 @@ https://certd.handfree.work/
 > * 请务必做好服务器本身的安全防护，防止数据库泄露
 > * 请务必做好数据备份，避免数据丢失
 
-## 五、 升级
-
-### docker-compose方式部署
-#### 1. 如果使用固定版本号
-1. 修改`docker-compose.yaml`中的镜像版本号
-2. 运行`docker compose up -d` 即可
-
-#### 2. 如果需要使用最新版本
-```shell
-#重新拉取镜像
-docker pull registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
-# 重新启动容器
-docker compose down
-docker compose up -d
-```
-> 数据默认存在`/data/certd`目录下，不用担心数据丢失
-
-### 自动升级(仅限尝鲜建议非生产使用)
-```yaml
-version: '3.3'
-services:
-  certd:
-    image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
-    container_name: certd
-    restart: unless-stopped
-    volumes:
-      - /data/certd:/app/data
-    ports:
-      - "7001:7001"
-      - "7002:7002"
-    environment:
-      - certd_system_resetAdminPasswd=false
-    labels:
-      com.centurylinklabs.watchtower.enable: "true"
-
-  certd-updater:  # 添加 Watchtower 服务
-    image: containrrr/watchtower:latest
-    container_name: certd-updater
-    restart: unless-stopped
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    # 配置 自动更新
-    environment:
-      - WATCHTOWER_CLEANUP=true            # 自动清理旧版本容器
-      - WATCHTOWER_INCLUDE_STOPPED=false   # 不更新已停止的容器
-      - WATCHTOWER_LABEL_ENABLE=true       # 根据容器标签进行更新
-      - WATCHTOWER_POLL_INTERVAL=300       # 每 5 分钟检查一次更新
-
-```
-
-### 其他部署方式升级方法
-请参考 https://certd.docmirror.cn/guide/install/upgrade.html
 
 
 
-###  更新日志：
+## 五、更多帮助
+请访问官方文档：[https://certd.docmirror.cn/](https://certd.docmirror.cn/guide/)
 
-[CHANGELOG](./CHANGELOG.md)
+* 升级方法：[升级方法](https://certd.docmirror.cn/guide/install/upgrade/)
+* 常见问题：[忘记密码](https://certd.docmirror.cn/guide/use/forgotpasswd/)
+* 多数据库：[多数据库配置](https://certd.docmirror.cn/guide/install/database/)
+* 站点安全：[站点安全特性](https://certd.docmirror.cn/guide/feature/safe/)
+* 更新日志：[CHANGELOG](./CHANGELOG.md)
 
 
-## 六、一些说明
-* 本项目ssl证书提供商为letencrypt/Google/ZeroSSL
-* 申请过程遵循acme协议
-* 证书续期：
-  * 实际上没有办法不改变证书文件本身情况下直接续期或者续签。
-  * 我们所说的续期，其实就是按照全套流程重新申请一份新证书，然后重新部署上去。
-* 免费证书过期时间90天，以后可能还会缩短，所以自动化部署必不可少
-* 设置每天自动运行，当证书过期前35天，会自动重新申请证书并部署
-
-
-## 七、不同平台的设置说明
-
-* 已迁移到新的文档网站，请到常见问题章节查看
-* [最新文档站链接 https://certd.docmirror.cn](https://certd.docmirror.cn/)
-
-## 八、问题处理
-### 7.1 忘记管理员密码   
-[重置管理员密码方法](https://certd.docmirror.cn/guide/use/forgotpasswd/)
-
-## 九、联系作者
+## 六、联系作者
 如有疑问，欢迎加入群聊（请备注certd）
 
 | 加群 | 微信群 | QQ群 |
@@ -194,7 +131,7 @@ services:
 | 二维码 | <img height="230" src="./docs/guide/contact/images/me.png"> |
 
 
-## 十、捐赠
+## 七、捐赠
 ************************
 支持开源，为爱发电，我已入驻爱发电   
 https://afdian.com/a/greper
@@ -218,34 +155,26 @@ https://afdian.com/a/greper
 
 ************************
 
-## 十一、贡献代码
+## 八、贡献代码
 
-1. 本地开发 [贡献插件](https://certd.docmirror.cn/guide/development/)
+1. 本地开发请参考 [贡献插件向导](https://certd.docmirror.cn/guide/development/)
 2. 作为贡献者，代表您同意您贡献的代码如下许可：
    1. 可以调整开源协议以使其更严格或更宽松。
    2. 可以用于商业用途。
 
 
 
-## 十二、 开源许可
+## 九、 开源许可
 * 本项目遵循 GNU Affero General Public License（AGPL）开源协议。   
 * 允许个人和公司内部自由使用、复制、修改和分发本项目，未获得商业授权情况下禁止任何形式的商业用途 
 * 未获得商业授权情况下，禁止任何对logo、版权信息及授权许可相关代码的修改。
 * 如需商业授权，请联系作者。
 
 
-## 十三、我的其他项目（求Star）
+## 十、我的其他项目（求Star）
 
 | 项目名称                                                    | stars                                                                                                 | 项目描述                              | 
 |---------------------------------------------------------|-------------------------------------------------------------------------------------------------------|-----------------------------------|
 | [袖手AI](https://ai.handsfree.work/)                    |                                                                                                       | 袖手GPT，国内可用，无需FQ，每日免费额度            | 
 | [fast-crud](https://gitee.com/fast-crud/fast-crud/)     | <img alt="GitHub stars" src="https://img.shields.io/github/stars/fast-crud/fast-crud?logo=github"/>   | 基于vue3的crud快速开发框架                 |  
 | [dev-sidecar](https://github.com/docmirror/dev-sidecar/) | <img alt="GitHub stars" src="https://img.shields.io/github/stars/docmirror/dev-sidecar?logo=github"/> | 直连访问github工具，无需FQ，解决github无法访问的问题 |                       
-
-
-
-## 十四、更新日志
-
-更新日志：[CHANGELOG](./CHANGELOG.md)
-
-

build.trigger

@@ -1 +1 @@
-01:33
+17:28

docs/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,91 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+### Bug Fixes
+
+* 修复二次认证登录进入错误账号的bug ([e3930e0](https://github.com/certd/certd/commit/e3930e07172dd7903cb0f6ff26e0e3e828ba3e77))
+
+### Features
+
+* 从yaml文件注册插件 ([deb3893](https://github.com/certd/certd/commit/deb38938204b29543f36d3266249958faaaa6b66))
+
+### Performance Improvements
+
+* 优化cdnfly插件，支持自动匹配域名部署 ([afd59e9](https://github.com/certd/certd/commit/afd59e9933b2650f41c5d47684c171b93b962065))
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+### Bug Fixes
+
+* 服务器时间获取不准确的bug ([5d10cbf](https://github.com/certd/certd/commit/5d10cbf18daf94a90a7551641a3b13e3c5fec611))
+* 修复复制流水线无效的bug ([3df20a9](https://github.com/certd/certd/commit/3df20a924f32970b052e2588ea20de095f0ea693))
+* 修复http上传方式无法清除记录文件的bug ([72a7b51](https://github.com/certd/certd/commit/72a7b51d479602b2c54c6c3ac8d8a0dcb9664e73))
+* 修复token过期后，疯狂打印token过期信息的bug ([50a5fa1](https://github.com/certd/certd/commit/50a5fa15bb240a125bbc91d2ce1ff3c835888a77))
+
+### Performance Improvements
+
+* 从域名的soa获取主域名，子域名托管无需额外配置 ([a586a92](https://github.com/certd/certd/commit/a586a92d5e32ea846ac37be52a7ad8c328d89966))
+* 七牛oss支持删除过期备份 ([b7113bd](https://github.com/certd/certd/commit/b7113bda2378116d6c116dc583f563cce7cf9f00))
+* 数据库备份支持oss ([308d460](https://github.com/certd/certd/commit/308d4600efe2002f199c33b4594d3071784e58ea))
+* 支持阿里云中文域名申请 ([b3468cf](https://github.com/certd/certd/commit/b3468cf7f28228d7c9cf68de6b5a9bbeb67f2c6d))
+* 支持反向代理增加contextPath路径 ([0088929](https://github.com/certd/certd/commit/0088929622160cc922995de9a563e8061686ff34))
+* 支持中文域名 ([162ebfd](https://github.com/certd/certd/commit/162ebfd4e0c25727efb33952d3bbf7420a02e2c3))
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+### Performance Improvements
+
+* 添加部署证书至火山 Live ([abea80e](https://github.com/certd/certd/commit/abea80e3ab9b1672aebe1c5d5e856693b29931a8))
+* 优化首页插件列表展示 ([9b8f60b](https://github.com/certd/certd/commit/9b8f60b64b5f9a3db7dfa9b3dcbd9201984358d0))
+* 证书申请支持51dns ([8638fc9](https://github.com/certd/certd/commit/8638fc91ff34fccaf12ff9874fd3fa9d2a8c18b7))
+* 支持51dns ([96a0900](https://github.com/certd/certd/commit/96a0900edc95dcfd9acccf9d13592f12f5a09b3d))
+* ssh PTY模式登录设置 ([8385bcc](https://github.com/certd/certd/commit/8385bcc2d7f2411a07748bb5c53f9eaf4d38d7cc))
+* ssh伪终端模式优化，windows下不开启 ([42dfe93](https://github.com/certd/certd/commit/42dfe936b773b7bdd82ca3378363252ffffd7b71))
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+### Bug Fixes
+
+* 上传商用证书，直接粘贴文本报错的问题；修复无法上传ec加密证书的bug ([5750bb7](https://github.com/certd/certd/commit/5750bb706779da274d8e7a87e71416cb64d2df79))
+* 修复下载证书时提示token已过期的问题 ([0e07ae6](https://github.com/certd/certd/commit/0e07ae6ce84dcb9279d3c44060d621566afa593c))
+
+### Performance Improvements
+
+* 更新license时同时绑定url ([78367af](https://github.com/certd/certd/commit/78367af8307f801e778c76d49f0918c21ffe032f))
+* 切换到不同的分组后再打开创建对话框，会自动选择分组 ([893dcd4](https://github.com/certd/certd/commit/893dcd4f2487891199ed3e5a3d47a79a75efc942))
+* 新增部署到火山引擎ALB/CLB、上传到证书中心 ([c9a3e3d](https://github.com/certd/certd/commit/c9a3e3d9d26f964c7af7b56667936f1414fbf42a))
+* 优化/api缓存为0 ([dc05cd4](https://github.com/certd/certd/commit/dc05cd481f186b13375192be965000e6b4b429a5))
+* 优化华为cdn插件引用ccm证书 ([b565b4b](https://github.com/certd/certd/commit/b565b4b3b919b71b98ea2517670bc1ef00e00dc9))
+* 优化证书流水线创建，支持选择分组 ([d613aa8](https://github.com/certd/certd/commit/d613aa8f3e85d8dc475ef1b62d49394ce7fd7d24))
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+### Performance Improvements
+
+* 登录支持双重认证 ([48aef25](https://github.com/certd/certd/commit/48aef25b3f6499d674ca4e4ef16f4c62399fb735))
+* 多重认证登录 ([0f82cf4](https://github.com/certd/certd/commit/0f82cf409bc60706ab07e4ca4f272b9a1ca7eecb))
+* 优化部署到华为云CDN，支持先上传到ccm，再使用证书id部署，修复offline状态下导致部署报错的bug ([79df39a](https://github.com/certd/certd/commit/79df39acabab10ae7e1864dadcdc186bb007a3c5))
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+### Bug Fixes
+
+* 补充类型断言 ([2143dff](https://github.com/certd/certd/commit/2143dff2ae96e6a78bef9f0498e36f8cd9e6941f))
+* 修复腾讯云部署到任意资源插件，无法使用之前已上传的腾讯云证书问题 ([32c714d](https://github.com/certd/certd/commit/32c714d1b6e68c71a74a7452115040c87ac4bfdc))
+
+### Performance Improvements
+
+* 插件支持导入导出 ([cf8abb4](https://github.com/certd/certd/commit/cf8abb45282070c8ba91469f93fd379fabf1f74a))
+* 支持上传证书到华为云CCM ([cfd3b66](https://github.com/certd/certd/commit/cfd3b66be9ebf53a26693057e70ed60c3f116be9))
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+### Bug Fixes
+
+* 修复登录错误次数过多阻止再次登录逻辑 ([bf4d191](https://github.com/certd/certd/commit/bf4d191c8bd2f9209eb6768f662b9c77de99e998))
+
 ## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
 
 ### Bug Fixes

docs/guide/feature/safe/index.md

@@ -22,9 +22,11 @@ Certd 存储了证书以及授权等敏感数据，所以需要严格保障安
 * [站点隐藏设置说明](./hidden/)
   ![](./images/hidden.png)
 
-## 4、登录二次验证
+## 4、登录双重验证
 
-待实现
+支持2FA双重认证
+
+![](./images/2fa.png)
 
 ## 5、数据库自动备份【建议开启】
 * [自动备份设置说明](../../use/backup/)

docs/guide/index.md

@@ -17,6 +17,8 @@ Certd 是一款开源、免费、全自动申请和部署更新SSL证书的工
 * 支持SQLite、Postgresql、MySQL数据库
 
 
+  ![](../images/intro/intro.svg)
+
 ## 二、一些说明
 * 本项目申请证书过程遵循acme协议
 * 需要验证域名所有权，一般有两种方式

docs/guide/install/baota/index.md

@@ -13,7 +13,7 @@
 
 #### 2.1 应用商店一键部署【推荐】
 
-* 在应用商店中找到`certd`（要先点右上角更新应用）
+* 在宝塔Docker应用商店中找到`certd`（要先点右上角更新应用）
 * 点击安装，配置域名等基本信息即可完成安装
 
 > 需要宝塔9.2.0及以上版本才支持
@@ -70,3 +70,12 @@ admin/123456
 ## 五、备份恢复
 
 将备份的`db.sqlite`及同目录下的其他文件一起覆盖到原来的位置，重启certd即可
+
+
+## 六、宝塔部署相关问题排查
+
+### 1. 无法访问Certd
+1. 确认服务器的安全规则，是否放开了对应端口
+2. 确认宝塔防火墙是否放开对应端口
+3. 尝试将Certd容器加入宝塔的`bridge`网络 
+![](./images/network.png)

docs/guide/install/docker/index.md

@@ -55,6 +55,11 @@ https://your_server_ip:7002
 
 ## 二、升级
 
+::: warning   
+如果您是第一次升级certd版本，切记切记先备份一下数据    
+:::
+
+
 ### 如果使用固定版本号
 1. 修改`docker-compose.yaml`中的镜像版本号
 2. 运行`docker compose up -d` 即可

docs/guide/install/source/index.md

@@ -44,6 +44,11 @@ kill -9 $(lsof -t -i:7001)
 ./start.sh
 ```
 
+::: warning   
+升级certd版本前，切记切记先备份一下数据    
+:::
+
+
 ## 三、数据备份
 > 数据默认保存在 `./packages/ui/certd-server/data` 目录下    
 > 建议配置一条[数据库备份流水线](../../use/backup/)  自动备份

docs/guide/install/upgrade.md

@@ -8,5 +8,9 @@
 3. [1Panel面板方式部署升级](./1panel/#三、升级)
 4. [源码方式部署](./source/#二、升级)
 
+::: warning   
+如果您是第一次升级certd版本，切记切记先备份一下数据    
+:::
+
 ## 升级日志
 [CHANGELOG](../changelogs/CHANGELOG.md)

docs/guide/use/backup/index.md

@@ -1,5 +1,6 @@
-# 数据库自动备份
-
+# 数据库备份
+* 两种备份方法：  1、手动备份  2、自动备份
+* 本文仅限sqlite数据库。
 ## 一、手动备份
 数据库文件根据不同的部署方式保存的位置不一样，您可以手动复制出来进行备份
 

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.33.3"
+  "version": "1.34.1"
 }

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,43 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/publishlab/node-acme-client/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+### Bug Fixes
+
+* 根据SOA记录判断子域名托管有缺陷，改回手动配置子域名托管记录的方式 ([1b280a2](https://github.com/publishlab/node-acme-client/commit/1b280a2940f9e2d919b0bf23b89cc185be1fa498))
+
+# [1.34.0](https://github.com/publishlab/node-acme-client/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.33.8](https://github.com/publishlab/node-acme-client/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+### Bug Fixes
+
+* 修复http上传方式无法清除记录文件的bug ([72a7b51](https://github.com/publishlab/node-acme-client/commit/72a7b51d479602b2c54c6c3ac8d8a0dcb9664e73))
+
+### Performance Improvements
+
+* 从域名的soa获取主域名，子域名托管无需额外配置 ([a586a92](https://github.com/publishlab/node-acme-client/commit/a586a92d5e32ea846ac37be52a7ad8c328d89966))
+* 七牛oss支持删除过期备份 ([b7113bd](https://github.com/publishlab/node-acme-client/commit/b7113bda2378116d6c116dc583f563cce7cf9f00))
+
+## [1.33.7](https://github.com/publishlab/node-acme-client/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.33.6](https://github.com/publishlab/node-acme-client/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.33.5](https://github.com/publishlab/node-acme-client/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.33.4](https://github.com/publishlab/node-acme-client/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.33.3](https://github.com/publishlab/node-acme-client/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 **Note:** Version bump only for package @certd/acme-client

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.33.3",
+    "version": "1.34.1",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.33.3",
+        "@certd/basic": "^1.34.1",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.7.2",
@@ -26,7 +26,8 @@
         "http-proxy-agent": "^7.0.2",
         "https-proxy-agent": "^7.0.5",
         "lodash-es": "^4.17.21",
-        "node-forge": "^1.3.1"
+        "node-forge": "^1.3.1",
+        "punycode": "^2.3.1"
     },
     "devDependencies": {
         "@types/node": "^20.14.10",
@@ -67,5 +68,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "be69244e8ddb757de45c7e2b6033195c1f5a6910"
+    "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
 }

packages/core/acme-client/src/auto.js

@@ -117,12 +117,12 @@ export default async (client, userOpts) => {
 
         log(`[auto] [${d}] Trigger challengeCreateFn()`);
         try {
-            const { recordReq, recordRes, dnsProvider, challenge, keyAuthorization } = await opts.challengeCreateFn(authz, keyAuthorizationGetter);
+            const { recordReq, recordRes, dnsProvider, challenge, keyAuthorization ,httpUploader} = await opts.challengeCreateFn(authz, keyAuthorizationGetter);
             clearTasks.push(async () => {
                 /* Trigger challengeRemoveFn(), suppress errors */
                 log(`[auto] [${d}] Trigger challengeRemoveFn()`);
                 try {
-                    await opts.challengeRemoveFn(authz, challenge, keyAuthorization, recordReq, recordRes, dnsProvider);
+                    await opts.challengeRemoveFn(authz, challenge, keyAuthorization, recordReq, recordRes, dnsProvider,httpUploader);
                 } catch (e) {
                     log(`[auto] [${d}] challengeRemoveFn threw error: ${e.message}`);
                 }

packages/core/acme-client/src/index.js

@@ -46,3 +46,5 @@ export *  from './axios.js'
 export * from './logger.js'
 export * from './verify.js'
 export * from './error.js'
+
+export * from './util.js'

packages/core/acme-client/src/util.js

@@ -340,5 +340,6 @@ export {
     formatResponseError,
     getAuthoritativeDnsResolver,
     retrieveTlsAlpnCertificate,
+    resolveDomainBySoaRecord
 };
 

packages/core/acme-client/test/soa.spec.mjs

@@ -0,0 +1,11 @@
+import {assert} from 'chai'
+import {resolveDomainBySoaRecord} from "../src/util.js"
+describe('dns', () => {
+    it('resolveDomainBySoaRecord', async () => {
+        const resp = await resolveDomainBySoaRecord("a.corp.smartdeer.com")
+
+        assert.equal(resp, "smartdeer.com")
+
+    });
+
+})

packages/core/acme-client/types/index.d.ts

@@ -59,7 +59,7 @@ export interface ClientExternalAccountBindingOptions {
 export interface ClientAutoOptions {
     csr: CsrBuffer | CsrString;
     challengeCreateFn: (authz: Authorization, keyAuthorization: (challenge:rfc8555.Challenge)=>Promise<string>) => Promise<{recordReq?:any,recordRes?:any,dnsProvider?:any,challenge: rfc8555.Challenge,keyAuthorization:string}>;
-    challengeRemoveFn: (authz: Authorization, challenge: rfc8555.Challenge, keyAuthorization: string,recordReq:any, recordRes:any,dnsProvider:any) => Promise<any>;
+    challengeRemoveFn: (authz: Authorization, challenge: rfc8555.Challenge, keyAuthorization: string,recordReq:any, recordRes:any,dnsProvider:any,httpUploader:any) => Promise<any>;
     email?: string;
     termsOfServiceAgreed?: boolean;
     skipChallengeVerification?: boolean;
@@ -204,4 +204,6 @@ export function setLogger(fn: (message: any, ...args: any[]) => void): void;
 
 export function walkTxtRecord(record: any): Promise<string[]>;
 
-export const CancelError: typeof CancelError;
+export const CancelError: typeof CancelError;
+
+export function resolveDomainBySoaRecord(domain: string): Promise<string>;

packages/core/acme-client/types/index.test-d.js

@@ -1,137 +0,0 @@
-"use strict";
-/**
- * acme-client type definition tests
- */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var acme = require("acme-client");
-(function () { return __awaiter(void 0, void 0, void 0, function () {
-    var accountKey, client, order, authorizations, authorization, challenge, _a, certKey, certCsr;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, acme.crypto.createPrivateKey()];
-            case 1:
-                accountKey = _b.sent();
-                client = new acme.Client({
-                    accountKey: accountKey,
-                    directoryUrl: acme.directory.letsencrypt.staging
-                });
-                /* Account */
-                return [4 /*yield*/, client.createAccount({
-                        termsOfServiceAgreed: true,
-                        contact: ['mailto:test@example.com']
-                    })];
-            case 2:
-                /* Account */
-                _b.sent();
-                return [4 /*yield*/, client.createOrder({
-                        identifiers: [
-                            { type: 'dns', value: 'example.com' },
-                            { type: 'dns', value: '*.example.com' },
-                        ]
-                    })];
-            case 3:
-                order = _b.sent();
-                return [4 /*yield*/, client.getOrder(order)];
-            case 4:
-                _b.sent();
-                return [4 /*yield*/, client.getAuthorizations(order)];
-            case 5:
-                authorizations = _b.sent();
-                authorization = authorizations[0];
-                challenge = authorization.challenges[0];
-                return [4 /*yield*/, client.getChallengeKeyAuthorization(challenge)];
-            case 6:
-                _b.sent();
-                return [4 /*yield*/, client.verifyChallenge(authorization, challenge)];
-            case 7:
-                _b.sent();
-                return [4 /*yield*/, client.completeChallenge(challenge)];
-            case 8:
-                _b.sent();
-                return [4 /*yield*/, client.waitForValidStatus(challenge)];
-            case 9:
-                _b.sent();
-                return [4 /*yield*/, acme.crypto.createCsr({
-                        commonName: 'example.com',
-                        altNames: ['example.com', '*.example.com']
-                    })];
-            case 10:
-                _a = _b.sent(), certKey = _a[0], certCsr = _a[1];
-                return [4 /*yield*/, client.finalizeOrder(order, certCsr)];
-            case 11:
-                _b.sent();
-                return [4 /*yield*/, client.getCertificate(order)];
-            case 12:
-                _b.sent();
-                return [4 /*yield*/, client.getCertificate(order, 'DST Root CA X3')];
-            case 13:
-                _b.sent();
-                /* Auto */
-                return [4 /*yield*/, client.auto({
-                        csr: certCsr,
-                        challengeCreateFn: function (authz, challenge, keyAuthorization) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-                            return [2 /*return*/];
-                        }); }); },
-                        challengeRemoveFn: function (authz, challenge, keyAuthorization) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-                            return [2 /*return*/];
-                        }); }); }
-                    })];
-            case 14:
-                /* Auto */
-                _b.sent();
-                return [4 /*yield*/, client.auto({
-                        csr: certCsr,
-                        email: 'test@example.com',
-                        termsOfServiceAgreed: false,
-                        skipChallengeVerification: false,
-                        challengePriority: ['http-01', 'dns-01'],
-                        preferredChain: 'DST Root CA X3',
-                        challengeCreateFn: function (authz, challenge, keyAuthorization) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-                            return [2 /*return*/];
-                        }); }); },
-                        challengeRemoveFn: function (authz, challenge, keyAuthorization) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-                            return [2 /*return*/];
-                        }); }); }
-                    })];
-            case 15:
-                _b.sent();
-                return [2 /*return*/];
-        }
-    });
-}); })();

packages/core/basic/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/certd/certd/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+### Performance Improvements
+
+* 支持部署证书到火山dcdn ([5f85219](https://github.com/certd/certd/commit/5f852194953dc1b4e6336770f417507b8f5a33ad))
+
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+### Performance Improvements
+
+* 支持51dns ([96a0900](https://github.com/certd/certd/commit/96a0900edc95dcfd9acccf9d13592f12f5a09b3d))
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+### Performance Improvements
+
+* 多重认证登录 ([0f82cf4](https://github.com/certd/certd/commit/0f82cf409bc60706ab07e4ca4f272b9a1ca7eecb))
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/basic
+
 ## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

@@ -1 +1 @@
-22:22
+00:16

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.33.3",
+  "version": "1.34.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -44,5 +44,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "be69244e8ddb757de45c7e2b6033195c1f5a6910"
+  "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
 }

packages/core/basic/src/utils/util.id.ts

@@ -1,4 +1,4 @@
 import { customAlphabet } from "nanoid";
 
 export const randomNumber = customAlphabet("1234567890", 4);
-export const simpleNanoId = customAlphabet("1234567890abcdefghijklmopqrstuvwxyz", 12);
+export const simpleNanoId = customAlphabet("1234567890abcdefghijklmopqrstuvwxyzABCDEFGHIJKLMOPQRSTUVWXYZ", 12);

packages/core/basic/src/utils/util.options.ts

@@ -1,4 +1,4 @@
-import { domainUtils } from './util.domain.js';
+import { domainUtils } from "./util.domain.js";
 
 function groupByDomain(options: any[], inDomains: string[]) {
   const matched = [];
@@ -19,16 +19,16 @@ function groupByDomain(options: any[], inDomains: string[]) {
 function buildGroupOptions(options: any[], inDomains: string[]) {
   const grouped = groupByDomain(options, inDomains);
   const groupOptions = [];
-  groupOptions.push({ value: 'matched', disabled: true, label: '----已匹配----' });
+  groupOptions.push({ value: "matched", disabled: true, label: "----已匹配----" });
   if (grouped.matched.length === 0) {
-    options.push({ value: '', disabled: true, label: '没有可以匹配的域名' });
+    options.push({ value: "", disabled: true, label: "没有可以匹配的域名" });
   } else {
     for (const matched of grouped.matched) {
       groupOptions.push(matched);
     }
   }
   if (grouped.notMatched.length > 0) {
-    groupOptions.push({ value: 'unmatched', disabled: true, label: '----未匹配----' });
+    groupOptions.push({ value: "unmatched", disabled: true, label: "----未匹配----" });
     for (const notMatched of grouped.notMatched) {
       groupOptions.push(notMatched);
     }

packages/core/basic/src/utils/util.request.ts

@@ -1,13 +1,13 @@
-import axios, { AxiosHeaders, AxiosRequestConfig } from 'axios';
-import { ILogger, logger } from './util.log.js';
-import { Logger } from 'log4js';
-import { HttpProxyAgent } from 'http-proxy-agent';
-import { HttpsProxyAgent } from 'https-proxy-agent';
-import nodeHttp from 'http';
-import * as https from 'node:https';
-import { merge } from 'lodash-es';
-import { safePromise } from './util.promise.js';
-import fs from 'fs';
+import axios, { AxiosHeaders, AxiosRequestConfig } from "axios";
+import { ILogger, logger } from "./util.log.js";
+import { Logger } from "log4js";
+import { HttpProxyAgent } from "http-proxy-agent";
+import { HttpsProxyAgent } from "https-proxy-agent";
+import nodeHttp from "http";
+import * as https from "node:https";
+import { merge } from "lodash-es";
+import { safePromise } from "./util.promise.js";
+import fs from "fs";
 export class HttpError extends Error {
   status?: number;
   statusText?: string;
@@ -22,10 +22,10 @@ export class HttpError extends Error {
     super(error.message || error.response?.statusText);
 
     const message = error?.message;
-    if (message && typeof message === 'string') {
-      if (message.indexOf && message.indexOf('ssl3_get_record:wrong version number') >= 0) {
+    if (message && typeof message === "string") {
+      if (message.indexOf && message.indexOf("ssl3_get_record:wrong version number") >= 0) {
         this.message = `${message}(http协议错误，服务端要求http协议，请检查是否使用了https请求)`;
-      } else if (message.indexOf('getaddrinfo EAI_AGAIN') >= 0) {
+      } else if (message.indexOf("getaddrinfo EAI_AGAIN") >= 0) {
         this.message = `${message}(无法解析域名，请检查网络连接或dns配置，更换docker-compose.yaml中dns配置)`;
       }
     }
@@ -47,7 +47,7 @@ export class HttpError extends Error {
     };
     let url = error.config?.url;
     if (error.config?.baseURL) {
-      url = (error.config?.baseURL || '') + url;
+      url = (error.config?.baseURL || "") + url;
     }
     if (url) {
       this.message = `${this.message} 【${url}】`;
@@ -73,7 +73,7 @@ export const HttpCommonError = HttpError;
 let defaultAgents = createAgent();
 
 export function setGlobalProxy(opts: { httpProxy?: string; httpsProxy?: string }) {
-  logger.info('setGlobalProxy:', opts);
+  logger.info("setGlobalProxy:", opts);
   defaultAgents = createAgent(opts);
 }
 
@@ -102,12 +102,12 @@ export function createAxiosService({ logger }: { logger: Logger }) {
       if (config.skipSslVerify || config.httpProxy) {
         let rejectUnauthorized = true;
         if (config.skipSslVerify) {
-          logger.info('跳过SSL验证');
+          logger.info("跳过SSL验证");
           rejectUnauthorized = false;
         }
         const proxy: any = {};
         if (config.httpProxy) {
-          logger.info('使用自定义http代理:', config.httpProxy);
+          logger.info("使用自定义http代理:", config.httpProxy);
           proxy.httpProxy = config.httpProxy;
           proxy.httpsProxy = config.httpProxy;
         }
@@ -128,7 +128,7 @@ export function createAxiosService({ logger }: { logger: Logger }) {
     },
     (error: Error) => {
       // 发送失败
-      logger.error('接口请求失败：', error);
+      logger.error("接口请求失败：", error);
       return Promise.reject(error);
     }
   );
@@ -143,7 +143,7 @@ export function createAxiosService({ logger }: { logger: Logger }) {
 
         logger.info(`http response : status=${response?.status},data=${resData}`);
       } else {
-        logger.info('http response status:', response?.status);
+        logger.info("http response status:", response?.status);
       }
       if (response?.config?.returnResponse) {
         return response;
@@ -154,53 +154,51 @@ export function createAxiosService({ logger }: { logger: Logger }) {
       const status = error.response?.status;
       switch (status) {
         case 400:
-          error.message = '请求错误';
+          error.message = "请求错误";
           break;
         case 401:
-          error.message = '认证/登录失败';
+          error.message = "认证/登录失败";
           break;
         case 403:
-          error.message = '拒绝访问';
+          error.message = "拒绝访问";
           break;
         case 404:
           error.message = `请求地址出错`;
           break;
         case 408:
-          error.message = '请求超时';
+          error.message = "请求超时";
           break;
         case 500:
-          error.message = '服务器内部错误';
+          error.message = "服务器内部错误";
           break;
         case 501:
-          error.message = '服务未实现';
+          error.message = "服务未实现";
           break;
         case 502:
-          error.message = '网关错误';
+          error.message = "网关错误";
           break;
         case 503:
-          error.message = '服务不可用';
+          error.message = "服务不可用";
           break;
         case 504:
-          error.message = '网关超时';
+          error.message = "网关超时";
           break;
         case 505:
-          error.message = 'HTTP版本不受支持';
+          error.message = "HTTP版本不受支持";
           break;
         default:
           break;
       }
-      logger.error(
-        `请求出错：status:${error.response?.status},statusText:${error.response?.statusText},url:${error.config?.url},method:${error.config?.method}。`
-      );
-      logger.error('返回数据:', JSON.stringify(error.response?.data));
+      logger.error(`请求出错：status:${error.response?.status},statusText:${error.response?.statusText},url:${error.config?.url},method:${error.config?.method}。`);
+      logger.error("返回数据:", JSON.stringify(error.response?.data));
       if (error.response?.data) {
         const message = error.response.data.message || error.response.data.msg || error.response.data.error;
-        if (typeof message === 'string') {
+        if (typeof message === "string") {
           error.message = message;
         }
       }
       if (error instanceof AggregateError) {
-        logger.error('AggregateError', error);
+        logger.error("AggregateError", error);
       }
       const err = new HttpError(error);
       return Promise.reject(err);
@@ -244,24 +242,24 @@ export function createAgent(opts: CreateAgentOptions = {}) {
   if (httpProxy) {
     process.env.HTTP_PROXY = httpProxy;
     process.env.http_proxy = httpProxy;
-    logger.info('use httpProxy:', httpProxy);
+    logger.info("use httpProxy:", httpProxy);
     httpAgent = new HttpProxyAgent(httpProxy, opts as any);
     merge(httpAgent.options, opts);
   } else {
-    process.env.HTTP_PROXY = '';
-    process.env.http_proxy = '';
+    process.env.HTTP_PROXY = "";
+    process.env.http_proxy = "";
     httpAgent = new nodeHttp.Agent(opts);
   }
   const httpsProxy = opts.httpsProxy;
   if (httpsProxy) {
     process.env.HTTPS_PROXY = httpsProxy;
     process.env.https_proxy = httpsProxy;
-    logger.info('use httpsProxy:', httpsProxy);
+    logger.info("use httpsProxy:", httpsProxy);
     httpsAgent = new HttpsProxyAgent(httpsProxy, opts as any);
     merge(httpsAgent.options, opts);
   } else {
-    process.env.HTTPS_PROXY = '';
-    process.env.https_proxy = '';
+    process.env.HTTPS_PROXY = "";
+    process.env.https_proxy = "";
     httpsAgent = new https.Agent(opts);
   }
   return {
@@ -276,27 +274,27 @@ export async function download(req: { http: HttpClient; config: HttpRequestConfi
     http
       .request({
         logRes: false,
-        responseType: 'stream',
+        responseType: "stream",
         ...config,
       })
       .then(res => {
         const writer = fs.createWriteStream(savePath);
         res.pipe(writer);
-        writer.on('close', () => {
-          logger.info('文件下载成功');
+        writer.on("close", () => {
+          logger.info("文件下载成功");
           resolve(true);
         });
         //error
-        writer.on('error', err => {
-          logger.error('下载失败', err);
+        writer.on("error", err => {
+          logger.error("下载失败", err);
           reject(err);
         });
         //进度条打印
-        const totalLength = res.headers['content-length'];
+        const totalLength = res.headers["content-length"];
         let currentLength = 0;
         // 每5%打印一次
         const step = (totalLength / 100) * 5;
-        res.on('data', (chunk: any) => {
+        res.on("data", (chunk: any) => {
           currentLength += chunk.length;
           if (currentLength % step < chunk.length) {
             const percent = ((currentLength / totalLength) * 100).toFixed(2);
@@ -305,19 +303,19 @@ export async function download(req: { http: HttpClient; config: HttpRequestConfi
         });
       })
       .catch(err => {
-        logger.info('下载失败', err);
+        logger.info("下载失败", err);
         reject(err);
       });
   });
 }
 
 export function getCookie(response: any, name: string) {
-  const cookies = response.headers['set-cookie'];
+  const cookies = response.headers["set-cookie"];
   //根据name 返回对应的cookie
   const found = cookies.find((cookie: any) => cookie.includes(name));
   if (!found) {
     return null;
   }
-  const cookie = found.split(';')[0];
-  return cookie.substring(cookie.indexOf('=') + 1);
+  const cookie = found.split(";")[0];
+  return cookie.substring(cookie.indexOf("=") + 1);
 }

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/certd/certd/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+**Note:** Version bump only for package @certd/pipeline
+
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.33.3",
+  "version": "1.34.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,8 +16,8 @@
     "test": "mocha   --loader=ts-node/esm"
   },
   "dependencies": {
-    "@certd/basic": "^1.33.3",
-    "@certd/plus-core": "^1.33.3",
+    "@certd/basic": "^1.34.1",
+    "@certd/plus-core": "^1.34.1",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
     "reflect-metadata": "^0.1.13"
@@ -43,5 +43,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "be69244e8ddb757de45c7e2b6033195c1f5a6910"
+  "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
 }

packages/core/pipeline/src/decorator/common.ts

@@ -1,17 +0,0 @@
-import { Decorator } from "./index.js";
-
-export type AutowireProp = {
-  name?: string;
-  type?: any;
-};
-export const AUTOWIRE_KEY = "pipeline:autowire";
-
-export function Autowire(props?: AutowireProp): PropertyDecorator {
-  return (target, propertyKey) => {
-    const _type = Reflect.getMetadata("design:type", target, propertyKey);
-    target = Decorator.target(target, propertyKey);
-    props = props || {};
-    props.type = _type;
-    Reflect.defineMetadata(AUTOWIRE_KEY, props || {}, target, propertyKey);
-  };
-}

packages/core/pipeline/src/decorator/index.ts

@@ -1,2 +1 @@
 export * from "./utils.js";
-export * from "./common.js";

packages/core/pipeline/src/plugin/api.ts

@@ -51,10 +51,6 @@ export type PluginDefine = Registrable & {
     [key: string]: TaskOutputDefine;
   };
 
-  autowire?: {
-    [key: string]: any;
-  };
-
   shortcut?: {
     [key: string]: {
       title: string;

packages/core/pipeline/src/plugin/decorator.ts

@@ -1,7 +1,6 @@
 import { pluginRegistry } from "./registry.js";
 import { PluginDefine, TaskInputDefine, TaskOutputDefine } from "./api.js";
 import { Decorator } from "../decorator/index.js";
-import { AUTOWIRE_KEY } from "../decorator/index.js";
 import "reflect-metadata";
 import { merge, sortBy } from "lodash-es";
 // 提供一个唯一 key
@@ -12,7 +11,6 @@ export function IsTaskPlugin(define: PluginDefine): ClassDecorator {
     target = Decorator.target(target);
 
     const inputs: any = {};
-    const autowires: any = {};
     const outputs: any = {};
     const properties = Decorator.getClassProperties(target);
     for (const property in properties) {
@@ -21,11 +19,6 @@ export function IsTaskPlugin(define: PluginDefine): ClassDecorator {
         inputs[property] = input;
       }
 
-      const autowire = Reflect.getMetadata(AUTOWIRE_KEY, target, property);
-      if (autowire) {
-        autowires[property] = autowire;
-      }
-
       const output = Reflect.getMetadata(PLUGIN_OUTPUT_KEY, target, property);
       if (output) {
         outputs[property] = output;
@@ -57,7 +50,7 @@ export function IsTaskPlugin(define: PluginDefine): ClassDecorator {
       },
     };
 
-    define = merge(defaultConfig, define, { input: inputMap, autowire: autowires, output: outputs });
+    define = merge(defaultConfig, define, { input: inputMap, output: outputs });
 
     Reflect.defineMetadata(PLUGIN_CLASS_KEY, define, target);
 

packages/core/pipeline/src/registry/registry.ts

@@ -65,7 +65,7 @@ export class Registry<T = any> {
   }
 
   getDefineList() {
-    const list = [];
+    let list = [];
     for (const key in this.storage) {
       const define = this.getDefine(key);
       if (define) {
@@ -78,6 +78,10 @@ export class Registry<T = any> {
         list.push({ ...define, key });
       }
     }
+
+    list = list.sort((a, b) => {
+      return (a.order ?? 10) - (b?.order ?? 10);
+    });
     return list;
   }
 

packages/libs/lib-huawei/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/certd/certd/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 **Note:** Version bump only for package @certd/lib-huawei

packages/libs/lib-huawei/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-huawei",
   "private": false,
-  "version": "1.33.3",
+  "version": "1.34.1",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
@@ -23,5 +23,5 @@
     "prettier": "^2.8.8",
     "tslib": "^2.8.1"
   },
-  "gitHead": "be69244e8ddb757de45c7e2b6033195c1f5a6910"
+  "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
 }

packages/libs/lib-iframe/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/certd/certd/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+### Performance Improvements
+
+* 更新license时同时绑定url ([78367af](https://github.com/certd/certd/commit/78367af8307f801e778c76d49f0918c21ffe032f))
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 **Note:** Version bump only for package @certd/lib-iframe

packages/libs/lib-iframe/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-iframe",
   "private": false,
-  "version": "1.33.3",
+  "version": "1.34.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -30,5 +30,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "be69244e8ddb757de45c7e2b6033195c1f5a6910"
+  "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
 }

packages/libs/lib-iframe/src/lib/iframe.client.ts

@@ -65,7 +65,7 @@ export class IframeClient {
     return window.self !== window.top;
   }
 
-  register<T = any>(action: string, handler: (data: IframeMessageData<T>) => Promise<void>) {
+  register<T = any>(action: string, handler: (data: IframeMessageData<T>) => Promise<any>) {
     this.handlers[action] = handler;
   }
 

packages/libs/lib-jdcloud/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/certd/certd/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/jdcloud
+
 ## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 **Note:** Version bump only for package @certd/jdcloud

packages/libs/lib-jdcloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/jdcloud",
-  "version": "1.33.3",
+  "version": "1.34.1",
   "description": "jdcloud openApi sdk",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
@@ -60,5 +60,5 @@
       "fetch"
     ]
   },
-  "gitHead": "be69244e8ddb757de45c7e2b6033195c1f5a6910"
+  "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
 }

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/certd/certd/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 **Note:** Version bump only for package @certd/lib-k8s

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.33.3",
+  "version": "1.34.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,7 +16,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/basic": "^1.33.3",
+    "@certd/basic": "^1.34.1",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "be69244e8ddb757de45c7e2b6033195c1f5a6910"
+  "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
 }

packages/libs/lib-server/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/certd/certd/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+**Note:** Version bump only for package @certd/lib-server
+
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+### Performance Improvements
+
+* 登录支持双重认证 ([48aef25](https://github.com/certd/certd/commit/48aef25b3f6499d674ca4e4ef16f4c62399fb735))
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/lib-server
+
 ## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 **Note:** Version bump only for package @certd/lib-server

packages/libs/lib-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.33.3",
+  "version": "1.34.1",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -27,10 +27,10 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.33.3",
-    "@certd/basic": "^1.33.3",
-    "@certd/pipeline": "^1.33.3",
-    "@certd/plus-core": "^1.33.3",
+    "@certd/acme-client": "^1.34.1",
+    "@certd/basic": "^1.34.1",
+    "@certd/pipeline": "^1.34.1",
+    "@certd/plus-core": "^1.34.1",
     "@midwayjs/cache": "~3.14.0",
     "@midwayjs/core": "~3.20.3",
     "@midwayjs/i18n": "~3.20.3",
@@ -61,5 +61,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "be69244e8ddb757de45c7e2b6033195c1f5a6910"
+  "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
 }

packages/libs/lib-server/src/basic/constants.ts

@@ -75,6 +75,10 @@ export const Constants = {
       code: 10010,
       message: '站点已关闭',
     },
+    need2fa:{
+      code: 10020,
+      message: '需要2FA认证',
+    },
     openKeyError: {
       code: 20000,
       message: 'ApiToken错误',

packages/libs/lib-server/src/basic/exception/auth-exception.ts

@@ -1,10 +1,19 @@
 import { Constants } from '../constants.js';
 import { BaseException } from './base-exception.js';
+import { TextException } from "./common-exception.js";
 /**
  * 授权异常
  */
 export class AuthException extends BaseException {
-  constructor(message) {
+  constructor(message?:string) {
     super('AuthException', Constants.res.auth.code, message ? message : Constants.res.auth.message);
   }
 }
+
+
+export class Need2FAException extends TextException {
+  constructor(message:string,data:any) {
+    super('Need2FAException', Constants.res.need2fa.code, message ? message : Constants.res.need2fa.message,data);
+  }
+}
+

packages/libs/lib-server/src/basic/exception/base-exception.ts

@@ -3,9 +3,11 @@
  */
 export class BaseException extends Error {
   code: number;
-  constructor(name, code, message) {
+  data?:any
+  constructor(name, code, message,data?:any) {
     super(message);
     this.name = name;
     this.code = code;
+    this.data = data;
   }
 }

packages/libs/lib-server/src/basic/exception/common-exception.ts

@@ -1,16 +1,23 @@
-import { Constants } from '../constants.js';
-import { BaseException } from './base-exception.js';
+import { Constants } from "../constants.js";
+import { BaseException } from "./base-exception.js";
+
 /**
  * 通用异常
  */
 export class CommonException extends BaseException {
   constructor(message) {
-    super('CommonException', Constants.res.error.code, message ? message : Constants.res.error.message);
+    super("CommonException", Constants.res.error.code, message ? message : Constants.res.error.message);
   }
 }
 
 export class CodeException extends BaseException {
   constructor(res: { code: number; message: string }) {
-    super('CodeException', res.code, res.message);
+    super("CodeException", res.code, res.message);
+  }
+}
+
+export class TextException extends BaseException {
+  constructor(name, code,message, data?) {
+    super(name, code, message, data);
   }
 }

packages/libs/lib-server/src/basic/result.ts

@@ -2,14 +2,15 @@ export class Result<T> {
   code: number;
   msg: string;
   data: T;
+
   constructor(code, msg, data?) {
     this.code = code;
     this.msg = msg;
     this.data = data;
   }
 
-  static error(code = 1, msg) {
-    return new Result(code, msg);
+  static error(code = 1, msg, data?: any) {
+    return new Result(code, msg, data);
   }
 
   static success(msg, data?) {

packages/libs/midway-flyway-js/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/certd/certd/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 **Note:** Version bump only for package @certd/midway-flyway-js

packages/libs/midway-flyway-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/midway-flyway-js",
-  "version": "1.33.3",
+  "version": "1.34.1",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "be69244e8ddb757de45c7e2b6033195c1f5a6910"
+  "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
 }

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,45 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/certd/certd/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+### Bug Fixes
+
+* 根据SOA记录判断子域名托管有缺陷，改回手动配置子域名托管记录的方式 ([1b280a2](https://github.com/certd/certd/commit/1b280a2940f9e2d919b0bf23b89cc185be1fa498))
+
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+### Bug Fixes
+
+* 修复http上传方式无法清除记录文件的bug ([72a7b51](https://github.com/certd/certd/commit/72a7b51d479602b2c54c6c3ac8d8a0dcb9664e73))
+
+### Performance Improvements
+
+* 从域名的soa获取主域名，子域名托管无需额外配置 ([a586a92](https://github.com/certd/certd/commit/a586a92d5e32ea846ac37be52a7ad8c328d89966))
+* 数据库备份支持oss ([308d460](https://github.com/certd/certd/commit/308d4600efe2002f199c33b4594d3071784e58ea))
+* 支持阿里云中文域名申请 ([b3468cf](https://github.com/certd/certd/commit/b3468cf7f28228d7c9cf68de6b5a9bbeb67f2c6d))
+* 支持中文域名 ([162ebfd](https://github.com/certd/certd/commit/162ebfd4e0c25727efb33952d3bbf7420a02e2c3))
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
 ## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 **Note:** Version bump only for package @certd/plugin-cert

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.33.3",
+  "version": "1.34.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -15,15 +15,16 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.33.3",
-    "@certd/basic": "^1.33.3",
-    "@certd/pipeline": "^1.33.3",
-    "@certd/plugin-lib": "^1.33.3",
+    "@certd/acme-client": "^1.34.1",
+    "@certd/basic": "^1.34.1",
+    "@certd/pipeline": "^1.34.1",
+    "@certd/plugin-lib": "^1.34.1",
     "@google-cloud/publicca": "^1.3.0",
     "dayjs": "^1.11.7",
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
     "psl": "^1.9.0",
+    "punycode": "^2.3.1",
     "rimraf": "^5.0.5"
   },
   "devDependencies": {
@@ -41,5 +42,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "be69244e8ddb757de45c7e2b6033195c1f5a6910"
+  "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
 }

packages/plugins/plugin-cert/src/dns-provider/api.ts

@@ -4,9 +4,6 @@ import { IAccess, Registrable } from "@certd/pipeline";
 export type DnsProviderDefine = Registrable & {
   accessType: string;
   icon?: string;
-  autowire?: {
-    [key: string]: any;
-  };
 };
 
 export type CreateRecordOptions = {
@@ -35,6 +32,8 @@ export interface IDnsProvider<T = any> {
   createRecord(options: CreateRecordOptions): Promise<T>;
   removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
   setCtx(ctx: DnsProviderContext): void;
+  //中文域名是否需要punycode转码，如果返回True，则使用punycode来添加解析记录，否则使用中文域名添加解析记录
+  usePunyCode(): boolean;
 }
 
 export interface ISubDomainsGetter {

packages/plugins/plugin-cert/src/dns-provider/base.ts

@@ -1,6 +1,5 @@
 import { CreateRecordOptions, DnsProviderContext, DnsProviderDefine, IDnsProvider, RemoveRecordOptions } from "./api.js";
 import { dnsProviderRegistry } from "./registry.js";
-import { Decorator } from "@certd/pipeline";
 import { HttpClient, ILogger } from "@certd/basic";
 
 export abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
@@ -8,6 +7,10 @@ export abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
   http!: HttpClient;
   logger!: ILogger;
 
+  usePunyCode(): boolean {
+    return false;
+  }
+
   setCtx(ctx: DnsProviderContext) {
     this.ctx = ctx;
     this.logger = ctx.logger;
@@ -28,15 +31,13 @@ export abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
 export async function createDnsProvider(opts: { dnsProviderType: string; context: DnsProviderContext }): Promise<IDnsProvider> {
   const { dnsProviderType, context } = opts;
   const dnsProviderPlugin = dnsProviderRegistry.get(dnsProviderType);
-  const DnsProviderClass = dnsProviderPlugin.target;
+  const DnsProviderClass = await dnsProviderPlugin.target();
   const dnsProviderDefine = dnsProviderPlugin.define as DnsProviderDefine;
   if (dnsProviderDefine.deprecated) {
     context.logger.warn(dnsProviderDefine.deprecated);
   }
   // @ts-ignore
   const dnsProvider: IDnsProvider = new DnsProviderClass();
-
-  Decorator.inject(dnsProviderDefine.autowire, dnsProvider, context);
   dnsProvider.setCtx(context);
   await dnsProvider.onInstance();
   return dnsProvider;

packages/plugins/plugin-cert/src/dns-provider/decorator.ts

@@ -1,6 +1,6 @@
 import { dnsProviderRegistry } from "./registry.js";
 import { DnsProviderDefine } from "./api.js";
-import { Decorator, AUTOWIRE_KEY } from "@certd/pipeline";
+import { Decorator } from "@certd/pipeline";
 import * as _ from "lodash-es";
 
 // 提供一个唯一 key
@@ -9,22 +9,15 @@ export const DNS_PROVIDER_CLASS_KEY = "pipeline:dns-provider";
 export function IsDnsProvider(define: DnsProviderDefine): ClassDecorator {
   return (target: any) => {
     target = Decorator.target(target);
-    const autowires: any = {};
-    const properties = Decorator.getClassProperties(target);
-    for (const property in properties) {
-      const autowire = Reflect.getMetadata(AUTOWIRE_KEY, target, property);
-      if (autowire) {
-        autowires[property] = autowire;
-      }
-    }
-    _.merge(define, { autowire: autowires });
 
     Reflect.defineMetadata(DNS_PROVIDER_CLASS_KEY, define, target);
 
     target.define = define;
     dnsProviderRegistry.register(define.name, {
       define,
-      target,
+      target: async () => {
+        return target;
+      },
     });
   };
 }

packages/plugins/plugin-cert/src/dns-provider/domain-parser.ts

@@ -1,14 +1,18 @@
 import { IDomainParser, ISubDomainsGetter } from "./api";
 //@ts-ignore
 import psl from "psl";
+import { ILogger, utils, logger as globalLogger } from "@certd/basic";
+import { resolveDomainBySoaRecord } from "@certd/acme-client";
 
 export class DomainParser implements IDomainParser {
   subDomainsGetter: ISubDomainsGetter;
-  constructor(subDomainsGetter: ISubDomainsGetter) {
+  logger: ILogger;
+  constructor(subDomainsGetter: ISubDomainsGetter, logger?: ILogger) {
     this.subDomainsGetter = subDomainsGetter;
+    this.logger = logger || globalLogger;
   }
 
-  parseDomain(fullDomain: string) {
+  parseDomainByPsl(fullDomain: string) {
     const parsed = psl.parse(fullDomain) as psl.ParsedDomain;
     if (parsed.error) {
       throw new Error(`解析${fullDomain}域名失败:` + JSON.stringify(parsed.error));
@@ -17,16 +21,46 @@ export class DomainParser implements IDomainParser {
   }
 
   async parse(fullDomain: string) {
+    this.logger.info(`查找主域名:${fullDomain}`);
+    const cacheKey = `domain_parse:${fullDomain}`;
+    const value = utils.cache.get(cacheKey);
+    if (value) {
+      this.logger.info(`从缓存获取到主域名:${fullDomain}->${value}`);
+      return value;
+    }
+
     const subDomains = await this.subDomainsGetter.getSubDomains();
     if (subDomains && subDomains.length > 0) {
+      const fullDomainDot = "." + fullDomain;
       for (const subDomain of subDomains) {
-        if (fullDomain.endsWith(subDomain)) {
+        if (fullDomainDot.endsWith("." + subDomain)) {
           //找到子域名托管
+          utils.cache.set(cacheKey, subDomain, {
+            ttl: 60 * 1000,
+          });
+          this.logger.info(`获取到子域名托管域名:${fullDomain}->${subDomain}`);
           return subDomain;
         }
       }
     }
 
-    return this.parseDomain(fullDomain);
+    const res = this.parseDomainByPsl(fullDomain);
+    this.logger.info(`从psl获取主域名:${fullDomain}->${res}`);
+
+    let soaManDomain = null;
+    try {
+      const mainDomain = await resolveDomainBySoaRecord(fullDomain);
+      if (mainDomain) {
+        this.logger.info(`从SOA获取到主域名:${fullDomain}->${mainDomain}`);
+        soaManDomain = mainDomain;
+      }
+    } catch (e) {
+      this.logger.error("从SOA获取主域名失败", e.message);
+    }
+    if (soaManDomain && soaManDomain !== res) {
+      this.logger.warn(`SOA获取的主域名（${soaManDomain}）和psl获取的主域名(${res})不一致，请确认是否有设置子域名托管`);
+    }
+
+    return res;
   }
 }

packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts

@@ -6,8 +6,8 @@ import { Challenge } from "@certd/acme-client/types/rfc8555";
 import { IContext } from "@certd/pipeline";
 import { ILogger, utils } from "@certd/basic";
 import { IDnsProvider, IDomainParser } from "../../dns-provider/index.js";
-import { HttpChallengeUploader } from "./uploads/api.js";
-
+import punycode from "node:punycode";
+import { IOssClient } from "@certd/plugin-lib";
 export type CnameVerifyPlan = {
   type?: string;
   domain: string;
@@ -18,7 +18,7 @@ export type CnameVerifyPlan = {
 export type HttpVerifyPlan = {
   type: string;
   domain: string;
-  httpUploader: HttpChallengeUploader;
+  httpUploader: IOssClient;
 };
 
 export type DomainVerifyPlan = {
@@ -35,7 +35,6 @@ export type DomainsVerifyPlan = {
 export type Providers = {
   dnsProvider?: IDnsProvider;
   domainsVerifyPlan?: DomainsVerifyPlan;
-  httpUploader?: HttpChallengeUploader;
 };
 
 export type CertInfo = {
@@ -184,7 +183,7 @@ export class AcmeService {
       return authz.challenges.find((c: any) => c.type === type);
     };
 
-    const doHttpVerify = async (challenge: any, httpUploader: HttpChallengeUploader) => {
+    const doHttpVerify = async (challenge: any, httpUploader: IOssClient) => {
       const keyAuthorization = await keyAuthorizationGetter(challenge);
       this.logger.info("http校验");
       const filePath = `.well-known/acme-challenge/${challenge.token}`;
@@ -203,14 +202,16 @@ export class AcmeService {
       this.logger.info("dns校验");
       const keyAuthorization = await keyAuthorizationGetter(challenge);
 
+      const mainDomain = dnsProvider.usePunyCode() ? domain : punycode.toUnicode(domain);
+      fullRecord = dnsProvider.usePunyCode() ? fullRecord : punycode.toUnicode(fullRecord);
       const recordValue = keyAuthorization;
-      let hostRecord = fullRecord.replace(`${domain}`, "");
+      let hostRecord = fullRecord.replace(`${mainDomain}`, "");
       if (hostRecord.endsWith(".")) {
         hostRecord = hostRecord.substring(0, hostRecord.length - 1);
       }
 
       const recordReq = {
-        domain,
+        domain: mainDomain,
         fullRecord,
         hostRecord,
         type: "TXT",
@@ -247,7 +248,10 @@ export class AcmeService {
               fullRecord = cname.fullRecord;
             }
           } else {
-            this.logger.error("未找到域名Cname校验计划，使用默认的dnsProvider");
+            this.logger.error(`未找到域名${fullDomain}的CNAME校验计划，请修改证书申请配置`);
+          }
+          if (dnsProvider == null) {
+            throw new Error(`未找到域名${fullDomain}CNAME校验计划的DnsProvider，请修改证书申请配置`);
           }
         } else if (domainVerifyPlan.type === "http") {
           const httpVerifyPlan = domainVerifyPlan.httpVerifyPlan;
@@ -286,7 +290,7 @@ export class AcmeService {
    * @returns {Promise}
    */
 
-  async challengeRemoveFn(authz: any, challenge: any, keyAuthorization: string, recordReq: any, recordRes: any, dnsProvider?: IDnsProvider, httpUploader?: HttpChallengeUploader) {
+  async challengeRemoveFn(authz: any, challenge: any, keyAuthorization: string, recordReq: any, recordRes: any, dnsProvider?: IDnsProvider, httpUploader?: IOssClient) {
     this.logger.info("执行清理");
 
     /* http-01 */
@@ -321,9 +325,16 @@ export class AcmeService {
     isTest?: boolean;
     privateKeyType?: string;
   }): Promise<CertInfo> {
-    const { email, isTest, domains, csrInfo, dnsProvider, domainsVerifyPlan, httpUploader } = options;
+    const { email, isTest, csrInfo, dnsProvider, domainsVerifyPlan } = options;
     const client: acme.Client = await this.getAcmeClient(email, isTest);
 
+    let domains = options.domains;
+    const encodingDomains = [];
+    for (const domain of domains) {
+      encodingDomains.push(punycode.toASCII(domain));
+    }
+    domains = encodingDomains;
+
     /* Create CSR */
     const { commonName, altNames } = this.buildCommonNameByDomains(domains);
     let privateKey = null;
@@ -361,14 +372,13 @@ export class AcmeService {
       privateKey
     );
 
-    if (dnsProvider == null && domainsVerifyPlan == null && httpUploader == null) {
-      throw new Error("dnsProvider 、 domainsVerifyPlan 、 httpUploader不能都为空");
+    if (dnsProvider == null && domainsVerifyPlan == null) {
+      throw new Error("dnsProvider 、 domainsVerifyPlan不能都为空");
     }
 
     const providers: Providers = {
       dnsProvider,
       domainsVerifyPlan,
-      httpUploader,
     };
     /* 自动申请证书 */
     const crt = await client.auto({
@@ -383,7 +393,7 @@ export class AcmeService {
       ): Promise<{ recordReq?: any; recordRes?: any; dnsProvider?: any; challenge: Challenge; keyAuthorization: string }> => {
         return await this.challengeCreateFn(authz, keyAuthorizationGetter, providers);
       },
-      challengeRemoveFn: async (authz: acme.Authorization, challenge: Challenge, keyAuthorization: string, recordReq: any, recordRes: any, dnsProvider: IDnsProvider): Promise<any> => {
+      challengeRemoveFn: async (authz: acme.Authorization, challenge: Challenge, keyAuthorization: string, recordReq: any, recordRes: any, dnsProvider: IDnsProvider, httpUploader: IOssClient): Promise<any> => {
         return await this.challengeRemoveFn(authz, challenge, keyAuthorization, recordReq, recordRes, dnsProvider, httpUploader);
       },
       signal: this.options.signal,

packages/plugins/plugin-cert/src/plugin/cert-plugin/base-convert.ts

@@ -27,8 +27,8 @@ export abstract class CertApplyBaseConvertPlugin extends AbstractTaskPlugin {
       "1、支持多个域名打到一个证书上，例如： foo.com，*.foo.com，*.bar.com\n" +
       "2、子域名被通配符包含的不要填写，例如：www.foo.com已经被*.foo.com包含，不要填写www.foo.com\n" +
       "3、泛域名只能通配*号那一级（*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com）\n" +
-      "4、输入一个，空格之后，再输入下一个\n" +
-      "5、如果你配置了子域托管解析，请先[设置托管子域名](#/certd/pipeline/subDomain)",
+      "4、输入一个，空格之后，再输入下一个 \n" +
+      "5、如果您配置了子域托管解析，请先[设置托管子域名](#/certd/pipeline/subDomain)",
   })
   domains!: string[];
 

packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts

@@ -9,8 +9,8 @@ import { CertReader } from "./cert-reader.js";
 import { CertApplyBasePlugin } from "./base.js";
 import { GoogleClient } from "../../libs/google.js";
 import { EabAccess } from "../../access";
-import { httpChallengeUploaderFactory } from "./uploads/factory.js";
 import { DomainParser } from "../../dns-provider/domain-parser.js";
+import { ossClientFactory } from "@certd/plugin-lib";
 export * from "./base.js";
 export type { CertInfo };
 export * from "./cert-reader.js";
@@ -115,6 +115,7 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
   })
   dnsProviderType!: string;
 
+  // dns解析授权类型,勿删
   dnsProviderAccessType!: string;
 
   @TaskInput({
@@ -326,7 +327,7 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
     }
     this.eab = eab;
     const subDomainsGetter = await this.ctx.serviceGetter.get<ISubDomainsGetter>("subDomainsGetter");
-    const domainParser = new DomainParser(subDomainsGetter);
+    const domainParser = new DomainParser(subDomainsGetter, this.logger);
     this.acme = new AcmeService({
       userId: this.ctx.user.id,
       userContext: this.userContext,
@@ -446,7 +447,7 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
             rootDir = rootDir + "/";
           }
           this.logger.info("上传方式", httpRecord.httpUploaderType);
-          const httpUploader = await httpChallengeUploaderFactory.createUploaderByType(httpRecord.httpUploaderType, {
+          const httpUploader = await ossClientFactory.createOssClientByType(httpRecord.httpUploaderType, {
             access,
             rootDir: rootDir,
             ctx: httpUploaderContext,

packages/plugins/plugin-cert/src/plugin/cert-plugin/uploads/api.ts

@@ -1,35 +0,0 @@
-import { IAccessService } from "@certd/pipeline";
-import { ILogger, utils } from "@certd/basic";
-
-export type HttpChallengeUploader = {
-  upload: (fileName: string, fileContent: Buffer) => Promise<void>;
-  remove: (fileName: string) => Promise<void>;
-};
-
-export type HttpChallengeUploadContext = {
-  accessService: IAccessService;
-  logger: ILogger;
-  utils: typeof utils;
-};
-
-export abstract class BaseHttpChallengeUploader<A> implements HttpChallengeUploader {
-  rootDir: string;
-  access: A = null;
-  logger: ILogger;
-  utils: typeof utils;
-  ctx: HttpChallengeUploadContext;
-  protected constructor(opts: { rootDir: string; access: A }) {
-    this.rootDir = opts.rootDir;
-    this.access = opts.access;
-  }
-
-  async setCtx(ctx: any) {
-    // set context
-    this.ctx = ctx;
-    this.logger = ctx.logger;
-    this.utils = ctx.utils;
-  }
-
-  abstract remove(fileName: string): Promise<void>;
-  abstract upload(fileName: string, fileContent: Buffer): Promise<void>;
-}

packages/plugins/plugin-cert/src/plugin/cert-plugin/uploads/impls/alioss.ts

@@ -1,39 +0,0 @@
-import { BaseHttpChallengeUploader } from "../api.js";
-import { AliossAccess, AliyunAccess } from "@certd/plugin-lib";
-import { AliossClient } from "@certd/plugin-lib";
-
-export class AliossHttpChallengeUploader extends BaseHttpChallengeUploader<AliossAccess> {
-  async upload(filePath: string, fileContent: Buffer) {
-    const aliyunAccess = await this.ctx.accessService.getById<AliyunAccess>(this.access.accessId);
-    const client = new AliossClient({
-      access: aliyunAccess,
-      bucket: this.access.bucket,
-      region: this.access.region,
-    });
-
-    const key = this.rootDir + filePath;
-    this.logger.info(`开始上传文件: ${key}`);
-    await client.uploadFile(key, fileContent);
-
-    this.logger.info(`校验文件上传成功: ${filePath}`);
-  }
-
-  async remove(filePath: string) {
-    const key = this.rootDir + filePath;
-    // remove file from alioss
-    const client = await this.getAliossClient();
-    await client.removeFile(key);
-    this.logger.info(`文件删除成功: ${key}`);
-  }
-
-  private async getAliossClient() {
-    const aliyunAccess = await this.ctx.accessService.getById<AliyunAccess>(this.access.accessId);
-    const client = new AliossClient({
-      access: aliyunAccess,
-      bucket: this.access.bucket,
-      region: this.access.region,
-    });
-    await client.init();
-    return client;
-  }
-}

packages/plugins/plugin-cert/src/plugin/cert-plugin/uploads/impls/ftp.ts

@@ -1,41 +0,0 @@
-import { BaseHttpChallengeUploader } from "../api.js";
-import { FtpAccess, FtpClient } from "@certd/plugin-lib";
-import path from "path";
-import os from "os";
-import fs from "fs";
-
-export class FtpHttpChallengeUploader extends BaseHttpChallengeUploader<FtpAccess> {
-  async upload(filePath: string, fileContent: Buffer) {
-    const client = new FtpClient({
-      access: this.access,
-      logger: this.logger,
-    });
-    await client.connect(async (client) => {
-      const tmpFilePath = path.join(os.tmpdir(), "cert", "http", filePath);
-      const dir = path.dirname(tmpFilePath);
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
-      }
-      fs.writeFileSync(tmpFilePath, fileContent);
-      try {
-        // Write file to temp path
-        const path = this.rootDir + filePath;
-        await client.upload(path, tmpFilePath);
-      } finally {
-        // Remove temp file
-        fs.unlinkSync(tmpFilePath);
-      }
-    });
-  }
-
-  async remove(filePath: string) {
-    const client = new FtpClient({
-      access: this.access,
-      logger: this.logger,
-    });
-    await client.connect(async (client) => {
-      const path = this.rootDir + filePath;
-      await client.client.remove(path);
-    });
-  }
-}

packages/plugins/plugin-cert/src/plugin/cert-plugin/uploads/impls/qiniuoss.ts

@@ -1,31 +0,0 @@
-import { BaseHttpChallengeUploader } from "../api.js";
-import { QiniuOssAccess, QiniuClient, QiniuAccess } from "@certd/plugin-lib";
-
-export class QiniuOssHttpChallengeUploader extends BaseHttpChallengeUploader<QiniuOssAccess> {
-  async upload(filePath: string, fileContent: Buffer) {
-    const qiniuAccess = await this.ctx.accessService.getById<QiniuAccess>(this.access.accessId);
-    const client = new QiniuClient({
-      access: qiniuAccess,
-      logger: this.logger,
-      http: this.ctx.utils.http,
-    });
-    if (this.rootDir.endsWith("/")) {
-      this.rootDir = this.rootDir.slice(0, -1);
-    }
-    await client.uploadFile(this.access.bucket, this.rootDir + filePath, fileContent);
-  }
-
-  async remove(filePath: string) {
-    const qiniuAccess = await this.ctx.accessService.getById<QiniuAccess>(this.access.accessId);
-    const client = new QiniuClient({
-      access: qiniuAccess,
-      logger: this.logger,
-      http: this.ctx.utils.http,
-    });
-
-    if (this.rootDir.endsWith("/")) {
-      this.rootDir = this.rootDir.slice(0, -1);
-    }
-    await client.removeFile(this.access.bucket, this.rootDir + filePath);
-  }
-}

packages/plugins/plugin-cert/src/plugin/cert-plugin/uploads/impls/sftp.ts

@@ -1,51 +0,0 @@
-import { BaseHttpChallengeUploader } from "../api.js";
-import { SshAccess, SshClient } from "@certd/plugin-lib";
-import path from "path";
-import os from "os";
-import fs from "fs";
-import { SftpAccess } from "@certd/plugin-lib";
-
-export class SftpHttpChallengeUploader extends BaseHttpChallengeUploader<SftpAccess> {
-  async upload(filePath: string, fileContent: Buffer) {
-    const tmpFilePath = path.join(os.tmpdir(), "cert", "http", filePath);
-
-    // Write file to temp path
-    const dir = path.dirname(tmpFilePath);
-    if (!fs.existsSync(dir)) {
-      fs.mkdirSync(dir, { recursive: true });
-    }
-    fs.writeFileSync(tmpFilePath, fileContent);
-
-    const access = await this.ctx.accessService.getById<SshAccess>(this.access.sshAccess);
-    const key = this.rootDir + filePath;
-    try {
-      const client = new SshClient(this.logger);
-      await client.uploadFiles({
-        connectConf: access,
-        mkdirs: true,
-        transports: [
-          {
-            localPath: tmpFilePath,
-            remotePath: key,
-          },
-        ],
-        opts: {
-          mode: this.access?.fileMode ?? undefined,
-        },
-      });
-    } finally {
-      // Remove temp file
-      fs.unlinkSync(tmpFilePath);
-    }
-  }
-
-  async remove(filePath: string) {
-    const access = await this.ctx.accessService.getById<SshAccess>(this.access.sshAccess);
-    const client = new SshClient(this.logger);
-    const key = this.rootDir + filePath;
-    await client.removeFiles({
-      connectConf: access,
-      files: [key],
-    });
-  }
-}

packages/plugins/plugin-cert/src/plugin/cert-plugin/uploads/impls/tencentcos.ts

@@ -1,28 +0,0 @@
-import { BaseHttpChallengeUploader } from "../api.js";
-import { TencentAccess, TencentCosAccess, TencentCosClient } from "@certd/plugin-lib";
-
-export class TencentCosHttpChallengeUploader extends BaseHttpChallengeUploader<TencentCosAccess> {
-  async upload(filePath: string, fileContent: Buffer) {
-    const access = await this.ctx.accessService.getById<TencentAccess>(this.access.accessId);
-    const client = new TencentCosClient({
-      access: access,
-      logger: this.logger,
-      region: this.access.region,
-      bucket: this.access.bucket,
-    });
-    const key = this.rootDir + filePath;
-    await client.uploadFile(key, fileContent);
-  }
-
-  async remove(filePath: string) {
-    const access = await this.ctx.accessService.getById<TencentAccess>(this.access.accessId);
-    const client = new TencentCosClient({
-      access: access,
-      logger: this.logger,
-      region: this.access.region,
-      bucket: this.access.bucket,
-    });
-    const key = this.rootDir + filePath;
-    await client.removeFile(key);
-  }
-}

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/certd/certd/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+### Performance Improvements
+
+* 支持部署证书到火山dcdn ([5f85219](https://github.com/certd/certd/commit/5f852194953dc1b4e6336770f417507b8f5a33ad))
+
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+### Performance Improvements
+
+* 优化cdnfly插件，支持自动匹配域名部署 ([afd59e9](https://github.com/certd/certd/commit/afd59e9933b2650f41c5d47684c171b93b962065))
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+### Bug Fixes
+
+* 修复http上传方式无法清除记录文件的bug ([72a7b51](https://github.com/certd/certd/commit/72a7b51d479602b2c54c6c3ac8d8a0dcb9664e73))
+
+### Performance Improvements
+
+* 七牛oss支持删除过期备份 ([b7113bd](https://github.com/certd/certd/commit/b7113bda2378116d6c116dc583f563cce7cf9f00))
+* 数据库备份支持oss ([308d460](https://github.com/certd/certd/commit/308d4600efe2002f199c33b4594d3071784e58ea))
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+### Performance Improvements
+
+* ssh PTY模式登录设置 ([8385bcc](https://github.com/certd/certd/commit/8385bcc2d7f2411a07748bb5c53f9eaf4d38d7cc))
+* ssh伪终端模式优化，windows下不开启 ([42dfe93](https://github.com/certd/certd/commit/42dfe936b773b7bdd82ca3378363252ffffd7b71))
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+### Performance Improvements
+
+* 插件支持导入导出 ([cf8abb4](https://github.com/certd/certd/commit/cf8abb45282070c8ba91469f93fd379fabf1f74a))
+
 ## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 **Note:** Version bump only for package @certd/plugin-lib

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.33.3",
+  "version": "1.34.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,10 +16,11 @@
   },
   "dependencies": {
     "@alicloud/pop-core": "^1.7.10",
-    "@certd/basic": "^1.33.3",
-    "@certd/pipeline": "^1.33.3",
+    "@aws-sdk/client-s3": "^3.787.0",
+    "@certd/basic": "^1.34.1",
+    "@certd/pipeline": "^1.34.1",
     "@kubernetes/client-node": "0.21.0",
-    "ali-oss": "^6.21.0",
+    "ali-oss": "^6.22.0",
     "basic-ftp": "^5.0.5",
     "cos-nodejs-sdk-v5": "^2.14.6",
     "dayjs": "^1.11.7",
@@ -48,5 +49,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "be69244e8ddb757de45c7e2b6033195c1f5a6910"
+  "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
 }

packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts

@@ -5,6 +5,7 @@ import { IsAccess, AccessInput, BaseAccess } from "@certd/pipeline";
   title: "阿里云授权",
   desc: "",
   icon: "ant-design:aliyun-outlined",
+  order: 0,
 })
 export class AliyunAccess extends BaseAccess {
   @AccessInput({

packages/plugins/plugin-lib/src/aliyun/lib/oss-client.ts

@@ -1,4 +1,4 @@
-import { AliyunAccess } from "../access";
+import { AliyunAccess } from "../access/index.js";
 
 export class AliossClient {
   access: AliyunAccess;
@@ -52,7 +52,7 @@ export class AliossClient {
     }
   }
 
-  async uploadFile(filePath: string, content: Buffer) {
+  async uploadFile(filePath: string, content: Buffer | string) {
     await this.init();
     return await this.client.put(filePath, content);
   }
@@ -61,4 +61,23 @@ export class AliossClient {
     await this.init();
     return await this.client.delete(filePath);
   }
+
+  async downloadFile(key: string, savePath: string) {
+    await this.init();
+    return await this.client.get(key, savePath);
+  }
+
+  async listDir(dirKey: string) {
+    await this.init();
+    const res = await this.client.listV2({
+      prefix: dirKey,
+      // max-keys: 100,
+      // continuation-token: "token",
+      // delimiter: "/",
+      // marker: "marker",
+      // encoding-type: "url",
+    });
+
+    return res.objects;
+  }
 }

packages/plugins/plugin-lib/src/common/index.ts

@@ -37,6 +37,7 @@ export function createRemoteSelectInputDefine(opts?: {
   multi?: boolean;
   required?: boolean;
   rules?: any;
+  mergeScript?: string;
 }) {
   const title = opts?.title || "请选择";
   const certDomainsInputKey = opts?.certDomainsInputKey || "certDomains";
@@ -65,8 +66,10 @@ export function createRemoteSelectInputDefine(opts?: {
       watches: [certDomainsInputKey, accessIdInputKey, ...watches],
     },
     rules: opts?.rules,
-    required: true,
-    mergeScript: `
+    required: opts.required ?? true,
+    mergeScript:
+      opts.mergeScript ??
+      `
           return {
             component:{
               form: ctx.compute(({form})=>{
@@ -80,3 +83,5 @@ export function createRemoteSelectInputDefine(opts?: {
 
   return merge(item, opts?.formItem);
 }
+
+

packages/plugins/plugin-lib/src/ftp/client.ts

@@ -11,7 +11,7 @@ export class FtpClient {
     this.logger = opts.logger;
   }
 
-  async connect(callback: (client: FtpClient) => Promise<void>) {
+  async connect(callback: (client: FtpClient) => Promise<any>) {
     const ftp = await import("basic-ftp");
     const Client = ftp.Client;
     const client = new Client();
@@ -21,7 +21,7 @@ export class FtpClient {
     this.logger.info("FTP连接成功");
     this.client = client;
     try {
-      await callback(this);
+      return await callback(this);
     } finally {
       if (client) {
         client.close();
@@ -44,4 +44,20 @@ export class FtpClient {
     this.logger.info(`开始删除文件${filePath}`);
     await this.client.remove(filePath, true);
   }
+
+  async listDir(dir: string): Promise<any[]> {
+    if (!dir) {
+      return [];
+    }
+    if (!dir.endsWith("/")) {
+      dir = dir + "/";
+    }
+    this.logger.info(`开始列出目录${dir}`);
+    return await this.client.list(dir);
+  }
+
+  async download(filePath: string, savePath: string): Promise<void> {
+    this.logger.info(`开始下载文件${filePath} -> ${savePath}`);
+    await this.client.downloadTo(savePath, filePath);
+  }
 }

packages/plugins/plugin-lib/src/index.ts

@@ -5,3 +5,5 @@ export * from "./ftp/index.js";
 export * from "./tencent/index.js";
 export * from "./qiniu/index.js";
 export * from "./ctyun/index.js";
+export * from "./oss/index.js";
+export * from "./s3/index.js";

packages/plugins/plugin-lib/src/oss/api.ts

@@ -0,0 +1,90 @@
+import { IAccessService } from "@certd/pipeline";
+import { ILogger, utils } from "@certd/basic";
+import dayjs from "dayjs";
+
+export type OssClientRemoveByOpts = {
+  dir?: string;
+  //删除多少天前的文件
+  beforeDays?: number;
+};
+
+export type OssFileItem = {
+  //文件全路径
+  path: string;
+  size: number;
+  //毫秒时间戳
+  lastModified: number;
+};
+
+export type IOssClient = {
+  upload: (fileName: string, fileContent: Buffer) => Promise<void>;
+  remove: (fileName: string, opts?: { joinRootDir?: boolean }) => Promise<void>;
+
+  download: (fileName: string, savePath: string) => Promise<void>;
+
+  removeBy: (removeByOpts: OssClientRemoveByOpts) => Promise<void>;
+
+  listDir: (dir: string) => Promise<OssFileItem[]>;
+};
+
+export type OssClientContext = {
+  accessService: IAccessService;
+  logger: ILogger;
+  utils: typeof utils;
+};
+
+export abstract class BaseOssClient<A> implements IOssClient {
+  rootDir: string = "";
+  access: A = null;
+  logger: ILogger;
+  utils: typeof utils;
+  ctx: OssClientContext;
+
+  protected constructor(opts: { rootDir?: string; access: A }) {
+    this.rootDir = opts.rootDir || "";
+    this.access = opts.access;
+  }
+
+  join(...strs: string[]) {
+    let res = "";
+    for (const item of strs) {
+      if (item) {
+        if (!res) {
+          res = item;
+        } else {
+          res += "/" + item;
+        }
+      }
+    }
+    res = res.replace(/[\\/]+/g, "/");
+    return res;
+  }
+
+  async setCtx(ctx: any) {
+    // set context
+    this.ctx = ctx;
+    this.logger = ctx.logger;
+    this.utils = ctx.utils;
+    await this.init();
+  }
+
+  async init() {
+    // do nothing
+  }
+
+  abstract remove(fileName: string, opts?: { joinRootDir?: boolean }): Promise<void>;
+  abstract upload(fileName: string, fileContent: Buffer): Promise<void>;
+  abstract download(fileName: string, savePath: string): Promise<void>;
+  abstract listDir(dir: string): Promise<OssFileItem[]>;
+
+  async removeBy(removeByOpts: OssClientRemoveByOpts): Promise<void> {
+    const list = await this.listDir(removeByOpts.dir);
+    // removeByOpts.beforeDays = 0;
+    const beforeDate = dayjs().subtract(removeByOpts.beforeDays, "day");
+    for (const item of list) {
+      if (item.lastModified && item.lastModified < beforeDate.valueOf()) {
+        await this.remove(item.path, { joinRootDir: false });
+      }
+    }
+  }
+}

packages/plugins/plugin-lib/src/oss/factory.ts

@@ -1,30 +1,33 @@
-import { HttpChallengeUploadContext } from "./api";
+import { OssClientContext } from "./api";
 
-export class HttpChallengeUploaderFactory {
+export class OssClientFactory {
   async getClassByType(type: string) {
     if (type === "alioss") {
       const module = await import("./impls/alioss.js");
-      return module.AliossHttpChallengeUploader;
+      return module.default;
     } else if (type === "ssh") {
       const module = await import("./impls/ssh.js");
-      return module.SshHttpChallengeUploader;
+      return module.default;
     } else if (type === "sftp") {
       const module = await import("./impls/sftp.js");
-      return module.SftpHttpChallengeUploader;
+      return module.default;
     } else if (type === "ftp") {
       const module = await import("./impls/ftp.js");
-      return module.FtpHttpChallengeUploader;
+      return module.default;
     } else if (type === "tencentcos") {
       const module = await import("./impls/tencentcos.js");
-      return module.TencentCosHttpChallengeUploader;
+      return module.default;
     } else if (type === "qiniuoss") {
       const module = await import("./impls/qiniuoss.js");
-      return module.QiniuOssHttpChallengeUploader;
+      return module.default;
+    } else if (type === "s3") {
+      const module = await import("./impls/s3.js");
+      return module.default;
     } else {
       throw new Error(`暂不支持此文件上传方式: ${type}`);
     }
   }
-  async createUploaderByType(type: string, opts: { rootDir: string; access: any; ctx: HttpChallengeUploadContext }) {
+  async createOssClientByType(type: string, opts: { rootDir?: string; access: any; ctx: OssClientContext }) {
     const cls = await this.getClassByType(type);
     if (cls) {
       // @ts-ignore
@@ -35,4 +38,4 @@ export class HttpChallengeUploaderFactory {
   }
 }
 
-export const httpChallengeUploaderFactory = new HttpChallengeUploaderFactory();
+export const ossClientFactory = new OssClientFactory();

packages/plugins/plugin-lib/src/oss/impls/alioss.ts

@@ -0,0 +1,57 @@
+import { BaseOssClient, OssFileItem } from "../api.js";
+import { AliossAccess, AliossClient, AliyunAccess } from "../../aliyun/index.js";
+import dayjs from "dayjs";
+
+export default class AliOssClientImpl extends BaseOssClient<AliossAccess> {
+  client: AliossClient;
+  join(...strs: string[]) {
+    const str = super.join(...strs);
+    if (str.startsWith("/")) {
+      return str.substring(1);
+    }
+    return str;
+  }
+  async init() {
+    const aliyunAccess = await this.ctx.accessService.getById<AliyunAccess>(this.access.accessId);
+    const client = new AliossClient({
+      access: aliyunAccess,
+      bucket: this.access.bucket,
+      region: this.access.region,
+    });
+    await client.init();
+    this.client = client;
+  }
+  async download(filePath: string, savePath: string): Promise<void> {
+    const key = this.join(this.rootDir, filePath);
+    await this.client.downloadFile(key, savePath);
+  }
+  async listDir(dir: string): Promise<OssFileItem[]> {
+    const dirKey = this.join(this.rootDir, dir) + "/";
+    const list = await this.client.listDir(dirKey);
+    this.logger.info(`列出目录: ${dirKey},文件数：${list.length}`);
+    return list.map(item => {
+      return {
+        path: item.name,
+        lastModified: dayjs(item.lastModified).valueOf(),
+        size: item.size,
+      };
+    });
+  }
+  async upload(filePath: string, fileContent: Buffer | string) {
+    const key = this.join(this.rootDir, filePath);
+    this.logger.info(`开始上传文件: ${key}`);
+    await this.client.uploadFile(key, fileContent);
+
+    this.logger.info(`文件上传成功: ${filePath}`);
+  }
+
+  async remove(filePath: string, opts?: { joinRootDir?: boolean }) {
+    if (opts?.joinRootDir !== false) {
+      filePath = this.join(this.rootDir, filePath);
+    }
+    const key = filePath;
+    // remove file from alioss
+    await this.client.removeFile(key);
+    this.logger.info(`文件删除成功: ${key}`);
+  }
+}

packages/plugins/plugin-lib/src/oss/impls/ftp.ts

@@ -0,0 +1,78 @@
+import { BaseOssClient } from "../api.js";
+import path from "path";
+import os from "os";
+import fs from "fs";
+import { FtpAccess, FtpClient } from "../../ftp/index.js";
+
+export default class FtpOssClientImpl extends BaseOssClient<FtpAccess> {
+  join(...strs: string[]) {
+    const str = super.join(...strs);
+    if (!str.startsWith("/")) {
+      return "/" + str;
+    }
+    return str;
+  }
+
+  async download(fileName: string, savePath: string) {
+    const client = this.getFtpClient();
+    await client.connect(async client => {
+      const path = this.join(this.rootDir, fileName);
+      await client.download(path, savePath);
+    });
+  }
+  async listDir(dir: string) {
+    const client = this.getFtpClient();
+    return await client.connect(async (client: FtpClient) => {
+      const path = this.join(this.rootDir, dir);
+      const res = await client.listDir(path);
+      return res.map(item => {
+        return {
+          path: this.join(path, item.name),
+          size: item.size,
+          lastModified: item.modifiedAt.getTime(),
+        };
+      });
+    });
+  }
+  async upload(filePath: string, fileContent: Buffer | string) {
+    const client = this.getFtpClient();
+    await client.connect(async client => {
+      let tmpFilePath = fileContent as string;
+      if (typeof fileContent !== "string") {
+        tmpFilePath = path.join(os.tmpdir(), "cert", "oss", filePath);
+        const dir = path.dirname(tmpFilePath);
+        if (!fs.existsSync(dir)) {
+          fs.mkdirSync(dir, { recursive: true });
+        }
+        fs.writeFileSync(tmpFilePath, fileContent);
+      }
+
+      try {
+        // Write file to temp path
+        const path = this.join(this.rootDir, filePath);
+        await client.upload(tmpFilePath, path);
+      } finally {
+        // Remove temp file
+        fs.unlinkSync(tmpFilePath);
+      }
+    });
+  }
+
+  private getFtpClient() {
+    return new FtpClient({
+      access: this.access,
+      logger: this.logger,
+    });
+  }
+
+  async remove(filePath: string, opts?: { joinRootDir?: boolean }) {
+    if (opts?.joinRootDir !== false) {
+      filePath = this.join(this.rootDir, filePath);
+    }
+    const client = this.getFtpClient();
+    await client.connect(async client => {
+      await client.client.remove(filePath);
+      this.logger.info(`删除文件成功: ${filePath}`);
+    });
+  }
+}

packages/plugins/plugin-lib/src/oss/impls/qiniuoss.ts

@@ -0,0 +1,50 @@
+import { QiniuAccess, QiniuClient, QiniuOssAccess } from "../../qiniu/index.js";
+import { BaseOssClient, OssFileItem } from "../api.js";
+
+export default class QiniuOssClientImpl extends BaseOssClient<QiniuOssAccess> {
+  client: QiniuClient;
+
+  join(...strs: string[]) {
+    const str = super.join(...strs);
+    if (str.startsWith("/")) {
+      return str.substring(1);
+    }
+    return str;
+  }
+  async init() {
+    const qiniuAccess = await this.ctx.accessService.getById<QiniuAccess>(this.access.accessId);
+    this.client = new QiniuClient({
+      access: qiniuAccess,
+      logger: this.logger,
+      http: this.ctx.utils.http,
+    });
+  }
+
+  async download(fileName: string, savePath: string): Promise<void> {
+    const path = this.join(this.rootDir, fileName);
+    await this.client.downloadFile(this.access.bucket, path, savePath);
+  }
+  async listDir(dir: string): Promise<OssFileItem[]> {
+    const path = this.join(this.rootDir, dir);
+    const res = await this.client.listDir(this.access.bucket, path);
+    return res.items.map(item => {
+      return {
+        path: item.key,
+        size: item.fsize,
+        //ns ，纳秒，去掉低4位 为毫秒
+        lastModified: Math.floor(item.putTime / 10000),
+      };
+    });
+  }
+  async upload(filePath: string, fileContent: Buffer | string) {
+    const path = this.join(this.rootDir, filePath);
+    await this.client.uploadFile(this.access.bucket, path, fileContent);
+  }
+
+  async remove(filePath: string, opts?: { joinRootDir?: boolean }) {
+    if (opts?.joinRootDir !== false) {
+      filePath = this.join(this.rootDir, filePath);
+    }
+    await this.client.removeFile(this.access.bucket, filePath);
+  }
+}

packages/plugins/plugin-lib/src/oss/impls/s3.ts

@@ -0,0 +1,98 @@
+import { BaseOssClient, OssFileItem } from "../api.js";
+import path from "node:path";
+import { S3Access } from "../../s3/access.js";
+import fs from "fs";
+import dayjs from "dayjs";
+
+export default class S3OssClientImpl extends BaseOssClient<S3Access> {
+  client: any;
+  join(...strs: string[]) {
+    const str = super.join(...strs);
+    if (str.startsWith("/")) {
+      return str.substring(1);
+    }
+    return str;
+  }
+  async init() {
+    // import { S3Client } from "@aws-sdk/client-s3";
+    //@ts-ignore
+    const { S3Client } = await import("@aws-sdk/client-s3");
+    this.client = new S3Client({
+      forcePathStyle: true,
+      //@ts-ignore
+      s3ForcePathStyle: true,
+      credentials: {
+        accessKeyId: this.access.accessKeyId, // 默认 MinIO 访问密钥
+        secretAccessKey: this.access.secretAccessKey, // 默认 MinIO 秘密密钥
+      },
+      region: "us-east-1",
+      endpoint: this.access.endpoint,
+    });
+  }
+
+  async download(filePath: string, savePath: string): Promise<void> {
+    // @ts-ignore
+    const { GetObjectCommand } = await import("@aws-sdk/client-s3");
+    const key = path.join(this.rootDir, filePath);
+    const params = {
+      Bucket: this.access.bucket, // The name of the bucket. For example, 'sample_bucket_101'.
+      Key: key, // The name of the object. For example, 'sample_upload.txt'.
+    };
+    const res = await this.client.send(new GetObjectCommand({ ...params }));
+    const fileContent = fs.createWriteStream(savePath);
+    res.Body.pipe(fileContent);
+
+    this.logger.info(`文件下载成功: ${savePath}`);
+  }
+
+  async listDir(dir: string): Promise<OssFileItem[]> {
+    // @ts-ignore
+    const { ListObjectsCommand } = await import("@aws-sdk/client-s3");
+    const dirKey = this.join(this.rootDir, dir);
+    const params = {
+      Bucket: this.access.bucket, // The name of the bucket. For example, 'sample_bucket_101'.
+      Prefix: dirKey, // The name of the object. For example, 'sample_upload.txt'.
+    };
+    const res = await this.client.send(new ListObjectsCommand({ ...params }));
+    return res.Contents.map(item => {
+      return {
+        path: item.Key,
+        size: item.Size,
+        lastModified: dayjs(item.LastModified).valueOf(),
+      };
+    });
+  }
+  async upload(filePath: string, fileContent: Buffer | string) {
+    // @ts-ignore
+    const { PutObjectCommand } = await import("@aws-sdk/client-s3");
+    const key = path.join(this.rootDir, filePath);
+    this.logger.info(`开始上传文件: ${key}`);
+    const params = {
+      Bucket: this.access.bucket, // The name of the bucket. For example, 'sample_bucket_101'.
+      Key: key, // The name of the object. For example, 'sample_upload.txt'.
+    };
+    if (typeof fileContent === "string") {
+      fileContent = fs.createReadStream(fileContent) as any;
+    }
+    await this.client.send(new PutObjectCommand({ Body: fileContent, ...params }));
+
+    this.logger.info(`文件上传成功: ${filePath}`);
+  }
+
+  async remove(filePath: string, opts?: { joinRootDir?: boolean }) {
+    if (opts?.joinRootDir !== false) {
+      filePath = this.join(this.rootDir, filePath);
+    }
+    const key = filePath;
+    // @ts-ignore
+    const { DeleteObjectCommand } = await import("@aws-sdk/client-s3");
+    await this.client.send(
+      new DeleteObjectCommand({
+        Bucket: this.access.bucket,
+        Key: key,
+      })
+    );
+
+    this.logger.info(`文件删除成功: ${key}`);
+  }
+}

packages/plugins/plugin-lib/src/oss/impls/sftp.ts

@@ -0,0 +1,82 @@
+import { BaseOssClient, OssFileItem } from "../api.js";
+import path from "path";
+import os from "os";
+import fs from "fs";
+import { SftpAccess, SshAccess, SshClient } from "../../ssh/index.js";
+
+export default class SftpOssClientImpl extends BaseOssClient<SftpAccess> {
+  async download(fileName: string, savePath: string): Promise<void> {
+    const path = this.join(this.rootDir, fileName);
+    const client = new SshClient(this.logger);
+    const access = await this.ctx.accessService.getById<SshAccess>(this.access.sshAccess);
+    await client.download({
+      connectConf: access,
+      filePath: path,
+      savePath,
+    });
+  }
+
+  async listDir(dir: string): Promise<OssFileItem[]> {
+    const path = this.join(this.rootDir, dir);
+    const client = new SshClient(this.logger);
+    const access = await this.ctx.accessService.getById<SshAccess>(this.access.sshAccess);
+    const res = await client.listDir({
+      connectConf: access,
+      dir: path,
+    });
+
+    return res.map(item => {
+      return {
+        path: this.join(path, item.filename),
+        size: item.size,
+        lastModified: item.attrs.atime * 1000,
+      };
+    });
+  }
+  async upload(filePath: string, fileContent: Buffer | string) {
+    let tmpFilePath = fileContent as string;
+    if (typeof fileContent !== "string") {
+      tmpFilePath = path.join(os.tmpdir(), "cert", "oss", filePath);
+      const dir = path.dirname(tmpFilePath);
+      if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+      }
+      fs.writeFileSync(tmpFilePath, fileContent);
+    }
+
+    const access = await this.ctx.accessService.getById<SshAccess>(this.access.sshAccess);
+    const key = this.join(this.rootDir, filePath);
+    try {
+      const client = new SshClient(this.logger);
+      await client.uploadFiles({
+        connectConf: access,
+        mkdirs: true,
+        transports: [
+          {
+            localPath: tmpFilePath,
+            remotePath: key,
+          },
+        ],
+        uploadType: "sftp",
+        opts: {
+          mode: this.access?.fileMode ?? undefined,
+        },
+      });
+    } finally {
+      // Remove temp file
+      fs.unlinkSync(tmpFilePath);
+    }
+  }
+
+  async remove(filePath: string, opts?: { joinRootDir?: boolean }) {
+    const access = await this.ctx.accessService.getById<SshAccess>(this.access.sshAccess);
+    const client = new SshClient(this.logger);
+    if (opts?.joinRootDir !== false) {
+      filePath = this.join(this.rootDir, filePath);
+    }
+    await client.removeFiles({
+      connectConf: access,
+      files: [filePath],
+    });
+  }
+}

packages/plugins/plugin-lib/src/oss/impls/ssh.ts

@@ -1,10 +1,20 @@
-import { BaseHttpChallengeUploader } from "../api.js";
-import { SshAccess, SshClient } from "@certd/plugin-lib";
+import { BaseOssClient, OssClientRemoveByOpts, OssFileItem } from "../api.js";
 import path from "path";
 import os from "os";
 import fs from "fs";
+import { SshAccess, SshClient } from "../../ssh/index.js";
 
-export class SshHttpChallengeUploader extends BaseHttpChallengeUploader<SshAccess> {
+//废弃
+export default class SshOssClientImpl extends BaseOssClient<SshAccess> {
+  download(fileName: string, savePath: string): Promise<void> {
+    throw new Error("Method not implemented.");
+  }
+  removeBy(removeByOpts: OssClientRemoveByOpts): Promise<void> {
+    throw new Error("Method not implemented.");
+  }
+  listDir(dir: string): Promise<OssFileItem[]> {
+    throw new Error("Method not implemented.");
+  }
   async upload(filePath: string, fileContent: Buffer) {
     const tmpFilePath = path.join(os.tmpdir(), "cert", "http", filePath);
 
@@ -34,12 +44,14 @@ export class SshHttpChallengeUploader extends BaseHttpChallengeUploader<SshAcces
     }
   }
 
-  async remove(filePath: string) {
+  async remove(filePath: string, opts?: { joinRootDir?: boolean }) {
+    if (opts?.joinRootDir !== false) {
+      filePath = this.join(this.rootDir, filePath);
+    }
     const client = new SshClient(this.logger);
-    const key = this.rootDir + filePath;
     await client.removeFiles({
       connectConf: this.access,
-      files: [key],
+      files: [filePath],
     });
   }
 }

packages/plugins/plugin-lib/src/oss/impls/tencentcos.ts

@@ -0,0 +1,54 @@
+import dayjs from "dayjs";
+import { TencentAccess, TencentCosAccess, TencentCosClient } from "../../tencent/index.js";
+import { BaseOssClient, OssFileItem } from "../api.js";
+
+export default class TencentOssClientImpl extends BaseOssClient<TencentCosAccess> {
+  client: TencentCosClient;
+
+  join(...strs: string[]) {
+    const str = super.join(...strs);
+    if (str.startsWith("/")) {
+      return str.substring(1);
+    }
+    return str;
+  }
+  async init() {
+    const access = await this.ctx.accessService.getById<TencentAccess>(this.access.accessId);
+    this.client = new TencentCosClient({
+      access: access,
+      logger: this.logger,
+      region: this.access.region,
+      bucket: this.access.bucket,
+    });
+  }
+  async download(filePath: string, savePath: string): Promise<void> {
+    const key = this.join(this.rootDir, filePath);
+    await this.client.downloadFile(key, savePath);
+  }
+
+  async listDir(dir: string): Promise<OssFileItem[]> {
+    const dirKey = this.join(this.rootDir, dir) + "/";
+    // @ts-ignore
+    const res: any[] = await this.client.listDir(dirKey);
+    return res.map(item => {
+      return {
+        path: item.Key,
+        size: item.Size,
+        lastModified: dayjs(item.LastModified).valueOf(),
+      };
+    });
+  }
+  async upload(filePath: string, fileContent: Buffer | string) {
+    const key = this.join(this.rootDir, filePath);
+    await this.client.uploadFile(key, fileContent);
+    this.logger.info(`文件上传成功: ${filePath}`);
+  }
+
+  async remove(filePath: string, opts?: { joinRootDir?: boolean }) {
+    if (opts?.joinRootDir !== false) {
+      filePath = this.join(this.rootDir, filePath);
+    }
+    await this.client.removeFile(filePath);
+    this.logger.info(`文件删除成功: ${filePath}`);
+  }
+}

packages/plugins/plugin-lib/src/oss/index.ts

@@ -0,0 +1,2 @@
+export * from "./factory.js";
+export * from "./api.js";

packages/plugins/plugin-lib/src/qiniu/lib/sdk.ts

@@ -1,5 +1,6 @@
-import { HttpClient, ILogger } from "@certd/basic";
+import { HttpClient, ILogger, safePromise, utils } from "@certd/basic";
 import { QiniuAccess } from "../access.js";
+import fs from "fs";
 
 export type QiniuCertInfo = {
   key: string;
@@ -76,7 +77,7 @@ export class QiniuClient {
     const http = new HttpClient({ timeout: 10000, middlewares: [auth] });
     console.log("http", http);
 
-    return new Promise((resolve, reject) => {
+    return safePromise((resolve, reject) => {
       try {
         http.get({
           url: opts.url,
@@ -98,7 +99,7 @@ export class QiniuClient {
     });
   }
 
-  async uploadFile(bucket: string, key: string, content: Buffer) {
+  async uploadFile(bucket: string, key: string, content: Buffer | string) {
     const sdk = await import("qiniu");
     const qiniu = sdk.default;
     const mac = new qiniu.auth.digest.Mac(this.access.accessKey, this.access.secretKey);
@@ -111,8 +112,15 @@ export class QiniuClient {
     const config = new qiniu.conf.Config();
     const formUploader = new qiniu.form_up.FormUploader(config);
     const putExtra = new qiniu.form_up.PutExtra();
-    // 文件上传
-    const { data, resp } = await formUploader.put(uploadToken, key, content, putExtra);
+    let res: any = {};
+    if (typeof content === "string") {
+      const readableStream = fs.createReadStream(content);
+      res = await formUploader.putStream(uploadToken, key, readableStream, putExtra);
+    } else {
+      // 文件上传
+      res = await formUploader.put(uploadToken, key, content, putExtra);
+    }
+    const { data, resp } = res;
     if (resp.statusCode === 200) {
       this.logger.info("文件上传成功：" + key);
       return data;
@@ -123,12 +131,7 @@ export class QiniuClient {
   }
 
   async removeFile(bucket: string, key: string) {
-    const sdk = await import("qiniu");
-    const qiniu = sdk.default;
-    const mac = new qiniu.auth.digest.Mac(this.access.accessKey, this.access.secretKey);
-    const config = new qiniu.conf.Config();
-    config.useHttpsDomain = true;
-    const bucketManager = new qiniu.rs.BucketManager(mac, config);
+    const bucketManager = await this.getBucketManager();
 
     const { resp } = await bucketManager.delete(bucket, key);
 
@@ -139,4 +142,39 @@ export class QiniuClient {
       throw new Error("删除失败:" + JSON.stringify(resp));
     }
   }
+
+  async downloadFile(bucket: string, path: string, savePath: string) {
+    const bucketManager = await this.getBucketManager();
+    const privateBucketDomain = `http://${bucket}.qiniudn.com`;
+    const deadline = Math.floor(Date.now() / 1000) + 3600; // 1小时过期
+    const privateDownloadUrl = bucketManager.privateDownloadUrl(privateBucketDomain, path, deadline);
+
+    await utils.request.download({
+      http: this.http,
+      logger: this.logger,
+      config: {
+        url: privateDownloadUrl,
+        method: "get",
+      },
+      savePath,
+    });
+  }
+
+  private async getBucketManager() {
+    const sdk = await import("qiniu");
+    const qiniu = sdk.default;
+    const mac = new qiniu.auth.digest.Mac(this.access.accessKey, this.access.secretKey);
+    const config = new qiniu.conf.Config();
+    config.useHttpsDomain = true;
+    return new qiniu.rs.BucketManager(mac, config);
+  }
+
+  async listDir(bucket: string, path: string) {
+    const bucketManager = await this.getBucketManager();
+    const res = await bucketManager.listPrefix(bucket, {
+      prefix: path,
+      limit: 1000,
+    });
+    return res.data;
+  }
 }

packages/plugins/plugin-lib/src/s3/access.ts

@@ -0,0 +1,87 @@
+import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
+
+/**
+ * 这个注解将注册一个授权配置
+ * 在certd的后台管理系统中，用户可以选择添加此类型的授权
+ */
+@IsAccess({
+  name: "s3",
+  title: "s3/minio授权",
+  desc: "S3/minio oss授权",
+  icon: "mdi:folder-upload-outline",
+})
+export class S3Access extends BaseAccess {
+  @AccessInput({
+    title: "endpoint",
+    component: {
+      placeholder: "http://xxxxxx:9000",
+      name: "a-input",
+      vModel: "value",
+    },
+    helper: "Minio的地址，如果是aws s3 则无需填写",
+    required: false,
+  })
+  endpoint!: string;
+
+  /**
+   * const minioClient = new S3Client({
+   *   endpoint: "http://localhost:9000",
+   *   forcePathStyle: true,
+   *   credentials: {
+   *     accessKeyId: "minioadmin", // 默认 MinIO 访问密钥
+   *     secretAccessKey: "minioadmin", // 默认 MinIO 秘密密钥
+   *   },
+   *   region: "us-east-1",
+   * });
+   */
+
+  @AccessInput({
+    title: "accessKeyId",
+    component: {
+      placeholder: "accessKeyId",
+    },
+    helper: "accessKeyId",
+    required: true,
+  })
+  accessKeyId!: string;
+
+  @AccessInput({
+    title: "secretAccessKey",
+    component: {
+      placeholder: "secretAccessKey",
+      component: {
+        name: "a-input",
+        vModel: "value",
+      },
+    },
+    helper: "secretAccessKey",
+    encrypt: true,
+    required: true,
+  })
+  secretAccessKey!: string;
+
+  @AccessInput({
+    title: "地区",
+    value: "us-east-1",
+    component: {
+      name: "a-input",
+      vModel: "value",
+    },
+    helper: "region",
+    required: true,
+  })
+  region!: string;
+
+  @AccessInput({
+    title: "存储桶",
+    component: {
+      name: "a-input",
+      vModel: "value",
+    },
+    helper: "bucket 名称",
+    required: true,
+  })
+  bucket!: string;
+}
+
+new S3Access();

packages/plugins/plugin-lib/src/s3/index.ts

@@ -0,0 +1 @@
+export * from "./access.js";

packages/plugins/plugin-lib/src/ssh/ssh-access.ts

@@ -1,7 +1,4 @@
 import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
-import { ConnectConfig } from "ssh2";
-import { SshClient } from "./ssh.js";
-
 @IsAccess({
   name: "ssh",
   title: "主机登录授权",
@@ -9,7 +6,7 @@ import { SshClient } from "./ssh.js";
   icon: "clarity:host-line",
   input: {},
 })
-export class SshAccess extends BaseAccess implements ConnectConfig {
+export class SshAccess extends BaseAccess {
   @AccessInput({
     title: "主机地址",
     component: {
@@ -66,6 +63,16 @@ export class SshAccess extends BaseAccess implements ConnectConfig {
   })
   passphrase!: string;
 
+  @AccessInput({
+    title: "伪终端",
+    helper: "如果登录报错：all authentication methods failed，可以尝试开启伪终端模式进行keyboard-interactive方式登录\n开启后对日志输出有一定的影响",
+    component: {
+      name: "a-switch",
+      vModel: "checked",
+    },
+  })
+  pty!: boolean;
+
   @AccessInput({
     title: "socks代理",
     helper: "socks代理配置，格式：socks5://user:password@host:port",
@@ -125,6 +132,7 @@ export class SshAccess extends BaseAccess implements ConnectConfig {
   testRequest = true;
 
   async onTestRequest() {
+    const { SshClient } = await import("./ssh.js");
     const client = new SshClient(this.ctx.logger);
 
     await client.exec({

packages/plugins/plugin-lib/src/ssh/ssh.ts

@@ -1,22 +1,33 @@
 // @ts-ignore
-import ssh2, { ConnectConfig, ExecOptions } from "ssh2";
-
-import ssh2Constants from "ssh2/lib/protocol/constants.js";
 import path from "path";
-import * as _ from "lodash-es";
-import { ILogger } from "@certd/basic";
+import { isArray } from "lodash-es";
+import { ILogger, safePromise } from "@certd/basic";
 import { SshAccess } from "./ssh-access.js";
-import stripAnsi from "strip-ansi";
-import { SocksClient } from "socks";
-import { SocksProxy, SocksProxyType } from "socks/typings/common/constants.js";
+
 import fs from "fs";
+import { SocksProxyType } from "socks/typings/common/constants";
 
 export type TransportItem = { localPath: string; remotePath: string };
+export interface SocksProxy {
+  ipaddress?: string;
+  host?: string;
+  port: number;
+  type: any;
+  userId?: string;
+  password?: string;
+  custom_auth_method?: number;
+  custom_auth_request_handler?: () => Promise<Buffer>;
+  custom_auth_response_size?: number;
+  custom_auth_response_handler?: (data: Buffer) => Promise<boolean>;
+}
+export type SshConnectConfig = {
+  sock?: any;
+};
 
 export class AsyncSsh2Client {
-  conn: ssh2.Client;
+  conn: any;
   logger: ILogger;
-  connConf: SshAccess & ssh2.ConnectConfig;
+  connConf: SshAccess & SshConnectConfig;
   windows = false;
   encoding: string;
   constructor(connConf: SshAccess, logger: ILogger) {
@@ -40,7 +51,10 @@ export class AsyncSsh2Client {
       if (typeof this.connConf.port === "string") {
         this.connConf.port = parseInt(this.connConf.port);
       }
-      const proxyOption: SocksProxy = this.parseSocksProxyFromUri(this.connConf.socksProxy);
+
+      const { SocksClient } = await import("socks");
+
+      const proxyOption = this.parseSocksProxyFromUri(this.connConf.socksProxy);
       const info = await SocksClient.createConnection({
         proxy: proxyOption,
         command: "connect",
@@ -53,10 +67,12 @@ export class AsyncSsh2Client {
       this.connConf.sock = info.socket;
     }
 
-    const { SUPPORTED_KEX, SUPPORTED_SERVER_HOST_KEY, SUPPORTED_CIPHER, SUPPORTED_MAC } = ssh2Constants;
-    return new Promise((resolve, reject) => {
+    const ssh2 = await import("ssh2");
+    const ssh2Constants = await import("ssh2/lib/protocol/constants.js");
+    const { SUPPORTED_KEX, SUPPORTED_SERVER_HOST_KEY, SUPPORTED_CIPHER, SUPPORTED_MAC } = ssh2Constants.default;
+    return safePromise((resolve, reject) => {
       try {
-        const conn = new ssh2.Client();
+        const conn = new ssh2.default.Client();
         conn
           .on("error", (err: any) => {
             this.logger.error("连接失败", err);
@@ -92,7 +108,7 @@ export class AsyncSsh2Client {
     });
   }
   async getSftp() {
-    return new Promise((resolve, reject) => {
+    return safePromise((resolve, reject) => {
       this.logger.info("获取sftp");
       this.conn.sftp((err: any, sftp: any) => {
         if (err) {
@@ -106,7 +122,7 @@ export class AsyncSsh2Client {
 
   async fastPut(options: { sftp: any; localPath: string; remotePath: string; opts?: { mode?: string } }) {
     const { sftp, localPath, remotePath, opts } = options;
-    return new Promise((resolve, reject) => {
+    return safePromise((resolve, reject) => {
       this.logger.info(`开始上传：${localPath} => ${remotePath}`);
       sftp.fastPut(localPath, remotePath, { ...(opts ?? {}) }, (err: Error) => {
         if (err) {
@@ -120,9 +136,23 @@ export class AsyncSsh2Client {
     });
   }
 
+  async listDir(options: { sftp: any; remotePath: string }) {
+    const { sftp, remotePath } = options;
+    return safePromise((resolve, reject) => {
+      this.logger.info(`listDir：${remotePath}`);
+      sftp.readdir(remotePath, (err: Error, list: any) => {
+        if (err) {
+          reject(err);
+          return;
+        }
+        resolve(list);
+      });
+    });
+  }
+
   async unlink(options: { sftp: any; remotePath: string }) {
     const { sftp, remotePath } = options;
-    return new Promise((resolve, reject) => {
+    return safePromise((resolve, reject) => {
       this.logger.info(`开始删除远程文件：${remotePath}`);
       sftp.unlink(remotePath, (err: Error) => {
         if (err) {
@@ -152,9 +182,12 @@ export class AsyncSsh2Client {
     //   script += "\r\nexit\r\n";
     //   //保证windows下正常退出
     // }
-    return new Promise((resolve, reject) => {
+    return safePromise((resolve, reject) => {
       this.logger.info(`执行命令：[${this.connConf.host}][exec]: \n` + script);
-      this.conn.exec(script, { pty: true, env: opts.env }, (err: Error, stream: any) => {
+      // pty 伪终端，window下的输出会带上conhost.exe之类的多余的字符串，影响返回结果判断
+      // linux下 当使用keyboard-interactive 登录时，需要pty
+      const pty = this.connConf.pty; //linux下开启伪终端，windows下不开启
+      this.conn.exec(script, { pty, env: opts.env }, (err: Error, stream: any) => {
         if (err) {
           reject(err);
           return;
@@ -197,7 +230,9 @@ export class AsyncSsh2Client {
   }
 
   async shell(script: string | string[]): Promise<string> {
-    return new Promise<any>((resolve, reject) => {
+    const stripAnsiModule = await import("strip-ansi");
+    const stripAnsi = stripAnsiModule.default;
+    return safePromise<any>((resolve, reject) => {
       this.logger.info(`执行shell脚本：[${this.connConf.host}][shell]: ` + script);
       this.conn.shell((err: Error, stream: any) => {
         if (err) {
@@ -262,6 +297,28 @@ export class AsyncSsh2Client {
     }
     return proxy;
   }
+
+  async download(param: { remotePath: string; savePath: string; sftp: any }) {
+    return safePromise((resolve, reject) => {
+      const { remotePath, savePath, sftp } = param;
+      sftp.fastGet(
+        remotePath,
+        savePath,
+        {
+          step: (transferred: any, chunk: any, total: any) => {
+            this.logger.info(`${transferred} / ${total}`);
+          },
+        },
+        (err: any) => {
+          if (err) {
+            reject(err);
+          } else {
+            resolve({});
+          }
+        }
+      );
+    });
+  }
 }
 
 export class SshClient {
@@ -308,17 +365,17 @@ export class SshClient {
           }
         }
 
-        if (options.uploadType === "sftp") {
-          const sftp = await conn.getSftp();
-          for (const transport of transports) {
-            await conn.fastPut({ sftp, ...transport, opts });
-          }
-        } else {
+        if (options.uploadType === "scp") {
           //scp
           for (const transport of transports) {
             await this.scpUpload({ conn, ...transport, opts });
             await new Promise(resolve => setTimeout(resolve, 1000));
           }
+        } else {
+          const sftp = await conn.getSftp();
+          for (const transport of transports) {
+            await conn.fastPut({ sftp, ...transport, opts });
+          }
         }
 
         this.logger.info("文件全部上传成功");
@@ -328,16 +385,16 @@ export class SshClient {
 
   async scpUpload(options: { conn: any; localPath: string; remotePath: string; opts?: { mode?: string } }) {
     const { conn, localPath, remotePath } = options;
-    return new Promise((resolve, reject) => {
+    return safePromise((resolve, reject) => {
       // 关键步骤：构造 SCP 命令
-      try {
-        this.logger.info(`开始上传：${localPath} => ${remotePath}`);
-        conn.conn.exec(
-          `scp -t ${remotePath}`, // -t 表示目标模式
-          (err, stream) => {
-            if (err) {
-              return reject(err);
-            }
+      this.logger.info(`开始上传：${localPath} => ${remotePath}`);
+      conn.conn.exec(
+        `scp -t ${remotePath}`, // -t 表示目标模式
+        (err, stream) => {
+          if (err) {
+            return reject(err);
+          }
+          try {
             // 准备 SCP 协议头
             const fileStats = fs.statSync(localPath);
             const fileName = path.basename(localPath);
@@ -357,11 +414,11 @@ export class SshClient {
                 resolve(true);
               })
               .on("error", reject);
+          } catch (e) {
+            reject(e);
           }
-        );
-      } catch (e) {
-        reject(e);
-      }
+        }
+      );
     });
   }
 
@@ -449,7 +506,7 @@ export class SshClient {
           script = script.join(" && ");
         } else {
           const newLine = isLinux ? "\n" : "\r\n";
-          if (_.isArray(script)) {
+          if (isArray(script)) {
             script = script as Array<string>;
             script = script.join(newLine);
           }
@@ -457,7 +514,7 @@ export class SshClient {
             script = envScripts.join(newLine) + newLine + script;
           }
         }
-        return await conn.exec(script as string, { env: options.env });
+        return await conn.exec(script as string, {});
       },
     });
   }
@@ -465,7 +522,7 @@ export class SshClient {
   async shell(options: { connectConf: SshAccess; script: string | Array<string> }): Promise<string> {
     let { script } = options;
     const { connectConf } = options;
-    if (_.isArray(script)) {
+    if (isArray(script)) {
       script = script as Array<string>;
       if (connectConf.windows) {
         script = script.join("\r\n");
@@ -505,4 +562,31 @@ export class SshClient {
       conn.end();
     }
   }
+
+  async listDir(param: { connectConf: any; dir: string }) {
+    return await this._call<any>({
+      connectConf: param.connectConf,
+      callable: async (conn: AsyncSsh2Client) => {
+        const sftp = await conn.getSftp();
+        return await conn.listDir({
+          sftp,
+          remotePath: param.dir,
+        });
+      },
+    });
+  }
+
+  async download(param: { connectConf: any; filePath: string; savePath: string }) {
+    return await this._call<any>({
+      connectConf: param.connectConf,
+      callable: async (conn: AsyncSsh2Client) => {
+        const sftp = await conn.getSftp();
+        return await conn.download({
+          sftp,
+          remotePath: param.filePath,
+          savePath: param.savePath,
+        });
+      },
+    });
+  }
 }

packages/plugins/plugin-lib/src/tencent/lib/cos-client.ts

@@ -1,5 +1,6 @@
 import { TencentAccess } from "../access.js";
-import { ILogger } from "@certd/basic";
+import { ILogger, safePromise } from "@certd/basic";
+import fs from "fs";
 
 export class TencentCosClient {
   access: TencentAccess;
@@ -23,15 +24,19 @@ export class TencentCosClient {
     return new sdk.default(clientConfig);
   }
 
-  async uploadFile(key: string, file: Buffer) {
+  async uploadFile(key: string, file: Buffer | string) {
     const cos = await this.getCosClient();
-    return new Promise((resolve, reject) => {
+    return safePromise((resolve, reject) => {
+      let readableStream = file as any;
+      if (typeof file === "string") {
+        readableStream = fs.createReadStream(file);
+      }
       cos.putObject(
         {
           Bucket: this.bucket /* 必须 */,
           Region: this.region /* 必须 */,
           Key: key /* 必须 */,
-          Body: file, // 上传文件对象
+          Body: readableStream, // 上传文件对象
           onProgress: function (progressData) {
             console.log(JSON.stringify(progressData));
           },
@@ -49,7 +54,7 @@ export class TencentCosClient {
 
   async removeFile(key: string) {
     const cos = await this.getCosClient();
-    return new Promise((resolve, reject) => {
+    return safePromise((resolve, reject) => {
       cos.deleteObject(
         {
           Bucket: this.bucket,
@@ -66,4 +71,47 @@ export class TencentCosClient {
       );
     });
   }
+
+  async downloadFile(key: string, savePath: string) {
+    const cos = await this.getCosClient();
+    const writeStream = fs.createWriteStream(savePath);
+    return safePromise((resolve, reject) => {
+      cos.getObject(
+        {
+          Bucket: this.bucket,
+          Region: this.region,
+          Key: key,
+          Output: writeStream,
+        },
+        function (err, data) {
+          if (err) {
+            reject(err);
+            return;
+          }
+          resolve(data);
+        }
+      );
+    });
+  }
+
+  async listDir(dirKey: string) {
+    const cos = await this.getCosClient();
+    return safePromise((resolve, reject) => {
+      cos.getBucket(
+        {
+          Bucket: this.bucket,
+          Region: this.region,
+          Prefix: dirKey,
+          MaxKeys: 1000,
+        },
+        function (err, data) {
+          if (err) {
+            reject(err);
+            return;
+          }
+          resolve(data.Contents);
+        }
+      );
+    });
+  }
 }

packages/ui/certd-client/.env

@@ -1,12 +1,12 @@
-VITE_APP_API=/api
+VITE_APP_API=api
 #登录与权限关闭
 VITE_APP_PM_ENABLED=true
 VITE_APP_TITLE=Certd
 VITE_APP_SLOGAN=让你的证书永不过期
-VITE_APP_COPYRIGHT_YEAR=2021-2024
+VITE_APP_COPYRIGHT_YEAR=2021-2025
 VITE_APP_COPYRIGHT_NAME=handsfree.work
 VITE_APP_COPYRIGHT_URL=https://certd.handsfree.work
-VITE_APP_LOGO=/static/images/logo/logo.svg
-VITE_APP_LOGIN_LOGO=/static/images/logo/rect-black.svg
+VITE_APP_LOGO=static/images/logo/logo.svg
+VITE_APP_LOGIN_LOGO=static/images/logo/rect-black.svg
 VITE_APP_PROJECT_PATH=https://github.com/certd/certd
 VITE_APP_NAMESPACE=fs

packages/ui/certd-client/.env.production

@@ -1,3 +1,3 @@
-VITE_APP_API=/api
+VITE_APP_API=api
 #登录与权限开启
 VITE_APP_PM_ENABLED=true

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,69 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.34.1](https://github.com/certd/certd/compare/v1.34.0...v1.34.1) (2025-05-05)
+
+### Bug Fixes
+
+* 根据SOA记录判断子域名托管有缺陷，改回手动配置子域名托管记录的方式 ([1b280a2](https://github.com/certd/certd/commit/1b280a2940f9e2d919b0bf23b89cc185be1fa498))
+* 修复宝塔授权测试按钮显示错误的bug ([048696e](https://github.com/certd/certd/commit/048696ee9386491bb68592fb3a47d1c900bb68bf))
+
+### Performance Improvements
+
+* 支持部署证书到火山dcdn ([5f85219](https://github.com/certd/certd/commit/5f852194953dc1b4e6336770f417507b8f5a33ad))
+
+# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28)
+
+### Bug Fixes
+
+* 修复二次认证登录进入错误账号的bug ([e3930e0](https://github.com/certd/certd/commit/e3930e07172dd7903cb0f6ff26e0e3e828ba3e77))
+
+## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26)
+
+### Bug Fixes
+
+* 服务器时间获取不准确的bug ([5d10cbf](https://github.com/certd/certd/commit/5d10cbf18daf94a90a7551641a3b13e3c5fec611))
+* 修复复制流水线无效的bug ([3df20a9](https://github.com/certd/certd/commit/3df20a924f32970b052e2588ea20de095f0ea693))
+* 修复token过期后，疯狂打印token过期信息的bug ([50a5fa1](https://github.com/certd/certd/commit/50a5fa15bb240a125bbc91d2ce1ff3c835888a77))
+
+### Performance Improvements
+
+* 数据库备份支持oss ([308d460](https://github.com/certd/certd/commit/308d4600efe2002f199c33b4594d3071784e58ea))
+* 支持反向代理增加contextPath路径 ([0088929](https://github.com/certd/certd/commit/0088929622160cc922995de9a563e8061686ff34))
+
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+### Performance Improvements
+
+* 优化首页插件列表展示 ([9b8f60b](https://github.com/certd/certd/commit/9b8f60b64b5f9a3db7dfa9b3dcbd9201984358d0))
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+### Bug Fixes
+
+* 上传商用证书，直接粘贴文本报错的问题；修复无法上传ec加密证书的bug ([5750bb7](https://github.com/certd/certd/commit/5750bb706779da274d8e7a87e71416cb64d2df79))
+* 修复下载证书时提示token已过期的问题 ([0e07ae6](https://github.com/certd/certd/commit/0e07ae6ce84dcb9279d3c44060d621566afa593c))
+
+### Performance Improvements
+
+* 更新license时同时绑定url ([78367af](https://github.com/certd/certd/commit/78367af8307f801e778c76d49f0918c21ffe032f))
+* 切换到不同的分组后再打开创建对话框，会自动选择分组 ([893dcd4](https://github.com/certd/certd/commit/893dcd4f2487891199ed3e5a3d47a79a75efc942))
+* 优化/api缓存为0 ([dc05cd4](https://github.com/certd/certd/commit/dc05cd481f186b13375192be965000e6b4b429a5))
+* 优化证书流水线创建，支持选择分组 ([d613aa8](https://github.com/certd/certd/commit/d613aa8f3e85d8dc475ef1b62d49394ce7fd7d24))
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+### Performance Improvements
+
+* 登录支持双重认证 ([48aef25](https://github.com/certd/certd/commit/48aef25b3f6499d674ca4e4ef16f4c62399fb735))
+* 多重认证登录 ([0f82cf4](https://github.com/certd/certd/commit/0f82cf409bc60706ab07e4ca4f272b9a1ca7eecb))
+
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+### Performance Improvements
+
+* 插件支持导入导出 ([cf8abb4](https://github.com/certd/certd/commit/cf8abb45282070c8ba91469f93fd379fabf1f74a))
+
 ## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
 
 **Note:** Version bump only for package @certd/ui-client

packages/ui/certd-client/index.html

@@ -2,11 +2,11 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8"/>
-    <link rel="icon" href="/api/app/favicon"/>
+    <link rel="icon" href="api/app/favicon"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title>Loading</title>
-    <script src="/static/icons/iconfont.js"></script>
-    <link rel="stylesheet" type="text/css" href="/static/index.css"/>
+    <script src="static/icons/iconfont.js?v=<%=version%>"></script>
+    <link rel="stylesheet" type="text/css" href="static/index.css?v=<%=version%>"/>
 </head>
 <body>
 <div id="app">

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.33.3",
+  "version": "1.34.1",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -101,8 +101,8 @@
     "zod-defaults": "^0.1.3"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.33.3",
-    "@certd/pipeline": "^1.33.3",
+    "@certd/lib-iframe": "^1.34.1",
+    "@certd/pipeline": "^1.34.1",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

packages/ui/certd-client/src/api/service.ts

@@ -3,6 +3,17 @@ import { get } from "lodash-es";
 import { errorLog, errorCreate } from "./tools";
 import { env } from "/src/utils/util.env";
 import { useUserStore } from "/@/store/user";
+
+export class CodeError extends Error {
+  code: number;
+  data?: any;
+  constructor(message: string, code: number, data?: any) {
+    super(message);
+    this.code = code;
+    this.data = data;
+  }
+}
+
 /**
  * @description 创建请求实例
  */
@@ -38,32 +49,30 @@ function createService() {
       }
 
       // 这个状态码是和后端约定的
-      const { code } = dataAxios;
-      // 根据 code 进行判断
-      if (code === undefined) {
+      if (dataAxios?.code === undefined) {
         // 如果没有 code 代表这不是项目后端开发的接口
         errorCreate(`非标准返回：${dataAxios}， ${response.config.url}`);
         return dataAxios;
-      } else {
-        // 有 code 代表这是一个后端接口 可以进行进一步的判断
-        switch (code) {
-          case 0:
-            // [ 示例 ] code === 0 代表没有错误
+      }
+      const { code } = dataAxios;
+      // 有 code 代表这是一个后端接口 可以进行进一步的判断
+      switch (code) {
+        case 0:
+          // [ 示例 ] code === 0 代表没有错误
+          // @ts-ignore
+          return dataAxios?.data;
+        default:
+          // 不是正确的 code
+          const errorMessage = dataAxios.msg || dataAxios.message || "未知错误";
+          // @ts-ignore
+          if (response?.config?.onError) {
+            const err = new CodeError(errorMessage, dataAxios.code, dataAxios.data);
             // @ts-ignore
-            return dataAxios.data;
-          default:
-            // 不是正确的 code
-            const errorMessage = dataAxios.msg || dataAxios.message || "未知错误";
-            // @ts-ignore
-            if (response?.config?.onError) {
-              // @ts-ignore
-              response.config.onError(new Error(errorMessage));
-            }
-            //@ts-ignore
-            const showErrorNotify = response?.config?.showErrorNotify;
-            errorCreate(`${errorMessage}: ${response.config.url}`, showErrorNotify);
-            return dataAxios;
-        }
+            response.config.onError(err);
+          }
+          //@ts-ignore
+          const showErrorNotify = response?.config?.showErrorNotify;
+          errorCreate(`${errorMessage}: ${response.config.url}`, showErrorNotify, dataAxios);
       }
     },
     error => {
@@ -109,7 +118,7 @@ function createService() {
       errorLog(error, error?.response?.config?.showErrorNotify);
       if (status === 401) {
         const userStore = useUserStore();
-        userStore.logout();
+        userStore.logout(true, true);
       }
 
       if (error?.config?.onError) {

packages/ui/certd-client/src/api/tools.ts

@@ -4,6 +4,7 @@
  * @param {String} defaultValue 默认值
  */
 import { uiContext } from "@fast-crud/fast-crud";
+import { CodeError } from "/@/api/service";
 
 export function parse(jsonString = "{}", defaultValue = {}) {
   let result = defaultValue;
@@ -66,10 +67,9 @@ export function errorLog(error: any, notify = true) {
 
 /**
  * @description 创建一个错误
- * @param {String} msg 错误信息
  */
-export function errorCreate(msg: string, notify = true) {
-  const err = new Error(msg);
+export function errorCreate(msg: string, notify = true, data?: any) {
+  const err = new CodeError(msg, data.code, data.data);
   console.error("errorCreate", err);
   if (notify) {
     uiContext.get().notification.error({ message: err.message });

packages/ui/certd-client/src/components/pem-input.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="pem-input">
     <FileInput v-bind="fileInput" class="mb-5" type="primary" text="选择文件" @change="onChange" />
-    <a-textarea v-bind="textarea" v-model:value="textRef"></a-textarea>
+    <a-textarea v-bind="textarea" :value="modelValue" @update:value="emitValue"></a-textarea>
   </div>
 </template>
 
@@ -17,7 +17,6 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits(["update:modelValue"]);
-const textRef = ref();
 
 function emitValue(value: string) {
   emit("update:modelValue", value);
@@ -39,16 +38,6 @@ function onChange(e: any) {
   };
   fileReader.readAsText(file); // 以文本形式读取文件
 }
-
-watch(
-  () => props.modelValue,
-  value => {
-    textRef.value = value;
-  },
-  {
-    immediate: true,
-  }
-);
 </script>
 
 <style lang="less">