Compare commits

...

37 Commits

Author SHA1 Message Date
xiaojunnuo
eb41a3655f v1.37.10 2025-11-19 23:52:19 +08:00
xiaojunnuo
a84476187f build: prepare to build 2025-11-19 23:49:47 +08:00
xiaojunnuo
70b603d601 perf: 站点证书监控备注输入框改成textarea 2025-11-19 23:49:09 +08:00
xiaojunnuo
c9709f2698 perf: 优化dokploy 部署插件,配置选择serverId 2025-11-19 23:47:26 +08:00
xiaojunnuo
be4f479afd build: release 2025-11-19 15:41:19 +08:00
xiaojunnuo
a251465dbc build: publish 2025-11-19 15:30:56 +08:00
xiaojunnuo
9b7051f2be build: trigger build image 2025-11-19 15:30:33 +08:00
xiaojunnuo
8bfdef79c4 v1.37.9 2025-11-19 15:28:27 +08:00
xiaojunnuo
f2c2bf81b3 build: prepare to build 2025-11-19 15:24:37 +08:00
xiaojunnuo
8b5247b9bb build: prepare to build 2025-11-19 15:23:57 +08:00
xiaojunnuo
075b1dc0eb fix: 商用证书上传保存失败的bug 2025-11-19 15:13:08 +08:00
xiaojunnuo
42e1f0478d chore: docs 2025-11-19 13:24:40 +08:00
xiaojunnuo
d4653678b2 perf: 优化阿里云clb 过期证书清理报错的问题 2025-11-18 18:09:59 +08:00
xiaojunnuo
a4ce752e58 chore: 阿里云nlb证书清理增加日志打印 2025-11-18 18:02:55 +08:00
xiaojunnuo
f6649398ef chore: 清理过期证书增加日志打印 2025-11-18 18:01:23 +08:00
xiaojunnuo
02859cc270 build: release 2025-11-18 01:28:48 +08:00
xiaojunnuo
4ed30e082f build: publish 2025-11-18 01:18:48 +08:00
xiaojunnuo
d3985dd129 build: trigger build image 2025-11-18 01:18:32 +08:00
xiaojunnuo
ac70821fea v1.37.8 2025-11-18 01:16:57 +08:00
xiaojunnuo
38b273a1c9 build: prepare to build 2025-11-18 01:14:14 +08:00
xiaojunnuo
eb5c88fbb2 perf: 支持回车键触发登录 2025-11-18 01:13:31 +08:00
xiaojunnuo
1102952b47 perf: 修复西数解析记录添加失败的bug,支持部署证书到西数虚拟主机 2025-11-18 01:04:47 +08:00
xiaojunnuo
5ad6cadcee chore: 1 2025-11-15 16:56:04 +08:00
xiaojunnuo
5d236808d6 Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev 2025-11-15 16:46:06 +08:00
xiaojunnuo
ada9243e84 chore: 1 2025-11-15 16:32:41 +08:00
xiaojunnuo
ad4e1c1b5b Merge branch 'v2' into v2-dev 2025-11-13 13:54:44 +08:00
xiaojunnuo
c5105c29b0 build: release 2025-11-13 01:31:28 +08:00
xiaojunnuo
f689b0f3b2 Merge branch 'v2-dev' into v2 2025-11-13 01:17:55 +08:00
xiaojunnuo
730f614024 build: publish 2025-11-13 01:17:09 +08:00
xiaojunnuo
2e4eb17a48 build: trigger build image 2025-11-13 01:16:45 +08:00
Rab
d20046c866 fix(plugins/woai-cdn): 修正默认接口域名与帮助链接中的路径 (#576) @LjyLab 2025-11-12 15:30:32 +08:00
xiaojunnuo
2df452fe5b Merge branch 'v2' of https://github.com/certd/certd into v2 2025-11-12 09:10:43 +08:00
xiaojunnuo
6cd57dd426 Merge branch 'v2-dev' into v2 2025-11-11 00:57:37 +08:00
greper
d19ac1fd15 Update promotional content in README.md 2025-11-10 10:56:54 +08:00
greper
410a23751b Update README.md 2025-11-10 10:56:23 +08:00
greper
8190507e8c Revise README for permanent version promotion
Updated promotional text for the permanent professional version and adjusted the display format.
2025-11-10 10:54:47 +08:00
greper
645f74f39d Update README with promotional content
Added promotional message for permanent professional version and Double Eleven event.
2025-11-10 10:53:38 +08:00
53 changed files with 772 additions and 175 deletions

View File

@@ -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.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 优化dokploy 部署插件配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
* 站点证书监控备注输入框改成textarea ([70b603d](https://github.com/certd/certd/commit/70b603d601c34f39148c2ab70c655c51babf563d))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
### Bug Fixes
* 商用证书上传保存失败的bug ([075b1dc](https://github.com/certd/certd/commit/075b1dc0eb8c39acc277277b1b334d66b6717ab2))
### Performance Improvements
* 优化阿里云clb 过期证书清理报错的问题 ([d465367](https://github.com/certd/certd/commit/d4653678b2e3643460f918992eeae4044d3a1cc7))
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
### Bug Fixes
* **plugins/woai-cdn:** 修正默认接口域名与帮助链接中的路径 ([#576](https://github.com/certd/certd/issues/576)) @LjyLab ([d20046c](https://github.com/certd/certd/commit/d20046c86681ea177ece434423b7c81a76b437fb))
### Performance Improvements
* 修复西数解析记录添加失败的bug支持部署证书到西数虚拟主机 ([1102952](https://github.com/certd/certd/commit/1102952b4703e8c0bbc17b0700c0ed3ef6f866d3))
* 支持回车键触发登录 ([eb5c88f](https://github.com/certd/certd/commit/eb5c88fbb2901f1a9669429a7cd8dc76f6806d01))
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Bug Fixes

View File

@@ -16,6 +16,13 @@ Certd® 是一个免费的全自动证书管理系统,让你的网站证书永
> 流水线数量现已调整为无限制,欢迎大家使用
**************************************************************************************************
🔥🔥🔥永久专业版上线双11活动火热进行中🔥🔥🔥
赶快升级到最新版点击右上角金色VIP按钮点击立即赞助看看你的优惠券金额是多少
**************************************************************************************************
## 一、特性
本项目不仅支持证书申请过程自动化,还可以自动化部署更新证书,让你的证书永不过期。
@@ -154,14 +161,13 @@ https://certd.handfree.work/
************************
开源为什么要做专业版收费?
1. 纯靠为爱发电不可持续比如我的dev-sidecar项目即便是拥有20K+star,也差点凉凉,幸亏有另外大佬接手用爱发电)
2. 没有赞助的项目,作者不会用心倾听用户的心声,不顾用户体验(比如:下意识拒绝需求、频繁破坏性变更升级、全盘推倒重来之类的)
3. 没有赞助的项目,交流群的戾气有时候比较重,容易起冲突
2. 没有赞助的项目,作者会比较任性,不会用心倾听用户的心声,不顾用户体验(比如:下意识拒绝需求、频繁破坏性变更升级、全盘推倒重来之类的)
3. 没有赞助的项目,交流群的戾气有时候比较重,容易起冲突
发电权益:
1. 可加入发电专属群,可以获得作者一对一技术支持
2. 您的需求我们将优先实现,并且将作为专业版功能提供
3. 一年期专业版激活码
1. 可加入发电专属VIP群,可以获得作者一对一技术支持,必要时可以远程协助
2. 您的需求我们将优先实现,并且可能将作为专业版功能提供
3. 获得专业版功能
专业版特权对比
@@ -173,7 +179,7 @@ https://certd.handfree.work/
| 站点证书监控 | 限制1条 | 无限制 |
| 自动部署插件 | 阿里云CDN、腾讯云、七牛CDN、主机部署、宝塔、1Panel等大部分插件 | 群晖 |
| 通知 | 邮件通知、自定义webhook | 邮件免配置、企微、钉钉、飞书、anpush、server酱等 |
| VIP群 | 无 | 可加,一对一技术支持,必要时远程协助 |
************************

View File

@@ -9,8 +9,7 @@ services:
restart: unless-stopped # 自动重启
volumes:
# ↓↓↓↓↓ -------------------------------------------------------- 数据库以及证书存储路径,默认存在宿主机的/data/certd/目录下,【您需要定时备份此目录,以保障数据容灾】
# 只要修改冒号前面的,冒号后面的/app/data不要动
- /data/certd:/app/data
- /data/certd:/app/data # 只要修改冒号前面的,冒号后面的/app/data切记切记不要动
#- /volume1/docker/certd:/app/data:delegated #群晖使用这个配置
# ↓↓↓↓↓ -------------------------------------------------------- 如果走时不准考虑挂载localtime文件
#- /etc/localtime:/etc/localtime

View File

@@ -3,6 +3,39 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
### Bug Fixes
* 商用证书上传保存失败的bug ([075b1dc](https://github.com/certd/certd/commit/075b1dc0eb8c39acc277277b1b334d66b6717ab2))
### Performance Improvements
* 优化阿里云clb 过期证书清理报错的问题 ([d465367](https://github.com/certd/certd/commit/d4653678b2e3643460f918992eeae4044d3a1cc7))
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
### Bug Fixes
* **plugins/woai-cdn:** 修正默认接口域名与帮助链接中的路径 ([#576](https://github.com/certd/certd/issues/576)) @LjyLab ([d20046c](https://github.com/certd/certd/commit/d20046c86681ea177ece434423b7c81a76b437fb))
### Performance Improvements
* 修复西数解析记录添加失败的bug支持部署证书到西数虚拟主机 ([1102952](https://github.com/certd/certd/commit/1102952b4703e8c0bbc17b0700c0ed3ef6f866d3))
* 支持回车键触发登录 ([eb5c88f](https://github.com/certd/certd/commit/eb5c88fbb2901f1a9669429a7cd8dc76f6806d01))
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Bug Fixes
* 修复点击立即触发运行报错的bug ([e1eef01](https://github.com/certd/certd/commit/e1eef013a856d26fe80a05d9ec6e505e2e31e5f9))
* 账号绑定页面某些情况下打不开的bug ([44973eb](https://github.com/certd/certd/commit/44973ebd00e89c0fee8f3b91174157757ce0160f))
### Performance Improvements
* 支持使用letencrypt测试环境申请ip证书 ([86ce00a](https://github.com/certd/certd/commit/86ce00adf92ff98fead87a3eaaa6631036708f47))
* 支持腾讯云teo dns解析 ([1d23dd2](https://github.com/certd/certd/commit/1d23dd2426bd1e4c4dfea0a9e561d665e045ba9d))
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
### Bug Fixes

View File

@@ -57,6 +57,10 @@ https://your_server_ip:7002
::: warning
如果您是第一次升级certd版本切记切记先备份一下数据
```
# docker-compose.yaml配置
- /data/certd:/app/data # 请务必确保 /app/data 这个路径没有改动,固定写死
```
:::

View File

@@ -10,6 +10,12 @@
::: warning
如果您是第一次升级certd版本切记切记先备份一下数据
很多人docker不太会配置数据目录没有映射出来升级导致数据丢失
```
# docker-compose.yaml配置
- /data/certd:/app/data # 请务必确保 /app/data 这个路径没有改动,固定写死
```
具体备份方法可以参考上面每种部署方式升级方法后面的备份章节
:::
## 升级日志

View File

@@ -1,5 +1,5 @@
# 任务插件
`102` 款任务插件
`103` 款任务插件
## 1. 证书申请
| 序号 | 名称 | 说明 |
@@ -29,18 +29,19 @@
| 6.| **白山云-更新证书** | |
| 7.| **天翼云-部署证书到CDN** | 部署证书到天翼云CDN和全站加速 |
| 8.| **括彩云-部署到括彩云CDN** | 括彩云CDN每月免费30G[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) |
| 9.| **多吉云-部署到多吉云CDN** | |
| 10.| **我爱云-部署证书到我爱云CDN** | 部署证书到我爱云CDN |
| 11.| **CacheFly-部署证书到CacheFly** | 部署证书到 CacheFly |
| 12.| **Gcore-部署证书到Gcore** | 仅上传 并不会部署到cdn |
| 13.| **Gcore-刷新Gcore证书** | 刷新现有的证书 |
| 14.| **又拍云-部署证书到CDN/USS** | 支持又拍云CDN又拍云云存储USS |
| 15.| **FlexCDN-更新证书** | |
| 16.| **farcdn-更新证书** | www.farcdn.net |
| 17.| **雨云-更新证书** | app.rainyun.com |
| 18.| **网宿-更新证书** | 网宿证书自动更新 |
| 19.| **金山云-更新CDN证书** | 金山云自动更新CDN证书 |
| 20.| **APISIX-更新证书** | 自动更新APISIX证书 |
| 9.| **西数-部署到虚拟主机** | 西部数码部署证书到虚拟主机 |
| 10.| **多吉云-部署到多吉云CDN** | |
| 11.| **我爱云-部署证书到我爱云CDN** | 部署证书到我爱云CDN |
| 12.| **CacheFly-部署证书到CacheFly** | 部署证书到 CacheFly |
| 13.| **Gcore-部署证书到Gcore** | 仅上传 并不会部署到cdn |
| 14.| **Gcore-刷新Gcore证书** | 刷新现有的证书 |
| 15.| **又拍云-部署证书到CDN/USS** | 支持又拍云CDN又拍云云存储USS |
| 16.| **FlexCDN-更新证书** | |
| 17.| **farcdn-更新证书** | www.farcdn.net |
| 18.| **雨云-更新证书** | app.rainyun.com |
| 19.| **网宿-更新证书** | 网宿证书自动更新 |
| 20.| **金山云-更新CDN证书** | 金山云自动更新CDN证书 |
| 21.| **APISIX-更新证书** | 自动更新APISIX证书 |
## 4. 面板
| 序号 | 名称 | 说明 |

View File

@@ -9,15 +9,16 @@
| 5.| **新网** | 新网域名解析 |
| 6.| **新网(代理方式)** | 新网域名解析(代理方式) |
| 7.| **腾讯云** | 腾讯云域名DNS解析提供者 |
| 8.| **华为云** | 华为云DNS解析提供 |
| 9.| **西部数码** | west dns provider |
| 10.| **dns.la** | dns.la |
| 11.| **雨云** | 雨云DNS解析提供商 |
| 12.| **cloudflare** | cloudflare dns provider |
| 13.| **namesilo** | namesilo dns provider |
| 14.| **godaddy** | GoDaddy |
| 15.| **51dns** | 51DNS |
| 16.| **新网互联** | 新网互联 |
| 8.| **腾讯云EO DNS** | 腾讯云EO DNS解析提供 |
| 9.| **华为云** | 华为云DNS解析提供商 |
| 10.| **西部数码** | west dns provider |
| 11.| **dns.la** | dns.la |
| 12.| **雨云** | 雨云DNS解析提供商 |
| 13.| **cloudflare** | cloudflare dns provider |
| 14.| **namesilo** | namesilo dns provider |
| 15.| **godaddy** | GoDaddy |
| 16.| **51dns** | 51DNS |
| 17.| **新网互联** | 新网互联 |
<style module>
table th:first-of-type {

View File

@@ -9,5 +9,5 @@
}
},
"npmClient": "pnpm",
"version": "1.37.7"
"version": "1.37.10"
}

View File

@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/publishlab/node-acme-client/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/acme-client
## [1.37.9](https://github.com/publishlab/node-acme-client/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/acme-client
## [1.37.8](https://github.com/publishlab/node-acme-client/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/acme-client
## [1.37.7](https://github.com/publishlab/node-acme-client/compare/v1.37.6...v1.37.7) (2025-11-12)
### Performance Improvements

View File

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

View File

@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/basic
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/basic
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/basic
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Performance Improvements

View File

@@ -1 +1 @@
01:12
23:49

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/basic",
"private": false,
"version": "1.37.7",
"version": "1.37.10",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -46,5 +46,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
"gitHead": "8bfdef79c48c3151089107ead7134ce4515fd5bc"
}

View File

@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/pipeline
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/pipeline
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/pipeline
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
**Note:** Version bump only for package @certd/pipeline

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/pipeline",
"private": false,
"version": "1.37.7",
"version": "1.37.10",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -18,8 +18,8 @@
"compile": "tsc --skipLibCheck --watch"
},
"dependencies": {
"@certd/basic": "^1.37.7",
"@certd/plus-core": "^1.37.7",
"@certd/basic": "^1.37.10",
"@certd/plus-core": "^1.37.10",
"dayjs": "^1.11.7",
"lodash-es": "^4.17.21",
"reflect-metadata": "^0.1.13"
@@ -45,5 +45,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
"gitHead": "8bfdef79c48c3151089107ead7134ce4515fd5bc"
}

View File

@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/lib-huawei
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/lib-huawei
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/lib-huawei
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
**Note:** Version bump only for package @certd/lib-huawei

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/lib-huawei",
"private": false,
"version": "1.37.7",
"version": "1.37.10",
"main": "./dist/bundle.js",
"module": "./dist/bundle.js",
"types": "./dist/d/index.d.ts",
@@ -24,5 +24,5 @@
"prettier": "^2.8.8",
"tslib": "^2.8.1"
},
"gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
"gitHead": "8bfdef79c48c3151089107ead7134ce4515fd5bc"
}

View File

@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/lib-iframe
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/lib-iframe
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/lib-iframe
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
**Note:** Version bump only for package @certd/lib-iframe

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/lib-iframe",
"private": false,
"version": "1.37.7",
"version": "1.37.10",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -31,5 +31,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
"gitHead": "8bfdef79c48c3151089107ead7134ce4515fd5bc"
}

View File

@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/jdcloud
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/jdcloud
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/jdcloud
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
**Note:** Version bump only for package @certd/jdcloud

View File

@@ -1,6 +1,6 @@
{
"name": "@certd/jdcloud",
"version": "1.37.7",
"version": "1.37.10",
"description": "jdcloud openApi sdk",
"main": "./dist/bundle.js",
"module": "./dist/bundle.js",
@@ -61,5 +61,5 @@
"fetch"
]
},
"gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
"gitHead": "8bfdef79c48c3151089107ead7134ce4515fd5bc"
}

View File

@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/lib-k8s
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/lib-k8s
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/lib-k8s
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
**Note:** Version bump only for package @certd/lib-k8s

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/lib-k8s",
"private": false,
"version": "1.37.7",
"version": "1.37.10",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -17,7 +17,7 @@
"pub": "npm publish"
},
"dependencies": {
"@certd/basic": "^1.37.7",
"@certd/basic": "^1.37.10",
"@kubernetes/client-node": "0.21.0"
},
"devDependencies": {
@@ -32,5 +32,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
"gitHead": "8bfdef79c48c3151089107ead7134ce4515fd5bc"
}

View File

@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/lib-server
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/lib-server
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/lib-server
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
**Note:** Version bump only for package @certd/lib-server

View File

@@ -1,6 +1,6 @@
{
"name": "@certd/lib-server",
"version": "1.37.7",
"version": "1.37.10",
"description": "midway with flyway, sql upgrade way ",
"private": false,
"type": "module",
@@ -28,11 +28,11 @@
],
"license": "AGPL",
"dependencies": {
"@certd/acme-client": "^1.37.7",
"@certd/basic": "^1.37.7",
"@certd/pipeline": "^1.37.7",
"@certd/plugin-lib": "^1.37.7",
"@certd/plus-core": "^1.37.7",
"@certd/acme-client": "^1.37.10",
"@certd/basic": "^1.37.10",
"@certd/pipeline": "^1.37.10",
"@certd/plugin-lib": "^1.37.10",
"@certd/plus-core": "^1.37.10",
"@midwayjs/cache": "3.14.0",
"@midwayjs/core": "3.20.11",
"@midwayjs/i18n": "3.20.13",
@@ -64,5 +64,5 @@
"typeorm": "^0.3.11",
"typescript": "^5.4.2"
},
"gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
"gitHead": "8bfdef79c48c3151089107ead7134ce4515fd5bc"
}

View File

@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
**Note:** Version bump only for package @certd/midway-flyway-js

View File

@@ -1,6 +1,6 @@
{
"name": "@certd/midway-flyway-js",
"version": "1.37.7",
"version": "1.37.10",
"description": "midway with flyway, sql upgrade way ",
"private": false,
"type": "module",
@@ -46,5 +46,5 @@
"typeorm": "^0.3.11",
"typescript": "^5.4.2"
},
"gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
"gitHead": "8bfdef79c48c3151089107ead7134ce4515fd5bc"
}

View File

@@ -3,6 +3,20 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 优化dokploy 部署插件配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/plugin-cert
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/plugin-cert
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Performance Improvements

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/plugin-cert",
"private": false,
"version": "1.37.7",
"version": "1.37.10",
"type": "module",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@@ -17,10 +17,10 @@
"compile": "tsc --skipLibCheck --watch"
},
"dependencies": {
"@certd/acme-client": "^1.37.7",
"@certd/basic": "^1.37.7",
"@certd/pipeline": "^1.37.7",
"@certd/plugin-lib": "^1.37.7",
"@certd/acme-client": "^1.37.10",
"@certd/basic": "^1.37.10",
"@certd/pipeline": "^1.37.10",
"@certd/plugin-lib": "^1.37.10",
"@google-cloud/publicca": "^1.3.0",
"dayjs": "^1.11.7",
"jszip": "^3.10.1",
@@ -43,5 +43,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
"gitHead": "8bfdef79c48c3151089107ead7134ce4515fd5bc"
}

View File

@@ -36,6 +36,7 @@ export class CertReader {
detail: CertificateInfo;
//毫秒时间戳
effective: number;
//毫秒时间戳
expires: number;
constructor(certInfo: CertInfo) {
this.cert = certInfo;

View File

@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/plugin-lib
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/plugin-lib
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/plugin-lib
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Performance Improvements

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/plugin-lib",
"private": false,
"version": "1.37.7",
"version": "1.37.10",
"type": "module",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@@ -22,8 +22,8 @@
"@alicloud/pop-core": "^1.7.10",
"@alicloud/tea-util": "^1.4.10",
"@aws-sdk/client-s3": "^3.787.0",
"@certd/basic": "^1.37.7",
"@certd/pipeline": "^1.37.7",
"@certd/basic": "^1.37.10",
"@certd/pipeline": "^1.37.10",
"@kubernetes/client-node": "0.21.0",
"ali-oss": "^6.22.0",
"basic-ftp": "^5.0.5",
@@ -53,5 +53,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
"gitHead": "8bfdef79c48c3151089107ead7134ce4515fd5bc"
}

View File

@@ -3,6 +3,24 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 站点证书监控备注输入框改成textarea ([70b603d](https://github.com/certd/certd/commit/70b603d601c34f39148c2ab70c655c51babf563d))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
### Bug Fixes
* 商用证书上传保存失败的bug ([075b1dc](https://github.com/certd/certd/commit/075b1dc0eb8c39acc277277b1b334d66b6717ab2))
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
### Performance Improvements
* 支持回车键触发登录 ([eb5c88f](https://github.com/certd/certd/commit/eb5c88fbb2901f1a9669429a7cd8dc76f6806d01))
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Bug Fixes

View File

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

View File

@@ -117,7 +117,6 @@ onUnmounted(() => {
:confirm-text="$t('common.refresh')"
:fullscreen-button="false"
:title="$t('ui.widgets.checkUpdatesTitle')"
centered
content-class="px-8 min-h-10"
footer-class="border-none mb-3 mr-3"
header-class="border-none"

View File

@@ -156,7 +156,6 @@ if (enableShortcutKey.value) {
:confirm-text="$t('common.confirm')"
:fullscreen-button="false"
:title="$t('common.prompt')"
centered
content-class="px-8 min-h-10"
footer-class="border-none mb-3 mr-3"
header-class="border-none"

View File

@@ -555,7 +555,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
search: {
show: false,
},
type: "text",
type: "textarea",
column: {
width: 200,
sorter: true,

View File

@@ -204,7 +204,7 @@ export function useCertUpload() {
notifications,
};
const id = await api.Save({
const { id } = await api.Save({
title: pipeline.title,
content: JSON.stringify(pipeline),
keepHistoryCount: 30,

View File

@@ -7,14 +7,14 @@
<template v-if="formState.loginType === 'password'">
<!-- <div class="login-title">登录</div>-->
<a-form-item required has-feedback name="username" :rules="rules.username">
<a-input v-model:value="formState.username" :placeholder="t('authentication.usernamePlaceholder')" autocomplete="off">
<a-input v-model:value="formState.username" :placeholder="t('authentication.usernamePlaceholder')" autocomplete="off" @keydown.enter="handleFinish">
<template #prefix>
<fs-icon icon="ion:phone-portrait-outline"></fs-icon>
</template>
</a-input>
</a-form-item>
<a-form-item has-feedback name="password" :rules="rules.password">
<a-input-password v-model:value="formState.password" :placeholder="t('authentication.passwordPlaceholder')" autocomplete="off">
<a-input-password v-model:value="formState.password" :placeholder="t('authentication.passwordPlaceholder')" autocomplete="off" @keyup.enter="handleFinish">
<template #prefix>
<fs-icon icon="ion:lock-closed-outline"></fs-icon>
</template>
@@ -22,7 +22,7 @@
</a-form-item>
<a-form-item v-if="settingStore.sysPublic.captchaEnabled" has-feedback required name="captcha" :rules="rules.captcha">
<CaptchaInput v-model:model-value="formState.captcha"></CaptchaInput>
<CaptchaInput v-model:model-value="formState.captcha" @keydown.enter="handleFinish"></CaptchaInput>
</a-form-item>
</template>
</a-tab-pane>
@@ -37,7 +37,7 @@
</a-form-item>
<a-form-item has-feedback name="smsCaptcha">
<CaptchaInput v-model:model-value="formState.smsCaptcha"></CaptchaInput>
<CaptchaInput v-model:model-value="formState.smsCaptcha" @keydown.enter="handleFinish"></CaptchaInput>
</a-form-item>
<a-form-item name="smsCode" :rules="rules.smsCode">
@@ -169,7 +169,7 @@ export default defineComponent({
await userStore.loginByTwoFactor(twoFactor);
};
const handleFinish = async (values: any) => {
const handleFinish = async () => {
loading.value = true;
try {
// formState.captcha = await doCaptchaValidate();

View File

@@ -3,6 +3,28 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 优化dokploy 部署插件配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
### Performance Improvements
* 优化阿里云clb 过期证书清理报错的问题 ([d465367](https://github.com/certd/certd/commit/d4653678b2e3643460f918992eeae4044d3a1cc7))
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
### Bug Fixes
* **plugins/woai-cdn:** 修正默认接口域名与帮助链接中的路径 ([#576](https://github.com/certd/certd/issues/576)) @LjyLab ([d20046c](https://github.com/certd/certd/commit/d20046c86681ea177ece434423b7c81a76b437fb))
### Performance Improvements
* 修复西数解析记录添加失败的bug支持部署证书到西数虚拟主机 ([1102952](https://github.com/certd/certd/commit/1102952b4703e8c0bbc17b0700c0ed3ef6f866d3))
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Performance Improvements

View File

@@ -1,6 +1,6 @@
{
"name": "@certd/ui-server",
"version": "1.37.7",
"version": "1.37.10",
"description": "fast-server base midway",
"private": true,
"type": "module",
@@ -45,20 +45,20 @@
"@aws-sdk/client-cloudfront": "^3.699.0",
"@aws-sdk/client-iam": "^3.699.0",
"@aws-sdk/client-s3": "^3.705.0",
"@certd/acme-client": "^1.37.7",
"@certd/basic": "^1.37.7",
"@certd/commercial-core": "^1.37.7",
"@certd/acme-client": "^1.37.10",
"@certd/basic": "^1.37.10",
"@certd/commercial-core": "^1.37.10",
"@certd/cv4pve-api-javascript": "^8.4.2",
"@certd/jdcloud": "^1.37.7",
"@certd/lib-huawei": "^1.37.7",
"@certd/lib-k8s": "^1.37.7",
"@certd/lib-server": "^1.37.7",
"@certd/midway-flyway-js": "^1.37.7",
"@certd/pipeline": "^1.37.7",
"@certd/plugin-cert": "^1.37.7",
"@certd/plugin-lib": "^1.37.7",
"@certd/plugin-plus": "^1.37.7",
"@certd/plus-core": "^1.37.7",
"@certd/jdcloud": "^1.37.10",
"@certd/lib-huawei": "^1.37.10",
"@certd/lib-k8s": "^1.37.10",
"@certd/lib-server": "^1.37.10",
"@certd/midway-flyway-js": "^1.37.10",
"@certd/pipeline": "^1.37.10",
"@certd/plugin-cert": "^1.37.10",
"@certd/plugin-lib": "^1.37.10",
"@certd/plugin-plus": "^1.37.10",
"@certd/plus-core": "^1.37.10",
"@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
"@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
"@koa/cors": "^5.0.0",

View File

@@ -155,10 +155,14 @@ export class AliyunDeployCertToALB extends AbstractTaskPlugin {
const client = await this.getLBClient(access, this.regionId);
await this.deployDefaultCert(certId, client);
}
await this.ctx.utils.sleep(10000)
this.logger.info(`准备开始清理过期证书`);
await this.ctx.utils.sleep(30000)
for (const listener of this.listeners) {
await this.clearInvalidCert(albClientV2, listener);
try{
await this.clearInvalidCert(albClientV2, listener);
}catch(e){
this.logger.error(`清理监听器${listener}的过期证书失败`, e);
}
}
@@ -236,6 +240,7 @@ export class AliyunDeployCertToALB extends AbstractTaskPlugin {
const certIds = [];
for (const item of list) {
this.logger.info(`监听器${listener}绑定的证书${item.CertificateId},status:${item.Status},IsDefault:${item.IsDefault}`);
if (item.Status !== "Associated") {
continue;
}
@@ -244,10 +249,12 @@ export class AliyunDeployCertToALB extends AbstractTaskPlugin {
}
certIds.push( parseInt(item.CertificateId));
}
this.logger.info(`监听器${listener}绑定的证书${certIds}`);
//检查是否过期,过期则删除
const invalidCertIds = [];
for (const certId of certIds) {
const res = await sslClient.getCertInfo(certId);
this.logger.info(`证书${certId}过期时间:${res.notAfter}`);
if (res.notAfter < new Date().getTime()) {
invalidCertIds.push(certId);
}
@@ -256,7 +263,7 @@ export class AliyunDeployCertToALB extends AbstractTaskPlugin {
this.logger.info(`监听器${listener}没有过期的证书`);
return
}
this.logger.info(`开始解绑过期的证书:${invalidCertIds}`);
this.logger.info(`开始解绑过期的证书:${invalidCertIds}listener:${listener}`);
await client.doRequest({
// 接口名称
action: "DissociateAdditionalCertificatesFromListener",

View File

@@ -152,9 +152,14 @@ export class AliyunDeployCertToNLB extends AbstractTaskPlugin {
await this.deployDefaultCert(certId, client);
}
await this.ctx.utils.sleep(10000)
this.logger.info(`准备开始清理过期证书`);
await this.ctx.utils.sleep(30000)
for (const listener of this.listeners) {
await this.clearInvalidCert(nlbClientV2, listener);
try{
await this.clearInvalidCert(nlbClientV2, listener);
}catch(e){
this.logger.error(`清理监听器${listener}的过期证书失败`, e);
}
}
this.logger.info('执行完成');
@@ -232,6 +237,7 @@ export class AliyunDeployCertToNLB extends AbstractTaskPlugin {
const certIds = [];
for (const item of list) {
this.logger.info(`监听器${listener}绑定的证书${item.CertificateId},status:${item.Status},IsDefault:${item.IsDefault}`);
if (item.Status !== "Associated") {
continue;
}
@@ -240,10 +246,12 @@ export class AliyunDeployCertToNLB extends AbstractTaskPlugin {
}
certIds.push( parseInt(item.CertificateId));
}
this.logger.info(`监听器${listener}绑定的证书${certIds}`);
//检查是否过期,过期则删除
const invalidCertIds = [];
for (const certId of certIds) {
const res = await sslClient.getCertInfo(certId);
this.logger.info(`证书${certId}过期时间:${res.notAfter}`);
if (res.notAfter < new Date().getTime()) {
invalidCertIds.push(certId);
}
@@ -252,7 +260,7 @@ export class AliyunDeployCertToNLB extends AbstractTaskPlugin {
this.logger.info(`监听器${listener}没有过期的证书`);
return
}
this.logger.info(`开始解绑过期的证书:${invalidCertIds}`);
this.logger.info(`开始解绑过期的证书:${invalidCertIds},listener:${listener}`);
const ids:any = {}
let i = 0

View File

@@ -50,6 +50,14 @@ export class DokployAccess extends BaseAccess {
return "ok"
}
async getServerList(){
const req = {
url :"/api/server.all",
method: "get",
}
return await this.doRequest(req);
}
async getCertList(){
const req = {
url :"/api/certificates.all",
@@ -96,7 +104,7 @@ export class DokployAccess extends BaseAccess {
headers,
baseURL: this.endpoint,
...req,
logRes: true,
logRes: false,
});
}

View File

@@ -1,13 +1,13 @@
import { AbstractTaskPlugin, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
import {CertApplyPluginNames, CertInfo} from "@certd/plugin-cert";
import {CertApplyPluginNames, CertInfo, CertReader} from "@certd/plugin-cert";
import {createCertDomainGetterInputDefine, createRemoteSelectInputDefine} from "@certd/plugin-lib";
import {DokployAccess} from "../access.js";
@IsTaskPlugin({
//命名规范,插件类型+功能就是目录plugin-demo中的demo大写字母开头驼峰命名
name: "DokployRefreshCert",
title: "Dokploy-更新证书",
desc: "自动更新Dokploy证书",
title: "Dokploy-部署server证书",
desc: "自动更新Dokploy server证书",
icon: "svg:icon-lucky",
//插件分组
group: pluginGroups.panel.key,
@@ -52,12 +52,12 @@ export class DokployRefreshCert extends AbstractTaskPlugin {
createRemoteSelectInputDefine({
title: "证书名称",
helper: "要更新的证书名称,如果这里没有,请先给手动绑定一次证书",
action: DokployRefreshCert.prototype.onGetCertList.name,
action: DokployRefreshCert.prototype.onGetServerList.name,
pager: false,
search: false
})
)
certList!: string[];
serverList!: string[];
//插件实例化时执行的方法
async onInstance() {
@@ -67,46 +67,61 @@ export class DokployRefreshCert extends AbstractTaskPlugin {
async execute(): Promise<void> {
const access = await this.getAccess<DokployAccess>(this.accessId);
if (!this.serverList || this.serverList.length === 0) {
throw new Error("请先选择要部署证书的server");
}
// await access.createCert({cert:this.cert})
const certList = await access.getCertList();
const oldCertList = await access.getCertList();
for (const certId of this.certList) {
this.logger.info(`----------- 开始更新证书:${certId}`);
const [serverId,name] = certId.split("#");
const founds = certList.filter((item: any) => item.name === name);
if (founds){
for (const found of founds) {
await access.removeCert({id:found.certificateId})
}
const certReader = new CertReader(this.cert);
for (const serverId of this.serverList) {
this.logger.info(`----------- 开始部署server证书${serverId}`);
if(!serverId){
this.logger.error(`----------- serverId不能为空跳过更新`);
continue;
}
await access.createCert({
name,
name: certReader.buildCertName(),
cert: this.cert,
serverId: serverId,
});
this.logger.info(`----------- 更新证书${certId}成功`);
this.logger.info(`----------- 部署server${serverId}证书成功`);
}
this.logger.info(`----------- 等待10秒后开始清理过期证书`);
await this.ctx.utils.sleep(10000);
//清理过期证书
for (const certItem of oldCertList) {
const certDetail = CertReader.readCertDetail(certItem.certificateData);
if (certDetail.expires.getTime() < new Date().getTime()){
this.logger.info(`----------- 证书${certItem.certificateId}已过期`);
await access.removeCert({id:certItem.certificateId});
this.logger.info(`----------- 清理过期证书${certItem.certificateId}成功`);
}else{
this.logger.info(`----------- 证书${certItem.certificateId}还未过期`);
}
}
this.logger.info("部署完成");
}
async onGetCertList(data: PageSearch = {}) {
async onGetServerList(data: PageSearch = {}) {
const access = await this.getAccess<DokployAccess>(this.accessId);
const res = await access.getCertList()
const res = await access.getServerList()
const list = res
if (!list || list.length === 0) {
throw new Error("没有找到证书,你可以直接手动输入id如果id不存在将自动创建");
throw new Error("没有找到Server,你可以直接手动输入serverId");
}
const options = list.map((item: any) => {
return {
label: `${item.name}<${item.serverId}>`,
value: `${item.serverId}#${item.name}`,
domain: item.name
value: `${item.serverId}`,
};
});
return options;

View File

@@ -1,5 +1,6 @@
import { HttpRequestConfig } from '@certd/basic';
import { IsAccess, AccessInput, BaseAccess } from '@certd/pipeline';
import qs from 'qs';
/**
* 这个注解将注册一个授权配置
* 在certd的后台管理系统中用户可以选择添加此类型的授权
@@ -55,7 +56,7 @@ export class WestAccess extends BaseAccess {
component: {
placeholder: '账户级别的key对整个账户都有管理权限',
},
helper: '账户级别的key对整个账户都有管理权限\n前往https://www.west.cn/manager/API/APIconfig.asp手动设置“api连接密码”',
helper: '账户级别的key对整个账户都有管理权限\n前往[API接口配置](https://www.west.cn/manager/API/APIconfig.asp)手动设置“api连接密码”',
encrypt: true,
required: false,
mergeScript: `
@@ -88,6 +89,100 @@ export class WestAccess extends BaseAccess {
`,
})
apidomainkey = '';
@AccessInput({
title: "测试",
component: {
name: "api-test",
action: "TestRequest"
},
helper: "点击测试接口是否正常"
})
testRequest = true;
async onTestRequest() {
await this.getDomainList();
return "ok";
}
async getDomainList() {
const res = await this.doRequest({
url: '/v2/domain',
method: 'GET',
data:{
act:'getdomains',
limit:1,
page:1
}
});
return res;
}
public async doRequest(req: HttpRequestConfig) {
let { url, method, data } = req;
if (data == null) {
data = {};
}
if (!method) {
method = 'POST';
}
if (this.scope === 'account') {
/**
* token text 身份验证字符串取值为md5(username+api_password+timestamp),其中:
username您在我司注册的用户名。
api_password您设置的API密码。您可登录官网管理中心在“代理商管理”-<API接口配置>""页面查看您的api密码。
timestamp当前时间的毫秒时间戳。
将字符串username与字符串api_password连接再与timestamp连接然后将生成的字符串进行md5求值md5算法要求为
32位16进制字符串小写格式。
身份验证串有效期10分钟。
比如您的用户名为zhangsan您的API密码为5dh232kfg!* ,当前毫秒时间戳为1554691950854
token=md5(zhangsan + 5dh232kfg!* + 1554691950854)=cfcd208495d565ef66e7dff9f98764da
*/
// data.apikey = this.ctx.utils.hash.md5(this.apikey);
data.username = this.username;
const timestamp = new Date().getTime();
const token = this.ctx.utils.hash.md5(`${this.username}${this.apikey}${timestamp}`).toLowerCase();
data.token = token;
data.time = timestamp;
} else {
data.apidomainkey = this.apidomainkey;
}
const headers = {}
const body: any = {}
if (method.toUpperCase() === 'POST') {
headers['Content-Type'] = 'application/x-www-form-urlencoded';
body.data = data
} else if (method.toUpperCase() === 'GET') {
let queryString = '';
if (method.toUpperCase() === 'GET') {
queryString = qs.stringify(data);
}
url = `${url}?${queryString}`
}
const res = await this.ctx.http.request<any, any>({
baseURL: 'https://api.west.cn/api',
url,
method,
...body,
headers,
});
this.ctx.logger.info(`request ${url} ${method} res:${JSON.stringify(res)}`);
if (res.msg !== 'success' && res.result!= 200) {
throw new Error(`${JSON.stringify(res.msg)}`);
}
return res;
}
}
new WestAccess();

View File

@@ -4,10 +4,10 @@ import { WestAccess } from './access.js';
type westRecord = {
// 这里定义Record记录的数据结构跟对应云平台接口返回值一样即可一般是拿到id就行用于删除txt解析记录清理申请痕迹
code: number;
result: number;
msg: string;
body: {
record_id: number;
data: {
id: number;
};
};
@@ -31,27 +31,6 @@ export class WestDnsProvider extends AbstractDnsProvider<westRecord> {
//...
}
private async doRequestApi(url: string, data: any = null, method = 'post') {
if (this.access.scope === 'account') {
data.apikey = this.ctx.utils.hash.md5(this.access.apikey);
data.username = this.access.username;
} else {
data.apidomainkey = this.access.apidomainkey;
}
const res = await this.ctx.http.request<any, any>({
url,
method,
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
});
if (res.msg !== 'success') {
throw new Error(`${JSON.stringify(res.msg)}`);
}
return res;
}
/**
* 创建dns解析记录用于验证域名所有权
*/
@@ -63,22 +42,26 @@ export class WestDnsProvider extends AbstractDnsProvider<westRecord> {
* type: 'TXT',
* domain: 'example.com'
*/
const { fullRecord, value, type, domain } = options;
const { fullRecord, value, type, domain,hostRecord } = options;
this.logger.info('添加域名解析:', fullRecord, value, type, domain);
// 准备要发送到API的请求体
const requestBody = {
act: 'dnsrec.add', // API动作类型
act: 'adddnsrecord', // API动作类型
domain: domain, // 域名
record_type: 'TXT', // DNS记录类型
hostname: fullRecord, // 完整的记录名
record_value: value, // 记录的值
record_line: '', // 记录线路
record_ttl: 60, // TTL (生存时间)设置为60秒
type: 'TXT', // DNS记录类型
host: hostRecord, // 完整的记录名
value: value, // 记录的值
line: '', // 记录线路
ttl: 60, // TTL (生存时间)设置为60秒
};
const url = 'https://api.west.cn/API/v2/domain/dns/';
const res = await this.doRequestApi(url, requestBody);
const url = '/v2/domain/';
const res = await this.access.doRequest({
url,
method:'POST',
data: requestBody,
});
const record = res as westRecord;
this.logger.info(`添加域名解析成功:fullRecord=${fullRecord},value=${value}`);
this.logger.info(`dns解析记录:${JSON.stringify(record)}`);
@@ -90,6 +73,7 @@ export class WestDnsProvider extends AbstractDnsProvider<westRecord> {
/**
* 删除dns解析记录,清理申请痕迹
* https://console-docs.apipost.cn/preview/ab2c3103b22855ba/fac91d1e43fafb69?target_id=c4564349-6687-413d-a3d4-b0e8db5b34b2
* @param options
*/
async removeRecord(options: RemoveRecordOptions<westRecord>): Promise<void> {
@@ -104,16 +88,17 @@ export class WestDnsProvider extends AbstractDnsProvider<westRecord> {
// 准备要发送到API的请求体
const requestBody = {
act: 'dnsrec.remove', // API动作类型
act: 'deldnsrecord', // API动作类型
domain: domain, // 域名
record_id: record.body.record_id,
hostname: fullRecord, // 完整的记录名
record_type: 'TXT', // DNS记录类型
record_line: '', // 记录线路
id: record.data?.id,
};
const url = 'https://api.west.cn/API/v2/domain/dns/';
const res = await this.doRequestApi(url, requestBody);
const url = '/v2/domain/';
const res = await this.access.doRequest({
url,
method:'POST',
data: requestBody,
});
const result = res.result;
this.logger.info('删除域名解析成功:', fullRecord, value, JSON.stringify(result));
}

View File

@@ -1,2 +1,3 @@
export * from './dns-provider.js';
export * from './access.js';
export * from './plugins/deploy-to-vhost.js';

View File

@@ -0,0 +1,227 @@
import {
AbstractTaskPlugin,
IsTaskPlugin,
PageSearch,
pluginGroups,
RunStrategy,
TaskInput
} from "@certd/pipeline";
import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert";
import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib";
import { WestAccess } from "../access.js";
@IsTaskPlugin({
//命名规范,插件类型+功能就是目录plugin-demo中的demo大写字母开头驼峰命名
name: "WestDeployToVhost",
title: "西数-部署到虚拟主机",
desc: "西部数码部署证书到虚拟主机",
icon: "svg:icon-lucky",
//插件分组
group: pluginGroups.cdn.key,
needPlus: false,
default: {
//默认值配置照抄即可
strategy: {
runStrategy: RunStrategy.SkipWhenSucceed
}
}
})
//类名规范跟上面插件名称name一致
export class WestDeployToVhost extends AbstractTaskPlugin {
//证书选择,此项必须要有
@TaskInput({
title: "域名证书",
helper: "请选择前置任务输出的域名证书",
component: {
name: "output-selector",
from: [...CertApplyPluginNames]
}
// required: true, // 必填
})
cert!: CertInfo;
@TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
certDomains!: string[];
//授权选择框
@TaskInput({
title: "西数授权",
component: {
name: "access-selector",
type: "west" //固定授权类型
},
required: true //必填
})
accessId!: string;
//
@TaskInput(
createRemoteSelectInputDefine({
title: "虚拟主机列表",
helper: "虚拟主机列表",
action: WestDeployToVhost.prototype.onGetVhostList.name,
pager: false,
search: false
})
)
vhostList!: string[];
// @TaskInput(
// createRemoteSelectInputDefine({
// title: "证书Id",
// helper: "要部署的西数证书id",
// action: WestDeployToVhost.prototype.onGetCertList.name,
// pager: false,
// search: false
// })
// )
// certList!: string[];
//插件实例化时执行的方法
async onInstance() {
}
//插件执行方法
async execute(): Promise<void> {
const access = await this.getAccess<WestAccess>(this.accessId);
for (const item of this.vhostList) {
this.logger.info(`----------- 开始更新证书到虚拟主机:${item}`);
const arr = item.split("_");
const sitename = arr[1];
await this.uploadCert({access,sitename});
await this.ctx.utils.sleep(2000);
const res = await this.getVhostSslInfo({access,sitename});
this.logger.info(`----------- 虚拟主机${sitename}证书信息:${JSON.stringify(res)}`);
this.logger.info(`----------- 更新证书${item}成功`);
}
this.logger.info("部署完成");
}
// async onGetCertList(data: PageSearch = {}) {
// const access = await this.getAccess<WestAccess>(this.accessId);
// const list = await access.getCertList({});
// if (!list || list.length === 0) {
// throw new Error("没有找到证书,请先在控制台上传一次证书且关联域名");
// }
// /**
// * certificate-id
// * name
// * dns-names
// */
// const options = list.map((item: any) => {
// const domains = item["dns-names"]
// const certId = item["certificate-id"];
// return {
// label: `${item.name}<${certId}-${domains[0]}>`,
// value: certId,
// domain: item["dns-names"]
// };
// });
// return {
// list: this.ctx.utils.options.buildGroupOptions(options, this.certDomains),
// total: list.length,
// pageNo: 1,
// pageSize: list.length
// };
// }
async uploadCert(req:{access:any,sitename:string}){
const {access,sitename} = req;
const data = {
/**
* act
vhostssl
String
sitename
westly
String
cmd
import
String
openssl/closessl 部署/关闭
keycontent
String
私匙
certcontent
*/
act:"vhostssl",
sitename:sitename,
westly:"1",
cmd:"import",
opensslclosessl:"openssl",
keycontent:this.cert.key,
certcontent:this.cert.crt,
}
const res = await access.doRequest({
url: `/v2/vhost/`,
method:"POST",
data:data
});
return res;
}
async getVhostSslInfo(req:{access:any,sitename:string}){
const {access,sitename} = req;
const data = {
act:"vhostssl",
sitename:sitename,
cmd:"info",
}
const res = await access.doRequest({
url: `/v2/vhost/`,
method:"POST",
data:data
});
return res;
}
async onGetVhostList(data: PageSearch = {}) {
const access = await this.getAccess<WestAccess>(this.accessId);
const res = await access.doRequest({
url: `/v2/vhost/`,
method:"POST",
data:{
act:"sync",
westid: 1,
}
});
const list = res.data
if (!list || list.length === 0) {
throw new Error("没有找到虚拟主机");
}
/**
* certificate-id
* name
* dns-names
*/
const options = list.map((item: any) => {
return {
label: `${item.sitename}<${item.westid}-${item.bindings}>`,
value: `${item.westid}_${item.sitename}`,
domain: item.bindings.split(",")
};
});
return {
list: this.ctx.utils.options.buildGroupOptions(options, this.certDomains),
total: list.length,
pageNo: 1,
pageSize: list.length
};
}
}
//实例化一下,注册插件
new WestDeployToVhost();

View File

@@ -1,7 +1,7 @@
import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
import { CertInfo } from '@certd/plugin-cert';
import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert";
import { WoaiAccess } from '../access.js';
import { CertApplyPluginNames} from '@certd/plugin-cert';
@IsTaskPlugin({
name: 'WoaiCDN',
title: '我爱云-部署证书到我爱云CDN',
@@ -17,7 +17,7 @@ import { CertApplyPluginNames} from '@certd/plugin-cert';
export class WoaiCdnPlugin extends AbstractTaskPlugin {
@TaskInput({
title: '接口地址(可留空)',
helper: '请填写我爱云的地址, 默认为 [API](https://console.edge.ttzi.cn) 末尾请不要携带`/`',
helper: '请填写我爱云的地址, 默认为 [API](https://console.edeg.ttzi.cn) 末尾请不要携带`/`',
component: { name: 'a-input' },
required: false,
})
@@ -73,9 +73,9 @@ export class WoaiCdnPlugin extends AbstractTaskPlugin {
const { baseApi, certId, cert, accessId } = this;
const access = (await this.getAccess(accessId)) as WoaiAccess;
// 使用默认值或用户输入的值
const apiBase = baseApi || 'https://console.edge.ttzi.cn';
const apiBase = baseApi || 'https://console.edeg.ttzi.cn';
// 登录获取token
const loginResponse = await this.doRequestApi(`${apiBase}/login`, {
const loginResponse = await this.doRequestApi(`${apiBase}/account/login`, {
username: access.username,
password: access.password,
});

View File

@@ -1 +1 @@
00:49
15:30

View File

@@ -1 +1 @@
01:16
15:41