Merge branch 'v2' of https://github.com/certd/certd into v2

Updated promotional text for the permanent professional version and adjusted the display format.

.gitignore

@@ -29,4 +29,5 @@ test/**/*.js
 /packages/ui/certd-server/data/db.sqlite
 /packages/ui/certd-server/data/keys.yaml
 /packages/pro/
-test.js
+test.js
+.history

.npmrc

@@ -3,4 +3,4 @@ prefer-workspace-packages=true
 better_sqlite3_binary_host=https://registry.npmmirror.com/-/binary/better-sqlite3
 better_sqlite3_binary_host_mirror=https://registry.npmmirror.com/-/binary/better-sqlite3
 better-sqlite3_binary_host=https://registry.npmmirror.com/-/binary/better-sqlite3
-better-sqlite3_binary_host_mirror=https://registry.npmmirror.com/-/binary/better-sqlite3
+better-sqlite3_binary_host_mirror=https://registry.npmmirror.com/-/binary/better-sqlite3

.vscode/launch.json

@@ -24,6 +24,36 @@
             "runtimeArgs": ["dev"],
             "console": "integratedTerminal",
             "internalConsoleOptions": "neverOpen"
+        },
+         {
+            "name": "server-mysql",
+            "type": "node",
+            "request": "launch",
+            "cwd": "${workspaceFolder}/packages/ui/certd-server",
+            "runtimeExecutable": "pnpm",
+            "runtimeArgs": ["dev-mysql"],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
+        },
+         {
+            "name": "server-pg",
+            "type": "node",
+            "request": "launch",
+            "cwd": "${workspaceFolder}/packages/ui/certd-server",
+            "runtimeExecutable": "pnpm",
+            "runtimeArgs": ["dev-pg"],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
+        },
+        {
+            "name": "server-common",
+            "type": "node",
+            "request": "launch",
+            "cwd": "${workspaceFolder}/packages/ui/certd-server",
+            "runtimeExecutable": "pnpm",
+            "runtimeArgs": ["dev-commpro"],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
         },
         {
             "name": "server-local-plus",

.vscode/settings.json

@@ -1,5 +1,8 @@
 {
     "eslint.debug": false,
     "eslint.format.enable": true,
-    "typescript.tsc.autoDetect": "watch"
+    "typescript.tsc.autoDetect": "watch",
+    "git.scanRepositories": [
+        "./packages/pro"
+    ]
 }

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

README.md

@@ -16,6 +16,13 @@ Certd® 是一个免费的全自动证书管理系统，让你的网站证书永
 
 > 流水线数量现已调整为无限制，欢迎大家使用
 
+
+**************************************************************************************************
+                   🔥🔥🔥永久专业版上线，双11活动火热进行中🔥🔥🔥
+       赶快升级到最新版点击右上角金色VIP按钮，点击立即赞助，看看你的优惠券金额是多少？
+**************************************************************************************************
+
+
 ## 一、特性
 本项目不仅支持证书申请过程自动化，还可以自动化部署更新证书，让你的证书永不过期。     
 
@@ -152,8 +159,11 @@ https://certd.handfree.work/
 
 ## 八、捐赠
 ************************
-支持开源，为爱发电，我已入驻爱发电
+开源为什么要做专业版收费？
-https://afdian.com/a/greper
+1. 纯靠为爱发电不可持续（比如：我的dev-sidecar项目即便是拥有20K+star,也差点凉凉，幸亏有另外大佬接手用爱发电）    
+2. 没有赞助的项目，作者不会用心倾听用户的心声，不顾用户体验（比如：下意识拒绝需求、频繁破坏性变更升级、全盘推倒重来之类的） 
+3. 没有赞助的项目，交流群的戾气有时候比较重，容易起冲突 
+
 
 发电权益：
 1. 可加入发电专属群，可以获得作者一对一技术支持
@@ -173,7 +183,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/.vitepress/config.ts

@@ -95,10 +95,10 @@ export default defineConfig({
                         },
                         {
                             text: "插件列表", items: [
-                                {text: "授权提供商", link: "/guide/plugins/access.md"},
                                 {text: "DNS提供商", link: "/guide/plugins/dns-provider.md"},
                                 {text: "任务插件", link: "/guide/plugins/deploy.md"},
                                 {text: "通知插件", link: "/guide/plugins/notification.md"},
+                                {text: "授权提供商", link: "/guide/plugins/access.md"},
                             ]
                         },
                     ]

docs/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,85 @@
 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
+
+* 修复飞牛证书部署后无法生效的bug ([bf156a1](https://github.com/certd/certd/commit/bf156a13bd443cdadb73c9dff79bbef7231b4401))
+* aliyunoss 选择证书接入点选择新加坡无法上传的bug ([e00733a](https://github.com/certd/certd/commit/e00733a34644c23ffe926486b15dc96bf2fa4b57))
+
+### Performance Improvements
+
+* 优化start.sh脚本，去掉删除非ui目录的操作及提示 ([7993a7c](https://github.com/certd/certd/commit/7993a7cdb01885535950c63187e3f67d67ba2f75))
+* 增加飞牛证书id选择的提示 ([5a4d812](https://github.com/certd/certd/commit/5a4d8121462b1afe921d028465687be8c9679814))
+* 证书监控支持设置证书即将过期天数 ([cd35568](https://github.com/certd/certd/commit/cd35568e042e6ab928685efad51cdbed823d2d4f))
+* 支持网络测试 ([2bef608](https://github.com/certd/certd/commit/2bef608e07ceb56d52007f290667e0afef401b22))
+* 支持新网代理方式 ([f612509](https://github.com/certd/certd/commit/f612509cac87b859e81a7a52fe94b2eaccad22f9))
+* dns支持新网互联 ([f415190](https://github.com/certd/certd/commit/f41519048326d971acd9e0a30462231f77a299a6))
+* start.sh脚本支持根据当前系统判断是否使用sudo ([567cb7d](https://github.com/certd/certd/commit/567cb7d737023e26ec58403c6f28f109e212d379))
+
 ## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
 
 ### 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

@@ -2,50 +2,69 @@
 
 | 序号 | 名称 | 说明 |
 |-----|-----|-----|
-| 1.| **阿里云授权** |  | 
+| 1.| **主机登录授权** |  | 
-| 2.| **EAB授权** | ZeroSSL证书申请需要EAB授权 | 
+| 2.| **阿里云授权** |  | 
-| 3.| **google cloud** | 谷歌云授权 | 
+| 3.| **阿里云ESA授权** |  | 
-| 4.| **主机登录授权** |  | 
+| 4.| **腾讯云** |  | 
-| 5.| **SFTP授权** |  | 
+| 5.| **华为云授权** |  | 
-| 6.| **阿里云OSS授权** | 包含地域和Bucket | 
+| 6.| **火山引擎** |  | 
-| 7.| **FTP授权** |  | 
+| 7.| **京东云** |  | 
-| 8.| **腾讯云** |  | 
+| 8.| **七牛云授权** |  | 
-| 9.| **腾讯云COS授权** | 腾讯云对象存储授权，包含地域和存储桶 | 
+| 9.| **天翼云授权** |  | 
-| 10.| **七牛云授权** |  | 
+| 10.| **baota授权** |  | 
-| 11.| **七牛OSS授权** |  | 
+| 11.| **百度云授权** |  | 
-| 12.| **天翼云授权** |  | 
+| 12.| **EAB授权** | ZeroSSL证书申请需要EAB授权 | 
-| 13.| **s3/minio授权** | S3/minio oss授权 | 
+| 13.| **google cloud** | 谷歌云授权 | 
-| 14.| **baota授权** |  | 
+| 14.| **SFTP授权** |  | 
-| 15.| **易盾DCDN授权** | https://user.yiduncdn.com | 
+| 15.| **阿里云OSS授权** | 包含地域和Bucket | 
-| 16.| **易盾rcdn授权** | 易盾CDN，每月免费30G，[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) | 
+| 16.| **FTP授权** |  | 
-| 17.| **易发云短信** | sms.yfyidc.cn/ | 
+| 17.| **腾讯云COS授权** | 腾讯云对象存储授权，包含地域和存储桶 | 
-| 18.| **cdnfly授权** |  | 
+| 18.| **七牛OSS授权** |  | 
-| 19.| **群晖登录授权** |  | 
+| 19.| **s3/minio授权** | S3/minio oss授权 | 
-| 20.| **k8s授权** |  | 
+| 20.| **宝塔云WAF授权** | 用于连接和管理宝塔云WAF服务的授权配置 | 
-| 21.| **1panel授权** | 账号和密码 | 
+| 21.| **易盾DCDN授权** | https://user.yiduncdn.com | 
-| 22.| **百度云授权** |  | 
+| 22.| **易盾rcdn授权** | 易盾CDN，每月免费30G，[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) | 
-| 23.| **LeCDN授权** |  | 
+| 23.| **易发云短信** | sms.yfyidc.cn/ | 
-| 24.| **白山云授权** |  | 
+| 24.| **cdnfly授权** |  | 
-| 25.| **plesk授权** |  | 
+| 25.| **群晖登录授权** |  | 
-| 26.| **易支付** |  | 
+| 26.| **k8s授权** |  | 
-| 27.| **支付宝** |  | 
+| 27.| **1panel授权** | 账号和密码 | 
-| 28.| **微信支付** |  | 
+| 28.| **LeCDN授权** |  | 
-| 29.| **长亭雷池授权** |  | 
+| 29.| **白山云授权** |  | 
-| 30.| **lucky** |  | 
+| 30.| **plesk授权** |  | 
-| 31.| **括彩云cdn授权** | 括彩云CDN，每月免费30G，[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) | 
+| 31.| **易支付** |  | 
-| 32.| **uniCloud** | unicloud授权 | 
+| 32.| **支付宝** |  | 
-| 33.| **华为云授权** |  | 
+| 33.| **微信支付** |  | 
-| 34.| **西部数码授权** |  | 
+| 34.| **长亭雷池授权** |  | 
-| 35.| **多吉云** |  | 
+| 35.| **lucky** |  | 
-| 36.| **我爱云授权** | 我爱云CDN | 
+| 36.| **括彩云cdn授权** | 括彩云CDN，每月免费30G，[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) | 
-| 37.| **CacheFly** | CacheFly | 
+| 37.| **uniCloud** | unicloud授权 | 
-| 38.| **Gcore** | Gcore | 
+| 38.| **猫云授权** |  | 
-| 39.| **亚马逊云aws授权** |  | 
+| 39.| **西部数码授权** |  | 
-| 40.| **dns.la授权** |  | 
+| 40.| **多吉云** |  | 
-| 41.| **又拍云** |  | 
+| 41.| **我爱云授权** | 我爱云CDN | 
-| 42.| **火山引擎** |  | 
+| 42.| **CacheFly** | CacheFly | 
-| 43.| **京东云** |  | 
+| 43.| **Gcore** | Gcore | 
-| 44.| **51dns授权** |  | 
+| 44.| **亚马逊云aws授权** |  | 
+| 45.| **亚马逊云科技（国区）授权** |  | 
+| 46.| **dns.la授权** |  | 
+| 47.| **又拍云** |  | 
+| 48.| **51dns授权** |  | 
+| 49.| **FlexCDN授权** |  | 
+| 50.| **farcdn授权** |  | 
+| 51.| **cloudflare授权** |  | 
+| 52.| **Github授权** |  | 
+| 53.| **namesilo授权** |  | 
+| 54.| **proxmox** |  | 
+| 55.| **网宿授权** |  | 
+| 56.| **金山云授权** |  | 
+| 57.| **APISIX授权** |  | 
+| 58.| **Dokploy授权** |  | 
+| 59.| **godaddy授权** |  | 
+| 60.| **新网授权** |  | 
+| 61.| **新网授权（代理方式）** |  | 
+| 62.| **新网互联授权** | 仅支持代理账号，ip需要加入白名单 | 
+| 63.| **雨云授权** | https://app.rainyun.com/ | 
 
 <style module>
 table th:first-of-type {

docs/guide/plugins/deploy.md

@@ -1,5 +1,5 @@
 # 任务插件
-共 `70` 款任务插件    
+共 `102` 款任务插件    
 ## 1. 证书申请
 
 | 序号 | 名称 | 说明 |
@@ -15,6 +15,8 @@
 | 2.| **IIS-部署到IIS站点** |  | 
 | 3.| **主机-执行远程主机脚本命令** | 可以执行重启nginx等操作让证书生效 | 
 | 4.| **主机-部署证书到SSH主机** | SFTP上传证书到主机，然后SSH执行部署脚本命令 | 
+| 5.| **主机-复制到本机** | 【仅管理员使用】实际上是复制证书到docker容器内的某个路径，需要做目录映射到宿主机 | 
+| 6.| **上传证书到对象存储OSS** | 支持阿里云OSS、腾讯云COS、七牛云KODO、S3、MinIO、FTP、SFTP | 
 ## 3. CDN
 
 | 序号 | 名称 | 说明 |
@@ -22,33 +24,44 @@
 | 1.| **易盾-部署到易盾DCDN** | 主要是防御，http://user.yiduncdn.com/ | 
 | 2.| **易盾-部署到易盾RCDN** | 易盾CDN，每月免费30G，[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) | 
 | 3.| **cdnfly-部署证书到cdnfly** | cdnfly | 
-| 4.| **百度云-部署证书到CDN** | 部署到百度云CDN | 
+| 4.| **LeCDN-更新证书** |  | 
-| 5.| **LeCDN-更新证书** |  | 
+| 5.| **LeCDN-更新证书V2** | 支持新版本LeCDN | 
-| 6.| **LeCDN-更新证书V2** | 支持新版本LeCDN | 
+| 6.| **白山云-更新证书** |  | 
-| 7.| **白山云-更新证书** |  | 
+| 7.| **天翼云-部署证书到CDN** | 部署证书到天翼云CDN和全站加速 | 
-| 8.| **天翼云-部署证书到CDN** | 部署证书到天翼云CDN和全站加速 | 
+| 8.| **括彩云-部署到括彩云CDN** | 括彩云CDN，每月免费30G，[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) | 
-| 9.| **括彩云-部署到括彩云CDN** | 括彩云CDN，每月免费30G，[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) | 
+| 9.| **多吉云-部署到多吉云CDN** |  | 
-| 10.| **多吉云-部署到多吉云CDN** |  | 
+| 10.| **我爱云-部署证书到我爱云CDN** | 部署证书到我爱云CDN | 
-| 11.| **我爱云-部署证书到我爱云CDN** | 部署证书到我爱云CDN | 
+| 11.| **CacheFly-部署证书到CacheFly** | 部署证书到 CacheFly | 
-| 12.| **CacheFly-部署证书到CacheFly** | 部署证书到 CacheFly | 
+| 12.| **Gcore-部署证书到Gcore** | 仅上传 并不会部署到cdn | 
-| 13.| **Gcore-部署证书到Gcore** | 仅上传 并不会部署到cdn | 
+| 13.| **Gcore-刷新Gcore证书** | 刷新现有的证书 | 
-| 14.| **Gcore-刷新Gcore证书** | 刷新现有的证书 | 
+| 14.| **又拍云-部署证书到CDN/USS** | 支持又拍云CDN，又拍云云存储USS | 
-| 15.| **又拍云-部署证书到CDN/USS** | 支持又拍云CDN，又拍云云存储USS | 
+| 15.| **FlexCDN-更新证书** |  | 
+| 16.| **farcdn-更新证书** | www.farcdn.net | 
+| 17.| **雨云-更新证书** | app.rainyun.com | 
+| 18.| **网宿-更新证书** | 网宿证书自动更新 | 
+| 19.| **金山云-更新CDN证书** | 金山云自动更新CDN证书 | 
+| 20.| **APISIX-更新证书** | 自动更新APISIX证书 | 
 ## 4. 面板
 
 | 序号 | 名称 | 说明 |
 |-----|-----|-----|
 | 1.| **宝塔-面板证书部署** | 部署宝塔面板本身的ssl证书 | 
-| 2.| **宝塔-网站证书部署** | 部署宝塔管理的站点的ssl证书，目前支持网站站点、docker站点等 | 
+| 2.| **宝塔-网站证书部署** | 部署宝塔管理的站点的ssl证书，目前支持宝塔网站站点、docker站点等。本插件也支持aaPanel。 | 
-| 3.| **群晖-部署证书到群晖面板** | Synology，支持6.x以上版本 | 
+| 3.| **宝塔-WAF证书部署** | 部署宝塔云WAF/aaWAF | 
-| 4.| **K8S-部署证书到Secret** | 部署证书到k8s的secret | 
+| 4.| **宝塔win-网站证书部署** | 部署到Windows版宝塔管理的站点的ssl证书 | 
-| 5.| **K8S-Ingress 证书部署** | 部署证书到k8s的Ingress | 
+| 5.| **宝塔-删除过期证书** | 删除证书夹中过期证书 | 
-| 6.| **1Panel-部署证书到1Panel** | 更新1Panel的证书 | 
+| 6.| **群晖-部署证书到群晖面板** | Synology，支持6.x以上版本 | 
-| 7.| **Plesk-部署Plesk网站证书** |  | 
+| 7.| **K8S-部署证书到Secret** | 部署证书到k8s的secret | 
-| 8.| **雷池-更新证书** | 更新长亭雷池WAF的证书 | 
+| 8.| **K8S-Ingress 证书部署** | 部署证书到k8s的Ingress | 
-| 9.| **lucky-更新Lucky证书** |  | 
+| 9.| **1Panel-部署证书到1Panel** | 更新1Panel的证书 | 
-| 10.| **uniCloud-部署到服务空间** | 部署到服务空间 | 
+| 10.| **Plesk-部署Plesk网站证书** |  | 
-| 11.| **威联通-部署证书到威联通** | 部署证书到qnap | 
+| 11.| **雷池-更新证书** | 更新长亭雷池WAF的证书 | 
+| 12.| **lucky-更新Lucky证书** |  | 
+| 13.| **uniCloud-部署到服务空间** | 部署到服务空间 | 
+| 14.| **威联通-部署证书到威联通** | 部署证书到qnap | 
+| 15.| **飞牛NAS-部署证书** |  | 
+| 16.| **Proxmox-上传证书到Proxmox** |  | 
+| 17.| **Dokploy-更新证书** | 自动更新Dokploy证书 | 
 ## 5. 阿里云
 
 | 序号 | 名称 | 说明 |
@@ -57,18 +70,24 @@
 | 2.| **阿里云-部署至任意云资源** | 【不建议使用】需要消耗阿里云自动部署次数，支持SLB、LIVE、webHosting、VOD、CR、DCDN、DDoS、CDN、ALB、APIGateway、FC、GA、MSE、NLB、OSS、SAE、WAF等云产品 | 
 | 3.| **阿里云-部署证书至CDN** | 自动部署域名证书至阿里云CDN | 
 | 4.| **阿里云-部署证书至DCDN** | 依赖证书申请前置任务，自动部署域名证书至阿里云DCDN | 
-| 5.| **阿里云-部署证书至OSS** | 自动部署域名证书至阿里云OSS | 
+| 5.| **阿里云-部署证书至OSS** | 部署域名证书至阿里云OSS自定义域名，不是上传到阿里云oss | 
-| 6.| **阿里云-上传证书到阿里云** | 如果不想在阿里云上同一份证书上传多次，可以把此任务作为前置任务，其他阿里云任务证书那一项选择此任务的输出 | 
+| 6.| **阿里云-上传证书到阿里云CAS** | 上传证书到阿里云数字证书管理服务（CAS），注意：不会部署到任何应用上；如果不想在阿里云上同一份证书上传多次，可以把此任务作为前置任务，其他阿里云任务证书那一项选择此任务的输出 | 
 | 7.| **阿里云-部署至阿里云WAF** | 部署证书到阿里云WAF | 
 | 8.| **阿里云-部署至ALB（应用负载均衡）** | ALB,更新监听器的默认证书 | 
 | 9.| **阿里云-部署至NLB（网络负载均衡）** | NLB,网络负载均衡,更新监听器的默认证书 | 
-| 10.| **阿里云-部署至SLB(传统负载均衡)** | 部署证书到阿里云SLB(传统负载均衡) | 
+| 10.| **阿里云-部署至CLB(传统负载均衡)** | 部署证书到阿里云CLB(传统负载均衡) | 
-| 11.| **阿里云-部署至阿里云FC(3.0)** | 部署证书到阿里云函数计算（FC3.0）,【注意】证书的加密算法必须选择【pkcs1旧版】 | 
+| 11.| **阿里云-部署至阿里云FC(3.0)** | 部署证书到阿里云函数计算（FC3.0） | 
+| 12.| **阿里云-部署至ESA** | 部署证书到阿里云ESA(边缘安全加速)，自动删除过期证书 | 
+| 13.| **阿里云-部署至VOD** | 部署证书到阿里云视频点播（vod） | 
+| 14.| **阿里云-部署证书至API网关** | 自动部署域名证书至阿里云API网关（APIGateway） | 
+| 15.| **阿里云-部署至云原生API网关/AI网关** | 自动部署域名证书至云原生API网关、AI网关 | 
 ## 6. 华为云
 
 | 序号 | 名称 | 说明 |
 |-----|-----|-----|
 | 1.| **华为云-部署证书至CDN** |  | 
+| 2.| **华为云-上传证书至CCM** | 上传证书到华为云云证书管理（CCM） | 
+| 3.| **华为云-部署证书至OBS** |  | 
 ## 7. 腾讯云
 
 | 序号 | 名称 | 说明 |
@@ -79,9 +98,15 @@
 | 4.| **腾讯云-部署到CDN-v2** | 推荐使用 | 
 | 5.| **腾讯云-上传证书到腾讯云** | 上传成功后输出：tencentCertId | 
 | 6.| **腾讯云-部署证书到COS** | 部署到腾讯云COS源站域名证书【注意：很不稳定，需要重试很多次偶尔才能成功一次】 | 
-| 7.| **腾讯云-部署到腾讯云EO** | 腾讯云边缘安全加速平台EO，必须配置上传证书到腾讯云任务 | 
+| 7.| **腾讯云-部署到腾讯云EO** | 腾讯云边缘安全加速平台EdgeOne(EO)，必须配置上传证书到腾讯云任务 | 
 | 8.| **腾讯云-删除即将过期证书** | 仅删除未使用的证书 | 
-| 9.| **腾讯云-部署到TKE-ingress** | serverless集群请使用K8S部署插件；Qcloud类型需要【上传到腾讯云】作为前置任务；ApiServer未开启外网访问则需要做域名的内网IP映射 | 
+| 9.| **腾讯云-部署到TKE** | 修改TKE集群密钥配置，支持Opaque和TLS证书类型。注意：
+1. serverless集群请使用K8S部署插件；
+2. Opaque类型需要【上传到腾讯云】作为前置任务；
+3. ApiServer需要开通公网访问（或者certd可访问），实际上底层仍然是通过KubeClient进行部署 | 
+| 10.| **腾讯云-部署到腾讯云直播** | https://console.cloud.tencent.com/live/ | 
+| 11.| **腾讯云-实例开关机** | 腾讯云实例开关机 | 
+| 12.| **腾讯云-更新证书(Id不变)** | 根据证书id一键更新腾讯云证书并自动部署（Id不变），注意该接口为腾讯云白名单功能，非白名单用户无法使用该功能 | 
 ## 8. 火山引擎
 
 | 序号 | 名称 | 说明 |
@@ -91,6 +116,8 @@
 | 3.| **火山引擎-上传证书至证书中心** | 上传证书至火山引擎证书中心 | 
 | 4.| **火山引擎-部署证书至ALB** | 部署至火山引擎应用负载均衡 | 
 | 5.| **火山引擎-部署证书至Live** | 部署至火山引擎视频直播 | 
+| 6.| **火山引擎-部署证书至DCDN** | 部署至火山引擎全站加速 | 
+| 7.| **火山引擎-部署证书至VOD** | 部署至火山引擎视频点播(暂不可用) | 
 ## 9. 京东云
 
 | 序号 | 名称 | 说明 |
@@ -98,26 +125,43 @@
 | 1.| **京东云-部署证书至CDN** | 京东云内容分发网络 | 
 | 2.| **京东云-更新已有证书** | 更新SSL数字证书中的证书 | 
 | 3.| **京东云-上传新证书** | 上传证书到SSL数字证书中心 | 
-## 10. 七牛云
+## 10. 百度云
+
+| 序号 | 名称 | 说明 |
+|-----|-----|-----|
+| 1.| **百度云-部署证书到CDN** | 部署到百度云CDN | 
+| 2.| **百度云-部署证书到负载均衡** | 部署到百度云负载均衡，包括BLB、APPBLB | 
+| 3.| **百度云-上传到证书托管** | 上传证书到百度云证书托管中心 | 
+## 11. 七牛云
 
 | 序号 | 名称 | 说明 |
 |-----|-----|-----|
 | 1.| **七牛云-部署证书至OSS** | 自动部署域名证书至七牛云KODO，注意是自定义源站域名，不是CDN域名 | 
-| 2.| **七牛云-部署证书至CDN** | 自动部署域名证书至七牛云CDN | 
+| 2.| **七牛云-部署证书至CDN/DCDN** | 自动部署域名证书至七牛云CDN、DCDN | 
-## 11. 亚马逊云
+| 3.| **七牛云-上传证书到七牛云** | 上传到七牛云 | 
+## 12. 亚马逊云
 
 | 序号 | 名称 | 说明 |
 |-----|-----|-----|
 | 1.| **AWS-部署证书到CloudFront** | 部署证书到 AWS CloudFront | 
-## 12. 其他
+| 2.| **AWS-上传证书到ACM** | 上传证书 AWS ACM | 
+| 3.| **AWS(国区)-部署证书到CloudFront** | 部署证书到 AWS CloudFront | 
+## 13. 其他
 
 | 序号 | 名称 | 说明 |
 |-----|-----|-----|
 | 1.| **Demo-测试插件** |  | 
-| 2.| **重启 Certd** | 【仅管理员可用】 重启 certd的https服务，用于更新 Certd 的 ssl 证书 | 
+| 2.| **等待** | 等待一段时间 | 
-| 3.| **自定义js脚本** | 【仅管理员】运行自定义js脚本执行 | 
+| 3.| **邮件发送证书** | 通过邮件发送证书 | 
-| 4.| **等待** | 等待一段时间 | 
+| 4.| **webhook方式部署证书** | 调用webhook部署证书 | 
-| 5.| **数据库备份** | 仅支持备份SQLite数据库 | 
+| 5.| **Github-检查Release版本** | 检查最新Release版本并推送消息 | 
+## 14. 管理
+
+| 序号 | 名称 | 说明 |
+|-----|-----|-----|
+| 1.| **重启 Certd** | 【仅管理员可用】 重启 certd的https服务，用于更新 Certd 的 ssl 证书 | 
+| 2.| **自定义js脚本** | 【仅管理员】运行自定义js脚本执行 | 
+| 3.| **数据库备份** | 【仅管理员可用】仅支持备份SQLite数据库 | 
 
 <style module>
 table th:first-of-type {

docs/guide/plugins/dns-provider.md

@@ -3,13 +3,21 @@
 | 序号 | 名称 | 说明 |
 |-----|-----|-----|
 | 1.| **阿里云** | 阿里云DNS解析提供商 | 
-| 2.| **腾讯云** | 腾讯云域名DNS解析提供者 | 
+| 2.| **阿里ESA** | 阿里ESA DNS解析 | 
-| 3.| **华为云** | 华为云DNS解析提供商 | 
+| 3.| **火山引擎** | 火山引擎DNS解析提供商 | 
-| 4.| **西部数码** | west dns provider | 
+| 4.| **京东云** | 京东云DNS解析提供商 | 
-| 5.| **dns.la** | dns.la | 
+| 5.| **新网** | 新网域名解析 | 
-| 6.| **火山引擎** | 火山引擎DNS解析提供商 | 
+| 6.| **新网(代理方式)** | 新网域名解析(代理方式) | 
-| 7.| **京东云** | 京东云DNS解析提供商 | 
+| 7.| **腾讯云** | 腾讯云域名DNS解析提供者 | 
-| 8.| **51dns** | 51DNS | 
+| 8.| **华为云** | 华为云DNS解析提供商 | 
+| 9.| **西部数码** | west dns provider | 
+| 10.| **dns.la** | dns.la | 
+| 11.| **雨云** | 雨云DNS解析提供商 | 
+| 12.| **cloudflare** | cloudflare dns provider | 
+| 13.| **namesilo** | namesilo dns provider | 
+| 14.| **godaddy** | GoDaddy | 
+| 15.| **51dns** | 51DNS | 
+| 16.| **新网互联** | 新网互联 | 
 
 <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 | 
@@ -14,6 +14,10 @@
 | 10.| **Slack通知** | Slack消息推送通知 | 
 | 11.| **Bark 通知** | Bark 推送通知插件 | 
 | 12.| **飞书通知** | 飞书群聊webhook通知 | 
+| 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.2"
+  "version": "1.37.6"
 }

package.json

@@ -18,8 +18,9 @@
     "devb": "lerna run dev-build",
     "i-all": "lerna link && lerna exec npm install  ",
     "publish": "npm run prepublishOnly2  && lerna publish --force-publish=pro/plus-core --conventional-commits --create-release github && npm run afterpublishOnly && npm run commitAll",
-    "afterpublishOnly": "npm run copylogs && time /t >trigger/build.trigger && git add ./trigger/build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && git push",
+    "afterpublishOnly": "npm run plugin-doc-gen && npm run copylogs && time /t >trigger/build.trigger && git add ./trigger/build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && git push",
     "transform-sql": "cd ./packages/ui/certd-server/db/ && node --experimental-json-modules transform.js",
+    "plugin-doc-gen": "cd ./packages/ui/certd-server/ && npm run export-md",
     "commitAll": "git add . && git commit -m \"build: publish\" && git push && npm run commitPro",
     "commitPro": "cd ./packages/pro/ && git add . && git commit -m \"build: publish\" && git push",
     "copylogs": "copyfiles \"CHANGELOG.md\"  ./docs/guide/changelogs/",
@@ -34,7 +35,8 @@
     "docs:build": "npm run copylogs && vitepress build docs",
     "docs:preview": "vitepress preview docs",
     "pub": "echo 1",
-    "dev": "pnpm run -r --parallel  compile "
+    "dev": "pnpm run -r --parallel  compile ",
+    "release": "time /t >trigger/release.trigger && git add trigger/release.trigger && git commit -m \"build: release\" && git push"
   },
   "license": "AGPL-3.0",
   "dependencies": {

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,26 @@
 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/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
+
+* 修复并发情况下证书申请日志混乱的bug ([bb2714f](https://github.com/publishlab/node-acme-client/commit/bb2714ff241f9db4a71d805b23a1b0f9f2f6413a))
+
 ## [1.37.2](https://github.com/publishlab/node-acme-client/compare/v1.37.1...v1.37.2) (2025-10-14)
 
 ### 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.2",
+    "version": "1.37.6",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.37.2",
+        "@certd/basic": "^1.37.6",
         "@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": "c725cee0445dbe1ebd1b6588373bde31697113da"
+    "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
 }

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

@@ -28,7 +28,6 @@ class AcmeApi {
                 }
             }
         }
-        console.log(locationUrl, mapping);
         return locationUrl;
     }
 

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

@@ -2,7 +2,6 @@
  * ACME auto helper
  */
 import { readCsrDomains } from "./crypto/index.js";
-import { log } from "./logger.js";
 import { wait } from "./wait.js";
 import { CancelError } from "./error.js";
 
@@ -45,6 +44,9 @@ export default async (client, userOpts) => {
         accountPayload.externalAccountBinding = opts.externalAccountBinding;
     }
 
+    const log = (...args)=>{
+        return client.logger.info(...args);
+    }
     /**
      * Register account
      */

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

@@ -3,9 +3,9 @@
  */
 import axios from 'axios';
 import { parseRetryAfterHeader } from './util.js';
-import { log } from './logger.js';
 const { AxiosError } = axios;
 import {getGlobalAgents, HttpError} from '@certd/basic'
+import { log } from './logger.js';
 /**
  * Defaults
  */

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

@@ -5,7 +5,6 @@
  */
 import { createHash } from 'crypto';
 import  { getPemBodyAsB64u } from './crypto/index.js';
-import { log } from './logger.js';
 import HttpClient from './http.js';
 import AcmeApi from './api.js';
 import verify from './verify.js';
@@ -104,8 +103,13 @@ class AcmeClient {
             max: this.opts.backoffMax,
         };
 
-        this.http = new HttpClient(this.opts.directoryUrl, this.opts.accountKey, this.opts.externalAccountBinding, this.opts.urlMapping);
+        this.http = new HttpClient(this.opts.directoryUrl, this.opts.accountKey, this.opts.externalAccountBinding, this.opts.urlMapping, opts.logger);
         this.api = new AcmeApi(this.http, this.opts.accountUrl);
+        this.logger = opts.logger;
+    }
+
+    log(...args) {
+        this.logger.info(...args);
     }
 
     /**
@@ -177,7 +181,7 @@ class AcmeClient {
             this.getAccountUrl();
 
             /* Account URL exists */
-            log('Account URL exists, returning updateAccount()');
+            this.log('Account URL exists, returning updateAccount()');
             return this.updateAccount(data);
         }
         catch (e) {
@@ -185,7 +189,7 @@ class AcmeClient {
 
             /* HTTP 200: Account exists */
             if (resp.status === 200) {
-                log('Account already exists (HTTP 200), returning updateAccount()');
+                this.log('Account already exists (HTTP 200), returning updateAccount()');
                 return this.updateAccount(data);
             }
 
@@ -214,7 +218,7 @@ class AcmeClient {
             this.api.getAccountUrl();
         }
         catch (e) {
-            log('No account URL found, returning createAccount()');
+            this.log('No account URL found, returning createAccount()');
             return this.createAccount(data);
         }
 
@@ -502,7 +506,7 @@ class AcmeClient {
             await verify[challenge.type](authz, challenge, keyAuthorization);
         };
 
-        log('Waiting for ACME challenge verification（等待ACME检查验证）');
+        this.log('Waiting for ACME challenge verification（等待ACME检查验证）');
         return util.retry(verifyFn, this.backoffOpts);
     }
 
@@ -570,7 +574,7 @@ class AcmeClient {
             const resp = await this.api.apiRequest(item.url, null, [200]);
 
             /* Verify status */
-            log(`[${d}] Item has status（检查状态）: ${resp.data.status}`);
+            this.log(`[${d}] Item has status（检查状态）: ${resp.data.status}`);
 
             if (invalidStates.includes(resp.data.status)) {
                 abort();
@@ -586,7 +590,7 @@ class AcmeClient {
             throw new Error(`[${d}] Unexpected item status: ${resp.data.status}`);
         };
 
-        log(`[${d}] Waiting for valid status （等待valid状态）: ${item.url}`, this.backoffOpts);
+        this.log(`[${d}] Waiting for valid status （等待valid状态）: ${item.url}`, this.backoffOpts);
         return util.retry(verifyFn, this.backoffOpts);
     }
 

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

@@ -19,7 +19,7 @@ import { getJwk } from './crypto/index.js';
  */
 
 class HttpClient {
-    constructor(directoryUrl, accountKey, externalAccountBinding = {}, urlMapping = {}) {
+    constructor(directoryUrl, accountKey, externalAccountBinding = {}, urlMapping = {},logger) {
         this.directoryUrl = directoryUrl;
         this.accountKey = accountKey;
         this.externalAccountBinding = externalAccountBinding;
@@ -31,6 +31,7 @@ class HttpClient {
         this.directoryMaxAge = 86400;
         this.directoryTimestamp = 0;
         this.urlMapping = urlMapping;
+        this.log = logger? logger.info.bind(logger) : log;
     }
 
     /**
@@ -48,7 +49,7 @@ class HttpClient {
             for (const key in this.urlMapping.mappings) {
                 if (url.includes(key)) {
                     const newUrl = url.replace(key, this.urlMapping.mappings[key]);
-                    log(`use reverse proxy: ${newUrl}`);
+                    this.log(`use reverse proxy: ${newUrl}`);
                     url = newUrl;
                 }
             }
@@ -65,10 +66,10 @@ class HttpClient {
         opts.headers['Content-Type'] = 'application/jose+json';
 
         /* Request */
-        log(`HTTP request: ${method} ${url}`);
+        this.log(`HTTP request: ${method} ${url}`);
         const resp = await axios.request(opts);
 
-        log(`RESP ${resp.status} ${method} ${url}`);
+        this.log(`RESP ${resp.status} ${method} ${url}`);
         return resp;
     }
 
@@ -85,7 +86,7 @@ class HttpClient {
         const age = (now - this.directoryTimestamp);
 
         if (!this.directoryCache || (age > this.directoryMaxAge)) {
-            log(`Refreshing ACME directory, age: ${age}`);
+            this.log(`Refreshing ACME directory, age: ${age}`);
             const resp = await this.request(this.directoryUrl, 'get');
 
             if (resp.status >= 400) {
@@ -187,7 +188,7 @@ class HttpClient {
 
         /* Nonce */
         if (nonce) {
-            log(`Using nonce: ${nonce}`);
+            this.log(`Using nonce: ${nonce}`);
             header.nonce = nonce;
         }
 
@@ -314,7 +315,7 @@ class HttpClient {
             nonce = resp.headers['replay-nonce'] || null;
             attempts += 1;
 
-            log(`Caught invalid nonce error, retrying (${attempts}/${this.maxBadNonceRetries}) signed request to: ${url}`);
+            this.log(`Caught invalid nonce error, retrying (${attempts}/${this.maxBadNonceRetries}) signed request to: ${url}`);
             return this.signedRequest(url, payload, { kid, nonce, includeExternalAccountBinding }, attempts);
         }
 

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/types/index.d.ts

@@ -49,6 +49,7 @@ export interface ClientOptions {
     backoffMax?: number;
     urlMapping?: UrlMapping;
     signal?: AbortSignal;
+    logger?:any
 }
 
 export interface ClientExternalAccountBindingOptions {
@@ -107,6 +108,9 @@ export const directory: {
         staging: string,
         production: string
     },
+    letsencrypt_staging: {
+        production: string
+    },
     zerossl: {
         staging: string,
         production: string

packages/core/basic/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.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
+
 ## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
 
 ### Performance Improvements

packages/core/basic/build.md

@@ -1 +1 @@
-22:48
+00:42

packages/core/basic/package.json

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

packages/core/basic/src/index.ts

@@ -1,2 +1 @@
-export * from './utils/index.js';
+export * from "./utils/index.js";
-export * from './utils/util.id.js';

packages/core/basic/src/utils/index.ts

@@ -37,6 +37,9 @@ import { mitter } from "./util.mitter.js";
 
 import * as request from "./util.request.js";
 export * from "./util.cache.js";
+
+export * from "./util.id.js";
+
 export const utils = {
   sleep,
   http,

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.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
+
 ## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
 
 **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.2",
+  "version": "1.37.6",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -18,8 +18,8 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/basic": "^1.37.2",
+    "@certd/basic": "^1.37.6",
-    "@certd/plus-core": "^1.37.2",
+    "@certd/plus-core": "^1.37.6",
     "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": "c725cee0445dbe1ebd1b6588373bde31697113da"
+  "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.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
+
 ## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
 
 **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.2",
+  "version": "1.37.6",
   "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": "c725cee0445dbe1ebd1b6588373bde31697113da"
+  "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.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
+
 ## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
 
 **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.2",
+  "version": "1.37.6",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
+  "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.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
+
 ## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
 
 **Note:** Version bump only for package @certd/jdcloud

packages/libs/lib-jdcloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/jdcloud",
-  "version": "1.37.2",
+  "version": "1.37.6",
   "description": "jdcloud openApi sdk",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
@@ -61,5 +61,5 @@
       "fetch"
     ]
   },
-  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
+  "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.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
+
 ## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
 
 **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.2",
+  "version": "1.37.6",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,7 +17,7 @@
     "pub": "npm publish"
   },
   "dependencies": {
-    "@certd/basic": "^1.37.2",
+    "@certd/basic": "^1.37.6",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -32,5 +32,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
+  "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.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
+
 ## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
 
 **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.2",
+  "version": "1.37.6",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -28,11 +28,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.37.2",
+    "@certd/acme-client": "^1.37.6",
-    "@certd/basic": "^1.37.2",
+    "@certd/basic": "^1.37.6",
-    "@certd/pipeline": "^1.37.2",
+    "@certd/pipeline": "^1.37.6",
-    "@certd/plugin-lib": "^1.37.2",
+    "@certd/plugin-lib": "^1.37.6",
-    "@certd/plus-core": "^1.37.2",
+    "@certd/plus-core": "^1.37.6",
     "@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": "c725cee0445dbe1ebd1b6588373bde31697113da"
+  "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
 }

packages/libs/lib-server/src/basic/base-controller.ts

@@ -47,4 +47,12 @@ export abstract class BaseController {
     }
     return user;
   }
+
+  isAdmin() {
+    const roleIds: number[] = this.ctx?.user?.roles;
+    if (roleIds?.includes(1)) {
+      return true;
+    }
+  }
+
 }

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

@@ -37,6 +37,18 @@ export class SysPublicSettings extends BaseSettings {
   //验证码类型
   captchaType?: string;
   captchaAddonId?:number;
+
+
+
+  //流水线是否启用有效期
+  pipelineValidTimeEnabled?: boolean = false;
+
+  //证书域名添加到监控
+  certDomainAddToMonitorEnabled?: boolean = false;
+
+  // 固定证书有效期天数，0表示不固定
+  fixedCertExpireDays?: number;
+
 }
 
 export class SysPrivateSettings extends BaseSettings {
@@ -51,6 +63,8 @@ export class SysPrivateSettings extends BaseSettings {
   dnsResultOrder? = '';
   commonCnameEnabled?: boolean = true;
 
+  httpRequestTimeout?: number = 30;
+
   sms?: {
     type?: string;
     config?: any;
@@ -214,3 +228,4 @@ export class SysSafeSetting 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.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
+
 ## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
 
 **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.2",
+  "version": "1.37.6",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
+  "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
 }

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.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
+
+* 修复并发情况下证书申请日志混乱的bug ([bb2714f](https://github.com/certd/certd/commit/bb2714ff241f9db4a71d805b23a1b0f9f2f6413a))
+
 ## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
 
 ### Performance Improvements

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.37.2",
+  "version": "1.37.6",
   "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.2",
+    "@certd/acme-client": "^1.37.6",
-    "@certd/basic": "^1.37.2",
+    "@certd/basic": "^1.37.6",
-    "@certd/pipeline": "^1.37.2",
+    "@certd/pipeline": "^1.37.6",
-    "@certd/plugin-lib": "^1.37.2",
+    "@certd/plugin-lib": "^1.37.6",
     "@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": "c725cee0445dbe1ebd1b6588373bde31697113da"
+  "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;
@@ -82,9 +82,9 @@ export class AcmeService {
     this.sslProvider = options.sslProvider || "letsencrypt";
     this.eab = options.eab;
     this.skipLocalVerify = options.skipLocalVerify ?? false;
-    acme.setLogger((message: any, ...args: any[]) => {
+    // acme.setLogger((message: any, ...args: any[]) => {
-      this.logger.info(message, ...args);
+    //   this.logger.info(message, ...args);
-    });
+    // });
   }
 
   async getAccountConfig(email: string, urlMapping: UrlMapping): Promise<any> {
@@ -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 {
@@ -155,6 +150,7 @@ export class AcmeService {
       backoffMax: 10000,
       urlMapping,
       signal: this.options.signal,
+      logger: this.logger,
     });
 
     if (conf.accountUrl == null) {
@@ -326,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 = [];

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.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
+
+* 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)
 
 **Note:** Version bump only for package @certd/plugin-lib

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.37.2",
+  "version": "1.37.6",
   "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.2",
+    "@certd/basic": "^1.37.6",
-    "@certd/pipeline": "^1.37.2",
+    "@certd/pipeline": "^1.37.6",
     "@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": "c725cee0445dbe1ebd1b6588373bde31697113da"
+  "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b"
 }

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

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

packages/plugins/plugin-lib/src/ssh/ssh.ts

@@ -188,6 +188,11 @@ export class AsyncSsh2Client {
     //   script += "\r\nexit\r\n";
     //   //保证windows下正常退出
     // }
+
+    if (script.includes(" -i ")) {
+      this.logger.warn("不支持交互式命令，请不要使用-i参数");
+    }
+
     return safePromise((resolve, reject) => {
       this.logger.info(`执行命令：[${this.connConf.host}][exec]: \n` + script);
       // pty 伪终端，window下的输出会带上conhost.exe之类的多余的字符串，影响返回结果判断

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,47 @@
 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))
+
+## [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
+
+*  注册页面增加手机注册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))
+* 站点证书监控增加导出和分组功能 ([2ed12c4](https://github.com/certd/certd/commit/2ed12c429eb58274a4f9dd0ed3b66e160d283ded))
+* 证书监控增加批量删除 ([e578c52](https://github.com/certd/certd/commit/e578c52fdf2f838038062aa4209b655fbae461fb))
+
 ## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
 
 ### 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.2",
+  "version": "1.37.6",
   "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.2",
+    "@certd/lib-iframe": "^1.37.6",
-    "@certd/pipeline": "^1.37.2",
+    "@certd/pipeline": "^1.37.6",
     "@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

@@ -57,6 +57,7 @@ export default {
   suiteBuy: "Suite Purchase",
   myTrade: "My Orders",
   paymentReturn: "Payment Return",
+  hasExpired: "Expired",
   user: {
     greeting: "Hello",
     profile: "Account Info",
@@ -136,10 +137,16 @@ export default {
     triggerType: "Trigger Type",
     pipelineId: "Pipeline Id",
   },
+
+  pi: {
+    validTime: "Piepline Valid Time",
+    validTimeHelper: "Not filled in means permanent validity",
+  },
   types: {
-    certApply: "Certificate Application",
+    certApply: "Cert Apply",
-    certUpload: "Certificate Upload",
+    certUpload: "Cert Upload",
     custom: "Custom",
+    template: "Template",
   },
   myPipelines: "My Pipelines",
   selectedCount: "Selected {count} items",
@@ -224,9 +231,13 @@ export default {
     notificationWhen: "Notification Timing",
     notificationHelper: "Get real-time alerts when the task fails",
     groupIdTitle: "Pipeline Group",
+
+    addToMonitorEnabled: "Add to Cert Monitor",
+    addToMonitorDomains: "Add to Monitor Domains",
   },
   notificationDefault: "Use Default Notification",
   monitor: {
+    remark: "Remark",
     title: "Site Certificate Monitoring",
     description: "Check website certificates' expiration at 0:00 daily; reminders sent 10 days before expiration (using default notification channel);",
     settingLink: "Site Monitoring Settings",
@@ -248,6 +259,7 @@ export default {
     certDomains: "Certificate Domains",
     certProvider: "Issuer",
     certStatus: "Certificate Status",
+    error: "Error",
     status: {
       ok: "Valid",
       expired: "Expired",
@@ -292,7 +304,7 @@ export default {
   },
   domainList: {
     title: "Domain List",
-    helper: "Format: domain:port:name, one per line. Port and name are optional.\nExamples:\nwww.baidu.com:443:Baidu\nwww.taobao.com::Taobao\nwww.google.com",
+    helper: "Format: domain:port:name:remark, one per line. Port and name are optional.\nExamples:\nwww.baidu.com:443:Baidu:remarkText\nwww.taobao.com::Taobao\nwww.google.com",
     required: "Please enter domains to import",
     placeholder: "www.baidu.com:443:Baidu\nwww.taobao.com::Taobao\nwww.google.com\n",
   },
@@ -719,8 +731,18 @@ export default {
   addonName: "Name",
   addonNameHelper: "Fill freely, helps to distinguish when multiple same type exist",
   addonTypeSelect: "Select type",
+  dates: {
+    years: "{count} years",
+    months: "{count} months",
+  },
   sys: {
     setting: {
+      baseSetting: "Base Settings",
+      registerSetting: "Register Settings",
+      safeSetting: "Safe Settings",
+      paymentSetting: "Payment Settings",
+      captchaSetting: "Captcha Setting",
+      pipelineSetting: "Pipeline Settings",
       showRunStrategy: "Show RunStrategy",
       showRunStrategyHelper: "Allow modify the run strategy of the task",
 
@@ -730,11 +752,14 @@ export default {
       captchaTest: "Captcha Test",
       // 保存后再点击测试，请务必测试通过了，再开启登录验证码
       captchaTestHelper: "Save and click test, please make sure the test is passed before enabling login captcha",
-      baseSetting: "Base Settings",
+
-      registerSetting: "Register Settings",
+      pipelineValidTimeEnabled: "Enable Pipeline Valid Time",
-      safeSetting: "Safe Settings",
+      pipelineValidTimeEnabledHelper: "Whether to enable the valid time of the pipeline",
-      paymentSetting: "Payment Settings",
+      certDomainAddToMonitorEnabled: "Add Domain to Certificate Monitor",
-      captchaSetting: "Captcha Setting",
+      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

@@ -62,6 +62,7 @@ export default {
   suiteBuy: "套餐购买",
   myTrade: "我的订单",
   paymentReturn: "支付返回",
+  hasExpired: "已过期",
 
   user: {
     greeting: "您好",
@@ -142,10 +143,15 @@ export default {
     triggerType: "触发类型",
     pipelineId: "流水线Id",
   },
+  pi: {
+    validTime: "流水线有效期",
+    validTimeHelper: "不填则为永久有效",
+  },
   types: {
     certApply: "证书申请",
     certUpload: "证书上传",
     custom: "自定义",
+    template: "模版",
   },
   myPipelines: "我的流水线",
   selectedCount: "已选择 {count} 项",
@@ -229,9 +235,12 @@ export default {
     notificationWhen: "通知时机",
     notificationHelper: "任务执行失败实时提醒",
     groupIdTitle: "流水线分组",
+    addToMonitorEnabled: "添加到证书监控",
+    addToMonitorDomains: "添加到监控域名",
   },
   notificationDefault: "使用默认通知",
   monitor: {
+    remark: "备注",
     title: "站点证书监控",
     description: "每天0点，检查网站证书的过期时间，到期前10天时将发出提醒（使用默认通知渠道）;",
     settingLink: "站点监控设置",
@@ -253,6 +262,7 @@ export default {
     certDomains: "证书域名",
     certProvider: "颁发机构",
     certStatus: "证书状态",
+    error: "错误信息",
     status: {
       ok: "正常",
       expired: "过期",
@@ -297,9 +307,9 @@ export default {
   },
   domainList: {
     title: "域名列表",
-    helper: "格式【域名:端口:名称】，一行一个，其中端口、名称可以省略\n比如：\nwww.baidu.com:443:百度\nwww.taobao.com::淘宝\nwww.google.com",
+    helper: "格式【域名:端口:名称:备注】，一行一个，其中端口、名称、备注可以省略\n比如：\nwww.baidu.com:443:百度:备注文本\nwww.taobao.com::淘宝\nwww.google.com",
     required: "请输入要导入的域名",
-    placeholder: "www.baidu.com:443:百度\nwww.taobao.com::淘宝\nwww.google.com\n",
+    placeholder: "www.baidu.com:443:百度:备注文本\nwww.taobao.com::淘宝\nwww.google.com\n",
   },
   accountInfo: "账号信息",
   securitySettings: "认证安全设置",
@@ -721,8 +731,19 @@ export default {
     copyPipelineConfig: "复制该流水线配置作为模板来源",
     pipeline: "流水线",
   },
+  dates: {
+    years: "{count}年",
+    months: "{count}月",
+  },
   sys: {
     setting: {
+      baseSetting: "基本设置",
+      registerSetting: "注册设置",
+      safeSetting: "安全设置",
+      paymentSetting: "支付设置",
+      captchaSetting: "验证码设置",
+      pipelineSetting: "流水线设置",
+
       showRunStrategy: "显示运行策略选择",
       showRunStrategyHelper: "任务设置中是否允许选择运行策略",
 
@@ -731,11 +752,15 @@ export default {
       captchaType: "验证码配置",
       captchaTest: "测试验证码",
       captchaTestHelper: "保存后再点击测试，请务必测试通过了，再开启登录验证码",
-      baseSetting: "基本设置",
+
-      registerSetting: "注册设置",
+      pipelineValidTimeEnabled: "启用流水线有效期",
-      safeSetting: "安全设置",
+      pipelineValidTimeEnabledHelper: "是否启用流水线有效期",
-      paymentSetting: "支付设置",
+      certDomainAddToMonitorEnabled: "证书域名添加到证书监控",
-      captchaSetting: "验证码设置",
+      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: "没有生效?",
+  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

@@ -50,6 +50,15 @@ export type SysPublicSetting = {
   captchaEnabled?: boolean;
   captchaType?: number;
   captchaAddonId?: number;
+
+  //流水线是否启用有效期
+  pipelineValidTimeEnabled?: boolean;
+
+  //证书域名添加到监控
+  certDomainAddToMonitorEnabled?: boolean;
+
+  // 固定证书有效期天数，0表示不固定
+  fixedCertExpireDays?: number;
 };
 export type SuiteSetting = {
   enabled?: boolean;
@@ -63,6 +72,9 @@ export type SysPrivateSetting = {
     type?: string;
     config?: any;
   };
+
+  //http请求超时时间
+  httpRequestTimeout?: number;
 };
 export type SysInstallInfo = {
   siteId: string;

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/style/scroll.less

@@ -1,23 +1,23 @@
 ::-webkit-scrollbar {
-  width: 8px;
+  width: 12px !important;
-  height: 8px;
+  height: 12px !important;
 }
 
 ::-webkit-scrollbar-track {
-  width: 8px;
+  width: 12px !important;
   background: rgba(#101f1c, 0.1);
-  -webkit-border-radius: 2em;
+  -webkit-border-radius: 4em;
-  -moz-border-radius: 2em;
+  -moz-border-radius: 4em;
-  border-radius: 2em;
+  border-radius: 4em;
 }
 
 ::-webkit-scrollbar-thumb {
   // background-color: rgba(#101F1C, 0.5);
   background-clip: padding-box;
   min-height: 28px;
-  -webkit-border-radius: 2em;
+  -webkit-border-radius: 4em;
-  -moz-border-radius: 2em;
+  -moz-border-radius: 4em;
-  border-radius: 2em;
+  border-radius: 4em;
   background-color: #b3b3b3;
   box-shadow: 0px 1px 1px #eee inset;
 }

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/basic/group/api.ts

@@ -0,0 +1,64 @@
+import { dict } from "@fast-crud/fast-crud";
+import { request } from "/src/api/service";
+
+export function createApi() {
+  const apiPrefix = "/basic/group";
+  return {
+    async GetList(query: any) {
+      return await request({
+        url: apiPrefix + "/page",
+        method: "post",
+        data: query,
+      });
+    },
+
+    async AddObj(obj: any) {
+      return await request({
+        url: apiPrefix + "/add",
+        method: "post",
+        data: obj,
+      });
+    },
+
+    async UpdateObj(obj: any) {
+      return await request({
+        url: apiPrefix + "/update",
+        method: "post",
+        data: obj,
+      });
+    },
+
+    async DelObj(id: number) {
+      return await request({
+        url: apiPrefix + "/delete",
+        method: "post",
+        params: { id },
+      });
+    },
+
+    async GetObj(id: number) {
+      return await request({
+        url: apiPrefix + "/info",
+        method: "post",
+        params: { id },
+      });
+    },
+    async ListAll(type: string) {
+      return await request({
+        url: apiPrefix + "/all",
+        method: "post",
+        params: { type },
+      });
+    },
+  };
+}
+
+export const pipelineGroupApi = createApi();
+
+export function createGroupDictRef(type: string) {
+  return dict({
+    url: "/basic/group/all?type=" + type,
+    value: "id",
+    label: "name",
+  });
+}

packages/ui/certd-client/src/views/certd/basic/group/crud.tsx

@@ -0,0 +1,142 @@
+import { useI18n } from "/src/locales";
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { pipelineGroupApi } from "./api";
+import { ref } from "vue";
+
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const { t } = useI18n();
+  const api = pipelineGroupApi;
+  const typeRef = ref(context.type);
+
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetList(query);
+  };
+  const editRequest = async (req: EditReq) => {
+    const { form, row } = req;
+    form.id = row.id;
+    const res = await api.UpdateObj(form);
+    return res;
+  };
+  const delRequest = async (req: DelReq) => {
+    const { row } = req;
+    return await api.DelObj(row.id);
+  };
+
+  const addRequest = async (req: AddReq) => {
+    const { form } = req;
+    form.type = typeRef.value;
+    const res = await api.AddObj(form);
+    return res;
+  };
+
+  return {
+    crudOptions: {
+      settings: {
+        plugins: {
+          mobile: {
+            props: {
+              rowHandle: {
+                width: 160,
+              },
+            },
+          },
+        },
+      },
+      request: {
+        pageRequest,
+        addRequest,
+        editRequest,
+        delRequest,
+      },
+      search: {
+        initialForm: {
+          type: typeRef.value,
+        },
+      },
+      form: {
+        labelCol: {
+          //固定label宽度
+          span: null,
+          style: {
+            width: "100px",
+          },
+        },
+        col: {
+          span: 22,
+        },
+        wrapper: {
+          width: 600,
+        },
+      },
+      rowHandle: {
+        width: 200,
+        group: {
+          editable: {
+            edit: {
+              text: t("certd.edit"),
+              order: -1,
+              type: "primary",
+              click({ row, index }) {
+                crudExpose.openEdit({
+                  index,
+                  row,
+                });
+              },
+            },
+          },
+        },
+      },
+      table: {
+        editable: {
+          enabled: true,
+          mode: "cell",
+          exclusive: true,
+          //排他式激活效果，将其他行的编辑状态触发保存
+          exclusiveEffect: "save", //自动保存其他行编辑状态，cancel = 自动关闭其他行编辑状态
+          async updateCell(opts) {
+            const { row, key, value } = opts;
+            //如果是添加，需要返回{[rowKey]:xxx},比如:{id:2}
+            return await api.UpdateObj({ id: row.id, [key]: value });
+          },
+        },
+      },
+      columns: {
+        id: {
+          title: "ID",
+          key: "id",
+          type: "number",
+          search: {
+            show: true,
+          },
+          column: {
+            width: 100,
+            editable: {
+              disabled: true,
+            },
+          },
+          form: {
+            show: false,
+          },
+        },
+        name: {
+          title: t("certd.groupName"),
+          search: {
+            show: true,
+          },
+          type: "text",
+          form: {
+            rules: [
+              {
+                required: true,
+                message: t("certd.enterGroupName"),
+              },
+            ],
+          },
+          column: {
+            width: 400,
+          },
+        },
+      },
+    },
+  };
+}

packages/ui/certd-client/src/views/certd/basic/group/group-selector.vue

@@ -0,0 +1,58 @@
+<template>
+  <div class="pi-group-selector flex full-w">
+    <div class="flex-1">
+      <fs-dict-select :value="modelValue" :dict="groupDictRef" :allow-clear="true" @update:value="doUpdate"></fs-dict-select>
+    </div>
+
+    <fs-table-select
+      class="flex-0"
+      :create-crud-options="createCrudOptions"
+      :crud-options-override="{
+        search: { show: false, initialForm: { type: props.type } },
+        table: {
+          scroll: {
+            x: 540,
+          },
+        },
+      }"
+      :model-value="modelValue"
+      :dict="groupDictRef"
+      :show-current="false"
+      :show-select="false"
+      :dialog="{ width: 960 }"
+      :destroy-on-close="false"
+      height="400px"
+      @update:model-value="doUpdate"
+      @dialog-closed="doRefresh"
+    >
+      <template #default="scope">
+        <fs-button class="ml-5" type="primary" icon="ant-design:edit-outlined" @click="scope.open({ context: { type: props.type } })"></fs-button>
+      </template>
+    </fs-table-select>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { createGroupDictRef } from "./api";
+import createCrudOptions from "./crud";
+import { dict, FsDictSelect } from "@fast-crud/fast-crud";
+
+const props = defineProps<{
+  modelValue?: number;
+  type: string;
+}>();
+
+defineOptions({
+  name: "GroupSelector",
+});
+const groupDictRef = createGroupDictRef(props.type);
+const emit = defineEmits(["refresh", "update:modelValue", "change"]);
+function doRefresh() {
+  emit("refresh");
+  groupDictRef.reloadDict();
+}
+
+function doUpdate(value: any) {
+  emit("update:modelValue", value);
+}
+</script>

packages/ui/certd-client/src/views/certd/basic/group/index.vue

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

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/api.ts

@@ -35,6 +35,14 @@ export const siteInfoApi = {
     });
   },
 
+  async BatchDelObj(ids: number[]) {
+    return await request({
+      url: apiPrefix + "/batchDelete",
+      method: "post",
+      data: { ids },
+    });
+  },
+
   async GetObj(id: number) {
     return await request({
       url: apiPrefix + "/info",

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

@@ -1,17 +1,18 @@
 // @ts-ignore
 import { useI18n } from "/src/locales";
-import { AddReq, ColumnCompositionProps, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { AddReq, ColumnCompositionProps, ColumnProps, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DataFormatterContext, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { siteInfoApi } from "./api";
 import * as settingApi from "./setting/api";
 import dayjs from "dayjs";
-import { Modal, notification } from "ant-design-vue";
+import { message, Modal, notification } from "ant-design-vue";
 import { useSettingStore } from "/@/store/settings";
 import { mySuiteApi } from "/@/views/certd/suite/mine/api";
 import { mitter } from "/@/utils/util.mitt";
 import { useSiteIpMonitor } from "./ip/use";
 import { useSiteImport } from "/@/views/certd/monitor/site/use";
 import { ref } from "vue";
-
+import GroupSelector from "../../basic/group/group-selector.vue";
+import { createGroupDictRef } from "../../basic/group/api";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
   const api = siteInfoApi;
@@ -32,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;
   };
@@ -57,6 +59,29 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   }
   loadSetting();
 
+  const selectedRowKeys = ref([]);
+
+  const settingStore = useSettingStore();
+
+  const handleBatchDelete = () => {
+    if (selectedRowKeys.value?.length > 0) {
+      Modal.confirm({
+        title: "确认",
+        content: `确定要批量删除这${selectedRowKeys.value.length}条记录吗`,
+        async onOk() {
+          await api.BatchDelObj(selectedRowKeys.value);
+          message.info("删除成功");
+          crudExpose.doRefresh();
+          selectedRowKeys.value = [];
+        },
+      });
+    } else {
+      message.error("请先勾选记录");
+    }
+  };
+
+  context.handleBatchDelete = handleBatchDelete;
+
   function checkAll() {
     Modal.confirm({
       title: t("certd.monitor.confirmTitle"), // "确认"
@@ -70,6 +95,16 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       },
     });
   }
+
+  const GroupTypeSite = "site";
+  const groupDictRef = createGroupDictRef(GroupTypeSite);
+
+  function getDefaultGroupId() {
+    const searchFrom = crudExpose.getSearchValidatedFormData();
+    if (searchFrom.groupId) {
+      return searchFrom.groupId;
+    }
+  }
   return {
     id: "siteMonitorCrud",
     crudOptions: {
@@ -79,6 +114,68 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         editRequest,
         delRequest,
       },
+      tabs: {
+        name: "groupId",
+        show: true,
+      },
+      toolbar: {
+        buttons: {
+          export: {
+            show: true,
+          },
+        },
+        export: {
+          dataFrom: "search",
+          columnFilter: (col: ColumnProps) => {
+            //列过滤器，返回true则导出该列
+            //例如： 只导出show=true的列
+            return col.show === true;
+          },
+          dataFormatter: (opts: DataFormatterContext) => {
+            //例如 格式化日期
+            const { row, originalRow, col, exportCol } = opts;
+            const key = col.key;
+            const element = originalRow[key];
+            if (key.includes("Time") && element) {
+              row[key] = dayjs(element).format("YYYY-MM-DD HH:mm:ss");
+            }
+
+            if (col.width) {
+              exportCol.width = col.width / 10;
+            }
+
+            if (col.key === "certInfo" && originalRow?.certProvider) {
+              row[key] = originalRow?.certProvider + " " + originalRow?.certDomains;
+            }
+
+            //参数说明
+            // DataFormatterContext = {row: any,originalRow: any, key: string, col: ColumnProps, exportCol:ExportColumn}
+            // row = 当前行数据
+            // originalRow = 当前行原始数据
+            // key = 当前列的key
+            // col = 当前列的配置
+            // exportCol = 当前列的导出配置
+          },
+        },
+      },
+      pagination: {
+        pageSizeOptions: ["10", "20", "50", "100", "200"],
+      },
+      settings: {
+        plugins: {
+          //这里使用行选择插件，生成行选择crudOptions配置，最终会与crudOptions合并
+          rowSelection: {
+            enabled: true,
+            props: {
+              multiple: true,
+              crossPage: false,
+              selectedRowKeys: () => {
+                return selectedRowKeys;
+              },
+            },
+          },
+        },
+      },
       form: {
         labelCol: {
           //固定label宽度
@@ -122,7 +219,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
                 }
               }
 
-              await crudExpose.openAdd({});
+              const defaultGroupId = getDefaultGroupId();
+              await crudExpose.openAdd({
+                row: { groupId: defaultGroupId },
+              });
             },
           },
           //导入按钮
@@ -131,7 +231,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             text: t("certd.monitor.bulkImport"),
             type: "primary",
             async click() {
+              const defaultGroupId = getDefaultGroupId();
               openSiteImportDialog({
+                defaultGroupId,
                 afterSubmit() {
                   crudExpose.doRefresh();
                 },
@@ -183,10 +285,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
         },
       },
-      tabs: {
+      // tabs: {
-        name: "disabled",
+      //   name: "disabled",
-        show: true,
+      //   show: true,
-      },
+      // },
       columns: {
         id: {
           title: "ID",
@@ -367,6 +469,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           column: {
             sorter: true,
             width: 155,
+            show: false,
           },
         },
         certExpiresTime: {
@@ -405,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";
@@ -415,6 +524,46 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             },
           },
         },
+        groupId: {
+          title: t("certd.fields.group"),
+          type: "dict-select",
+          search: {
+            show: true,
+          },
+          dict: groupDictRef,
+          form: {
+            component: {
+              name: GroupSelector,
+              vModel: "modelValue",
+              type: GroupTypeSite,
+              onRefresh() {
+                groupDictRef.reloadDict();
+              },
+            },
+          },
+          column: {
+            width: 130,
+            align: "center",
+            component: {
+              color: "auto",
+            },
+            sorter: true,
+          },
+        },
+        remark: {
+          title: t("certd.monitor.remark"),
+          search: {
+            show: false,
+          },
+          type: "text",
+          column: {
+            width: 200,
+            sorter: true,
+            cellRender({ value }) {
+              return <a-tooltip title={value}>{value}</a-tooltip>;
+            },
+          },
+        },
         lastCheckTime: {
           title: t("certd.monitor.lastCheckTime"),
           search: {
@@ -582,6 +731,21 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             show: false,
           },
         },
+        error: {
+          title: t("certd.monitor.error"),
+          search: {
+            show: false,
+          },
+          type: "text",
+          form: { show: false },
+          column: {
+            width: 200,
+            sorter: true,
+            cellRender({ value }) {
+              return <a-tooltip title={value}>{value}</a-tooltip>;
+            },
+          },
+        },
       },
     },
   };

packages/ui/certd-client/src/views/certd/monitor/site/index.vue

@@ -15,23 +15,28 @@
         </div>
       </div>
     </template>
-    <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
+    <fs-crud ref="crudRef" v-bind="crudBinding">
+      <template #pagination-left>
+        <a-tooltip title="批量删除">
+          <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
+        </a-tooltip>
+      </template>
+    </fs-crud>
   </fs-page>
 </template>
 
 <script lang="ts" setup>
-import { onActivated, onMounted } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
+import { onActivated, onMounted } from "vue";
 import createCrudOptions from "./crud";
-import { siteInfoApi } from "./api";
-import { Modal, notification } from "ant-design-vue";
 import { useI18n } from "/src/locales";
-
 const { t } = useI18n();
 defineOptions({
   name: "SiteCertMonitor",
 });
-const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: {} });
+const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+
+const handleBatchDelete = context.handleBatchDelete;
 
 // 页面打开后获取列表数据
 onMounted(() => {

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

@@ -1,13 +1,13 @@
 import { useFormWrapper } from "@fast-crud/fast-crud";
 import { siteInfoApi } from "./api";
 import { useI18n } from "/src/locales";
-
+import GroupSelector from "../../basic/group/group-selector.vue";
 export function useSiteImport() {
   const { t } = useI18n();
   const { openCrudFormDialog } = useFormWrapper();
 
-  async function openSiteImportDialog(opts: { afterSubmit: any }) {
+  async function openSiteImportDialog(opts: { afterSubmit: any; defaultGroupId?: number }) {
-    const { afterSubmit } = opts;
+    const { afterSubmit, defaultGroupId } = opts;
     await openCrudFormDialog<any>({
       crudOptions: {
         columns: {
@@ -26,6 +26,21 @@ export function useSiteImport() {
               },
             },
           },
+          groupId: {
+            type: "select",
+            title: t("certd.fields.group"),
+            form: {
+              value: defaultGroupId,
+              component: {
+                name: GroupSelector,
+                vModel: "modelValue",
+                type: "site",
+              },
+              col: {
+                span: 24,
+              },
+            },
+          },
         },
 
         form: {

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

@@ -6,12 +6,13 @@ import { useRouter } from "vue-router";
 import { compute, CreateCrudOptionsRet, dict, useFormWrapper } from "@fast-crud/fast-crud";
 import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
 import { useReference } from "/@/use/use-refrence";
-import { ref } from "vue";
+import { computed, ref } from "vue";
 import * as api from "../api";
 import { PluginGroup, usePluginStore } from "/@/store/plugin";
 import { createNotificationApi } from "/@/views/certd/notification/api";
 import GroupSelector from "../group/group-selector.vue";
 import { useI18n } from "/src/locales";
+import { useSettingStore } from "/@/store/settings";
 
 export function fillPipelineByDefaultForm(pipeline: any, form: any) {
   const triggers = [];
@@ -78,6 +79,7 @@ export function useCertPipelineCreator() {
   const { openCrudFormDialog } = useFormWrapper();
 
   const pluginStore = usePluginStore();
+  const settingStore = useSettingStore();
   const router = useRouter();
 
   function createCrudOptions(certPlugins: any[], getFormData: any, doSubmit: any): CreateCrudOptionsRet {
@@ -251,7 +253,48 @@ export function useCertPipelineCreator() {
                 name: GroupSelector,
                 vModel: "modelValue",
               },
-              order: 9999,
+              order: 888,
+            },
+          },
+          addToMonitorEnabled: {
+            title: t("certd.pipelineForm.addToMonitorEnabled"),
+            type: "switch",
+            form: {
+              show: computed(() => {
+                return settingStore.isPlus && settingStore.sysPublic?.certDomainAddToMonitorEnabled;
+              }),
+              value: false,
+              component: {
+                name: "a-switch",
+                vModel: "checked",
+              },
+              col: {
+                span: 24,
+              },
+              order: 999,
+              valueChange({ value, form }) {
+                if (value) {
+                  form.addToMonitorDomains = form.domains.join("\n").replaceAll("*", "www");
+                }
+              },
+            },
+          },
+          addToMonitorDomains: {
+            title: t("certd.pipelineForm.addToMonitorDomains"),
+            type: "text",
+            form: {
+              show: compute(({ form }) => {
+                return form.addToMonitorEnabled;
+              }),
+              component: {
+                name: "a-textarea",
+                vModel: "value",
+              },
+              col: {
+                span: 24,
+              },
+              helper: t("certd.domainList.helper"),
+              order: 999,
             },
           },
         },
@@ -324,12 +367,14 @@ 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,
         type: "cert",
         groupId,
+        addToMonitorEnabled: form.addToMonitorEnabled,
+        addToMonitorDomains: form.addToMonitorDomains,
       });
       if (form.email) {
         try {

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";
@@ -466,7 +470,7 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
           },
           column: {
             sorter: true,
-            width: 80,
+            width: 100,
             align: "center",
             component: {
               name: "fs-dict-switch",
@@ -513,7 +517,7 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
               { value: "cert", label: t("certd.types.certApply") },
               { value: "cert_upload", label: t("certd.types.certUpload") },
               { value: "custom", label: t("certd.types.custom") },
-              { value: "template", label: "模版" },
+              { value: "template", label: t("certd.types.template") },
             ],
           }),
           form: {
@@ -522,7 +526,7 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
           },
           column: {
             sorter: true,
-            width: 90,
+            width: 110,
             align: "center",
             show: true,
             component: {
@@ -555,16 +559,53 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
             sorter: true,
           },
         },
-        createTime: {
+        validTime: {
-          title: t("certd.fields.createTime"),
+          title: t("certd.pi.validTime"),
-          type: "datetime",
+          type: "date",
           form: {
-            show: false,
+            show: computed(() => {
+              return settingStore.isPlus && settingStore.sysPublic.pipelineValidTimeEnabled && userStore.isAdmin;
+            }),
+            helper: t("certd.pi.validTimeHelper"),
+            valueResolve({ form, key, value }) {
+              if (value) {
+                form[key] = value.valueOf();
+              }
+            },
+            valueBuilder({ form, key, value }) {
+              if (value) {
+                form[key] = dayjs(value);
+              }
+            },
+            component: {
+              presets: [
+                { label: t("certd.dates.months", { count: 3 }), value: dayjs().add(3, "month") },
+                { label: t("certd.dates.months", { count: 6 }), value: dayjs().add(6, "month") },
+                { label: t("certd.dates.years", { count: 1 }), value: dayjs().add(1, "year") },
+                { label: t("certd.dates.years", { count: 2 }), value: dayjs().add(2, "year") },
+                { label: t("certd.dates.years", { count: 3 }), value: dayjs().add(3, "year") },
+                { label: t("certd.dates.years", { count: 4 }), value: dayjs().add(4, "year") },
+                { label: t("certd.dates.years", { count: 5 }), value: dayjs().add(5, "year") },
+                { label: t("certd.dates.years", { count: 6 }), value: dayjs().add(6, "year") },
+              ],
+            },
           },
           column: {
+            show: computed(() => {
+              return settingStore.isPlus && settingStore.sysPublic.pipelineValidTimeEnabled;
+            }),
             sorter: true,
             width: 155,
             align: "center",
+            cellRender({ value }) {
+              if (!value || value <= 0) {
+                return "-";
+              }
+              if (value < Date.now()) {
+                return t("certd.hasExpired");
+              }
+              return dayjs(value).format("YYYY-MM-DD");
+            },
           },
         },
         updateTime: {

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

@@ -37,6 +37,7 @@ const pipelineOptions: PipelineOptions = {
         type: detail.pipeline.type,
         from: detail.pipeline.from,
       },
+      validTime: detail.pipeline.validTime,
     } as PipelineDetail;
   },
 
@@ -55,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>
@@ -26,7 +26,6 @@
 import { onActivated, onMounted, ref } from "vue";
 import { dict, useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
-import PiCertdForm from "./certd-form/index.vue";
 import ChangeGroup from "./components/change-group.vue";
 import ChangeTrigger from "./components/change-trigger.vue";
 import { Modal, notification } from "ant-design-vue";
@@ -35,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",
@@ -62,8 +62,10 @@ onActivated(async () => {
   await crudExpose.doRefresh();
 });
 
+const settingStore = useSettingStore();
+
 function batchFinished() {
-  crudExpose.doRefresh();
+  if (settingStore) crudExpose.doRefresh();
   selectedRowKeys.value = [];
 }
 function batchDelete() {
@@ -80,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;
         }
       }