v1.37.7

# Conflicts:
#	packages/core/basic/src/utils/util.hash.ts

.vscode/settings.json

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

CHANGELOG.md

@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
+* 修复站点证书监控复制按钮无效的bug ([efa26a0](https://github.com/certd/certd/commit/efa26a067f06402f30befc016d9934cadcd5a563))
+* 修复lego模式下 私钥加密类型错误的bug ([f7cf7c1](https://github.com/certd/certd/commit/f7cf7c198d7f77b222099770f81accc637bc6619))
+
+### Performance Improvements
+
+* 优化数据备份效率，流式写入文件 ([c38dbbb](https://github.com/certd/certd/commit/c38dbbb1d72bd00a92fe275b76aea82a791e7199))
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 ### Bug Fixes

README.md

@@ -152,8 +152,11 @@ https://certd.handfree.work/
 
 ## 八、捐赠
 ************************
-支持开源，为爱发电，我已入驻爱发电
+开源为什么要做专业版收费？
-https://afdian.com/a/greper
+1. 纯靠为爱发电不可持续（比如：我的dev-sidecar项目即便是拥有20K+star,也差点凉凉，幸亏有另外大佬接手用爱发电）    
+2. 没有赞助的项目，作者不会用心倾听用户的心声，不顾用户体验（比如：下意识拒绝需求、频繁破坏性变更升级、全盘推倒重来之类的） 
+3. 没有赞助的项目，交流群的戾气有时候比较重，容易起冲突 
+
 
 发电权益：
 1. 可加入发电专属群，可以获得作者一对一技术支持
@@ -173,7 +176,6 @@ https://afdian.com/a/greper
 
 ************************
 
-************************
 
 ## 九、贡献代码
 

docker/run/docker-compose.yaml

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

docs/guide/changelogs/CHANGELOG.md

@@ -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.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
+
+* 修复站点证书监控复制按钮无效的bug ([efa26a0](https://github.com/certd/certd/commit/efa26a067f06402f30befc016d9934cadcd5a563))
+* 修复lego模式下 私钥加密类型错误的bug ([f7cf7c1](https://github.com/certd/certd/commit/f7cf7c198d7f77b222099770f81accc637bc6619))
+
+### Performance Improvements
+
+* 优化数据备份效率，流式写入文件 ([c38dbbb](https://github.com/certd/certd/commit/c38dbbb1d72bd00a92fe275b76aea82a791e7199))
+
+## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+### Bug Fixes
+
+* 修复并发情况下证书申请日志混乱的bug ([bb2714f](https://github.com/certd/certd/commit/bb2714ff241f9db4a71d805b23a1b0f9f2f6413a))
+* 修复网络测试，telnet的bug ([c03a70f](https://github.com/certd/certd/commit/c03a70fde23c8e840bd0fdb4fcbca8990f6c65eb))
+* 修复站点证书监控，证书已经更新到最新日期了，仍然发出警告通知的bug ([1f42f93](https://github.com/certd/certd/commit/1f42f933f07860b27aa3d016e40916ff2b063eac))
+
+### Performance Improvements
+
+*  注册页面增加手机注册tab页签 ([6b2f1fc](https://github.com/certd/certd/commit/6b2f1fcd3e058061b814c3331cda8ce1b2d80d73))
+* 流水线创建时支持添加到证书监控 ([59ba408](https://github.com/certd/certd/commit/59ba4080706548828ef1c0a9cd893c1c9a7d591f))
+* 流水线支持有效期设置 ([911e69e](https://github.com/certd/certd/commit/911e69e3bc0cdd48b62953b5d0981d640fc1f8ac))
+* 群辉增加请求超时时长设置 ([b381492](https://github.com/certd/certd/commit/b3814920bdcabc911f860a8e19b5b9b3a04709ac))
+* 通知支持meow ([c77645e](https://github.com/certd/certd/commit/c77645e1733670214aaca5544cf8759d7e4adda4))
+* 站点证书监控增加导出和分组功能 ([2ed12c4](https://github.com/certd/certd/commit/2ed12c429eb58274a4f9dd0ed3b66e160d283ded))
+* 证书监控增加批量删除 ([e578c52](https://github.com/certd/certd/commit/e578c52fdf2f838038062aa4209b655fbae461fb))
+* esa 自动删除过期证书提示 ([8bf1f82](https://github.com/certd/certd/commit/8bf1f828b9eaa9208f32e8ee7460b86420fed0c7))
+* ssh 增加禁止-i参数提示 ([3a8931f](https://github.com/certd/certd/commit/3a8931feeffd7157163ff7d46b693e5e1a434b9c))
+
 ## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
 
 ### Bug Fixes

docs/guide/open/index.md

@@ -9,6 +9,7 @@
 
 https://apifox.com/apidoc/shared-2e76f8c4-7c58-413b-a32d-a1316529af44/254949529e0
 
+
 ## Token生成方法
 
 header中传入x-certd-token即可调用开放接口   
@@ -17,6 +18,12 @@ header中传入x-certd-token即可调用开放接口
 3、将content加上keySecret进行签名： sign = md5(content + keySecret)   
 4、然后将content和sign分别base64后用.号连接： x-certd-token = base64(content) +"."+base64(sign)   
 
+
+## 补充说明
+1.证书申请接口支持证书id和域名两种方式获取证书。
+2.autoApply=true将在没有证书时自动触发申请，申请过程中会提示`正在申请中`，可轮循获取状态，直到证书申请成功。
+
+
 ## SDK
 待开发
 

docs/guide/plugins/access.md

@@ -62,7 +62,9 @@
 | 58.| **Dokploy授权** |  | 
 | 59.| **godaddy授权** |  | 
 | 60.| **新网授权** |  | 
-| 61.| **雨云授权** | https://app.rainyun.com/ | 
+| 61.| **新网授权（代理方式）** |  | 
+| 62.| **新网互联授权** | 仅支持代理账号，ip需要加入白名单 | 
+| 63.| **雨云授权** | https://app.rainyun.com/ | 
 
 <style module>
 table th:first-of-type {

docs/guide/plugins/deploy.md

@@ -46,7 +46,7 @@
 | 序号 | 名称 | 说明 |
 |-----|-----|-----|
 | 1.| **宝塔-面板证书部署** | 部署宝塔面板本身的ssl证书 | 
-| 2.| **宝塔-网站证书部署** | 部署宝塔管理的站点的ssl证书，目前支持网站站点、docker站点等。本插件也支持aaPanel。 | 
+| 2.| **宝塔-网站证书部署** | 部署宝塔管理的站点的ssl证书，目前支持宝塔网站站点、docker站点等。本插件也支持aaPanel。 | 
 | 3.| **宝塔-WAF证书部署** | 部署宝塔云WAF/aaWAF | 
 | 4.| **宝塔win-网站证书部署** | 部署到Windows版宝塔管理的站点的ssl证书 | 
 | 5.| **宝塔-删除过期证书** | 删除证书夹中过期证书 | 
@@ -77,7 +77,7 @@
 | 9.| **阿里云-部署至NLB（网络负载均衡）** | NLB,网络负载均衡,更新监听器的默认证书 | 
 | 10.| **阿里云-部署至CLB(传统负载均衡)** | 部署证书到阿里云CLB(传统负载均衡) | 
 | 11.| **阿里云-部署至阿里云FC(3.0)** | 部署证书到阿里云函数计算（FC3.0） | 
-| 12.| **阿里云-部署至ESA** | 部署证书到阿里云ESA(边缘安全加速) | 
+| 12.| **阿里云-部署至ESA** | 部署证书到阿里云ESA(边缘安全加速)，自动删除过期证书 | 
 | 13.| **阿里云-部署至VOD** | 部署证书到阿里云视频点播（vod） | 
 | 14.| **阿里云-部署证书至API网关** | 自动部署域名证书至阿里云API网关（APIGateway） | 
 | 15.| **阿里云-部署至云原生API网关/AI网关** | 自动部署域名证书至云原生API网关、AI网关 | 
@@ -86,7 +86,7 @@
 | 序号 | 名称 | 说明 |
 |-----|-----|-----|
 | 1.| **华为云-部署证书至CDN** |  | 
-| 2.| **华为云-上传证书至CCM** | 上传证书到华为云CCM | 
+| 2.| **华为云-上传证书至CCM** | 上传证书到华为云云证书管理（CCM） | 
 | 3.| **华为云-部署证书至OBS** |  | 
 ## 7. 腾讯云
 

docs/guide/plugins/dns-provider.md

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

docs/guide/plugins/notification.md

@@ -2,10 +2,10 @@
 
 | 序号 | 名称 | 说明 |
 |-----|-----|-----|
-| 1.| **企业微信通知** | 企业微信群聊机器人通知 | 
+| 1.| **电子邮件** | 电子邮件通知 | 
-| 2.| **电子邮件** | 电子邮件通知 | 
+| 2.| **自定义webhook** | 根据模版自定义http请求 | 
-| 3.| **爱语飞飞微信通知(iyuu)** | https://iyuu.cn/ | 
+| 3.| **企业微信通知** | 企业微信群聊机器人通知 | 
-| 4.| **自定义webhook** | 根据模版自定义http请求 | 
+| 4.| **爱语飞飞微信通知(iyuu)** | https://iyuu.cn/ | 
 | 5.| **Server酱ᵀ** | https://sct.ftqq.com/ | 
 | 6.| **Server酱³** | https://doc.sc3.ft07.com/serverchan3 | 
 | 7.| **AnPush** | https://anpush.com | 
@@ -17,6 +17,7 @@
 | 13.| **钉钉通知** | 钉钉群聊通知 | 
 | 14.| **VoceChat通知** | https://voce.chat | 
 | 15.| **OneBot V11 通知** | 通过动态拼接URL发送 OneBot V11 协议消息 | 
+| 16.| **MeoW通知** | https://api.chuckfang.com/ | 
 
 <style module>
 table th:first-of-type {

docs/guide/use/synology/index.md

@@ -18,6 +18,12 @@
 ### 3. 配置Certd项目
 
 ![](./images/3.png)
+建议加上 `:delegated` 提升性能
+```yaml
+  volumes:
+                                          ↓↓↓↓------加上这个提升性能
+    - /volume1/docker/certd:/app/data:delegated
+```
 
 ### 4. 外网访问设置
 

lerna.json

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

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
 ## [1.37.3](https://github.com/publishlab/node-acme-client/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 ### Bug Fixes

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.37.3",
+    "version": "1.37.7",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.37.3",
+        "@certd/basic": "^1.37.7",
         "@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": "e1daaf07ce2fda6ce44998d65f8a989fc6af88db"
+    "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
 }

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

@@ -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) =>{
+        // 判断是否为IP（v4或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);

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

@@ -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);
     }
 
     /**

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

@@ -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',

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

@@ -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) {
+async function getAuthoritativeDnsResolver(recordName, logger = log) {
-    log(`获取域名${recordName}的权威NS服务器: `);
+    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;
 }

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

@@ -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;
 }
 
-/**
+    return {
- * Export API
+        challenges:{
- */
+            'http-01': verifyHttpChallenge,
+            'dns-01': verifyDnsChallenge,
+            'tls-alpn-01': verifyTlsAlpnChallenge,
+        },
+        walkTxtRecord,
+    }
 
-export default {
+}
-    'http-01': verifyHttpChallenge,
-    'dns-01': verifyDnsChallenge,
-    'tls-alpn-01': verifyTlsAlpnChallenge,
-};

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

@@ -108,6 +108,9 @@ export const directory: {
         staging: string,
         production: string
     },
+    letsencrypt_staging: {
+        production: string
+    },
     zerossl: {
         staging: string,
         production: string
@@ -204,7 +207,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;

packages/core/basic/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.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
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

@@ -1 +1 @@
-01:10
+01:12

packages/core/basic/package.json

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

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

@@ -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('.')) {
+    if (targetDomain.startsWith(".")) {
-      targetDomain = '*' + targetDomain;
+      targetDomain = "*" + targetDomain;
     }
     for (let inDomain of inDomains) {
-      if (inDomain.startsWith('.')) {
+      if (inDomain.startsWith(".")) {
-        inDomain = '*' + inDomain;
+        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,
 };

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.37.3",
+  "version": "1.37.7",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -18,8 +18,8 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/basic": "^1.37.3",
+    "@certd/basic": "^1.37.7",
-    "@certd/plus-core": "^1.37.3",
+    "@certd/plus-core": "^1.37.7",
     "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": "e1daaf07ce2fda6ce44998d65f8a989fc6af88db"
+  "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
 }

packages/libs/lib-huawei/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 **Note:** Version bump only for package @certd/lib-huawei

packages/libs/lib-huawei/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-huawei",
   "private": false,
-  "version": "1.37.3",
+  "version": "1.37.7",
   "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": "e1daaf07ce2fda6ce44998d65f8a989fc6af88db"
+  "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
 }

packages/libs/lib-iframe/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 **Note:** Version bump only for package @certd/lib-iframe

packages/libs/lib-iframe/package.json

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

packages/libs/lib-jdcloud/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 **Note:** Version bump only for package @certd/jdcloud

packages/libs/lib-jdcloud/package.json

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

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 **Note:** Version bump only for package @certd/lib-k8s

packages/libs/lib-k8s/package.json

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

packages/libs/lib-server/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.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
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 **Note:** Version bump only for package @certd/lib-server

packages/libs/lib-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.37.3",
+  "version": "1.37.7",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -28,11 +28,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.37.3",
+    "@certd/acme-client": "^1.37.7",
-    "@certd/basic": "^1.37.3",
+    "@certd/basic": "^1.37.7",
-    "@certd/pipeline": "^1.37.3",
+    "@certd/pipeline": "^1.37.7",
-    "@certd/plugin-lib": "^1.37.3",
+    "@certd/plugin-lib": "^1.37.7",
-    "@certd/plus-core": "^1.37.3",
+    "@certd/plus-core": "^1.37.7",
     "@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": "e1daaf07ce2fda6ce44998d65f8a989fc6af88db"
+  "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
 }

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

@@ -130,12 +130,15 @@ export class PlusService {
     return res.accessToken;
   }
 
-  async getVipTrial() {
+  async getVipTrial(vipType= "plus") {
     await this.register();
     const plusRequestService = await this.getPlusRequestService();
     const res = await plusRequestService.request({
       url: '/activation/subject/vip/trialGet',
       method: 'POST',
+      data:{
+        vipType
+      }
     });
     if (res.license) {
       await this.updateLicense(res.license);

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

@@ -46,6 +46,9 @@ export class SysPublicSettings extends BaseSettings {
   //证书域名添加到监控
   certDomainAddToMonitorEnabled?: boolean = false;
 
+  // 固定证书有效期天数，0表示不固定
+  fixedCertExpireDays?: number;
+
 }
 
 export class SysPrivateSettings extends BaseSettings {

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

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 **Note:** Version bump only for package @certd/midway-flyway-js

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

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

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
+* 修复lego模式下 私钥加密类型错误的bug ([f7cf7c1](https://github.com/certd/certd/commit/f7cf7c198d7f77b222099770f81accc637bc6619))
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 ### Bug Fixes

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.37.3",
+  "version": "1.37.7",
   "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.3",
+    "@certd/acme-client": "^1.37.7",
-    "@certd/basic": "^1.37.3",
+    "@certd/basic": "^1.37.7",
-    "@certd/pipeline": "^1.37.3",
+    "@certd/pipeline": "^1.37.7",
-    "@certd/plugin-lib": "^1.37.3",
+    "@certd/plugin-lib": "^1.37.7",
     "@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": "e1daaf07ce2fda6ce44998d65f8a989fc6af88db"
+  "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
 }

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

@@ -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 = "";
+    const directoryUrl = acme.directory[this.sslProvider].production;
-    if (isTest) {
-      directoryUrl = acme.directory[this.sslProvider].staging;
-    } else {
-      directoryUrl = acme.directory[this.sslProvider].production;
-    }
     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 { email, csrInfo, dnsProvider, domainsVerifyPlan, profile, preferredChain } = options;
-    const client: acme.Client = await this.getAcmeClient(email, isTest);
+    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(
+    const csrData: any = {
-      {
+      // commonName,
-        commonName,
+      ...csrInfo,
-        ...csrInfo,
+      altNames,
-        altNames,
+      // emailAddress: email,
-        // emailAddress: email,
+    };
-      },
+    const [key, csr] = await createCsr(csrData, privateKey);
-      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];
+    // const commonName = domains[0];
-    let altNames: undefined | string[] = undefined;
+    // let altNames: undefined | string[] = undefined;
-    if (domains.length > 1) {
+    // if (domains.length > 1) {
-      altNames = _.slice(domains, 1);
+    //   altNames = _.slice(domains, 1);
-    }
+    // }
     return {
-      commonName,
+      // commonName,
-      altNames,
+      altNames: domains,
     };
   }
 

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

@@ -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,

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

@@ -158,7 +158,7 @@ export class CertApplyLegoPlugin extends CertApplyBasePlugin {
     if (this.eab) {
       eabArgs = ` --eab --kid "${this.eab.kid}" --hmac "${this.eab.hmacKey}"`;
     }
-    const keyType = `-k ${this.privateKeyType}`;
+    const keyType = `-k ${this.privateKeyType?.replaceAll("_", "")}`;
 
     const saveDir = `./data/.lego/pipeline_${this.pipeline.id}/`;
     const savePathArgs = `--path "${saveDir}"`;

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.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
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 ### Performance Improvements

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.37.3",
+  "version": "1.37.7",
   "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.3",
+    "@certd/basic": "^1.37.7",
-    "@certd/pipeline": "^1.37.3",
+    "@certd/pipeline": "^1.37.7",
     "@kubernetes/client-node": "0.21.0",
     "ali-oss": "^6.22.0",
     "basic-ftp": "^5.0.5",
@@ -53,5 +53,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "e1daaf07ce2fda6ce44998d65f8a989fc6af88db"
+  "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
 }

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

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

packages/ui/certd-client/.env

@@ -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#/product/list
+# 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"

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

@@ -1,3 +1,6 @@
 VITE_APP_API=api
 #登录与权限开启
 VITE_APP_PM_ENABLED=true
+
+
+VITE_APP_VIP_PRODUCT_URL="https://app.handfree.work/subject#/app/certd/product"

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.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
+
+* 修复站点证书监控复制按钮无效的bug ([efa26a0](https://github.com/certd/certd/commit/efa26a067f06402f30befc016d9934cadcd5a563))
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 ### Performance Improvements

packages/ui/certd-client/index.html

@@ -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%>"/>

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.37.3",
+  "version": "1.37.7",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -33,11 +33,11 @@
     "@aws-sdk/s3-request-presigner": "^3.535.0",
     "@certd/vue-js-cron-light": "^4.0.14",
     "@ctrl/tinycolor": "^4.1.0",
-    "@fast-crud/editor-code": "^1.26.6",
+    "@fast-crud/editor-code": "^1.27.4",
-    "@fast-crud/fast-crud": "^1.26.6",
+    "@fast-crud/fast-crud": "^1.27.4",
-    "@fast-crud/fast-extends": "^1.26.6",
+    "@fast-crud/fast-extends": "^1.27.4",
-    "@fast-crud/ui-antdv4": "^1.26.6",
+    "@fast-crud/ui-antdv4": "^1.27.4",
-    "@fast-crud/ui-interface": "^1.26.6",
+    "@fast-crud/ui-interface": "^1.27.4",
     "@iconify/tailwind": "^1.2.0",
     "@iconify/vue": "^4.1.1",
     "@manypkg/get-packages": "^2.2.2",
@@ -106,8 +106,8 @@
     "zod-defaults": "^0.1.3"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.37.3",
+    "@certd/lib-iframe": "^1.37.7",
-    "@certd/pipeline": "^1.37.3",
+    "@certd/pipeline": "^1.37.7",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

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

@@ -56,10 +56,10 @@ function onChange(data: any) {
 }
 
 async function getCaptchaForm() {
-  return await captchaRef.value.getCaptchaForm();
+  return await captchaRef.value?.getCaptchaForm();
 }
 async function reset() {
-  await captchaRef.value.reset();
+  await captchaRef.value?.reset();
 }
 defineExpose({
   getCaptchaForm,

packages/ui/certd-client/src/components/captcha/captchas/tencent_captcha.vue

@@ -53,6 +53,13 @@ function callback(res: { ret: number; ticket: string; randstr: string; errorCode
   // res（验证成功） = {ret: 0, ticket: "String", randstr: "String"}
   // res（请求验证码发生错误，验证码自动返回trerror_前缀的容灾票据） = {ret: 0, ticket: "String", randstr: "String",  errorCode: Number, errorMessage: "String"}
   // 此处代码仅为验证结果的展示示例，真实业务接入，建议基于ticket和errorCode情况做不同的业务处理
+
+  if (res.errorCode && res.errorCode > 0) {
+    notification.error({
+      message: `验证码验证失败：${res.errorMessage || res.errorCode}`,
+    });
+  }
+
   if (res.ret === 0) {
     emitChange({
       ticket: res.ticket,
@@ -116,7 +123,7 @@ function emitChange(value: any) {
   emit("change", value);
 }
 function reset() {
-  captchaInstanceRef.value.instance.reset();
+  captchaInstanceRef.value?.instance?.reset();
 }
 
 watch(

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

@@ -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>

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

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

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

@@ -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();
       });
     }
   },

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

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!settingStore.isComm || userStore.isAdmin" class="layout-vip isPlus" @click="openUpgrade">
+  <div v-if="!settingStore.isComm || userStore.isAdmin" class="layout-vip isPlus" :class="{ isForever: settingStore.isForever }" @click="openUpgrade">
     <contextHolder />
     <fs-icon icon="mingcute:vip-1-line" :title="text.title" />
 
@@ -12,7 +12,7 @@
   </div>
 </template>
 <script lang="tsx" setup>
-import { computed, onMounted, reactive } from "vue";
+import { computed, onMounted, reactive, ref } from "vue";
 import dayjs from "dayjs";
 import { message, Modal } from "ant-design-vue";
 import * as api from "./api";
@@ -21,7 +21,7 @@ import { useRouter } from "vue-router";
 import { useUserStore } from "/@/store/user";
 import { mitter } from "/@/utils/util.mitt";
 import { useI18n } from "vue-i18n";
-
+import { env } from "/@/utils/util.env";
 const { t } = useI18n();
 
 const settingStore = useSettingStore();
@@ -106,7 +106,7 @@ const text = computed<Text>(() => {
 
 const expireTime = computed(() => {
   if (settingStore.isPlus) {
-    return dayjs(settingStore.plusInfo.expireTime).format("YYYY-MM-DD");
+    return settingStore.expiresText;
   }
   return "";
 });
@@ -165,34 +165,38 @@ function goAccount() {
   router.push("/sys/account");
 }
 
-async function getVipTrial() {
+async function getVipTrial(vipType = "plus") {
-  const res = await api.getVipTrial();
+  const res = await api.getVipTrial(vipType);
   message.success(t("vip.congratulations_vip_trial", { duration: res.duration }));
   await settingStore.init();
 }
 
-function openTrialModal() {
+function openTrialModal(vipType = "plus") {
   Modal.destroyAll();
 
   modal.confirm({
     title: t("vip.trial_modal_title"),
     okText: t("vip.trial_modal_ok_text"),
     onOk() {
-      getVipTrial();
+      getVipTrial(vipType);
     },
     width: 600,
     content: () => {
       return (
         <div class="flex-col mt-10 mb-10">
           <div>{t("vip.trial_modal_thanks")}</div>
-          <div>{t("vip.trial_modal_click_confirm")}</div>
+          <div>{t("vip.trial_modal_click_confirm", { vipType })}</div>
         </div>
       );
     },
   });
 }
 
-function openStarModal() {
+function openStarModal(vipType: string) {
+  if (settingStore.isPlus) {
+    message.error(t("vip.already_vip"));
+    return;
+  }
   Modal.destroyAll();
   const goGithub = () => {
     window.open("https://github.com/certd/certd/");
@@ -203,7 +207,7 @@ function openStarModal() {
     okText: t("vip.star_now"),
     onOk() {
       goGithub();
-      openTrialModal();
+      openTrialModal(vipType);
     },
     width: 600,
     content: () => {
@@ -231,7 +235,49 @@ function openUpgrade() {
     title = t("vip.renew_pro_upgrade_business");
   }
 
+  // const goBuyUrl = "https://afdian.com/a/greper"
+  const subjectId = settingStore.installInfo.siteId;
+  const appKey = settingStore.installInfo.appKey;
+  const location = window.location;
+  const callbackUrl = encodeURIComponent(`${location.origin}${location.pathname}#/sys/account`);
+  const goBuyUrl = `${env.VIP_PRODUCT_URL}?appKey=${appKey}&subjectId=${subjectId}&callback=${callbackUrl}`;
+  const goBuyCommUrl = `${goBuyUrl}&vipType=comm`;
   const productInfo = settingStore.productInfo;
+
+  function checkPerpetualPlus() {
+    if (settingStore.isPerpetual) {
+      Modal.warn({
+        title: t("vip.already_perpetual_plus"),
+        okText: t("vip.confirm"),
+      });
+      throw new Error(t("vip.already_perpetual_plus"));
+    }
+  }
+  function goBuyPlusPage() {
+    checkPerpetualPlus();
+    if (settingStore.isComm) {
+      Modal.warn({
+        title: t("vip.already_comm"),
+        okText: t("vip.confirm"),
+      });
+      return;
+    }
+    window.open(goBuyUrl);
+  }
+  function goBuyCommPage() {
+    checkPerpetualPlus();
+    if (settingStore.isPlus && !settingStore.isComm) {
+      Modal.confirm({
+        title: t("vip.already_plus"),
+        okText: t("vip.confirm"),
+        onOk() {
+          window.open(goBuyCommUrl);
+        },
+      });
+      return;
+    }
+    window.open(goBuyCommUrl);
+  }
   const vipTypeDefine = {
     free: {
       title: t("vip.basic_edition"),
@@ -248,7 +294,7 @@ function openUpgrade() {
       trial: {
         title: t("vip.click_to_get_7_day_trial"),
         click: () => {
-          openStarModal();
+          openStarModal("plus");
         },
       },
       icon: "stash:thumb-up",
@@ -258,7 +304,7 @@ function openUpgrade() {
       get() {
         return (
           <a-tooltip title={t("vip.afdian_support_vip")}>
-            <a-button size="small" type="primary" href="https://afdian.com/a/greper" target="_blank">
+            <a-button size="small" type="primary" onClick={goBuyPlusPage}>
               {t("vip.get_after_support")}
             </a-button>
           </a-tooltip>
@@ -274,30 +320,67 @@ function openUpgrade() {
       price: productInfo.comm.price,
       price3: `¥${productInfo.comm.price3}/3${t("vip.years")}`,
       tooltip: productInfo.comm.tooltip,
+      trial: {
+        title: t("vip.click_to_get_7_day_trial"),
+        click: () => {
+          openStarModal("comm");
+        },
+      },
       get() {
-        return <a-button size="small">{t("vip.contact_author_for_trial")}</a-button>;
+        return (
+          <a-button size="small" type="primary" onClick={goBuyCommPage}>
+            {t("vip.buy")}
+          </a-button>
+        );
       },
     },
   };
 
-  const modalRef = modal.confirm({
+  const manualActiveFlag = ref();
+  function showManualActivation() {
+    manualActiveFlag.value = true;
+  }
+
+  function goBindAccount() {
+    modalRef?.destroy();
+    router.push({
+      path: "/sys/account",
+    });
+  }
+  const modalRef = modal.success({
     title,
-    async onOk() {
-      return await doActive();
-    },
     maskClosable: true,
-    okText: t("vip.activate"),
+    okText: t("vip.close"),
     width: 1100,
     content: () => {
-      let activationCodeGetWay = (
+      let manualActiveBlock: any = "";
-        <span>
+      if (manualActiveFlag.value) {
-          <a href="https://afdian.com/a/greper" target="_blank">
+        manualActiveBlock = (
-            {t("vip.get_pro_code_after_support")}
+          <div>
-          </a>
+            <div class="mt-10">
-          <span> {t("vip.business_contact_author")}</span>
+              <a-input-search class="w-2/6" v-model:value={formState.code} placeholder={placeholder} enter-button={t("vip.activate")} onSearch={doActive}></a-input-search>
-        </span>
+            </div>
-      );
+            <div class="mt-10">
+              {t("vip.activation_code_one_use")}
+              <a onClick={goAccount}>{t("vip.bind_account")}</a>，{t("vip.transfer_vip")}
+            </div>
+          </div>
+        );
+      }
       const vipLabel = settingStore.vipLabel;
+      let plusInfo: any = "";
+      if (isPlus) {
+        plusInfo = (
+          <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>
+        );
+      }
+
       const slots = [];
       for (const key in vipTypeDefine) {
         // @ts-ignore
@@ -363,26 +446,23 @@ function openUpgrade() {
             <a-row gutter={20}>{slots}</a-row>
           </div>
           <div class="mt-10">
-            <h3 class="block-header">{isPlus ? t("vip.renew") : t("vip.activate_immediately")}</h3>
+            <div class="flex-o w-100">
-            <div>{isPlus ? `${t("vip.current")} ${vipLabel} ${t("vip.activated_expire_time")}` + dayjs(settingStore.plusInfo.expireTime).format("YYYY-MM-DD") : ""}</div>
+              <span>{t("vip.site_id")}：</span>
-            <div class="mt-10">
+              <fs-copyable v-model={computedSiteId.value}></fs-copyable>
-              <div class="flex-o w-100">
-                <span>{t("vip.site_id")}：</span>
-                <fs-copyable class="flex-1" v-model={computedSiteId.value}></fs-copyable>
-              </div>
-              <a-input class="mt-10" v-model:value={formState.code} placeholder={placeholder} />
-              <a-input class="mt-10" v-model:value={formState.inviteCode} placeholder={t("vip.invite_code_optional")} />
-            </div>
 
-            <div class="mt-10">
+              <a class="ml-2" onClick={goBindAccount}>
-              {t("vip.no_activation_code")}
+                {t("vip.not_effective")}
-              {activationCodeGetWay}
+              </a>
-            </div>
-            <div class="mt-10">
-              {t("vip.activation_code_one_use")}
-              <a onClick={goAccount}>{t("vip.bind_account")}</a>，{t("vip.transfer_vip")}
             </div>
           </div>
+          {plusInfo}
+          <div class="mt-10">
+            {t("vip.have_activation_code")}
+            <span>
+              <a onClick={showManualActivation}>{t("vip.manual_activation")}</a>
+            </span>
+          </div>
+          <div class="mt-10">{manualActiveBlock}</div>
         </div>
       );
     },
@@ -406,6 +486,10 @@ onMounted(() => {
 
   &.isPlus {
     color: #c5913f;
+
+    &.isForever {
+      color: #ff2e83;
+    }
   }
 
   .text {
@@ -420,6 +504,11 @@ onMounted(() => {
     border: 1px solid #eee;
     border-radius: 5px;
     height: 275px;
+    line-height: 24px;
+
+    .privilege {
+      margin-top: 5px;
+    }
 
     //background-color: rgba(250, 237, 167, 0.79);
     &.current {

packages/ui/certd-client/src/locales/langs/en-US/certd.ts

@@ -757,6 +757,9 @@ 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",
     },
   },
   modal: {

packages/ui/certd-client/src/locales/langs/en-US/vip.ts

@@ -32,13 +32,14 @@ export default {
   successContent: "You have successfully activated {vipLabel}, valid until: {expireDate}",
   bindAccountTitle: "Bind Your Account",
   bindAccountContent: "Binding your account helps prevent license loss. Strongly recommended.",
-  congratulations_vip_trial: "Congratulations, you have received a Pro version {duration} days trial",
+  congratulations_vip_trial: "Congratulations, you have received a VIP version {duration} days trial",
-  trial_modal_title: "7-day Pro version trial acquisition",
+  trial_modal_title: "7-day VIP version trial acquisition",
   trial_modal_ok_text: "Get now",
   trial_modal_thanks: "Thank you for supporting the open source project",
-  trial_modal_click_confirm: "Click confirm to get a 7-day Pro version trial",
+  trial_modal_click_confirm: "Click confirm to get a 7-day VIP({vipType}) version trial",
-  get_7_day_pro_trial: "7-day professional version trial",
+  get_7_day_pro_trial: "7-day VIP version trial",
   star_now: "Star Now",
+  already_vip: "Already VIP version, can't trial ",
   please_help_star: "Could you please help by starring? Thanks a lot!",
   admin_only_operation: "Admin operation only",
   enter_activation_code: "Please enter the activation code",
@@ -61,7 +62,7 @@ export default {
   plugins_fully_open: "All plugins open, including Synology and more",
   click_to_get_7_day_trial: "Click to get 7-day trial",
   years: "years",
-  afdian_support_vip: 'Get a one-year professional activation code after supporting "VIP membership" on Afdian, open source needs your support',
+  afdian_support_vip: "Obtain the permanent professional version coupon",
   get_after_support: "Get after sponsoring",
 
   business_edition: "Business Edition",
@@ -72,9 +73,9 @@ export default {
   plugin_management: "Plugin management",
   unlimited_multi_users: "Unlimited multi-users",
   support_user_payment: "Supports user payments",
-  contact_author_for_trial: "Please contact the author for trial",
+  contact_author_for_trial: "Buy It Now",
   activate: "Activate",
-  get_pro_code_after_support: 'Get a one-year professional activation code after supporting "VIP membership" on Afdian',
+  get_pro_code_after_support: "Go to sponsoring",
   business_contact_author: "Business edition please contact the author directly",
   year: "year",
   freee: "Free",
@@ -88,4 +89,15 @@ 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?",
+  buy: "Buy",
+  already_plus: "Already Professional Edition, will upgrade to Business Edition, Professional Edition time will be lost",
+  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",
 };

packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts

@@ -757,6 +757,10 @@ export default {
       pipelineValidTimeEnabledHelper: "是否启用流水线有效期",
       certDomainAddToMonitorEnabled: "证书域名添加到证书监控",
       certDomainAddToMonitorEnabledHelper: "创建证书流水线时是否可以选择将域名添加到证书监控",
+
+      fixedCertExpireDays: "固定证书有效期天数",
+      fixedCertExpireDaysHelper: "固定证书有效期天数，有助于列表进度条整齐显示",
+      fixedCertExpireDaysRecommend: "推荐90",
     },
   },
   modal: {

packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts

@@ -32,13 +32,14 @@ export default {
   successContent: "您已成功激活{vipLabel},有效期至：{expireDate}",
   bindAccountTitle: "是否绑定袖手账号",
   bindAccountContent: "绑定账号后，可以避免License丢失，强烈建议绑定",
-  congratulations_vip_trial: "恭喜，您已获得专业版{duration}天试用",
+  congratulations_vip_trial: "恭喜，您已获得VIP{duration}天试用",
-  trial_modal_title: "7天专业版试用获取",
+  trial_modal_title: "7天VIP试用获取",
   trial_modal_ok_text: "立即获取",
   trial_modal_thanks: "感谢您对开源项目的支持",
-  trial_modal_click_confirm: "点击确认，即可获取7天专业版试用",
+  trial_modal_click_confirm: "点击确认，即可获取7天VIP({vipType})试用",
-  get_7_day_pro_trial: "7天专业版试用获取",
+  get_7_day_pro_trial: "7天VIP试用获取",
   star_now: "立即去Star",
+  already_vip: "您已经是VIP了，不能试用",
   please_help_star: "可以先请您帮忙点个star吗？感谢感谢",
   admin_only_operation: "仅限管理员操作",
   enter_activation_code: "请输入激活码",
@@ -61,8 +62,8 @@ export default {
   plugins_fully_open: "插件全开放，群辉等更多插件",
   click_to_get_7_day_trial: "点击获取7天试用",
   years: "年",
-  afdian_support_vip: "爱发电赞助“VIP会员”后获取一年期专业版激活码，开源需要您的支持",
+  afdian_support_vip: "新用户开通永久专业版立享50优惠券",
-  get_after_support: "爱发电赞助后获取",
+  get_after_support: "立即赞助",
 
   business_edition: "商业版",
   commercial_license: "商业授权，可对外运营",
@@ -72,10 +73,9 @@ export default {
   plugin_management: "插件管理",
   unlimited_multi_users: "多用户无限制",
   support_user_payment: "支持用户支付",
-  contact_author_for_trial: "请联系作者获取试用",
   activate: "激活",
-  get_pro_code_after_support: "爱发电赞助“VIP会员”后获取一年期专业版激活码",
+  get_pro_code_after_support: "前往获取",
-  business_contact_author: "商业版请直接联系作者",
+  business_contact_author: "",
   year: "年",
   freee: "免费",
   renew: "续期",
@@ -87,5 +87,16 @@ export default {
   no_activation_code: "没有激活码？",
   activation_code_one_use: "激活码使用过一次之后，不可再次使用，如果要更换站点，请",
   bind_account: "绑定账号",
-  transfer_vip: '，然后"转移VIP"即可',
+  transfer_vip: '然后"转移VIP"即可',
+  needVipTip: "此为专业版功能，请先开通专业版",
+  manual_activation: "激活码手动激活",
+  close: "关闭",
+  have_activation_code: "已经有激活码了？",
+  buy: "立即购买",
+  already_plus: "已经是专业版了，是否升级为商业版？注意：专业版时长将被覆盖",
+  already_comm: "已经是商业版了，不能降级为专业版",
+  already_perpetual_plus: "您已经是永久专业版了，无法继续升级",
+  confirm: "确认",
+  not_effective: "VIP没有生效?",
+  learn_more: "更多特权(加VIP群等)",
 };

packages/ui/certd-client/src/plugin/fast-crud/index.tsx

@@ -1,6 +1,6 @@
 import { request } from "/src/api/service";
 // import "/src/mock";
-import { ColumnCompositionProps, CrudOptions, FastCrud, PageQuery, PageRes, setLogger, TransformResProps, useColumns, UseCrudProps, UserPageQuery, useTypes, utils } from "@fast-crud/fast-crud";
+import { ColumnCompositionProps, CrudOptions, FastCrud, PageQuery, PageRes, setLogger, TransformResProps, useColumns, UseCrudProps, UserPageQuery, useTypes, utils, forEachTableColumns } from "@fast-crud/fast-crud";
 import "@fast-crud/fast-crud/dist/style.css";
 import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader, FsExtendsInput } from "@fast-crud/fast-extends";
 import "@fast-crud/fast-extends/dist/style.css";
@@ -17,22 +17,24 @@ import { FsEditorCode } from "@fast-crud/editor-code";
 import "@fast-crud/editor-code/dist/style.css";
 
 class ColumnSizeSaver {
-  save: (key: string, size: number) => void;
+  type: string;
-  constructor() {
+  save: (key: string, value: any) => void;
-    this.save = debounce((key: string, size: number) => {
+  constructor(type: string = "columnSize") {
+    this.type = type;
+    this.save = debounce((key: string, value: any) => {
       const saveKey = this.getKey();
       let data = LocalStorage.get(saveKey);
       if (!data) {
         data = {};
       }
-      data[key] = size;
+      data[key] = value;
       LocalStorage.set(saveKey, data);
     });
   }
   getKey() {
     const loc = window.location;
     const currentUrl = `${loc.pathname}${loc.search}${loc.hash}`;
-    return `columnSize-${currentUrl}`;
+    return `${this.type}-${currentUrl}`;
   }
   get(key: string) {
     const saveKey = this.getKey();
@@ -45,6 +47,7 @@ class ColumnSizeSaver {
   }
 }
 const columnSizeSaver = new ColumnSizeSaver();
+const tableSortSaver = new ColumnSizeSaver("tableSorter");
 
 function install(app: App, options: any = {}) {
   app.use(UiAntdv);
@@ -63,6 +66,8 @@ function install(app: App, options: any = {}) {
     commonOptions(props: UseCrudProps): CrudOptions {
       utils.logger.debug("commonOptions:", props);
       const crudBinding = props.crudExpose?.crudBinding;
+      const crudExpose = props.crudExpose;
+
       const { isMobile } = usePreferences();
       const opts: CrudOptions = {
         settings: {
@@ -74,6 +79,20 @@ function install(app: App, options: any = {}) {
               },
             },
           },
+          onUseCrud(bindings: any) {
+            const oldSorter = tableSortSaver.get("sorter");
+            if (oldSorter) {
+              const { prop, order } = oldSorter;
+              forEachTableColumns(bindings.table.columns, (column: any) => {
+                if (column.key === prop) {
+                  column.sortOrder = order;
+                } else {
+                  column.sortOrder = false;
+                }
+              });
+              bindings.table.sort = oldSorter;
+            }
+          },
         },
         table: {
           scroll: {
@@ -104,6 +123,30 @@ function install(app: App, options: any = {}) {
               return "-";
             },
           },
+          onSortChange: (sortChange: any) => {
+            const { isServerSort, prop, asc, order } = sortChange;
+            const oldSort = crudBinding.value.table.sort;
+            const newSorter = isServerSort ? { prop, order, asc } : null;
+
+            forEachTableColumns(crudBinding.value.table.columns, (column: any) => {
+              if (column.key === prop) {
+                column.sortOrder = order;
+              } else {
+                column.sortOrder = false;
+              }
+            });
+
+            crudBinding.value.table.sort = newSorter;
+            if (newSorter) {
+              tableSortSaver.save("sorter", newSorter);
+            } else {
+              tableSortSaver.clear();
+            }
+
+            if (isServerSort || oldSort != null) {
+              crudExpose.doRefresh();
+            }
+          },
         },
         toolbar: {
           export: {
@@ -193,7 +236,11 @@ function install(app: App, options: any = {}) {
           wrapper: {
             saveRemind: true,
             // inner: true,
-            // innerContainerSelector: "main.fs-framework-content"
+            // innerContainerSelector: "main.fs-framework-content"，
+            buttons: {
+              copy: { show: false },
+              paste: { show: false },
+            },
           },
         },
         columns: {

packages/ui/certd-client/src/store/settings/api.basic.ts

@@ -56,6 +56,9 @@ export type SysPublicSetting = {
 
   //证书域名添加到监控
   certDomainAddToMonitorEnabled?: boolean;
+
+  // 固定证书有效期天数，0表示不固定
+  fixedCertExpireDays?: number;
 };
 export type SuiteSetting = {
   enabled?: boolean;

packages/ui/certd-client/src/store/settings/index.ts

@@ -1,6 +1,5 @@
 import { defineStore } from "pinia";
 import { Modal, notification } from "ant-design-vue";
-import * as _ from "lodash-es";
 import * as basicApi from "./api.basic";
 import { AppInfo, HeaderMenus, PlusInfo, SiteEnv, SiteInfo, SuiteSetting, SysInstallInfo, SysPublicSetting } from "./api.basic";
 import { useUserStore } from "../user";
@@ -11,6 +10,8 @@ import { useTitle } from "@vueuse/core";
 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;
@@ -126,11 +127,14 @@ export const useSettingStore = defineStore({
     getInstallInfo(): SysInstallInfo {
       return this.installInfo;
     },
+    isPerpetual(): boolean {
+      return this.plusInfo?.isPlus && this.plusInfo?.expireTime === -1;
+    },
     isPlus(): boolean {
-      return this.plusInfo?.isPlus && this.plusInfo?.expireTime > new Date().getTime();
+      return this.plusInfo?.isPlus && (this.plusInfo?.expireTime === -1 || this.plusInfo?.expireTime > new Date().getTime());
     },
     isComm(): boolean {
-      return this.plusInfo?.isComm && this.plusInfo?.expireTime > new Date().getTime();
+      return this.plusInfo?.isComm && (this.plusInfo?.expireTime === -1 || this.plusInfo?.expireTime > new Date().getTime());
     },
     isAgent(): boolean {
       return this.siteEnv?.agent?.enabled === true;
@@ -138,6 +142,18 @@ export const useSettingStore = defineStore({
     isCommOrAgent() {
       return this.isComm || this.isAgent;
     },
+    expiresText() {
+      if (this.plusInfo?.expireTime == null) {
+        return "";
+      }
+      if (this.plusInfo?.expireTime === -1) {
+        return "永久";
+      }
+      return dayjs(this.plusInfo?.expireTime).format("YYYY-MM-DD");
+    },
+    isForever() {
+      return this.isPlus && this.plusInfo?.expireTime === -1;
+    },
     vipLabel(): string {
       const { t } = useI18n();
       const vipLabelMap: any = {
@@ -174,19 +190,19 @@ 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() {
       const allSettings = await basicApi.loadAllSettings();
-      _.merge(this.sysPublic, allSettings.sysPublic || {});
+      merge(this.sysPublic, allSettings.sysPublic || {});
-      _.merge(this.installInfo, allSettings.installInfo || {});
+      merge(this.installInfo, allSettings.installInfo || {});
-      _.merge(this.siteEnv, allSettings.siteEnv || {});
+      merge(this.siteEnv, allSettings.siteEnv || {});
-      _.merge(this.plusInfo, allSettings.plusInfo || {});
+      merge(this.plusInfo, allSettings.plusInfo || {});
-      _.merge(this.headerMenus, allSettings.headerMenus || {});
+      merge(this.headerMenus, allSettings.headerMenus || {});
-      _.merge(this.suiteSetting, allSettings.suiteSetting || {});
+      merge(this.suiteSetting, allSettings.suiteSetting || {});
       //@ts-ignore
       this.initSiteInfo(allSettings.siteInfo || {});
       this.initAppInfo(allSettings.app || {});
@@ -206,7 +222,7 @@ export const useSettingStore = defineStore({
           siteInfo.loginLogo = `api/basic/file/download?key=${siteInfo.loginLogo}`;
         }
       }
-      this.siteInfo = _.merge({}, defaultSiteInfo, siteInfo);
+      this.siteInfo = merge({}, defaultSiteInfo, siteInfo);
 
       if (this.siteInfo.logo) {
         updatePreferences({

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

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

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

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

packages/ui/certd-client/src/utils/util.env.ts

@@ -6,22 +6,28 @@ export function getEnvValue(key: string) {
 
 export class EnvConfig {
   MODE: string = import.meta.env.MODE;
-  API: string = import.meta.env.VITE_APP_API;
+  API: string;
-  STORAGE: string = import.meta.env.VITE_APP_STORAGE;
+  STORAGE: string;
-  TITLE: string = import.meta.env.VITE_APP_TITLE;
+  TITLE: string;
-  SLOGAN: string = import.meta.env.VITE_APP_SLOGAN;
+  SLOGAN: string;
-  LOGO: string = import.meta.env.VITE_APP_LOGO;
+  LOGO: string;
-  LOGIN_LOGO: string = import.meta.env.VITE_APP_LOGIN_LOGO;
+  LOGIN_LOGO: string;
-  ICP_NO: string = import.meta.env.VITE_APP_ICP_NO;
+  ICP_NO: string;
-  COPYRIGHT_YEAR: string = import.meta.env.VITE_APP_COPYRIGHT_YEAR;
+  COPYRIGHT_YEAR: string;
-  COPYRIGHT_NAME: string = import.meta.env.VITE_APP_COPYRIGHT_NAME;
+  COPYRIGHT_NAME: string;
-  COPYRIGHT_URL: string = import.meta.env.VITE_APP_COPYRIGHT_URL;
+  COPYRIGHT_URL: string;
-  PM_ENABLED: string = import.meta.env.VITE_APP_PM_ENABLED;
+  PM_ENABLED: string;
+  VIP_PRODUCT_URL: string;
 
-  init(env: any) {
+  constructor() {
+    this.init();
+  }
+  init() {
+    const env = import.meta.env;
     for (const key in this) {
-      if (this.hasOwnProperty(key)) {
+      const metaKey = "VITE_APP_" + key;
-        this[key] = env[key];
+      if (this.hasOwnProperty(key) && env.hasOwnProperty(metaKey)) {
+        this[key] = env[metaKey];
       }
     }
   }

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

@@ -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: {

packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx

@@ -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";

packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx

@@ -33,6 +33,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
 
   const addRequest = async (req: AddReq) => {
     const { form } = req;
+    delete form.id;
     const res = await api.AddObj(form);
     return res;
   };
@@ -60,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({
@@ -505,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";

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

@@ -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",

packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx

@@ -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,

packages/ui/certd-client/src/views/certd/pipeline/components/change-group.vue

@@ -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: {

packages/ui/certd-client/src/views/certd/pipeline/components/change-notification.vue

@@ -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: {

packages/ui/certd-client/src/views/certd/pipeline/components/change-trigger.vue

@@ -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": {

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

@@ -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";

packages/ui/certd-client/src/views/certd/pipeline/detail.vue

@@ -20,8 +20,8 @@ defineOptions({
   name: "PipelineDetail",
 });
 const route = useRoute();
-const pipelineId: Ref = ref(route.query.id);
+const pipelineId: Ref = ref(parseInt((route.query.id as string) || "0"));
-const historyId = ref(route.query.historyId as string);
+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),
     });

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

@@ -9,9 +9,9 @@
           <span>{{ t("certd.selectedCount", { count: selectedRowKeys.length }) }}</span>
           <fs-button icon="ion:trash-outline" class="color-red" type="link" :text="t('certd.batchDelete')" @click="batchDelete"></fs-button>
           <fs-button icon="icon-park-outline:replay-music" class="need-plus" type="link" :text="t('certd.batchForceRerun')" @click="batchRerun"></fs-button>
-          <change-group class="color-green" :selected-row-keys="selectedRowKeys" @change="batchFinished"></change-group>
+          <change-group :selected-row-keys="selectedRowKeys" @change="batchFinished"></change-group>
-          <change-notification class="color-green" :selected-row-keys="selectedRowKeys" @change="batchFinished"></change-notification>
+          <change-notification :selected-row-keys="selectedRowKeys" @change="batchFinished"></change-notification>
-          <change-trigger class="color-green" :selected-row-keys="selectedRowKeys" @change="batchFinished"></change-trigger>
+          <change-trigger :selected-row-keys="selectedRowKeys" @change="batchFinished"></change-trigger>
         </div>
       </div>
       <template #actionbar-right> </template>
@@ -34,6 +34,7 @@ import { useI18n } from "/src/locales";
 
 const { t } = useI18n();
 import ChangeNotification from "/@/views/certd/pipeline/components/change-notification.vue";
+import { useSettingStore } from "/@/store/settings";
 
 defineOptions({
   name: "PipelineManager",
@@ -61,8 +62,10 @@ onActivated(async () => {
   await crudExpose.doRefresh();
 });
 
+const settingStore = useSettingStore();
+
 function batchFinished() {
-  crudExpose.doRefresh();
+  if (settingStore) crudExpose.doRefresh();
   selectedRowKeys.value = [];
 }
 function batchDelete() {
@@ -79,6 +82,7 @@ function batchDelete() {
 }
 
 function batchRerun() {
+  settingStore.checkPlus();
   Modal.confirm({
     title: "确认强制重新运行吗",
     content: "确定要强制重新运行选中流水线吗？(20条一批执行)",

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/history-timeline-item.vue

@@ -3,7 +3,7 @@
     <template #dot>
       <fs-icon v-bind="status" :color="status.iconColor || status.color" />
     </template>
-    <p>
+    <p class="flex items-center">
       <fs-date-format :model-value="runnable.createTime"></fs-date-format>
       <a-tag class="ml-5" :color="status.color" :closable="status.value === 'start'" @close="cancelTask">
         {{ status.label }}

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue

@@ -24,7 +24,7 @@
             </a-col>
           </a-row>
         </template>
-        <div class="flex-col h-100 w-100 overflow-hidden">
+        <div class="flex-col h-100 overflow-hidden md:ml-5 md:mr-5 step-form-body">
           <a-tabs v-model:active-key="pluginGroupActive" tab-position="left" class="flex-1 overflow-hidden">
             <template v-for="group of computedPluginGroups" :key="group.key">
               <a-tab-pane v-if="(group.key === 'admin' && userStore.isAdmin) || group.key !== 'admin'" :key="group.key" class="scroll-y">
@@ -464,12 +464,9 @@ defineExpose({
 .step-form-drawer {
   max-width: 100%;
 
-  .ant-tabs-right > div > .ant-tabs-nav .ant-tabs-tab {
-    padding: 8px 10px;
-  }
-
   .ant-tabs-nav .ant-tabs-tab {
     margin-top: 10px !important;
+    padding: 8px 14px !important;
   }
 
   &.fullscreen {

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue

@@ -9,8 +9,8 @@
       </div>
     </template>
     <template v-if="currentTask">
-      <pi-container>
+      <pi-container class="task-form-container">
-        <a-form ref="taskFormRef" class="task-form" :model="currentTask" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-form ref="taskFormRef" class="task-form md:ml-20 md:mr-20" :model="currentTask" :label-col="labelCol" :wrapper-col="wrapperCol">
           <fs-form-item
             v-model="currentTask.title"
             :item="{
@@ -258,8 +258,8 @@ export default {
     return {
       userStore,
       settingStore,
-      labelCol: { span: 6 },
+      labelCol: { span: 4 },
-      wrapperCol: { span: 16 },
+      wrapperCol: { span: 20 },
       ...useTaskForm(),
       ...useStep(),
     };
@@ -269,8 +269,18 @@ export default {
 
 <style lang="less">
 .pi-task-form {
+  .task-form-container {
+    .body {
+      .task-form {
+        .ant-form-item-label {
+          text-align: left !important ;
+        }
+      }
+    }
+  }
+
   .steps {
-    margin: 0 50px 0 50px;
+    margin: 0;
   }
   .ant-list .ant-list-item .ant-list-item-meta .ant-list-item-meta-title {
     margin: 0;
@@ -283,7 +293,6 @@ export default {
     }
   }
   .step-list {
-    padding: 10px;
     .icon-button {
       font-size: 18px;
       color: #1677ff;
@@ -291,7 +300,7 @@ export default {
     }
 
     .step-row {
-      padding: 10px;
+      margin-bottom: 10px;
       display: flex;
       align-items: center;
       justify-content: space-between;
@@ -306,7 +315,7 @@ export default {
         display: flex;
         align-items: center;
         > * {
-          margin-right: 15px;
+          margin-right: 10px;
           font-size: 14px;
         }
       }

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

@@ -327,11 +327,11 @@ export default defineComponent({
   },
   props: {
     pipelineId: {
-      type: [Number, String],
+      type: Number,
       default: 0,
     },
     historyId: {
-      type: [Number, String],
+      type: Number,
       default: 0,
     },
     editMode: {
@@ -348,6 +348,7 @@ export default defineComponent({
   emits: ["update:modelValue", "update:editMode"],
   setup(props, ctx) {
     const { t } = useI18n();
+    //右侧选中的pipeline
     const currentPipeline: Ref<any> = ref({});
     const pipeline: Ref<any> = ref({});
     const pipelineEntity: Ref<any> = ref({});
@@ -399,7 +400,7 @@ export default defineComponent({
       currentPipeline.value = currentHistory.value.pipeline;
     };
 
-    async function loadHistoryList(reload = false) {
+    async function loadHistoryList(reload = false, historyId: number) {
       if (props.editMode) {
         return;
       }
@@ -416,11 +417,11 @@ export default defineComponent({
       histories.value = historyList;
 
       if (historyList.length > 0) {
-        //@ts-ignore
+        if (historyId > 0) {
-        if (props.historyId > 0) {
+          //如果传递了history，优先显示历史记录作为当前
-          const found = historyList.find(item => {
+          const found = histories.value.find(item => {
             //字符串==int
-            return item.id == props.historyId;
+            return item.id == historyId;
           });
           if (found) {
             await changeCurrentHistory(found);
@@ -428,7 +429,8 @@ export default defineComponent({
           }
         }
         //@ts-ignore
-        if (historyList[0]?.version === pipeline.value.version) {
+        if (historyList[0]?.version === pipeline.value?.version) {
+          //如果当前的流水线版本与历史记录最后一条一致，则将该记录设置为current
           await changeCurrentHistory(historyList[0]);
         }
       }
@@ -482,7 +484,7 @@ export default defineComponent({
         if (editMode) {
           changeCurrentHistory();
         } else if (histories.value.length > 0) {
-          if (histories.value[0].pipeline.version === pipeline.value.version) {
+          if (histories.value[0].pipeline?.version === pipeline.value?.version) {
             changeCurrentHistory(histories.value[0]);
           }
         }
@@ -508,7 +510,7 @@ export default defineComponent({
           detail.pipeline
         );
         pipeline.value = currentPipeline.value;
-        await loadHistoryList(true);
+        await loadHistoryList(true, props.historyId);
       },
       {
         immediate: true,
@@ -739,6 +741,14 @@ export default defineComponent({
           async onOk() {
             //@ts-ignore
             await changeCurrentHistory(null);
+            if (histories.value.length > 0) {
+              //看是不是最新的pipeline版本
+              if (pipeline.value?.version !== histories.value[0].pipeline?.version) {
+                const detail: PipelineDetail = await props.options.getPipelineDetail({ pipelineId: pipeline.value.id });
+                pipeline.value = detail.pipeline;
+              }
+            }
+
             await props.options.doTrigger({ pipelineId: pipeline.value.id, stepId: stepId });
             notification.success({ message: "管道已经开始运行" });
           },
@@ -830,10 +840,6 @@ export default defineComponent({
         saveLoading.value = true;
         try {
           if (props.options.doSave) {
-            if (pipeline.value.version == null) {
-              pipeline.value.version = 0;
-            }
-            pipeline.value.version++;
             currentPipeline.value = pipeline.value;
 
             //移除空阶段
@@ -841,7 +847,11 @@ export default defineComponent({
               return item.tasks.length === 0;
             });
 
-            await props.options.doSave(pipeline.value);
+            const { version } = await props.options.doSave(pipeline.value);
+            if (version) {
+              pipeline.value.version = version;
+              currentPipeline.value.version = version;
+            }
           }
           if (offEdit) {
             toggleEditMode(false);
@@ -1023,7 +1033,7 @@ export default defineComponent({
     }
 
     .layout-right {
-      width: 350px;
+      width: 354px;
       height: 100%;
     }
   }
@@ -1250,7 +1260,7 @@ export default defineComponent({
     position: relative;
 
     &.collapsed {
-      margin-right: -350px;
+      margin-right: -354px;
     }
 
     .collapse-toggle {

packages/ui/certd-client/src/views/certd/pipeline/pipeline/type.ts

@@ -16,7 +16,7 @@ export type RunHistory = {
 
 export type PipelineOptions = {
   doTrigger(options: { pipelineId: number; stepId?: string }): Promise<void>;
-  doSave(pipelineConfig: Pipeline): Promise<void>;
+  doSave(pipelineConfig: Pipeline): Promise<{ id: number; version: number }>;
   getPipelineDetail(query: { pipelineId: number }): Promise<PipelineDetail>;
   getHistoryList(query: { pipelineId: number }): Promise<RunHistory[]>;
   getHistoryDetail(query: { historyId: number }): Promise<RunHistory>;

packages/ui/certd-client/src/views/framework/register/index.vue

@@ -61,7 +61,7 @@
               </a-input-password>
             </a-form-item>
 
-            <a-form-item has-feedback name="imgCode" label="验证码" :rules="rules.imgCode">
+            <a-form-item has-feedback name="captchaForEmail" label="验证码" :rules="rules.captchaForEmail">
               <CaptchaInput v-model:model-value="formState.captchaForEmail"></CaptchaInput>
             </a-form-item>
 
@@ -118,6 +118,7 @@ export default defineComponent({
       password: "",
       confirmPassword: "",
       captcha: null,
+      captchaForEmail: null,
     });
 
     const rules = {
@@ -180,10 +181,10 @@ export default defineComponent({
           message: "请通过验证码",
         },
       ],
-      imgCode: [
+      captchaForEmail: [
         {
           required: true,
-          message: "请输入验证码",
+          message: "请通过验证码",
         },
       ],
     };
@@ -204,7 +205,7 @@ export default defineComponent({
             password: formState.password,
             username: formState.username,
             email: formState.email,
-            captcha: formState.captcha,
+            captcha: registerType.value === "email" ? formState.captchaForEmail : formState.captcha,
             validateCode: formState.validateCode,
           }) as any
         );

packages/ui/certd-client/src/views/sys/account/index.vue

@@ -29,9 +29,10 @@ const settingStore = useSettingStore();
 
 const iframeSrcRef = computed(() => {
   if (!settingStore.installInfo.accountServerBaseUrl) {
-    return "";
+    return "#/app/certd/home";
   }
-  return `${settingStore.installInfo.accountServerBaseUrl}/#/?appKey=${settingStore.installInfo.appKey}`;
+  const timestamp = Date.now();
+  return `${settingStore.installInfo.accountServerBaseUrl}/#/app/certd/home?t=${timestamp}`;
 });
 
 type SubjectInfo = {

packages/ui/certd-client/src/views/sys/settings/tabs/pipeline.vue

@@ -24,6 +24,14 @@
         <div class="helper">{{ t("certd.sys.setting.certDomainAddToMonitorEnabledHelper") }}</div>
       </a-form-item>
 
+      <a-form-item :label="t('certd.sys.setting.fixedCertExpireDays')" :name="['public', 'fixedCertExpireDays']">
+        <div class="flex items-center">
+          <a-input-number v-model:value="formState.public.fixedCertExpireDays" :placeholder="t('certd.sys.setting.fixedCertExpireDaysRecommend')" />
+          <vip-button class="ml-5" mode="button"></vip-button>
+        </div>
+        <div class="helper">{{ t("certd.sys.setting.fixedCertExpireDaysHelper") }}</div>
+      </a-form-item>
+
       <a-form-item label=" " :colon="false" :wrapper-col="{ span: 8 }">
         <a-button :loading="saveLoading" type="primary" html-type="submit">{{ t("certd.saveButton") }}</a-button>
       </a-form-item>

packages/ui/certd-client/src/views/sys/suite/user-suite/crud.tsx

@@ -375,7 +375,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
         },
         createTime: {
-          title: t("certd.create_time"),
+          title: t("certd.createTime"),
           type: "datetime",
           form: {
             show: false,
@@ -387,7 +387,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
         },
         updateTime: {
-          title: t("certd.update_time"),
+          title: t("certd.updateTime"),
           type: "datetime",
           form: {
             show: false,

packages/ui/certd-server/.env.dev-localplus.yaml

@@ -20,7 +20,7 @@
 typeorm:
   dataSource:
     default:
-      database: './data/db-plus-dev-1.sqlite'
+      database: './data/db-plus-dev.sqlite'
 
 # plus server: 'http://127.0.0.1:11007'
 account:

packages/ui/certd-server/CHANGELOG.md

@@ -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.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)
+
+### Performance Improvements
+
+* 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))
+
+### Performance Improvements
+
+* 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)
+
+### Performance Improvements
+
+* 优化数据备份效率，流式写入文件 ([c38dbbb](https://github.com/certd/certd/commit/c38dbbb1d72bd00a92fe275b76aea82a791e7199))
+
 ## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
 
 ### Bug Fixes

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.37.3",
+  "version": "1.37.7",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -45,20 +45,20 @@
     "@aws-sdk/client-cloudfront": "^3.699.0",
     "@aws-sdk/client-iam": "^3.699.0",
     "@aws-sdk/client-s3": "^3.705.0",
-    "@certd/acme-client": "^1.37.3",
+    "@certd/acme-client": "^1.37.7",
-    "@certd/basic": "^1.37.3",
+    "@certd/basic": "^1.37.7",
-    "@certd/commercial-core": "^1.37.3",
+    "@certd/commercial-core": "^1.37.7",
     "@certd/cv4pve-api-javascript": "^8.4.2",
-    "@certd/jdcloud": "^1.37.3",
+    "@certd/jdcloud": "^1.37.7",
-    "@certd/lib-huawei": "^1.37.3",
+    "@certd/lib-huawei": "^1.37.7",
-    "@certd/lib-k8s": "^1.37.3",
+    "@certd/lib-k8s": "^1.37.7",
-    "@certd/lib-server": "^1.37.3",
+    "@certd/lib-server": "^1.37.7",
-    "@certd/midway-flyway-js": "^1.37.3",
+    "@certd/midway-flyway-js": "^1.37.7",
-    "@certd/pipeline": "^1.37.3",
+    "@certd/pipeline": "^1.37.7",
-    "@certd/plugin-cert": "^1.37.3",
+    "@certd/plugin-cert": "^1.37.7",
-    "@certd/plugin-lib": "^1.37.3",
+    "@certd/plugin-lib": "^1.37.7",
-    "@certd/plugin-plus": "^1.37.3",
+    "@certd/plugin-plus": "^1.37.7",
-    "@certd/plus-core": "^1.37.3",
+    "@certd/plus-core": "^1.37.7",
     "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
     "@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
     "@koa/cors": "^5.0.0",
@@ -73,6 +73,7 @@
     "@midwayjs/typeorm": "3.20.11",
     "@midwayjs/upload": "3.20.13",
     "@midwayjs/validate": "3.20.13",
+    "@peculiar/x509": "^1.11.0",
     "@volcengine/openapi": "^1.28.1",
     "ali-oss": "^6.21.0",
     "axios": "^1.7.2",

packages/ui/certd-server/src/controller/sys/plus/plus-controller.ts

@@ -1,5 +1,6 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController, PlusService, SysInstallInfo, SysSettingsService } from '@certd/lib-server';
+import { logger } from '@certd/basic';
 
 /**
  */
@@ -31,15 +32,20 @@ export class SysPlusController extends BaseController {
     installInfo.bindUrl = url;
     await this.sysSettingsService.saveSetting(installInfo);
 
-    //重新验证配置
+    //重新验证vip
-    await this.plusService.verify();
+    try{
+      await this.plusService.verify();
+    }catch(e){
+      logger.error(`验证配置失败:${e}`);
+    }
+  
 
     return this.ok(true);
   }
 
   @Post('/getVipTrial', { summary: 'sys:settings:edit' })
-  async getVipTrial(@Body(ALL) body) {
+  async getVipTrial(@Body("vipType") vipType?:string) {
-    const res = await this.plusService.getVipTrial();
+    const res = await this.plusService.getVipTrial(vipType);
     return this.ok(res);
   }
   //

packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts

@@ -91,7 +91,7 @@ export class PipelineController extends CrudController<PipelineService> {
       delete bean.validTime
     }
 
-    await this.service.save(bean);
+    const {version} = await this.service.save(bean);
     //是否增加证书监控
     if (bean.addToMonitorEnabled && bean.addToMonitorDomains) {
       const sysPublicSettings = await this.sysSettingsService.getPublicSettings();
@@ -103,7 +103,7 @@ export class PipelineController extends CrudController<PipelineService> {
         });
       }
     }
-    return this.ok(bean.id);
+    return this.ok({id:bean.id,version:version});
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })

packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts

@@ -13,7 +13,7 @@ import { CnameRecordEntity, CnameRecordStatusType } from "../entity/cname-record
 import { createDnsProvider, IDnsProvider } from "@certd/plugin-cert";
 import { CnameProvider, CnameRecord } from "@certd/pipeline";
 import { cache, http, isDev, logger, utils } from "@certd/basic";
-import { getAuthoritativeDnsResolver, walkTxtRecord } from "@certd/acme-client";
+import { getAuthoritativeDnsResolver, createChallengeFn } from "@certd/acme-client";
 import { CnameProviderService } from "./cname-provider-service.js";
 import { CnameProviderEntity } from "../entity/cname-provider.js";
 import { CommonDnsProvider } from "./common-provider.js";
@@ -134,6 +134,8 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
     if (!param.id) {
       throw new ValidateException("id不能为空");
     }
+    //hostRecord包含所有权校验信息，不允许用户修改hostRecord
+    delete param.hostRecord
 
     const old = await this.info(param.id);
     if (!old) {
@@ -239,6 +241,8 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
    * @param id
    */
   async verify(id: number) {
+
+    const {walkTxtRecord} = createChallengeFn({logger});
     const bean = await this.info(id);
     if (!bean) {
       throw new ValidateException(`CnameRecord:${id} 不存在`);
@@ -414,6 +418,7 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
 
   async checkRepeatAcmeChallengeRecords(acmeRecordDomain: string, targetCnameDomain: string) {
 
+    
     let dnsResolver = null;
     try {
       dnsResolver = await getAuthoritativeDnsResolver(acmeRecordDomain);
@@ -458,6 +463,9 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
       //如果权威服务器中查不到txt，无需继续检查
       return;
     }
+
+    const {walkTxtRecord} = createChallengeFn({logger});
+
     if (cnameRecords.length > 0) {
       // 从cname记录中获取txt记录
       // 对比是否存在，如果不存在于cname中获取的txt中，说明本体有创建多余的txt记录

packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts

@@ -241,7 +241,10 @@ export class PipelineService extends BaseService<PipelineEntity> {
       fromType = "auto";
     }
     await this.certInfoService.updateDomains(pipeline.id, pipeline.userId || bean.userId, domains, fromType);
-    return bean;
+    return {
+      ...bean,
+      version: pipeline.version,
+    };
   }
 
   /**
@@ -255,6 +258,11 @@ export class PipelineService extends BaseService<PipelineEntity> {
       bean.title = pipeline.title;
     }
     pipeline.id = bean.id;
+
+    if (pipeline.version == null) {
+      pipeline.version = 0;
+    }
+    pipeline.version++;
     bean.content = JSON.stringify(pipeline);
     await this.addOrUpdate(bean);
     await this.registerTrigger(bean);

packages/ui/certd-server/src/plugins/plugin-admin/plugin-db-backup.ts

@@ -6,15 +6,15 @@ import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
 import JSZip from "jszip";
 import * as os from "node:os";
 import { OssClientContext, ossClientFactory, OssClientRemoveByOpts, SshAccess, SshClient } from "@certd/plugin-lib";
-
+import { pipeline } from "stream/promises";
-const defaultBackupDir = 'certd_backup';
+const defaultBackupDir = "certd_backup";
-const defaultFilePrefix = 'db_backup';
+const defaultFilePrefix = "db_backup";
 
 @IsTaskPlugin({
-  name: 'DBBackupPlugin',
+  name: "DBBackupPlugin",
-  title: '数据库备份',
+  title: "数据库备份",
-  icon: 'lucide:database-backup',
+  icon: "lucide:database-backup",
-  desc: '【仅管理员可用】仅支持备份SQLite数据库',
+  desc: "【仅管理员可用】仅支持备份SQLite数据库",
   group: pluginGroups.admin.key,
   showRunStrategy: true,
   default: {
@@ -22,32 +22,32 @@ const defaultFilePrefix = 'db_backup';
       runStrategy: RunStrategy.AlwaysRun,
     },
   },
-  onlyAdmin:true,
+  onlyAdmin: true,
   needPlus: true,
 })
 export class DBBackupPlugin extends AbstractPlusTaskPlugin {
   @TaskInput({
-    title: '备份方式',
+    title: "备份方式",
-    value: 'local',
+    value: "local",
     component: {
-      name: 'a-select',
+      name: "a-select",
       options: [
-        {label: '本地复制', value: 'local'},
+        { label: "本地复制", value: "local" },
-        {label: 'ssh上传', value: 'ssh'},
+        { label: "ssh上传", value: "ssh" },
-        {label: 'oss上传', value: 'oss'},
+        { label: "oss上传", value: "oss" },
       ],
-      placeholder: '',
+      placeholder: "",
     },
-    helper: '支持本地复制、ssh上传',
+    helper: "支持本地复制、ssh上传",
     required: true,
   })
-  backupMode = 'local';
+  backupMode = "local";
 
   @TaskInput({
-    title: '主机登录授权',
+    title: "主机登录授权",
     component: {
-      name: 'access-selector',
+      name: "access-selector",
-      type: 'ssh',
+      type: "ssh",
     },
     mergeScript: `
       return {
@@ -60,19 +60,18 @@ export class DBBackupPlugin extends AbstractPlusTaskPlugin {
   })
   sshAccessId!: number;
 
-
   @TaskInput({
-    title: 'OSS类型',
+    title: "OSS类型",
     component: {
-      name: 'a-select',
+      name: "a-select",
       options: [
-        {value: "alioss", label: "阿里云OSS"},
+        { value: "alioss", label: "阿里云OSS" },
-        {value: "s3", label: "MinIO/S3"},
+        { value: "s3", label: "MinIO/S3" },
-        {value: "qiniuoss", label: "七牛云"},
+        { value: "qiniuoss", label: "七牛云" },
-        {value: "tencentcos", label: "腾讯云COS"},
+        { value: "tencentcos", label: "腾讯云COS" },
-        {value: "ftp", label: "Ftp"},
+        { value: "ftp", label: "Ftp" },
-        {value: "sftp", label: "Sftp"},
+        { value: "sftp", label: "Sftp" },
-      ]
+      ],
     },
     mergeScript: `
       return {
@@ -86,9 +85,9 @@ export class DBBackupPlugin extends AbstractPlusTaskPlugin {
   ossType!: string;
 
   @TaskInput({
-    title: 'OSS授权',
+    title: "OSS授权",
     component: {
-      name: 'access-selector',
+      name: "access-selector",
     },
     mergeScript: `
       return {
@@ -106,12 +105,11 @@ export class DBBackupPlugin extends AbstractPlusTaskPlugin {
   })
   ossAccessId!: number;
 
-
   @TaskInput({
-    title: '备份保存目录',
+    title: "备份保存目录",
     component: {
-      name: 'a-input',
+      name: "a-input",
-      type: 'value',
+      type: "value",
       placeholder: `默认${defaultBackupDir}`,
     },
     helper: `ssh方式默认保存在当前用户的${defaultBackupDir}目录下，本地方式默认保存在data/${defaultBackupDir}目录下，也可以填写绝对路径`,
@@ -120,10 +118,10 @@ export class DBBackupPlugin extends AbstractPlusTaskPlugin {
   backupDir: string = defaultBackupDir;
 
   @TaskInput({
-    title: '备份文件前缀',
+    title: "备份文件前缀",
     component: {
-      name: 'a-input',
+      name: "a-input",
-      vModel: 'value',
+      vModel: "value",
       placeholder: `默认${defaultFilePrefix}`,
     },
     required: false,
@@ -131,11 +129,11 @@ export class DBBackupPlugin extends AbstractPlusTaskPlugin {
   filePrefix: string = defaultFilePrefix;
 
   @TaskInput({
-    title: '附加上传文件',
+    title: "附加上传文件",
     value: true,
     component: {
-      name: 'a-switch',
+      name: "a-switch",
-      vModel: 'checked',
+      vModel: "checked",
       placeholder: `是否备份上传的头像等文件`,
     },
     required: false,
@@ -143,99 +141,119 @@ export class DBBackupPlugin extends AbstractPlusTaskPlugin {
   withUpload = true;
 
   @TaskInput({
-    title: '删除过期备份',
+    title: "删除过期备份",
     component: {
-      name: 'a-input-number',
+      name: "a-input-number",
-      vModel: 'value',
+      vModel: "value",
-      placeholder: '20',
+      placeholder: "20",
     },
-    helper: '删除多少天前的备份,不填则不删除，windows暂不支持',
+    helper: "删除多少天前的备份,不填则不删除，windows暂不支持",
     required: false,
   })
   retainDays!: number;
 
-  async onInstance() {
+  async onInstance() {}
-  }
 
   async execute(): Promise<void> {
-
     if (!this.isAdmin()) {
-      throw new Error('只有管理员才能运行此任务');
+      throw new Error("只有管理员才能运行此任务");
     }
 
-    this.logger.info('开始备份数据库');
+    this.logger.info("开始备份数据库");
 
     let dbPath = process.env.certd_typeorm_dataSource_default_database;
-    dbPath = dbPath || './data/db.sqlite';
+    dbPath = dbPath || "./data/db.sqlite";
     if (!fs.existsSync(dbPath)) {
-      this.logger.error('数据库文件不存在：', dbPath);
+      this.logger.error("数据库文件不存在：", dbPath);
       return;
     }
-    const dbTmpFilename = `${this.filePrefix}_${dayjs().format('YYYYMMDD_HHmmss')}_sqlite`;
+    const dbTmpFilename = `${this.filePrefix}_${dayjs().format("YYYYMMDD_HHmmss")}_sqlite`;
     const dbZipFilename = `${dbTmpFilename}.zip`;
-    const tempDir = path.resolve(os.tmpdir(), 'certd_backup');
+    const tempDir = path.resolve(os.tmpdir(), "certd_backup");
     if (!fs.existsSync(tempDir)) {
-      await fs.promises.mkdir(tempDir, {recursive: true});
+      await fs.promises.mkdir(tempDir, { recursive: true });
     }
     const dbTmpPath = path.resolve(tempDir, dbTmpFilename);
     const dbZipPath = path.resolve(tempDir, dbZipFilename);
 
-    //复制到临时目录
+    try {
-    await fs.promises.copyFile(dbPath, dbTmpPath);
+      //复制到临时目录
-    //本地压缩
+      await fs.promises.copyFile(dbPath, dbTmpPath);
-    const zip = new JSZip();
+      // //本地压缩
-    const stream = fs.createReadStream(dbTmpPath);
+      // const zip = new JSZip();
-    // 使用流的方式添加文件内容
+      // const stream = fs.createReadStream(dbTmpPath);
-    zip.file(dbTmpFilename, stream, {binary: true, compression: 'DEFLATE'});
+      // // 使用流的方式添加文件内容
+      // zip.file(dbTmpFilename, stream, {binary: true, compression: 'DEFLATE'});
 
-    const uploadDir = path.resolve('data', 'upload');
+      // const uploadDir = path.resolve('data', 'upload');
-    if (this.withUpload && fs.existsSync(uploadDir)) {
+      // if (this.withUpload && fs.existsSync(uploadDir)) {
-      zip.folder(uploadDir);
+      //   zip.folder(uploadDir);
-    }
+      // }
 
-    const content = await zip.generateAsync({type: 'nodebuffer'});
+      // const content = await zip.generateAsync({type: 'nodebuffer'});
 
-    await fs.promises.writeFile(dbZipPath, content);
+      // await fs.promises.writeFile(dbZipPath, content);
-    this.logger.info(`数据库文件压缩完成:${dbZipPath}`);
+      // 创建可写流
+      const outputStream = fs.createWriteStream(dbZipPath);
+      const zip = new JSZip();
 
-    this.logger.info('开始备份，当前备份方式：', this.backupMode);
+      // 添加数据库文件
-    const backupDir = this.backupDir || defaultBackupDir;
+      const dbStream = fs.createReadStream(dbTmpPath);
-    const backupFilePath = `${backupDir}/${dbZipFilename}`;
+      zip.file(dbTmpFilename, dbStream, { binary: true, compression: "DEFLATE" });
 
-    try{
+      // 处理上传目录
-      if (this.backupMode === 'local') {
+      const uploadDir = path.resolve("data", "upload");
+      if (this.withUpload && fs.existsSync(uploadDir)) {
+        zip.folder("upload"); // 注意：这里应该是相对路径
+      }
+
+      // 使用流式生成
+      const zipStream = zip.generateNodeStream({
+        type: "nodebuffer",
+        streamFiles: true,
+        compression: "DEFLATE",
+      });
+
+      // 管道传输
+      await pipeline(zipStream, outputStream);
+      this.logger.info(`数据库文件压缩完成:${dbZipPath}`);
+
+      this.logger.info("开始备份，当前备份方式：", this.backupMode);
+      const backupDir = this.backupDir || defaultBackupDir;
+      const backupFilePath = `${backupDir}/${dbZipFilename}`;
+
+      if (this.backupMode === "local") {
         await this.localBackup(dbZipPath, backupDir, backupFilePath);
-      } else if (this.backupMode === 'ssh') {
+      } else if (this.backupMode === "ssh") {
         await this.sshBackup(dbZipPath, backupDir, backupFilePath);
-      } else if (this.backupMode === 'oss') {
+      } else if (this.backupMode === "oss") {
         await this.ossBackup(dbZipPath, backupDir, backupFilePath);
       } else {
         throw new Error(`不支持的备份方式:${this.backupMode}`);
       }
-    }finally{
+    } finally {
       //删除临时目录
-      await fs.promises.rm(tempDir, {recursive: true, force: true});
+      await fs.promises.rm(tempDir, { recursive: true, force: true });
     }
 
-
+    this.logger.info("数据库备份完成");
-    this.logger.info('数据库备份完成');
   }
 
   private async localBackup(dbPath: string, backupDir: string, backupPath: string) {
-    if (!backupPath.startsWith('/')) {
+    if (!backupPath.startsWith("/")) {
-      backupPath = path.join('./data/', backupPath);
+      backupPath = path.join("./data/", backupPath);
     }
     const dir = path.dirname(backupPath);
     if (!fs.existsSync(dir)) {
-      await fs.promises.mkdir(dir, {recursive: true});
+      await fs.promises.mkdir(dir, { recursive: true });
     }
     backupPath = path.resolve(backupPath);
     await fs.promises.copyFile(dbPath, backupPath);
-    this.logger.info('备份文件路径：', backupPath);
+    this.logger.info("备份文件路径：", backupPath);
 
     if (this.retainDays > 0) {
       // 删除过期备份
-      this.logger.info('开始删除过期备份文件');
+      this.logger.info("开始删除过期备份文件");
       const files = fs.readdirSync(dir);
       const now = Date.now();
       let count = 0;
@@ -245,76 +263,76 @@ export class DBBackupPlugin extends AbstractPlusTaskPlugin {
         if (now - stat.mtimeMs > this.retainDays * 24 * 60 * 60 * 1000) {
           fs.unlinkSync(filePath as fs.PathLike);
           count++;
-          this.logger.info('删除过期备份文件：', filePath);
+          this.logger.info("删除过期备份文件：", filePath);
         }
       });
-      this.logger.info('删除过期备份文件数:', count);
+      this.logger.info("删除过期备份文件数:", count);
     }
   }
 
   private async sshBackup(dbPath: string, backupDir: string, backupPath: string) {
     const access: SshAccess = await this.getAccess(this.sshAccessId);
     const sshClient = new SshClient(this.logger);
-    this.logger.info('备份目录：', backupPath);
+    this.logger.info("备份目录：", backupPath);
     await sshClient.uploadFiles({
       connectConf: access,
-      transports: [{localPath: dbPath, remotePath: backupPath}],
+      transports: [{ localPath: dbPath, remotePath: backupPath }],
       mkdirs: true,
     });
-    this.logger.info('备份文件上传完成');
+    this.logger.info("备份文件上传完成");
 
     if (this.retainDays > 0) {
       // 删除过期备份
-      this.logger.info('开始删除过期备份文件');
+      this.logger.info("开始删除过期备份文件");
       const isWin = access.windows;
       let script: string[] = [];
       if (isWin) {
-        throw new Error('删除过期文件暂不支持windows系统');
+        throw new Error("删除过期文件暂不支持windows系统");
         // script = `forfiles /p ${backupDir} /s /d -${this.retainDays} /c "cmd /c del @path"`;
       } else {
-        script = [`cd ${backupDir}`, 'echo 备份目录', 'pwd', `find . -type f -mtime +${this.retainDays} -name '${this.filePrefix}*' -exec rm -f {} \\;`];
+        script = [`cd ${backupDir}`, "echo 备份目录", "pwd", `find . -type f -mtime +${this.retainDays} -name '${this.filePrefix}*' -exec rm -f {} \\;`];
       }
 
       await sshClient.exec({
         connectConf: access,
         script,
       });
-      this.logger.info('删除过期备份文件完成');
+      this.logger.info("删除过期备份文件完成");
     }
   }
 
   private async ossBackup(dbPath: string, backupDir: string, backupPath: string) {
     if (!this.ossAccessId) {
-        throw new Error('未配置ossAccessId');
+      throw new Error("未配置ossAccessId");
     }
     const access = await this.getAccess(this.ossAccessId);
-    const ossType = this.ossType
+    const ossType = this.ossType;
 
     const ctx: OssClientContext = {
       logger: this.logger,
       utils: this.ctx.utils,
-      accessService:this.accessService
+      accessService: this.accessService,
-    }
+    };
 
     this.logger.info(`开始备份文件到:${ossType}`);
-    const client = await  ossClientFactory.createOssClientByType(ossType, {
+    const client = await ossClientFactory.createOssClientByType(ossType, {
       access,
       ctx,
-    })
+    });
 
     await client.upload(backupPath, dbPath);
 
     if (this.retainDays > 0) {
       // 删除过期备份
-      this.logger.info('开始删除过期备份文件');
+      this.logger.info("开始删除过期备份文件");
       const removeByOpts: OssClientRemoveByOpts = {
         dir: backupDir,
         beforeDays: this.retainDays,
       };
       await client.removeBy(removeByOpts);
-      this.logger.info('删除过期备份文件完成');
+      this.logger.info("删除过期备份文件完成");
-    }else{
+    } else {
-      this.logger.info('已禁止删除过期文件');
+      this.logger.info("已禁止删除过期文件");
     }
   }
 }

packages/ui/certd-server/src/plugins/plugin-captcha/tencent/index.ts

@@ -3,57 +3,54 @@ import { ICaptchaAddon } from "../api.js";
 import { TencentAccess } from "@certd/plugin-lib";
 
 @IsAddon({
-  addonType:"captcha",
+  addonType: "captcha",
-  name: 'tencent',
+  name: "tencent",
-  title: '腾讯云验证码',
+  title: "腾讯云验证码",
-  desc: '',
+  desc: "",
-  showTest:false,
+  showTest: false,
 })
-export class TencentCaptcha extends BaseAddon implements ICaptchaAddon{
+export class TencentCaptcha extends BaseAddon implements ICaptchaAddon {
-
   @AddonInput({
-    title: '腾讯云授权',
+    title: "腾讯云授权",
-    helper: '腾讯云授权',
+    helper: "腾讯云授权",
     component: {
-      name: 'access-selector',
+      name: "access-selector",
-      vModel:"modelValue",
+      vModel: "modelValue",
       from: "sys",
-      type: 'tencent', //固定授权类型
+      type: "tencent", //固定授权类型
     },
     required: true,
   })
-  accessId  :number;
+  accessId: number;
 
   @AddonInput({
-    title: '验证ID',
+    title: "验证ID",
     component: {
-      name:"a-input-number",
+      name: "a-input-number",
-      placeholder: 'CaptchaAppId',
+      placeholder: "CaptchaAppId",
     },
-    helper:"[腾讯云验证码](https://cloud.tencent.com/act/cps/redirect?redirect=37716&cps_key=b3ef73330335d7a6efa4a4bbeeb6b2c9)",
+    helper: "[腾讯云验证码](https://cloud.tencent.com/act/cps/redirect?redirect=37716&cps_key=b3ef73330335d7a6efa4a4bbeeb6b2c9)",
     required: true,
   })
-  captchaAppId:number;
+  captchaAppId: number;
 
   @AddonInput({
-    title: '验证Key',
+    title: "验证Key",
     component: {
-      placeholder: 'AppSecretKey',
+      placeholder: "AppSecretKey",
     },
     required: true,
   })
-  appSecretKey = '';
+  appSecretKey = "";
 
-
+  async onValidate(data?: any) {
-  async onValidate(data?:any) {
     if (!data) {
-      return false
+      return false;
     }
 
+    const access = await this.getAccess<TencentAccess>(this.accessId);
 
-    const access = await this.getAccess<TencentAccess>(this.accessId)
+    const sdk = await import("tencentcloud-sdk-nodejs/tencentcloud/services/captcha/v20190722/index.js");
-
-    const sdk =await import("tencentcloud-sdk-nodejs/tencentcloud/services/captcha/v20190722/index.js");
 
     const CaptchaClient = sdk.v20190722.Client;
 
@@ -70,35 +67,40 @@ export class TencentCaptcha extends BaseAddon implements ICaptchaAddon{
       },
     };
 
-// 实例化要请求产品的client对象,clientProfile是可选的
+    // 实例化要请求产品的client对象,clientProfile是可选的
     const client = new CaptchaClient(clientConfig);
     const params = {
-      "CaptchaType": 9, //固定值9
+      CaptchaType: 9, //固定值9
-      "UserIp": "127.0.0.1",
+      UserIp: "127.0.0.1",
-      "Ticket": data.ticket,
+      Ticket: data.ticket,
-      "Randstr": data.randstr,
+      Randstr: data.randstr,
-      "AppSecretKey": this.appSecretKey,
+      AppSecretKey: this.appSecretKey,
-      "CaptchaAppId": this.captchaAppId,
+      CaptchaAppId: this.captchaAppId,
     };
-   const res =  await client.DescribeCaptchaResult(params)
+    try {
-
+      const res = await client.DescribeCaptchaResult(params);
-    if (res.CaptchaCode == 1) {
+      if (res.CaptchaCode == 1) {
-      // 验证成功
+        // 验证成功
-      // verification successful
+        // verification successful
-      return true;
+        return true;
-    } else {
+      } else {
-      // 验证失败
+        // 验证失败
-      // verification failed
+        // verification failed
-      this.logger.error("腾讯云验证码验证失败",res.CaptchaMsg)
+        this.logger.error("腾讯云验证码验证失败", res.CaptchaMsg);
-      return false;
+        return false;
+      }
+    } catch (err) {
+      if (data.ticket.startsWith("trerror_") && err.message.includes("账户已欠费")) {
+        this.logger.error("腾讯云验证码账户欠费，临时放行：", err.message);
+        return true;
+      }
+      throw err
     }
   }
 
-
+  async getCaptcha(): Promise<any> {
- async  getCaptcha(): Promise<any> {
     return {
       captchaAppId: this.captchaAppId,
-    }
+    };
   }
-
 }

packages/ui/certd-server/src/plugins/plugin-doge/lib/index.ts

@@ -1,16 +1,18 @@
 import crypto from 'crypto';
 import querystring from 'querystring';
 import { DogeCloudAccess } from '../access.js';
-import { HttpClient } from '@certd/basic';
+import { HttpClient, ILogger } from '@certd/basic';
 
 export class DogeClient {
   accessKey: string;
   secretKey: string;
   http: HttpClient;
-  constructor(access: DogeCloudAccess, http: HttpClient) {
+  logger: ILogger;
+  constructor(access: DogeCloudAccess, http: HttpClient,logger: ILogger) {
     this.accessKey = access.accessKey;
     this.secretKey = access.secretKey;
     this.http = http;
+    this.logger = logger;
   }
 
   async request(apiPath: string, data: any = {}, jsonMode = false, ignoreResNullCode = false) {
@@ -36,6 +38,7 @@ export class DogeClient {
 
     if (res.code == null && ignoreResNullCode) {
       //ignore
+      this.logger.warn('执行出错：', res);
     } else if (res.code !== 200) {
       throw new Error('API Error: ' + res.msg);
     }

packages/ui/certd-server/src/plugins/plugin-doge/plugins/deploy-to-cdn/index.ts

@@ -1,8 +1,9 @@
-import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
 import { CertInfo } from '@certd/plugin-cert';
 import { DogeClient } from '../../lib/index.js';
 import dayjs from 'dayjs';
-import { CertApplyPluginNames} from '@certd/plugin-cert';
+import { CertApplyPluginNames } from '@certd/plugin-cert';
+import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib';
 @IsTaskPlugin({
   name: 'DogeCloudDeployToCDN',
   title: '多吉云-部署到多吉云CDN',
@@ -15,12 +16,6 @@ import { CertApplyPluginNames} from '@certd/plugin-cert';
   },
 })
 export class DogeCloudDeployToCDNPlugin extends AbstractTaskPlugin {
-  @TaskInput({
-    title: '域名',
-    helper: 'CDN域名',
-    required: true,
-  })
-  domain!: string;
   //证书选择，此项必须要有
   @TaskInput({
     title: '证书',
@@ -33,6 +28,9 @@ export class DogeCloudDeployToCDNPlugin extends AbstractTaskPlugin {
   })
   cert!: CertInfo;
 
+  @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
+  certDomains!: string[];
+
   //授权选择框
   @TaskInput({
     title: '多吉云授权',
@@ -45,6 +43,16 @@ export class DogeCloudDeployToCDNPlugin extends AbstractTaskPlugin {
   })
   accessId!: string;
 
+  @TaskInput(createRemoteSelectInputDefine({
+    title: 'CDN域名',
+    helper: '请选择CDN域名，可以选择多个，一次性部署',
+    required: true,
+    action: DogeCloudDeployToCDNPlugin.prototype.onGetDomainList.name,
+    pager: false,
+    search: false
+  }))
+  domain!: string | string[];
+
   @TaskInput({
     title: '忽略部署接口报错',
     helper: '当该域名部署后报错，但是实际上已经部署成功时，可以勾选',
@@ -60,11 +68,23 @@ export class DogeCloudDeployToCDNPlugin extends AbstractTaskPlugin {
 
   async onInstance() {
     const access = await this.getAccess(this.accessId);
-    this.dogeClient = new DogeClient(access, this.ctx.http);
+    this.dogeClient = new DogeClient(access, this.ctx.http, this.ctx.logger);
   }
   async execute(): Promise<void> {
     const certId: number = await this.updateCert();
-    await this.bindCert(certId);
+
+    let domains = this.domain 
+    if (typeof domains === 'string'){
+      domains = [domains]
+    }
+    for (const domain of domains) {
+      this.ctx.logger.info(`绑定证书${certId}到域名${domain}`);
+      await this.bindCert(certId,domain);
+    }
+    this.logger.info("执行完成，3秒后删除过期证书");
+
+    await this.ctx.utils.sleep(3000);
+    await this.clearExpiredCert();
   }
 
   async updateCert() {
@@ -76,15 +96,60 @@ export class DogeCloudDeployToCDNPlugin extends AbstractTaskPlugin {
     return data.id;
   }
 
-  async bindCert(certId: number) {
+  async bindCert(certId: number,domain: string) {
     await this.dogeClient.request(
       '/cdn/cert/bind.json',
       {
         id: certId,
-        domain: this.domain,
+        domain: domain,
       },
       this.ignoreDeployNullCode
     );
   }
+
+  async clearExpiredCert() {
+    const res = await this.dogeClient.request(
+      '/cdn/cert/list.json',
+      {},
+    );
+    const list = res.certs?.filter((item: any) => item.expire < dayjs().unix()  && item.domainCount === 0) || [];
+    for (const item of list) {
+      this.ctx.logger.info(`删除过期证书${item.id}->${item.domain}`);
+      try{
+        await this.dogeClient.request(
+          '/cdn/cert/delete.json',
+          {
+            id: item.id,
+          },
+        );
+      }catch(err){
+        this.ctx.logger.warn(`删除过期证书${item.id}->${item.domain}失败`, err);
+      }
+    }
+  }
+
+
+  async onGetDomainList(data: PageSearch = {}) {
+    const res = await this.dogeClient.request(
+      '/cdn/domain/list.json',
+      {},
+    );
+
+    const list = res.domains
+    if (!list || list.length === 0) {
+      throw new Error("没有找到CDN域名");
+    }
+
+    const options = list.map((item: any) => {
+      return {
+        label: `${item.name}`,
+        value: item.name,
+        domain: item.name
+      };
+    });
+    return {
+      list: this.ctx.utils.options.buildGroupOptions(options, this.certDomains),
+    };
+  }
 }
 new DogeCloudDeployToCDNPlugin();