Compare commits

...

43 Commits

Author SHA1 Message Date
xiaojunnuo
6d89814795 v1.36.19 2025-09-06 00:33:10 +08:00
xiaojunnuo
f339bc9f7f build: prepare to build 2025-09-06 00:30:00 +08:00
xiaojunnuo
bb80bc0c07 chore: 2025-09-06 00:29:55 +08:00
xiaojunnuo
96677ff8bf build: prepare to build 2025-09-06 00:28:54 +08:00
xiaojunnuo
c7b6a6df79 chore: 2025-09-06 00:28:50 +08:00
xiaojunnuo
8bb7e8bfb2 chore: 2025-09-06 00:28:43 +08:00
xiaojunnuo
02ab343e22 build: prepare to build 2025-09-06 00:26:48 +08:00
xiaojunnuo
4d875a18de chore: 2025-09-06 00:26:29 +08:00
xiaojunnuo
cff2336923 build: prepare to build 2025-09-06 00:17:10 +08:00
xiaojunnuo
0e96bfdfa3 perf: 创建证书时支持选择通知时机 2025-09-06 00:12:16 +08:00
xiaojunnuo
a24ef48ad1 chore: 2025-09-06 00:01:45 +08:00
xiaojunnuo
fe9c4f3391 perf: 支持根据id更新证书(证书Id不变接口),不过该接口为白名单功能,普通腾讯云账户无法使用 2025-09-06 00:01:17 +08:00
xiaojunnuo
6cbb0739f8 fix: 修复远程数据选择无法过滤的bug 2025-09-05 22:19:03 +08:00
xiaojunnuo
79ebabfcfb perf: 创建k8s secret 时设置type为tls 2025-09-05 21:32:34 +08:00
xiaojunnuo
0c8e3262fe chore: 2025-09-05 21:17:15 +08:00
xiaojunnuo
c24a040c19 perf: ssh 增加超时断开连接,默认10分钟超时 2025-09-05 21:16:09 +08:00
xiaojunnuo
4f39cb8dfa chore: 2025-09-05 18:08:23 +08:00
xiaojunnuo
cdd2816642 chore: 2025-09-05 00:16:34 +08:00
xiaojunnuo
27b6dfa4d2 perf: 支持ssl.com证书颁发机构 2025-09-04 23:42:03 +08:00
xiaojunnuo
204cbd0209 chore: 2025-09-04 15:21:53 +08:00
xiaojunnuo
b7980aad5a perf: 支持godaddy 2025-09-04 15:13:45 +08:00
xiaojunnuo
e175729e2c chore: 2025-09-02 10:39:46 +08:00
xiaojunnuo
c26ad4c807 fix: 修复mysql下购买套餐加量包无效的bug 2025-09-02 10:37:36 +08:00
xiaojunnuo
4372adc703 fix: 修复批量流水线执行时日志显示错乱的问题 2025-09-01 18:10:32 +08:00
xiaojunnuo
8a0c2b9b13 perf: 去掉宝塔url后面的斜杠 2025-09-01 17:01:14 +08:00
xiaojunnuo
4443a1c030 perf: 商业版隐藏文档相关链接 2025-09-01 16:18:50 +08:00
xiaojunnuo
39a02235cf perf: 子域名托管说明 2025-09-01 15:52:19 +08:00
xiaojunnuo
db89561480 perf: 商业版隐藏文档相关链接 2025-09-01 15:52:14 +08:00
xiaojunnuo
a4cbb11693 chore: 2025-09-01 14:18:42 +08:00
xiaojunnuo
1ceeacc526 chore: 2025-09-01 13:33:12 +08:00
xiaojunnuo
b59052cc43 fix: 前置任务输出不存在时输出警告提示 2025-09-01 13:29:47 +08:00
xiaojunnuo
44019e1042 perf: 增加健康检查探针 /health/liveliness 和 /health/readiness 2025-08-29 10:07:17 +08:00
xiaojunnuo
fd0e1da4a2 build: publish 2025-08-29 00:43:39 +08:00
xiaojunnuo
f6c67b475a build: trigger build image 2025-08-29 00:43:24 +08:00
xiaojunnuo
ea18a5ad15 v1.36.18 2025-08-29 00:41:56 +08:00
xiaojunnuo
4d0cd3f497 build: prepare to build 2025-08-29 00:39:03 +08:00
xiaojunnuo
7dbdeaebe0 perf: 支持部署到dokploy 2025-08-29 00:38:45 +08:00
xiaojunnuo
2085bcceb6 perf: openapi返回证书时挑选匹配范围最小的那一个;增加format参数,增加返回值p7b格式,增加detail返回 2025-08-28 22:39:11 +08:00
xiaojunnuo
c09c962cb6 perf: 部署到k8s支持自动创建secret 2025-08-28 21:28:32 +08:00
xiaojunnuo
9108459ae4 perf: 短信验证码支持腾讯云 2025-08-28 17:35:17 +08:00
xiaojunnuo
992bac0b1f chore: 2025-08-28 15:53:15 +08:00
xiaojunnuo
ebd6917a1d fix: 修复proxmox某些情况下执行卡住的bug 2025-08-28 15:47:32 +08:00
xiaojunnuo
3e079e3b80 chore: 2025-08-28 00:58:17 +08:00
103 changed files with 2089 additions and 381 deletions

View File

