Compare commits

...

102 Commits

Author SHA1 Message Date
xiaojunnuo
9acac86ed5 v1.37.11 2025-11-29 04:15:57 +08:00
xiaojunnuo
ba5007219d build: prepare to build 2025-11-29 04:13:44 +08:00
xiaojunnuo
ec046fd599 build: prepare to build 2025-11-29 04:10:55 +08:00
xiaojunnuo
5452ff1153 build: prepare to build 2025-11-29 04:08:56 +08:00
xiaojunnuo
d03b1e0608 chore: 数据库脚本同步 2025-11-29 04:06:51 +08:00
xiaojunnuo
53c88ad5af perf: 优化天翼云cdn 等待5秒部署完成 2025-11-29 03:25:21 +08:00
xiaojunnuo
21585ca565 chore: 优化oidc登录 2025-11-28 01:42:42 +08:00
xiaojunnuo
2fabee647a fix: 修复阿里云 waf tlsVersion参数缺失导致部署失败的问题 2025-11-27 22:36:33 +08:00
xiaojunnuo
cf4632045c Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev 2025-11-27 01:59:28 +08:00
xiaojunnuo
ec75afbc44 perf: 支持oidc单点登录 2025-11-27 01:59:22 +08:00
xiaojunnuo
c7b298c46f fix: 修复备注撑开表格行高的bug
https://github.com/certd/certd/issues/586
2025-11-26 23:38:34 +08:00
xiaojunnuo
3406bb5a4a fix: 修复域名管理无法创建tencent-eo dns授权的bug
https://github.com/certd/certd/issues/587
2025-11-26 23:36:34 +08:00
xiaojunnuo
e9427b4694 chore: oauth-second 2025-11-26 23:25:51 +08:00
xiaojunnuo
517a1f1835 Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev 2025-11-26 16:04:24 +08:00
xiaojunnuo
6e735bbd1e fix: openapi 成功后失败都返回msg 2025-11-26 16:04:14 +08:00
xiaojunnuo
5a148aa3b9 chore: oidc first 2025-11-26 07:34:42 +08:00
xiaojunnuo
b4c362da37 docs: openapi 2025-11-25 09:12:35 +08:00
xiaojunnuo
575ae164c8 perf: ssh支持ppk格式私钥 2025-11-25 00:48:21 +08:00
xiaojunnuo
a9606bfb4e chore: 1 2025-11-24 23:43:14 +08:00
xiaojunnuo
b5ec04723d perf: ssl.com支持ecc 2025-11-24 23:33:25 +08:00
xiaojunnuo
51cc08411f perf: 优化宝塔网站证书在并发部署时导致nginx配置文件错乱的问题 2025-11-24 23:18:56 +08:00
xiaojunnuo
d75034deae build: release 2025-11-19 23:57:16 +08:00
xiaojunnuo
4ce23debb6 build: publish 2025-11-19 23:55:03 +08:00
xiaojunnuo
063706a7bf build: trigger build image 2025-11-19 23:54:03 +08:00
xiaojunnuo
eb41a3655f v1.37.10 2025-11-19 23:52:19 +08:00
xiaojunnuo
a84476187f build: prepare to build 2025-11-19 23:49:47 +08:00
xiaojunnuo
70b603d601 perf: 站点证书监控备注输入框改成textarea 2025-11-19 23:49:09 +08:00
xiaojunnuo
c9709f2698 perf: 优化dokploy 部署插件,配置选择serverId 2025-11-19 23:47:26 +08:00
xiaojunnuo
be4f479afd build: release 2025-11-19 15:41:19 +08:00
xiaojunnuo
a251465dbc build: publish 2025-11-19 15:30:56 +08:00
xiaojunnuo
9b7051f2be build: trigger build image 2025-11-19 15:30:33 +08:00
xiaojunnuo
8bfdef79c4 v1.37.9 2025-11-19 15:28:27 +08:00
xiaojunnuo
f2c2bf81b3 build: prepare to build 2025-11-19 15:24:37 +08:00
xiaojunnuo
8b5247b9bb build: prepare to build 2025-11-19 15:23:57 +08:00
xiaojunnuo
075b1dc0eb fix: 商用证书上传保存失败的bug 2025-11-19 15:13:08 +08:00
xiaojunnuo
42e1f0478d chore: docs 2025-11-19 13:24:40 +08:00
xiaojunnuo
d4653678b2 perf: 优化阿里云clb 过期证书清理报错的问题 2025-11-18 18:09:59 +08:00
xiaojunnuo
a4ce752e58 chore: 阿里云nlb证书清理增加日志打印 2025-11-18 18:02:55 +08:00
xiaojunnuo
f6649398ef chore: 清理过期证书增加日志打印 2025-11-18 18:01:23 +08:00
xiaojunnuo
02859cc270 build: release 2025-11-18 01:28:48 +08:00
xiaojunnuo
4ed30e082f build: publish 2025-11-18 01:18:48 +08:00
xiaojunnuo
d3985dd129 build: trigger build image 2025-11-18 01:18:32 +08:00
xiaojunnuo
ac70821fea v1.37.8 2025-11-18 01:16:57 +08:00
xiaojunnuo
38b273a1c9 build: prepare to build 2025-11-18 01:14:14 +08:00
xiaojunnuo
eb5c88fbb2 perf: 支持回车键触发登录 2025-11-18 01:13:31 +08:00
xiaojunnuo
1102952b47 perf: 修复西数解析记录添加失败的bug,支持部署证书到西数虚拟主机 2025-11-18 01:04:47 +08:00
xiaojunnuo
5ad6cadcee chore: 1 2025-11-15 16:56:04 +08:00
xiaojunnuo
5d236808d6 Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev 2025-11-15 16:46:06 +08:00
xiaojunnuo
ada9243e84 chore: 1 2025-11-15 16:32:41 +08:00
xiaojunnuo
ad4e1c1b5b Merge branch 'v2' into v2-dev 2025-11-13 13:54:44 +08:00
xiaojunnuo
c5105c29b0 build: release 2025-11-13 01:31:28 +08:00
xiaojunnuo
f689b0f3b2 Merge branch 'v2-dev' into v2 2025-11-13 01:17:55 +08:00
xiaojunnuo
730f614024 build: publish 2025-11-13 01:17:09 +08:00
xiaojunnuo
2e4eb17a48 build: trigger build image 2025-11-13 01:16:45 +08:00
xiaojunnuo
55d2a1f09b v1.37.7 2025-11-13 01:15:01 +08:00
xiaojunnuo
e3a5bcb907 build: prepare to build 2025-11-13 01:12:01 +08:00
xiaojunnuo
d56567c9de chore: teo dns 测试成功 2025-11-13 01:11:04 +08:00
xiaojunnuo
d7c381e05d chore: 1 2025-11-13 00:50:40 +08:00
xiaojunnuo
1d23dd2426 perf: 支持腾讯云teo dns解析 2025-11-13 00:45:05 +08:00
xiaojunnuo
86ce00adf9 perf: 支持使用letencrypt测试环境申请ip证书 2025-11-12 23:56:02 +08:00
xiaojunnuo
e1eef013a8 fix: 修复点击立即触发运行报错的bug 2025-11-12 22:15:17 +08:00
Rab
d20046c866 fix(plugins/woai-cdn): 修正默认接口域名与帮助链接中的路径 (#576) @LjyLab 2025-11-12 15:30:32 +08:00
xiaojunnuo
2df452fe5b Merge branch 'v2' of https://github.com/certd/certd into v2 2025-11-12 09:10:43 +08:00
xiaojunnuo
c31bfd8b94 docs: 1 2025-11-11 16:03:40 +08:00
xiaojunnuo
f443675f4f docs: 1 2025-11-11 16:03:19 +08:00
xiaojunnuo
a44bd8849d chore: 1 2025-11-11 13:29:38 +08:00
xiaojunnuo
274c887140 chore: nslookup 改成dig命令 2025-11-11 11:41:36 +08:00
xiaojunnuo
44973ebd00 fix: 账号绑定页面某些情况下打不开的bug 2025-11-11 11:05:34 +08:00
xiaojunnuo
88f74163ff build: release 2025-11-11 01:16:32 +08:00
xiaojunnuo
6cd57dd426 Merge branch 'v2-dev' into v2 2025-11-11 00:57:37 +08:00
xiaojunnuo
481e866011 build: publish 2025-11-11 00:50:16 +08:00
xiaojunnuo
a78450ba79 build: trigger build image 2025-11-11 00:49:58 +08:00
xiaojunnuo
9fcdeca692 v1.37.6 2025-11-11 00:48:12 +08:00
xiaojunnuo
8e10c56304 build: prepare to build 2025-11-11 00:42:43 +08:00
xiaojunnuo
591f600b11 build: prepare to build 2025-11-11 00:34:53 +08:00
xiaojunnuo
af03e55a73 build: prepare to build 2025-11-11 00:33:55 +08:00
xiaojunnuo
1462cddd1e perf: 支持letencrypt测试环境,支持IP证书? 2025-11-11 00:32:43 +08:00
xiaojunnuo
aac569a925 fix: 修复创建流水线报id不能为空的bug 2025-11-11 00:15:09 +08:00
greper
d19ac1fd15 Update promotional content in README.md 2025-11-10 10:56:54 +08:00
greper
410a23751b Update README.md 2025-11-10 10:56:23 +08:00
greper
8190507e8c Revise README for permanent version promotion
Updated promotional text for the permanent professional version and adjusted the display format.
2025-11-10 10:54:47 +08:00
greper
645f74f39d Update README with promotional content
Added promotional message for permanent professional version and Double Eleven event.
2025-11-10 10:53:38 +08:00
xiaojunnuo
acdf0912d4 perf: server 增加 "@peculiar/x509" 依赖 2025-11-09 20:10:52 +08:00
xiaojunnuo
32e4e91ab8 perf: 增加vip时间同步按钮 2025-11-09 14:38:38 +08:00
xiaojunnuo
b59ca329f3 build: release 2025-11-09 05:19:54 +08:00
xiaojunnuo
beb9099bdc build: publish 2025-11-09 05:08:01 +08:00
xiaojunnuo
a013d95f0f build: trigger build image 2025-11-09 05:07:44 +08:00
xiaojunnuo
9d5daf0015 v1.37.5 2025-11-09 05:06:02 +08:00
xiaojunnuo
1146307736 build: prepare to build 2025-11-09 05:00:01 +08:00
xiaojunnuo
c25eaadc1d build: prepare to build 2025-11-09 04:56:37 +08:00
xiaojunnuo
50f6e76ab9 chore: 1 2025-11-09 04:14:33 +08:00
xiaojunnuo
c3637e731f Merge branch 'v2-dev-buy' into v2-dev 2025-11-09 02:06:57 +08:00
xiaojunnuo
802683b765 chore: 1 2025-11-07 01:50:34 +08:00
xiaojunnuo
335cf93970 perf: doge云支持删除过期证书 2025-11-07 01:46:44 +08:00
xiaojunnuo
041954c067 perf: doge云插件支持选择CDN域名,以及支持同时部署多个域名 2025-11-07 01:38:46 +08:00
xiaojunnuo
2da44c3699 chore: 优化流水线运行时状态timeline被挤成2行的问题 2025-11-07 01:35:30 +08:00
xiaojunnuo
65e53092e8 fix: 修复某些情况下编辑流水线,没有立即展示变更效果的bug 2025-11-07 01:15:05 +08:00
xiaojunnuo
0203aa2b6e perf: 优化任务参数配置界面在手机版下的展示效果 2025-11-07 00:44:13 +08:00
xiaojunnuo
f83fe28a18 chore: 优化input-number 2025-11-06 23:24:58 +08:00
xiaojunnuo
e487b45898 Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev 2025-11-06 23:20:09 +08:00
xiaojunnuo
4a94eab393 perf: 支持列表展示时固定证书最大天数,有助于列表进度条整齐展示 2025-11-06 23:20:02 +08:00
xiaojunnuo
5ff7e6ef0e fix: 修复在苹果手机下输入框被放大的问题 2025-11-05 13:59:40 +08:00
158 changed files with 4666 additions and 2210 deletions

View File

@@ -4,5 +4,10 @@
"typescript.tsc.autoDetect": "watch",
"git.scanRepositories": [
"./packages/pro"
]
],
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"[typescript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"editor.tabSize": 2
}

