v1.27.9

Merge pull request #244 from origami-owo/v2

.npmrc

@@ -1,2 +1,2 @@
-link-workspace-packages=true
+link-workspace-packages=deep
 prefer-workspace-packages=true

CHANGELOG.md

@@ -3,6 +3,72 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.9](https://github.com/certd/certd/compare/v1.27.8...v1.27.9) (2024-11-26)
+
+### Performance Improvements
+
+* 通知支持自定义webhook、anpush、iyuu、server酱 ([cbccd9e](https://github.com/certd/certd/commit/cbccd9e3d0a4c24aba772af62734666d40b22c57))
+* 通知支持vocechat、bark、telegram、discord、slack ([642f57f](https://github.com/certd/certd/commit/642f57ff6d7152a9e14f59c7fc0e32a6b1751fb7))
+
+## [1.27.8](https://github.com/certd/certd/compare/v1.27.7...v1.27.8) (2024-11-25)
+
+**Note:** Version bump only for package root
+
+## [1.27.7](https://github.com/certd/certd/compare/v1.27.6...v1.27.7) (2024-11-25)
+
+### Bug Fixes
+
+* 修复关键字查询bug ([fab6660](https://github.com/certd/certd/commit/fab66606b35a540fac31fee902331ba1ffdebc16))
+* 修复CNAME时子域名级数超出限制的问题 ([3af6d96](https://github.com/certd/certd/commit/3af6d96e6e353c9b2111cff81679b79c55195a0a))
+
+### Performance Improvements
+
+* 谷歌EAB绑定邮箱改成必填 ([81a8123](https://github.com/certd/certd/commit/81a8123725d7bf4bd6a32a64a066bd760b7b6a7f))
+* 华为云密钥获取提示及访问链接 ([de43391](https://github.com/certd/certd/commit/de43391e4c12dc3ad976f8fa8787f4eb70a41e75))
+* 通知管理 ([d9a00ee](https://github.com/certd/certd/commit/d9a00eeaf72735ced67c59d7983d84e3c730064a))
+* 通知渠道支持测试按钮 ([b54ae27](https://github.com/certd/certd/commit/b54ae272ebc2d31b32b049d44e2299a6be7f153c))
+* 优化插件开发，dnsProvider无需写http logger 变量 ([fcbb5e4](https://github.com/certd/certd/commit/fcbb5e46a112174150a62648319b8224fce3b7ed))
+* 支持部署到阿里云WAF ([c96fcb7](https://github.com/certd/certd/commit/c96fcb7afced979435cffa73591275008033c90d))
+* 支持企业微信群聊机器人通知 ([b805a29](https://github.com/certd/certd/commit/b805a2925984144a31575b8aaa622f0c30d41b56))
+
+## [1.27.6](https://github.com/certd/certd/compare/v1.27.5...v1.27.6) (2024-11-19)
+
+### Bug Fixes
+
+* .env 读取 \r 问题 ([0e33dfa](https://github.com/certd/certd/commit/0e33dfa019a55ea76193c428ec756af386adeb9d))
+* 修复vip试用secret报错的bug ([018dee6](https://github.com/certd/certd/commit/018dee6c383233560f078dfd30f6c2857a7e15ee))
+
+### Performance Improvements
+
+* 当步骤全部都禁用时，任务本身显示删除线 ([9ab9a6e](https://github.com/certd/certd/commit/9ab9a6e8b083e19793894f23e59f29c604ec98e5))
+
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Bug Fixes
+
+* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1))
+* 修复角色无法删除的bug ([66629a5](https://github.com/certd/certd/commit/66629a591aecc2d8364ea415c7afc3f9d0406562))
+* 修复Cname情况下，无法使用DNS类型的bug ([26dad39](https://github.com/certd/certd/commit/26dad399d5768b3205da099ddc11809aef7d6224))
+
+### Performance Improvements
+
+* 日志查看自动滚动到底部 ([4a2f7eb](https://github.com/certd/certd/commit/4a2f7ebf87b7c027cebff7cb763f8f35f6d2aa36))
+* 系统设置中的代理设置优化为可全局生效，环境变量中的https_proxy设置将无效 ([381a37f](https://github.com/certd/certd/commit/381a37fbaa6b61c887eda743897ae00afb825bdf))
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+* 优化腾讯云 cloudflare 重复解析记录时的返回值 ([90d1b68](https://github.com/certd/certd/commit/90d1b68bd6cf232fbe085234efe07d29b7690044))
+* 支持namesilo ([80159ec](https://github.com/certd/certd/commit/80159ecca895103d0495f3217311199e66056572))
+* 专业版试用，无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232))
+
+## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
+
+### Bug Fixes
+
+* 修复未设置pfx密码，导致jks转换报错的bug ([c3cfbd8](https://github.com/certd/certd/commit/c3cfbd8474155aed4379f91075de37d5d8c73ef0))
+
+### Performance Improvements
+
+* 公共cname服务支持关闭 ([f4ae512](https://github.com/certd/certd/commit/f4ae5125dc4cd97816976779cb3586b5ee78947e))
+
 ## [1.27.3](https://github.com/certd/certd/compare/v1.27.2...v1.27.3) (2024-11-13)
 
 ### Bug Fixes

README.md

@@ -10,7 +10,7 @@ Certd 是一个免费全自动申请和自动部署更新SSL证书的管理系
 
 * 全自动申请证书（支持所有注册商注册的域名）
 * 全自动部署更新证书（目前支持部署到主机、部署到阿里云、腾讯云等，目前已支持30+部署插件）
-* 支持通配符域名/泛域名，支持多个域名打到一个证书上
+* 支持通配符域名/泛域名，支持多个域名打到一个证书上，支持pem、pfx、der、jks等多种证书格式
 * 邮件通知
 * 私有化部署，数据保存本地，镜像由Github Actions构建，过程公开透明
 * 支持sqlite，postgresql数据库
@@ -115,7 +115,7 @@ docker compose up -d
   * 实际上没有办法不改变证书文件本身情况下直接续期或者续签。
   * 我们所说的续期，其实就是按照全套流程重新申请一份新证书，然后重新部署上去。
 * 免费证书过期时间90天，以后可能还会缩短，所以自动化部署必不可少
-* 设置每天自动运行，当证书过期前20天，会自动重新申请证书并部署
+* 设置每天自动运行，当证书过期前35天，会自动重新申请证书并部署
 
 
 ## 七、不同平台的设置说明

build.trigger

@@ -1 +1 @@
-1
+02:09

docs/.vitepress/config.ts

@@ -100,6 +100,7 @@ export default defineConfig({
             { text: "Certd本身的证书更新", link: "/guide/use/https/index.md" },
             { text: "js脚本插件使用", link: "/guide/use/custom-script/index.md" },
             { text: "邮箱配置", link: "/guide/use/email/index.md" },
+            { text: "IPv6支持", link: "/guide/use/setting/ipv6.md" },
             { text: "如何贡献代码", link: "/guide/development/index.md" },
           ]
         },

docs/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,80 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.8](https://github.com/certd/certd/compare/v1.27.7...v1.27.8) (2024-11-25)
+
+**Note:** Version bump only for package root
+
+## [1.27.7](https://github.com/certd/certd/compare/v1.27.6...v1.27.7) (2024-11-25)
+
+### Bug Fixes
+
+* 修复关键字查询bug ([fab6660](https://github.com/certd/certd/commit/fab66606b35a540fac31fee902331ba1ffdebc16))
+* 修复CNAME时子域名级数超出限制的问题 ([3af6d96](https://github.com/certd/certd/commit/3af6d96e6e353c9b2111cff81679b79c55195a0a))
+
+### Performance Improvements
+
+* 谷歌EAB绑定邮箱改成必填 ([81a8123](https://github.com/certd/certd/commit/81a8123725d7bf4bd6a32a64a066bd760b7b6a7f))
+* 华为云密钥获取提示及访问链接 ([de43391](https://github.com/certd/certd/commit/de43391e4c12dc3ad976f8fa8787f4eb70a41e75))
+* 通知管理 ([d9a00ee](https://github.com/certd/certd/commit/d9a00eeaf72735ced67c59d7983d84e3c730064a))
+* 通知渠道支持测试按钮 ([b54ae27](https://github.com/certd/certd/commit/b54ae272ebc2d31b32b049d44e2299a6be7f153c))
+* 优化插件开发，dnsProvider无需写http logger 变量 ([fcbb5e4](https://github.com/certd/certd/commit/fcbb5e46a112174150a62648319b8224fce3b7ed))
+* 支持部署到阿里云WAF ([c96fcb7](https://github.com/certd/certd/commit/c96fcb7afced979435cffa73591275008033c90d))
+* 支持企业微信群聊机器人通知 ([b805a29](https://github.com/certd/certd/commit/b805a2925984144a31575b8aaa622f0c30d41b56))
+
+## [1.27.6](https://github.com/certd/certd/compare/v1.27.5...v1.27.6) (2024-11-19)
+
+### Bug Fixes
+
+* .env 读取 \r 问题 ([0e33dfa](https://github.com/certd/certd/commit/0e33dfa019a55ea76193c428ec756af386adeb9d))
+* 修复vip试用secret报错的bug ([018dee6](https://github.com/certd/certd/commit/018dee6c383233560f078dfd30f6c2857a7e15ee))
+
+### Performance Improvements
+
+* 当步骤全部都禁用时，任务本身显示删除线 ([9ab9a6e](https://github.com/certd/certd/commit/9ab9a6e8b083e19793894f23e59f29c604ec98e5))
+
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Bug Fixes
+
+* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1))
+* 修复角色无法删除的bug ([66629a5](https://github.com/certd/certd/commit/66629a591aecc2d8364ea415c7afc3f9d0406562))
+* 修复Cname情况下，无法使用DNS类型的bug ([26dad39](https://github.com/certd/certd/commit/26dad399d5768b3205da099ddc11809aef7d6224))
+
+### Performance Improvements
+
+* 日志查看自动滚动到底部 ([4a2f7eb](https://github.com/certd/certd/commit/4a2f7ebf87b7c027cebff7cb763f8f35f6d2aa36))
+* 系统设置中的代理设置优化为可全局生效，环境变量中的https_proxy设置将无效 ([381a37f](https://github.com/certd/certd/commit/381a37fbaa6b61c887eda743897ae00afb825bdf))
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+* 优化腾讯云 cloudflare 重复解析记录时的返回值 ([90d1b68](https://github.com/certd/certd/commit/90d1b68bd6cf232fbe085234efe07d29b7690044))
+* 支持namesilo ([80159ec](https://github.com/certd/certd/commit/80159ecca895103d0495f3217311199e66056572))
+* 专业版试用，无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232))
+
+## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
+
+### Bug Fixes
+
+* 修复未设置pfx密码，导致jks转换报错的bug ([c3cfbd8](https://github.com/certd/certd/commit/c3cfbd8474155aed4379f91075de37d5d8c73ef0))
+
+### Performance Improvements
+
+* 公共cname服务支持关闭 ([f4ae512](https://github.com/certd/certd/commit/f4ae5125dc4cd97816976779cb3586b5ee78947e))
+
+## [1.27.3](https://github.com/certd/certd/compare/v1.27.2...v1.27.3) (2024-11-13)
+
+### Bug Fixes
+
+* 修复偶发性cname一直验证超时的bug ([d2ce72e](https://github.com/certd/certd/commit/d2ce72e4aaacdf726ba8b91fcd71db40a27714ba))
+* 修复邮件配置，忽略证书校验设置不生效的bug ([66a9690](https://github.com/certd/certd/commit/66a9690dc958732e1b3c672d965db502296446f9))
+* 修复ipv6未开启情况下，请求带有ipv6地址域名报ETIMEDOUT的bug ([a9a0967](https://github.com/certd/certd/commit/a9a0967a6f1d0bd27e69f3ec52c31d90d470bc23))
+
+### Performance Improvements
+
+* 修复站点个性化，浏览器标题没有生效的bug ([bcfac02](https://github.com/certd/certd/commit/bcfac02c96ceaf23d1a0b05b48d8047da933beaf))
+* 优化上传到主机插 路径选择，根据证书格式显示 ([8c3f86c](https://github.com/certd/certd/commit/8c3f86c6909ed91f48bb2880e78834e22f6f6a29))
+* 支持jks ([889eaae](https://github.com/certd/certd/commit/889eaaea92818f628b922dae540c026630611707))
+* ipv6支持 ([da6ac16](https://github.com/certd/certd/commit/da6ac1626b3574be2fabeeb18a1f10d60bdcbe49))
+
 ## [1.27.2](https://github.com/certd/certd/compare/v1.27.1...v1.27.2) (2024-11-08)
 
 ### Bug Fixes

docs/guide/development/index.md

@@ -3,7 +3,7 @@
 
 建议nodejs版本 `20.x` 及以上
 
-## 1.本地调试运行
+## 一、本地调试运行
 
 ### 克隆代码
 ```shell
@@ -57,7 +57,7 @@ npm run dev
 
 ```
 
-## 开发插件
+## 二、开发插件
 进入 `packages/ui/certd-server/src/plugins`
 
 ### 1.复制`plugin-demo`目录作为你的插件目录
@@ -91,8 +91,22 @@ export * from './plugins/plugin-deploy-to-xx'
 export * from "./plugin-cloudflare.js"
 ```
 
-## 重启服务进行调试
+### 6. 重启服务进行调试
 刷新浏览器，检查你的插件是否工作正常， 确保能够正常进行证书申请和部署
 
-## 提交PR
+## 三、提交PR
 我们将尽快审核PR
+
+## 四、 注意事项
+### 1.  如何让任务报错停止
+
+```js
+// 抛出异常即可使任务停止，否则会判定为成功
+throw new Error("错误信息")
+```
+
+
+## 五、贡献插件送激活码
+
+- PR要求，插件功能完整，代码规范
+- PR通过后，联系我们，送您一个专业版激活码

docs/guide/index.md

@@ -26,7 +26,7 @@ Certd 是一款开源、免费、全自动申请和部署更新SSL证书的工
     * 实际上没有办法不改变证书文件本身情况下直接续期或者续签。
     * 我们所说的续期，其实就是按照全套流程重新申请一份新证书，然后重新部署上去。
 * 免费证书过期时间90天，以后可能还会缩短，所以自动化部署必不可少
-* 设置每天自动运行，当证书过期前20天，会自动重新申请证书并部署
+* 设置每天自动运行，当证书过期前35天，会自动重新申请证书并部署
 
 ## 三、证书颁发机构对比
 * Let's Encrypt：申请最简单。

docs/guide/install/1panel/index.md

@@ -48,4 +48,4 @@ admin/123456
 
 ## 五、备份恢复
 
-将备份的`db.sqlite`覆盖到原来的位置即可
+将备份的`db.sqlite`覆盖到原来的位置，重启certd即可

docs/guide/install/baota/index.md

@@ -40,7 +40,7 @@ admin/123456
 ## 三、如何升级
 
 ### 1. 应用商店安装，直接更新镜像即可
-
+`docker`->`容器编排`->`左侧选择Certd-xxxx`->`更新镜像`
 ![img.png](./images/upgrade.png)
 
 
@@ -81,4 +81,4 @@ services:
 
 ## 五、备份恢复
 
-将备份的`db.sqlite`覆盖到原来的位置即可
+将备份的`db.sqlite`覆盖到原来的位置，重启certd即可

docs/guide/install/docker/index.md

@@ -71,4 +71,4 @@ docker compose up -d
 
 ## 四、备份恢复
 
-将备份的`db.sqlite`覆盖到原来的位置即可
+将备份的`db.sqlite`覆盖到原来的位置，重启certd即可

docs/guide/install/source/index.md

@@ -42,4 +42,4 @@ kill -9 $(lsof -t -i:7001)
 
 ## 四、备份恢复
 
-将备份的`db.sqlite`覆盖到原来的位置即可
+将备份的`db.sqlite`覆盖到原来的位置，重启certd即可

docs/guide/other/changelogs/CHANGELOG.md

@@ -1,721 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [1.27.2](https://github.com/certd/certd/compare/v1.27.1...v1.27.2) (2024-11-08)
-
-### Bug Fixes
-
-* 修复某些容器管理ui无法识别端口列表的bug ([576e60a](https://github.com/certd/certd/commit/576e60a2b52315909e659d2a58cf98b130e69e6f))
-* 修复删除腾讯云过期证书时间判断上的bug，导致已过期仍然没有删除证书 ([1ba1007](https://github.com/certd/certd/commit/1ba10072615015d91b81fc56a3b01dae6a2ae9d1))
-
-### Performance Improvements
-
-* 优化部署到阿里云CDN插件，支持多域名，更易用 ([80c500f](https://github.com/certd/certd/commit/80c500f618b169a1f64c57fe442242a4d0d9d833))
-* 优化流水线页面切换回来不丢失查询条件 ([4dcf6e8](https://github.com/certd/certd/commit/4dcf6e87bc5f7657ce8a56c5331e8723a0fee8ee))
-* 支持公共cname服务 ([3c919ee](https://github.com/certd/certd/commit/3c919ee5d1aef5d26cf3620a7c49d920786bc941))
-* 执行历史支持点击查看流水线详情 ([8968639](https://github.com/certd/certd/commit/89686399f90058835435b92872fc236fac990148))
-* 专业版7天试用 ([c58250e](https://github.com/certd/certd/commit/c58250e1f065a9bd8b4e82acc1df754504c0010c))
-
-## [1.27.1](https://github.com/certd/certd/compare/v1.27.0...v1.27.1) (2024-11-04)
-
-### Bug Fixes
-
-* 修复头像没有更新的bug ([9b4a31f](https://github.com/certd/certd/commit/9b4a31fa6a32b9cab2e22bd141cf96ca29120445))
-
-### Performance Improvements
-
-* 禁止页面缓存，点击tab页签可以刷新数据 ([7ad4b55](https://github.com/certd/certd/commit/7ad4b55ee000c1dd0747832b11107f32b0ffb889))
-* 优化时间选择器，自动填写分钟和秒钟 ([396dc34](https://github.com/certd/certd/commit/396dc34a841c7d016b033736afdba8366fb2d211))
-* cname 域名映射记录可读性优化 ([b1117ed](https://github.com/certd/certd/commit/b1117ed54a3ef015752999324ff72b821ef5e4b9))
-
-# [1.27.0](https://github.com/certd/certd/compare/v1.26.16...v1.27.0) (2024-10-31)
-
-### Bug Fixes
-
-* 修复历史记录不能按名称查询的bug ([6113c38](https://github.com/certd/certd/commit/6113c388b7fc58b11ca19ff05cc1286d096c8d28))
-* pfx兼容windows server 2016 ([e5e468a](https://github.com/certd/certd/commit/e5e468a463f66d02f235de54b7c1e09ace5f1cb1))
-
-### Features
-
-* 首页全新改版 ([63ec5b5](https://github.com/certd/certd/commit/63ec5b5519c760a3330569c0da6dac157302a330))
-
-### Performance Improvements
-
-* 管理控制台数据统计 ([babd589](https://github.com/certd/certd/commit/babd5897ae013ff7c04ebfcbfac8a00d84dd627c))
-* 增加向导 ([6d9ef26](https://github.com/certd/certd/commit/6d9ef26ecab71d752c2c55d75aed4fb5f6c05a39))
-* lego 升级到 4.19.2 ([129bf53](https://github.com/certd/certd/commit/129bf53edc9bbb001fe49fbd7e239bd1d09cc128))
-
-## [1.26.16](https://github.com/certd/certd/compare/v1.26.15...v1.26.16) (2024-10-30)
-
-### Bug Fixes
-
-* 修复lego No help topic for 错误 ([aaaf8d7](https://github.com/certd/certd/commit/aaaf8d7db34896cf8f2ff8f12eec1ab0cae58f0f))
-
-### Performance Improvements
-
-* 支持白山云cdn部署 ([b1b2cd0](https://github.com/certd/certd/commit/b1b2cd088b684eda764962abd61754c26a204d1c))
-* 支持华为云cdn ([81a3fdb](https://github.com/certd/certd/commit/81a3fdbc29b71f380762008cc151493ec97458f9))
-
-## [1.26.15](https://github.com/certd/certd/compare/v1.26.14...v1.26.15) (2024-10-28)
-
-### Bug Fixes
-
-* 顶部菜单变...的bug ([6dabad7](https://github.com/certd/certd/commit/6dabad76baba96be0f8af36a3fbfb9f5182aecf1))
-
-### Performance Improvements
-
-* 默认证书更新时间设置为35天，增加腾讯云删除过期证书插件，可以避免腾讯云过期证书邮件 ([51b6fed](https://github.com/certd/certd/commit/51b6fed468eaa6f28ce4497ce303ace1a52abb96))
-* 授权加密支持解密查看 ([5575c83](https://github.com/certd/certd/commit/5575c839705f6987ad2bdcd33256b0962c6a9c6a))
-* 重置管理员密码同时启用管理员账户，避免之前禁用了，重置密码还是登录不进去 ([f92d918](https://github.com/certd/certd/commit/f92d918a1e28e29b794ad4754661ea760c18af46))
-
-## [1.26.14](https://github.com/certd/certd/compare/v1.26.13...v1.26.14) (2024-10-26)
-
-### Bug Fixes
-
-* 修复阿里云部署大杀器报插件_还未注册错误的bug ([abd2dcf](https://github.com/certd/certd/commit/abd2dcf2e85a545321bae6451406d081f773b132))
-* 修复启动时自签证书无法保存的bug ([526c484](https://github.com/certd/certd/commit/526c48450bcd37b3ccded9b448f17de8140bdc6e))
-
-### Performance Improvements
-
-* 顶部菜单自定义 ([54d136c](https://github.com/certd/certd/commit/54d136cc6ae122f7c891b7a5c7232fe5de8e5cb5))
-* 禁用readonly用户 ([d10d42e](https://github.com/certd/certd/commit/d10d42e20619bb55a50d636b8867ff33db4e3b4b))
-* 限制其他用户流水线数量 ([315e437](https://github.com/certd/certd/commit/315e43746baf01682737f82e41579237a48409af))
-* 用户管理优化头像上传 ([661293c](https://github.com/certd/certd/commit/661293c189a3abf3cdc953b5225192372f57930d))
-
-## [1.26.13](https://github.com/certd/certd/compare/v1.26.12...v1.26.13) (2024-10-26)
-
-### Bug Fixes
-
-* 修复对话框全屏按钮与关闭按钮重叠的bug ([95df56c](https://github.com/certd/certd/commit/95df56cc5ca5e3eb843cd17cb7078cde47729f1e))
-* deprecated的运行时不要报错，只报警告 ([bcbefaa](https://github.com/certd/certd/commit/bcbefaaa35cf6d0eec085b3a2c5bfc7c6a8de9e1))
-
-### Performance Improvements
-
-* 更新certd本身的证书文档说明 ([0c50ede](https://github.com/certd/certd/commit/0c50ede129337b82df54575cbd2f4c2a783a0732))
-* 支持同时监听https端口，7002 ([d5a17f9](https://github.com/certd/certd/commit/d5a17f9e6afd63fda2df0981118480f25a1fac2e))
-
-## [1.26.12](https://github.com/certd/certd/compare/v1.26.11...v1.26.12) (2024-10-25)
-
-### Performance Improvements
-
-* 部署到阿里云任意云资源，阿里云部署大杀器 ([4075be7](https://github.com/certd/certd/commit/4075be7849b140acb92bd8da8a9acbf4eef85180))
-* 文件名特殊字符限制输入 ([c4164c6](https://github.com/certd/certd/commit/c4164c66e29f3ec799f98108a344806ca61e94ff))
-* 新增部署到百度云CDN插件 ([f126f9f](https://github.com/certd/certd/commit/f126f9f932d37fa01fff1accc7bdd17d349f8db5))
-* 新增部署到腾讯云CDN-v2，推荐使用 ([d782655](https://github.com/certd/certd/commit/d782655cb4dfbb74138178afbffeee76fc755115))
-* 优化cron选择器，增加下次触发时间显示 ([5b148b7](https://github.com/certd/certd/commit/5b148b7ed960ca6f7f5b733b2eadd56eeecbd4c2))
-* 支持部署到腾讯云COS ([a8a45d7](https://github.com/certd/certd/commit/a8a45d7f757820990e278533277a3deda5ba48f3))
-* 支持配置公共ZeroSSL授权 ([a90d1e6](https://github.com/certd/certd/commit/a90d1e68ee9cbc3705223457b8a86f071b150968))
-
-## [1.26.11](https://github.com/certd/certd/compare/v1.26.10...v1.26.11) (2024-10-23)
-
-### Bug Fixes
-
-* 申请证书没有使用到系统设置的http代理的bug ([3db216f](https://github.com/certd/certd/commit/3db216f515ba404cb4330fdab452971b22a50f08))
-* 修复移动任务后出现空阶段的bug ([4ea3edd](https://github.com/certd/certd/commit/4ea3edd59e93ca4f5b2e43b20dd4ef33909caddb))
-* 修复google证书*.xx.com与xx.com同时申请时报错的bug ([f8b99b8](https://github.com/certd/certd/commit/f8b99b81a23e7e9fd5e05ebd5caf355c41d67a90))
-* 允许七牛云cdn插件输入.号开头的通配符域名 ([18ee87d](https://github.com/certd/certd/commit/18ee87daff6eafc2201b58e28d85aafd3cb7a5b9))
-
-### Performance Improvements
-
-* 申请证书启用新的反代地址 ([a705182](https://github.com/certd/certd/commit/a705182b85e51157883e48f23463263793bf3c12))
-* 优化日志颜色 ([1291e98](https://github.com/certd/certd/commit/1291e98e821c5b1810aab7f0aebe3f5f5cd44a20))
-* 优化证书申请速度和成功率，反代地址优化，google基本可以稳定请求。增加请求重试。 ([41d9c3a](https://github.com/certd/certd/commit/41d9c3ac8398def541e65351cbe920d4a927182d))
-* 优化pfx密码密码输入框，让浏览器不自动填写密码 ([ffeede3](https://github.com/certd/certd/commit/ffeede38afa70c5ff6f2015516bead23d2c4df87))
-
-## [1.26.10](https://github.com/certd/certd/compare/v1.26.9...v1.26.10) (2024-10-20)
-
-### Bug Fixes
-
-* 修复cname服务普通用户access访问权限问题 ([c1e3e2e](https://github.com/certd/certd/commit/c1e3e2ee1f923ee5806479dd5f178c3286a01ae0))
-
-## [1.26.9](https://github.com/certd/certd/compare/v1.26.8...v1.26.9) (2024-10-19)
-
-### Bug Fixes
-
-* 修复普通用户无法校验cname配置的bug ([6285497](https://github.com/certd/certd/commit/62854978bf0bdbe749b42f8e40ab227ab31ec92f))
-* 修复切换普通用户登录时，左侧菜单没有同步更新的bug ([12116a8](https://github.com/certd/certd/commit/12116a89f43cf8b98f16d2ea6073f6b72a643215))
-* 修正邮箱设置跳转路由 ([17d8890](https://github.com/certd/certd/commit/17d88900a1f0e3af609b74597f5b1978230db32d))
-
-### Performance Improvements
-
-* 触发证书重新申请input变化对比规则优化，减少升级版本后触发申请证书的情况 ([c46a2a9](https://github.com/certd/certd/commit/c46a2a9a399c2a9a8bb59a48b9fb6e93227cce9b))
-* 任务下所有步骤都跳过时，整个任务显示跳过 ([84fd3b2](https://github.com/certd/certd/commit/84fd3b250dd1161ea06c5582fdadece4b29c2e53))
-* 授权配置去除前后空格 ([57d8d48](https://github.com/certd/certd/commit/57d8d48046fbf51c52b041d2dec03d51fb018587))
-* 数据库备份插件，先压缩再备份 ([304ef49](https://github.com/certd/certd/commit/304ef494fd5787c996ad0dcb6edd2f517afce9e2))
-* 优化菜单 ([1f4f157](https://github.com/certd/certd/commit/1f4f15757de1015cf7563f7022599eef58cc93d7))
-* 增加文档站 https://certd.docmirror.cn ([6e2ac1c](https://github.com/certd/certd/commit/6e2ac1c089f6ddccb396f1f2738509c05333e1bb))
-
-## [1.26.8](https://github.com/certd/certd/compare/v1.26.7...v1.26.8) (2024-10-15)
-
-### Bug Fixes
-
-* 修复无法设置角色的bug ([02fe704](https://github.com/certd/certd/commit/02fe704769edb25fea5ffd85a51a5530864b37b3))
-
-### Performance Improvements
-
-* 角色删除安全 ([28bb485](https://github.com/certd/certd/commit/28bb4856bee03569153f6471527c9b9f28cb3d14))
-* 密钥备份 ([1c6028a](https://github.com/certd/certd/commit/1c6028abcf8849163462bb2f8441b6838357e09b))
-* 证书直接查看 ([5dde5bd](https://github.com/certd/certd/commit/5dde5bd3f76db3959d411619d29bfb8064e3b307))
-* sqlite数据库备份插件 ([77f1631](https://github.com/certd/certd/commit/77f163144f7dcfb0431475c55508fecfd6d969f8))
-
-## [1.26.7](https://github.com/certd/certd/compare/v1.26.6...v1.26.7) (2024-10-14)
-
-### Bug Fixes
-
-* 修复siteInfo每次都要重新设置的bug ([36b26ae](https://github.com/certd/certd/commit/36b26ae9f5c7a53c1c2546fb79b2ea451b854abf))
-
-## [1.26.6](https://github.com/certd/certd/compare/v1.26.5...v1.26.6) (2024-10-14)
-
-### Bug Fixes
-
-* 修复排序失效的bug ([1f0742e](https://github.com/certd/certd/commit/1f0742ef9f0caae0c7e713acf0fd3cebf5d63875))
-
-## [1.26.5](https://github.com/certd/certd/compare/v1.26.4...v1.26.5) (2024-10-14)
-
-### Bug Fixes
-
-* 修复版本号获取错误的bug ([8851870](https://github.com/certd/certd/commit/8851870400df86e496198ad509061b8989fcc44f))
-
-## [1.26.4](https://github.com/certd/certd/compare/v1.26.3...v1.26.4) (2024-10-14)
-
-### Performance Improvements
-
-* [comm] 支持插件管理 ([e8b617b](https://github.com/certd/certd/commit/e8b617b80ce882dd63006f0cfc719a80a1cc6acc))
-* 新增代理设置功能 ([273ab61](https://github.com/certd/certd/commit/273ab6139f5807f4d7fe865cc353b97f51b9a668))
-* EAB授权支持绑定邮箱，支持公共EAB设置 ([07043af](https://github.com/certd/certd/commit/07043aff0ca7fd29c56dd3c363002cb15d78b464))
-
-## [1.26.3](https://github.com/certd/certd/compare/v1.26.2...v1.26.3) (2024-10-12)
-
-### Performance Improvements
-
-* 优化系统设置加载时机 ([7396253](https://github.com/certd/certd/commit/73962536d5a4769902d760d005f3f879465addcc))
-
-## [1.26.2](https://github.com/certd/certd/compare/v1.26.1...v1.26.2) (2024-10-11)
-
-### Bug Fixes
-
-* 修复某些情况下bindUrl失败的bug ([91fc1cd](https://github.com/certd/certd/commit/91fc1cd7353be4a22be951239ed70b38baebc74e))
-
-### Performance Improvements
-
-* 邮箱设置改为系统设置，普通用户无需配置发件邮箱 ([4244569](https://github.com/certd/certd/commit/42445692117184a3293e63bef84a74cbb5984b0e))
-
-## [1.26.1](https://github.com/certd/certd/compare/v1.26.0...v1.26.1) (2024-10-10)
-
-**Note:** Version bump only for package root
-
-# [1.26.0](https://github.com/certd/certd/compare/v1.25.9...v1.26.0) (2024-10-10)
-
-### Bug Fixes
-
-* 修复管理员编辑其他用户流水线任务时归属userid也被修改的bug ([e85c477](https://github.com/certd/certd/commit/e85c47744cf740b4af3b93dca7c2f0ccc818ec2f))
-* 修复历史记录根据流水线名称查询报错的bug ([ce9a986](https://github.com/certd/certd/commit/ce9a9862f122fce2186e7727eaa4b251b59e6032))
-* 修复某些代理情况下 报 400 The plain HTTP request was sent to HTTPS port use proxy 的bug ([a13203f](https://github.com/certd/certd/commit/a13203fb3f48c427d0d81a504912248dcc07df1a))
-
-### Features
-
-* 域名验证方法支持CNAME间接方式，此方式支持所有域名注册商，且无需提供Access授权，但是需要手动添加cname解析 ([f3d3508](https://github.com/certd/certd/commit/f3d35084ed44f9f33845f7045e520be5c27eed93))
-* 站点个性化设置 ([11a9fe9](https://github.com/certd/certd/commit/11a9fe9014d96cba929e5a066e78f2af7ae59d14))
-
-### Performance Improvements
-
-* 并行任务名称改成添加任务，取消并行，可以在同一个阶段获取上一个task的输出 ([c5e5877](https://github.com/certd/certd/commit/c5e58770d1c5edc19c6f9ea1618f44b68e091f35))
-* 调整静态资源到static目录 ([0584b36](https://github.com/certd/certd/commit/0584b3672b40f9042a2ed87e5627022606d046cd))
-* 调整全部静态资源到static目录 ([a218890](https://github.com/certd/certd/commit/a21889080d6c7ffdf0af526a3a21f0b2d1c77288))
-* 检查cname是否正确配置 ([b5d8935](https://github.com/certd/certd/commit/b5d8935159374fbe7fc7d4c48ae0ed9396861bdd))
-* 七牛云cdn支持配置多个域名 ([88d745e](https://github.com/certd/certd/commit/88d745e29063a089864fb9c6705be7b8d4c2669a))
-* 上传到主机插件支持注入环境变量 ([81fac73](https://github.com/certd/certd/commit/81fac736f9ccc8d1cda7ef4178752239cec20849))
-* 优化宝塔网站部署插件远程获取数据的提示 ([2a3ca9f](https://github.com/certd/certd/commit/2a3ca9f552d96594ec6690a1c4c91f598451b9a1))
-* 优化缩短首页缓存时间 ([49395e8](https://github.com/certd/certd/commit/49395e8cb65f4b30c0145329ed5de48be4ef3842))
-* 域名输入增加校验提示，避免输入错误的域名 ([0c8e83e](https://github.com/certd/certd/commit/0c8e83e1254a9ce4d5a4e7888eb1710394a4b77c))
-* cname校验配置增加未校验通过提示 ([77cc3c4](https://github.com/certd/certd/commit/77cc3c4a5cbd81f8233a8e0bb33fab0621c0905f))
-* google eab授权支持自动获取，不过要配置代理 ([592791d](https://github.com/certd/certd/commit/592791d1356fc252fbb70d7f168567aee9585507))
-
-## [1.25.9](https://github.com/certd/certd/compare/v1.25.8...v1.25.9) (2024-10-01)
-
-### Bug Fixes
-
-* 修复西部数码账户级别apikey不可用的bug ([f8f3e8b](https://github.com/certd/certd/commit/f8f3e8b43fd5d815887bcb53b95f46dc96424b79))
-
-### Performance Improvements
-
-* 增加等待插件 ([3ef0541](https://github.com/certd/certd/commit/3ef0541cc85ab6abf698ead3b258ae1ac156ef98))
-
-## [1.25.8](https://github.com/certd/certd/compare/v1.25.7...v1.25.8) (2024-09-30)
-
-### Bug Fixes
-
-* 修复pfxPassword无效的bug ([251e450](https://github.com/certd/certd/commit/251e450fabfe62405bac13e39f2153736c081ef0))
-
-### Performance Improvements
-
-* 群晖获取deviceid优化 ([8d42273](https://github.com/certd/certd/commit/8d4227366548eb70f6bc04303829e6933168f906))
-
-## [1.25.7](https://github.com/certd/certd/compare/v1.25.6...v1.25.7) (2024-09-29)
-
-### Bug Fixes
-
-* 修复某些地区被屏蔽无法激活专业版的bug ([7532a96](https://github.com/certd/certd/commit/7532a960851b84d4f2cc3dba02353c5235e1a364))
-
-### Performance Improvements
-
-* 上传到主机，支持socks代理 ([d91026d](https://github.com/certd/certd/commit/d91026dc4fbfe5fedc4ee8e43dc0d08f1cf88356))
-* 支持上传到七牛云oss ([bf024bd](https://github.com/certd/certd/commit/bf024bdda8bc2a463475be5761acf0da7317a08a))
-
-## [1.25.6](https://github.com/certd/certd/compare/v1.25.5...v1.25.6) (2024-09-29)
-
-### Bug Fixes
-
-* 修复中间证书复制错误的bug ([76e86ea](https://github.com/certd/certd/commit/76e86ea283ecbe4ec76cdc92b98457d0fef544ac))
-
-### Performance Improvements
-
-* 部署支持1Panel ([d047234](https://github.com/certd/certd/commit/d047234d98d31504f2e5a472b66e1b75806af26e))
-* 增加使用教程 ([9d9c021](https://github.com/certd/certd/commit/9d9c0218195af5b9896cce7109b26a433480571d))
-
-## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26)
-
-**Note:** Version bump only for package root
-
-## [1.25.4](https://github.com/certd/certd/compare/v1.25.3...v1.25.4) (2024-09-25)
-
-### Bug Fixes
-
-* 修复启动报授权验证失败的bug ([3460d3d](https://github.com/certd/certd/commit/3460d3ddca222ea702816ab805909d489eff957f))
-
-## [1.25.3](https://github.com/certd/certd/compare/v1.25.2...v1.25.3) (2024-09-24)
-
-### Bug Fixes
-
-* 修复upload to host trim错误 ([0f0ddb9](https://github.com/certd/certd/commit/0f0ddb9c5963fd643d6d203334efac471c43ec3b))
-
-## [1.25.2](https://github.com/certd/certd/compare/v1.25.1...v1.25.2) (2024-09-24)
-
-**Note:** Version bump only for package root
-
-## [1.25.1](https://github.com/certd/certd/compare/v1.25.0...v1.25.1) (2024-09-24)
-
-**Note:** Version bump only for package root
-
-# [1.25.0](https://github.com/certd/certd/compare/v1.24.4...v1.25.0) (2024-09-24)
-
-### Bug Fixes
-
-* 修复首次创建任务运行时不自动设置当前运行情况的bug ([ecd83ee](https://github.com/certd/certd/commit/ecd83ee136abdd3df9ed2f21ec2ff0f24c0ed9d9))
-
-### Features
-
-* 账号绑定 ([e046640](https://github.com/certd/certd/commit/e0466409d0c021bb415abd94df448c8a0d4799e9))
-* 支持中间证书 ([e86756e](https://github.com/certd/certd/commit/e86756e4c65a53dd23106d7ecbfe2fa987cc13f3))
-* 支持vip转移 ([361e8fe](https://github.com/certd/certd/commit/361e8fe7ae5877e23fd5de31bc919bedd09c57f5))
-
-### Performance Improvements
-
-* 群晖支持OTP双重验证登录 ([8b8039f](https://github.com/certd/certd/commit/8b8039f42bbce10a4d0e737cdeeeef9bb17bee5a))
-* 任务支持禁用 ([8ed16b3](https://github.com/certd/certd/commit/8ed16b3ea2dfe847357863a0bfa614e4fa5fc041))
-* 优化收件邮箱输入 ([22ef28f](https://github.com/certd/certd/commit/22ef28f6338a78465bd52ccbad13e66e80263b2f))
-* 优化主机登录失败提示 ([9de77b3](https://github.com/certd/certd/commit/9de77b327d39cff5ed6660ec53b58ba0eea18e5a))
-* 增加重启certd插件 ([48238d9](https://github.com/certd/certd/commit/48238d929e6c4afa1d428e4d35b9159d37a47ae0))
-* 证书支持旧版RSA，pkcs1 ([3d9c3ec](https://github.com/certd/certd/commit/3d9c3ecb3eb604b2458154f608bde0f01915d116))
-* 支持阿里云ACK证书部署 ([d331fea](https://github.com/certd/certd/commit/d331fea47789122650e057ec7c9e85ee8e66f09b))
-* 支持七牛云 ([8ecc2f9](https://github.com/certd/certd/commit/8ecc2f9446a9ebd11b9bfbffbb6cf7812a043495))
-* 支持k8s ingress secret ([e5a5d0a](https://github.com/certd/certd/commit/e5a5d0a607bb6b4e1a1f7a1a419bada5f2dee59f))
-* http请求增加默认超时时间 ([664bd86](https://github.com/certd/certd/commit/664bd863e5b4895aabe2384277c0c65f5902fdb2))
-* plugins增加图标 ([a8da658](https://github.com/certd/certd/commit/a8da658a9723342b4f43a579f7805bfef0648efb))
-
-## [1.24.4](https://github.com/certd/certd/compare/v1.24.3...v1.24.4) (2024-09-09)
-
-### Bug Fixes
-
-* 修复腾讯云cdn证书部署后会自动关闭hsts，http2.0等配置的bug ([7908ab7](https://github.com/certd/certd/commit/7908ab79da624c94fa05849925b15e480e3317c4))
-* 修复腾讯云tke证书部署报错的bug ([653f409](https://github.com/certd/certd/commit/653f409d91a441850d6381f89a8dd390831f0d5e))
-
-### Performance Improvements
-
-* 插件选择支持搜索 ([d1498a7](https://github.com/certd/certd/commit/d1498a71601b74d38343b1d070eadd03705dd9d5))
-* 前置任务步骤增加错误提示 ([ae3daa9](https://github.com/certd/certd/commit/ae3daa9bcf4fc363825aad9b77f5d3879aeeff70))
-* 群晖部署教程 ([0f0af2f](https://github.com/certd/certd/commit/0f0af2f309390f388e7a272cea3a1dd30c01977d))
-* 支持群晖 ([5c270b6](https://github.com/certd/certd/commit/5c270b6b9d45a2152f9fdb3c07bd98b7c803cb8e))
-
-## [1.24.3](https://github.com/certd/certd/compare/v1.24.2...v1.24.3) (2024-09-06)
-
-### Performance Improvements
-
-* 支持多吉云cdn证书部署 ([65ef685](https://github.com/certd/certd/commit/65ef6857296784ca765926e09eafcb6fc8b6ecde))
-
-## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
-
-### Bug Fixes
-
-* 修复复制流水线出现的各种问题 ([6314e8d](https://github.com/certd/certd/commit/6314e8d7eb58cd52e2a7bd3b5ffb9112b0b69577))
-* 修复windows下无法执行第二条命令的bug ([71ac8aa](https://github.com/certd/certd/commit/71ac8aae4aa694e1a23761e9761c9fba30b43a21))
-
-### Performance Improvements
-
-* 阶段、任务、步骤全面支持拖动排序 ([bd73a16](https://github.com/certd/certd/commit/bd73a163cd0497f062bd424ddc6bc9bbc95f81ea))
-* 任务配置不需要的字段可以自动隐藏 ([192d9dc](https://github.com/certd/certd/commit/192d9dc7e36737d684c769f255f407c28b1152ac))
-* 任务支持拖动排序 ([1e9b563](https://github.com/certd/certd/commit/1e9b5638aa36a8ce70019a9c750230ba41938327))
-* 西部数据支持用户级的apikey ([1c17b41](https://github.com/certd/certd/commit/1c17b41e160944b073e1849e6f9467c3659a4bfc))
-* 修复windows下无法执行第二条命令的bug ([d5bfcdb](https://github.com/certd/certd/commit/d5bfcdb6de1dcc1702155442e2e00237d0bbb6e5))
-* 优化跳过处理逻辑 ([b80210f](https://github.com/certd/certd/commit/b80210f24bf5db1c958d06ab27c9e5d3db452eda))
-* 支持阿里云oss ([87a2673](https://github.com/certd/certd/commit/87a2673e8c33dff6eda1b836d92ecc121564ed78))
-* 支持西部数码DNS ([c59cab1](https://github.com/certd/certd/commit/c59cab1aaeb19f86df8e3e0d8127cbd0a9ef77f3))
-* 支持pfx、der ([fbeaed2](https://github.com/certd/certd/commit/fbeaed203519f59b6d9396c4e8953353ccb5e723))
-* client 请求超时时间延长为10s ([ff46771](https://github.com/certd/certd/commit/ff46771d8dd43e71c1ca70e3ba783945750342cc))
-
-## [1.24.1](https://github.com/certd/certd/compare/v1.24.0...v1.24.1) (2024-09-02)
-
-### Bug Fixes
-
-* 激活仅限管理员 ([1c17970](https://github.com/certd/certd/commit/1c17970b981f0987c506744ee6b2283fd5e40493))
-* 修复在没有勾选使用代理的情况下，仍然会使用代理的bug ([0f66794](https://github.com/certd/certd/commit/0f6679425f6a736bb0128527dd99c085fac17d84))
-
-### Performance Improvements
-
-* 部署插件支持宝塔、易盾云等 ([ee61709](https://github.com/certd/certd/commit/ee617095efa1171548cf52fd45f0f98a368555a3))
-* 授权配置支持加密 ([42a56b5](https://github.com/certd/certd/commit/42a56b581d754c3e5f9838179d19ab0d004ef2eb))
-* 优化内存占用 ([db61033](https://github.com/certd/certd/commit/db6103363364440b650bc10bb334834e4a9470c7))
-* 支持阿里云 DCDN ([98b77f8](https://github.com/certd/certd/commit/98b77f80843834616fb26f83b4c42245326abd06))
-* 支持已跳过的步骤重新运行 ([ea775ad](https://github.com/certd/certd/commit/ea775adae18d57a04470cfba6b9460d761d74035))
-* 支持cdnfly ([724a850](https://github.com/certd/certd/commit/724a85028b4a7146c9e3b4df4497dcf2a7bf7c67))
-* 支持ftp上传 ([b9bddbf](https://github.com/certd/certd/commit/b9bddbfabb5664365f1232e9432532187c98006c))
-
-# [1.24.0](https://github.com/certd/certd/compare/v1.23.1...v1.24.0) (2024-08-25)
-
-### Bug Fixes
-
-* 部署到腾讯云cdn选择证书任务步骤限制只能选证书 ([3345c14](https://github.com/certd/certd/commit/3345c145b802170f75a098a35d0c4b8312efcd17))
-* 修复成功后跳过之后丢失腾讯云证书id的bug ([37eb762](https://github.com/certd/certd/commit/37eb762afe25c5896b75dee25f32809f8426e7b7))
-* 修复创建流水线后立即运行时报no id错误的bug ([17ead54](https://github.com/certd/certd/commit/17ead547aab25333603980304aa3aad3db1f73d5))
-* 修复使用代理的情况下申请证书失败的bug ([95122e2](https://github.com/certd/certd/commit/95122e28609333f4df55c266e5434897954c0fb3))
-* 修复执行日志没有清理的bug ([22a3363](https://github.com/certd/certd/commit/22a336370a88a7df2a23c967043bae153da71ed5))
-* 修复重置密码参数配置后无效的bug ([e358a88](https://github.com/certd/certd/commit/e358a8869696578687306e4cd0dcda53f898fe13))
-* 修复ssh无法连接成功，无法执行命令的bug ([41b9837](https://github.com/certd/certd/commit/41b9837582323fb400ef8525ce65e8b37ad4b36f))
-
-### Features
-
-* 支持ECC类型 ([a7424e0](https://github.com/certd/certd/commit/a7424e02f5c7e02ac1688791040785920ce67473))
-* 支持google证书申请（需要使用代理） ([a593056](https://github.com/certd/certd/commit/a593056e79e99dd6a74f75b5eab621af7248cfbe))
-
-### Performance Improvements
-
-* 更新k8s底层api库 ([746bb9d](https://github.com/certd/certd/commit/746bb9d385e2f397daef4976eca1d4782a2f5ebd))
-* 优化成功后跳过的提示 ([7b451bb](https://github.com/certd/certd/commit/7b451bbf6e6337507f4627b5a845f5bd96ab4f7b))
-* 优化证书申请成功率 ([968c469](https://github.com/certd/certd/commit/968c4690a07f69c08dcb3d3a494da4e319627345))
-* 优化dnspod的token id 说明 ([790bf11](https://github.com/certd/certd/commit/790bf11af06d6264ef74bc1bb919661f0354239a))
-* email proxy ([453f1ba](https://github.com/certd/certd/commit/453f1baa0b9eb0f648aa1b71ccf5a95b202ce13f))
-
-## [1.23.1](https://github.com/certd/certd/compare/v1.23.0...v1.23.1) (2024-08-06)
-
-### Bug Fixes
-
-* 修复模糊查询无效的bug ([9355917](https://github.com/certd/certd/commit/93559174c780173f0daec7cdbd1f72f8d5c504d5))
-
-### Performance Improvements
-
-* 优化插件字段的default value ([24c7be2](https://github.com/certd/certd/commit/24c7be2c9cb39c14f7a97b674127c88033280b02))
-* 优化默认值设置 ([1af19f0](https://github.com/certd/certd/commit/1af19f0ac053fe109782882964533636b5969d6b))
-
-# [1.23.0](https://github.com/certd/certd/compare/v1.22.9...v1.23.0) (2024-08-05)
-
-### Bug Fixes
-
-* 修复环境变量多个下划线不生效的bug ([7ec2218](https://github.com/certd/certd/commit/7ec2218c9fee5bee2bf0aa31f3e3a4301575f247))
-
-### Features
-
-* use node 20 ([e8ed972](https://github.com/certd/certd/commit/e8ed97206bf28e83f942db2ef4ea07fa76fd3567))
-
-## [1.22.9](https://github.com/certd/certd/compare/v1.22.8...v1.22.9) (2024-08-05)
-
-### Performance Improvements
-
-* 优化定时任务 ([87e440e](https://github.com/certd/certd/commit/87e440ee2a8b10dc571ce619f28bc83c1e5eb147))
-
-## [1.22.8](https://github.com/certd/certd/compare/v1.22.7...v1.22.8) (2024-08-05)
-
-### Performance Improvements
-
-* 修复删除历史记录没有删除log的bug，新增history管理页面，演示站点启动时不自动启动非管理员用户的定时任务 ([f78ae93](https://github.com/certd/certd/commit/f78ae93eedfe214008c3d071ca3d77c962137a64))
-* 优化pipeline删除时，删除其他history ([b425203](https://github.com/certd/certd/commit/b4252033d56a9ad950f3e204ff021497c3978015))
-
-## [1.22.7](https://github.com/certd/certd/compare/v1.22.6...v1.22.7) (2024-08-04)
-
-### Bug Fixes
-
-* 修复保存配置报id不能为空的bug ([367f807](https://github.com/certd/certd/commit/367f80731396003416665c22853dfbc09c2c03a0))
-
-## [1.22.6](https://github.com/certd/certd/compare/v1.22.5...v1.22.6) (2024-08-03)
-
-### Bug Fixes
-
-* 修复在相同的cron时偶尔无法触发定时任务的bug ([680941a](https://github.com/certd/certd/commit/680941af119619006b592e3ab6fb112cb5556a8b))
-* 修复pg下pipeline title 类型问题 ([a9717b9](https://github.com/certd/certd/commit/a9717b9a0df7b5a64d4fe03314fecad4f59774cc))
-
-### Performance Improvements
-
-* 流水线支持名称模糊查询 ([59897c4](https://github.com/certd/certd/commit/59897c4ceae992ebe2972ca9e8f9196616ffdfd7))
-* 腾讯云clb支持更多大区选择 ([e4f4570](https://github.com/certd/certd/commit/e4f4570b29f26c60f1ee9660a4c507cbeaba3d7e))
-* 优化前置任务输出为空的提示 ([6ed1e18](https://github.com/certd/certd/commit/6ed1e18c7d9c46d964ecc6abc90f3908297b7632))
-
-## [1.22.5](https://github.com/certd/certd/compare/v1.22.4...v1.22.5) (2024-07-26)
-
-### Bug Fixes
-
-* 修复用户管理无法添加用户的bug ([e7e89b8](https://github.com/certd/certd/commit/e7e89b8de7386e84c0d6b8e217e2034909657d68))
-
-## [1.22.4](https://github.com/certd/certd/compare/v1.22.3...v1.22.4) (2024-07-26)
-
-### Performance Improvements
-
-* 证书申请支持反向代理，letsencrypt无法访问时的备用方案 ([b7b5df0](https://github.com/certd/certd/commit/b7b5df0587e0f7ea288c1b2af6f87211f207395f))
-* 支持arm64 ([fa14f87](https://github.com/certd/certd/commit/fa14f87a8093ef3addc5e5f3315ce1bfc9982782))
-
-## [1.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25)
-
-### Bug Fixes
-
-* lege 无执行权限问题 ([338eb3b](https://github.com/certd/certd/commit/338eb3bdfeb461e9b3bc7eee97b97a59f5642ffe))
-
-## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23)
-
-### Bug Fixes
-
-* 修复创建流水线时，无法根据dns类型默认正确的dns授权的bug ([a2c43b5](https://github.com/certd/certd/commit/a2c43b50a6069ed48958fd142844a8568c2af452))
-
-## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20)
-
-### Performance Improvements
-
-* 创建证书任务可以选择lege插件 ([affef13](https://github.com/certd/certd/commit/affef130378030c517250c58a4e787b0fc85d7d1))
-* 创建证书任务增加定时任务和邮件通知输入 ([427620d](https://github.com/certd/certd/commit/427620d34f3b8ad6933005faf1878908441a2453))
-* 支持配置启动后自动触发一次任务 ([a5a0c1f](https://github.com/certd/certd/commit/a5a0c1f6e7a3f05e581005e491d5b102ee854412))
-
-# [1.22.0](https://github.com/certd/certd/compare/v1.21.2...v1.22.0) (2024-07-19)
-
-### Features
-
-* 升级midway，支持esm ([485e603](https://github.com/certd/certd/commit/485e603b5165c28bc08694997726eaf2a585ebe7))
-* 支持lego，海量DNS提供商 ([0bc6d0a](https://github.com/certd/certd/commit/0bc6d0a211920fb0084d705e1db67ee1e7262c44))
-* 支持postgresql ([3b19bfb](https://github.com/certd/certd/commit/3b19bfb4291e89064b3b407a80dae092d54747d5))
-
-### Performance Improvements
-
-* 优化一些小细节 ([b168852](https://github.com/certd/certd/commit/b1688525dbbbfd67e0ab1cf5b4ddfbe9d394f370))
-* 增加备案号设置 ([bd3d959](https://github.com/certd/certd/commit/bd3d959944db63a5690b55ee150e1007133868b9))
-* 自动生成jwtkey，无需手动配置 ([390e485](https://github.com/certd/certd/commit/390e4853a570390a97df6a3b3882579f9547eeb4))
-
-## [1.21.2](https://github.com/certd/certd/compare/v1.21.1...v1.21.2) (2024-07-08)
-
-### Performance Improvements
-
-* 申请证书时可以选择跳过本地dns校验 ([fe91d94](https://github.com/certd/certd/commit/fe91d94090d22ed0a3ea753ba74dfaa1bf057c17))
-
-## [1.21.1](https://github.com/certd/certd/compare/v1.21.0...v1.21.1) (2024-07-08)
-
-### Performance Improvements
-
-* 上传到主机，支持设置不mkdirs ([5ba9831](https://github.com/certd/certd/commit/5ba9831ed1aa6ec6057df246f1035b36b9c41d2e))
-* 说明优化，默认值优化 ([970c7fd](https://github.com/certd/certd/commit/970c7fd8a0f557770e973d8462ee5684ef742810))
-
-# [1.21.0](https://github.com/certd/certd/compare/v1.20.17...v1.21.0) (2024-07-03)
-
-### Features
-
-* 支持zero ssl ([eade2c2](https://github.com/certd/certd/commit/eade2c2b681569f03e9cd466e7d5bcd6703ed492))
-
-## [1.20.17](https://github.com/certd/certd/compare/v1.20.16...v1.20.17) (2024-07-03)
-
-### Performance Improvements
-
-* 创建dns解析后，强制等待60s ([f47b35f](https://github.com/certd/certd/commit/f47b35f6d5bd7d675005c3e286b7e9a029201f8b))
-* 文件上传提示由cert.crt改为cert.pem ([a09b0e4](https://github.com/certd/certd/commit/a09b0e48c176f3ed763791bd50322c29729f7c1c))
-* 优化cname verify ([eba333d](https://github.com/certd/certd/commit/eba333de7a5b5ef4b0b7eaa904f578720102fa61))
-
-## [1.20.16](https://github.com/certd/certd/compare/v1.20.15...v1.20.16) (2024-07-01)
-
-### Bug Fixes
-
-* 修复配置了cdn cname后申请失败的bug ([4a5fa76](https://github.com/certd/certd/commit/4a5fa767edc347d03d29a467e86c9a4d70b0220c))
-
-## [1.20.15](https://github.com/certd/certd/compare/v1.20.14...v1.20.15) (2024-06-28)
-
-### Bug Fixes
-
-* 修复无法强制取消任务的bug ([9cc01db](https://github.com/certd/certd/commit/9cc01db1d569a5c45bb3e731f35d85df324a8e62))
-
-### Performance Improvements
-
-* 腾讯云dns provider 支持腾讯云的accessId ([e0eb3a4](https://github.com/certd/certd/commit/e0eb3a441384d474fe2923c69b25318264bdc9df))
-* 支持windows文件上传 ([7f61cab](https://github.com/certd/certd/commit/7f61cab101fa13b4e88234e9ad47434e6130fed2))
-
-## [1.20.14](https://github.com/certd/certd/compare/v1.20.13...v1.20.14) (2024-06-23)
-
-### Bug Fixes
-
-* 修复修改密码功能异常问题 ([f740ff5](https://github.com/certd/certd/commit/f740ff517f521dce361284c2c54bccc68aee0ea2))
-
-## [1.20.13](https://github.com/certd/certd/compare/v1.20.12...v1.20.13) (2024-06-18)
-
-### Bug Fixes
-
-* 日志高度越界 ([c4c9adb](https://github.com/certd/certd/commit/c4c9adb8bfd513f57252e523794e3799a9b220f8))
-* 修复邮箱设置页面SMTP拼写错误的问题 ([b98f1c0](https://github.com/certd/certd/commit/b98f1c0dd0bc6c6b4f814c578692afdf6d90b88d))
-* 修复logo问题 ([7e483e6](https://github.com/certd/certd/commit/7e483e60913d509b113148c735fe13ba1d72dddf))
-
-### Performance Improvements
-
-* 增加警告，修复一些样式错乱问题 ([fd54c2f](https://github.com/certd/certd/commit/fd54c2ffac492222e85ff2f5f49a9ee5cfc73588))
-* ssh登录支持openssh格式私钥、支持私钥密码 ([5c2c508](https://github.com/certd/certd/commit/5c2c50839a9076004f9034d754ac6deb531acdfb))
-
-## [1.20.12](https://github.com/certd/certd/compare/v1.20.10...v1.20.12) (2024-06-17)
-
-### Bug Fixes
-
-* 修复aliyun域名超过100个找不到域名的bug ([5b1494b](https://github.com/certd/certd/commit/5b1494b3ce93d1026dc56ee741342fbb8bf7be24))
-
-### Performance Improvements
-
-* 增加系统设置，可以关闭自助注册功能 ([20feace](https://github.com/certd/certd/commit/20feacea12d43386540db6a600f391d786be4014))
-* 增加cloudflare access token说明 ([934e6e2](https://github.com/certd/certd/commit/934e6e2bd05387cd50ffab95f230933543954098))
-* 支持重置管理员密码，忘记密码的补救方案 ([732cbc5](https://github.com/certd/certd/commit/732cbc5e927b526850724594830392b2f10c6705))
-* 支持cloudflare域名 ([fbb9a47](https://github.com/certd/certd/commit/fbb9a47e8f7bb805289b9ee64bd46ffee0f01c06))
-
-## [1.20.10](https://github.com/certd/certd/compare/v1.20.9...v1.20.10) (2024-05-30)
-
-### Bug Fixes
-
-* 增加权限相关helper说明 ([83e4083](https://github.com/certd/certd/commit/83e40836ebff10bec60efe8933183e1ba1c22bf9))
-* 增加权限相关helper说明 ([4304c94](https://github.com/certd/certd/commit/4304c9443ad9248f63dd6d8c512d8d6f32f90d37))
-
-### Performance Improvements
-
-* 上传到主机插件支持复制到本机路径 ([92446c3](https://github.com/certd/certd/commit/92446c339936f98f08f654b8971a7393d8435224))
-* 优化文件下载包名 ([d9eb927](https://github.com/certd/certd/commit/d9eb927b0a1445feab08b1958aa9ea80637a5ae6))
-* 增加任务复制功能 ([39ad759](https://github.com/certd/certd/commit/39ad7597fa0e19cc1f7631bbd6fea0a9e05a62c9))
-
-## [1.20.9](https://github.com/certd/certd/compare/v1.20.8...v1.20.9) (2024-03-22)
-
-**Note:** Version bump only for package root
-
-## [1.20.8](https://github.com/certd/certd/compare/v1.20.7...v1.20.8) (2024-03-22)
-
-**Note:** Version bump only for package root
-
-## [1.20.7](https://github.com/certd/certd/compare/v1.20.6...v1.20.7) (2024-03-22)
-
-**Note:** Version bump only for package root
-
-## [1.20.6](https://github.com/certd/certd/compare/v1.20.5...v1.20.6) (2024-03-21)
-
-### Bug Fixes
-
-* 调整按钮图标到居中位置 ([836d18f](https://github.com/certd/certd/commit/836d18f07e22d00faf2f213bc3301a6672b5bafc))
-
-### Performance Improvements
-
-* 插件贡献文档及示例 ([72fb20a](https://github.com/certd/certd/commit/72fb20abf3ba5bdd862575d2907703a52fd7eb17))
-
-## [1.20.5](https://github.com/certd/certd/compare/v1.20.2...v1.20.5) (2024-03-11)
-
-### Bug Fixes
-
-* 修复腾讯云cdn部署无法选择端点的bug ([154409b](https://github.com/certd/certd/commit/154409b1dfee3ea1caae740ad9c1f99a6e7a9814))
-
-## [1.20.2](https://github.com/certd/certd/compare/v1.2.1...v1.20.2) (2024-02-28)
-
-### Bug Fixes
-
-* 临时修复阿里云domainlist接口返回域名列表不全的问题，后续还需要增加翻页查询 ([849c145](https://github.com/certd/certd/commit/849c145926984762bd9dbec87bd91cd047fc0855))
-
-## [1.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12)
-
-### Bug Fixes
-
-* 修复邮箱设置无效的bug ([aaa3224](https://github.com/certd/certd/commit/aaa322464d0f65e924d1850995540d396ee24d25))
-
-**Note:** Version bump only for package root
-
-# [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27)
-
-* 🔱: [client] sync upgrade with 2 commits [trident-sync] ([aa3207f](https://github.com/certd/certd/commit/aa3207fca5f15f7c3da789989d99c8ae7d1c4551))
-
-### BREAKING CHANGES
-
-* search支持自定义布局，search.layout、search.collapse转移到 search.container之下。如果想使用原来的search组件，请配置search.is=fs-search-v1
-
-## [1.1.6](https://github.com/certd/certd/compare/v1.1.5...v1.1.6) (2023-07-10)
-
-### Bug Fixes
-
-* 修复上传证书到腾讯云失败的bug ([e950322](https://github.com/certd/certd/commit/e950322232e19d1263b8552eefa5b0150fd7864e))
-
-## [1.1.5](https://github.com/certd/certd/compare/v1.1.4...v1.1.5) (2023-07-03)
-
-**Note:** Version bump only for package root
-
-## [1.1.4](https://github.com/certd/certd/compare/v1.1.3...v1.1.4) (2023-07-03)
-
-### Bug Fixes
-
-* 成功图标转动的问题 ([f87eee3](https://github.com/certd/certd/commit/f87eee3b9ff1ef9874e79a81fe0ed7104cb9ee8c))
-
-### Performance Improvements
-
-* cancel task ([bc65c0a](https://github.com/certd/certd/commit/bc65c0a786360c087fe95cad93ec6a87804cc5ee))
-* flush log ([891a43a](https://github.com/certd/certd/commit/891a43ae6716ff98ed06643f7da2e35199ee195c))
-* flush logger ([91be682](https://github.com/certd/certd/commit/91be6826b902e0f302b1a6cbdb1d24e15914c18d))
-* timeout ([3eeb1f7](https://github.com/certd/certd/commit/3eeb1f77aa2922f3545f3d2067f561d95621d54f))
-
-## [1.1.3](https://github.com/certd/certd/compare/v1.1.2...v1.1.3) (2023-07-03)
-
-**Note:** Version bump only for package root
-
-## [1.1.2](https://github.com/certd/certd/compare/v1.1.1...v1.1.2) (2023-07-03)
-
-**Note:** Version bump only for package root
-
-## [1.1.1](https://github.com/certd/certd/compare/v1.1.0...v1.1.1) (2023-06-28)
-
-**Note:** Version bump only for package root
-
-# [1.1.0](https://github.com/certd/certd/compare/v1.0.6...v1.1.0) (2023-06-28)
-
-### Bug Fixes
-
-* 修复access选择类型trigger ([2851a33](https://github.com/certd/certd/commit/2851a33eb2510f038fadb55da29512597a4ba512))
-
-### Features
-
-* 权限控制 ([27a4c81](https://github.com/certd/certd/commit/27a4c81c6d70e70abb3892c3ea58d4719988808a))
-* 邮件通知 ([937e3fa](https://github.com/certd/certd/commit/937e3fac19cd03b8aa91db8ba03fda7fcfbacea2))
-* cert download ([5a51c14](https://github.com/certd/certd/commit/5a51c14de521cb8075a80d2ae41a16e6d5281259))
-* config  merge ([fdc25dc](https://github.com/certd/certd/commit/fdc25dc0d795555cffacc4572648ec158988fbbb))
-* save files ([99522fb](https://github.com/certd/certd/commit/99522fb49adb42c1dfdf7bec3dd52d641158285b))
-* save files ([671d273](https://github.com/certd/certd/commit/671d273e2f9136d16896536b0ca127cf372f1619))
-
-## [1.0.6](https://github.com/certd/certd/compare/v1.0.5...v1.0.6) (2023-05-25)
-
-**Note:** Version bump only for package root
-
-## [1.0.5](https://github.com/certd/certd/compare/v1.0.4...v1.0.5) (2023-05-25)
-
-**Note:** Version bump only for package root
-
-## [1.0.4](https://github.com/certd/certd/compare/v1.0.3...v1.0.4) (2023-05-25)
-
-**Note:** Version bump only for package root
-
-## [1.0.3](https://github.com/certd/certd/compare/v1.0.2...v1.0.3) (2023-05-25)
-
-**Note:** Version bump only for package root
-
-## [1.0.2](https://github.com/certd/certd/compare/v1.0.1...v1.0.2) (2023-05-24)
-
-**Note:** Version bump only for package root
-
-## [1.0.1](https://github.com/certd/certd/compare/v1.0.0...v1.0.1) (2023-05-24)
-
-**Note:** Version bump only for package root

docs/guide/use/aliyun/index.md

@@ -8,4 +8,14 @@
 ALIYUN_CLIENT_CONNECT_TIMEOUT=10000 # 连接超时，单位毫秒
 ALIYUN_CLIENT_READ_TIMEOUT=10000 #读取数据超时，单位毫秒
 
-```
+```
+
+
+## 阿里云Access权限设置
+
+
+* 申请证书 ：`AliyunDNSFullAccess`
+* 上传证书到阿里云： `AliyunYundunCertFullAccess`
+* 部署证书到OSS: `AliyunYundunCertFullAccess`、`AliyunOSSFullAccess`
+* 部署证书到CDN: `AliyunYundunCertFullAccess`、`AliyunCDNFullAccess`
+* 部署证书到DCDN： `AliyunYundunCertFullAccess`、`AliyunDCDNFullAccess`

docs/guide/use/backup/index.md

@@ -27,4 +27,4 @@
 
 ## 三、备份恢复
 
-将备份的`db.sqlite`覆盖到原来的位置即可
+将备份的`db.sqlite`覆盖到原来的位置，重启certd即可

docs/guide/use/custom-script/index.md

@@ -18,6 +18,10 @@ const res = await ctx.http.request({
     key : certKey
   }
 })
+if(!res || res.code !== 0){
+    //抛异常才能让任务失败
+    throw new Error("上传失败")
+}
 //不能用console.log，需要用ctx.logger 才能把日志打印在ui上
 ctx.logger.info("上传成功",res.data)
 
@@ -79,3 +83,4 @@ type CustomScriptPlugin = {
 }
 
 ```
+

docs/guide/use/setting/ipv6.md

@@ -0,0 +1,21 @@
+# IPv6支持
+
+## 启用IPv6
+在`docker-compose.yaml`中启用IPv6支持，放开如下注释：
+```yaml
+#    #↓↓↓↓ ------------------------------------------------------------- 启用ipv6网络
+    networks:
+      - ip6net
+networks:
+  ip6net:
+    enable_ipv6: true
+    ipam:
+      config:
+        - subnet: 2001:db8::/64
+
+```
+
+## 设置双栈网络优先级
+可根据实际情况设置
+
+![img.png](./images/ipv6.png)

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.27.3"
+  "version": "1.27.9"
 }

package.json

@@ -21,7 +21,7 @@
     "transform-sql": "cd ./packages/ui/certd-server/db/ && node --experimental-json-modules transform.js",
     "commitAll": "git add . && git commit -m \"build: publish\" && git push && npm run commitPro",
     "commitPro": "cd ./packages/core/ && git add . && git commit -m \"build: publish\" && git push",
-    "copylogs": "copyfiles \"CHANGELOG.md\"  ./docs/guide/other/changelogs/",
+    "copylogs": "copyfiles \"CHANGELOG.md\"  ./docs/guide/changelogs/",
     "prepublishOnly1": "npm run check && lerna run build ",
     "prepublishOnly2": "npm run check && npm run before-build && lerna run build ",
     "before-build": "npm run transform-sql && cd ./packages/core/basic && time /t >build.md && git add ./build.md && git commit -m \"build: prepare to build\"",

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.9](https://github.com/publishlab/node-acme-client/compare/v1.27.8...v1.27.9) (2024-11-26)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.27.8](https://github.com/publishlab/node-acme-client/compare/v1.27.7...v1.27.8) (2024-11-25)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.27.7](https://github.com/publishlab/node-acme-client/compare/v1.27.6...v1.27.7) (2024-11-25)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.27.6](https://github.com/publishlab/node-acme-client/compare/v1.27.5...v1.27.6) (2024-11-19)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.27.5](https://github.com/publishlab/node-acme-client/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.27.4](https://github.com/publishlab/node-acme-client/compare/v1.27.3...v1.27.4) (2024-11-14)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.27.3](https://github.com/publishlab/node-acme-client/compare/v1.27.2...v1.27.3) (2024-11-13)
 
 **Note:** Version bump only for package @certd/acme-client

packages/core/acme-client/docs/crypto.md

@@ -6,6 +6,38 @@
 </dd>
 </dl>
 
+## Constants
+
+<dl>
+<dt><a href="#createPrivateEcdsaKey">createPrivateEcdsaKey</a> ⇒ <code>Promise.&lt;buffer&gt;</code></dt>
+<dd><p>Generate a private ECDSA key</p>
+</dd>
+<dt><a href="#getPublicKey">getPublicKey</a> ⇒ <code>buffer</code></dt>
+<dd><p>Get a public key derived from a RSA or ECDSA key</p>
+</dd>
+<dt><a href="#getPemBodyAsB64u">getPemBodyAsB64u</a> ⇒ <code>string</code></dt>
+<dd><p>Parse body of PEM encoded object and return a Base64URL string
+If multiple objects are chained, the first body will be returned</p>
+</dd>
+<dt><a href="#readCsrDomains">readCsrDomains</a> ⇒ <code>object</code></dt>
+<dd><p>Read domains from a Certificate Signing Request</p>
+</dd>
+<dt><a href="#readCertificateInfo">readCertificateInfo</a> ⇒ <code>object</code></dt>
+<dd><p>Read information from a certificate
+If multiple certificates are chained, the first will be read</p>
+</dd>
+<dt><a href="#createCsr">createCsr</a> ⇒ <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code></dt>
+<dd><p>Create a Certificate Signing Request</p>
+</dd>
+<dt><a href="#createAlpnCertificate">createAlpnCertificate</a> ⇒ <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code></dt>
+<dd><p>Create a self-signed ALPN certificate for TLS-ALPN-01 challenges</p>
+<p><a href="https://datatracker.ietf.org/doc/html/rfc8737">https://datatracker.ietf.org/doc/html/rfc8737</a></p>
+</dd>
+<dt><a href="#isAlpnCertificateAuthorizationValid">isAlpnCertificateAuthorizationValid</a> ⇒ <code>boolean</code></dt>
+<dd><p>Validate that a ALPN certificate contains the expected key authorization</p>
+</dd>
+</dl>
+
 ## Functions
 
 <dl>
@@ -15,12 +47,6 @@
 <dt><a href="#createPrivateKey">createPrivateKey()</a></dt>
 <dd><p>Alias of <code>createPrivateRsaKey()</code></p>
 </dd>
-<dt><a href="#createPrivateEcdsaKey">createPrivateEcdsaKey([namedCurve])</a> ⇒ <code>Promise.&lt;buffer&gt;</code></dt>
-<dd><p>Generate a private ECDSA key</p>
-</dd>
-<dt><a href="#getPublicKey">getPublicKey(keyPem)</a> ⇒ <code>buffer</code></dt>
-<dd><p>Get a public key derived from a RSA or ECDSA key</p>
-</dd>
 <dt><a href="#getJwk">getJwk(keyPem)</a> ⇒ <code>object</code></dt>
 <dd><p>Get a JSON Web Key derived from a RSA or ECDSA key</p>
 <p><a href="https://datatracker.ietf.org/doc/html/rfc7517">https://datatracker.ietf.org/doc/html/rfc7517</a></p>
@@ -28,27 +54,6 @@
 <dt><a href="#splitPemChain">splitPemChain(chainPem)</a> ⇒ <code>Array.&lt;string&gt;</code></dt>
 <dd><p>Split chain of PEM encoded objects from string into array</p>
 </dd>
-<dt><a href="#getPemBodyAsB64u">getPemBodyAsB64u(pem)</a> ⇒ <code>string</code></dt>
-<dd><p>Parse body of PEM encoded object and return a Base64URL string
-If multiple objects are chained, the first body will be returned</p>
-</dd>
-<dt><a href="#readCsrDomains">readCsrDomains(csrPem)</a> ⇒ <code>object</code></dt>
-<dd><p>Read domains from a Certificate Signing Request</p>
-</dd>
-<dt><a href="#readCertificateInfo">readCertificateInfo(certPem)</a> ⇒ <code>object</code></dt>
-<dd><p>Read information from a certificate
-If multiple certificates are chained, the first will be read</p>
-</dd>
-<dt><a href="#createCsr">createCsr(data, [keyPem])</a> ⇒ <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code></dt>
-<dd><p>Create a Certificate Signing Request</p>
-</dd>
-<dt><a href="#createAlpnCertificate">createAlpnCertificate(authz, keyAuthorization, [keyPem])</a> ⇒ <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code></dt>
-<dd><p>Create a self-signed ALPN certificate for TLS-ALPN-01 challenges</p>
-<p><a href="https://datatracker.ietf.org/doc/html/rfc8737">https://datatracker.ietf.org/doc/html/rfc8737</a></p>
-</dd>
-<dt><a href="#isAlpnCertificateAuthorizationValid">isAlpnCertificateAuthorizationValid(certPem, keyAuthorization)</a> ⇒ <code>boolean</code></dt>
-<dd><p>Validate that a ALPN certificate contains the expected key authorization</p>
-</dd>
 </dl>
 
 <a name="crypto"></a>
@@ -57,40 +62,12 @@ If multiple certificates are chained, the first will be read</p>
 Native Node.js crypto interface
 
 **Kind**: global namespace  
-<a name="createPrivateRsaKey"></a>
-
-## createPrivateRsaKey([modulusLength]) ⇒ <code>Promise.&lt;buffer&gt;</code>
-Generate a private RSA key
-
-**Kind**: global function  
-**Returns**: <code>Promise.&lt;buffer&gt;</code> - PEM encoded private RSA key  
-
-| Param | Type | Default | Description |
-| --- | --- | --- | --- |
-| [modulusLength] | <code>number</code> | <code>2048</code> | Size of the keys modulus in bits, default: `2048` |
-
-**Example**  
-Generate private RSA key
-```js
-const privateKey = await acme.crypto.createPrivateRsaKey();
-```
-**Example**  
-Private RSA key with modulus size 4096
-```js
-const privateKey = await acme.crypto.createPrivateRsaKey(4096);
-```
-<a name="createPrivateKey"></a>
-
-## createPrivateKey()
-Alias of `createPrivateRsaKey()`
-
-**Kind**: global function  
 <a name="createPrivateEcdsaKey"></a>
 
-## createPrivateEcdsaKey([namedCurve]) ⇒ <code>Promise.&lt;buffer&gt;</code>
+## createPrivateEcdsaKey ⇒ <code>Promise.&lt;buffer&gt;</code>
 Generate a private ECDSA key
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>Promise.&lt;buffer&gt;</code> - PEM encoded private ECDSA key  
 
 | Param | Type | Description |
@@ -109,10 +86,10 @@ const privateKey = await acme.crypto.createPrivateEcdsaKey('P-384');
 ```
 <a name="getPublicKey"></a>
 
-## getPublicKey(keyPem) ⇒ <code>buffer</code>
+## getPublicKey ⇒ <code>buffer</code>
 Get a public key derived from a RSA or ECDSA key
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>buffer</code> - PEM encoded public key  
 
 | Param | Type | Description |
@@ -124,44 +101,13 @@ Get public key
 ```js
 const publicKey = acme.crypto.getPublicKey(privateKey);
 ```
-<a name="getJwk"></a>
-
-## getJwk(keyPem) ⇒ <code>object</code>
-Get a JSON Web Key derived from a RSA or ECDSA key
-
-https://datatracker.ietf.org/doc/html/rfc7517
-
-**Kind**: global function  
-**Returns**: <code>object</code> - JSON Web Key  
-
-| Param | Type | Description |
-| --- | --- | --- |
-| keyPem | <code>buffer</code> \| <code>string</code> | PEM encoded private or public key |
-
-**Example**  
-Get JWK
-```js
-const jwk = acme.crypto.getJwk(privateKey);
-```
-<a name="splitPemChain"></a>
-
-## splitPemChain(chainPem) ⇒ <code>Array.&lt;string&gt;</code>
-Split chain of PEM encoded objects from string into array
-
-**Kind**: global function  
-**Returns**: <code>Array.&lt;string&gt;</code> - Array of PEM objects including headers  
-
-| Param | Type | Description |
-| --- | --- | --- |
-| chainPem | <code>buffer</code> \| <code>string</code> | PEM encoded object chain |
-
 <a name="getPemBodyAsB64u"></a>
 
-## getPemBodyAsB64u(pem) ⇒ <code>string</code>
+## getPemBodyAsB64u ⇒ <code>string</code>
 Parse body of PEM encoded object and return a Base64URL string
 If multiple objects are chained, the first body will be returned
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>string</code> - Base64URL-encoded body  
 
 | Param | Type | Description |
@@ -170,10 +116,10 @@ If multiple objects are chained, the first body will be returned
 
 <a name="readCsrDomains"></a>
 
-## readCsrDomains(csrPem) ⇒ <code>object</code>
+## readCsrDomains ⇒ <code>object</code>
 Read domains from a Certificate Signing Request
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>object</code> - {commonName, altNames}  
 
 | Param | Type | Description |
@@ -190,11 +136,11 @@ console.log(`Alt names: ${altNames.join(', ')}`);
 ```
 <a name="readCertificateInfo"></a>
 
-## readCertificateInfo(certPem) ⇒ <code>object</code>
+## readCertificateInfo ⇒ <code>object</code>
 Read information from a certificate
 If multiple certificates are chained, the first will be read
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>object</code> - Certificate info  
 
 | Param | Type | Description |
@@ -215,10 +161,10 @@ console.log(`Alt names: ${altNames.join(', ')}`);
 ```
 <a name="createCsr"></a>
 
-## createCsr(data, [keyPem]) ⇒ <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code>
+## createCsr ⇒ <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code>
 Create a Certificate Signing Request
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code> - [privateKey, certificateSigningRequest]  
 
 | Param | Type | Description |
@@ -276,12 +222,12 @@ const [, certificateRequest] = await acme.crypto.createCsr({
 ```
 <a name="createAlpnCertificate"></a>
 
-## createAlpnCertificate(authz, keyAuthorization, [keyPem]) ⇒ <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code>
+## createAlpnCertificate ⇒ <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code>
 Create a self-signed ALPN certificate for TLS-ALPN-01 challenges
 
 https://datatracker.ietf.org/doc/html/rfc8737
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code> - [privateKey, certificate]  
 
 | Param | Type | Description |
@@ -303,10 +249,10 @@ const [, alpnCertificate] = await acme.crypto.createAlpnCertificate(authz, keyAu
 ```
 <a name="isAlpnCertificateAuthorizationValid"></a>
 
-## isAlpnCertificateAuthorizationValid(certPem, keyAuthorization) ⇒ <code>boolean</code>
+## isAlpnCertificateAuthorizationValid ⇒ <code>boolean</code>
 Validate that a ALPN certificate contains the expected key authorization
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>boolean</code> - True when valid  
 
 | Param | Type | Description |
@@ -314,3 +260,62 @@ Validate that a ALPN certificate contains the expected key authorization
 | certPem | <code>buffer</code> \| <code>string</code> | PEM encoded certificate |
 | keyAuthorization | <code>string</code> | Expected challenge key authorization |
 
+<a name="createPrivateRsaKey"></a>
+
+## createPrivateRsaKey([modulusLength]) ⇒ <code>Promise.&lt;buffer&gt;</code>
+Generate a private RSA key
+
+**Kind**: global function  
+**Returns**: <code>Promise.&lt;buffer&gt;</code> - PEM encoded private RSA key  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| [modulusLength] | <code>number</code> | Size of the keys modulus in bits, default: `2048` |
+
+**Example**  
+Generate private RSA key
+```js
+const privateKey = await acme.crypto.createPrivateRsaKey();
+```
+**Example**  
+Private RSA key with modulus size 4096
+```js
+const privateKey = await acme.crypto.createPrivateRsaKey(4096);
+```
+<a name="createPrivateKey"></a>
+
+## createPrivateKey()
+Alias of `createPrivateRsaKey()`
+
+**Kind**: global function  
+<a name="getJwk"></a>
+
+## getJwk(keyPem) ⇒ <code>object</code>
+Get a JSON Web Key derived from a RSA or ECDSA key
+
+https://datatracker.ietf.org/doc/html/rfc7517
+
+**Kind**: global function  
+**Returns**: <code>object</code> - JSON Web Key  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| keyPem | <code>buffer</code> \| <code>string</code> | PEM encoded private or public key |
+
+**Example**  
+Get JWK
+```js
+const jwk = acme.crypto.getJwk(privateKey);
+```
+<a name="splitPemChain"></a>
+
+## splitPemChain(chainPem) ⇒ <code>Array.&lt;string&gt;</code>
+Split chain of PEM encoded objects from string into array
+
+**Kind**: global function  
+**Returns**: <code>Array.&lt;string&gt;</code> - Array of PEM objects including headers  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| chainPem | <code>buffer</code> \| <code>string</code> | PEM encoded object chain |
+

packages/core/acme-client/docs/forge.md

@@ -8,37 +8,42 @@ major release. Please migrate to the new <code>acme.crypto</code> interface at y
 </dd>
 </dl>
 
+## Constants
+
+<dl>
+<dt><a href="#createPublicKey">createPublicKey</a> ⇒ <code>Promise.&lt;buffer&gt;</code></dt>
+<dd><p>Create public key from a private RSA key</p>
+</dd>
+<dt><a href="#getPemBody">getPemBody</a> ⇒ <code>string</code></dt>
+<dd><p>Parse body of PEM encoded object from buffer or string
+If multiple objects are chained, the first body will be returned</p>
+</dd>
+<dt><a href="#splitPemChain">splitPemChain</a> ⇒ <code>Array.&lt;string&gt;</code></dt>
+<dd><p>Split chain of PEM encoded objects from buffer or string into array</p>
+</dd>
+<dt><a href="#getModulus">getModulus</a> ⇒ <code>Promise.&lt;buffer&gt;</code></dt>
+<dd><p>Get modulus</p>
+</dd>
+<dt><a href="#getPublicExponent">getPublicExponent</a> ⇒ <code>Promise.&lt;buffer&gt;</code></dt>
+<dd><p>Get public exponent</p>
+</dd>
+<dt><a href="#readCsrDomains">readCsrDomains</a> ⇒ <code>Promise.&lt;object&gt;</code></dt>
+<dd><p>Read domains from a Certificate Signing Request</p>
+</dd>
+<dt><a href="#readCertificateInfo">readCertificateInfo</a> ⇒ <code>Promise.&lt;object&gt;</code></dt>
+<dd><p>Read information from a certificate</p>
+</dd>
+<dt><a href="#createCsr">createCsr</a> ⇒ <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code></dt>
+<dd><p>Create a Certificate Signing Request</p>
+</dd>
+</dl>
+
 ## Functions
 
 <dl>
 <dt><a href="#createPrivateKey">createPrivateKey([size])</a> ⇒ <code>Promise.&lt;buffer&gt;</code></dt>
 <dd><p>Generate a private RSA key</p>
 </dd>
-<dt><a href="#createPublicKey">createPublicKey(key)</a> ⇒ <code>Promise.&lt;buffer&gt;</code></dt>
-<dd><p>Create public key from a private RSA key</p>
-</dd>
-<dt><a href="#getPemBody">getPemBody(str)</a> ⇒ <code>string</code></dt>
-<dd><p>Parse body of PEM encoded object from buffer or string
-If multiple objects are chained, the first body will be returned</p>
-</dd>
-<dt><a href="#splitPemChain">splitPemChain(str)</a> ⇒ <code>Array.&lt;string&gt;</code></dt>
-<dd><p>Split chain of PEM encoded objects from buffer or string into array</p>
-</dd>
-<dt><a href="#getModulus">getModulus(input)</a> ⇒ <code>Promise.&lt;buffer&gt;</code></dt>
-<dd><p>Get modulus</p>
-</dd>
-<dt><a href="#getPublicExponent">getPublicExponent(input)</a> ⇒ <code>Promise.&lt;buffer&gt;</code></dt>
-<dd><p>Get public exponent</p>
-</dd>
-<dt><a href="#readCsrDomains">readCsrDomains(csr)</a> ⇒ <code>Promise.&lt;object&gt;</code></dt>
-<dd><p>Read domains from a Certificate Signing Request</p>
-</dd>
-<dt><a href="#readCertificateInfo">readCertificateInfo(cert)</a> ⇒ <code>Promise.&lt;object&gt;</code></dt>
-<dd><p>Read information from a certificate</p>
-</dd>
-<dt><a href="#createCsr">createCsr(data, [key])</a> ⇒ <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code></dt>
-<dd><p>Create a Certificate Signing Request</p>
-</dd>
 </dl>
 
 <a name="forge"></a>
@@ -50,34 +55,12 @@ DEPRECATION WARNING: This crypto interface is deprecated and will be removed fro
 major release. Please migrate to the new `acme.crypto` interface at your earliest convenience.
 
 **Kind**: global namespace  
-<a name="createPrivateKey"></a>
-
-## createPrivateKey([size]) ⇒ <code>Promise.&lt;buffer&gt;</code>
-Generate a private RSA key
-
-**Kind**: global function  
-**Returns**: <code>Promise.&lt;buffer&gt;</code> - PEM encoded private RSA key  
-
-| Param | Type | Default | Description |
-| --- | --- | --- | --- |
-| [size] | <code>number</code> | <code>2048</code> | Size of the key, default: `2048` |
-
-**Example**  
-Generate private RSA key
-```js
-const privateKey = await acme.forge.createPrivateKey();
-```
-**Example**  
-Private RSA key with defined size
-```js
-const privateKey = await acme.forge.createPrivateKey(4096);
-```
 <a name="createPublicKey"></a>
 
-## createPublicKey(key) ⇒ <code>Promise.&lt;buffer&gt;</code>
+## createPublicKey ⇒ <code>Promise.&lt;buffer&gt;</code>
 Create public key from a private RSA key
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>Promise.&lt;buffer&gt;</code> - PEM encoded public RSA key  
 
 | Param | Type | Description |
@@ -91,11 +74,11 @@ const publicKey = await acme.forge.createPublicKey(privateKey);
 ```
 <a name="getPemBody"></a>
 
-## getPemBody(str) ⇒ <code>string</code>
+## getPemBody ⇒ <code>string</code>
 Parse body of PEM encoded object from buffer or string
 If multiple objects are chained, the first body will be returned
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>string</code> - PEM body  
 
 | Param | Type | Description |
@@ -104,10 +87,10 @@ If multiple objects are chained, the first body will be returned
 
 <a name="splitPemChain"></a>
 
-## splitPemChain(str) ⇒ <code>Array.&lt;string&gt;</code>
+## splitPemChain ⇒ <code>Array.&lt;string&gt;</code>
 Split chain of PEM encoded objects from buffer or string into array
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>Array.&lt;string&gt;</code> - Array of PEM bodies  
 
 | Param | Type | Description |
@@ -116,10 +99,10 @@ Split chain of PEM encoded objects from buffer or string into array
 
 <a name="getModulus"></a>
 
-## getModulus(input) ⇒ <code>Promise.&lt;buffer&gt;</code>
+## getModulus ⇒ <code>Promise.&lt;buffer&gt;</code>
 Get modulus
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>Promise.&lt;buffer&gt;</code> - Modulus  
 
 | Param | Type | Description |
@@ -135,10 +118,10 @@ const m3 = await acme.forge.getModulus(certificateRequest);
 ```
 <a name="getPublicExponent"></a>
 
-## getPublicExponent(input) ⇒ <code>Promise.&lt;buffer&gt;</code>
+## getPublicExponent ⇒ <code>Promise.&lt;buffer&gt;</code>
 Get public exponent
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>Promise.&lt;buffer&gt;</code> - Exponent  
 
 | Param | Type | Description |
@@ -154,10 +137,10 @@ const e3 = await acme.forge.getPublicExponent(certificateRequest);
 ```
 <a name="readCsrDomains"></a>
 
-## readCsrDomains(csr) ⇒ <code>Promise.&lt;object&gt;</code>
+## readCsrDomains ⇒ <code>Promise.&lt;object&gt;</code>
 Read domains from a Certificate Signing Request
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>Promise.&lt;object&gt;</code> - {commonName, altNames}  
 
 | Param | Type | Description |
@@ -174,10 +157,10 @@ console.log(`Alt names: ${altNames.join(', ')}`);
 ```
 <a name="readCertificateInfo"></a>
 
-## readCertificateInfo(cert) ⇒ <code>Promise.&lt;object&gt;</code>
+## readCertificateInfo ⇒ <code>Promise.&lt;object&gt;</code>
 Read information from a certificate
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>Promise.&lt;object&gt;</code> - Certificate info  
 
 | Param | Type | Description |
@@ -198,10 +181,10 @@ console.log(`Alt names: ${altNames.join(', ')}`);
 ```
 <a name="createCsr"></a>
 
-## createCsr(data, [key]) ⇒ <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code>
+## createCsr ⇒ <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code>
 Create a Certificate Signing Request
 
-**Kind**: global function  
+**Kind**: global constant  
 **Returns**: <code>Promise.&lt;Array.&lt;buffer&gt;&gt;</code> - [privateKey, certificateSigningRequest]  
 
 | Param | Type | Description |
@@ -256,3 +239,25 @@ const certificateKey = await acme.forge.createPrivateKey();
 const [, certificateRequest] = await acme.forge.createCsr({
     altNames: ['test.example.com'],
 }, certificateKey);
+<a name="createPrivateKey"></a>
+
+## createPrivateKey([size]) ⇒ <code>Promise.&lt;buffer&gt;</code>
+Generate a private RSA key
+
+**Kind**: global function  
+**Returns**: <code>Promise.&lt;buffer&gt;</code> - PEM encoded private RSA key  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| [size] | <code>number</code> | Size of the key, default: `2048` |
+
+**Example**  
+Generate private RSA key
+```js
+const privateKey = await acme.forge.createPrivateKey();
+```
+**Example**  
+Private RSA key with defined size
+```js
+const privateKey = await acme.forge.createPrivateKey(4096);
+```

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.27.3",
+    "version": "1.27.9",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.27.3",
+        "@certd/basic": "^1.27.9",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.7.2",
@@ -65,5 +65,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "3a0178b2949083c770ed96a4122e4c0a5e0bcc11"
+    "gitHead": "ff1d7b115ad211e65fdbbcb625837aa7cc911cfd"
 }

packages/core/basic/.npmrc

@@ -1,2 +1,2 @@
-link-workspace-packages=true
+link-workspace-packages=deep
 prefer-workspace-packages=true

packages/core/basic/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.27.9](https://github.com/certd/certd/compare/v1.27.8...v1.27.9) (2024-11-26)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.27.8](https://github.com/certd/certd/compare/v1.27.7...v1.27.8) (2024-11-25)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.27.7](https://github.com/certd/certd/compare/v1.27.6...v1.27.7) (2024-11-25)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.27.6](https://github.com/certd/certd/compare/v1.27.5...v1.27.6) (2024-11-19)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Performance Improvements
+
+* 系统设置中的代理设置优化为可全局生效，环境变量中的https_proxy设置将无效 ([381a37f](https://github.com/certd/certd/commit/381a37fbaa6b61c887eda743897ae00afb825bdf))
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+* 优化腾讯云 cloudflare 重复解析记录时的返回值 ([90d1b68](https://github.com/certd/certd/commit/90d1b68bd6cf232fbe085234efe07d29b7690044))
+
+## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
+
+**Note:** Version bump only for package @certd/basic
+
 ## [1.27.3](https://github.com/certd/certd/compare/v1.27.2...v1.27.3) (2024-11-13)
 
 ### Bug Fixes

packages/core/basic/build.md

@@ -1 +1 @@
-00:16
+15:25

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.27.3",
+  "version": "1.27.9",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -43,5 +43,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "3a0178b2949083c770ed96a4122e4c0a5e0bcc11"
+  "gitHead": "ff1d7b115ad211e65fdbbcb625837aa7cc911cfd"
 }

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

@@ -178,7 +178,10 @@ export function createAxiosService({ logger }: { logger: Logger }) {
       );
       logger.error('返回数据:', JSON.stringify(error.response?.data));
       if (error.response?.data) {
-        error.message = error.response.data.message || error.response.data.msg || error.response.data.error || error.response.data;
+        const message = error.response.data.message || error.response.data.msg || error.response.data.error;
+        if (typeof message === 'string') {
+          error.message = message;
+        }
       }
       if (error instanceof AggregateError) {
         logger.error('AggregateError', error);
@@ -202,6 +205,9 @@ export type HttpClient = {
   request<D = any, R = any>(config: HttpRequestConfig<D>): Promise<HttpClientResponse<R>>;
 };
 
+// const http_proxy_backup = process.env.HTTP_PROXY || process.env.http_proxy;
+// const https_proxy_backup = process.env.HTTPS_PROXY || process.env.https_proxy;
+
 export type CreateAgentOptions = {
   httpProxy?: string;
   httpsProxy?: string;
@@ -216,20 +222,28 @@ export function createAgent(opts: CreateAgentOptions = {}) {
   );
 
   let httpAgent, httpsAgent;
-  const httpProxy = opts.httpProxy || process.env.HTTP_PROXY || process.env.http_proxy;
+  const httpProxy = opts.httpProxy;
   if (httpProxy) {
+    process.env.HTTP_PROXY = httpProxy;
+    process.env.http_proxy = 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 = '';
     httpAgent = new nodeHttp.Agent(opts);
   }
-  const httpsProxy = opts.httpsProxy || process.env.HTTPS_PROXY || process.env.https_proxy;
+  const httpsProxy = opts.httpsProxy;
   if (httpsProxy) {
+    process.env.HTTPS_PROXY = httpProxy;
+    process.env.https_proxy = httpProxy;
     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 = '';
     httpsAgent = new https.Agent(opts);
   }
   return {

packages/core/pipeline/.npmrc

@@ -1,2 +1,2 @@
-link-workspace-packages=true
+link-workspace-packages=deep
 prefer-workspace-packages=true

packages/core/pipeline/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.27.9](https://github.com/certd/certd/compare/v1.27.8...v1.27.9) (2024-11-26)
+
+### Performance Improvements
+
+* 通知支持自定义webhook、anpush、iyuu、server酱 ([cbccd9e](https://github.com/certd/certd/commit/cbccd9e3d0a4c24aba772af62734666d40b22c57))
+* 通知支持vocechat、bark、telegram、discord、slack ([642f57f](https://github.com/certd/certd/commit/642f57ff6d7152a9e14f59c7fc0e32a6b1751fb7))
+
+## [1.27.8](https://github.com/certd/certd/compare/v1.27.7...v1.27.8) (2024-11-25)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.27.7](https://github.com/certd/certd/compare/v1.27.6...v1.27.7) (2024-11-25)
+
+### Performance Improvements
+
+* 通知管理 ([d9a00ee](https://github.com/certd/certd/commit/d9a00eeaf72735ced67c59d7983d84e3c730064a))
+* 通知渠道支持测试按钮 ([b54ae27](https://github.com/certd/certd/commit/b54ae272ebc2d31b32b049d44e2299a6be7f153c))
+* 优化插件开发，dnsProvider无需写http logger 变量 ([fcbb5e4](https://github.com/certd/certd/commit/fcbb5e46a112174150a62648319b8224fce3b7ed))
+* 支持企业微信群聊机器人通知 ([b805a29](https://github.com/certd/certd/commit/b805a2925984144a31575b8aaa622f0c30d41b56))
+
+## [1.27.6](https://github.com/certd/certd/compare/v1.27.5...v1.27.6) (2024-11-19)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Performance Improvements
+
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+
+## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.27.3](https://github.com/certd/certd/compare/v1.27.2...v1.27.3) (2024-11-13)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.27.3",
+  "version": "1.27.9",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,8 +16,8 @@
     "test": "mocha   --loader=ts-node/esm"
   },
   "dependencies": {
-    "@certd/basic": "^1.27.3",
-    "@certd/plus-core": "^1.27.3",
+    "@certd/basic": "^1.27.9",
+    "@certd/plus-core": "^1.27.9",
     "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": "3a0178b2949083c770ed96a4122e4c0a5e0bcc11"
+  "gitHead": "ff1d7b115ad211e65fdbbcb625837aa7cc911cfd"
 }

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

@@ -2,7 +2,15 @@ import { Registrable } from "../registry/index.js";
 import { FormItemProps } from "../dt/index.js";
 import { HttpClient, ILogger, utils } from "@certd/basic";
 import * as _ from "lodash-es";
-import { AccessRequestHandleReq } from "../core";
+import { PluginRequestHandleReq } from "../plugin/index.js";
+
+export type AccessRequestHandleReqInput<T = any> = {
+  id?: number;
+  title?: string;
+  access: T;
+};
+
+export type AccessRequestHandleReq<T = any> = PluginRequestHandleReq<AccessRequestHandleReqInput<T>>;
 
 export type AccessInputDefine = FormItemProps & {
   title: string;
@@ -33,6 +41,10 @@ export type AccessContext = {
 export abstract class BaseAccess implements IAccess {
   ctx!: AccessContext;
 
+  setCtx(ctx: AccessContext) {
+    this.ctx = ctx;
+  }
+
   async onRequest(req: AccessRequestHandleReq) {
     if (!req.action) {
       throw new Error("action is required");

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

@@ -56,6 +56,6 @@ export function newAccess(type: string, input: any, ctx?: AccessContext) {
       utils,
     };
   }
-  access.ctx = ctx;
+  access.setCtx(ctx);
   return access;
 }

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

@@ -1,4 +1,4 @@
-import { Registry } from "../registry/index.js";
+import { createRegistry } from "../registry/index.js";
 
 // @ts-ignore
-export const accessRegistry = new Registry("access");
+export const accessRegistry = createRegistry("access");

packages/core/pipeline/src/core/executor.ts

@@ -7,9 +7,10 @@ import { createAxiosService, hashUtils, HttpRequestConfig, ILogger, logger, util
 import { IAccessService } from "../access/index.js";
 import { RegistryItem } from "../registry/index.js";
 import { Decorator } from "../decorator/index.js";
-import { ICnameProxyService, IEmailService, IPluginConfigService } from "../service/index.js";
+import { ICnameProxyService, IEmailService, IPluginConfigService, IUrlService } from "../service/index.js";
 import { FileStore } from "./file-store.js";
 import { cloneDeep, forEach, merge } from "lodash-es";
+import { INotificationService, NotificationBody, NotificationContext, notificationRegistry } from "../notification/index.js";
 
 export type ExecutorOptions = {
   pipeline: Pipeline;
@@ -17,10 +18,13 @@ export type ExecutorOptions = {
   onChanged: (history: RunHistory) => Promise<void>;
   accessService: IAccessService;
   emailService: IEmailService;
+  notificationService: INotificationService;
   cnameProxyService: ICnameProxyService;
   pluginConfigService: IPluginConfigService;
+  urlService: IUrlService;
   fileRootDir?: string;
   user: UserInfo;
+  baseURL?: string;
 };
 
 export class Executor {
@@ -357,20 +361,22 @@ export class Executor {
     if (!this.pipeline.notifications) {
       return;
     }
+    const url = await this.options.urlService.getPipelineDetailUrl(this.pipeline.id, this.runtime.id);
     let subject = "";
     let content = "";
+    const errorMessage = error?.message;
     if (when === "start") {
-      subject = `【CertD】开始执行，【${this.pipeline.id}】${this.pipeline.title}`;
-      content = `buildId:${this.runtime.id}`;
+      subject = `【Certd】开始执行，${this.pipeline.title}【${this.pipeline.id}】`;
+      content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}`;
     } else if (when === "success") {
-      subject = `【CertD】执行成功，【${this.pipeline.id}】${this.pipeline.title}`;
-      content = `buildId:${this.runtime.id}`;
+      subject = `【Certd】执行成功，${this.pipeline.title}【${this.pipeline.id}】`;
+      content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}`;
     } else if (when === "turnToSuccess") {
-      subject = `【CertD】执行成功（错误转成功），【${this.pipeline.id}】${this.pipeline.title}`;
-      content = `buildId:${this.runtime.id}`;
+      subject = `【Certd】执行成功（失败转成功），${this.pipeline.title}【${this.pipeline.id}】`;
+      content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}`;
     } else if (when === "error") {
-      subject = `【CertD】执行失败，【${this.pipeline.id}】${this.pipeline.title}`;
-      content = `buildId:${this.runtime.id}\nerror:${error.message}`;
+      subject = `【Certd】执行失败，${this.pipeline.title}【${this.pipeline.id}】`;
+      content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}\n错误详情:${error.message}`;
     } else {
       return;
     }
@@ -390,6 +396,39 @@ export class Executor {
         } catch (e) {
           logger.error("send email error", e);
         }
+      } else {
+        try {
+          //构建notification插件，发送通知
+          const notifyConfig = await this.options.notificationService.getById(notification.notificationId);
+          const notificationPlugin = notificationRegistry.get(notifyConfig.type);
+          const notificationCls: any = notificationPlugin.target;
+          const notificationSender = new notificationCls();
+          const notificationCtx: NotificationContext = {
+            http: utils.http,
+            logger,
+            utils,
+            emailService: this.options.emailService,
+          };
+          //设置参数
+          merge(notificationSender, notifyConfig.setting);
+          notificationSender.setCtx(notificationCtx);
+          await notificationSender.onInstance();
+          const body: NotificationBody = {
+            title: subject,
+            content,
+            userId: this.pipeline.userId,
+            pipeline: this.pipeline,
+            result: this.lastRuntime.pipeline.status,
+            pipelineId: this.pipeline.id,
+            historyId: this.runtime.id,
+            errorMessage,
+            url,
+          };
+          //发送通知
+          await notificationSender.send(body);
+        } catch (e) {
+          logger.error("send notification error", e);
+        }
       }
     }
   }

packages/core/pipeline/src/core/handler.ts

@@ -1,21 +0,0 @@
-import { HttpClient, ILogger, utils } from "@certd/basic";
-
-export type PluginRequestHandleReq<T = any> = {
-  typeName: string;
-  action: string;
-  input: T;
-  data: any;
-};
-
-export type AccessRequestHandleReqInput<T = any> = {
-  id?: number;
-  title?: string;
-  access: T;
-};
-export type AccessRequestHandleContext = {
-  http: HttpClient;
-  logger: ILogger;
-  utils: typeof utils;
-};
-
-export type AccessRequestHandleReq<T = any> = PluginRequestHandleReq<AccessRequestHandleReqInput<T>>;

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

@@ -3,5 +3,4 @@ export * from "./run-history.js";
 export * from "./context.js";
 export * from "./storage.js";
 export * from "./file-store.js";
-export * from "./handler.js";
 export * from "./exceptions.js";

packages/core/pipeline/src/core/run-history.ts

@@ -18,7 +18,7 @@ export function NewRunHistory(obj: any) {
   return history;
 }
 export class RunHistory {
-  id!: string;
+  id!: any;
   pipeline!: Pipeline;
   logs: {
     [runnableId: string]: string[];

packages/core/pipeline/src/dt/pipeline.ts

@@ -62,7 +62,7 @@ export type FileItem = {
   path: string;
 };
 export type Runnable = {
-  id: string;
+  id: any;
   title: string;
   strategy?: RunnableStrategy;
   runnableType?: string; // pipeline, stage, task , step
@@ -83,6 +83,9 @@ export type Notification = {
   type: NotificationType;
   when: NotificationWhen[];
   options: EmailOptions;
+  notificationId: number;
+  title: string;
+  subType: string;
 };
 
 export type Pipeline = Runnable & {

packages/core/pipeline/src/index.ts

@@ -6,3 +6,4 @@ export * from "./plugin/index.js";
 export * from "./context/index.js";
 export * from "./decorator/index.js";
 export * from "./service/index.js";
+export * from "./notification/index.js";

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

@@ -0,0 +1,111 @@
+import { PluginRequestHandleReq } from "../plugin";
+import { Registrable } from "../registry/index.js";
+import { FormItemProps, HistoryResult, Pipeline } from "../dt/index.js";
+import { HttpClient, ILogger, utils } from "@certd/basic";
+import * as _ from "lodash-es";
+import { IEmailService } from "../service/index.js";
+
+export type NotificationBody = {
+  userId: number;
+  title: string;
+  content: string;
+  pipeline: Pipeline;
+  pipelineId: number;
+  result?: HistoryResult;
+  historyId: number;
+  errorMessage?: string;
+  url?: string;
+};
+
+export type NotificationRequestHandleReqInput<T = any> = {
+  id?: number;
+  title?: string;
+  access: T;
+};
+
+export type NotificationRequestHandleReq<T = any> = PluginRequestHandleReq<NotificationRequestHandleReqInput<T>>;
+
+export type NotificationInputDefine = FormItemProps & {
+  title: string;
+  required?: boolean;
+  encrypt?: boolean;
+};
+export type NotificationDefine = Registrable & {
+  input?: {
+    [key: string]: NotificationInputDefine;
+  };
+};
+
+export type NotificationInstanceConfig = {
+  id: number;
+  type: string;
+  userId: number;
+  setting: {
+    [key: string]: any;
+  };
+};
+
+export interface INotificationService {
+  getById(id: number): Promise<NotificationInstanceConfig>;
+}
+
+export interface INotification {
+  ctx: NotificationContext;
+  [key: string]: any;
+}
+
+export type NotificationContext = {
+  http: HttpClient;
+  logger: ILogger;
+  utils: typeof utils;
+  emailService: IEmailService;
+};
+
+export abstract class BaseNotification implements INotification {
+  ctx!: NotificationContext;
+  http!: HttpClient;
+  logger!: ILogger;
+  abstract send(body: NotificationBody): Promise<void>;
+
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  async onInstance() {}
+  setCtx(ctx: NotificationContext) {
+    this.ctx = ctx;
+    this.http = ctx.http;
+    this.logger = ctx.logger;
+  }
+
+  async onRequest(req: NotificationRequestHandleReq) {
+    if (!req.action) {
+      throw new Error("action is required");
+    }
+
+    let methodName = req.action;
+    if (!req.action.startsWith("on")) {
+      methodName = `on${_.upperFirst(req.action)}`;
+    }
+
+    // @ts-ignore
+    const method = this[methodName];
+    if (method) {
+      // @ts-ignore
+      return await this[methodName](req.data);
+    }
+    throw new Error(`action ${req.action} not found`);
+  }
+
+  async onTestRequest() {
+    await this.send({
+      userId: 0,
+      title: "【Certd】测试通知",
+      content: "测试通知",
+      pipeline: {
+        id: 1,
+        title: "测试流水线",
+      } as any,
+      pipelineId: 1,
+      historyId: 1,
+      url: "https://certd.docmirror.cn",
+    });
+  }
+}

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

@@ -0,0 +1,56 @@
+// src/decorator/memoryCache.decorator.ts
+import { Decorator } from "../decorator/index.js";
+import * as _ from "lodash-es";
+import { notificationRegistry } from "./registry.js";
+import { NotificationContext, NotificationDefine, NotificationInputDefine } from "./api.js";
+
+// 提供一个唯一 key
+export const NOTIFICATION_CLASS_KEY = "pipeline:notification";
+export const NOTIFICATION_INPUT_KEY = "pipeline:notification:input";
+
+export function IsNotification(define: NotificationDefine): ClassDecorator {
+  return (target: any) => {
+    target = Decorator.target(target);
+
+    const inputs: any = {};
+    const properties = Decorator.getClassProperties(target);
+    for (const property in properties) {
+      const input = Reflect.getMetadata(NOTIFICATION_INPUT_KEY, target, property);
+      if (input) {
+        inputs[property] = input;
+      }
+    }
+    _.merge(define, { input: inputs });
+    Reflect.defineMetadata(NOTIFICATION_CLASS_KEY, define, target);
+    target.define = define;
+    notificationRegistry.register(define.name, {
+      define,
+      target,
+    });
+  };
+}
+
+export function NotificationInput(input?: NotificationInputDefine): PropertyDecorator {
+  return (target, propertyKey) => {
+    target = Decorator.target(target, propertyKey);
+    // const _type = Reflect.getMetadata("design:type", target, propertyKey);
+    Reflect.defineMetadata(NOTIFICATION_INPUT_KEY, input, target, propertyKey);
+  };
+}
+
+export function newNotification(type: string, input: any, ctx: NotificationContext) {
+  const register = notificationRegistry.get(type);
+  if (register == null) {
+    throw new Error(`notification ${type} not found`);
+  }
+  // @ts-ignore
+  const plugin = new register.target();
+  for (const key in input) {
+    plugin[key] = input[key];
+  }
+  if (!ctx) {
+    throw new Error("ctx is required");
+  }
+  plugin.setCtx(ctx);
+  return plugin;
+}

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

@@ -0,0 +1,3 @@
+export * from "./api.js";
+export * from "./registry.js";
+export * from "./decorator.js";

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

@@ -0,0 +1,4 @@
+import { createRegistry } from "../registry/index.js";
+
+// @ts-ignore
+export const notificationRegistry = createRegistry("notification");

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

@@ -3,12 +3,20 @@ import { FileItem, FormItemProps, Pipeline, Runnable, Step } from "../dt/index.j
 import { FileStore } from "../core/file-store.js";
 import { IAccessService } from "../access/index.js";
 import { ICnameProxyService, IEmailService } from "../service/index.js";
-import { CancelError, IContext, PluginRequestHandleReq, RunnableCollection } from "../core/index.js";
+import { CancelError, IContext, RunnableCollection } from "../core/index.js";
 import { HttpRequestConfig, ILogger, logger, utils } from "@certd/basic";
 import { HttpClient } from "@certd/basic";
 import dayjs from "dayjs";
 import { IPluginConfigService } from "../service/config";
 import { upperFirst } from "lodash-es";
+
+export type PluginRequestHandleReq<T = any> = {
+  typeName: string;
+  action: string;
+  input: T;
+  data: any;
+};
+
 export type UserInfo = {
   role: "admin" | "user";
   id: any;
@@ -102,6 +110,7 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
   _result: TaskResult = { clearLastStatus: false, files: [], pipelineVars: {}, pipelinePrivateVars: {} };
   ctx!: TaskInstanceContext;
   logger!: ILogger;
+  http!: HttpClient;
   accessService!: IAccessService;
 
   clearLastStatus() {
@@ -122,6 +131,7 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
     this.ctx = ctx;
     this.logger = ctx.logger;
     this.accessService = ctx.accessService;
+    this.http = ctx.http;
   }
 
   async getAccess<T = any>(accessId: string) {

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

@@ -1,4 +1,4 @@
-import { OnRegisterContext, Registry } from "../registry/index.js";
+import { createRegistry, OnRegisterContext } from "../registry/index.js";
 import { AbstractTaskPlugin } from "./api.js";
 import { pluginGroups } from "./group.js";
 
@@ -13,4 +13,4 @@ const onRegister = ({ key, value }: OnRegisterContext<AbstractTaskPlugin>) => {
     }
   }
 };
-export const pluginRegistry = new Registry<AbstractTaskPlugin>("plugin", onRegister);
+export const pluginRegistry = createRegistry<AbstractTaskPlugin>("plugin", onRegister);

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

@@ -19,7 +19,7 @@ export type OnRegisterContext<T> = {
   value: RegistryItem<T>;
 };
 export type OnRegister<T> = (ctx: OnRegisterContext<T>) => void;
-export class Registry<T> {
+export class Registry<T = any> {
   type = "";
   storage: {
     [key: string]: RegistryItem<T>;
@@ -88,3 +88,21 @@ export class Registry<T> {
     return item.define;
   }
 }
+
+export function createRegistry<T>(type: string, onRegister?: OnRegister<T>): Registry<T> {
+  const pipelineregistrycacheKey = "PIPELINE_REGISTRY_CACHE";
+  // @ts-ignore
+  let cached: any = global[pipelineregistrycacheKey];
+  if (!cached) {
+    cached = {};
+    // @ts-ignore
+    global[pipelineregistrycacheKey] = cached;
+  }
+
+  if (cached[type]) {
+    return cached[type];
+  }
+  const newRegistry = new Registry<T>(type, onRegister);
+  cached[type] = newRegistry;
+  return newRegistry;
+}

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

@@ -1,3 +1,4 @@
 export * from "./email.js";
 export * from "./cname.js";
 export * from "./config.js";
+export * from "./url.js";

packages/core/pipeline/src/service/url.ts

@@ -0,0 +1,3 @@
+export interface IUrlService {
+  getPipelineDetailUrl(pipelineId: number, historyId: number): Promise<string>;
+}

packages/libs/lib-huawei/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.9](https://github.com/certd/certd/compare/v1.27.8...v1.27.9) (2024-11-26)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.27.8](https://github.com/certd/certd/compare/v1.27.7...v1.27.8) (2024-11-25)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.27.7](https://github.com/certd/certd/compare/v1.27.6...v1.27.7) (2024-11-25)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.27.6](https://github.com/certd/certd/compare/v1.27.5...v1.27.6) (2024-11-19)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.27.3](https://github.com/certd/certd/compare/v1.27.2...v1.27.3) (2024-11-13)
 
 **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.27.3",
+  "version": "1.27.9",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
@@ -21,5 +21,5 @@
     "prettier": "^2.8.8",
     "tslib": "^2.8.1"
   },
-  "gitHead": "3a0178b2949083c770ed96a4122e4c0a5e0bcc11"
+  "gitHead": "ff1d7b115ad211e65fdbbcb625837aa7cc911cfd"
 }

packages/libs/lib-iframe/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.9](https://github.com/certd/certd/compare/v1.27.8...v1.27.9) (2024-11-26)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.27.8](https://github.com/certd/certd/compare/v1.27.7...v1.27.8) (2024-11-25)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.27.7](https://github.com/certd/certd/compare/v1.27.6...v1.27.7) (2024-11-25)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.27.6](https://github.com/certd/certd/compare/v1.27.5...v1.27.6) (2024-11-19)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.27.3](https://github.com/certd/certd/compare/v1.27.2...v1.27.3) (2024-11-13)
 
 **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.27.3",
+  "version": "1.27.9",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -30,5 +30,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "3a0178b2949083c770ed96a4122e4c0a5e0bcc11"
+  "gitHead": "ff1d7b115ad211e65fdbbcb625837aa7cc911cfd"
 }

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.9](https://github.com/certd/certd/compare/v1.27.8...v1.27.9) (2024-11-26)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.27.8](https://github.com/certd/certd/compare/v1.27.7...v1.27.8) (2024-11-25)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.27.7](https://github.com/certd/certd/compare/v1.27.6...v1.27.7) (2024-11-25)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.27.6](https://github.com/certd/certd/compare/v1.27.5...v1.27.6) (2024-11-19)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.27.3](https://github.com/certd/certd/compare/v1.27.2...v1.27.3) (2024-11-13)
 
 **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.27.3",
+  "version": "1.27.9",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,7 +16,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/basic": "^1.27.3",
+    "@certd/basic": "^1.27.9",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "3a0178b2949083c770ed96a4122e4c0a5e0bcc11"
+  "gitHead": "ff1d7b115ad211e65fdbbcb625837aa7cc911cfd"
 }

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.27.9](https://github.com/certd/certd/compare/v1.27.8...v1.27.9) (2024-11-26)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.27.8](https://github.com/certd/certd/compare/v1.27.7...v1.27.8) (2024-11-25)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.27.7](https://github.com/certd/certd/compare/v1.27.6...v1.27.7) (2024-11-25)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.27.6](https://github.com/certd/certd/compare/v1.27.5...v1.27.6) (2024-11-19)
+
+### Bug Fixes
+
+* 修复vip试用secret报错的bug ([018dee6](https://github.com/certd/certd/commit/018dee6c383233560f078dfd30f6c2857a7e15ee))
+
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Performance Improvements
+
+* 专业版试用，无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232))
+
+## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
+
+### Performance Improvements
+
+* 公共cname服务支持关闭 ([f4ae512](https://github.com/certd/certd/commit/f4ae5125dc4cd97816976779cb3586b5ee78947e))
+
 ## [1.27.3](https://github.com/certd/certd/compare/v1.27.2...v1.27.3) (2024-11-13)
 
 ### Performance Improvements

packages/libs/lib-server/package.json

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

packages/libs/lib-server/src/system/basic/service/plus-service.ts

@@ -55,7 +55,9 @@ export class PlusService {
 
   async bindUrl(url: string) {
     const plusRequestService = await this.getPlusRequestService();
-    return await plusRequestService.bindUrl(url);
+    const res = await plusRequestService.bindUrl(url);
+    this.plusRequestService = null;
+    return res;
   }
 
   async register() {
@@ -64,6 +66,7 @@ export class PlusService {
     if (!licenseInfo.license) {
       await plusRequestService.register();
       logger.info('站点注册成功');
+      this.plusRequestService = null;
     }
   }
 
@@ -108,6 +111,23 @@ export class PlusService {
     return res.accessToken;
   }
 
+  async getVipTrial() {
+    await this.register();
+    const plusRequestService = await this.getPlusRequestService();
+    const res = await plusRequestService.request({
+      url: '/activation/subject/vip/trialGet',
+      method: 'POST',
+    });
+    if (res.license) {
+      await this.updateLicense(res.license);
+      return {
+        duration: res.duration,
+      };
+    } else {
+      throw new Error('您已经领取过VIP试用了');
+    }
+  }
+
   async requestWithToken(config: HttpRequestConfig) {
     const plusRequestService = await this.getPlusRequestService();
     const token = await this.getAccessToken();

packages/libs/lib-server/src/system/settings/service/models.ts

@@ -18,6 +18,8 @@ export class SysPublicSettings extends BaseSettings {
   limitUserPipelineCount = 0;
   managerOtherUserPipeline = false;
   icpNo?: string;
+  defaultCron?: string;
+  defaultNotification?: number;
   // triggerOnStartup = false;
 }
 
@@ -31,6 +33,7 @@ export class SysPrivateSettings extends BaseSettings {
   httpsProxy? = '';
   httpProxy? = '';
   dnsResultOrder? = '';
+  commonCnameEnabled?: boolean = true;
 
   removeSecret() {
     const clone = cloneDeep(this);

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

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.9](https://github.com/certd/certd/compare/v1.27.8...v1.27.9) (2024-11-26)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.27.8](https://github.com/certd/certd/compare/v1.27.7...v1.27.8) (2024-11-25)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.27.7](https://github.com/certd/certd/compare/v1.27.6...v1.27.7) (2024-11-25)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.27.6](https://github.com/certd/certd/compare/v1.27.5...v1.27.6) (2024-11-19)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.27.3](https://github.com/certd/certd/compare/v1.27.2...v1.27.3) (2024-11-13)
 
 **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.27.3",
+  "version": "1.27.9",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "3a0178b2949083c770ed96a4122e4c0a5e0bcc11"
+  "gitHead": "ff1d7b115ad211e65fdbbcb625837aa7cc911cfd"
 }

packages/plugins/plugin-cert/.npmrc

@@ -1,2 +1,2 @@
-link-workspace-packages=true
+link-workspace-packages=deep
 prefer-workspace-packages=true

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.9](https://github.com/certd/certd/compare/v1.27.8...v1.27.9) (2024-11-26)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.27.8](https://github.com/certd/certd/compare/v1.27.7...v1.27.8) (2024-11-25)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.27.7](https://github.com/certd/certd/compare/v1.27.6...v1.27.7) (2024-11-25)
+
+### Performance Improvements
+
+* 谷歌EAB绑定邮箱改成必填 ([81a8123](https://github.com/certd/certd/commit/81a8123725d7bf4bd6a32a64a066bd760b7b6a7f))
+* 优化插件开发，dnsProvider无需写http logger 变量 ([fcbb5e4](https://github.com/certd/certd/commit/fcbb5e46a112174150a62648319b8224fce3b7ed))
+* 支持企业微信群聊机器人通知 ([b805a29](https://github.com/certd/certd/commit/b805a2925984144a31575b8aaa622f0c30d41b56))
+
+## [1.27.6](https://github.com/certd/certd/compare/v1.27.5...v1.27.6) (2024-11-19)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Bug Fixes
+
+* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1))
+
+### Performance Improvements
+
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+* 支持namesilo ([80159ec](https://github.com/certd/certd/commit/80159ecca895103d0495f3217311199e66056572))
+* 专业版试用，无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232))
+
+## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
+
+### Bug Fixes
+
+* 修复未设置pfx密码，导致jks转换报错的bug ([c3cfbd8](https://github.com/certd/certd/commit/c3cfbd8474155aed4379f91075de37d5d8c73ef0))
+
 ## [1.27.3](https://github.com/certd/certd/compare/v1.27.2...v1.27.3) (2024-11-13)
 
 ### Performance Improvements

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.27.3",
+  "version": "1.27.9",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -15,9 +15,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.27.3",
-    "@certd/basic": "^1.27.3",
-    "@certd/pipeline": "^1.27.3",
+    "@certd/acme-client": "^1.27.9",
+    "@certd/basic": "^1.27.9",
+    "@certd/pipeline": "^1.27.9",
     "@google-cloud/publicca": "^1.3.0",
     "dayjs": "^1.11.7",
     "jszip": "^3.10.1",
@@ -40,5 +40,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "3a0178b2949083c770ed96a4122e4c0a5e0bcc11"
+  "gitHead": "ff1d7b115ad211e65fdbbcb625837aa7cc911cfd"
 }

packages/plugins/plugin-cert/src/access/eab-access.ts

@@ -34,7 +34,7 @@ export class EabAccess extends BaseAccess {
     },
     rules: { type: "email", message: "请输入正确的邮箱" },
     helper: "Google的EAB申请证书，更换邮箱会导致EAB失效，可以在此处绑定一个邮箱避免此问题",
-    required: false,
+    required: true,
   })
   email = "";
 }

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

@@ -2,12 +2,17 @@ import { CreateRecordOptions, DnsProviderContext, DnsProviderDefine, IDnsProvide
 import psl from "psl";
 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> {
   ctx!: DnsProviderContext;
+  http!: HttpClient;
+  logger!: ILogger;
 
   setCtx(ctx: DnsProviderContext) {
     this.ctx = ctx;
+    this.logger = ctx.logger;
+    this.http = ctx.http;
   }
 
   abstract createRecord(options: CreateRecordOptions): Promise<T>;

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

@@ -1,3 +1,3 @@
-import { Registry } from "@certd/pipeline";
+import { createRegistry } from "@certd/pipeline";
 
-export const dnsProviderRegistry = new Registry("dnsProvider");
+export const dnsProviderRegistry = createRegistry("dnsProvider");

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

@@ -6,7 +6,6 @@ import JSZip from "jszip";
 import { CertConverter } from "./convert.js";
 import fs from "fs";
 import { pick } from "lodash-es";
-import { HttpClient } from "@certd/basic";
 
 export { CertReader };
 export type { CertInfo };
@@ -49,15 +48,14 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
   email!: string;
 
   @TaskInput({
-    title: "PFX证书密码",
+    title: "证书密码",
     component: {
       name: "input-password",
       vModel: "value",
     },
     required: false,
     order: 100,
-    // helper: "PFX、jks格式证书是否加密；jks必须设置密码，不传则默认123456",
-    helper: "PFX证书是否加密",
+    helper: "PFX、jks格式证书是否加密；jks必须设置密码，不传则默认123456",
   })
   pfxPassword!: string;
 
@@ -74,17 +72,6 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
   })
   renewDays!: number;
 
-  // @TaskInput({
-  //   title: "强制更新",
-  //   component: {
-  //     name: "a-switch",
-  //     vModel: "checked",
-  //   },
-  //   order: 100,
-  //   helper: "是否强制重新申请证书",
-  // })
-  // forceUpdate!: string;
-
   @TaskInput({
     title: "成功后邮件通知",
     value: true,
@@ -104,7 +91,6 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
   csrInfo!: string;
 
   userContext!: IContext;
-  http!: HttpClient;
   lastStatus!: Step;
 
   @TaskOutput({
@@ -114,7 +100,6 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
 
   async onInstance() {
     this.userContext = this.ctx.userContext;
-    this.http = this.ctx.http;
     this.lastStatus = this.ctx.lastStatus as Step;
     await this.onInit();
   }
@@ -152,7 +137,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
     }
     this._result.pipelinePrivateVars.cert = cert;
 
-    if (cert.pfx == null || cert.der == null || cert.jks == null) {
+    if (isNew) {
       try {
         const converter = new CertConverter({ logger: this.logger });
         const res = await converter.convert({
@@ -163,21 +148,18 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
           const pfxBuffer = fs.readFileSync(res.pfxPath);
           cert.pfx = pfxBuffer.toString("base64");
           fs.unlinkSync(res.pfxPath);
-          isNew = true;
         }
 
         if (cert.der == null && res.derPath) {
           const derBuffer = fs.readFileSync(res.derPath);
           cert.der = derBuffer.toString("base64");
           fs.unlinkSync(res.derPath);
-          isNew = true;
         }
 
         if (cert.jks == null && res.jksPath) {
           const jksBuffer = fs.readFileSync(res.jksPath);
           cert.jks = jksBuffer.toString("base64");
           fs.unlinkSync(res.jksPath);
-          isNew = true;
         }
 
         this.logger.info("转换证书格式成功");
@@ -303,7 +285,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
   }
 
   /**
-   * 检查是否过期，默认提前20天
+   * 检查是否过期，默认提前35天
    * @param expires
    * @param maxDays
    * @returns {boolean}

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

@@ -106,8 +106,8 @@ export class CertConverter {
       const p12Path = path.join(os.tmpdir(), "/certd/tmp/", randomStr + `_cert.p12`);
       const { tmpCrtPath, tmpKeyPath } = opts;
       let passwordArg = "-passout pass:";
-      if (pfxPassword) {
-        passwordArg = `-password pass:${pfxPassword}`;
+      if (jksPassword) {
+        passwordArg = `-password pass:${jksPassword}`;
       }
       await this.exec(`openssl pkcs12 -export -in ${tmpCrtPath} -inkey ${tmpKeyPath} -out ${p12Path} -name certd ${passwordArg}`);
 
@@ -117,7 +117,7 @@ export class CertConverter {
         fs.mkdirSync(dir, { recursive: true });
       }
       await this.exec(
-        `keytool -importkeystore -srckeystore ${p12Path} -srcstoretype PKCS12 -srcstorepass "${pfxPassword}" -destkeystore ${jksPath} -deststoretype PKCS12 -deststorepass "${jksPassword}" `
+        `keytool -importkeystore -srckeystore ${p12Path} -srcstoretype PKCS12 -srcstorepass "${jksPassword}" -destkeystore ${jksPath} -deststoretype PKCS12 -deststorepass "${jksPassword}" `
       );
       fs.unlinkSync(p12Path);
       return jksPath;

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

@@ -58,7 +58,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
     },
     required: true,
     helper:
-      "DNS直接验证：域名是在阿里云、腾讯云、华为云、Cloudflare、西数注册的，选它。\nCNAME代理验证：支持任何注册商注册的域名，但第一次需要手动添加CNAME记录",
+      "DNS直接验证：域名是在阿里云、腾讯云、华为云、Cloudflare、NameSilo、西数注册的，选它。\nCNAME代理验证：支持任何注册商注册的域名，但第一次需要手动添加CNAME记录",
   })
   challengeType!: string;
 

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

@@ -96,7 +96,6 @@ export class CertApplyLegoPlugin extends CertApplyBasePlugin {
     this.accessService = this.ctx.accessService;
     this.logger = this.ctx.logger;
     this.userContext = this.ctx.userContext;
-    this.http = this.ctx.http;
     this.lastStatus = this.ctx.lastStatus as Step;
     if (this.legoEabAccessId) {
       this.eab = await this.accessService.getById(this.legoEabAccessId);

packages/ui/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22-alpine AS builder
+FROM node:20-alpine AS builder
 WORKDIR /workspace/
 COPY . /workspace/
 # armv7 目前只能用node18， pnpm9不支持node18,所以pnpm只能用8.15.7版本
@@ -9,7 +9,7 @@ RUN npm install -g pnpm@8.15.7
 RUN cp /workspace/certd-client/dist/* /workspace/certd-server/public/ -rf
 RUN cd /workspace/certd-server && pnpm install && npm run build-on-docker
 
-FROM node:22-alpine
+FROM node:20-alpine
 EXPOSE 7001
 EXPOSE 7002
 RUN apk add --no-cache openssl
@@ -17,7 +17,7 @@ RUN apk add --no-cache openjdk8
 WORKDIR /app/
 COPY --from=builder /workspace/certd-server/ /app/
 
-ENV LEGO_VERSION=4.19.2
+ENV LEGO_VERSION 4.19.2
 ENV LEGO_DOWNLOAD_DIR /app/tools/lego
 RUN mkdir -p $LEGO_DOWNLOAD_DIR
 
@@ -31,9 +31,9 @@ RUN ARCH=$(uname -m) && \
         echo "Unsupported architecture: $ARCH"; \
     fi
 
-ENV TZ=Asia/Shanghai
-ENV NODE_ENV=production
-ENV MIDWAY_SERVER_ENV=production
+ENV TZ Asia/Shanghai
+ENV NODE_ENV production
+ENV MIDWAY_SERVER_ENV production
 CMD ["npm", "run","start"]
 
 

packages/ui/certd-client/.npmrc

@@ -1,2 +1,2 @@
-link-workspace-packages=true
+link-workspace-packages=deep
 prefer-workspace-packages=true

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,51 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.9](https://github.com/certd/certd/compare/v1.27.8...v1.27.9) (2024-11-26)
+
+### Performance Improvements
+
+* 通知支持自定义webhook、anpush、iyuu、server酱 ([cbccd9e](https://github.com/certd/certd/commit/cbccd9e3d0a4c24aba772af62734666d40b22c57))
+* 通知支持vocechat、bark、telegram、discord、slack ([642f57f](https://github.com/certd/certd/commit/642f57ff6d7152a9e14f59c7fc0e32a6b1751fb7))
+
+## [1.27.8](https://github.com/certd/certd/compare/v1.27.7...v1.27.8) (2024-11-25)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.27.7](https://github.com/certd/certd/compare/v1.27.6...v1.27.7) (2024-11-25)
+
+### Performance Improvements
+
+* 通知管理 ([d9a00ee](https://github.com/certd/certd/commit/d9a00eeaf72735ced67c59d7983d84e3c730064a))
+* 通知渠道支持测试按钮 ([b54ae27](https://github.com/certd/certd/commit/b54ae272ebc2d31b32b049d44e2299a6be7f153c))
+* 支持企业微信群聊机器人通知 ([b805a29](https://github.com/certd/certd/commit/b805a2925984144a31575b8aaa622f0c30d41b56))
+
+## [1.27.6](https://github.com/certd/certd/compare/v1.27.5...v1.27.6) (2024-11-19)
+
+### Performance Improvements
+
+* 当步骤全部都禁用时，任务本身显示删除线 ([9ab9a6e](https://github.com/certd/certd/commit/9ab9a6e8b083e19793894f23e59f29c604ec98e5))
+
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Bug Fixes
+
+* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1))
+* 修复Cname情况下，无法使用DNS类型的bug ([26dad39](https://github.com/certd/certd/commit/26dad399d5768b3205da099ddc11809aef7d6224))
+
+### Performance Improvements
+
+* 日志查看自动滚动到底部 ([4a2f7eb](https://github.com/certd/certd/commit/4a2f7ebf87b7c027cebff7cb763f8f35f6d2aa36))
+* 系统设置中的代理设置优化为可全局生效，环境变量中的https_proxy设置将无效 ([381a37f](https://github.com/certd/certd/commit/381a37fbaa6b61c887eda743897ae00afb825bdf))
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+* 专业版试用，无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232))
+
+## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
+
+### Performance Improvements
+
+* 公共cname服务支持关闭 ([f4ae512](https://github.com/certd/certd/commit/f4ae5125dc4cd97816976779cb3586b5ee78947e))
+
 ## [1.27.3](https://github.com/certd/certd/compare/v1.27.2...v1.27.3) (2024-11-13)
 
 ### Bug Fixes

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.27.3",
+  "version": "1.27.9",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -65,8 +65,8 @@
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.27.3",
-    "@certd/pipeline": "^1.27.3",
+    "@certd/lib-iframe": "^1.27.9",
+    "@certd/pipeline": "^1.27.9",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

packages/ui/certd-client/src/api/modules/api.basic.ts

@@ -24,11 +24,18 @@ export type PlusInfo = {
   isComm?: boolean;
 };
 export type SysPublicSetting = {
-  registerEnabled: boolean;
-  managerOtherUserPipeline: boolean;
+  registerEnabled?: boolean;
+  limitUserPipelineCount?: number;
+  managerOtherUserPipeline?: boolean;
   icpNo?: string;
 };
 
+export type SysPrivateSetting = {
+  httpProxy?: string;
+  httpsProxy?: string;
+  dnsResultOrder?: string;
+  commonCnameEnabled?: boolean;
+};
 export type SysInstallInfo = {
   siteId: string;
 };

packages/ui/certd-client/src/components/cron-editor/index.vue

@@ -13,8 +13,9 @@
         @error="onError"
       />
     </div>
-    <div class="mt-5">
+    <div class="mt-5 flex">
       <a-input :disabled="true" :readonly="readonly" :value="modelValue" @change="onChange"></a-input>
+      <fs-icon icon="ion:close-circle" class="pointer fs-16 ml-5 color-gray" title="清除选择" @click="onClear"></fs-icon>
     </div>
     <div class="helper">下次触发时间：{{ nextTime }}</div>
     <div class="fs-helper">{{ errorMessage }}</div>
@@ -35,11 +36,16 @@ const props = defineProps<{
 }>();
 
 const period = ref<string>("");
-if (props.modelValue == null) {
+if (props.modelValue == null || props.modelValue.endsWith("* * *")) {
   period.value = "day";
+} else if (props.modelValue.endsWith("* *")) {
+  period.value = "month";
+} else if (props.modelValue.endsWith("*")) {
+  period.value = "year";
 }
 const emit = defineEmits<{
   "update:modelValue": any;
+  change: any;
 }>();
 
 const errorMessage = ref<string | null>(null);
@@ -73,6 +79,13 @@ const onError = (error: any) => {
   errorMessage.value = error;
 };
 
+const onClear = () => {
+  if (props.disabled) {
+    return;
+  }
+  onUpdate("");
+};
+
 const nextTime = computed(() => {
   if (props.modelValue == null) {
     return "请先设置正确的cron表达式";

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-tip.vue

@@ -6,6 +6,9 @@
         <div>1. 解析记录应该添加在{{ record.domain }}域名下</div>
         <div>2. 要添加的是CNAME类型的记录，不是TXT</div>
         <div>3. 核对记录值是否是:{{ record.recordValue }}</div>
+        <div>
+          4. 运行命令 <a-tag>nslookup -qa=txt {{ record.hostRecord }}{{ record.domain }}</a-tag> 查看解析配置是否正确
+        </div>
       </div>
     </template>
     <fs-icon class="ml-5 pointer" icon="mingcute:question-line"></fs-icon>

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/index.vue

@@ -33,7 +33,7 @@
                       <span class="label">DNS类型：</span>
                       <span class="input">
                         <fs-dict-select
-                          v-model="item.dnsProviderType"
+                          v-model:value="item.dnsProviderType"
                           size="small"
                           :dict="dnsProviderTypeDict"
                           placeholder="DNS提供商"
@@ -79,6 +79,7 @@ import CnameVerifyPlan from "./cname-verify-plan.vue";
 import psl from "psl";
 import { Form } from "ant-design-vue";
 import { DomainsVerifyPlanInput } from "./type";
+import { CnameRecord } from "./api";
 defineOptions({
   name: "DomainsVerifyPlanEditor"
 });

packages/ui/certd-client/src/components/plugins/common/api-test.vue

@@ -11,12 +11,16 @@
 </template>
 <script setup lang="ts">
 import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
-import { ref } from "vue";
+import { ref, inject } from "vue";
+import { Form } from "ant-design-vue";
 
 defineOptions({
   name: "ApiTest"
 });
 
+const getScope: any = inject("get:scope");
+const getPluginType: any = inject("get:plugin:type");
+const formItemContext = Form.useInjectFormItemContext();
 const props = defineProps<{} & ComponentPropsType>();
 
 const emit = defineEmits<{
@@ -31,16 +35,21 @@ const doTest = async () => {
     return;
   }
 
+  formItemContext.onFieldChange();
+
+  const { form } = getScope();
+  const pluginType = getPluginType();
+
   message.value = "";
   hasError.value = false;
   loading.value = true;
   try {
     const res = await doRequest(
       {
-        type: props.type,
-        typeName: props.typeName,
+        type: pluginType,
+        typeName: form.type,
         action: props.action,
-        input: props.form
+        input: pluginType === "plugin" ? form.input : form
       },
       {
         onError(err: any) {
@@ -50,9 +59,7 @@ const doTest = async () => {
         showErrorNotify: false
       }
     );
-    if (res && res.length > 0) {
-      message.value = "测试请求成功";
-    }
+    message.value = "测试请求成功";
   } finally {
     loading.value = false;
   }

packages/ui/certd-client/src/components/plugins/common/remote-select.vue

@@ -42,6 +42,9 @@ const emit = defineEmits<{
 const attrs = useAttrs();
 
 const getCurrentPluginDefine: any = inject("getCurrentPluginDefine");
+const getScope: any = inject("get:scope");
+const getPluginType: any = inject("get:plugin:type");
+
 const optionsRef = ref([]);
 const message = ref("");
 const hasError = ref(false);
@@ -75,13 +78,16 @@ const getOptions = async () => {
   hasError.value = false;
   loading.value = true;
   optionsRef.value = [];
+  const { form } = getScope();
+  const pluginType = getPluginType();
+
   try {
     const res = await doRequest(
       {
-        type: props.type,
-        typeName: props.typeName,
+        type: pluginType,
+        typeName: form.type,
         action: props.action,
-        input: props.form
+        input: pluginType === "plugin" ? form.input : form
       },
       {
         onError(err: any) {

packages/ui/certd-client/src/components/plugins/lib/index.ts

@@ -1,9 +1,9 @@
 import { request } from "/@/api/service";
 export type ComponentPropsType = {
-  type: string;
-  typeName: string;
-  action?: string;
-  form: any;
+  type?: string;
+  typeName?: string;
+  action: string;
+  form?: any;
   value?: any;
 };
 export type RequestHandleReq<T = any> = {
@@ -15,7 +15,7 @@ export type RequestHandleReq<T = any> = {
 };
 
 export async function doRequest(req: RequestHandleReq, opts: any = {}) {
-  const url = req.type === "access" ? "/pi/handle/access" : "/pi/handle/plugin";
+  const url = `/pi/handle/${req.type}`;
   const { typeName, action, data, input } = req;
   const res = await request({
     url,

packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script lang="tsx" setup>
-import { defineProps, ref, useAttrs } from "vue";
+import { defineProps, inject, ref, useAttrs } from "vue";
 import { Modal } from "ant-design-vue";
 import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
 
@@ -19,7 +19,6 @@ defineOptions({
 });
 
 const props = defineProps<ComponentPropsType>();
-
 const emit = defineEmits<{
   "update:value": any;
 }>();
@@ -27,16 +26,21 @@ const emit = defineEmits<{
 const attrs = useAttrs();
 
 const otpCodeRef = ref("");
+const getScope: any = inject("get:scope");
+const getPluginType: any = inject("get:plugin:type");
 
 async function loginWithOTPCode(otpCode: string) {
+  const { form } = getScope();
+  const pluginType = getPluginType();
+
   return await doRequest({
-    type: props.type,
-    typeName: props.typeName,
+    type: pluginType,
+    typeName: form.type,
     action: "LoginWithOPTCode",
     data: {
       otpCode
     },
-    input: props.form
+    input: form
   });
 }
 

packages/ui/certd-client/src/components/tutorial/tutorial-steps.vue

@@ -158,7 +158,7 @@ const steps = ref<Step[]>([
         title: "设置定时执行",
         descriptions: [
           "流水线测试成功，接下来配置定时触发，以后每天定时执行就不用管了",
-          "推荐配置每天运行一次，在到期前20天才会重新申请新证书并部署，没到期前会自动跳过，不会重复申请。"
+          "推荐配置每天运行一次，在到期前35天才会重新申请新证书并部署，没到期前会自动跳过，不会重复申请。"
         ]
       },
       {

packages/ui/certd-client/src/components/vip-button/api.ts

@@ -7,3 +7,11 @@ export async function doActive(form: any) {
     data: form
   });
 }
+
+export async function getVipTrial() {
+  return await request({
+    url: "/sys/plus/getVipTrial",
+    method: "post",
+    data: {}
+  });
+}

packages/ui/certd-client/src/components/vip-button/index.vue

@@ -12,13 +12,14 @@
   </div>
 </template>
 <script lang="tsx" setup>
-import { computed, reactive, ref } from "vue";
+import { computed, reactive } from "vue";
 import dayjs from "dayjs";
 import { message, Modal } from "ant-design-vue";
 import * as api from "./api";
 import { useSettingStore } from "/@/store/modules/settings";
 import { useRouter } from "vue-router";
 import { useUserStore } from "/@/store/modules/user";
+
 const settingStore = useSettingStore();
 const props = withDefaults(
   defineProps<{
@@ -129,21 +130,27 @@ function goAccount() {
   router.push("/sys/account");
 }
 
+async function getVipTrial() {
+  const res = await api.getVipTrial();
+  message.success(`恭喜，您已获得专业版${res.duration}天试用`);
+  await settingStore.init();
+}
+
 function openTrialModal() {
   Modal.destroyAll();
 
   modal.confirm({
     title: "7天专业版试用获取",
-    okText: "立即去绑定账号",
+    okText: "立即获取",
     onOk() {
-      goAccount();
+      getVipTrial();
     },
     width: 600,
     content: () => {
       return (
         <div class="flex-col mt-10 mb-10">
           <div>感谢您对开源项目的支持</div>
-          <div>绑定袖手账号后，即可获取7天专业版试用</div>
+          <div>点击确认，即可获取7天专业版试用</div>
         </div>
       );
     }
@@ -192,11 +199,13 @@ function openUpgrade() {
   const vipTypeDefine = {
     free: {
       title: "基础版",
+      desc: "免费使用",
       type: "free",
       privilege: ["证书申请功能无限制", "证书流水线数量10条", "常用的主机、cdn等部署插件"]
     },
     plus: {
       title: "专业版",
+      desc: "功能增强，适用于个人企业内部使用",
       type: "plus",
       privilege: ["可加VIP群，需求优先实现", "证书流水线数量无限制", "免配置发邮件功能", "支持宝塔、易盾、群晖、1Panel、cdnfly等部署插件"],
       trial: {
@@ -208,6 +217,7 @@ function openUpgrade() {
     },
     comm: {
       title: "商业版",
+      desc: "商业授权，可对外运营",
       type: "comm",
       privilege: ["拥有专业版所有特权", "允许商用，可修改logo、标题", "数据统计", "插件管理", "多用户无限制", "支持用户支付（敬请期待）"]
     }
@@ -261,6 +271,7 @@ function openUpgrade() {
                   </span>
                 )}
               </h3>
+              <div>{item.desc}</div>
               <ul>
                 {item.privilege.map((p: string) => (
                   <li>
@@ -326,7 +337,7 @@ function openUpgrade() {
     padding: 10px;
     border: 1px solid #eee;
     border-radius: 5px;
-    height: 170px;
+    height: 195px;
     //background-color: rgba(250, 237, 167, 0.79);
     &.current {
       border-color: green;

packages/ui/certd-client/src/router/source/modules/certd.ts

@@ -49,6 +49,17 @@ export const certdResources = [
           cache: true
         }
       },
+      {
+        title: "通知设置",
+        name: "NotificationManager",
+        path: "/certd/notification",
+        component: "/certd/notification/index.vue",
+        meta: {
+          icon: "ion:megaphone-outline",
+          auth: true,
+          cache: true
+        }
+      },
       {
         title: "CNAME记录管理",
         name: "CnameRecord",

packages/ui/certd-client/src/style/common.less

@@ -77,6 +77,12 @@ h1, h2, h3, h4, h5, h6 {
   display: flex;
   flex-direction: column;
 }
+.align-left{
+  text-align: left;
+}
+.align-right{
+  text-align: right;
+}
 
 .scroll-y {
   overflow-y: auto;
@@ -198,6 +204,9 @@ h1, h2, h3, h4, h5, h6 {
 .color-green {
   color: green;
 }
+.color-gray {
+  color: gray;
+}
 
 .iconify{
     //font-size: 16px;

packages/ui/certd-client/src/views/certd/access/access-selector/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="access-selector">
-    <span v-if="target.name" class="mr-5 cd-flex-inline">
+    <span v-if="target?.name" class="mr-5 cd-flex-inline">
       <a-tag class="mr-5" color="green">{{ target.name }}</a-tag>
       <fs-icon class="cd-icon-button" icon="ion:close-circle-outline" @click="clear"></fs-icon>
     </span>
     <span v-else class="mlr-5 text-gray">{{ placeholder }}</span>
-    <a-button class="ml-5" :size="size" @click="chooseForm.open">选择</a-button>
+    <a-button class="ml-5" :disabled="disabled" :size="size" @click="chooseForm.open">选择</a-button>
     <a-form-item-rest v-if="chooseForm.show">
       <a-modal v-model:open="chooseForm.show" title="选择授权提供者" width="900px" @ok="chooseForm.ok">
         <div style="height: 400px; position: relative">
@@ -17,9 +17,10 @@
 </template>
 
 <script>
-import { defineComponent, reactive, ref, watch } from "vue";
+import { defineComponent, reactive, ref, watch, inject } from "vue";
 import CertAccessModal from "./access/index.vue";
 import { createAccessApi } from "../api";
+import { message } from "ant-design-vue";
 
 export default defineComponent({
   name: "AccessSelector",
@@ -44,9 +45,13 @@ export default defineComponent({
     from: {
       type: String, //user | sys
       default: "user"
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
-  emits: ["update:modelValue"],
+  emits: ["update:modelValue", "change", "selectedChange"],
   setup(props, ctx) {
     const api = createAccessApi(props.from);
 
@@ -55,14 +60,32 @@ export default defineComponent({
     async function refreshTarget(value) {
       selectedId.value = value;
       if (value > 0) {
-        target.value = await api.GetObj(value);
+        target.value = await api.GetSimpleInfo(value);
       }
     }
 
     function clear() {
-      selectedId.value = "";
-      target.value = null;
+      if (props.disabled) {
+        return;
+      }
+      emitValue(null);
+    }
+
+    async function emitValue(value) {
+      if (pipeline?.value && target?.value && pipeline.value.userId !== target.value.userId) {
+        message.error("对不起，您不能修改他人流水线的授权");
+        return;
+      }
+      if (value == null) {
+        selectedId.value = "";
+        target.value = null;
+      } else {
+        selectedId.value = value;
+        await refreshTarget(selectedId.value);
+      }
+      ctx.emit("change", selectedId.value);
       ctx.emit("update:modelValue", selectedId.value);
+      ctx.emit("selectedChange", target.value);
     }
 
     watch(
@@ -71,7 +94,7 @@ export default defineComponent({
       },
       async (value) => {
         selectedId.value = null;
-        target.value = {};
+        target.value = null;
         if (value == null) {
           return;
         }
@@ -99,16 +122,18 @@ export default defineComponent({
       }
     );
 
+    //当不在pipeline中编辑时，可能为空
+    const pipeline = inject("pipeline", null);
+
     const chooseForm = reactive({
       show: false,
       open() {
         chooseForm.show = true;
       },
       ok: () => {
-        chooseForm.show = false;
         console.log("choose ok:", selectedId.value);
-        refreshTarget(selectedId.value);
-        ctx.emit("update:modelValue", selectedId.value);
+        emitValue(selectedId.value);
+        chooseForm.show = false;
       }
     });
 

packages/ui/certd-client/src/views/certd/access/api.ts

@@ -43,6 +43,14 @@ export function createAccessApi(from = "user") {
       });
     },
 
+    async GetSimpleInfo(id: number) {
+      return await request({
+        url: apiPrefix + "/simpleInfo",
+        method: "post",
+        params: { id }
+      });
+    },
+
     async GetSecretPlain(id: number, key: string) {
       return await request({
         url: apiPrefix + "/getSecretPlain",

packages/ui/certd-client/src/views/certd/access/common.tsx

@@ -6,6 +6,9 @@ import SecretPlainGetter from "/@/views/certd/access/access-selector/access/secr
 
 export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
   provide("accessApi", api);
+  provide("get:plugin:type", () => {
+    return "access";
+  });
   const AccessTypeDictRef = dict({
     url: "/pi/access/accessTypeDict"
   });
@@ -44,6 +47,13 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
       //eval
       useReference(column);
 
+      if (column.required) {
+        if (!column.rules) {
+          column.rules = [];
+        }
+        column.rules.push({ required: true, message: "此项必填" });
+      }
+
       //设置默认值
       if (column.value != null && get(form, key) == null) {
         set(form, key, column.value);

packages/ui/certd-client/src/views/certd/access/crud.tsx

@@ -37,11 +37,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         editRequest,
         delRequest
       },
-      form: {
-        labelCol: {
-          span: 6
-        }
-      },
       rowHandle: {
         width: 200
       },

packages/ui/certd-client/src/views/certd/cname/record/crud.tsx

@@ -115,7 +115,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           }
         },
         cnameProviderId: {
-          title: "CNAME提供者",
+          title: "CNAME服务",
           type: "dict-select",
           dict: dict({
             url: "/cname/provider/list",

packages/ui/certd-client/src/views/certd/history/crud.tsx

@@ -138,7 +138,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           column: {
             width: 300,
             cellRender: ({ row, value }) => {
-              debugger;
               return (
                 <router-link to={{ path: "/certd/pipeline/detail", query: { id: row.pipelineId, editMode: false, historyId: row.id } }}>{value}</router-link>
               );

packages/ui/certd-client/src/views/certd/notification/api.ts

@@ -0,0 +1,70 @@
+import { request } from "/src/api/service";
+
+export function createApi() {
+  const apiPrefix = "/pi/notification";
+  return {
+    async GetList(query: any) {
+      return await request({
+        url: apiPrefix + "/page",
+        method: "post",
+        data: query
+      });
+    },
+
+    async AddObj(obj: any) {
+      return await request({
+        url: apiPrefix + "/add",
+        method: "post",
+        data: obj
+      });
+    },
+
+    async UpdateObj(obj: any) {
+      return await request({
+        url: apiPrefix + "/update",
+        method: "post",
+        data: obj
+      });
+    },
+
+    async DelObj(id: number) {
+      return await request({
+        url: apiPrefix + "/delete",
+        method: "post",
+        params: { id }
+      });
+    },
+
+    async GetObj(id: number) {
+      return await request({
+        url: apiPrefix + "/info",
+        method: "post",
+        params: { id }
+      });
+    },
+
+    async GetSimpleInfo(id: number) {
+      return await request({
+        url: apiPrefix + "/simpleInfo",
+        method: "post",
+        params: { id }
+      });
+    },
+
+    async GetProviderDefine(type: string) {
+      return await request({
+        url: apiPrefix + "/define",
+        method: "post",
+        params: { type }
+      });
+    },
+
+    async GetProviderDefineByType(type: string) {
+      return await request({
+        url: apiPrefix + "/defineByType",
+        method: "post",
+        params: { type }
+      });
+    }
+  };
+}

packages/ui/certd-client/src/views/certd/notification/common.tsx

@@ -0,0 +1,181 @@
+import { ColumnCompositionProps, compute, dict } from "@fast-crud/fast-crud";
+import { computed, provide, ref, toRef } from "vue";
+import { useReference } from "/@/use/use-refrence";
+import { forEach, get, merge, set } from "lodash-es";
+
+export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
+  provide("notificationApi", api);
+  provide("get:plugin:type", () => {
+    return "notification";
+  });
+  const notificationTypeDictRef = dict({
+    url: "/pi/notification/getTypeDict"
+  });
+  const defaultPluginConfig = {
+    component: {
+      name: "a-input",
+      vModel: "value"
+    }
+  };
+
+  function buildDefineFields(define: any, form: any, mode: string) {
+    const formWrapperRef = crudExpose.getFormWrapperRef();
+    const columnsRef = toRef(formWrapperRef.formOptions, "columns");
+
+    for (const key in columnsRef.value) {
+      if (key.indexOf(".") >= 0) {
+        delete columnsRef.value[key];
+      }
+    }
+    console.log('crudBinding.value[mode + "Form"].columns', columnsRef.value);
+    forEach(define.input, (value: any, mapKey: any) => {
+      const key = "body." + mapKey;
+      const field = {
+        ...value,
+        key
+      };
+      const column = merge({ title: key }, defaultPluginConfig, field);
+      //eval
+      useReference(column);
+
+      if (column.required) {
+        if (!column.rules) {
+          column.rules = [];
+        }
+        column.rules.push({ required: true, message: "此项必填" });
+      }
+
+      //设置默认值
+      if (column.value != null && get(form, key) == null) {
+        set(form, key, column.value);
+      }
+      //字段配置赋值
+      columnsRef.value[key] = column;
+      console.log("form", columnsRef.value, form);
+    });
+  }
+
+  const currentDefine = ref();
+
+  return {
+    id: {
+      title: "ID",
+      key: "id",
+      type: "number",
+      column: {
+        width: 100
+      },
+      form: {
+        show: false
+      }
+    },
+    type: {
+      title: "通知类型",
+      type: "dict-select",
+      dict: notificationTypeDictRef,
+      search: {
+        show: false
+      },
+      column: {
+        width: 200,
+        component: {
+          color: "auto"
+        }
+      },
+      editForm: {
+        component: {
+          disabled: false
+        }
+      },
+      form: {
+        component: {
+          disabled: false,
+          showSearch: true,
+          filterOption: (input: string, option: any) => {
+            input = input?.toLowerCase();
+            return option.value.toLowerCase().indexOf(input) >= 0 || option.label.toLowerCase().indexOf(input) >= 0;
+          }
+        },
+        rules: [{ required: true, message: "请选择通知类型" }],
+        valueChange: {
+          immediate: true,
+          async handle({ value, mode, form, immediate }) {
+            if (value == null) {
+              return;
+            }
+            const lastTitle = currentDefine.value?.title;
+            const define = await api.GetProviderDefine(value);
+            currentDefine.value = define;
+            console.log("define", define);
+
+            if (!immediate) {
+              form.body = {};
+            }
+
+            if (!form.name || form.name === lastTitle) {
+              form.name = define.title;
+            }
+            buildDefineFields(define, form, mode);
+          }
+        },
+        helper: computed(() => {
+          const define = currentDefine.value;
+          if (define == null) {
+            return "";
+          }
+          return define.desc;
+        })
+      }
+    } as ColumnCompositionProps,
+    name: {
+      title: "通知名称",
+      search: {
+        show: true
+      },
+      type: ["text"],
+      form: {
+        rules: [{ required: true, message: "请填写名称" }],
+        helper: "随便填，当多个相同类型的通知时，便于区分"
+      },
+      column: {
+        width: 200
+      }
+    },
+    test: {
+      title: "测试",
+      form: {
+        show: compute(({ form }) => {
+          return !!form.type;
+        }),
+        component: {
+          name: "api-test",
+          action: "TestRequest"
+        },
+        order: 999
+      },
+      column: {
+        show: false
+      }
+    },
+    setting: {
+      column: { show: false },
+      form: {
+        show: false,
+        valueBuilder({ value, form }) {
+          form.body = {};
+          if (!value) {
+            return;
+          }
+          const setting = JSON.parse(value);
+          for (const key in setting) {
+            form.body[key] = setting[key];
+          }
+        },
+        valueResolve({ form }) {
+          const setting = form.body;
+          form.setting = JSON.stringify(setting);
+        }
+      }
+    } as ColumnCompositionProps
+  };
+}

packages/ui/certd-client/src/views/certd/notification/crud.tsx

@@ -0,0 +1,57 @@
+// @ts-ignore
+import { useI18n } from "vue-i18n";
+import { ref } from "vue";
+import { getCommonColumnDefine } from "./common";
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const { t } = useI18n();
+  const api = context.api;
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetList(query);
+  };
+  const editRequest = async (req: EditReq) => {
+    const { form, row } = req;
+    form.id = row.id;
+    const res = await api.UpdateObj(form);
+    return res;
+  };
+  const delRequest = async (req: DelReq) => {
+    const { row } = req;
+    return await api.DelObj(row.id);
+  };
+
+  const addRequest = async (req: AddReq) => {
+    const { form } = req;
+    const res = await api.AddObj(form);
+    return res;
+  };
+
+  const typeRef = ref();
+  const commonColumnsDefine = getCommonColumnDefine(crudExpose, typeRef, api);
+  return {
+    crudOptions: {
+      request: {
+        pageRequest,
+        addRequest,
+        editRequest,
+        delRequest
+      },
+      form: {
+        labelCol: {
+          //固定label宽度
+          span: null,
+          style: {
+            width: "145px"
+          }
+        }
+      },
+      rowHandle: {
+        width: 200
+      },
+      columns: {
+        ...commonColumnsDefine
+      }
+    }
+  };
+}

packages/ui/certd-client/src/views/certd/notification/index.vue

@@ -0,0 +1,39 @@
+<template>
+  <fs-page>
+    <template #header>
+      <div class="title">
+        通知管理
+        <span class="sub">管理通知配置</span>
+      </div>
+    </template>
+    <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
+  </fs-page>
+</template>
+
+<script lang="ts">
+import { defineComponent, onActivated, onMounted } from "vue";
+import { useFs } from "@fast-crud/fast-crud";
+import createCrudOptions from "./crud";
+import { createApi } from "./api";
+
+export default defineComponent({
+  name: "NotificationManager",
+  setup() {
+    const api = createApi();
+    const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });
+
+    // 页面打开后获取列表数据
+    onMounted(() => {
+      crudExpose.doRefresh();
+    });
+    onActivated(() => {
+      crudExpose.doRefresh();
+    });
+
+    return {
+      crudBinding,
+      crudRef
+    };
+  }
+});
+</script>

packages/ui/certd-client/src/views/certd/notification/notification-selector/index.vue

@@ -0,0 +1,149 @@
+<template>
+  <div class="notification-selector">
+    <span v-if="target?.name" class="mr-5 cd-flex-inline">
+      <a-tag class="mr-5" color="green">{{ target.name }}</a-tag>
+      <fs-icon class="cd-icon-button" icon="ion:close-circle-outline" @click="clear"></fs-icon>
+    </span>
+    <span v-else class="mlr-5 text-gray">{{ placeholder }}</span>
+    <a-button class="ml-5" :disabled="disabled" :size="size" @click="chooseForm.open">选择</a-button>
+    <a-form-item-rest v-if="chooseForm.show">
+      <a-modal v-model:open="chooseForm.show" title="选择通知渠道" width="900px" @ok="chooseForm.ok">
+        <div style="height: 400px; position: relative">
+          <cert-notification-modal v-model="selectedId"></cert-notification-modal>
+        </div>
+      </a-modal>
+    </a-form-item-rest>
+  </div>
+</template>
+
+<script>
+import { defineComponent, reactive, ref, watch, inject } from "vue";
+import CertNotificationModal from "./modal/index.vue";
+import { createApi } from "../api";
+import { message } from "ant-design-vue";
+
+export default defineComponent({
+  name: "NotificationSelector",
+  components: { CertNotificationModal },
+  props: {
+    modelValue: {
+      type: [Number, String],
+      default: null
+    },
+    type: {
+      type: String,
+      default: ""
+    },
+    placeholder: {
+      type: String,
+      default: "请选择"
+    },
+    size: {
+      type: String,
+      default: "middle"
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ["update:modelValue", "selectedChange", "change"],
+  setup(props, ctx) {
+    const api = createApi();
+
+    const target = ref({});
+    const selectedId = ref();
+    async function refreshTarget(value) {
+      selectedId.value = value;
+      if (value > 0) {
+        target.value = await api.GetSimpleInfo(value);
+      }
+    }
+
+    function clear() {
+      if (props.disabled) {
+        return;
+      }
+      emitValue(null);
+    }
+
+    async function emitValue(value) {
+      if (pipeline?.value && target?.value && pipeline.value.userId !== target.value.userId) {
+        message.error("对不起，您不能修改他人流水线的通知");
+        return;
+      }
+      if (value == null) {
+        selectedId.value = "";
+        target.value = null;
+      } else {
+        selectedId.value = value;
+        await refreshTarget(selectedId.value);
+      }
+      ctx.emit("change", selectedId.value);
+      ctx.emit("update:modelValue", selectedId.value);
+      ctx.emit("selectedChange", target.value);
+    }
+
+    watch(
+      () => {
+        return props.modelValue;
+      },
+      async (value) => {
+        selectedId.value = null;
+        target.value = null;
+        if (value == null) {
+          return;
+        }
+        await refreshTarget(value);
+      },
+      {
+        immediate: true
+      }
+    );
+
+    const providerDefine = ref({});
+
+    async function refreshProviderDefine(type) {
+      providerDefine.value = await api.GetProviderDefine(type);
+    }
+    // watch(
+    //   () => {
+    //     return props.type;
+    //   },
+    //   async (value) => {
+    //     await refreshProviderDefine(value);
+    //   },
+    //   {
+    //     immediate: true
+    //   }
+    // );
+
+    //当不在pipeline中编辑时，可能为空
+    const pipeline = inject("pipeline", null);
+
+    const chooseForm = reactive({
+      show: false,
+      open() {
+        chooseForm.show = true;
+      },
+      ok: () => {
+        console.log("choose ok:", selectedId.value);
+        emitValue(selectedId.value);
+        chooseForm.show = false;
+      }
+    });
+
+    return {
+      clear,
+      target,
+      selectedId,
+      providerDefine,
+      chooseForm
+    };
+  }
+});
+</script>
+<style lang="less">
+.notification-selector {
+}
+</style>