@@ -3,6 +3,53 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
### Bug Fixes
* 前置任务输出不存在时输出警告提示 ([b59052c](https://github.com/certd/certd/commit/b59052cc43b7b070fabd8b8e914e4c2a5e0ad61c))
* 修复批量流水线执行时日志显示错乱的问题 ([4372adc](https://github.com/certd/certd/commit/4372adc703b9a4c785664054ab2a533626d815a8))
* 修复远程数据选择无法过滤的bug ([6cbb073](https://github.com/certd/certd/commit/6cbb0739f8428d51b0712f718fe4d236cc087cf9))
* 修复mysql下购买套餐加量包无效的bug ([c26ad4c](https://github.com/certd/certd/commit/c26ad4c8075f0606d45b8da13915737968d6191a))
### Performance Improvements
* 创建证书时支持选择通知时机 ([0e96bfd](https://github.com/certd/certd/commit/0e96bfdfa377824d204e72923d1176408ae6b300))
* 创建k8s secret 时设置type为tls ([79ebabf](https://github.com/certd/certd/commit/79ebabfcfb9e5a534049c84f5f1a642b357fc856))
* 去掉宝塔url后面的斜杠 ([8a0c2b9](https://github.com/certd/certd/commit/8a0c2b9b13628da750c25757e0cb8ed3038775ba))
* 商业版隐藏文档相关链接 ([4443a1c](https://github.com/certd/certd/commit/4443a1c0308fa6b95a05efd73d15d24b65d641c9))
* 商业版隐藏文档相关链接 ([db89561](https://github.com/certd/certd/commit/db8956148083bc4f988226ccf719940d08158a27))
* 增加健康检查探针 /health/liveliness 和 /health/readiness ([44019e1](https://github.com/certd/certd/commit/44019e104289fedd32a867db00e9c6cb71b389cc))
* 支持根据id更新证书证书Id不变接口不过该接口为白名单功能普通腾讯云账户无法使用 ([fe9c4f3](https://github.com/certd/certd/commit/fe9c4f3391ff07c01dd9a252225f69a129c39050))
* 支持godaddy ([b7980aa](https://github.com/certd/certd/commit/b7980aad5ab50f58662eaddf5d84aa82876a98eb))
* 支持ssl.com证书颁发机构 ([27b6dfa](https://github.com/certd/certd/commit/27b6dfa4d2ab3bddd284c3a34511a72e1a513a4c))
* 子域名托管说明 ([39a0223](https://github.com/certd/certd/commit/39a02235cf4416bb5bd1acd3831241efeaa2f602))
* ssh 增加超时断开连接默认10分钟超时 ([c24a040](https://github.com/certd/certd/commit/c24a040c19cacafc79228d7a7649af93837d94a1))
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
### Bug Fixes
* 更新我爱云CDN域名地址和部分目录结构 [@tyjsjxh](https://github.com/tyjsjxh) ([#514](https://github.com/certd/certd/issues/514)) ([78e7a81](https://github.com/certd/certd/commit/78e7a81638c2ee779f0ab6c3ba7e5c6f6e064151))
* 修复cron选择组件星期显示错误的bug ([eb75e52](https://github.com/certd/certd/commit/eb75e52278f94a72643f7317e6740fb42666c68a))
* 修复proxmox某些情况下执行卡住的bug ([ebd6917](https://github.com/certd/certd/commit/ebd6917a1d40ae4d94555c32b7e3c093d0599b94))
### Performance Improvements
* 部署到k8s支持自动创建secret ([c09c962](https://github.com/certd/certd/commit/c09c962cb676ca261610aa9f3e5105c9dae43f43))
* 短信验证码支持腾讯云 ([9108459](https://github.com/certd/certd/commit/9108459ae42bcd95a59acba164a64e82e5f2cfe6))
* 商业版支持自定义插件的参数配置 ([17f23f3](https://github.com/certd/certd/commit/17f23f37516af925d5049291d67d41e4271f81f8))
* 腾讯云插件支持国际版 ([58e82d5](https://github.com/certd/certd/commit/58e82d5dbd4ebf089ef239578ef9b68454d17b30))
* 腾讯云EO插件支持自动获取zoneid和域名列表 ([70fcdc9](https://github.com/certd/certd/commit/70fcdc9ebbfb7c883c0c8a2138f61a0776a9491b))
* 支持部署到阿里云云原生API网关、AI网关 ([2ca20be](https://github.com/certd/certd/commit/2ca20be197720201fceabcce9d927f4dbc1cc872))
* 支持部署到华为云obs ([9feb9d0](https://github.com/certd/certd/commit/9feb9d04b3c56ec95c06fcf4fd071eb0e88ffc6f))
* 支持部署到dokploy ([7dbdeae](https://github.com/certd/certd/commit/7dbdeaebe0bfee7521a863fe5e6b4a712aec5876))
* 支持删除宝塔证书夹中的过期证书 ([3575113](https://github.com/certd/certd/commit/3575113655be751d19f88c64491e98a89042d6a2))
* 支持p7b证书格式 ([d9f4a57](https://github.com/certd/certd/commit/d9f4a5793d68a017a5d80ad5385cbda603c4e165))
* lecdnv2支持api token ([e448934](https://github.com/certd/certd/commit/e4489343fee7754be07bcfc3323969dc3a30e90c))
* openapi返回证书时挑选匹配范围最小的那一个增加format参数增加返回值p7b格式增加detail返回 ([2085bcc](https://github.com/certd/certd/commit/2085bcceb61c3723c9bdfec4c4cc0917631ff5e5))
* ssh 配置sudo免密提示 ([e1e7011](https://github.com/certd/certd/commit/e1e7011853ad0c5bd7b09c3690861d5aa34b2db4))
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
### Bug Fixes ### Bug Fixes

View File

@@ -1 +1 @@
23:58 00:43

View File

@@ -120,6 +120,7 @@ export default defineConfig({
{text: "邮箱配置", link: "/guide/use/email/index.md"}, {text: "邮箱配置", link: "/guide/use/email/index.md"},
{text: "IPv6支持", link: "/guide/use/setting/ipv6.md"}, {text: "IPv6支持", link: "/guide/use/setting/ipv6.md"},
{text: "ESXi", link: "/guide/use/ESXi/index.md"}, {text: "ESXi", link: "/guide/use/ESXi/index.md"},
{text: "子域名托管", link: "/guide/use/cert/subdomain.md"},
] ]
}, },
{ {

View File

@@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
### Bug Fixes
* 更新我爱云CDN域名地址和部分目录结构 [@tyjsjxh](https://github.com/tyjsjxh) ([#514](https://github.com/certd/certd/issues/514)) ([78e7a81](https://github.com/certd/certd/commit/78e7a81638c2ee779f0ab6c3ba7e5c6f6e064151))
* 修复cron选择组件星期显示错误的bug ([eb75e52](https://github.com/certd/certd/commit/eb75e52278f94a72643f7317e6740fb42666c68a))
* 修复proxmox某些情况下执行卡住的bug ([ebd6917](https://github.com/certd/certd/commit/ebd6917a1d40ae4d94555c32b7e3c093d0599b94))
### Performance Improvements
* 部署到k8s支持自动创建secret ([c09c962](https://github.com/certd/certd/commit/c09c962cb676ca261610aa9f3e5105c9dae43f43))
* 短信验证码支持腾讯云 ([9108459](https://github.com/certd/certd/commit/9108459ae42bcd95a59acba164a64e82e5f2cfe6))
* 商业版支持自定义插件的参数配置 ([17f23f3](https://github.com/certd/certd/commit/17f23f37516af925d5049291d67d41e4271f81f8))
* 腾讯云插件支持国际版 ([58e82d5](https://github.com/certd/certd/commit/58e82d5dbd4ebf089ef239578ef9b68454d17b30))
* 腾讯云EO插件支持自动获取zoneid和域名列表 ([70fcdc9](https://github.com/certd/certd/commit/70fcdc9ebbfb7c883c0c8a2138f61a0776a9491b))
* 支持部署到阿里云云原生API网关、AI网关 ([2ca20be](https://github.com/certd/certd/commit/2ca20be197720201fceabcce9d927f4dbc1cc872))
* 支持部署到华为云obs ([9feb9d0](https://github.com/certd/certd/commit/9feb9d04b3c56ec95c06fcf4fd071eb0e88ffc6f))
* 支持部署到dokploy ([7dbdeae](https://github.com/certd/certd/commit/7dbdeaebe0bfee7521a863fe5e6b4a712aec5876))
* 支持删除宝塔证书夹中的过期证书 ([3575113](https://github.com/certd/certd/commit/3575113655be751d19f88c64491e98a89042d6a2))
* 支持p7b证书格式 ([d9f4a57](https://github.com/certd/certd/commit/d9f4a5793d68a017a5d80ad5385cbda603c4e165))
* lecdnv2支持api token ([e448934](https://github.com/certd/certd/commit/e4489343fee7754be07bcfc3323969dc3a30e90c))
* openapi返回证书时挑选匹配范围最小的那一个增加format参数增加返回值p7b格式增加detail返回 ([2085bcc](https://github.com/certd/certd/commit/2085bcceb61c3723c9bdfec4c4cc0917631ff5e5))
* ssh 配置sudo免密提示 ([e1e7011](https://github.com/certd/certd/commit/e1e7011853ad0c5bd7b09c3690861d5aa34b2db4))
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
### Bug Fixes ### Bug Fixes

View File

@@ -1,81 +0,0 @@
# 常见报错解决
## 1. getaddrinfo ENOTFOUND错误
如果出现`getaddrinfo ENOTFOUND`/`getaddrinfo EAI_AGAIN`错误,可以尝试在`docker-compose.yaml`中设置dns
```yaml
version: '3.3' # 兼容旧版docker-compose
services:
certd:
#↓↓↓↓ ------------ # 如果出现getaddrinfo ENOTFOUND 或 EAI_AGAIN错误可以尝试设置dns
dns:
- 223.5.5.5 # 阿里云公共dns
- 223.6.6.6
# # ↓↓↓↓ ------- # 如果你服务器在腾讯云可以用这个替换上面阿里云的公共dns
# - 119.29.29.29 # 腾讯云公共dns
# - 182.254.116.116
# # ↓↓↓↓ ------- # 如果你服务器部署在国外可以用这个替换上面阿里云的公共dns
# - 8.8.8.8 # 谷歌公共dns
# - 8.8.4.4
```
如果仍然有问题,按如下步骤检查是否能够ping通域名
```shell
docker exec -it certd /bin/sh
ping www.baidu.com
ping gg.px.certd.handfree.work
ping app.handfree.work
```
如果您是宝塔部署的
可以试试将容器网络加入brige网络看是否解决问题
![img.png](images/baota-net.png)
如果还是不行,请联系我们
## 2. 连接IPv6超时
docker-compose 需要放开IPv6网络的配置
```yaml
services:
certd:
networks:
- ip6net
# ↓↓↓↓ -------------------------------------------------------------- 启用ipv6网络还需要把上面networks的注释放开
networks:
ip6net:
enable_ipv6: true
ipam:
config:
- subnet: 2001:db8::/64
```
## 3. SSL_CERT_NOT_MATCH_DOMAIN_ERROR
部署证书任务报类似 `SSL_CERT_NOT_MATCH_DOMAIN_ERROR`错误
这是由于当前流水线的证书域名与要部署的目标站点的域名不匹配导致的,在申请证书任务中,增加目标站点域名,重新运行流水线即可
## 4. 没有服务器配置文件,请检查是否开启了外网映射!
宝塔网站证书部署报错:`Error: 没有服务器配置文件,请检查是否开启了外网映射!`
解决方案:先手动在宝塔网站中设置一次证书
## 5. 如何查看容器日志
```shell
docker logs -f --tail 200 certd
```
## 6. 容器内走时不准,或者时区不对
走时不准确,慢慢偏差越来越大
或者整个时区都不对
可以尝试挂载localtime文件
```yaml
volumes:
# ↓↓↓↓↓ -------------------- 如果走时不准请尝试挂载localtime文件
- /etc/localtime:/etc/localtime
- /etc/timezone:/etc/timezone
```

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

View File

@@ -0,0 +1,10 @@
# 二级子域名托管
如果你的域名是免费的二级域名比如sub.handsfree.work托管在CF或者阿里云上
在使用DNS方式校验时需要设置子域名托管
[阿里云子域名托管说明](https://help.aliyun.com/zh/dns/pubz-subdomain-management)
![img.png](./images/subdomain1.png)
![img_1.png](./images/subdomain2.png)

View File

@@ -9,5 +9,5 @@
} }
}, },
"npmClient": "pnpm", "npmClient": "pnpm",
"version": "1.36.17" "version": "1.36.19"
} }

View File

@@ -3,6 +3,16 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/publishlab/node-acme-client/compare/v1.36.18...v1.36.19) (2025-09-05)
### Performance Improvements
* 支持ssl.com证书颁发机构 ([27b6dfa](https://github.com/publishlab/node-acme-client/commit/27b6dfa4d2ab3bddd284c3a34511a72e1a513a4c))
## [1.36.18](https://github.com/publishlab/node-acme-client/compare/v1.36.17...v1.36.18) (2025-08-28)
**Note:** Version bump only for package @certd/acme-client
## [1.36.17](https://github.com/publishlab/node-acme-client/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/publishlab/node-acme-client/compare/v1.36.16...v1.36.17) (2025-08-17)
**Note:** Version bump only for package @certd/acme-client **Note:** Version bump only for package @certd/acme-client

View File

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

View File

@@ -25,6 +25,10 @@ export const directory = {
staging: 'https://acme.zerossl.com/v2/DV90', staging: 'https://acme.zerossl.com/v2/DV90',
production: 'https://acme.zerossl.com/v2/DV90', production: 'https://acme.zerossl.com/v2/DV90',
}, },
sslcom:{
staging: 'https://acme.ssl.com/sslcom-dv-rsa',
production: 'https://acme.ssl.com/sslcom-dv-rsa',
}
}; };
/** /**

View File

@@ -3,6 +3,20 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
### Bug Fixes
* 修复批量流水线执行时日志显示错乱的问题 ([4372adc](https://github.com/certd/certd/commit/4372adc703b9a4c785664054ab2a533626d815a8))
### Performance Improvements
* 去掉宝塔url后面的斜杠 ([8a0c2b9](https://github.com/certd/certd/commit/8a0c2b9b13628da750c25757e0cb8ed3038775ba))
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
**Note:** Version bump only for package @certd/basic
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
**Note:** Version bump only for package @certd/basic **Note:** Version bump only for package @certd/basic

View File

@@ -1 +1 @@
23:53 00:30

View File

@@ -1,7 +1,7 @@
{ {
"name": "@certd/basic", "name": "@certd/basic",
"private": false, "private": false,
"version": "1.36.17", "version": "1.36.19",
"type": "module", "type": "module",
"main": "./dist/index.js", "main": "./dist/index.js",
"module": "./dist/index.js", "module": "./dist/index.js",
@@ -45,5 +45,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f"
} }

View File

@@ -1,22 +1,4 @@
import log4js, { LoggingEvent, Logger } from "log4js"; import log4js, { CallStack, Level } from "log4js";
const OutputAppender = {
configure: (config: any, layouts: any, findAppender: any, levels: any) => {
let layout = layouts.basicLayout;
if (config.layout) {
layout = layouts.layout(config.layout.type, config.layout);
}
function customAppender(layout: any, timezoneOffset: any) {
return (loggingEvent: LoggingEvent) => {
if (loggingEvent.context.outputHandler?.write) {
const text = `${layout(loggingEvent, timezoneOffset)}\n`;
loggingEvent.context.outputHandler.write(text);
}
};
}
return customAppender(layout, config.timezoneOffset);
},
};
let logFilePath = "./logs/app.log"; let logFilePath = "./logs/app.log";
export function resetLogConfigure() { export function resetLogConfigure() {
@@ -24,7 +6,6 @@ export function resetLogConfigure() {
log4js.configure({ log4js.configure({
appenders: { appenders: {
std: { type: "stdout" }, std: { type: "stdout" },
output: { type: OutputAppender },
file: { file: {
type: "dateFile", type: "dateFile",
filename: logFilePath, filename: logFilePath,
@@ -33,7 +14,7 @@ export function resetLogConfigure() {
numBackups: 3, numBackups: 3,
}, },
}, },
categories: { default: { appenders: ["std", "file"], level: "info" }, pipeline: { appenders: ["std", "file", "output"], level: "info" } }, categories: { default: { appenders: ["std", "file"], level: "info" }, pipeline: { appenders: ["std", "file"], level: "info" } },
}); });
} }
resetLogConfigure(); resetLogConfigure();
@@ -44,15 +25,98 @@ export function resetLogFilePath(filePath: string) {
resetLogConfigure(); resetLogConfigure();
} }
export function buildLogger(write: (text: string) => void) { export function buildLogger(write: (text: string) => void) {
const logger = log4js.getLogger("pipeline"); return new PipelineLogger("pipeline", write);
const _secrets: string[] = []; }
//@ts-ignore
logger.addSecret = (secret: string) => { export type ILogger = {
_secrets.push(secret); readonly category: string;
}; level: Level | string;
logger.addContext("outputHandler", { log(level: Level | string, ...args: any[]): void;
write: (text: string) => {
for (const item of _secrets) { isLevelEnabled(level?: string): boolean;
isTraceEnabled(): boolean;
isDebugEnabled(): boolean;
isInfoEnabled(): boolean;
isWarnEnabled(): boolean;
isErrorEnabled(): boolean;
isFatalEnabled(): boolean;
_log(level: Level, data: any): void;
addContext(key: string, value: any): void;
removeContext(key: string): void;
clearContext(): void;
/**
* Replace the basic parse function with a new custom one
* - Note that linesToSkip will be based on the origin of the Error object in addition to the callStackLinesToSkip (at least 1)
* @param parseFunction the new parseFunction. Use `undefined` to reset to the base implementation
*/
setParseCallStackFunction(parseFunction: (error: Error, linesToSkip: number) => CallStack | undefined): void;
/**
* Adjust the value of linesToSkip when the parseFunction is called.
*
* Cannot be less than 0.
*/
callStackLinesToSkip: number;
trace(message: any, ...args: any[]): void;
debug(message: any, ...args: any[]): void;
info(message: any, ...args: any[]): void;
warn(message: any, ...args: any[]): void;
error(message: any, ...args: any[]): void;
fatal(message: any, ...args: any[]): void;
mark(message: any, ...args: any[]): void;
};
const locale = Intl.DateTimeFormat().resolvedOptions().locale;
const formatter = new Intl.DateTimeFormat(locale, {
year: "numeric",
month: "2-digit",
day: "2-digit",
hour: "2-digit",
minute: "2-digit",
second: "2-digit",
hour12: false,
});
function formatDateIntl(date = new Date()) {
const milliseconds = date.getMilliseconds(); // 获取毫秒
const formattedMilliseconds = milliseconds.toString().padStart(3, "0");
return formatter.format(date) + "." + formattedMilliseconds;
}
// @ts-ignore
export class PipelineLogger implements ILogger {
callStackLinesToSkip: number = 3;
readonly category: string = "pipeline";
level: Level | string = "info";
_secrets: string[] = [];
logger: ILogger;
customWriter!: (text: string) => void;
constructor(name: string, write: (text: string) => void) {
this.customWriter = write;
this.logger = log4js.getLogger(name);
}
addSecret(secret: string) {
this._secrets.push(secret);
}
_doLog(level: string, ...args: any[]) {
let text = args.join(" ");
if (this.customWriter) {
for (const item of this._secrets) {
if (item == null) { if (item == null) {
continue; continue;
} }
@@ -66,10 +130,88 @@ export function buildLogger(write: (text: string) => void) {
text = text.replaceAll(item, "*".repeat(item.length)); text = text.replaceAll(item, "*".repeat(item.length));
} }
} }
write(text); text = `[${formatDateIntl()}] [${level.toUpperCase()}] - ${text} \n`;
}, this.customWriter(text);
}); }
return logger; // @ts-ignore
} this.logger[level](...args);
}
export type ILogger = Logger; _log(level: Level, data: any): void {}
addContext(key: string, value: any): void {}
clearContext(): void {}
debug(message: any, ...args: any[]): void {
if (this.isDebugEnabled()) {
this._doLog("debug", message, ...args);
}
}
error(message: any, ...args: any[]): void {
if (this.isErrorEnabled()) {
this._doLog("error", message, ...args);
}
}
fatal(message: any, ...args: any[]): void {
if (this.isFatalEnabled()) {
this._doLog("fatal", message, ...args);
}
}
info(message: any, ...args: any[]): void {
if (this.isInfoEnabled()) {
this._doLog("info", message, ...args);
}
}
trace(message: any, ...args: any[]): void {
if (this.isTraceEnabled()) {
this._doLog("trace", message, ...args);
}
}
warn(message: any, ...args: any[]): void {
if (this.isWarnEnabled()) {
this._doLog("warn", message, ...args);
}
}
isDebugEnabled(): boolean {
return logger.isDebugEnabled();
}
isErrorEnabled(): boolean {
return logger.isErrorEnabled();
}
isFatalEnabled(): boolean {
return logger.isFatalEnabled();
}
isInfoEnabled(): boolean {
return logger.isInfoEnabled();
}
isLevelEnabled(level?: string): boolean {
return logger.isLevelEnabled();
}
isTraceEnabled(): boolean {
return logger.isTraceEnabled();
}
isWarnEnabled(): boolean {
return logger.isWarnEnabled();
}
log(level: Level | string, ...args: any[]): void {}
mark(message: any, ...args: any[]): void {}
removeContext(key: string): void {}
setParseCallStackFunction(parseFunction: (error: Error, linesToSkip: number) => CallStack | undefined): void {}
}

View File

@@ -1,6 +1,5 @@
import axios, { AxiosHeaders, AxiosRequestConfig } from "axios"; import axios, { AxiosHeaders, AxiosRequestConfig } from "axios";
import { ILogger, logger } from "./util.log.js"; import { ILogger, logger } from "./util.log.js";
import { Logger } from "log4js";
import { HttpProxyAgent } from "http-proxy-agent"; import { HttpProxyAgent } from "http-proxy-agent";
import { HttpsProxyAgent } from "https-proxy-agent"; import { HttpsProxyAgent } from "https-proxy-agent";
import nodeHttp from "http"; import nodeHttp from "http";
@@ -84,7 +83,7 @@ export function getGlobalAgents() {
/** /**
* @description 创建请求实例 * @description 创建请求实例
*/ */
export function createAxiosService({ logger }: { logger: Logger }) { export function createAxiosService({ logger }: { logger: ILogger }) {
// 创建一个 axios 实例 // 创建一个 axios 实例
const service = axios.create(); const service = axios.create();

View File

@@ -3,6 +3,21 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
### Bug Fixes
* 前置任务输出不存在时输出警告提示 ([b59052c](https://github.com/certd/certd/commit/b59052cc43b7b070fabd8b8e914e4c2a5e0ad61c))
### Performance Improvements
* 支持godaddy ([b7980aa](https://github.com/certd/certd/commit/b7980aad5ab50f58662eaddf5d84aa82876a98eb))
* 支持ssl.com证书颁发机构 ([27b6dfa](https://github.com/certd/certd/commit/27b6dfa4d2ab3bddd284c3a34511a72e1a513a4c))
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
**Note:** Version bump only for package @certd/pipeline
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
**Note:** Version bump only for package @certd/pipeline **Note:** Version bump only for package @certd/pipeline

View File

@@ -1,7 +1,7 @@
{ {
"name": "@certd/pipeline", "name": "@certd/pipeline",
"private": false, "private": false,
"version": "1.36.17", "version": "1.36.19",
"type": "module", "type": "module",
"main": "./dist/index.js", "main": "./dist/index.js",
"module": "./dist/index.js", "module": "./dist/index.js",
@@ -17,8 +17,8 @@
"pub": "npm publish" "pub": "npm publish"
}, },
"dependencies": { "dependencies": {
"@certd/basic": "^1.36.17", "@certd/basic": "^1.36.19",
"@certd/plus-core": "^1.36.17", "@certd/plus-core": "^1.36.19",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"reflect-metadata": "^0.1.13" "reflect-metadata": "^0.1.13"
@@ -44,5 +44,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f"
} }

View File

@@ -21,9 +21,9 @@ export type PageRes = {
export class Pager { export class Pager {
pageNo: number; pageNo: number;
pageSize: number; pageSize: number;
constructor(req: PageSearch) { constructor(req?: PageSearch) {
this.pageNo = req.pageNo ?? 1; this.pageNo = req?.pageNo ?? 1;
this.pageSize = req.pageSize || 50; this.pageSize = req?.pageSize || 50;
} }
getOffset() { getOffset() {

View File

@@ -314,7 +314,7 @@ export class Executor {
const outputKey = arr[2]; const outputKey = arr[2];
input[key] = this.currentStatusMap.get(id)?.status?.output[outputKey] ?? this.lastStatusMap.get(id)?.status?.output[outputKey]; input[key] = this.currentStatusMap.get(id)?.status?.output[outputKey] ?? this.lastStatusMap.get(id)?.status?.output[outputKey];
if (input[key] == null) { if (input[key] == null) {
this.logger.warn(`${item.title}的配置未找到对应的输出值,请确认对应的前置任务是否存在或者是否执行正确`); currentLogger.warn(`${item.title}的配置未找到对应的输出值,请确认对应的前置任务是否存在或者是否执行正确`);
} }
} }
} }

View File

@@ -253,9 +253,9 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
return name + "_" + dayjs().format("YYYYMMDDHHmmssSSS"); return name + "_" + dayjs().format("YYYYMMDDHHmmssSSS");
} }
buildCertName(domain: string) { buildCertName(domain: string, prefix = "") {
domain = domain.replaceAll("*", "_").replaceAll(".", "_"); domain = domain.replaceAll("*", "_").replaceAll(".", "_");
return `${domain}_${dayjs().format("YYYYMMDDHHmmssSSS")}`; return `${prefix}_${domain}_${dayjs().format("YYYYMMDDHHmmssSSS")}`;
} }
async onRequest(req: PluginRequestHandleReq<any>) { async onRequest(req: PluginRequestHandleReq<any>) {

View File

@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
**Note:** Version bump only for package @certd/lib-huawei
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
**Note:** Version bump only for package @certd/lib-huawei
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
**Note:** Version bump only for package @certd/lib-huawei **Note:** Version bump only for package @certd/lib-huawei

View File

@@ -1,7 +1,7 @@
{ {
"name": "@certd/lib-huawei", "name": "@certd/lib-huawei",
"private": false, "private": false,
"version": "1.36.17", "version": "1.36.19",
"main": "./dist/bundle.js", "main": "./dist/bundle.js",
"module": "./dist/bundle.js", "module": "./dist/bundle.js",
"types": "./dist/d/index.d.ts", "types": "./dist/d/index.d.ts",
@@ -24,5 +24,5 @@
"prettier": "^2.8.8", "prettier": "^2.8.8",
"tslib": "^2.8.1" "tslib": "^2.8.1"
}, },
"gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f"
} }

View File

@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
**Note:** Version bump only for package @certd/lib-iframe
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
**Note:** Version bump only for package @certd/lib-iframe
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
**Note:** Version bump only for package @certd/lib-iframe **Note:** Version bump only for package @certd/lib-iframe

View File

@@ -1,7 +1,7 @@
{ {
"name": "@certd/lib-iframe", "name": "@certd/lib-iframe",
"private": false, "private": false,
"version": "1.36.17", "version": "1.36.19",
"type": "module", "type": "module",
"main": "./dist/index.js", "main": "./dist/index.js",
"module": "./dist/index.js", "module": "./dist/index.js",
@@ -31,5 +31,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f"
} }

View File

@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
**Note:** Version bump only for package @certd/jdcloud
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
**Note:** Version bump only for package @certd/jdcloud
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
**Note:** Version bump only for package @certd/jdcloud **Note:** Version bump only for package @certd/jdcloud

View File

@@ -1,6 +1,6 @@
{ {
"name": "@certd/jdcloud", "name": "@certd/jdcloud",
"version": "1.36.17", "version": "1.36.19",
"description": "jdcloud openApi sdk", "description": "jdcloud openApi sdk",
"main": "./dist/bundle.js", "main": "./dist/bundle.js",
"module": "./dist/bundle.js", "module": "./dist/bundle.js",
@@ -61,5 +61,5 @@
"fetch" "fetch"
] ]
}, },
"gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f"
} }

View File

@@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
### Bug Fixes
* 修复远程数据选择无法过滤的bug ([6cbb073](https://github.com/certd/certd/commit/6cbb0739f8428d51b0712f718fe4d236cc087cf9))
### Performance Improvements
* 创建k8s secret 时设置type为tls ([79ebabf](https://github.com/certd/certd/commit/79ebabfcfb9e5a534049c84f5f1a642b357fc856))
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
### Performance Improvements
* 部署到k8s支持自动创建secret ([c09c962](https://github.com/certd/certd/commit/c09c962cb676ca261610aa9f3e5105c9dae43f43))
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
**Note:** Version bump only for package @certd/lib-k8s **Note:** Version bump only for package @certd/lib-k8s

View File

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

View File

@@ -1,7 +1,7 @@
import { CoreV1Api, KubeConfig, NetworkingV1Api, V1Ingress, V1Secret } from "@kubernetes/client-node"; import { CoreV1Api, KubeConfig, NetworkingV1Api, V1Ingress, V1Secret } from "@kubernetes/client-node";
import dns from "dns"; import dns from "dns";
import { ILogger } from "@certd/basic"; import { ILogger } from "@certd/basic";
import _ from "lodash-es"; import { merge } from "lodash-es";
export type K8sClientOpts = { export type K8sClientOpts = {
kubeConfigStr: string; kubeConfigStr: string;
@@ -90,7 +90,7 @@ export class K8sClient {
async createSecret(opts: { namespace: string; body: V1Secret }) { async createSecret(opts: { namespace: string; body: V1Secret }) {
const namespace = opts.namespace || "default"; const namespace = opts.namespace || "default";
const created = await this.client.createNamespacedSecret(namespace, opts.body); const created = await this.client.createNamespacedSecret(namespace, opts.body);
this.logger.info("new secrets:", opts.body); this.logger.info("new secrets:", opts.body.metadata);
return created.body; return created.body;
} }
@@ -103,17 +103,39 @@ export class K8sClient {
// return await this.client.replaceNamespacedSecret(secretName, namespace, opts.body); // return await this.client.replaceNamespacedSecret(secretName, namespace, opts.body);
// } // }
async patchSecret(opts: { namespace: string; secretName: string; body: V1Secret }) { async patchSecret(opts: { namespace: string; secretName: string; body: V1Secret; createOnNotFound?: boolean }) {
const namespace = opts.namespace || "default"; const namespace = opts.namespace || "default";
const secretName = opts.secretName; const secretName = opts.secretName;
if (secretName == null) { if (secretName == null) {
throw new Error("secretName 不能为空"); throw new Error("secretName 不能为空");
} }
this.logger.info("patch secret:", secretName, namespace); this.logger.info("patch secret:", secretName, namespace);
const oldSecret = await this.client.readNamespacedSecret(secretName, namespace); let oldSecret: any = null;
const newSecret = _.merge(oldSecret.body, opts.body); try {
oldSecret = await this.client.readNamespacedSecret(secretName, namespace);
} catch (e) {
//@ts-ignore
if (e.response?.body?.code === 404) {
this.logger.warn(`secret ${secretName} 不存在`);
if (opts.createOnNotFound) {
//没有找到,则创建
const body = merge(
{
type: "type: kubernetes.io/tls",
},
opts.body
);
const res = await this.createSecret({ namespace, body });
this.logger.info(`secret ${secretName} 已创建`);
return res;
}
}
throw e;
}
const newSecret = merge(oldSecret.body, opts.body);
const res = await this.client.replaceNamespacedSecret(secretName, namespace, newSecret); const res = await this.client.replaceNamespacedSecret(secretName, namespace, newSecret);
this.logger.info("secret updated"); this.logger.info(`secret ${secretName} 已更新`);
return res.body; return res.body;
} }
@@ -145,7 +167,7 @@ export class K8sClient {
this.logger.info("patch ingress:", ingressName, namespace); this.logger.info("patch ingress:", ingressName, namespace);
const client = this.kubeconfig.makeApiClient(NetworkingV1Api); const client = this.kubeconfig.makeApiClient(NetworkingV1Api);
const oldIngress = await client.readNamespacedIngress(ingressName, namespace); const oldIngress = await client.readNamespacedIngress(ingressName, namespace);
const newIngress = _.merge(oldIngress.body, opts.body); const newIngress = merge(oldIngress.body, opts.body);
const res = await client.replaceNamespacedIngress(ingressName, namespace, newIngress); const res = await client.replaceNamespacedIngress(ingressName, namespace, newIngress);
this.logger.info("ingress patched", opts.body); this.logger.info("ingress patched", opts.body);
return res; return res;

View File

@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
**Note:** Version bump only for package @certd/lib-server
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
**Note:** Version bump only for package @certd/lib-server
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
**Note:** Version bump only for package @certd/lib-server **Note:** Version bump only for package @certd/lib-server

View File

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

View File

@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
**Note:** Version bump only for package @certd/midway-flyway-js **Note:** Version bump only for package @certd/midway-flyway-js

View File

@@ -1,6 +1,6 @@
{ {
"name": "@certd/midway-flyway-js", "name": "@certd/midway-flyway-js",
"version": "1.36.17", "version": "1.36.19",
"description": "midway with flyway, sql upgrade way ", "description": "midway with flyway, sql upgrade way ",
"private": false, "private": false,
"type": "module", "type": "module",
@@ -46,5 +46,5 @@
"typeorm": "^0.3.11", "typeorm": "^0.3.11",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f"
} }

View File

@@ -3,6 +3,20 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
### Performance Improvements
* 支持ssl.com证书颁发机构 ([27b6dfa](https://github.com/certd/certd/commit/27b6dfa4d2ab3bddd284c3a34511a72e1a513a4c))
* 子域名托管说明 ([39a0223](https://github.com/certd/certd/commit/39a02235cf4416bb5bd1acd3831241efeaa2f602))
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
### Performance Improvements
* 支持p7b证书格式 ([d9f4a57](https://github.com/certd/certd/commit/d9f4a5793d68a017a5d80ad5385cbda603c4e165))
* openapi返回证书时挑选匹配范围最小的那一个增加format参数增加返回值p7b格式增加detail返回 ([2085bcc](https://github.com/certd/certd/commit/2085bcceb61c3723c9bdfec4c4cc0917631ff5e5))
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
### Performance Improvements ### Performance Improvements

View File

@@ -1,7 +1,7 @@
{ {
"name": "@certd/plugin-cert", "name": "@certd/plugin-cert",
"private": false, "private": false,
"version": "1.36.17", "version": "1.36.19",
"type": "module", "type": "module",
"main": "./dist/index.js", "main": "./dist/index.js",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
@@ -16,10 +16,10 @@
"pub": "npm publish" "pub": "npm publish"
}, },
"dependencies": { "dependencies": {
"@certd/acme-client": "^1.36.17", "@certd/acme-client": "^1.36.19",
"@certd/basic": "^1.36.17", "@certd/basic": "^1.36.19",
"@certd/pipeline": "^1.36.17", "@certd/pipeline": "^1.36.19",
"@certd/plugin-lib": "^1.36.17", "@certd/plugin-lib": "^1.36.19",
"@google-cloud/publicca": "^1.3.0", "@google-cloud/publicca": "^1.3.0",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"jszip": "^3.10.1", "jszip": "^3.10.1",
@@ -43,5 +43,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f"
} }

View File

@@ -12,7 +12,7 @@ export class EabAccess extends BaseAccess {
component: { component: {
placeholder: "kid / keyId", placeholder: "kid / keyId",
}, },
helper: "EAB KID google的叫 keyId", helper: "EAB KID google的叫 keyIdssl.com的叫Account/ACME Key",
required: true, required: true,
encrypt: true, encrypt: true,
}) })

View File

@@ -50,7 +50,7 @@ export type CertInfo = {
one?: string; one?: string;
p7b?: string; p7b?: string;
}; };
export type SSLProvider = "letsencrypt" | "google" | "zerossl"; export type SSLProvider = "letsencrypt" | "google" | "zerossl" | "sslcom";
export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521"; export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521";
type AcmeServiceOptions = { type AcmeServiceOptions = {
userContext: IContext; userContext: IContext;
@@ -373,6 +373,7 @@ export class AcmeService {
commonName, commonName,
...csrInfo, ...csrInfo,
altNames, altNames,
emailAddress: email,
}, },
privateKey privateKey
); );

View File

@@ -28,7 +28,7 @@ export abstract class CertApplyBaseConvertPlugin extends AbstractTaskPlugin {
"2、子域名被通配符包含的不要填写例如www.foo.com已经被*.foo.com包含不要填写www.foo.com\n" + "2、子域名被通配符包含的不要填写例如www.foo.com已经被*.foo.com包含不要填写www.foo.com\n" +
"3、泛域名只能通配*号那一级(*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com\n" + "3、泛域名只能通配*号那一级(*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com\n" +
"4、输入一个空格之后再输入下一个 \n" + "4、输入一个空格之后再输入下一个 \n" +
"5、如果您配置了子域托管解析,请先[设置托管子域名](#/certd/pipeline/subDomain)", "5、如果置了子域托管解析比如免费的二级域名托管在CF或者阿里云,请先[设置托管子域名](#/certd/pipeline/subDomain)",
}) })
domains!: string[]; domains!: string[];

View File

@@ -21,6 +21,15 @@ export type CertReaderHandleContext = {
}; };
export type CertReaderHandle = (ctx: CertReaderHandleContext) => Promise<void>; export type CertReaderHandle = (ctx: CertReaderHandleContext) => Promise<void>;
export type HandleOpts = { logger: ILogger; handle: CertReaderHandle }; export type HandleOpts = { logger: ILogger; handle: CertReaderHandle };
const formats = {
pem: ["crt", "key", "ic"],
one: ["one"],
pfx: ["pfx"],
der: ["der"],
jks: ["jks"],
p7b: ["p7b", "key"],
};
export class CertReader { export class CertReader {
cert: CertInfo; cert: CertInfo;
@@ -74,8 +83,17 @@ export class CertReader {
return arr[0] + endStr; return arr[0] + endStr;
} }
toCertInfo(): CertInfo { toCertInfo(format?: string): CertInfo {
return this.cert; if (!format) {
return this.cert;
}
const formatArr = formats[format];
const res: any = {};
formatArr.forEach((key: string) => {
res[key] = this.cert[key];
});
return res;
} }
getCrtDetail(crt: string = this.cert.crt) { getCrtDetail(crt: string = this.cert.crt) {
@@ -203,10 +221,10 @@ export class CertReader {
return `${prefix}_${domain}_${timeStr}.${suffix}`; return `${prefix}_${domain}_${timeStr}.${suffix}`;
} }
buildCertName() { buildCertName(prefix: string = "") {
let domain = this.getMainDomain(); let domain = this.getMainDomain();
domain = domain.replaceAll(".", "_").replaceAll("*", "_"); domain = domain.replaceAll(".", "_").replaceAll("*", "_");
return `${domain}_${dayjs().format("YYYYMMDDHHmmssSSS")}`; return `${prefix}_${domain}_${dayjs().format("YYYYMMDDHHmmssSSS")}`;
} }
static appendTimeSuffix(name?: string) { static appendTimeSuffix(name?: string) {

View File

@@ -89,6 +89,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
{ value: "letsencrypt", label: "Let's Encrypt", icon: "simple-icons:letsencrypt" }, { value: "letsencrypt", label: "Let's Encrypt", icon: "simple-icons:letsencrypt" },
{ value: "google", label: "Google", icon: "flat-color-icons:google" }, { value: "google", label: "Google", icon: "flat-color-icons:google" },
{ value: "zerossl", label: "ZeroSSL", icon: "emojione:digit-zero" }, { value: "zerossl", label: "ZeroSSL", icon: "emojione:digit-zero" },
{ value: "sslcom", label: "SSL.com仅主域名和www免费", icon: "la:expeditedssl" },
], ],
}, },
helper: "Let's Encrypt申请最简单\nGoogle大厂光环兼容性好仅首次需要翻墙获取EAB授权\nZeroSSL需要EAB授权无需翻墙", helper: "Let's Encrypt申请最简单\nGoogle大厂光环兼容性好仅首次需要翻墙获取EAB授权\nZeroSSL需要EAB授权无需翻墙",
@@ -104,7 +105,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
mergeScript: ` mergeScript: `
return { return {
show: ctx.compute(({form})=>{ show: ctx.compute(({form})=>{
return form.challengeType === 'dns' return form.challengeType === 'dns'
}), }),
component:{ component:{
onSelectedChange: ctx.compute(({form})=>{ onSelectedChange: ctx.compute(({form})=>{
@@ -137,7 +138,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
}) })
}, },
show: ctx.compute(({form})=>{ show: ctx.compute(({form})=>{
return form.challengeType === 'dns' return form.challengeType === 'dns'
}) })
} }
`, `,
@@ -194,6 +195,13 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
}) })
zerosslCommonEabAccessId!: number; zerosslCommonEabAccessId!: number;
@TaskInput({
title: "SSL.com公共EAB授权",
isSys: true,
show: false,
})
sslcomCommonEabAccessId!: number;
@TaskInput({ @TaskInput({
title: "EAB授权", title: "EAB授权",
component: { component: {
@@ -203,11 +211,16 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
maybeNeed: true, maybeNeed: true,
required: false, required: false,
helper: helper:
"需要提供EAB授权\nZeroSSL请前往[zerossl开发者中心](https://app.zerossl.com/developer),生成 'EAB Credentials'\n Google:请查看[google获取eab帮助文档](https://certd.docmirror.cn/guide/use/google/)用过一次后会绑定邮箱后续复用EAB要用同一个邮箱", "需要提供EAB授权" +
"\nZeroSSL请前往[zerossl开发者中心](https://app.zerossl.com/developer),生成 'EAB Credentials'" +
"\nGoogle:请查看[google获取eab帮助文档](https://certd.docmirror.cn/guide/use/google/)用过一次后会绑定邮箱后续复用EAB要用同一个邮箱" +
"\nSSL.com:[SSL.com账号页面](https://secure.ssl.com/account),然后点击api credentials链接然后点击编辑按钮查看Secret key和HMAC key",
mergeScript: ` mergeScript: `
return { return {
show: ctx.compute(({form})=>{ show: ctx.compute(({form})=>{
return (form.sslProvider === 'zerossl' && !form.zerosslCommonEabAccessId) || (form.sslProvider === 'google' && !form.googleCommonEabAccessId) return (form.sslProvider === 'zerossl' && !form.zerosslCommonEabAccessId)
|| (form.sslProvider === 'google' && !form.googleCommonEabAccessId)
|| (form.sslProvider === 'sslcom' && !form.sslcomCommonEabAccessId)
}) })
} }
`, `,
@@ -339,8 +352,8 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
async onInit() { async onInit() {
let eab: EabAccess = null; let eab: EabAccess = null;
if (this.sslProvider === "google") { if (this.sslProvider !== "letsencrypt") {
if (this.googleAccessId) { if (this.sslProvider === "google" && this.googleAccessId) {
this.logger.info("当前正在使用 google服务账号授权获取EAB"); this.logger.info("当前正在使用 google服务账号授权获取EAB");
const googleAccess = await this.getAccess(this.googleAccessId); const googleAccess = await this.getAccess(this.googleAccessId);
const googleClient = new GoogleClient({ const googleClient = new GoogleClient({
@@ -348,24 +361,19 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
logger: this.logger, logger: this.logger,
}); });
eab = await googleClient.getEab(); eab = await googleClient.getEab();
} else if (this.eabAccessId) {
this.logger.info("当前正在使用 google EAB授权");
eab = await this.getAccess(this.eabAccessId);
} else if (this.googleCommonEabAccessId) {
this.logger.info("当前正在使用 google 公共EAB授权");
eab = await this.getAccess(this.googleCommonEabAccessId, true);
} else { } else {
throw new Error("google需要配置EAB授权或服务账号授权"); const getEab = async (type: string) => {
} if (this.eabAccessId) {
} else if (this.sslProvider === "zerossl") { this.logger.info(`当前正在使用 ${type} EAB授权`);
if (this.eabAccessId) { eab = await this.getAccess(this.eabAccessId);
this.logger.info("当前正在使用 zerossl EAB授权"); } else if (this[`${type}CommonEabAccessId`]) {
eab = await this.getAccess(this.eabAccessId); this.logger.info(`当前正在使用 ${type} 公共EAB授权`);
} else if (this.zerosslCommonEabAccessId) { eab = await this.getAccess(this[`${type}CommonEabAccessId`], true);
this.logger.info("当前正在使用 zerossl 公共EAB授权"); } else {
eab = await this.getAccess(this.zerosslCommonEabAccessId, true); throw new Error(`${type}需要配置EAB授权`);
} else { }
throw new Error("zerossl需要配置EAB授权"); };
await getEab(this.sslProvider);
} }
} }
this.eab = eab; this.eab = eab;
@@ -397,12 +405,12 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
const csrInfo = _.merge( const csrInfo = _.merge(
{ {
country: "CN", // country: "CN",
state: "GuangDong", // state: "GuangDong",
locality: "ShengZhen", // locality: "ShengZhen",
organization: "CertD Org.", // organization: "CertD Org.",
organizationUnit: "IT Department", // organizationUnit: "IT Department",
emailAddress: email, // emailAddress: email,
}, },
this.csrInfo ? JSON.parse(this.csrInfo) : {} this.csrInfo ? JSON.parse(this.csrInfo) : {}
); );

View File

@@ -3,6 +3,20 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
### Performance Improvements
* ssh 增加超时断开连接默认10分钟超时 ([c24a040](https://github.com/certd/certd/commit/c24a040c19cacafc79228d7a7649af93837d94a1))
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
### Performance Improvements
* 腾讯云插件支持国际版 ([58e82d5](https://github.com/certd/certd/commit/58e82d5dbd4ebf089ef239578ef9b68454d17b30))
* 支持部署到阿里云云原生API网关、AI网关 ([2ca20be](https://github.com/certd/certd/commit/2ca20be197720201fceabcce9d927f4dbc1cc872))
* ssh 配置sudo免密提示 ([e1e7011](https://github.com/certd/certd/commit/e1e7011853ad0c5bd7b09c3690861d5aa34b2db4))
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
### Performance Improvements ### Performance Improvements

View File

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

View File

@@ -86,6 +86,15 @@ export class SshAccess extends BaseAccess {
}) })
socksProxy!: string; socksProxy!: string;
@AccessInput({
title: "超时时间",
helper: "执行命令的超时时间,单位秒,默认30分钟",
component: {
name: "a-input-number",
},
})
timeout: number;
@AccessInput({ @AccessInput({
title: "是否Windows", title: "是否Windows",
helper: "如果是Windows主机请勾选此项\n并且需要windows[安装OpenSSH](https://certd.docmirror.cn/guide/use/host/windows.html)", helper: "如果是Windows主机请勾选此项\n并且需要windows[安装OpenSSH](https://certd.docmirror.cn/guide/use/host/windows.html)",
@@ -136,9 +145,10 @@ export class SshAccess extends BaseAccess {
const { SshClient } = await import("./ssh.js"); const { SshClient } = await import("./ssh.js");
const client = new SshClient(this.ctx.logger); const client = new SshClient(this.ctx.logger);
const script = ["echo hello", "exit"];
await client.exec({ await client.exec({
connectConf: this, connectConf: this,
script: "echo hello", script: script,
}); });
return "ok"; return "ok";
} }

View File

@@ -469,7 +469,8 @@ export class SshClient {
async isCmd(conn: AsyncSsh2Client) { async isCmd(conn: AsyncSsh2Client) {
const spec = await conn.exec("echo %COMSPEC% "); const spec = await conn.exec("echo %COMSPEC% ");
if (spec.toString().trim() === "%COMSPEC%") { const ret = spec.toString().trim();
if (ret.includes("%COMSPEC%") && !ret.includes("echo %COMSPEC%")) {
return false; return false;
} else { } else {
return true; return true;
@@ -587,10 +588,15 @@ export class SshClient {
} }
throw e; throw e;
} }
let timeoutId = null;
try { try {
timeoutId = setTimeout(() => {
this.logger.info("执行超时,断开连接");
conn.end();
}, 1000 * (connectConf.timeout || 1800));
return await callable(conn); return await callable(conn);
} finally { } finally {
clearTimeout(timeoutId);
conn.end(); conn.end();
} }
} }

View File

@@ -76,9 +76,26 @@ export class TencentSslClient {
return res; return res;
} }
async DescribeCertificates(params: any) { async DescribeHostUploadUpdateRecordDetail(params: any) {
const client = await this.getSslClient(); const client = await this.getSslClient();
const res = await client.DescribeCertificates(params); const res = await client.request("DescribeHostUploadUpdateRecordDetail", params);
this.checkRet(res);
return res;
}
async UploadUpdateCertificateInstance(params: any) {
const client = await this.getSslClient();
const res = await client.request("UploadUpdateCertificateInstance", params);
this.checkRet(res);
return res;
}
async DescribeCertificates(params: { Limit?: number; Offset?: number; SearchKey?: string }) {
const client = await this.getSslClient();
const res = await client.DescribeCertificates({
ExpirationSort: "ASC",
...params,
});
this.checkRet(res); this.checkRet(res);
return res; return res;
} }

View File

@@ -3,6 +3,35 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
### Bug Fixes
* 修复批量流水线执行时日志显示错乱的问题 ([4372adc](https://github.com/certd/certd/commit/4372adc703b9a4c785664054ab2a533626d815a8))
* 修复远程数据选择无法过滤的bug ([6cbb073](https://github.com/certd/certd/commit/6cbb0739f8428d51b0712f718fe4d236cc087cf9))
* 修复mysql下购买套餐加量包无效的bug ([c26ad4c](https://github.com/certd/certd/commit/c26ad4c8075f0606d45b8da13915737968d6191a))
### Performance Improvements
* 创建证书时支持选择通知时机 ([0e96bfd](https://github.com/certd/certd/commit/0e96bfdfa377824d204e72923d1176408ae6b300))
* 商业版隐藏文档相关链接 ([4443a1c](https://github.com/certd/certd/commit/4443a1c0308fa6b95a05efd73d15d24b65d641c9))
* 商业版隐藏文档相关链接 ([db89561](https://github.com/certd/certd/commit/db8956148083bc4f988226ccf719940d08158a27))
* 支持根据id更新证书证书Id不变接口不过该接口为白名单功能普通腾讯云账户无法使用 ([fe9c4f3](https://github.com/certd/certd/commit/fe9c4f3391ff07c01dd9a252225f69a129c39050))
* 子域名托管说明 ([39a0223](https://github.com/certd/certd/commit/39a02235cf4416bb5bd1acd3831241efeaa2f602))
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
### Bug Fixes
* 修复cron选择组件星期显示错误的bug ([eb75e52](https://github.com/certd/certd/commit/eb75e52278f94a72643f7317e6740fb42666c68a))
### Performance Improvements
* 短信验证码支持腾讯云 ([9108459](https://github.com/certd/certd/commit/9108459ae42bcd95a59acba164a64e82e5f2cfe6))
* 商业版支持自定义插件的参数配置 ([17f23f3](https://github.com/certd/certd/commit/17f23f37516af925d5049291d67d41e4271f81f8))
* 支持p7b证书格式 ([d9f4a57](https://github.com/certd/certd/commit/d9f4a5793d68a017a5d80ad5385cbda603c4e165))
* openapi返回证书时挑选匹配范围最小的那一个增加format参数增加返回值p7b格式增加detail返回 ([2085bcc](https://github.com/certd/certd/commit/2085bcceb61c3723c9bdfec4c4cc0917631ff5e5))
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
**Note:** Version bump only for package @certd/ui-client **Note:** Version bump only for package @certd/ui-client

View File

@@ -1,6 +1,6 @@
{ {
"name": "@certd/ui-client", "name": "@certd/ui-client",
"version": "1.36.17", "version": "1.36.19",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite --open", "dev": "vite --open",
@@ -30,6 +30,7 @@
"@ant-design/icons-vue": "^7.0.1", "@ant-design/icons-vue": "^7.0.1",
"@aws-sdk/client-s3": "^3.535.0", "@aws-sdk/client-s3": "^3.535.0",
"@aws-sdk/s3-request-presigner": "^3.535.0", "@aws-sdk/s3-request-presigner": "^3.535.0",
"@certd/vue-js-cron-light": "^4.0.14",
"@ctrl/tinycolor": "^4.1.0", "@ctrl/tinycolor": "^4.1.0",
"@fast-crud/fast-crud": "^1.25.13", "@fast-crud/fast-crud": "^1.25.13",
"@fast-crud/fast-extends": "^1.25.13", "@fast-crud/fast-extends": "^1.25.13",
@@ -43,7 +44,6 @@
"@tailwindcss/typography": "^0.5.16", "@tailwindcss/typography": "^0.5.16",
"@tanstack/vue-store": "^0.7.0", "@tanstack/vue-store": "^0.7.0",
"@vee-validate/zod": "^4.15.0", "@vee-validate/zod": "^4.15.0",
"@certd/vue-js-cron-light": "^4.0.14",
"@vue/shared": "^3.5.13", "@vue/shared": "^3.5.13",
"@vueuse/core": "^10.11.0", "@vueuse/core": "^10.11.0",
"ant-design-vue": "^4.2.6", "ant-design-vue": "^4.2.6",
@@ -103,8 +103,8 @@
"zod-defaults": "^0.1.3" "zod-defaults": "^0.1.3"
}, },
"devDependencies": { "devDependencies": {
"@certd/lib-iframe": "^1.36.17", "@certd/lib-iframe": "^1.36.19",
"@certd/pipeline": "^1.36.17", "@certd/pipeline": "^1.36.19",
"@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-node-resolve": "^15.2.3",
"@types/chai": "^4.3.12", "@types/chai": "^4.3.12",

View File

@@ -66,7 +66,7 @@ const getOptions = async () => {
const input = (pluginType === "plugin" ? form?.input : form) || {}; const input = (pluginType === "plugin" ? form?.input : form) || {};
for (let key in define.input) { for (let key in define.input) {
const inWatches = props.watches.includes(key); const inWatches = props.watches?.includes(key);
const inputDefine = define.input[key]; const inputDefine = define.input[key];
if (inWatches && inputDefine.required) { if (inWatches && inputDefine.required) {
const value = input[key]; const value = input[key];

View File

@@ -105,7 +105,7 @@ const getOptions = async () => {
const input = (pluginType === "plugin" ? form?.input : form) || {}; const input = (pluginType === "plugin" ? form?.input : form) || {};
for (let key in define.input) { for (let key in define.input) {
const inWatches = props.watches.includes(key); const inWatches = props.watches?.includes(key);
const inputDefine = define.input[key]; const inputDefine = define.input[key];
if (inWatches && inputDefine.required) { if (inWatches && inputDefine.required) {
const value = input[key]; const value = input[key];
@@ -169,7 +169,7 @@ const getOptions = async () => {
}; };
const filterOption = (input: string, option: any) => { const filterOption = (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 || String(option.value).toLowerCase().indexOf(input.toLowerCase()); return option.label.toLowerCase().includes(input.toLowerCase()) || String(option.value).toLowerCase().includes(input.toLowerCase());
}; };
async function onClick() { async function onClick() {

View File

@@ -0,0 +1,192 @@
<template>
<div class="remote-select">
<div class="flex flex-row">
<a-tree-select class="remote-tree-select-input" :tree-data="optionsRef" :value="value" tree-checkable allow-clear v-bind="attrs" @click="onClick" @update:value="emit('update:value', $event)"> </a-tree-select>
<div class="ml-5">
<fs-button :loading="loading" title="刷新选项" icon="ion:refresh-outline" @click="refreshOptions"></fs-button>
</div>
</div>
<div class="helper" :class="{ error: hasError }">
{{ message }}
</div>
</div>
</template>
<script setup lang="ts">
import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
import { PluginDefine } from "@certd/pipeline";
defineOptions({
name: "RemoteTreeSelect",
});
const props = defineProps<
{
watches: string[];
search?: boolean;
pager?: boolean;
} & ComponentPropsType
>();
const emit = defineEmits<{
"update:value": any;
}>();
const attrs = useAttrs();
const getCurrentPluginDefine: any = inject("getCurrentPluginDefine", () => {
return {};
});
const getScope: any = inject("get:scope", () => {
return {};
});
const getPluginType: any = inject("get:plugin:type", () => {
return "plugin";
});
const searchKeyRef = ref("");
const optionsRef = ref([]);
const message = ref("");
const hasError = ref(false);
const loading = ref(false);
const pagerRef: Ref = ref({
current: 1,
});
const getOptions = async () => {
debugger;
if (loading.value) {
return;
}
if (!getCurrentPluginDefine) {
return;
}
const define: PluginDefine = getCurrentPluginDefine()?.value;
if (!define) {
return;
}
const pluginType = getPluginType();
const { form } = getScope();
const input = (pluginType === "plugin" ? form?.input : form) || {};
for (let key in define.input) {
const inWatches = props.watches?.includes(key);
const inputDefine = define.input[key];
if (inWatches && inputDefine.required) {
const value = input[key];
if (value == null || value === "") {
console.log("remote-select required", key);
return;
}
}
}
message.value = "";
hasError.value = false;
loading.value = true;
const pageNo = pagerRef.value.pageNo;
const pageSize = pagerRef.value.pageSize;
try {
const res = await doRequest(
{
type: pluginType,
typeName: form.type,
action: props.action,
input,
data: {
searchKey: props.search ? searchKeyRef.value : "",
pageNo,
pageSize,
},
},
{
onError(err: any) {
hasError.value = true;
message.value = `获取选项出错:${err.message}`;
},
showErrorNotify: false,
}
);
const list = res?.list || res || [];
if (list.length > 0) {
message.value = "获取数据成功,请从下拉框中选择";
} else {
message.value = "获取数据成功,没有数据";
}
optionsRef.value = list;
pagerRef.value.total = list.length;
if (props.pager) {
if (res.pageNo != null) {
pagerRef.value.pageNo = res.pageNo ?? 1;
}
if (res.pageSize != null) {
pagerRef.value.pageSize = res.pageSize ?? 100;
}
if (res.total != null) {
pagerRef.value.total = res.total ?? list.length;
}
}
return res;
} finally {
loading.value = false;
}
};
async function onClick() {
if (optionsRef.value?.length === 0) {
await refreshOptions();
}
}
async function refreshOptions() {
await getOptions();
}
async function doSearch() {
pagerRef.value.pageNo = 1;
await refreshOptions();
}
watch(
() => {
const pluginType = getPluginType();
const { form, key } = getScope();
const input = (pluginType === "plugin" ? form?.input : form) || {};
const watches = {};
for (const key of props.watches) {
//@ts-ignore
watches[key] = input[key];
}
return {
form: watches,
key,
};
},
async (value, oldValue) => {
const { form } = value;
const oldForm: any = oldValue?.form;
let changed = oldForm == null || optionsRef.value.length == 0;
for (const key of props.watches) {
//@ts-ignore
if (oldForm && form[key] != oldForm[key]) {
changed = true;
break;
}
}
if (changed) {
await getOptions();
}
},
{
immediate: true,
}
);
async function onPageChange(current: any) {
await refreshOptions();
}
</script>
<style lang="less"></style>

View File

@@ -2,6 +2,7 @@ import SynologyIdDeviceGetter from "./synology/device-id-getter.vue";
import RemoteAutoComplete from "./common/remote-auto-complete.vue"; import RemoteAutoComplete from "./common/remote-auto-complete.vue";
import RemoteSelect from "./common/remote-select.vue"; import RemoteSelect from "./common/remote-select.vue";
import RemoteInput from "./common/remote-input.vue"; import RemoteInput from "./common/remote-input.vue";
import RemoteTreeSelect from "./common/remote-tree-select.vue";
import CertDomainsGetter from "./common/cert-domains-getter.vue"; import CertDomainsGetter from "./common/cert-domains-getter.vue";
import OutputSelector from "/@/components/plugins/common/output-selector/index.vue"; import OutputSelector from "/@/components/plugins/common/output-selector/index.vue";
import DnsProviderSelector from "/@/components/plugins/cert/dns-provider-selector/index.vue"; import DnsProviderSelector from "/@/components/plugins/cert/dns-provider-selector/index.vue";
@@ -24,6 +25,7 @@ export default {
app.component("SynologyDeviceIdGetter", SynologyIdDeviceGetter); app.component("SynologyDeviceIdGetter", SynologyIdDeviceGetter);
app.component("RemoteAutoComplete", RemoteAutoComplete); app.component("RemoteAutoComplete", RemoteAutoComplete);
app.component("RemoteSelect", RemoteSelect); app.component("RemoteSelect", RemoteSelect);
app.component("RemoteTreeSelect", RemoteTreeSelect);
app.component("RemoteInput", RemoteInput); app.component("RemoteInput", RemoteInput);
app.component("CertDomainsGetter", CertDomainsGetter); app.component("CertDomainsGetter", CertDomainsGetter);
app.component("InputPassword", InputPassword); app.component("InputPassword", InputPassword);

View File

@@ -21,6 +21,7 @@ export default {
pipeline: "Pipeline", pipeline: "Pipeline",
domain: "Domain", domain: "Domain",
deployTimes: "Deployments", deployTimes: "Deployments",
monitorCount: "DomainMonitors",
duration: "Duration", duration: "Duration",
price: "Price", price: "Price",
paymentMethod: "Payment Method", paymentMethod: "Payment Method",
@@ -218,6 +219,7 @@ export default {
triggerCronHelper: triggerCronHelper:
"Click the button above to choose a daily execution time.\nIt is recommended to trigger once per day. The task will be skipped if the certificate has not expired and will not be executed repeatedly.", "Click the button above to choose a daily execution time.\nIt is recommended to trigger once per day. The task will be skipped if the certificate has not expired and will not be executed repeatedly.",
notificationTitle: "Failure Notification", notificationTitle: "Failure Notification",
notificationWhen: "Notification Timing",
notificationHelper: "Get real-time alerts when the task fails", notificationHelper: "Get real-time alerts when the task fails",
groupIdTitle: "Pipeline Group", groupIdTitle: "Pipeline Group",
}, },
@@ -587,6 +589,7 @@ export default {
commFeature: "Commercial feature", commFeature: "Commercial feature",
smsProvider: "SMS provider", smsProvider: "SMS provider",
aliyunSms: "Aliyun SMS", aliyunSms: "Aliyun SMS",
tencentSms: "Tencent SMS",
yfySms: "YFY SMS", yfySms: "YFY SMS",
smsTest: "SMS test", smsTest: "SMS test",
testMobilePlaceholder: "Enter test mobile number", testMobilePlaceholder: "Enter test mobile number",

View File

@@ -25,6 +25,7 @@ export default {
pipeline: "流水线", pipeline: "流水线",
domain: "域名", domain: "域名",
deployTimes: "部署次数", deployTimes: "部署次数",
monitorCount: "域名监控数",
duration: "时长", duration: "时长",
price: "价格", price: "价格",
paymentMethod: "支付方式", paymentMethod: "支付方式",
@@ -223,6 +224,7 @@ export default {
triggerCronTitle: "定时触发", triggerCronTitle: "定时触发",
triggerCronHelper: "点击上面的按钮,选择每天几点定时执行。\n建议设置为每天触发一次证书未到期之前任务会跳过不会重复执行", triggerCronHelper: "点击上面的按钮,选择每天几点定时执行。\n建议设置为每天触发一次证书未到期之前任务会跳过不会重复执行",
notificationTitle: "失败通知", notificationTitle: "失败通知",
notificationWhen: "通知时机",
notificationHelper: "任务执行失败实时提醒", notificationHelper: "任务执行失败实时提醒",
groupIdTitle: "流水线分组", groupIdTitle: "流水线分组",
}, },
@@ -593,6 +595,7 @@ export default {
commFeature: "商业版功能", commFeature: "商业版功能",
smsProvider: "短信提供商", smsProvider: "短信提供商",
aliyunSms: "阿里云短信", aliyunSms: "阿里云短信",
tencentSms: "腾讯云短信",
yfySms: "易发云短信", yfySms: "易发云短信",
smsTest: "短信测试", smsTest: "短信测试",
testMobilePlaceholder: "输入测试手机号", testMobilePlaceholder: "输入测试手机号",

View File

@@ -0,0 +1,12 @@
import { useSettingStore } from "/@/store/settings";
export default {
mounted(el: any, binding: any, vnode: any) {
const settingStore = useSettingStore();
const isComm = settingStore.isComm;
const { value } = binding;
if ((value === false && isComm) || (value === true && !isComm)) {
el.parentNode && el.parentNode.removeChild(el);
}
},
};

View File

@@ -0,0 +1,8 @@
import comm from "./comm-show.js";
const install = function (app: any) {
app.directive("comm", comm);
};
export default {
install,
};

View File

@@ -4,9 +4,12 @@ import FastCrud from "./fast-crud";
import permission from "./permission"; import permission from "./permission";
import { App } from "vue"; import { App } from "vue";
import "./validator/index.js"; import "./validator/index.js";
import directives from "./directive/index";
function install(app: App, options: any = {}) { function install(app: App, options: any = {}) {
app.use(FastCrud, options); app.use(FastCrud, options);
app.use(permission); app.use(permission);
app.use(directives);
} }
export default { export default {

View File

@@ -5,6 +5,7 @@ import { i18n } from "/src/locales/i18n";
import { cloneDeep } from "lodash-es"; import { cloneDeep } from "lodash-es";
interface PluginState { interface PluginState {
group?: PluginGroups; group?: PluginGroups;
originGroup?: PluginGroups;
} }
export type PluginGroup = { export type PluginGroup = {
@@ -55,7 +56,7 @@ export class PluginGroups {
if (this.mergeSetting) { if (this.mergeSetting) {
for (const plugin of groups[key].plugins) { for (const plugin of groups[key].plugins) {
if (plugin.sysSetting) { if (plugin.sysSetting) {
merge(plugin.input, plugin.sysSetting.metadata); merge(plugin.input, plugin.sysSetting.metadata?.input || {});
} }
} }
} }
@@ -166,6 +167,7 @@ export const usePluginStore = defineStore({
}, },
async clear() { async clear() {
this.group = null; this.group = null;
this.originGroup = null
}, },
async getList(): Promise<PluginDefine[]> { async getList(): Promise<PluginDefine[]> {
await this.init(); await this.init();

View File

@@ -4,7 +4,7 @@
<div class="title"> <div class="title">
{{ t("certd.cnameRecord") }} {{ t("certd.cnameRecord") }}
<span class="sub"> <span class="sub">
<a href="https://certd.docmirror.cn/guide/feature/cname/" target="_blank"> <a v-comm="false" href="https://certd.docmirror.cn/guide/feature/cname/" target="_blank">
{{ t("certd.cname_feature_guide") }} {{ t("certd.cname_feature_guide") }}
</a> </a>
</span> </span>

View File

@@ -3,7 +3,7 @@
<template #header> <template #header>
<div class="title">开放接口密钥管理</div> <div class="title">开放接口密钥管理</div>
<div class="more"> <div class="more">
<a :href="OPEN_API_DOC" target="_blank">开放接口文档</a> <a v-comm="false" :href="OPEN_API_DOC" target="_blank">开放接口文档</a>
</div> </div>
</template> </template>
<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud> <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>

View File

@@ -22,7 +22,7 @@ export function fillPipelineByDefaultForm(pipeline: any, form: any) {
if (form.notification != null) { if (form.notification != null) {
notifications.push({ notifications.push({
type: "custom", type: "custom",
when: ["error", "turnToSuccess", "success"], when: form.notificationWhen || ["error", "turnToSuccess"],
notificationId: form.notification, notificationId: form.notification,
title: form.notificationTarget?.name || "自定义通知", title: form.notificationTarget?.name || "自定义通知",
}); });
@@ -223,6 +223,25 @@ export function useCertPipelineCreator() {
helper: t("certd.pipelineForm.notificationHelper"), helper: t("certd.pipelineForm.notificationHelper"),
}, },
}, },
notificationWhen: {
title: t("certd.pipelineForm.notificationWhen"),
type: "text",
form: {
value: ["error", "turnToSuccess"],
component: {
name: "a-select",
vModel: "value",
mode: "multiple",
options: [
{ value: "start", label: t("certd.start_time") },
{ value: "success", label: t("certd.success_time") },
{ value: "turnToSuccess", label: t("certd.fail_to_success_time") },
{ value: "error", label: t("certd.fail_time") },
],
},
order: 102,
},
},
groupId: { groupId: {
title: t("certd.pipelineForm.groupIdTitle"), title: t("certd.pipelineForm.groupIdTitle"),
type: "dict-select", type: "dict-select",
@@ -268,7 +287,7 @@ export function useCertPipelineCreator() {
async function doSubmit({ form }: any) { async function doSubmit({ form }: any) {
// const certDetail = readCertDetail(form.cert.crt); // const certDetail = readCertDetail(form.cert.crt);
// 添加certd pipeline // 添加certd pipeline
const pluginInput = omit(form, ["triggerCron", "notification", "notificationTarget", "certApplyPlugin", "groupId"]); const pluginInput = omit(form, ["triggerCron", "notification", "notificationTarget", "notificationWhen", "certApplyPlugin", "groupId"]);
let pipeline: any = { let pipeline: any = {
title: form.domains[0] + "证书自动化", title: form.domains[0] + "证书自动化",
runnableType: "pipeline", runnableType: "pipeline",

View File

@@ -313,6 +313,8 @@ function useStepForm() {
}; };
const stepDelete = () => { const stepDelete = () => {
//检查输出依赖
Modal.confirm({ Modal.confirm({
title: "确认", title: "确认",
content: `确定要删除此步骤吗?`, content: `确定要删除此步骤吗?`,

View File

@@ -279,7 +279,7 @@
</fs-page> </fs-page>
</template> </template>
<script lang="ts"> <script lang="tsx">
import { computed, defineComponent, onMounted, onUnmounted, provide, ref, Ref, watch } from "vue"; import { computed, defineComponent, onMounted, onUnmounted, provide, ref, Ref, watch } from "vue";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import PiTaskForm from "./component/task-form/index.vue"; import PiTaskForm from "./component/task-form/index.vue";
@@ -758,9 +758,12 @@ export default defineComponent({
//检查输出的stepid是否存在 //检查输出的stepid是否存在
let hasError = false; let hasError = false;
let errorMessage = ""; let errorMessages: any = [];
let errorIndex = 1;
eachSteps(pp, (step: any, task: any, stage: any) => { eachSteps(pp, (step: any, task: any, stage: any) => {
stepIds.push(step.id); if (step.disabled !== true) {
stepIds.push(step.id);
}
if (step.input) { if (step.input) {
for (const key in step.input) { for (const key in step.input) {
const value = step.input[key]; const value = step.input[key];
@@ -775,21 +778,36 @@ export default defineComponent({
const paramName = arr[2]; const paramName = arr[2];
if (!stepIds.includes(stepId)) { if (!stepIds.includes(stepId)) {
hasError = true; hasError = true;
const message = `任务${step.title}的前置输出步骤${paramName}不存在,请重新修改此任务`; const message = `${step.title}的前置输出步骤${paramName}不存在或已被禁用`;
errorIndex++;
addValidateError(task.id, { addValidateError(task.id, {
message, message,
}); });
addValidateError(step.id, { addValidateError(step.id, {
message, message,
}); });
errorMessage += message + ""; errorMessages.push(message);
} }
} }
} }
}); });
if (hasError) { if (hasError) {
notification.error({ message: errorMessage }); notification.error({
message: () => {
const nodes = [];
let i = 0;
for (const error of errorMessages) {
i++;
nodes.push(
<div>
{i}.{error}
</div>
);
}
return nodes;
},
});
throw new Error(errorMessage); throw new Error(errorMessage);
} }
} }

View File

@@ -4,10 +4,14 @@
<div class="title"> <div class="title">
{{ t("certd.subdomainHosting") }} {{ t("certd.subdomainHosting") }}
<span class="sub"> <span class="sub">
{{ t("certd.subdomainHostingHint") }} {{ t("certd.subdomainHelpText") }} {{ t("certd.subdomainHostingHint") }}
<a href="https://help.aliyun.com/zh/dns/subdomain-management" target="_blank">
{{ t("certd.subdomainManagement") }} <span v-comm="false">
</a> {{ t("certd.subdomainHelpText") }}
<a href="https://certd.docmirror.cn/guide/use/cert/subdomain.html" target="_blank">
{{ t("certd.subdomainManagement") }}
</a>
</span>
</span> </span>
</div> </div>
</template> </template>

View File

@@ -1,5 +1,5 @@
<template> <template>
<a-modal v-model:open="openRef" class="order-modal" :title="$t('certd.order.confirmTitle')" @ok="orderCreate"> <a-modal v-model:open="openRef" class="order-modal" :title="$t('certd.order.confirmTitle')" :width="670" @ok="orderCreate">
<div v-if="product" class="order-box"> <div v-if="product" class="order-box">
<div class="flex-o mt-5"> <div class="flex-o mt-5">
<span class="label">{{ $t("certd.order.package") }}</span>{{ product.title }} <span class="label">{{ $t("certd.order.package") }}</span>{{ product.title }}
@@ -13,6 +13,7 @@
<span class="flex-o"> {{ $t("certd.order.pipeline") }}<suite-value class="ml-5" :model-value="product.content.maxPipelineCount" :unit="$t('certd.order.unit.pieces')" /> </span> <span class="flex-o"> {{ $t("certd.order.pipeline") }}<suite-value class="ml-5" :model-value="product.content.maxPipelineCount" :unit="$t('certd.order.unit.pieces')" /> </span>
<span class="flex-o"> {{ $t("certd.order.domain") }}<suite-value class="ml-5" :model-value="product.content.maxDomainCount" :unit="$t('certd.order.unit.count')" /> </span> <span class="flex-o"> {{ $t("certd.order.domain") }}<suite-value class="ml-5" :model-value="product.content.maxDomainCount" :unit="$t('certd.order.unit.count')" /> </span>
<span class="flex-o"> {{ $t("certd.order.deployTimes") }}<suite-value class="ml-5" :model-value="product.content.maxDeployCount" :unit="$t('certd.order.unit.times')" /> </span> <span class="flex-o"> {{ $t("certd.order.deployTimes") }}<suite-value class="ml-5" :model-value="product.content.maxDeployCount" :unit="$t('certd.order.unit.times')" /> </span>
<span class="flex-o"> {{ $t("certd.order.monitorCount") }}<suite-value class="ml-5" :model-value="product.content.maxMonitorCount" :unit="$t('certd.order.unit.times')" /> </span>
</span> </span>
</div> </div>

View File

@@ -11,7 +11,7 @@
@finish="handleFinish" @finish="handleFinish"
@finish-failed="handleFinishFailed" @finish-failed="handleFinishFailed"
> >
<a-tabs v-model:active-key="forgotPasswordType" :destroyInactiveTabPane="true"> <a-tabs v-model:active-key="forgotPasswordType" :destroy-inactive-tab-pane="true">
<a-tab-pane key="email" tab="邮箱找回"> <a-tab-pane key="email" tab="邮箱找回">
<a-form-item has-feedback name="input" label="邮箱"> <a-form-item has-feedback name="input" label="邮箱">
<a-input v-model:value="formState.input" placeholder="邮箱" size="large" autocomplete="off"> <a-input v-model:value="formState.input" placeholder="邮箱" size="large" autocomplete="off">
@@ -21,13 +21,7 @@
</a-input> </a-input>
</a-form-item> </a-form-item>
<a-form-item has-feedback name="validateCode" label="邮件验证码"> <a-form-item has-feedback name="validateCode" label="邮件验证码">
<email-code <email-code v-model:value="formState.validateCode" :img-code="formState.imgCode" :email="formState.input" :random-str="formState.randomStr" verification-type="forgotPassword" />
v-model:value="formState.validateCode"
:img-code="formState.imgCode"
:email="formState.input"
:random-str="formState.randomStr"
verification-type="forgotPassword"
/>
</a-form-item> </a-form-item>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="mobile" tab="手机号找回"> <a-tab-pane key="mobile" tab="手机号找回">
@@ -72,7 +66,7 @@
<a-form-item> <a-form-item>
<a-button type="primary" size="large" html-type="submit" class="submit-button"> 找回密码</a-button> <a-button type="primary" size="large" html-type="submit" class="submit-button"> 找回密码</a-button>
<div class="mt-2"> <div v-comm="false" class="mt-2">
<a href="https://certd.docmirror.cn/guide/use/forgotpasswd/" target="_blank"> 管理员无绑定通信方式或MFA丢失找回 </a> <a href="https://certd.docmirror.cn/guide/use/forgotpasswd/" target="_blank"> 管理员无绑定通信方式或MFA丢失找回 </a>
</div> </div>
</a-form-item> </a-form-item>
@@ -87,7 +81,7 @@ import EmailCode from "/@/views/framework/register/email-code.vue";
import SmsCode from "/@/views/framework/login/sms-code.vue"; import SmsCode from "/@/views/framework/login/sms-code.vue";
import { utils } from "@fast-crud/fast-crud"; import { utils } from "@fast-crud/fast-crud";
import { useUserStore } from "/@/store/user"; import { useUserStore } from "/@/store/user";
import { useSettingStore } from "/@/store/settings";
defineOptions({ defineOptions({
name: "ForgotPasswordPage", name: "ForgotPasswordPage",
}); });
@@ -123,6 +117,7 @@ const layout = {
const forgotPasswordType = ref(); const forgotPasswordType = ref();
const userStore = useUserStore(); const userStore = useUserStore();
const settingStore = useSettingStore();
const formRef = ref(); const formRef = ref();
const imageCodeRef = ref(); const imageCodeRef = ref();

View File

@@ -119,7 +119,7 @@ export async function SaveCommPluginConfigs(data: CommPluginConfig): Promise<voi
}); });
} }
export async function savePluginSetting(req: { id: number; metadata: any }): Promise<void> { export async function savePluginSetting(req: { name: string; sysSetting: any }): Promise<void> {
return await request({ return await request({
url: apiPrefix + "/saveSetting", url: apiPrefix + "/saveSetting",
method: "post", method: "post",

View File

@@ -3,7 +3,7 @@
<div class="origin-metadata w-100%"> <div class="origin-metadata w-100%">
<div class="block-title"> <div class="block-title">
自定义插件参数配置 自定义插件参数配置
<div class="helper">1111</div> <div class="helper">可以设置插件选项的配置设置配置默认值修改帮助说明设置是否显示该字段等</div>
</div> </div>
<div class="p-10"> <div class="p-10">
<div ref="formRef" class="config-form w-full" :label-col="labelCol" :wrapper-col="wrapperCol"> <div ref="formRef" class="config-form w-full" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -16,18 +16,18 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<template v-for="(item, key) in originInputs" :key="key"> <template v-for="item in originInputs" :key="item.key">
<template v-for="prop in editableKeys" :key="prop.key"> <template v-for="prop in editableKeys" :key="prop.key">
<tr> <tr>
<td v-if="prop.key === 'value'" class="border-t-2 p-5" rowspan="3" :class="{ 'border-t-2': prop.key === 'value' }">{{ item.title }}</td> <td v-if="prop.key === 'value'" class="border-t-2 p-5" rowspan="3" :class="{ 'border-t-2': prop.key === 'value' }">{{ item.title }}</td>
<td class="border-t p-5" :class="{ 'border-t-2': prop.key === 'value' }">{{ prop.label }}</td> <td class="border-t p-5" :class="{ 'border-t-2': prop.key === 'value' }">{{ prop.label }}</td>
<td class="border-t p-5" :class="{ 'border-t-2': prop.key === 'value' }"> <td class="border-t p-5" :class="{ 'border-t-2': prop.key === 'value' }">
<rollbackable :value="configForm[key][prop.key]" @set="configForm[key][prop.key] = item[prop.key] ?? null" @clear="delete configForm[key][prop.key]"> <rollbackable :value="configForm[item.key][prop.key]" @set="prop.onSet(item)" @clear="delete configForm[item.key][prop.key]">
<template #default> <template #default>
<fs-render :render-func="prop.defaultRender(key, item)"></fs-render> <fs-render :render-func="prop.defaultRender(item)"></fs-render>
</template> </template>
<template #edit> <template #edit>
<fs-render :render-func="prop.editRender(key, item)"></fs-render> <fs-render :render-func="prop.editRender(item)"></fs-render>
</template> </template>
</rollbackable> </rollbackable>
</td> </td>
@@ -73,9 +73,7 @@ function getScope() {
form: configForm, form: configForm,
}; };
} }
function getScopeFunc() {
return getScope;
}
function getForm() { function getForm() {
return configForm; return configForm;
} }
@@ -84,43 +82,52 @@ const editableKeys = ref([
{ {
key: "value", key: "value",
label: "默认值", label: "默认值",
defaultRender(key: string, item: any) { onSet(item: any) {
configForm[item.key]["value"] = item.value ?? null;
},
defaultRender(item: any) {
return () => { return () => {
return item["value"] ?? ""; return item["value"] ?? "";
}; };
}, },
editRender(key: string, item: any) { editRender(item: any) {
return () => { return () => {
return <fs-component-render {...item.component} vModel:modelValue={configForm[key]["value"]} scope={getScope()} />; return <fs-component-render {...item.component} vModel:modelValue={configForm[item.key]["value"]} scope={getScope()} />;
}; };
}, },
}, },
{ {
key: "show", key: "show",
label: "是否显示", label: "是否显示",
defaultRender(key: string, item: any) { onSet(item: any) {
configForm[item.key]["show"] = item.show ?? true;
},
defaultRender(item: any) {
return () => { return () => {
const value = item["show"]; const value = item["show"];
return value === false ? "不显示" : "显示"; return value === false ? "不显示" : "显示";
}; };
}, },
editRender(key: string, item: any) { editRender(item: any) {
return () => { return () => {
return <a-switch vModel:checked={configForm[key]["show"]} />; return <a-switch vModel:checked={configForm[item.key]["show"]} />;
}; };
}, },
}, },
{ {
key: "helper", key: "helper",
label: "帮助说明", label: "帮助说明",
defaultRender(key: string, item: any) { onSet(item: any) {
configForm[item.key]["helper"] = item.helper ?? "";
},
defaultRender(item: any) {
return () => { return () => {
return <pre class={"helper"}>{item["helper"]}</pre>; return <pre class={"helper"}>{item["helper"]}</pre>;
}; };
}, },
editRender(key: string, item: any) { editRender(item: any) {
return () => { return () => {
return <a-textarea rows={5} vModel:value={configForm[key]["helper"]} />; return <a-textarea rows={5} vModel:value={configForm[item.key]["helper"]} />;
}; };
}, },
}, },
@@ -155,7 +162,7 @@ async function loadPluginSetting() {
const setting = props.plugin.sysSetting; const setting = props.plugin.sysSetting;
if (setting) { if (setting) {
const settingJson = JSON.parse(setting); const settingJson = JSON.parse(setting);
merge(configForm, settingJson.metadata); merge(configForm, settingJson.metadata?.input || {});
} }
} }

View File

@@ -1,15 +1,17 @@
import * as api from "/@/views/sys/plugin/api"; import * as api from "/@/views/sys/plugin/api";
import { useFormWrapper } from "@fast-crud/fast-crud"; import { useFormWrapper } from "@fast-crud/fast-crud";
import { useI18n } from "/@/locales"; import { useI18n } from "/@/locales";
import { Modal, notification } from "ant-design-vue"; import { notification } from "ant-design-vue";
import ConfigEditor from "./config-editor.vue"; import ConfigEditor from "./config-editor.vue";
import { useModal } from "/@/use/use-modal";
import { ref } from "vue"; import { ref } from "vue";
import { usePluginStore } from "/@/store/plugin";
export function usePluginConfig() { export function usePluginConfig() {
const { openCrudFormDialog } = useFormWrapper(); const { openCrudFormDialog } = useFormWrapper();
const { t } = useI18n(); const { t } = useI18n();
const modal = useModal(); const pluginStore = usePluginStore();
// @ts-ignore
async function openConfigDialog({ row, crudExpose }) { async function openConfigDialog({ row, crudExpose }) {
const configEditorRef = ref(); const configEditorRef = ref();
function createCrudOptions() { function createCrudOptions() {
@@ -19,7 +21,7 @@ export function usePluginConfig() {
form: { form: {
wrapper: { wrapper: {
width: "80%", width: "80%",
title: "插件元数据配置", title: "插件参数自定义",
saveRemind: false, saveRemind: false,
slots: { slots: {
"form-body-top": () => { "form-body-top": () => {
@@ -44,12 +46,16 @@ export function usePluginConfig() {
newForm[key] = value; newForm[key] = value;
} }
} }
return await api.savePluginSetting({ const res = await api.savePluginSetting({
name: row.name, name: row.name,
sysSetting: { sysSetting: {
metadata: newForm, metadata: {
input: newForm,
},
}, },
}); });
await pluginStore.clear();
return res;
}, },
}, },
}, },

View File

@@ -45,6 +45,7 @@
<a-form-item :label="t('certd.smsProvider')" :name="['private', 'sms', 'type']"> <a-form-item :label="t('certd.smsProvider')" :name="['private', 'sms', 'type']">
<a-select v-model:value="formState.private.sms.type" @change="smsTypeChange"> <a-select v-model:value="formState.private.sms.type" @change="smsTypeChange">
<a-select-option value="aliyun">{{ t("certd.aliyunSms") }}</a-select-option> <a-select-option value="aliyun">{{ t("certd.aliyunSms") }}</a-select-option>
<a-select-option value="tencent">{{ t("certd.tencentSms") }}</a-select-option>
<a-select-option value="yfysms">{{ t("certd.yfySms") }}</a-select-option> <a-select-option value="yfysms">{{ t("certd.yfySms") }}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>

View File

@@ -0,0 +1,15 @@
flyway:
scriptDir: './db/migration-mysql'
typeorm:
dataSource:
default:
type: mysql # mariadb
host: localhost
port: 3309
logging: true
username: root
password: root
database: certd_comm

View File

@@ -3,6 +3,42 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
### Bug Fixes
* 前置任务输出不存在时输出警告提示 ([b59052c](https://github.com/certd/certd/commit/b59052cc43b7b070fabd8b8e914e4c2a5e0ad61c))
* 修复mysql下购买套餐加量包无效的bug ([c26ad4c](https://github.com/certd/certd/commit/c26ad4c8075f0606d45b8da13915737968d6191a))
### Performance Improvements
* 增加健康检查探针 /health/liveliness 和 /health/readiness ([44019e1](https://github.com/certd/certd/commit/44019e104289fedd32a867db00e9c6cb71b389cc))
* 支持根据id更新证书证书Id不变接口不过该接口为白名单功能普通腾讯云账户无法使用 ([fe9c4f3](https://github.com/certd/certd/commit/fe9c4f3391ff07c01dd9a252225f69a129c39050))
* 支持godaddy ([b7980aa](https://github.com/certd/certd/commit/b7980aad5ab50f58662eaddf5d84aa82876a98eb))
* 支持ssl.com证书颁发机构 ([27b6dfa](https://github.com/certd/certd/commit/27b6dfa4d2ab3bddd284c3a34511a72e1a513a4c))
## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
### Bug Fixes
* 更新我爱云CDN域名地址和部分目录结构 [@tyjsjxh](https://github.com/tyjsjxh) ([#514](https://github.com/certd/certd/issues/514)) ([78e7a81](https://github.com/certd/certd/commit/78e7a81638c2ee779f0ab6c3ba7e5c6f6e064151))
* 修复proxmox某些情况下执行卡住的bug ([ebd6917](https://github.com/certd/certd/commit/ebd6917a1d40ae4d94555c32b7e3c093d0599b94))
### Performance Improvements
* 部署到k8s支持自动创建secret ([c09c962](https://github.com/certd/certd/commit/c09c962cb676ca261610aa9f3e5105c9dae43f43))
* 短信验证码支持腾讯云 ([9108459](https://github.com/certd/certd/commit/9108459ae42bcd95a59acba164a64e82e5f2cfe6))
* 商业版支持自定义插件的参数配置 ([17f23f3](https://github.com/certd/certd/commit/17f23f37516af925d5049291d67d41e4271f81f8))
* 腾讯云插件支持国际版 ([58e82d5](https://github.com/certd/certd/commit/58e82d5dbd4ebf089ef239578ef9b68454d17b30))
* 腾讯云EO插件支持自动获取zoneid和域名列表 ([70fcdc9](https://github.com/certd/certd/commit/70fcdc9ebbfb7c883c0c8a2138f61a0776a9491b))
* 支持部署到阿里云云原生API网关、AI网关 ([2ca20be](https://github.com/certd/certd/commit/2ca20be197720201fceabcce9d927f4dbc1cc872))
* 支持部署到华为云obs ([9feb9d0](https://github.com/certd/certd/commit/9feb9d04b3c56ec95c06fcf4fd071eb0e88ffc6f))
* 支持部署到dokploy ([7dbdeae](https://github.com/certd/certd/commit/7dbdeaebe0bfee7521a863fe5e6b4a712aec5876))
* 支持删除宝塔证书夹中的过期证书 ([3575113](https://github.com/certd/certd/commit/3575113655be751d19f88c64491e98a89042d6a2))
* 支持p7b证书格式 ([d9f4a57](https://github.com/certd/certd/commit/d9f4a5793d68a017a5d80ad5385cbda603c4e165))
* lecdnv2支持api token ([e448934](https://github.com/certd/certd/commit/e4489343fee7754be07bcfc3323969dc3a30e90c))
* openapi返回证书时挑选匹配范围最小的那一个增加format参数增加返回值p7b格式增加detail返回 ([2085bcc](https://github.com/certd/certd/commit/2085bcceb61c3723c9bdfec4c4cc0917631ff5e5))
## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
### Bug Fixes ### Bug Fixes

View File

@@ -0,0 +1,3 @@
update cd_user_suite set is_empty = false where is_empty is null;
ALTER TABLE cd_user_suite MODIFY COLUMN `is_empty` boolean default false ;

View File

@@ -0,0 +1,2 @@
update cd_user_suite set is_empty = false where is_empty is null;
ALTER TABLE "cd_user_suite" ALTER COLUMN "is_empty" SET DEFAULT false;

View File

@@ -1,6 +1,6 @@
{ {
"name": "@certd/ui-server", "name": "@certd/ui-server",
"version": "1.36.17", "version": "1.36.19",
"description": "fast-server base midway", "description": "fast-server base midway",
"private": true, "private": true,
"type": "module", "type": "module",
@@ -11,6 +11,7 @@
"dev-commpro": "cross-env NODE_ENV=dev-commpro mwtsc --watch --run @midwayjs/mock/app", "dev-commpro": "cross-env NODE_ENV=dev-commpro mwtsc --watch --run @midwayjs/mock/app",
"dev-pg": "cross-env NODE_ENV=dev-pg mwtsc --watch --run @midwayjs/mock/app", "dev-pg": "cross-env NODE_ENV=dev-pg mwtsc --watch --run @midwayjs/mock/app",
"dev-mysql": "cross-env NODE_ENV=dev-mysql mwtsc --watch --run @midwayjs/mock/app", "dev-mysql": "cross-env NODE_ENV=dev-mysql mwtsc --watch --run @midwayjs/mock/app",
"dev-mysql-comm": "cross-env NODE_ENV=dev-mysql-comm mwtsc --watch --run @midwayjs/mock/app",
"dev-localplus": "cross-env NODE_ENV=dev-localplus mwtsc --watch --run @midwayjs/mock/app", "dev-localplus": "cross-env NODE_ENV=dev-localplus mwtsc --watch --run @midwayjs/mock/app",
"dev-pgpl": "cross-env NODE_ENV=dev-pgpl mwtsc --watch --run @midwayjs/mock/app", "dev-pgpl": "cross-env NODE_ENV=dev-pgpl mwtsc --watch --run @midwayjs/mock/app",
"dev-new": "cross-env NODE_ENV=dev-new mwtsc --watch --run @midwayjs/mock/app", "dev-new": "cross-env NODE_ENV=dev-new mwtsc --watch --run @midwayjs/mock/app",
@@ -42,20 +43,20 @@
"@aws-sdk/client-cloudfront": "^3.699.0", "@aws-sdk/client-cloudfront": "^3.699.0",
"@aws-sdk/client-iam": "^3.699.0", "@aws-sdk/client-iam": "^3.699.0",
"@aws-sdk/client-s3": "^3.705.0", "@aws-sdk/client-s3": "^3.705.0",
"@certd/acme-client": "^1.36.17", "@certd/acme-client": "^1.36.19",
"@certd/basic": "^1.36.17", "@certd/basic": "^1.36.19",
"@certd/commercial-core": "^1.36.17", "@certd/commercial-core": "^1.36.19",
"@certd/cv4pve-api-javascript": "^8.4.1", "@certd/cv4pve-api-javascript": "^8.4.2",
"@certd/jdcloud": "^1.36.17", "@certd/jdcloud": "^1.36.19",
"@certd/lib-huawei": "^1.36.17", "@certd/lib-huawei": "^1.36.19",
"@certd/lib-k8s": "^1.36.17", "@certd/lib-k8s": "^1.36.19",
"@certd/lib-server": "^1.36.17", "@certd/lib-server": "^1.36.19",
"@certd/midway-flyway-js": "^1.36.17", "@certd/midway-flyway-js": "^1.36.19",
"@certd/pipeline": "^1.36.17", "@certd/pipeline": "^1.36.19",
"@certd/plugin-cert": "^1.36.17", "@certd/plugin-cert": "^1.36.19",
"@certd/plugin-lib": "^1.36.17", "@certd/plugin-lib": "^1.36.19",
"@certd/plugin-plus": "^1.36.17", "@certd/plugin-plus": "^1.36.19",
"@certd/plus-core": "^1.36.17", "@certd/plus-core": "^1.36.19",
"@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120", "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
"@huaweicloud/huaweicloud-sdk-core": "^3.1.120", "@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
"@koa/cors": "^5.0.0", "@koa/cors": "^5.0.0",
@@ -117,7 +118,7 @@
"socks-proxy-agent": "^8.0.4", "socks-proxy-agent": "^8.0.4",
"strip-ansi": "^7.1.0", "strip-ansi": "^7.1.0",
"svg-captcha": "^1.4.0", "svg-captcha": "^1.4.0",
"tencentcloud-sdk-nodejs": "^4.0.983", "tencentcloud-sdk-nodejs": "^4.1.112",
"typeorm": "^0.3.20", "typeorm": "^0.3.20",
"uuid": "^10.0.0" "uuid": "^10.0.0"
}, },

View File

@@ -0,0 +1,21 @@
import {Controller, Get, Provide} from '@midwayjs/core';
import {BaseController, Constants} from '@certd/lib-server';
/**
*/
@Provide()
@Controller('/health')
export class HealthController extends BaseController {
@Get('/liveliness', { summary: Constants.per.guest })
async liveliness(): Promise<any> {
return this.ok('ok')
}
@Get('/readiness', { summary: Constants.per.guest })
async readiness(): Promise<any> {
return this.ok('ok')
}
}

View File

@@ -23,7 +23,7 @@ const unhiddenHtml = `
@Provide() @Provide()
@Controller('/api/unhidden') @Controller('/api/unhidden')
export class HnhiddenController { export class UnhiddenController {
@Inject() @Inject()
ctx: IMidwayKoaContext; ctx: IMidwayKoaContext;
@Inject() @Inject()

View File

@@ -10,6 +10,7 @@ export type CertGetReq = {
domains?: string; domains?: string;
certId: number; certId: number;
autoApply?:boolean; autoApply?:boolean;
format?:string; //默认是所有,pem,der,p12,pfx,jks,one,p7b
}; };
/** /**
@@ -38,6 +39,7 @@ export class OpenCertController extends BaseOpenController {
domains: req.domains, domains: req.domains,
certId: req.certId, certId: req.certId,
autoApply: req.autoApply??false, autoApply: req.autoApply??false,
format: req.format
}); });
return this.ok(res); return this.ok(res);
} }

View File

@@ -164,7 +164,8 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
@Post('/getSmsTypeDefine', { summary: 'sys:settings:view' }) @Post('/getSmsTypeDefine', { summary: 'sys:settings:view' })
async getSmsTypeDefine(@Body('type') type: string) { async getSmsTypeDefine(@Body('type') type: string) {
return this.ok(SmsServiceFactory.getDefine(type)); const define =await SmsServiceFactory.getDefine(type);
return this.ok(define);
} }

View File

@@ -83,7 +83,7 @@ export class CodeService {
} }
const smsType = sysSettings.sms.type; const smsType = sysSettings.sms.type;
const smsConfig = sysSettings.sms.config; const smsConfig = sysSettings.sms.config;
const sender: ISmsService = SmsServiceFactory.createSmsService(smsType); const sender: ISmsService = await SmsServiceFactory.createSmsService(smsType);
const accessGetter = new AccessSysGetter(this.accessService); const accessGetter = new AccessSysGetter(this.accessService);
sender.setCtx({ sender.setCtx({
accessService: accessGetter, accessService: accessGetter,

View File

@@ -1,25 +1,28 @@
import { AliyunSmsService } from './aliyun-sms.js';
import { YfySmsService } from './yfy-sms.js';
export class SmsServiceFactory { export class SmsServiceFactory {
static createSmsService(type: string) { static async createSmsService(type: string) {
const cls = this.GetClassByType(type); const cls = await this.GetClassByType(type);
return new cls(); return new cls();
} }
static GetClassByType(type: string) { static async GetClassByType(type: string) {
switch (type) { switch (type) {
case 'aliyun': case 'aliyun':
const {AliyunSmsService} = await import("./aliyun-sms.js")
return AliyunSmsService; return AliyunSmsService;
case 'yfysms': case 'yfysms':
const {YfySmsService} = await import("./yfy-sms.js")
return YfySmsService; return YfySmsService;
case 'tencent':
const {TencentSmsService} = await import("./tencent-sms.js")
return TencentSmsService;
default: default:
throw new Error('不支持的短信服务类型'); throw new Error('不支持的短信服务类型');
} }
} }
static getDefine(type: string) { static async getDefine(type: string) {
const cls = this.GetClassByType(type); const cls = await this.GetClassByType(type);
return cls.getDefine(); return cls.getDefine();
} }
} }

View File

@@ -0,0 +1,124 @@
import {ISmsService, PluginInputs, SmsPluginCtx} from './api.js';
import {TencentAccess} from "@certd/plugin-lib";
export type TencentSmsConfig = {
accessId: string;
signName: string;
codeTemplateId: string;
appId: string;
region: string;
};
export class TencentSmsService implements ISmsService {
static getDefine() {
return {
name: 'tencent',
desc: '腾讯云短信服务',
input: {
accessId: {
title: '腾讯云授权',
component: {
name: 'access-selector',
type: 'tencent',
},
required: true,
},
region: {
title: '区域',
value:"ap-beijing",
component: {
name: 'a-select',
vModel: 'value',
options:[
{value:"ap-beijing",label:"华北地区(北京)"},
{value:"ap-guangzhou",label:"华南地区(广州)"},
{value:"ap-nanjing",label:"华东地区(南京)"},
]
},
helper:"随便选一个",
required: true,
},
signName: {
title: '签名',
component: {
name: 'a-input',
vModel: 'value',
},
required: true,
},
appId: {
title: '应用ID',
component: {
name: 'a-input',
vModel: 'value',
},
required: true,
},
codeTemplateId: {
title: '验证码模板Id',
component: {
name: 'a-input',
vModel: 'value',
},
required: true,
},
} as PluginInputs<TencentSmsConfig>,
};
}
ctx: SmsPluginCtx<TencentSmsConfig>;
setCtx(ctx: any) {
this.ctx = ctx;
}
async getClient() {
const sdk = await import('tencentcloud-sdk-nodejs/tencentcloud/services/sms/v20210111/index.js');
const client = sdk.v20210111.Client;
const access = await this.ctx.accessService.getById<TencentAccess>(this.ctx.config.accessId);
// const region = this.region;
const clientConfig = {
credential: {
secretId: access.secretId,
secretKey: access.secretKey,
},
region: this.ctx.config.region,
profile: {
httpProfile: {
endpoint: `sms.${access.intlDomain()}tencentcloudapi.com`,
},
},
};
return new client(clientConfig);
}
async sendSmsCode(opts: { mobile: string; code: string; phoneCode: string }) {
const { mobile, code, phoneCode } = opts;
const client = await this.getClient();
const smsConfig = this.ctx.config;
const params = {
"PhoneNumberSet": [
`+${phoneCode}${mobile}`
],
"SmsSdkAppId": smsConfig.appId,
"TemplateId": smsConfig.codeTemplateId,
"SignName": smsConfig.signName,
"TemplateParamSet": [
code
]
};
const ret = await client.SendSms(params);
this.checkRet(ret);
}
checkRet(ret: any) {
if (!ret || ret.Error) {
throw new Error('执行失败:' + ret.Error.Code + ',' + ret.Error.Message);
}
}
}

View File

@@ -27,7 +27,7 @@ export class CertInfoFacade {
@Inject() @Inject()
userSettingsService : UserSettingsService userSettingsService : UserSettingsService
async getCertInfo(req: { domains?: string; certId?: number; userId: number,autoApply?:boolean }) { async getCertInfo(req: { domains?: string; certId?: number; userId: number,autoApply?:boolean,format?:string }) {
const { domains, certId, userId } = req; const { domains, certId, userId } = req;
if (certId) { if (certId) {
return await this.certInfoService.getCertInfoById({ id: certId, userId }); return await this.certInfoService.getCertInfoById({ id: certId, userId });
@@ -41,7 +41,7 @@ export class CertInfoFacade {
const domainArr = domains.split(','); const domainArr = domains.split(',');
const matchedList = await this.certInfoService.getMatchCertList({domains:domainArr,userId}) const matchedList = await this.certInfoService.getMatchCertList({domains:domainArr,userId})
let matched: CertInfoEntity = null
if (matchedList.length === 0 ) { if (matchedList.length === 0 ) {
if(req.autoApply === true){ if(req.autoApply === true){
//自动申请,先创建自动申请流水线 //自动申请,先创建自动申请流水线
@@ -54,13 +54,7 @@ export class CertInfoFacade {
}); });
} }
} }
matched = null; let matched = this.getMinixMatched(matchedList);
for (const item of matchedList) {
if (item.expiresTime>0 && item.expiresTime > new Date().getTime()) {
matched = item;
break
}
}
if (!matched) { if (!matched) {
if(req.autoApply === true){ if(req.autoApply === true){
//如果没有找到有效期内的证书,则自动触发一次申请 //如果没有找到有效期内的证书,则自动触发一次申请
@@ -75,7 +69,38 @@ export class CertInfoFacade {
} }
} }
return await this.certInfoService.getCertInfoById({ id: matched.id, userId: userId }); return await this.certInfoService.getCertInfoById({ id: matched.id, userId: userId,format:req.format });
}
public getMinixMatched(matchedList: CertInfoEntity[]) {
let matched: CertInfoEntity = null;
for (const item of matchedList) {
if (item.expiresTime > 0 && item.expiresTime > new Date().getTime()) {
if (matched) {
//如果前面已经有match的值判断范围是否比上一个小
const currentStars = `-${item.domains}`.split("*");
const matchedStars = `-${matched.domains}`.split("*");
const currentLength = item.domains.split(",");
const matchedLength = matched.domains.split(",");
if (currentStars.length < matchedStars.length) {
//如果*的数量比上一个少,则替换为当前
matched = item;
} else if (currentStars.length == matchedStars.length) {
//如果*的数量相同,则比较域名数量
if (currentLength.length < matchedLength.length) {
matched = item;
}
}
} else {
matched = item;
}
}
}
return matched;
} }
async createAutoPipeline(req:{domains:string[],userId:number}){ async createAutoPipeline(req:{domains:string[],userId:number}){

View File

@@ -113,7 +113,7 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
}); });
} }
async getCertInfoById(req: { id: number; userId: number }) { async getCertInfoById(req: { id: number; userId: number,format?:string }) {
const entity = await this.info(req.id); const entity = await this.info(req.id);
if (!entity || entity.userId !== req.userId) { if (!entity || entity.userId !== req.userId) {
throw new CodeException(Constants.res.openCertNotFound); throw new CodeException(Constants.res.openCertNotFound);
@@ -124,7 +124,14 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
} }
const certInfo = JSON.parse(entity.certInfo) as CertInfo; const certInfo = JSON.parse(entity.certInfo) as CertInfo;
const certReader = new CertReader(certInfo); const certReader = new CertReader(certInfo);
return certReader.toCertInfo(); return {
...certReader.toCertInfo(req.format),
detail: {
id: entity.id,
domains: entity.domains.split(','),
notAfter: certReader.expires,
},
};
} }
async updateCertByPipelineId(pipelineId: number, cert: CertInfo,file?:string,fromType = 'pipeline') { async updateCertByPipelineId(pipelineId: number, cert: CertInfo,file?:string,fromType = 'pipeline') {

View File

@@ -33,3 +33,5 @@ export * from './plugin-wangsu/index.js'
export * from './plugin-admin/index.js' export * from './plugin-admin/index.js'
export * from './plugin-ksyun/index.js' export * from './plugin-ksyun/index.js'
export * from './plugin-apisix/index.js' export * from './plugin-apisix/index.js'
export * from './plugin-dokploy/index.js'
export * from './plugin-godaddy/index.js'

View File

@@ -116,6 +116,12 @@ export class AliyunDeployCertToFC extends AbstractTaskPlugin {
}) })
protocol!: string; protocol!: string;
@TaskInput({
title: '证书名称',
helper: '上传后将以此名称作为前缀备注',
})
certName!: string;
async onInstance() {} async onInstance() {}
async exec(cmd: string) { async exec(cmd: string) {
@@ -179,7 +185,7 @@ export class AliyunDeployCertToFC extends AbstractTaskPlugin {
bodyType: 'json', bodyType: 'json',
}); });
// body params // body params
const certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt)) const certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt),this.certName??"")
const body: { [key: string]: any } = { const body: { [key: string]: any } = {
certConfig: { certConfig: {

View File

@@ -8,7 +8,7 @@ import {CertInfo, CertReader} from "@certd/plugin-cert";
name: "apisix", name: "apisix",
title: "APISIX授权", title: "APISIX授权",
desc: "", desc: "",
icon: "svg:icon-ksyun" icon: "svg:icon-lucky"
}) })
export class ApisixAccess extends BaseAccess { export class ApisixAccess extends BaseAccess {
@@ -93,7 +93,7 @@ export class ApisixAccess extends BaseAccess {
headers, headers,
baseURL: this.endpoint, baseURL: this.endpoint,
...req, ...req,
logRes: true, logRes: false,
}); });
} }

View File

@@ -0,0 +1,107 @@
import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
import { HttpRequestConfig } from "@certd/basic";
import { CertInfo } from "@certd/plugin-cert";
/**
*/
@IsAccess({
name: "dokploy",
title: "Dokploy授权",
desc: "",
icon: "svg:icon-lucky"
})
export class DokployAccess extends BaseAccess {
@AccessInput({
title: "Dokploy地址",
component: {
placeholder: "http://192.168.11.11:5480",
},
required: true,
})
endpoint = '';
@AccessInput({
title: 'ApiKey',
component: {
placeholder: 'ApiKey',
},
// naAyXbZmxtsfrDfneOCeirbQNIICmBgfBiYXQwryPIUOdzPkXkfnaKjeAdbOQdwp
//tlyvdNzojaFkNfGScALLmyuFHkHcYWaxoYjiDzWFHcnZAWdjOquMSqBwHLvGDGZK
helper: "[settings-profile](https://app.dokploy.com/dashboard/settings/profile)中配置API Keys",
required: true,
encrypt: true,
})
apiKey = '';
@AccessInput({
title: "测试",
component: {
name: "api-test",
action: "TestRequest"
},
helper: "点击测试接口是否正常"
})
testRequest = true;
async onTestRequest() {
await this.getCertList();
return "ok"
}
async getCertList(){
const req = {
url :"/api/certificates.all",
method: "get",
}
return await this.doRequest(req);
}
async createCert(opts:{cert:CertInfo,serverId:string,name:string}){
const req = {
url :"/api/certificates.create",
method: "post",
data:{
// certificateId:opts.certificateId,
"name": opts.name,
"certificateData": opts.cert.crt,
"privateKey": opts.cert.key,
"serverId": opts.serverId,
autoRenew: false,
organizationId : ""
}
}
return await this.doRequest(req);
}
async removeCert (opts:{id:string}){
const req = {
url :"/api/certificates.remove",
method: "post",
data:{
certificateId:opts.id,
}
}
return await this.doRequest(req);
}
async doRequest(req: HttpRequestConfig){
const headers = {
"x-api-key": this.apiKey,
...req.headers
};
return await this.ctx.http.request({
headers,
baseURL: this.endpoint,
...req,
logRes: true,
});
}
}
new DokployAccess();

View File

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

View File

@@ -0,0 +1 @@
import "./plugin-refresh-cert.js"

View File

@@ -0,0 +1,117 @@
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 {DokployAccess} from "../access.js";
@IsTaskPlugin({
//命名规范,插件类型+功能就是目录plugin-demo中的demo大写字母开头驼峰命名
name: "DokployRefreshCert",
title: "Dokploy-更新证书",
desc: "自动更新Dokploy证书",
icon: "svg:icon-lucky",
//插件分组
group: pluginGroups.panel.key,
needPlus: true,
default: {
//默认值配置照抄即可
strategy: {
runStrategy: RunStrategy.SkipWhenSucceed
}
}
})
//类名规范跟上面插件名称name一致
export class DokployRefreshCert extends AbstractTaskPlugin {
//证书选择,此项必须要有
@TaskInput({
title: "域名证书",
helper: "请选择前置任务输出的域名证书",
component: {
name: "output-selector",
from: [...CertApplyPluginNames]
}
// required: true, // 必填
})
cert!: CertInfo;
@TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
certDomains!: string[];
//授权选择框
@TaskInput({
title: "Dokploy授权",
component: {
name: "access-selector",
type: "dokploy" //固定授权类型
},
required: true //必填
})
accessId!: string;
//
@TaskInput(
createRemoteSelectInputDefine({
title: "证书名称",
helper: "要更新的证书名称,如果这里没有,请先给手动绑定一次证书",
action: DokployRefreshCert.prototype.onGetCertList.name,
pager: false,
search: false
})
)
certList!: string[];
//插件实例化时执行的方法
async onInstance() {
}
//插件执行方法
async execute(): Promise<void> {
const access = await this.getAccess<DokployAccess>(this.accessId);
// await access.createCert({cert:this.cert})
const certList = 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})
}
}
await access.createCert({
name,
cert: this.cert,
serverId: serverId,
});
this.logger.info(`----------- 更新证书${certId}成功`);
}
this.logger.info("部署完成");
}
async onGetCertList(data: PageSearch = {}) {
const access = await this.getAccess<DokployAccess>(this.accessId);
const res = await access.getCertList()
const list = res
if (!list || list.length === 0) {
throw new Error("没有找到证书你可以直接手动输入id如果id不存在将自动创建");
}
const options = list.map((item: any) => {
return {
label: `${item.name}<${item.serverId}>`,
value: `${item.serverId}#${item.name}`,
domain: item.name
};
});
return options;
}
}
//实例化一下,注册插件
new DokployRefreshCert();

View File

@@ -0,0 +1,96 @@
import {AccessInput, BaseAccess, IsAccess, Pager, PageSearch} from '@certd/pipeline';
import {HttpRequestConfig} from "@certd/basic";
/**
* 这个注解将注册一个授权配置
* 在certd的后台管理系统中用户可以选择添加此类型的授权
*/
@IsAccess({
name: 'godaddy',
title: 'godaddy授权',
icon: 'simple-icons:godaddy',
desc: '',
})
export class GodaddyAccess extends BaseAccess {
/**
* 授权属性配置
*/
@AccessInput({
title: 'Key',
component: {
placeholder: '授权key',
},
helper:"[https://developer.godaddy.com/keys](https://developer.godaddy.com/keys)创建key选择product不要选择ote",
required: true,
encrypt: false,
})
key = '';
@AccessInput({
title: 'Secret',
component: {
name:"a-input-password",
vModel:"value",
},
required: true,
encrypt: true,
})
secret = '';
@AccessInput({
title: 'HTTP代理',
component: {
placeholder: 'http://xxxxx:xx',
},
helper: '使用https_proxy',
required: false,
})
httpProxy = '';
@AccessInput({
title: "测试",
component: {
name: "api-test",
action: "TestRequest"
},
helper: "点击测试接口是否正常(注意账号中必须要有50个域名才能使用API接口)"
})
testRequest = true;
async onTestRequest() {
const res = await this.getDomainList({pageSize:1});
this.ctx.logger.info(res)
return "ok"
}
async getDomainList(opts?: PageSearch){
const pager = new Pager(opts);
const req = {
url :`/v1/domains?limit=${pager.pageSize}`,
method: "get",
}
return await this.doRequest(req);
}
async doRequest(req: HttpRequestConfig){
const headers = {
"Authorization": `sso-key ${this.key}:${this.secret}`,
...req.headers
};
return await this.ctx.http.request({
headers,
baseURL: "https://api.godaddy.com",
...req,
logRes: true,
httpProxy: this.httpProxy,
});
}
}
new GodaddyAccess();

View File

@@ -0,0 +1,90 @@
import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from "@certd/plugin-cert";
import { GodaddyAccess } from "./access.js";
export type GodaddyRecord = {
domain: string,
type: string,
name: string,
data: string,
};
// 这里通过IsDnsProvider注册一个dnsProvider
@IsDnsProvider({
name: 'godaddy',
title: 'godaddy',
desc: 'GoDaddy',
icon: 'simple-icons:godaddy',
// 这里是对应的 cloudflare的access类型名称
accessType: 'godaddy',
order:10,
})
export class GodaddyDnsProvider extends AbstractDnsProvider<GodaddyRecord> {
access!: GodaddyAccess;
async onInstance() {
//一些初始化的操作
// 也可以通过ctx成员变量传递context
this.access = this.ctx.access as GodaddyAccess;
}
/**
* 创建dns解析记录用于验证域名所有权
*/
async createRecord(options: CreateRecordOptions): Promise<GodaddyRecord> {
/**
* fullRecord: '_acme-challenge.test.example.com',
* value: 一串uuid
* type: 'TXT',
* domain: 'example.com'
* hostRecord: _acme-challenge.test
*/
const { fullRecord,hostRecord, value, type, domain } = options;
this.logger.info('添加域名解析:', fullRecord, value, type, domain);
const res = await this.access.doRequest({
method: 'PATCH',
url: '/v1/domains/'+domain+'/records',
data: [
{
type: 'TXT',
name: hostRecord,
data: value,
ttl: 600,
}
]
})
this.logger.info('添加域名解析成功:', res);
return {
domain: domain,
type: 'TXT',
name: hostRecord,
data: value,
};
}
/**
* 删除dns解析记录,清理申请痕迹
* @param options
*/
async removeRecord(options: RemoveRecordOptions<GodaddyRecord>): Promise<void> {
const { fullRecord, value } = options.recordReq;
const record = options.recordRes;
this.logger.info('删除域名解析:', fullRecord, value);
if (!record) {
this.logger.info('record为空不执行删除');
return;
}
//这里调用删除txt dns解析记录接口
const {name,type,domain} = record
const res = await this.access.doRequest({
method: 'DELETE',
url: '/v1/domains/'+domain+`/records/${type}/${name}`,
})
this.logger.info(`删除域名解析成功:fullRecord=${fullRecord},id=${res}`);
}
}
//实例化这个provider将其自动注册到系统中
new GodaddyDnsProvider();

View File

@@ -0,0 +1,2 @@
export * from './dns-provider.js';
export * from './access.js';

View File

@@ -61,10 +61,12 @@ export class ProxmoxAccess extends BaseAccess {
@AccessInput({ @AccessInput({
title: '领域', title: '领域',
value: "pam",
component: { component: {
placeholder: 'realm', placeholder: 'pam、pve。默认值 pam',
}, },
required: true, helper:"pam 或 pve。默认值 pam",
required: false,
encrypt: false, encrypt: false,
}) })
realm = ''; realm = '';

View File

@@ -71,8 +71,14 @@ export class ProxmoxUploadCert extends AbstractPlusTaskPlugin {
for (const node of this.nodes) { for (const node of this.nodes) {
this.logger.info(`开始上传证书到节点:${node}`); this.logger.info(`开始上传证书到节点:${node}`);
const res = await client.nodes.get(node).certificates.custom.uploadCustomCert(cert.crt, true, cert.key, true); try{
this.logger.info(`上传结果:${JSON.stringify(res.response)}`); const res = await client.nodes.get(node).certificates.custom.uploadCustomCert(cert.crt, true, cert.key, true);
this.logger.info(`上传结果:${JSON.stringify(res.response)}`);
}catch (e) {
this.logger.error(`执行失败:${e.message},请检查节点名称是否正确`);
throw e
}
} }
this.logger.info('部署成功'); this.logger.info('部署成功');

View File

@@ -103,6 +103,10 @@ export class DeployCertToTencentEO extends AbstractTaskPlugin {
logger: this.logger, logger: this.logger,
}); });
if (this.cert == null){
throw new Error('请选择域名证书');
}
let tencentCertId = this.cert as string; let tencentCertId = this.cert as string;
if (typeof this.cert !== 'string') { if (typeof this.cert !== 'string') {
const certReader = new CertReader(this.cert); const certReader = new CertReader(this.cert);

View File

@@ -34,20 +34,6 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin {
}) })
ingressClass!: string; ingressClass!: string;
/**
* AccessProvider的key,或者一个包含access的具体的对象
*/
@TaskInput({
title: "Access授权",
helper: "access授权",
component: {
name: "access-selector",
type: "tencent"
},
required: true
})
accessId!: string;
@TaskInput({ @TaskInput({
title: "腾讯云证书id", title: "腾讯云证书id",
helper: "请选择“上传证书到腾讯云”前置任务的输出", helper: "请选择“上传证书到腾讯云”前置任务的输出",
@@ -66,6 +52,7 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin {
}) })
tencentCertId!: string; tencentCertId!: string;
@TaskInput({ @TaskInput({
title: "域名证书", title: "域名证书",
helper: "请选择前置任务输出的域名证书", helper: "请选择前置任务输出的域名证书",
@@ -85,6 +72,24 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin {
cert!: any; cert!: any;
/**
* AccessProvider的key,或者一个包含access的具体的对象
*/
@TaskInput({
title: "Access授权",
helper: "access授权",
component: {
name: "access-selector",
type: "tencent"
},
required: true
})
accessId!: string;
@TaskInput({ title: "大区", value: "ap-guangzhou", required: true }) @TaskInput({ title: "大区", value: "ap-guangzhou", required: true })
region!: string; region!: string;
@@ -147,6 +152,17 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin {
}) })
skipTLSVerify!:boolean skipTLSVerify!:boolean
@TaskInput({
title: "Secret自动创建",
helper: "如果Secret不存在则创建",
value: false,
component: {
name: "a-switch",
vModel: "checked",
},
})
createOnNotFound: boolean;
// @TaskInput({ title: "集群内网ip", helper: "如果开启了外网的话,无需设置" }) // @TaskInput({ title: "集群内网ip", helper: "如果开启了外网的话,无需设置" })
// clusterIp!: string; // clusterIp!: string;
@@ -288,7 +304,7 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin {
secretNames = [secretName]; secretNames = [secretName];
} }
for (const secret of secretNames) { for (const secret of secretNames) {
await k8sClient.patchSecret({ namespace, secretName: secret, body }); await k8sClient.patchSecret({ namespace, secretName: secret, body , createOnNotFound: this.createOnNotFound});
this.logger.info(`CertSecret已更新:${secret}`); this.logger.info(`CertSecret已更新:${secret}`);
} }
} }

Some files were not shown because too many files have changed in this diff Show More