View File

@@ -3,6 +3,94 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Bug Fixes
* 修复阿里云 waf tlsVersion参数缺失导致部署失败的问题 ([2fabee6](https://github.com/certd/certd/commit/2fabee647acf64afe689f5bea3603028cd0ba4a2))
* 修复备注撑开表格行高的bug ([c7b298c](https://github.com/certd/certd/commit/c7b298c46f0d52b43bd2bb17b374e7970a446446))
* 修复域名管理无法创建tencent-eo dns授权的bug ([3406bb5](https://github.com/certd/certd/commit/3406bb5a4a56bb310cddc1a1f410c70909fd129b))
* openapi 成功后失败都返回msg ([6e735bb](https://github.com/certd/certd/commit/6e735bbd1e29712e939f775a4db974db70e3b4b0))
### Performance Improvements
* ssh支持ppk格式私钥 ([575ae16](https://github.com/certd/certd/commit/575ae164c863d0b1f9fa0890549a2ee7472fb469))
* 优化宝塔网站证书在并发部署时导致nginx配置文件错乱的问题 ([51cc084](https://github.com/certd/certd/commit/51cc08411fd2dbab66d769b495dc1b0bf2f2578c))
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
* ssl.com支持ecc ([b5ec047](https://github.com/certd/certd/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 优化dokploy 部署插件配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
* 站点证书监控备注输入框改成textarea ([70b603d](https://github.com/certd/certd/commit/70b603d601c34f39148c2ab70c655c51babf563d))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
### Bug Fixes
* 商用证书上传保存失败的bug ([075b1dc](https://github.com/certd/certd/commit/075b1dc0eb8c39acc277277b1b334d66b6717ab2))
### Performance Improvements
* 优化阿里云clb 过期证书清理报错的问题 ([d465367](https://github.com/certd/certd/commit/d4653678b2e3643460f918992eeae4044d3a1cc7))
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
### Bug Fixes
* **plugins/woai-cdn:** 修正默认接口域名与帮助链接中的路径 ([#576](https://github.com/certd/certd/issues/576)) @LjyLab ([d20046c](https://github.com/certd/certd/commit/d20046c86681ea177ece434423b7c81a76b437fb))
### Performance Improvements
* 修复西数解析记录添加失败的bug支持部署证书到西数虚拟主机 ([1102952](https://github.com/certd/certd/commit/1102952b4703e8c0bbc17b0700c0ed3ef6f866d3))
* 支持回车键触发登录 ([eb5c88f](https://github.com/certd/certd/commit/eb5c88fbb2901f1a9669429a7cd8dc76f6806d01))
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Bug Fixes
* 修复点击立即触发运行报错的bug ([e1eef01](https://github.com/certd/certd/commit/e1eef013a856d26fe80a05d9ec6e505e2e31e5f9))
* 账号绑定页面某些情况下打不开的bug ([44973eb](https://github.com/certd/certd/commit/44973ebd00e89c0fee8f3b91174157757ce0160f))
### Performance Improvements
* 支持使用letencrypt测试环境申请ip证书 ([86ce00a](https://github.com/certd/certd/commit/86ce00adf92ff98fead87a3eaaa6631036708f47))
* 支持腾讯云teo dns解析 ([1d23dd2](https://github.com/certd/certd/commit/1d23dd2426bd1e4c4dfea0a9e561d665e045ba9d))
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
### Bug Fixes
* 修复创建流水线报id不能为空的bug ([aac569a](https://github.com/certd/certd/commit/aac569a9259ede43399e0ed5d668e936b984d6dd))
### Performance Improvements
* 增加vip时间同步按钮 ([32e4e91](https://github.com/certd/certd/commit/32e4e91ab81008dda422fb53fd6f4d1711c5d80c))
* 支持letencrypt测试环境支持IP证书 ([1462cdd](https://github.com/certd/certd/commit/1462cddd1eb347b7ff238286b5c977b29a0591ec))
* server 增加 "@peculiar/x509" 依赖 ([acdf091](https://github.com/certd/certd/commit/acdf0912d452029f158279fb78155086e4fbac17))
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
### Bug Fixes
* 修复某些情况下编辑流水线没有立即展示变更效果的bug ([65e5309](https://github.com/certd/certd/commit/65e53092e8d677eb34b7d04d68c6f738165f5de2))
* 修复批量修改定时没有立即显示生效的bug ([c166602](https://github.com/certd/certd/commit/c16660254b8d637bd3ca100695934b343875fcbf))
* 修复新部署的无法保存公共eab配置的bug ([6b7631e](https://github.com/certd/certd/commit/6b7631ed5e920582d8e2162ec788b9429238ac29))
* 修复在苹果手机下输入框被放大的问题 ([5ff7e6e](https://github.com/certd/certd/commit/5ff7e6ef0eaa6bc111d0dd3c5713e1658f9113ad))
### Performance Improvements
* 支持记忆字段排序 ([d46b9c5](https://github.com/certd/certd/commit/d46b9c54b14ec5c892f4eed141fb549485941edd))
* 优化任务参数配置界面在手机版下的展示效果 ([0203aa2](https://github.com/certd/certd/commit/0203aa2b6e86e58e5e66a1b9d0278d186aa92554))
* 支持列表展示时固定证书最大天数,有助于列表进度条整齐展示 ([4a94eab](https://github.com/certd/certd/commit/4a94eab3935c89a63892661d9cf0d0891e54aa81))
* 子域名托管说明 ([b5d8161](https://github.com/certd/certd/commit/b5d8161bc2e686e6c8b552de0c29117a5d405313))
* cname方式hostRecord增加user校验 ([bc174f7](https://github.com/certd/certd/commit/bc174f70545e487bd549eff250f8ef69c6d343f3))
* doge云插件支持选择CDN域名以及支持同时部署多个域名 ([041954c](https://github.com/certd/certd/commit/041954c0674fabed54ed2cf5e727fecfb6943d19))
* doge云支持删除过期证书 ([335cf93](https://github.com/certd/certd/commit/335cf9397080a5e09074d5a89d03f59bd051cda5))
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
### Bug Fixes

View File

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

View File

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

View File

@@ -3,6 +3,77 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 优化dokploy 部署插件配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
* 站点证书监控备注输入框改成textarea ([70b603d](https://github.com/certd/certd/commit/70b603d601c34f39148c2ab70c655c51babf563d))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
### Bug Fixes
* 商用证书上传保存失败的bug ([075b1dc](https://github.com/certd/certd/commit/075b1dc0eb8c39acc277277b1b334d66b6717ab2))
### Performance Improvements
* 优化阿里云clb 过期证书清理报错的问题 ([d465367](https://github.com/certd/certd/commit/d4653678b2e3643460f918992eeae4044d3a1cc7))
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
### Bug Fixes
* **plugins/woai-cdn:** 修正默认接口域名与帮助链接中的路径 ([#576](https://github.com/certd/certd/issues/576)) @LjyLab ([d20046c](https://github.com/certd/certd/commit/d20046c86681ea177ece434423b7c81a76b437fb))
### Performance Improvements
* 修复西数解析记录添加失败的bug支持部署证书到西数虚拟主机 ([1102952](https://github.com/certd/certd/commit/1102952b4703e8c0bbc17b0700c0ed3ef6f866d3))
* 支持回车键触发登录 ([eb5c88f](https://github.com/certd/certd/commit/eb5c88fbb2901f1a9669429a7cd8dc76f6806d01))
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Bug Fixes
* 修复点击立即触发运行报错的bug ([e1eef01](https://github.com/certd/certd/commit/e1eef013a856d26fe80a05d9ec6e505e2e31e5f9))
* 账号绑定页面某些情况下打不开的bug ([44973eb](https://github.com/certd/certd/commit/44973ebd00e89c0fee8f3b91174157757ce0160f))
### Performance Improvements
* 支持使用letencrypt测试环境申请ip证书 ([86ce00a](https://github.com/certd/certd/commit/86ce00adf92ff98fead87a3eaaa6631036708f47))
* 支持腾讯云teo dns解析 ([1d23dd2](https://github.com/certd/certd/commit/1d23dd2426bd1e4c4dfea0a9e561d665e045ba9d))
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
### Bug Fixes
* 修复创建流水线报id不能为空的bug ([aac569a](https://github.com/certd/certd/commit/aac569a9259ede43399e0ed5d668e936b984d6dd))
### Performance Improvements
* 增加vip时间同步按钮 ([32e4e91](https://github.com/certd/certd/commit/32e4e91ab81008dda422fb53fd6f4d1711c5d80c))
* 支持letencrypt测试环境支持IP证书 ([1462cdd](https://github.com/certd/certd/commit/1462cddd1eb347b7ff238286b5c977b29a0591ec))
* server 增加 "@peculiar/x509" 依赖 ([acdf091](https://github.com/certd/certd/commit/acdf0912d452029f158279fb78155086e4fbac17))
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
### Bug Fixes
* 修复某些情况下编辑流水线没有立即展示变更效果的bug ([65e5309](https://github.com/certd/certd/commit/65e53092e8d677eb34b7d04d68c6f738165f5de2))
* 修复批量修改定时没有立即显示生效的bug ([c166602](https://github.com/certd/certd/commit/c16660254b8d637bd3ca100695934b343875fcbf))
* 修复新部署的无法保存公共eab配置的bug ([6b7631e](https://github.com/certd/certd/commit/6b7631ed5e920582d8e2162ec788b9429238ac29))
* 修复在苹果手机下输入框被放大的问题 ([5ff7e6e](https://github.com/certd/certd/commit/5ff7e6ef0eaa6bc111d0dd3c5713e1658f9113ad))
### Performance Improvements
* 支持记忆字段排序 ([d46b9c5](https://github.com/certd/certd/commit/d46b9c54b14ec5c892f4eed141fb549485941edd))
* 优化任务参数配置界面在手机版下的展示效果 ([0203aa2](https://github.com/certd/certd/commit/0203aa2b6e86e58e5e66a1b9d0278d186aa92554))
* 支持列表展示时固定证书最大天数,有助于列表进度条整齐展示 ([4a94eab](https://github.com/certd/certd/commit/4a94eab3935c89a63892661d9cf0d0891e54aa81))
* 子域名托管说明 ([b5d8161](https://github.com/certd/certd/commit/b5d8161bc2e686e6c8b552de0c29117a5d405313))
* cname方式hostRecord增加user校验 ([bc174f7](https://github.com/certd/certd/commit/bc174f70545e487bd549eff250f8ef69c6d343f3))
* doge云插件支持选择CDN域名以及支持同时部署多个域名 ([041954c](https://github.com/certd/certd/commit/041954c0674fabed54ed2cf5e727fecfb6943d19))
* doge云支持删除过期证书 ([335cf93](https://github.com/certd/certd/commit/335cf9397080a5e09074d5a89d03f59bd051cda5))
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
### Bug Fixes

View File

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

View File

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

View File

@@ -19,9 +19,15 @@ header中传入x-certd-token即可调用开放接口
4、然后将content和sign分别base64后用.号连接: x-certd-token = base64(content) +"."+base64(sign)
## 补充说明
1.证书申请接口支持证书id和域名两种方式获取证书。
2.autoApply=true将在没有证书时自动触发申请申请过程中会提示`正在申请中`,可轮循获取状态,直到证书申请成功。
## 参数
支持证书id和域名两种方式获取证书。
## 创建新的证书申请
参数autoApply=true将在没有证书时自动触发申请证书检查逻辑如下
1. 如果证书仓库里面有,且没有过期,就直接返回证书
2. 如果没有或者已过期,就会去找流水线,有就触发流水线执行
3. 如果没有流水线,就创建一个流水线,触发运行(`注意:需要提前在域名管理中配置好域名校验方式,否则会申请失败`
4. 再次采用相同参数请求接口,如果在申请过程中,就会提示`正在申请中`,可轮循获取状态,直到证书申请成功。
## SDK

View File

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

View File

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

View File

@@ -9,5 +9,5 @@
}
},
"npmClient": "pnpm",
"version": "1.37.4"
"version": "1.37.11"
}

View File

@@ -3,6 +3,41 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.11](https://github.com/publishlab/node-acme-client/compare/v1.37.10...v1.37.11) (2025-11-28)
### Performance Improvements
* ssl.com支持ecc ([b5ec047](https://github.com/publishlab/node-acme-client/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
## [1.37.10](https://github.com/publishlab/node-acme-client/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/acme-client
## [1.37.9](https://github.com/publishlab/node-acme-client/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/acme-client
## [1.37.8](https://github.com/publishlab/node-acme-client/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/acme-client
## [1.37.7](https://github.com/publishlab/node-acme-client/compare/v1.37.6...v1.37.7) (2025-11-12)
### Performance Improvements
* 支持使用letencrypt测试环境申请ip证书 ([86ce00a](https://github.com/publishlab/node-acme-client/commit/86ce00adf92ff98fead87a3eaaa6631036708f47))
* 支持腾讯云teo dns解析 ([1d23dd2](https://github.com/publishlab/node-acme-client/commit/1d23dd2426bd1e4c4dfea0a9e561d665e045ba9d))
## [1.37.6](https://github.com/publishlab/node-acme-client/compare/v1.37.5...v1.37.6) (2025-11-10)
### Performance Improvements
* 支持letencrypt测试环境支持IP证书 ([1462cdd](https://github.com/publishlab/node-acme-client/commit/1462cddd1eb347b7ff238286b5c977b29a0591ec))
## [1.37.5](https://github.com/publishlab/node-acme-client/compare/v1.37.4...v1.37.5) (2025-11-08)
**Note:** Version bump only for package @certd/acme-client
## [1.37.4](https://github.com/publishlab/node-acme-client/compare/v1.37.3...v1.37.4) (2025-10-28)
**Note:** Version bump only for package @certd/acme-client

View File

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

View File

@@ -4,6 +4,9 @@
import { readCsrDomains } from "./crypto/index.js";
import { wait } from "./wait.js";
import { CancelError } from "./error.js";
import { domainUtils } from '@certd/basic';
const defaultOpts = {
@@ -65,7 +68,7 @@ export default async (client, userOpts) => {
* Parse domains from CSR
*/
log("[auto] Parsing domains from Certificate Signing Request ");
log("[auto] Parsing domains from Certificate Signing Request");
const { commonName, altNames } = readCsrDomains(opts.csr);
const uniqueDomains = Array.from(new Set([commonName].concat(altNames).filter((d) => d)));
@@ -76,9 +79,21 @@ export default async (client, userOpts) => {
*/
log("[auto] Placing new certificate order with ACME provider");
const orderPayload = { identifiers: uniqueDomains.map((d) => ({ type: "dns", value: d })) };
if (opts.profile && client.sslProvider === 'letsencrypt' ){
let hasIp = false
const orderPayload = { identifiers: uniqueDomains.map((d) =>{
// 判断是否为IPv4或v6否则按域名处理
const type = domainUtils.isIp(d) ? 'ip' : 'dns';
if(type === 'ip'){
hasIp = true
}
return { type, value: d }
}) };
if (opts.profile && client.sslProvider.startsWith("letsencrypt") ){
orderPayload.profile = opts.profile;
if(hasIp){
orderPayload.profile = "shortlived"
}
}
const order = await client.createOrder(orderPayload);
const authorizations = await client.getAuthorizations(order);

View File

@@ -7,7 +7,7 @@ import { createHash } from 'crypto';
import { getPemBodyAsB64u } from './crypto/index.js';
import HttpClient from './http.js';
import AcmeApi from './api.js';
import verify from './verify.js';
import {createChallengeFn} from './verify.js';
import * as util from './util.js';
import auto from './auto.js';
import { CancelError } from './error.js';
@@ -492,6 +492,9 @@ class AcmeClient {
throw new Error('Unable to verify ACME challenge, URL not found');
}
const {challenges} = createChallengeFn({logger:this.logger});
const verify = challenges
if (typeof verify[challenge.type] === 'undefined') {
throw new Error(`Unable to verify ACME challenge, unknown type: ${challenge.type}`);
}
@@ -507,7 +510,12 @@ class AcmeClient {
};
this.log('Waiting for ACME challenge verification等待ACME检查验证');
return util.retry(verifyFn, this.backoffOpts);
const log = (...args)=>{
this.logger.info(...args)
}
return util.retry(verifyFn, this.backoffOpts,log);
}
/**

View File

@@ -21,6 +21,9 @@ export const directory = {
staging: 'https://acme-staging-v02.api.letsencrypt.org/directory',
production: 'https://acme-v02.api.letsencrypt.org/directory',
},
letsencrypt_staging: {
production: 'https://acme-staging-v02.api.letsencrypt.org/directory',
},
zerossl: {
staging: 'https://acme.zerossl.com/v2/DV90',
production: 'https://acme.zerossl.com/v2/DV90',
@@ -28,9 +31,28 @@ export const directory = {
sslcom:{
staging: 'https://acme.ssl.com/sslcom-dv-rsa',
production: 'https://acme.ssl.com/sslcom-dv-rsa',
ec: 'https://acme.ssl.com/sslcom-dv-ecc',
}
};
export function getDirectoryUrl(opts) {
const {sslProvider, pkType} = opts
const list= directory[sslProvider]
if (!list) {
throw new Error(`sslProvider ${sslProvider} not found`)
}
let pkTypePrefix = pkType || 'rsa'
if (pkType) {
pkTypePrefix = pkType.toLowerCase().split("_")[0]
}
if (pkTypePrefix && list[pkTypePrefix]) {
return list[pkTypePrefix]
}
return list.production
}
/**
* Crypto
*/

View File

@@ -48,7 +48,7 @@ class Backoff {
* @returns {Promise}
*/
async function retryPromise(fn, attempts, backoff) {
async function retryPromise(fn, attempts, backoff, logger = log) {
let aborted = false;
try {
@@ -60,12 +60,12 @@ async function retryPromise(fn, attempts, backoff) {
throw e;
}
log(`Promise rejected: ${e.message}`);
logger(`Promise rejected: ${e.message}`);
const duration = backoff.duration();
log(`Promise rejected attempt #${backoff.attempts}, ${duration}ms 后重试: ${e.message}`);
logger(`Promise rejected attempt #${backoff.attempts}, ${duration}ms 后重试: ${e.message}`);
await new Promise((resolve) => { setTimeout(resolve, duration); });
return retryPromise(fn, attempts, backoff);
return retryPromise(fn, attempts, backoff, logger);
}
}
@@ -80,9 +80,9 @@ async function retryPromise(fn, attempts, backoff) {
* @returns {Promise}
*/
function retry(fn, { attempts = 5, min = 5000, max = 30000 } = {}) {
function retry(fn, { attempts = 5, min = 5000, max = 30000 } = {}, logger = log) {
const backoff = new Backoff({ min, max });
return retryPromise(fn, attempts, backoff);
return retryPromise(fn, attempts, backoff, logger);
}
/**
@@ -216,21 +216,21 @@ function formatResponseError(resp) {
* @returns {Promise<string>} Root domain name
*/
async function resolveDomainBySoaRecord(recordName) {
async function resolveDomainBySoaRecord(recordName, logger = log) {
try {
await dns.resolveSoa(recordName);
log(`找到${recordName}的SOA记录`);
logger(`找到${recordName}的SOA记录`);
return recordName;
}
catch (e) {
log(`找不到${recordName}的SOA记录,继续往主域名查找`);
logger(`找不到${recordName}的SOA记录,继续往主域名查找`);
const parentRecordName = recordName.split('.').slice(1).join('.');
if (!parentRecordName.includes('.')) {
throw new Error('SOA record查找失败');
}
return resolveDomainBySoaRecord(parentRecordName);
return resolveDomainBySoaRecord(parentRecordName,logger);
}
}
@@ -241,18 +241,18 @@ async function resolveDomainBySoaRecord(recordName) {
* @returns {Promise<dns.Resolver>} DNS resolver
*/
async function getAuthoritativeDnsResolver(recordName) {
log(`获取域名${recordName}的权威NS服务器: `);
async function getAuthoritativeDnsResolver(recordName, logger = log) {
logger(`获取域名${recordName}的权威NS服务器: `);
const resolver = new dns.Resolver();
try {
/* Resolve root domain by SOA */
const domain = await resolveDomainBySoaRecord(recordName);
const domain = await resolveDomainBySoaRecord(recordNam,logger);
/* Resolve authoritative NS addresses */
log(`获取到权威NS服务器name: ${domain}`);
logger(`获取到权威NS服务器name: ${domain}`);
const nsRecords = await dns.resolveNs(domain);
log(`域名权威NS服务器${nsRecords}`);
logger(`域名权威NS服务器${nsRecords}`);
const nsAddrArray = await Promise.all(nsRecords.map(async (r) => dns.resolve4(r)));
const nsAddresses = [].concat(...nsAddrArray).filter((a) => a);
@@ -261,16 +261,16 @@ async function getAuthoritativeDnsResolver(recordName) {
}
/* Authoritative NS success */
log(`Found ${nsAddresses.length} authoritative NS addresses for domain: ${domain}`);
logger(`Found ${nsAddresses.length} authoritative NS addresses for domain: ${domain}`);
resolver.setServers(nsAddresses);
}
catch (e) {
log(`Authoritative NS lookup error获取权威NS服务器地址失败: ${e.message}`);
logger(`Authoritative NS lookup error获取权威NS服务器地址失败: ${e.message}`);
}
/* Return resolver */
const addresses = resolver.getServers();
log(`DNS resolver addresses域名的权威NS服务器地址: ${addresses.join(', ')}`);
logger(`DNS resolver addresses域名的权威NS服务器地址: ${addresses.join(', ')}`);
return resolver;
}

View File

@@ -4,14 +4,22 @@
import dnsSdk from "dns"
import https from 'https'
import {log} from './logger.js'
import {log as defaultLog} from './logger.js'
import axios from './axios.js'
import * as util from './util.js'
import {isAlpnCertificateAuthorizationValid} from './crypto/index.js'
const dns = dnsSdk.promises
/**
export function createChallengeFn(opts = {}){
const logger = opts?.logger || {info:defaultLog,error:defaultLog,warn:defaultLog,debug:defaultLog}
const log = function(...args){
logger.info(...args)
}
/**
* Verify ACME HTTP challenge
*
* https://datatracker.ietf.org/doc/html/rfc8555#section-8.3
@@ -112,7 +120,7 @@ async function walkDnsChallengeRecord(recordName, resolver = dns,deep = 0) {
return records
}
export async function walkTxtRecord(recordName,deep = 0) {
async function walkTxtRecord(recordName,deep = 0) {
if(deep >5){
log(`walkTxtRecord too deep (#${deep}) , skip walk`)
return []
@@ -136,7 +144,7 @@ export async function walkTxtRecord(recordName,deep = 0) {
try{
/* Authoritative DNS resolver */
log(`从域名权威服务器获取TXT解析记录`);
const authoritativeResolver = await util.getAuthoritativeDnsResolver(recordName);
const authoritativeResolver = await util.getAuthoritativeDnsResolver(recordName,log);
const res = await walkDnsChallengeRecord(recordName, authoritativeResolver,deep);
if (res && res.length > 0) {
for (const item of res) {
@@ -173,7 +181,8 @@ async function verifyDnsChallenge(authz, challenge, keyAuthorization, prefix = '
recordValues = [...new Set(recordValues)];
log(`DNS查询成功, 找到 ${recordValues.length} 条TXT记录${recordValues}`);
if (!recordValues.length || !recordValues.includes(keyAuthorization)) {
throw new Error(`没有找到需要的DNS TXT记录: ${recordName},期望:${keyAuthorization},结果:${recordValues}`);
const err = `没有找到需要的DNS TXT记录: ${recordName},期望:${keyAuthorization},结果:${recordValues}`
throw new Error(err);
}
log(`关键授权匹配成功(${challenge.type}/${recordName}:${keyAuthorization},校验成功, ACME challenge verified`);
@@ -207,12 +216,13 @@ async function verifyTlsAlpnChallenge(authz, challenge, keyAuthorization) {
return true;
}
/**
* Export API
*/
return {
challenges:{
'http-01': verifyHttpChallenge,
'dns-01': verifyDnsChallenge,
'tls-alpn-01': verifyTlsAlpnChallenge,
},
walkTxtRecord,
}
export default {
'http-01': verifyHttpChallenge,
'dns-01': verifyDnsChallenge,
'tls-alpn-01': verifyTlsAlpnChallenge,
};
}

View File

@@ -108,12 +108,17 @@ export const directory: {
staging: string,
production: string
},
letsencrypt_staging: {
production: string
},
zerossl: {
staging: string,
production: string
}
};
export function getDirectoryUrl(opts:{sslProvider:string, pkType: string}): string;
/**
* Crypto
*/
@@ -204,7 +209,8 @@ export const agents: any;
export function setLogger(fn: (message: any, ...args: any[]) => void): void;
export function walkTxtRecord(record: any): Promise<string[]>;
export function createChallengeFn(opts?: {logger?:any}): any;
// export function walkTxtRecord(record: any): Promise<string[]>;
export function getAuthoritativeDnsResolver(record:string): Promise<any>;
export const CancelError: typeof CancelError;

View File

@@ -3,6 +3,40 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Performance Improvements
* 优化宝塔网站证书在并发部署时导致nginx配置文件错乱的问题 ([51cc084](https://github.com/certd/certd/commit/51cc08411fd2dbab66d769b495dc1b0bf2f2578c))
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
* ssl.com支持ecc ([b5ec047](https://github.com/certd/certd/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/basic
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/basic
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/basic
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Performance Improvements
* 支持使用letencrypt测试环境申请ip证书 ([86ce00a](https://github.com/certd/certd/commit/86ce00adf92ff98fead87a3eaaa6631036708f47))
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
**Note:** Version bump only for package @certd/basic
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
**Note:** Version bump only for package @certd/basic
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
**Note:** Version bump only for package @certd/basic

View File

@@ -1 +1 @@
01:28
04:13

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/basic",
"private": false,
"version": "1.37.4",
"version": "1.37.11",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -17,6 +17,7 @@
"compile": "tsc --skipLibCheck --watch"
},
"dependencies": {
"async-lock": "^1.4.1",
"axios": "^1.7.2",
"dayjs": "^1.11.7",
"http-proxy-agent": "^7.0.2",
@@ -46,5 +47,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
}

View File

@@ -7,29 +7,29 @@ function match(targetDomains: string | string[], inDomains: string[]) {
return false;
}
if (typeof targetDomains === 'string') {
if (typeof targetDomains === "string") {
targetDomains = [targetDomains];
}
for (let targetDomain of targetDomains) {
let matched = false;
if (targetDomain.startsWith('.')) {
targetDomain = '*' + targetDomain;
if (targetDomain.startsWith(".")) {
targetDomain = "*" + targetDomain;
}
for (let inDomain of inDomains) {
if (inDomain.startsWith('.')) {
inDomain = '*' + inDomain;
if (inDomain.startsWith(".")) {
inDomain = "*" + inDomain;
}
if (targetDomain === inDomain) {
matched = true;
break;
}
if (!inDomain.startsWith('*.')) {
if (!inDomain.startsWith("*.")) {
//不可能匹配
continue;
}
//子域名匹配通配符即可
const firstDotIndex = targetDomain.indexOf('.');
const firstDotIndex = targetDomain.indexOf(".");
const targetDomainSuffix = targetDomain.substring(firstDotIndex + 1);
if (targetDomainSuffix === inDomain.substring(2)) {
matched = true;
@@ -46,6 +46,32 @@ function match(targetDomains: string | string[], inDomains: string[]) {
return true;
}
function isIpv4(d: string) {
if (!d) {
return false;
}
const isIPv4Regex = /^(\d{1,3}\.){3}\d{1,3}$/;
return isIPv4Regex.test(d);
}
function isIpv6(d: string) {
if (!d) {
return false;
}
const isIPv6Regex = /^([\da-f]{1,4}:){2,7}[\da-f]{1,4}$/i;
return isIPv6Regex.test(d);
}
function isIp(d: string) {
if (!d) {
return false;
}
return isIpv4(d) || isIpv6(d);
}
export const domainUtils = {
match,
isIpv4,
isIpv6,
isIp,
};

View File

@@ -1,46 +1,16 @@
import { logger, utils } from './index.js';
// @ts-ignore
import AsyncLock from "async-lock";
export class Locker {
locked: Record<string, any> = {};
private asyncLocker: AsyncLock;
async execute(lockStr: string, callback: any) {
await this.lock(lockStr);
const timeoutId = setTimeout(() => {
logger.warn('Lock timeout,自动解锁', lockStr);
this.unlock(lockStr);
}, 20000);
try {
return await callback();
} finally {
clearTimeout(timeoutId);
this.unlock(lockStr);
}
constructor() {
this.asyncLocker = new AsyncLock();
}
async lock(str: string) {
const isLocked = this.isLocked(str);
if (isLocked) {
let count = 0;
while (true) {
await utils.sleep(100);
if (!this.isLocked(str)) {
break;
}
count++;
if (count > 20) {
throw new Error('Lock timeout');
}
}
}
this.locked[str] = true;
}
unlock(str: string) {
delete this.locked[str];
}
isLocked(str: string) {
return this.locked[str] ?? false;
async execute(lockStr: string, callback: any, options?: { timeout?: number }) {
const timeout = options?.timeout ?? 120000;
return this.asyncLocker.acquire(lockStr, callback, { timeout });
}
}

View File

@@ -0,0 +1,14 @@
import { random } from "lodash-es";
import { locker } from "./dist/utils/util.lock.js";
async function testLocker() {
for (let i = 0; i < 10; i++) {
await locker.execute("test", async () => {
console.log("test", i);
await new Promise(resolve => setTimeout(resolve, Math.random() * 1000));
throw new Error("test error");
});
}
}
await testLocker();

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/lib-iframe",
"private": false,
"version": "1.37.4",
"version": "1.37.11",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -31,5 +31,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
}

View File

@@ -3,6 +3,36 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Performance Improvements
* ssh支持ppk格式私钥 ([575ae16](https://github.com/certd/certd/commit/575ae164c863d0b1f9fa0890549a2ee7472fb469))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/jdcloud
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/jdcloud
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/jdcloud
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
**Note:** Version bump only for package @certd/jdcloud
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
**Note:** Version bump only for package @certd/jdcloud
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
**Note:** Version bump only for package @certd/jdcloud
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
**Note:** Version bump only for package @certd/jdcloud

View File

@@ -1,13 +1,11 @@
{
"name": "@certd/jdcloud",
"version": "1.37.4",
"version": "1.37.11",
"description": "jdcloud openApi sdk",
"main": "./dist/bundle.js",
"module": "./dist/bundle.js",
"types": "./dist/d/index.d.ts",
"scripts": {
"test": "cross-env NODE_CONFIG_DIR=./test/config mocha --recursive --require babel-register",
"dev": "babel src --out-dir babel -w",
"build": "rollup -c ",
"dev-build": "npm run build",
"pub": "npm publish"
@@ -15,7 +13,6 @@
"author": "",
"license": "Apache",
"dependencies": {
"babel-register": "^6.26.0",
"buffer": "^5.0.8",
"create-hash": "^1.1.3",
"create-hmac": "^1.1.6",
@@ -30,8 +27,6 @@
"@rollup/plugin-typescript": "^11.0.0",
"@typescript-eslint/eslint-plugin": "^8.26.1",
"@typescript-eslint/parser": "^8.26.1",
"babel-cli": "^6.26.0",
"babel-preset-env": "^1.6.1",
"chai": "^4.1.2",
"config": "^1.30.0",
"cross-env": "^5.1.4",
@@ -61,5 +56,5 @@
"fetch"
]
},
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
}

View File

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

View File

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

View File

@@ -3,6 +3,38 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Performance Improvements
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/lib-server
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/lib-server
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/lib-server
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
**Note:** Version bump only for package @certd/lib-server
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
**Note:** Version bump only for package @certd/lib-server
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
### Performance Improvements
* 支持列表展示时固定证书最大天数,有助于列表进度条整齐展示 ([4a94eab](https://github.com/certd/certd/commit/4a94eab3935c89a63892661d9cf0d0891e54aa81))
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
**Note:** Version bump only for package @certd/lib-server

View File

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

View File

@@ -1,5 +1,5 @@
import { PermissionException, ValidateException } from './exception/index.js';
import { In, Repository, SelectQueryBuilder } from 'typeorm';
import { FindOneOptions, In, Repository, SelectQueryBuilder } from 'typeorm';
import { Inject } from '@midwayjs/core';
import { TypeORMDataSourceManager } from '@midwayjs/typeorm';
import { EntityManager } from 'typeorm/entity-manager/EntityManager.js';
@@ -238,4 +238,8 @@ export abstract class BaseService<T> {
await this.delete(ids);
}
async findOne(options: FindOneOptions<T>) {
return await this.getRepository().findOne(options);
}
}

View File

@@ -16,7 +16,7 @@ export class SysPublicSettings extends BaseSettings {
static __access__ = 'public';
registerEnabled = false;
userValidTimeEnabled?:boolean = false;
userValidTimeEnabled?: boolean = false;
passwordLoginEnabled = true;
usernameRegisterEnabled = true;
mobileRegisterEnabled = false;
@@ -36,7 +36,7 @@ export class SysPublicSettings extends BaseSettings {
captchaEnabled = false;
//验证码类型
captchaType?: string;
captchaAddonId?:number;
captchaAddonId?: number;
@@ -46,6 +46,17 @@ export class SysPublicSettings extends BaseSettings {
//证书域名添加到监控
certDomainAddToMonitorEnabled?: boolean = false;
// 固定证书有效期天数0表示不固定
fixedCertExpireDays?: number;
// 第三方OAuth配置
oauthEnabled?: boolean = false;
oauthProviders: Record<string, {
type: string;
title: string;
addonId: number;
}> = {};
}
export class SysPrivateSettings extends BaseSettings {
@@ -66,9 +77,9 @@ export class SysPrivateSettings extends BaseSettings {
type?: string;
config?: any;
} = {
type: 'aliyun',
config: {},
};
type: 'aliyun',
config: {},
};
removeSecret() {
const clone = cloneDeep(this);
@@ -193,7 +204,7 @@ export class SysSuiteSetting extends BaseSettings {
static __key__ = 'sys.suite';
static __access__ = 'private';
enabled:boolean = false;
enabled: boolean = false;
registerGift?: {
productId: number;
@@ -218,11 +229,9 @@ export class SysSafeSetting extends BaseSettings {
static __access__ = 'private';
// 站点隐藏
hidden:SiteHidden = {
hidden: SiteHidden = {
enabled: false,
hiddenOpenApi:false,
hiddenOpenApi: false,
autoHiddenTimes: 5,
};
}

View File

@@ -31,6 +31,7 @@ export type AddonDefine = Registrable & {
[key: string]: AddonInputDefine;
};
showTest?: boolean;
icon?: string;
};
export type AddonInstanceConfig = {

View File

@@ -76,7 +76,7 @@ export class AddonService extends BaseService<AddonEntity> {
getDefineList(addonType: string) {
return addonRegistry.getDefineList();
return addonRegistry.getDefineList(addonType);
}
getDefineByType(type: string, prefix?: string) {
@@ -187,4 +187,14 @@ export class AddonService extends BaseService<AddonEntity> {
});
return this.buildAddonInstanceConfig(res);
}
async getOneByType(req:{addonType:string,type:string,userId:number}) {
return await this.repository.findOne({
where: {
addonType: req.addonType,
type: req.type,
userId: req.userId
}
});
}
}

View File

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

View File

@@ -1,6 +1,6 @@
{
"name": "@certd/midway-flyway-js",
"version": "1.37.4",
"version": "1.37.11",
"description": "midway with flyway, sql upgrade way ",
"private": false,
"type": "module",
@@ -46,5 +46,5 @@
"typeorm": "^0.3.11",
"typescript": "^5.4.2"
},
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
}

View File

@@ -3,6 +3,43 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Performance Improvements
* ssl.com支持ecc ([b5ec047](https://github.com/certd/certd/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 优化dokploy 部署插件配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/plugin-cert
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/plugin-cert
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Performance Improvements
* 支持使用letencrypt测试环境申请ip证书 ([86ce00a](https://github.com/certd/certd/commit/86ce00adf92ff98fead87a3eaaa6631036708f47))
* 支持腾讯云teo dns解析 ([1d23dd2](https://github.com/certd/certd/commit/1d23dd2426bd1e4c4dfea0a9e561d665e045ba9d))
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
### Performance Improvements
* 支持letencrypt测试环境支持IP证书 ([1462cdd](https://github.com/certd/certd/commit/1462cddd1eb347b7ff238286b5c977b29a0591ec))
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
**Note:** Version bump only for package @certd/plugin-cert
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
### Bug Fixes

View File

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

View File

@@ -50,7 +50,7 @@ export type CertInfo = {
one?: string;
p7b?: string;
};
export type SSLProvider = "letsencrypt" | "google" | "zerossl" | "sslcom";
export type SSLProvider = "letsencrypt" | "google" | "zerossl" | "sslcom" | "letsencrypt_staging";
export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521";
type AcmeServiceOptions = {
userContext: IContext;
@@ -111,7 +111,7 @@ export class AcmeService {
await this.userContext.setObj(this.buildAccountKey(email), conf);
}
async getAcmeClient(email: string, isTest = false): Promise<acme.Client> {
async getAcmeClient(email: string): Promise<acme.Client> {
const mappings = {};
if (this.sslProvider === "letsencrypt") {
mappings["acme-v02.api.letsencrypt.org"] = this.options.reverseProxy || "le.px.certd.handfree.work";
@@ -128,12 +128,7 @@ export class AcmeService {
await this.saveAccountConfig(email, conf);
this.logger.info(`创建新的Accountkey:${email}`);
}
let directoryUrl = "";
if (isTest) {
directoryUrl = acme.directory[this.sslProvider].staging;
} else {
directoryUrl = acme.directory[this.sslProvider].production;
}
const directoryUrl = acme.getDirectoryUrl({ sslProvider: this.sslProvider, pkType: this.options.privateKeyType });
if (this.options.useMappingProxy) {
urlMapping.enabled = true;
} else {
@@ -327,13 +322,12 @@ export class AcmeService {
domainsVerifyPlan?: DomainsVerifyPlan;
httpUploader?: any;
csrInfo: any;
isTest?: boolean;
privateKeyType?: string;
profile?: string;
preferredChain?: string;
}): Promise<CertInfo> {
const { email, isTest, csrInfo, dnsProvider, domainsVerifyPlan, profile, preferredChain } = options;
const client: acme.Client = await this.getAcmeClient(email, isTest);
const { email, csrInfo, dnsProvider, domainsVerifyPlan, profile, preferredChain } = options;
const client: acme.Client = await this.getAcmeClient(email);
let domains = options.domains;
const encodingDomains = [];
@@ -343,7 +337,7 @@ export class AcmeService {
domains = encodingDomains;
/* Create CSR */
const { commonName, altNames } = this.buildCommonNameByDomains(domains);
const { altNames } = this.buildCommonNameByDomains(domains);
let privateKey = null;
const privateKeyType = options.privateKeyType || "rsa_2048";
const privateKeyArr = privateKeyType.split("_");
@@ -370,15 +364,13 @@ export class AcmeService {
//兼容老版本
createCsr = acme.forge.createCsr;
}
const [key, csr] = await createCsr(
{
commonName,
...csrInfo,
altNames,
// emailAddress: email,
},
privateKey
);
const csrData: any = {
// commonName,
...csrInfo,
altNames,
// emailAddress: email,
};
const [key, csr] = await createCsr(csrData, privateKey);
if (dnsProvider == null && domainsVerifyPlan == null) {
throw new Error("dnsProvider 、 domainsVerifyPlan不能都为空");
@@ -423,7 +415,7 @@ export class AcmeService {
}
buildCommonNameByDomains(domains: string | string[]): {
commonName: string;
commonName?: string;
altNames: string[] | undefined;
} {
if (typeof domains === "string") {
@@ -432,14 +424,14 @@ export class AcmeService {
if (domains.length === 0) {
throw new Error("domain can not be empty");
}
const commonName = domains[0];
let altNames: undefined | string[] = undefined;
if (domains.length > 1) {
altNames = _.slice(domains, 1);
}
// const commonName = domains[0];
// let altNames: undefined | string[] = undefined;
// if (domains.length > 1) {
// altNames = _.slice(domains, 1);
// }
return {
commonName,
altNames,
// commonName,
altNames: domains,
};
}

View File

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

View File

@@ -137,6 +137,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
{ value: "google", label: "Google免费", icon: "flat-color-icons:google" },
{ value: "zerossl", label: "ZeroSSL免费", icon: "emojione:digit-zero" },
{ value: "sslcom", label: "SSL.com仅主域名和www免费", icon: "la:expeditedssl" },
{ value: "letsencrypt_staging", label: "Let's Encrypt测试环境IP证书", icon: "simple-icons:letsencrypt" },
],
},
helper: "Let's Encrypt申请最简单\nGoogle大厂光环兼容性好仅首次需要翻墙获取EAB授权\nZeroSSL需要EAB授权无需翻墙\nSSL.com仅主域名和www免费,必须设置CAA记录",
@@ -412,7 +413,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
async onInit() {
let eab: EabAccess = null;
if (this.sslProvider && this.sslProvider !== "letsencrypt") {
if (this.sslProvider && !this.sslProvider.startsWith("letsencrypt")) {
if (this.sslProvider === "google" && this.googleAccessId) {
this.logger.info("当前正在使用 google服务账号授权获取EAB");
const googleAccess = await this.getAccess(this.googleAccessId);
@@ -495,7 +496,6 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
dnsProvider,
domainsVerifyPlan,
csrInfo,
isTest: false,
privateKeyType: this.privateKeyType,
profile: this.certProfile,
preferredChain: this.preferredChain,

View File

@@ -17,6 +17,7 @@
"@typescript-eslint/ban-ts-ignore": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-unused-vars": "off"
"@typescript-eslint/no-unused-vars": "off",
"max-len": [0, 160, 2, { "ignoreUrls": true }]
}
}

View File

@@ -3,6 +3,39 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Performance Improvements
* ssh支持ppk格式私钥 ([575ae16](https://github.com/certd/certd/commit/575ae164c863d0b1f9fa0890549a2ee7472fb469))
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
**Note:** Version bump only for package @certd/plugin-lib
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
**Note:** Version bump only for package @certd/plugin-lib
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
**Note:** Version bump only for package @certd/plugin-lib
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Performance Improvements
* 支持腾讯云teo dns解析 ([1d23dd2](https://github.com/certd/certd/commit/1d23dd2426bd1e4c4dfea0a9e561d665e045ba9d))
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
**Note:** Version bump only for package @certd/plugin-lib
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
**Note:** Version bump only for package @certd/plugin-lib
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
**Note:** Version bump only for package @certd/plugin-lib

View File

@@ -1,7 +1,7 @@
{
"name": "@certd/plugin-lib",
"private": false,
"version": "1.37.4",
"version": "1.37.11",
"type": "module",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@@ -22,8 +22,8 @@
"@alicloud/pop-core": "^1.7.10",
"@alicloud/tea-util": "^1.4.10",
"@aws-sdk/client-s3": "^3.787.0",
"@certd/basic": "^1.37.4",
"@certd/pipeline": "^1.37.4",
"@certd/basic": "^1.37.11",
"@certd/pipeline": "^1.37.11",
"@kubernetes/client-node": "0.21.0",
"ali-oss": "^6.22.0",
"basic-ftp": "^5.0.5",
@@ -35,7 +35,7 @@
"rimraf": "^5.0.5",
"socks": "^2.8.3",
"socks-proxy-agent": "^8.0.4",
"ssh2": "^1.15.0",
"ssh2": "1.17.0",
"strip-ansi": "^7.1.0",
"tencentcloud-sdk-nodejs": "^4.0.1005"
},
@@ -53,5 +53,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
}

View File

@@ -7,4 +7,5 @@ export * from "./qiniu/index.js";
export * from "./ctyun/index.js";
export * from "./oss/index.js";
export * from "./s3/index.js";
export * from "./lib/index.js";
export * from "./lib/index.js";
export * from "./service/index.js";

View File

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

View File

@@ -0,0 +1,7 @@
export type SiteInfo = {
siteUrl: string;
};
export interface ISiteInfoGetter {
getSiteInfo(): Promise<SiteInfo>;
}

View File

@@ -64,4 +64,8 @@ export class TencentAccess extends BaseAccess {
intlDomain() {
return this.isIntl() ? "intl." : "";
}
buildEndpoint(endpoint: string) {
return `${this.intlDomain()}${endpoint}`;
}
}

View File

@@ -36,7 +36,7 @@ export class TencentSslClient {
checkRet(ret: any) {
if (!ret || ret.Error) {
throw new Error("请求失败:" + ret.Error.Code + "," + ret.Error.Message);
throw new Error("请求失败:" + ret.Error.Code + "," + ret.Error.Message + ",requestId" + ret.RequestId);
}
}
@@ -70,43 +70,33 @@ export class TencentSslClient {
}
async deployCertificateInstance(params: any) {
const client = await this.getSslClient();
const res = await client.DeployCertificateInstance(params);
this.checkRet(res);
return res;
return await this.doRequest("DeployCertificateInstance", params);
}
async DescribeHostUploadUpdateRecordDetail(params: any) {
const client = await this.getSslClient();
const res = await client.request("DescribeHostUploadUpdateRecordDetail", params);
this.checkRet(res);
return res;
return await this.doRequest("DescribeHostUploadUpdateRecordDetail", params);
}
async UploadUpdateCertificateInstance(params: any) {
const client = await this.getSslClient();
const res = await client.request("UploadUpdateCertificateInstance", params);
this.checkRet(res);
return res;
return await this.doRequest("UploadUpdateCertificateInstance", params);
}
async DescribeCertificates(params: { Limit?: number; Offset?: number; SearchKey?: string }) {
const client = await this.getSslClient();
const res = await client.DescribeCertificates({
return await this.doRequest("DescribeCertificates", {
ExpirationSort: "ASC",
...params,
});
this.checkRet(res);
return res;
}
async doRequest(action: string, params: any) {
const client = await this.getSslClient();
if (!client[action]) {
throw new Error(`action ${action} not found`);
try {
const res = await client.request(action, params);
this.checkRet(res);
return res;
} catch (e) {
this.logger.error(`action ${action} error: ${e.message},requestId=${e.RequestId}`);
throw e;
}
const res = await client[action](params);
this.checkRet(res);
return res;
}
}

View File

@@ -19,6 +19,8 @@ RUN apk add --no-cache openjdk8
WORKDIR /app/
COPY --from=builder /workspace/certd-server/ /app/
COPY ./patch/ssh2/*.js /app/node_modules/.pnpm/node_modules/ssh2/lib/protocol/
ENV LEGO_VERSION=4.22.2
ENV LEGO_DOWNLOAD_DIR=/app/tools/lego
RUN mkdir -p $LEGO_DOWNLOAD_DIR

View File

@@ -10,4 +10,5 @@ VITE_APP_LOGO=static/images/logo/logo.svg
VITE_APP_LOGIN_LOGO=static/images/logo/rect-black.svg
VITE_APP_PROJECT_PATH=https://github.com/certd/certd
VITE_APP_NAMESPACE=fs
VITE_APP_VIP_PRODUCT_URL="http://localhost:1017/subject#/app/certd/product"
# VITE_APP_VIP_PRODUCT_URL="http://localhost:1017/subject#/app/certd/product"
VITE_APP_VIP_PRODUCT_URL="https://app.handfree.work/subject#/app/certd/product"

View File

@@ -3,6 +3,68 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
### Bug Fixes
* 修复备注撑开表格行高的bug ([c7b298c](https://github.com/certd/certd/commit/c7b298c46f0d52b43bd2bb17b374e7970a446446))
* 修复域名管理无法创建tencent-eo dns授权的bug ([3406bb5](https://github.com/certd/certd/commit/3406bb5a4a56bb310cddc1a1f410c70909fd129b))
### Performance Improvements
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
### Performance Improvements
* 站点证书监控备注输入框改成textarea ([70b603d](https://github.com/certd/certd/commit/70b603d601c34f39148c2ab70c655c51babf563d))
## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
### Bug Fixes
* 商用证书上传保存失败的bug ([075b1dc](https://github.com/certd/certd/commit/075b1dc0eb8c39acc277277b1b334d66b6717ab2))
## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
### Performance Improvements
* 支持回车键触发登录 ([eb5c88f](https://github.com/certd/certd/commit/eb5c88fbb2901f1a9669429a7cd8dc76f6806d01))
## [1.37.7](https://github.com/certd/certd/compare/v1.37.6...v1.37.7) (2025-11-12)
### Bug Fixes
* 修复点击立即触发运行报错的bug ([e1eef01](https://github.com/certd/certd/commit/e1eef013a856d26fe80a05d9ec6e505e2e31e5f9))
* 账号绑定页面某些情况下打不开的bug ([44973eb](https://github.com/certd/certd/commit/44973ebd00e89c0fee8f3b91174157757ce0160f))
## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10)
### Bug Fixes
* 修复创建流水线报id不能为空的bug ([aac569a](https://github.com/certd/certd/commit/aac569a9259ede43399e0ed5d668e936b984d6dd))
### Performance Improvements
* 增加vip时间同步按钮 ([32e4e91](https://github.com/certd/certd/commit/32e4e91ab81008dda422fb53fd6f4d1711c5d80c))
## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08)
### Bug Fixes
* 修复某些情况下编辑流水线没有立即展示变更效果的bug ([65e5309](https://github.com/certd/certd/commit/65e53092e8d677eb34b7d04d68c6f738165f5de2))
* 修复批量修改定时没有立即显示生效的bug ([c166602](https://github.com/certd/certd/commit/c16660254b8d637bd3ca100695934b343875fcbf))
* 修复在苹果手机下输入框被放大的问题 ([5ff7e6e](https://github.com/certd/certd/commit/5ff7e6ef0eaa6bc111d0dd3c5713e1658f9113ad))
### Performance Improvements
* 支持记忆字段排序 ([d46b9c5](https://github.com/certd/certd/commit/d46b9c54b14ec5c892f4eed141fb549485941edd))
* 优化任务参数配置界面在手机版下的展示效果 ([0203aa2](https://github.com/certd/certd/commit/0203aa2b6e86e58e5e66a1b9d0278d186aa92554))
* 支持列表展示时固定证书最大天数,有助于列表进度条整齐展示 ([4a94eab](https://github.com/certd/certd/commit/4a94eab3935c89a63892661d9cf0d0891e54aa81))
* 子域名托管说明 ([b5d8161](https://github.com/certd/certd/commit/b5d8161bc2e686e6c8b552de0c29117a5d405313))
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
### Bug Fixes

View File

@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8"/>
<link rel="icon" href="api/app/favicon"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<title>Loading</title>
<script src="static/icons/iconfont.js?v=<%=version%>"></script>
<link rel="stylesheet" type="text/css" href="static/index.css?v=<%=version%>"/>

View File

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

View File

@@ -6,7 +6,12 @@
<div>1. 解析记录应该添加在{{ record.domain }}域名下</div>
<div>2. 要添加的是CNAME类型的记录不是TXT</div>
<div>3. 核对记录值是否是:{{ record.recordValue }}</div>
<div>4. 运行下面的命令,查看解析是否正确 <fs-copyable :style="{ color: '#52c41a' }" :model-value="nslookupCmd"></fs-copyable></div>
<div>
4. 在验证中状态下运行下面的命令,查看cname和txt解析是否正确
<fs-copyable :style="{ color: '#52c41a' }" :model-value="nslookupCmd"></fs-copyable>
或者
<fs-copyable :style="{ color: '#52c41a' }" :model-value="digCmd"></fs-copyable>
</div>
<div>5. 如果以上检查都没有问题则可能是DNS解析生效时间比较慢某些提供商延迟可能高达几个小时</div>
</div>
</template>
@@ -23,4 +28,8 @@ const props = defineProps<{
const nslookupCmd = computed(() => {
return `nslookup -q=txt _acme-challenge.${props.record.domain}`;
});
const digCmd = computed(() => {
return `dig _acme-challenge.${props.record.domain}`;
});
</script>

View File

@@ -1,4 +1,3 @@
import { notification } from "ant-design-vue";
import { useSettingStore } from "/@/store/settings";
export default {
@@ -7,17 +6,15 @@ export default {
const settingStore = useSettingStore();
el.className = el.className + " need-plus";
if (!settingStore.isPlus) {
function checkPlus() {
// 事件处理代码
notification.warn({
message: "此为专业版功能,请升级到专业版",
});
}
el.addEventListener("click", function (event: any) {
checkPlus();
event.stopPropagation();
event.preventDefault();
settingStore.checkPlus();
});
el.addEventListener("move", function (event: any) {
checkPlus();
event.stopPropagation();
event.preventDefault();
settingStore.checkPlus();
});
}
},

View File

@@ -340,6 +340,13 @@ function openUpgrade() {
function showManualActivation() {
manualActiveFlag.value = true;
}
function goBindAccount() {
modalRef?.destroy();
router.push({
path: "/sys/account",
});
}
const modalRef = modal.success({
title,
maskClosable: true,
@@ -367,6 +374,9 @@ function openUpgrade() {
<div class="mt-10">
{t("vip.current")} {vipLabel} {t("vip.activated_expire_time")}
{settingStore.expiresText}
<a class="ml-15" href="https://app.handfree.work/subject/#/page/detail/1" target="_blank">
{t("vip.learn_more")}
</a>
</div>
);
}
@@ -439,6 +449,10 @@ function openUpgrade() {
<div class="flex-o w-100">
<span>{t("vip.site_id")}</span>
<fs-copyable v-model={computedSiteId.value}></fs-copyable>
<a class="ml-2" onClick={goBindAccount}>
{t("vip.not_effective")}
</a>
</div>
</div>
{plusInfo}

View File

@@ -1,8 +1,8 @@
<template>
<div id="userLayout" :class="['user-layout-wrapper']">
<div class="login-container flex-center">
<div class="user-layout-content flex-center flex-col">
<div class="top flex flex-col items-center justify-center">
<div class="login-container flex justify-start">
<div class="user-layout-content flex-col justify-start">
<div class="top flex flex-col items-center justify-start">
<div class="header flex flex-row items-center">
<img :src="siteInfo.loginLogo" class="logo" alt="logo" />
<span class="title"></span>
@@ -10,8 +10,9 @@
<div class="desc">{{ siteInfo.slogan }}</div>
</div>
<router-view />
<div class="flex-1 flex flex-col justify-start items-center">
<router-view />
</div>
<div class="footer">
<div class="copyright">
<span v-if="!settingStore.isComm">

View File

@@ -57,6 +57,7 @@ export default {
passwordPlaceholder: "Please enter your password",
mobilePlaceholder: "Please enter your mobile number",
loginButton: "Log In",
bindButton: "Bind Account",
forgotPassword: "Forgot password?",
forgotAdminPassword: "Forgot admin password?",
registerLink: "Register",

View File

@@ -757,6 +757,16 @@ export default {
pipelineValidTimeEnabledHelper: "Whether to enable the valid time of the pipeline",
certDomainAddToMonitorEnabled: "Add Domain to Certificate Monitor",
certDomainAddToMonitorEnabledHelper: "Whether to add the domain to the certificate monitor",
fixedCertExpireDays: "Fixed Cert Expire Days",
fixedCertExpireDaysHelper: "Fixed cert expiration days, helpful for table list progress bar display",
fixedCertExpireDaysRecommend: "Recommend 90",
enableOauth: "Enable OAuth2 Login",
oauthEnabledHelper: "Whether to enable OAuth2 login",
oauthProviders: "OAuth2 Login Providers",
oauthType: "OAuth2 Login Type",
oauthConfig: "OAuth2 Login Config",
oauthProviderSelectorPlaceholder: "Please select OAuth2 login provider",
},
},
modal: {

View File

@@ -89,6 +89,7 @@ export default {
activation_code_one_use: "Activation code can only be used once. To change site, please ",
bind_account: "bind account",
transfer_vip: ' then "Transfer VIP"',
needVipTip: "This feature requires a professional version, please upgrade to a professional version first.",
manual_activation: "Manual activation use code",
close: "Close",
have_activation_code: "Already have activation code?",
@@ -97,4 +98,6 @@ export default {
already_comm: "Already Business Edition, can't change to Professional Edition",
already_perpetual_plus: "You already have a perpetual Professional Edition, can't upgrade",
confirm: "Confirm",
not_effective: "Not effective?",
learn_more: "More privileges",
};

View File

@@ -57,6 +57,7 @@ export default {
passwordPlaceholder: "请输入密码",
mobilePlaceholder: "请输入手机号",
loginButton: "登录",
bindButton: "绑定账号",
forgotPassword: "忘记密码?",
forgotAdminPassword: "忘记管理员密码?",
registerLink: "注册",

View File

@@ -604,7 +604,7 @@ export default {
limitUserPipelineCountHelper: "0为不限制",
enableSelfRegistration: "开启自助注册",
enableUserValidityPeriod: "开启用户有效期",
userValidityPeriodHelper: "有效期内用户可正常使用,失效后流水线将被停用",
userValidityPeriodHelper: "有效期内用户可正常使用,失效后用户的流水线将被停用",
enableUsernameRegistration: "开启用户名注册",
enableEmailRegistration: "开启邮箱注册",
proFeature: "专业版功能",
@@ -757,6 +757,17 @@ export default {
pipelineValidTimeEnabledHelper: "是否启用流水线有效期",
certDomainAddToMonitorEnabled: "证书域名添加到证书监控",
certDomainAddToMonitorEnabledHelper: "创建证书流水线时是否可以选择将域名添加到证书监控",
fixedCertExpireDays: "固定证书有效期天数",
fixedCertExpireDaysHelper: "固定证书有效期天数,有助于列表进度条整齐显示",
fixedCertExpireDaysRecommend: "推荐90",
enableOauth: "启用第三方登录",
oauthEnabledHelper: "是否启用第三方登录",
oauthProviders: "第三方登录提供商",
oauthType: "第三方登录类型",
oauthConfig: "第三方登录配置",
oauthProviderSelectorPlaceholder: "请选择第三方登录提供商",
},
},
modal: {

View File

@@ -87,7 +87,8 @@ export default {
no_activation_code: "没有激活码?",
activation_code_one_use: "激活码使用过一次之后,不可再次使用,如果要更换站点,请",
bind_account: "绑定账号",
transfer_vip: '然后"转移VIP"即可',
transfer_vip: '然后"转移VIP"即可',
needVipTip: "此为专业版功能,请先开通专业版",
manual_activation: "激活码手动激活",
close: "关闭",
have_activation_code: "已经有激活码了?",
@@ -96,4 +97,6 @@ export default {
already_comm: "已经是商业版了,不能降级为专业版",
already_perpetual_plus: "您已经是永久专业版了,无法继续升级",
confirm: "确认",
not_effective: "VIP没有生效?",
learn_more: "更多特权(加VIP群等)",
};

View File

@@ -232,15 +232,15 @@ function install(app: App, options: any = {}) {
},
wrapperCol: {
span: null,
buttons: {
copy: { show: false },
paste: { show: false },
},
},
wrapper: {
saveRemind: true,
// inner: true,
// innerContainerSelector: "main.fs-framework-content"
// innerContainerSelector: "main.fs-framework-content"
buttons: {
copy: { show: false },
paste: { show: false },
},
},
},
columns: {

View File

@@ -32,6 +32,14 @@ export const outsideResource = [
path: "/forgotPassword",
component: "/framework/forgot-password/index.vue",
},
{
meta: {
title: "第三方登录回调",
},
name: "oauthCallback",
path: "/oauth/callback/:type",
component: "/framework/oauth/oauth-callback.vue",
},
],
},
...errorPage,

View File

@@ -56,6 +56,20 @@ export type SysPublicSetting = {
//证书域名添加到监控
certDomainAddToMonitorEnabled?: boolean;
// 固定证书有效期天数0表示不固定
fixedCertExpireDays?: number;
// 第三方OAuth配置
oauthEnabled?: boolean;
oauthProviders?: Record<
string,
{
type: string;
title: string;
addonId: number;
}
>;
};
export type SuiteSetting = {
enabled?: boolean;

View File

@@ -11,6 +11,7 @@ import { utils } from "/@/utils";
import { cloneDeep, merge } from "lodash-es";
import { useI18n } from "/src/locales";
import dayjs from "dayjs";
import { $t } from "/src/locales";
export interface SettingState {
skipReset?: boolean; // 注销登录时不清空此store的状态
sysPublic?: SysPublicSetting;
@@ -189,9 +190,9 @@ export const useSettingStore = defineStore({
checkPlus() {
if (!this.isPlus) {
notification.warn({
message: "此为专业版功能,请先升级到专业版",
message: $t("vip.needVipTip"),
});
throw new Error("此为专业版功能,请升级到专业版");
throw new Error($t("vip.needVipTip"));
}
},
async loadSysSettings() {

View File

@@ -71,4 +71,8 @@ footer {
.ant-progress .ant-progress-text{
width:3em;
}
.ant-input-number{
min-width: 150px;
}

View File

@@ -300,7 +300,7 @@ h6 {
}
.ant-drawer-content-wrapper {
max-width: 90vw;
max-width: 95vw;
}
.block-title {

View File

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

View File

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

View File

@@ -82,6 +82,7 @@ function createCrudOptionsWithApi(opts: any) {
opts.context = {
api,
addonType: props.addonType,
type: props.type,
};
return createCrudOptions(opts);
}

View File

@@ -1,7 +1,8 @@
import { request } from "/src/api/service";
import { RequestHandleReq } from "/@/components/plugins/lib";
import { AddonTypeDefines } from "./types";
export function createAddonApi(opts: { from: any; addonType: string }) {
export function createAddonApi(opts: { from: any; addonType: string } = { from: "user", addonType: "" }) {
let apiPrefix = "/addon";
if (opts.from === "sys") {
apiPrefix = "/sys/addon";
@@ -128,15 +129,6 @@ export function createAddonApi(opts: { from: any; addonType: string }) {
};
}
export const AddonTypeDefines = {
captcha: {
name: "captcha",
title: "验证码",
showDefault: false,
showTest: false,
},
};
export function getAddonTypeDefine(addonType: string) {
return AddonTypeDefines[addonType];
}

View File

@@ -110,7 +110,8 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any, a
type: "dict-select",
dict: addonTypeDictRef,
search: {
show: false,
show: true,
valueChange: null,
},
column: {
width: 200,

View File

@@ -5,7 +5,12 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq,
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const api = context.api;
const addonType = context.addonType;
const type = context.type;
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
if (query.query?.body) {
delete query.query.body;
}
return await api.GetList(query);
};
const editRequest = async (req: EditReq) => {
@@ -44,6 +49,12 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
},
},
},
addForm: {
initialForm: {
addonType: addonType,
type: type,
},
},
rowHandle: {
width: 200,
},

View File

@@ -20,7 +20,7 @@ import { addonProvide } from "/@/views/certd/addon/common";
export default defineComponent({
name: "AddonManager",
setup() {
const api = createAddonApi();
const api = createAddonApi({ from: "user", addonType: "" });
addonProvide(api);
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });

View File

@@ -0,0 +1,15 @@
export interface AddonTypeDefine {
name: string;
title: string;
showDefault: boolean;
showTest: boolean;
}
export const AddonTypeDefines: Record<string, AddonTypeDefine> = {
captcha: {
name: "captcha",
title: "验证码",
showDefault: false,
showTest: false,
},
};

View File

@@ -184,7 +184,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
name: "AccessSelector",
vModel: "modelValue",
type: compute(({ form }) => {
return form.dnsProviderType;
const type = form.dnsProviderType || "aliyun";
return dnsProviderTypeDict?.dataMap[type]?.accessType;
}),
},
show: compute(({ form }) => {

View File

@@ -84,6 +84,12 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
edit: {
show: false,
},
copy: { show: false },
view: {
async click({ row }) {
await router.push({ path: "/certd/pipeline/detail", query: { id: row.pipelineId, historyId: row.id, editMode: "false" } });
},
},
},
},
columns: {

View File

@@ -22,3 +22,36 @@ export async function UpdateProfile(form: any) {
data: form,
});
}
export async function GetOauthBounds() {
return await request({
url: "/oauth/bounds",
method: "POST",
});
}
export async function GetOauthProviders() {
return await request({
url: "/oauth/providers",
method: "POST",
});
}
export async function UnbindOauth(type: string) {
return await request({
url: "/oauth/unbind",
method: "POST",
data: { type },
});
}
export async function OauthBoundUrl(type: string) {
return await request({
url: "/oauth/login",
method: "POST",
data: {
type,
forType: "bind",
},
});
}

View File

@@ -15,7 +15,14 @@
</a-descriptions-item>
<a-descriptions-item :label="t('authentication.email')">{{ userInfo.email }}</a-descriptions-item>
<a-descriptions-item :label="t('authentication.phoneNumber')">{{ userInfo.phoneCode }}{{ userInfo.mobile }}</a-descriptions-item>
<a-descriptions-item></a-descriptions-item>
<a-descriptions-item v-if="settingStore.sysPublic.oauthEnabled && settingStore.isPlus" label="第三方账号绑定">
<div v-for="item in computedOauthBounds" :key="item.name" class="flex items-center gap-2">
<fs-icon :icon="item.icon" class="mr-2 text-blue-500" />
<span class="mr-2 w-36">{{ item.title }}</span>
<a-button v-if="item.bound" type="link" danger @click="unbind(item.name)">解绑</a-button>
<a-button v-else type="primary" @click="bind(item.name)">绑定</a-button>
</div>
</a-descriptions-item>
<a-descriptions-item :label="t('common.handle')">
<a-button type="primary" @click="doUpdate">{{ t("authentication.updateProfile") }}</a-button>
<change-password-button class="ml-10" :show-button="true"> </change-password-button>
@@ -27,10 +34,12 @@
<script lang="ts" setup>
import * as api from "./api";
import { Ref, ref } from "vue";
import { computed, onMounted, Ref, ref } from "vue";
import ChangePasswordButton from "/@/views/certd/mine/change-password-button.vue";
import { useI18n } from "/src/locales";
import { useUserProfile } from "./use";
import { Modal } from "ant-design-vue";
import { useSettingStore } from "/@/store/settings";
const { t } = useI18n();
@@ -38,13 +47,13 @@ defineOptions({
name: "UserProfile",
});
const settingStore = useSettingStore();
const userInfo: Ref = ref({});
const getUserInfo = async () => {
userInfo.value = await api.getMineInfo();
};
getUserInfo();
const { openEditProfileDialog } = useUserProfile();
function doUpdate() {
@@ -54,4 +63,51 @@ function doUpdate() {
},
});
}
const oauthBounds = ref([]);
const oauthProviders = ref([]);
async function loadOauthBounds() {
const res = await api.GetOauthBounds();
oauthBounds.value = res;
}
async function loadOauthProviders() {
const res = await api.GetOauthProviders();
oauthProviders.value = res;
}
const computedOauthBounds = computed(() => {
const list = oauthProviders.value.map(item => {
const bound = oauthBounds.value.find(bound => bound.type === item.name);
return {
...item,
bound,
};
});
return list;
});
async function unbind(type: string) {
Modal.confirm({
title: "确认解绑吗?",
okText: "确认",
okType: "danger",
onOk: async () => {
await api.UnbindOauth(type);
await loadOauthBounds();
},
});
}
async function bind(type: string) {
//获取第三方登录URL
const res = await api.OauthBoundUrl(type);
const loginUrl = res.loginUrl;
window.location.href = loginUrl;
}
onMounted(async () => {
await getUserInfo();
await loadOauthBounds();
await loadOauthProviders();
});
</script>

View File

@@ -9,6 +9,7 @@ import { useModal } from "/@/use/use-modal";
import { notification } from "ant-design-vue";
import CertView from "/@/views/certd/pipeline/cert-view.vue";
import { useCertUpload } from "/@/views/certd/pipeline/cert-upload/use";
import { useSettingStore } from "/@/store/settings";
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const { t } = useI18n();
@@ -35,6 +36,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
const { openCrudFormDialog } = useFormWrapper();
const router = useRouter();
const settingStore = useSettingStore();
const model = useModal();
const viewCert = async (row: any) => {
const cert = await api.GetCert(row.id);
@@ -224,12 +227,19 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
if (!expiresTime) {
return "-";
}
// 申请时间 ps:此处为证书在certd创建的时间而非实际证书申请时间
const applyDate = dayjs(effectiveTime ?? applyTime ?? Date.now()).format("YYYY-MM-DD");
// 失效时间
const expireDate = dayjs(expiresTime).format("YYYY-MM-DD");
// 有效天数 ps:此处证书最小设置为90d
const effectiveDays = Math.max(90, dayjs(expiresTime).diff(applyDate, "day"));
let effectiveDays = Math.max(90, dayjs(expiresTime).diff(applyDate, "day"));
const fixedCertExpireDays = settingStore.getSysPublic?.fixedCertExpireDays;
if (fixedCertExpireDays && fixedCertExpireDays > 0) {
effectiveDays = fixedCertExpireDays;
}
// 距离失效时间剩余天数
const leftDays = dayjs(expiresTime).diff(dayjs(), "day");
const color = leftDays < 20 ? "red" : "#389e0d";

View File

@@ -61,6 +61,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
const selectedRowKeys = ref([]);
const settingStore = useSettingStore();
const handleBatchDelete = () => {
if (selectedRowKeys.value?.length > 0) {
Modal.confirm({
@@ -506,7 +508,13 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
// 失效时间
const expireDate = dayjs(expiresTime).format("YYYY-MM-DD");
// 有效天数 ps:此处证书最小设置为90d
const effectiveDays = Math.max(90, dayjs(expiresTime).diff(applyDate, "day"));
let effectiveDays = Math.max(90, dayjs(expiresTime).diff(applyDate, "day"));
const fixedCertExpireDays = settingStore.getSysPublic?.fixedCertExpireDays;
if (fixedCertExpireDays && fixedCertExpireDays > 0) {
effectiveDays = fixedCertExpireDays;
}
// 距离失效时间剩余天数
const leftDays = dayjs(expiresTime).diff(dayjs(), "day");
const color = leftDays < certValidDays ? "red" : "#389e0d";
@@ -547,10 +555,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
search: {
show: false,
},
type: "text",
type: "textarea",
column: {
width: 200,
sorter: true,
ellipsis: true,
cellRender({ value }) {
return <a-tooltip title={value}>{value}</a-tooltip>;
},

View File

@@ -350,6 +350,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
show: false,
},
column: {
ellipsis: true,
width: 200,
sorter: true,
tooltip: true,

View File

@@ -62,7 +62,7 @@ export async function GetDetail(id: any) {
});
}
export async function Save(pipelineEntity: any) {
export async function Save(pipelineEntity: any): Promise<{ id: number; version: number }> {
return await request({
url: apiPrefix + "/save",
method: "post",

View File

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

View File

@@ -367,7 +367,7 @@ export function useCertPipelineCreator() {
pipeline = setRunnableIds(pipeline);
const groupId = form.groupId;
const id = await api.Save({
const { id } = await api.Save({
title: pipeline.title,
content: JSON.stringify(pipeline),
keepHistoryCount: 30,

View File

@@ -1,10 +1,11 @@
<template>
<fs-button icon="mdi:format-list-group" type="link" text="修改分组" @click="openGroupSelectDialog"></fs-button>
<fs-button icon="mdi:format-list-group" class="need-plus" type="link" text="修改分组" @click="openGroupSelectDialog"></fs-button>
</template>
<script setup lang="ts">
import * as api from "../api";
import { notification } from "ant-design-vue";
import { dict, useFormWrapper } from "@fast-crud/fast-crud";
import { useSettingStore } from "/@/store/settings";
const props = defineProps<{
selectedRowKeys: any[];
@@ -24,8 +25,9 @@ const pipelineGroupDictRef = dict({
label: "name",
});
const { openCrudFormDialog } = useFormWrapper();
const settingStore = useSettingStore();
async function openGroupSelectDialog() {
settingStore.checkPlus();
const crudOptions: any = {
columns: {
groupId: {

View File

@@ -1,11 +1,11 @@
<template>
<fs-button icon="mdi:format-list-group" type="link" text="修改通知" @click="openFormDialog"></fs-button>
<fs-button icon="mdi:format-list-group" class="need-plus" type="link" text="修改通知" @click="openFormDialog"></fs-button>
</template>
<script setup lang="ts">
import * as api from "../api";
import { useFormWrapper } from "@fast-crud/fast-crud";
import * as api from "../api";
import { useSettingStore } from "/@/store/settings";
import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
import { ref } from "vue";
const props = defineProps<{
selectedRowKeys: any[];
@@ -32,8 +32,9 @@ async function batchUpdateRequest(form: any) {
}
const { openCrudFormDialog } = useFormWrapper();
const settingStore = useSettingStore();
async function openFormDialog() {
settingStore.checkPlus();
const crudOptions: any = {
columns: {
when: {

View File

@@ -1,12 +1,12 @@
<template>
<fs-button icon="mdi:format-list-group" type="link" :text="t('certd.editSchedule')" @click="openFormDialog"></fs-button>
<fs-button icon="mdi:format-list-group" class="need-plus" type="link" :text="t('certd.editSchedule')" @click="openFormDialog"></fs-button>
</template>
<script setup lang="ts">
import * as api from "../api";
import { useFormWrapper } from "@fast-crud/fast-crud";
import * as api from "../api";
import { useSettingStore } from "/@/store/settings";
import { useI18n } from "/src/locales";
const { t } = useI18n();
const props = defineProps<{
@@ -27,7 +27,10 @@ async function batchUpdateRequest(form: any) {
const { openCrudFormDialog } = useFormWrapper();
const settingStore = useSettingStore();
async function openFormDialog() {
settingStore.checkPlus();
const crudOptions: any = {
columns: {
"props.cron": {

View File

@@ -375,7 +375,11 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
// 失效时间
const expireDate = dayjs(expiresTime).format("YYYY-MM-DD");
// 有效天数 ps:此处证书最小设置为90d
const effectiveDays = Math.max(90, dayjs(expiresTime).diff(applyDate, "day"));
let effectiveDays = Math.max(90, dayjs(expiresTime).diff(applyDate, "day"));
const fixedCertExpireDays = settingStore.sysPublic.fixedCertExpireDays;
if (fixedCertExpireDays && fixedCertExpireDays > 0) {
effectiveDays = fixedCertExpireDays;
}
// 距离失效时间剩余天数
const leftDays = dayjs(expiresTime).diff(dayjs(), "day");
const color = leftDays < 20 ? "red" : "#389e0d";

View File

@@ -20,8 +20,8 @@ defineOptions({
name: "PipelineDetail",
});
const route = useRoute();
const pipelineId: Ref = ref(route.query.id);
const historyId = ref(route.query.historyId as string);
const pipelineId: Ref = ref(parseInt((route.query.id as string) || "0"));
const historyId: Ref = ref(parseInt((route.query.historyId as string) || "0"));
const pluginStore = usePluginStore();
const pipelineOptions: PipelineOptions = {
async getPipelineDetail({ pipelineId }) {
@@ -56,7 +56,7 @@ const pipelineOptions: PipelineOptions = {
},
async doSave(pipelineConfig: any) {
await api.Save({
return await api.Save({
id: pipelineConfig.id,
content: JSON.stringify(pipelineConfig),
});

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