perf: 1panel支持先上传证书再选择证书

https://github.com/certd/certd/issues/705

.trae/skills/access-plugin-dev/SKILL.md

@@ -163,6 +163,16 @@ async doRequest(req: { action: string, data?: any }) {
 }
 ```
 
+--- 开发技巧：实现统一的 API 请求封装
+
+**好处：**
+- **代码复用**：避免在每个 API 方法中重复编写相同的 header 设置和错误处理逻辑
+- **错误处理一致**：统一捕获和处理各种错误情况，确保错误信息格式统一
+- **日志记录完善**：集中记录详细的错误信息，便于调试和问题排查
+- **接口调用简化**：调用方只需关注业务逻辑，无需关心底层请求细节
+- **易于维护**：统一修改 API 调用方式时，只需修改一处代码
+
+
 ## 注意事项
 
 1. **插件命名**：插件名称应简洁明了，反映其功能。
@@ -170,9 +180,12 @@ async doRequest(req: { action: string, data?: any }) {
 3. **日志输出**：必须使用 `this.ctx.logger` 输出日志，而不是 `console`。
 4. **错误处理**：API 调用失败时应抛出明确的错误信息。
 5. **测试方法**：实现 `onTestRequest` 方法，以便用户可以测试授权是否正常。
+6. **统一接口调用方法**：封装统一的 API 请求方法，避免在每个 API 方法调用中重复编写错误处理逻辑。
 
 ## 完整示例
 
+### 示例 1: 通用授权插件
+
 ```typescript
 import { AccessInput, BaseAccess, IsAccess, Pager, PageRes, PageSearch } from '@certd/pipeline';
 import { DomainRecord } from '@certd/plugin-lib';

.trae/skills/agent.md

@@ -6,9 +6,8 @@ Access：存储用户的第三放应用的授权数据，比如用户名密码
 Task： 部署任务插件，它继承AbstractTaskPlugin类，被流水线调用execute方法，将证书部署到对应的应用上
 DnsProvider: DNS提供商插件，它用于在ACME申请证书时给域名添加txt解析记录。
 
-在开始工作前，请阅读并加载.trae/skills下面的技能，根据skills进行相应的插件开发
+注意事项：
-当开发过程中遇到问题，需要参考plugins目录下的其他插件，或者用户提醒你更好的做法时，你需要总结经验，更新相应的skills，让skills越来越完善，能够在以后得新插件开发中具备指导意义。
+1、使用技能：在开始工作前，请阅读并加载.trae/skills下面的技能，根据skills进行相应的插件开发
-
+2、迭代技能：当开发过程用户提醒你更好的做法时，你需要总结经验，更新相应的skills，让skills越来越完善，能够在以后得新插件开发中具备指导意义。
-一般调用的api接口文档会比较复杂，你不知道接口是什么时，请务必询问用户，让用户提供API接口文档
+3、一般调用的api接口文档会比较复杂，你不知道接口是什么时，请务必询问用户，让用户提供API接口文档
-
+4、完成开发后无需测试，通知用户自己去测试
-完成开发后无需测试，通知用户自己去测试

.trae/skills/dns-provider-dev/SKILL.md

@@ -126,6 +126,8 @@ if (isDev()) {
 
 ## 完整示例
 
+### 示例：通用 DNS Provider
+
 ```typescript
 import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert';
 import { DemoAccess } from './access.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.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+### Bug Fixes
+
+*  修复cn域名获取不到到期时间的问题 ([73b8e85](https://github.com/certd/certd/commit/73b8e859766097b5251fc4e5051593d686669eb2))
+* 修复某些情况下报无法修改通知的问题 ([d1a6592](https://github.com/certd/certd/commit/d1a65922d7e152d6edcf6c53b70079f16b54a0d3))
+
+### Performance Improvements
+
+* 腾讯云CLB大区增加台北 ([6b109d1](https://github.com/certd/certd/commit/6b109d172f0c7b6ce6ec164dc196d646a65f529f))
+* 优化腾讯云CLB插件支持选择证书id ([c875971](https://github.com/certd/certd/commit/c875971b71dc6d392e56f0a7605281c40d9bb405))
+* 支持域名到期时间监控通知 ([c6628e7](https://github.com/certd/certd/commit/c6628e7311d6c43c2a784581fb25ec37b29c168d))
+* **monitor:** 支持查看监控执行记录 ([b5cc794](https://github.com/certd/certd/commit/b5cc794061c11b7200b669473c25c4bbfc944b61))
+* **plugin-dnsmgr:** 添加彩虹DNS插件支持 ([af50344](https://github.com/certd/certd/commit/af503442b8298c5b89d11cf2ea351d62e66a609e))
+* **spaceship:** 新增Spaceship DNS插件和授权模块 ([21aec77](https://github.com/certd/certd/commit/21aec77e5c3307b5973d4185baba33edcb28926f))
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 ### Bug Fixes

README.md

@@ -211,3 +211,4 @@ https://certd.handfree.work/
 | --------- |--------- |----------- |
 | [fast-crud](https://gitee.com/fast-crud/fast-crud/)     | <img alt="GitHub stars" src="https://img.shields.io/github/stars/fast-crud/fast-crud?logo=github"/>   | 基于vue3的crud快速开发框架                 |  
 | [dev-sidecar](https://github.com/docmirror/dev-sidecar/) | <img alt="GitHub stars" src="https://img.shields.io/github/stars/docmirror/dev-sidecar?logo=github"/> | 直连访问github工具，无需FQ，解决github无法访问的问题 |
+| [winsvc-manager](https://github.com/greper/winsvc-manager/) | <img alt="GitHub stars" src="https://img.shields.io/github/stars/greper/winsvc-manager?logo=github"/> | 可视化包装应用成为一个Windows服务，使其后台运行 |

docs/.vitepress/config.ts

@@ -124,6 +124,7 @@ export default defineConfig({
                         {text: "子域名托管", link: "/guide/use/cert/subdomain.md"},
                         {text: "流水线有效期", link: "/guide/use/pipeline/valid.md"},
                         {text: "IP证书申请", link: "/guide/use/cert/ip.md"},
+                        {text: "企业模式", link: "/guide/use/mode/enterprise.md"},
                         {text: "插件开发", link: "/guide/use/dev/plugin.md"},
                     ]
                 },

docs/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+### Bug Fixes
+
+*  修复cn域名获取不到到期时间的问题 ([73b8e85](https://github.com/certd/certd/commit/73b8e859766097b5251fc4e5051593d686669eb2))
+* 修复某些情况下报无法修改通知的问题 ([d1a6592](https://github.com/certd/certd/commit/d1a65922d7e152d6edcf6c53b70079f16b54a0d3))
+
+### Performance Improvements
+
+* 腾讯云CLB大区增加台北 ([6b109d1](https://github.com/certd/certd/commit/6b109d172f0c7b6ce6ec164dc196d646a65f529f))
+* 优化腾讯云CLB插件支持选择证书id ([c875971](https://github.com/certd/certd/commit/c875971b71dc6d392e56f0a7605281c40d9bb405))
+* 支持域名到期时间监控通知 ([c6628e7](https://github.com/certd/certd/commit/c6628e7311d6c43c2a784581fb25ec37b29c168d))
+* **monitor:** 支持查看监控执行记录 ([b5cc794](https://github.com/certd/certd/commit/b5cc794061c11b7200b669473c25c4bbfc944b61))
+* **plugin-dnsmgr:** 添加彩虹DNS插件支持 ([af50344](https://github.com/certd/certd/commit/af503442b8298c5b89d11cf2ea351d62e66a609e))
+* **spaceship:** 新增Spaceship DNS插件和授权模块 ([21aec77](https://github.com/certd/certd/commit/21aec77e5c3307b5973d4185baba33edcb28926f))
+
+## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
+
+### Bug Fixes
+
+* 修复某些情况下报没有匹配到任何校验方式的bug ([fe02ce7](https://github.com/certd/certd/commit/fe02ce7b64cf23c4dc4c30daccd5330059a35e9a))
+* 修复上传头像退出登录的bug ([6eb20a1](https://github.com/certd/certd/commit/6eb20a1f2e31d984d9135edbf39c97cdd15621f9))
+
+### Performance Improvements
+
+* 阿里云CDN部署支持根据证书域名自动匹配部署 ([a68301e](https://github.com/certd/certd/commit/a68301e4dcea8b7391ad751aa57555d566297ad9))
+* 阿里云dcdn支持根据证书域名匹配模式 ([df012de](https://github.com/certd/certd/commit/df012dec90590ecba85a69ed6355cfa8382c1da3))
+* 支持部署证书到百度CCE ([a19ea74](https://github.com/certd/certd/commit/a19ea7489c01cdbf795fb51f804bd6d00389f604))
+* dcdn自动匹配部署，支持新增域名感知 ([c6a988b](https://github.com/certd/certd/commit/c6a988bc925886bd7163c1270f2b7a10a57b1c5b))
+
 ## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
 
 ### Bug Fixes

docs/guide/plugins/access.md

@@ -28,51 +28,53 @@
 | 24.| **中国移动CND授权** |  | 
 | 25.| **授权插件示例** | 这是一个示例授权插件，用于演示如何实现一个授权插件 | 
 | 26.| **dns.la授权** |  | 
-| 27.| **多吉云** |  | 
+| 27.| **彩虹DNS** | 彩虹DNS管理系统授权 | 
-| 28.| **Dokploy授权** |  | 
+| 28.| **多吉云** |  | 
-| 29.| **farcdn授权** |  | 
+| 29.| **Dokploy授权** |  | 
-| 30.| **FlexCDN授权** |  | 
+| 30.| **farcdn授权** |  | 
-| 31.| **Gcore** | Gcore | 
+| 31.| **FlexCDN授权** |  | 
-| 32.| **Github授权** |  | 
+| 32.| **Gcore** | Gcore | 
-| 33.| **godaddy授权** |  | 
+| 33.| **Github授权** |  | 
-| 34.| **金山云授权** |  | 
+| 34.| **godaddy授权** |  | 
-| 35.| **FTP授权** |  | 
+| 35.| **金山云授权** |  | 
-| 36.| **七牛OSS授权** |  | 
+| 36.| **FTP授权** |  | 
-| 37.| **腾讯云COS授权** | 腾讯云对象存储授权，包含地域和存储桶 | 
+| 37.| **七牛OSS授权** |  | 
-| 38.| **s3/minio授权** | S3/minio oss授权 | 
+| 38.| **腾讯云COS授权** | 腾讯云对象存储授权，包含地域和存储桶 | 
-| 39.| **namesilo授权** |  | 
+| 39.| **s3/minio授权** | S3/minio oss授权 | 
-| 40.| **Next Terminal 授权** | 用于访问 Next Terminal API 的授权配置 | 
+| 40.| **namesilo授权** |  | 
-| 41.| **1panel授权** | 账号和密码 | 
+| 41.| **Next Terminal 授权** | 用于访问 Next Terminal API 的授权配置 | 
-| 42.| **支付宝** |  | 
+| 42.| **1panel授权** | 账号和密码 | 
-| 43.| **白山云授权** |  | 
+| 43.| **支付宝** |  | 
-| 44.| **宝塔云WAF授权** | 用于连接和管理宝塔云WAF服务的授权配置 | 
+| 44.| **白山云授权** |  | 
-| 45.| **cdnfly授权** |  | 
+| 45.| **宝塔云WAF授权** | 用于连接和管理宝塔云WAF服务的授权配置 | 
-| 46.| **k8s授权** |  | 
+| 46.| **cdnfly授权** |  | 
-| 47.| **括彩云cdn授权** | 括彩云CDN，每月免费30G，[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) | 
+| 47.| **k8s授权** |  | 
-| 48.| **LeCDN授权** |  | 
+| 48.| **括彩云cdn授权** | 括彩云CDN，每月免费30G，[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) | 
-| 49.| **lucky** |  | 
+| 49.| **LeCDN授权** |  | 
-| 50.| **猫云授权** |  | 
+| 50.| **lucky** |  | 
-| 51.| **plesk授权** |  | 
+| 51.| **猫云授权** |  | 
-| 52.| **长亭雷池授权** |  | 
+| 52.| **plesk授权** |  | 
-| 53.| **群晖登录授权** |  | 
+| 53.| **长亭雷池授权** |  | 
-| 54.| **uniCloud** | unicloud授权 | 
+| 54.| **群晖登录授权** |  | 
-| 55.| **微信支付** |  | 
+| 55.| **uniCloud** | unicloud授权 | 
-| 56.| **易盾rcdn授权** | 易盾CDN，每月免费30G，[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) | 
+| 56.| **微信支付** |  | 
-| 57.| **易发云短信** | sms.yfyidc.cn/ | 
+| 57.| **易盾rcdn授权** | 易盾CDN，每月免费30G，[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) | 
-| 58.| **易盾DCDN授权** | https://user.yiduncdn.com | 
+| 58.| **易发云短信** | sms.yfyidc.cn/ | 
-| 59.| **易支付** |  | 
+| 59.| **易盾DCDN授权** | https://user.yiduncdn.com | 
-| 60.| **proxmox** |  | 
+| 60.| **易支付** |  | 
-| 61.| **UCloud授权** | 优刻得授权 | 
+| 61.| **proxmox** |  | 
-| 62.| **又拍云** |  | 
+| 62.| **Spaceship.com 授权** | Spaceship.com API 授权插件 | 
-| 63.| **网宿授权** |  | 
+| 63.| **UCloud授权** | 优刻得授权 | 
-| 64.| **西部数码授权** |  | 
+| 64.| **又拍云** |  | 
-| 65.| **我爱云授权** | 我爱云CDN | 
+| 65.| **网宿授权** |  | 
-| 66.| **新网授权（代理方式）** |  | 
+| 66.| **西部数码授权** |  | 
-| 67.| **新网授权** |  | 
+| 67.| **我爱云授权** | 我爱云CDN | 
-| 68.| **新网互联授权** | 仅支持代理账号，ip需要加入白名单 | 
+| 68.| **新网授权（代理方式）** |  | 
-| 69.| **Zenlayer授权** | Zenlayer授权 | 
+| 69.| **新网授权** |  | 
-| 70.| **GoEdge授权** |  | 
+| 70.| **新网互联授权** | 仅支持代理账号，ip需要加入白名单 | 
-| 71.| **雨云授权** | https://app.rainyun.com/ | 
+| 71.| **Zenlayer授权** | Zenlayer授权 | 
+| 72.| **GoEdge授权** |  | 
+| 73.| **雨云授权** | https://app.rainyun.com/ | 
 
 <style module>
 table th:first-of-type {

docs/guide/plugins/dns-provider.md

@@ -20,8 +20,10 @@
 | 16.| **腾讯云EO DNS** | 腾讯云EO DNS解析提供者 | 
 | 17.| **西部数码** | west dns provider | 
 | 18.| **Dns提供商Demo** | dns provider示例 | 
-| 19.| **51dns** | 51DNS | 
+| 19.| **彩虹DNS** | 彩虹DNS管理系统 | 
-| 20.| **新网互联** | 新网互联 | 
+| 20.| **Spaceship** | Spaceship 域名解析 | 
+| 21.| **51dns** | 51DNS | 
+| 22.| **新网互联** | 新网互联 | 
 
 <style module>
 table th:first-of-type {

docs/guide/use/mode/enterprise.md

@@ -0,0 +1,40 @@
+# 企业模式（项目管理）
+
+## 模式简介
+Certd支持两种管理模式，`SaaS模式（默认）`和`企业模式`。
+
+
+![](../../../../packages/ui/certd-client/public/static/images/ent/admin_mode.png)
+
+## SaaS模式
+* 默认的模式，每个用户管理自己的流水线和授权资源，每个用户独立使用。    
+* Certd系统作为SaaS提供证书自动申请部署服务，您的客户注册即可使用，无需自己部署
+
+
+## 企业模式
+
+* 通过项目合作管理流水线证书和授权资源，所有用户视为企业内部员工。
+
+* 当你想在企业内部使用，企业内部有多个项目，各个项目成员共同管理项目资源和证书时可以启用此模式
+
+* 需要在"系统设置->管理模式"中开启`企业模式`
+
+![](./images/admin_mode.jpg)
+
+
+::: warning
+* 建议在开始使用时固定一个合适的模式，之后就不要随意切换了。
+* 商业版不能使用企业模式，因为商业版提供功能价值在于SaaS服务，与企业模式冲突   
+:::
+
+###  数据迁移
+模式之间数据不互通，您可以通过个人数据迁移功能将数据转到项目之下
+
+####  个人数据迁移到项目
+注意：此操作不可逆，请谨慎操作
+![](./images/transfer.jpg)
+
+####  流水线数据转到其他项目
+项目之间流水线数据可以转移，依赖的授权数据会同步复制一份   
+
+![](./images/move.png)

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.39.8"
+  "version": "1.39.9"
 }

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/publishlab/node-acme-client/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.39.8](https://github.com/publishlab/node-acme-client/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 **Note:** Version bump only for package @certd/acme-client

packages/core/acme-client/package.json

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

packages/core/basic/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+### Performance Improvements
+
+* **spaceship:** 新增Spaceship DNS插件和授权模块 ([21aec77](https://github.com/certd/certd/commit/21aec77e5c3307b5973d4185baba33edcb28926f))
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

@@ -1 +1 @@
-23:54
+01:21

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.39.8",
+  "version": "1.39.9",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -47,5 +47,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "adc3e6118b941818926705c3536babfca117c247"
+  "gitHead": "1c634a702af9298d25542acc270d68f71d9b1049"
 }

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

@@ -271,7 +271,7 @@ export function createAxiosService({ logger }: { logger: ILogger }) {
       }
 
       const originalRequest = error.config || {};
-      logger.info(`config`, originalRequest);
+      // logger.info(`config`, originalRequest);
       const retry = originalRequest.retry || {};
       if (retry.status && retry.status.includes(status)) {
         if (retry.max > 0 && retry.count < retry.max) {

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+### Performance Improvements
+
+* 支持域名到期时间监控通知 ([c6628e7](https://github.com/certd/certd/commit/c6628e7311d6c43c2a784581fb25ec37b29c168d))
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 ### Performance Improvements

packages/core/pipeline/package.json

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

packages/core/pipeline/src/notification/api.ts

@@ -7,6 +7,7 @@ import { IEmailService } from "../service/index.js";
 
 export type NotificationBody = {
   userId?: number;
+  projectId?: number;
   title: string;
   content: string;
   pipeline?: Pipeline;
@@ -20,6 +21,7 @@ export type NotificationBody = {
   pipelineResult?: string;
   pipelineTitle?: string;
   errors?: string;
+  [key: string]: any; // 其他templateData
 };
 
 export type NotificationRequestHandleReqInput<T = any> = {

packages/libs/lib-huawei/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 **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.39.8",
+  "version": "1.39.9",
   "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": "adc3e6118b941818926705c3536babfca117c247"
+  "gitHead": "1c634a702af9298d25542acc270d68f71d9b1049"
 }

packages/libs/lib-iframe/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 **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.39.8",
+  "version": "1.39.9",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "adc3e6118b941818926705c3536babfca117c247"
+  "gitHead": "1c634a702af9298d25542acc270d68f71d9b1049"
 }

packages/libs/lib-jdcloud/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+**Note:** Version bump only for package @certd/jdcloud
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 **Note:** Version bump only for package @certd/jdcloud

packages/libs/lib-jdcloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/jdcloud",
-  "version": "1.39.8",
+  "version": "1.39.9",
   "description": "jdcloud openApi sdk",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
@@ -56,5 +56,5 @@
       "fetch"
     ]
   },
-  "gitHead": "adc3e6118b941818926705c3536babfca117c247"
+  "gitHead": "1c634a702af9298d25542acc270d68f71d9b1049"
 }

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 ### Performance Improvements

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.39.8",
+  "version": "1.39.9",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -18,7 +18,7 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/basic": "^1.39.8",
+    "@certd/basic": "^1.39.9",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -33,5 +33,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "adc3e6118b941818926705c3536babfca117c247"
+  "gitHead": "1c634a702af9298d25542acc270d68f71d9b1049"
 }

packages/libs/lib-server/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+**Note:** Version bump only for package @certd/lib-server
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 **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.39.8",
+  "version": "1.39.9",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -28,11 +28,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.39.8",
+    "@certd/acme-client": "^1.39.9",
-    "@certd/basic": "^1.39.8",
+    "@certd/basic": "^1.39.9",
-    "@certd/pipeline": "^1.39.8",
+    "@certd/pipeline": "^1.39.9",
-    "@certd/plugin-lib": "^1.39.8",
+    "@certd/plugin-lib": "^1.39.9",
-    "@certd/plus-core": "^1.39.8",
+    "@certd/plus-core": "^1.39.9",
     "@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": "adc3e6118b941818926705c3536babfca117c247"
+  "gitHead": "1c634a702af9298d25542acc270d68f71d9b1049"
 }

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

@@ -76,10 +76,12 @@ export abstract class BaseService<T> {
    * @param where
    */
   async delete(ids: string | any[], where?: any) {
-    const idArr = this.resolveIdArr(ids);
+    let idArr = this.resolveIdArr(ids);
+    idArr = this.filterIds(idArr);
     if (idArr.length === 0) {
       return;
     }
+  
     await this.getRepository().delete({
       id: In(idArr),
       ...where,
@@ -94,7 +96,9 @@ export abstract class BaseService<T> {
     }
     if (typeof ids === 'string') {
       return ids.split(',');
-    } else {
+    } else if(!Array.isArray(ids)){
+      return [ids];
+    }else {
       return ids;
     }
   }
@@ -217,6 +221,7 @@ export abstract class BaseService<T> {
     if (!Array.isArray(ids)) {
       ids = [ids];
     }
+    ids = this.filterIds(ids);
     const res = await this.getRepository().find({
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
@@ -234,7 +239,16 @@ export abstract class BaseService<T> {
     throw new PermissionException('权限不足');
   }
 
+ filterIds(ids: any[]) {
+    if (!ids) {
+      throw new ValidateException('ids不能为空');
+    }
+    return ids.filter((item) => {
+      return item!=null && item != ""
+    });
+  }
   async batchDelete(ids: number[], userId: number,projectId?:number) {
+    ids = this.filterIds(ids);
     if(userId!=null){
       const list = await this.getRepository().find({
         where: {

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

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 **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.39.8",
+  "version": "1.39.9",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "adc3e6118b941818926705c3536babfca117c247"
+  "gitHead": "1c634a702af9298d25542acc270d68f71d9b1049"
 }

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 **Note:** Version bump only for package @certd/plugin-cert

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.39.8",
+  "version": "1.39.9",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,10 +17,10 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.39.8",
+    "@certd/acme-client": "^1.39.9",
-    "@certd/basic": "^1.39.8",
+    "@certd/basic": "^1.39.9",
-    "@certd/pipeline": "^1.39.8",
+    "@certd/pipeline": "^1.39.9",
-    "@certd/plugin-lib": "^1.39.8",
+    "@certd/plugin-lib": "^1.39.9",
     "psl": "^1.9.0",
     "punycode.js": "^2.3.1"
   },
@@ -38,5 +38,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "adc3e6118b941818926705c3536babfca117c247"
+  "gitHead": "1c634a702af9298d25542acc270d68f71d9b1049"
 }

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 ### Performance Improvements

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.39.8",
+  "version": "1.39.9",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -22,10 +22,10 @@
     "@alicloud/pop-core": "^1.7.10",
     "@alicloud/tea-util": "^1.4.11",
     "@aws-sdk/client-s3": "^3.964.0",
-    "@certd/acme-client": "^1.39.8",
+    "@certd/acme-client": "^1.39.9",
-    "@certd/basic": "^1.39.8",
+    "@certd/basic": "^1.39.9",
-    "@certd/pipeline": "^1.39.8",
+    "@certd/pipeline": "^1.39.9",
-    "@certd/plus-core": "^1.39.8",
+    "@certd/plus-core": "^1.39.9",
     "@kubernetes/client-node": "0.21.0",
     "ali-oss": "^6.22.0",
     "basic-ftp": "^5.0.5",
@@ -57,5 +57,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "adc3e6118b941818926705c3536babfca117c247"
+  "gitHead": "1c634a702af9298d25542acc270d68f71d9b1049"
 }

packages/plugins/plugin-lib/src/cert/cert-reader.ts

@@ -7,6 +7,9 @@ import { ILogger } from "@certd/basic";
 import dayjs from "dayjs";
 import { uniq } from "lodash-es";
 
+export interface ICertInfoGetter {
+  getByPipelineId: (pipelineId: number) => Promise<CertInfo>;
+}
 export type CertInfo = {
   crt: string; //fullchain证书
   key: string; //私钥

packages/plugins/plugin-lib/src/cert/consts.ts

@@ -1,2 +1,2 @@
 export const CertApplyPluginNames = [":cert:"];
-export const EVENT_CERT_APPLY_SUCCESS = "CertApply.success";
+export const EVENT_CERT_APPLY_SUCCESS = "CertApply.success";

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

@@ -1,4 +1,4 @@
 export * from "./convert.js";
 export * from "./cert-reader.js";
 export * from "./consts.js";
-export * from "./dns-provider/index.js";
+export * from "./dns-provider/index.js";

packages/plugins/plugin-lib/src/common/util.ts

@@ -44,6 +44,10 @@ export function createRemoteSelectInputDefine(opts?: {
   component?: any;
   value?: any;
   pageSize?: number;
+  uploadCert?: {
+    title?: string;
+    columns?: Record<string, any>;
+  };
 }) {
   const title = opts?.title || "请选择";
   const certDomainsInputKey = opts?.certDomainsInputKey || "certDomains";
@@ -74,6 +78,7 @@ export function createRemoteSelectInputDefine(opts?: {
       multi,
       pageSize: opts?.pageSize,
       watches: [certDomainsInputKey, accessIdInputKey, ...watches],
+      uploadCert: opts?.uploadCert,
       ...opts.component,
     },
     value: opts.value,

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+### Bug Fixes
+
+* 修复某些情况下报无法修改通知的问题 ([d1a6592](https://github.com/certd/certd/commit/d1a65922d7e152d6edcf6c53b70079f16b54a0d3))
+
+### Performance Improvements
+
+* 支持域名到期时间监控通知 ([c6628e7](https://github.com/certd/certd/commit/c6628e7311d6c43c2a784581fb25ec37b29c168d))
+* **monitor:** 支持查看监控执行记录 ([b5cc794](https://github.com/certd/certd/commit/b5cc794061c11b7200b669473c25c4bbfc944b61))
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 ### Bug Fixes

packages/ui/certd-client/package.json

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

packages/ui/certd-client/src/components/plugins/common/remote-select.vue

@@ -25,8 +25,9 @@
           </div>
         </template>
       </a-select>
-      <div class="ml-5">
+      <div class="ml-5 flex flex-row no-wrap">
         <fs-button :loading="loading" title="刷新选项" icon="ion:refresh-outline" @click="refreshOptions"></fs-button>
+        <UploadCert v-if="uploadCert" class="ml-5" v-bind="uploadCert" @submit="refreshOptions"></UploadCert>
       </div>
     </div>
     <div class="helper" :class="{ error: hasError }">
@@ -39,6 +40,8 @@ import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
 import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
 import { PluginDefine } from "@certd/pipeline";
 import { getInputFromForm } from "./utils";
+import UploadCert from "./upload-cert.vue";
+import { UploadCertProps } from "./types";
 
 defineOptions({
   name: "RemoteSelect",
@@ -65,9 +68,10 @@ const props = defineProps<
     pager?: boolean;
     multi?: boolean;
     pageSize?: number;
+    uploadCert?: UploadCertProps;
   } & ComponentPropsType
 >();
-
+debugger;
 const emit = defineEmits<{
   "update:value": any;
 }>();

packages/ui/certd-client/src/components/plugins/common/types.ts

@@ -0,0 +1,5 @@
+export interface UploadCertProps {
+  title?: string;
+  columns?: Record<string, any>;
+  button?: any;
+}

packages/ui/certd-client/src/components/plugins/common/upload-cert.vue

@@ -0,0 +1,101 @@
+<template>
+  <div class="upload-cert">
+    <fs-button v-model:loading="loading" type="primary" text="上传" v-bind="props.button" @click="openUploadCertDialog"></fs-button>
+  </div>
+</template>
+<script lang="ts" setup>
+import { message } from "ant-design-vue";
+import { useFormDialog } from "../../../use/use-dialog";
+import { computed, inject, ref } from "vue";
+import { doRequest } from "../lib";
+import { getInputFromForm } from "./utils";
+import { UploadCertProps } from "./types";
+import { merge } from "lodash-es";
+
+const props = defineProps<UploadCertProps>();
+const loading = ref(false);
+
+const emit = defineEmits(["submit"]);
+const { openFormDialog } = useFormDialog();
+const pipeline = inject("pipeline", null);
+
+const getCurrentPluginDefine: any = inject("getCurrentPluginDefine", () => {
+  return {};
+});
+const getScope: any = inject("get:scope", () => {
+  return {};
+});
+const getPluginType: any = inject("get:plugin:type", () => {
+  return "plugin";
+});
+const title = computed(() => props.title || "上传证书");
+function openUploadCertDialog() {
+  const columns = merge(
+    {
+      certName: {
+        title: "证书名称",
+        form: {
+          component: {
+            name: "a-input",
+            vModel: "value",
+          },
+          helper: "上传后证书显示名称",
+        },
+      },
+    },
+    props.columns
+  );
+  openFormDialog({
+    title: title.value,
+    columns: {
+      certName: {
+        title: "证书名称",
+        form: {
+          component: {
+            name: "a-input",
+            vModel: "value",
+          },
+        },
+      },
+      ...props.columns,
+    },
+    onSubmit: async (form: any) => {
+      const pluginType = getPluginType();
+      const scope = getScope();
+      const { input, record } = getInputFromForm(scope.form, pluginType);
+      loading.value = true;
+      try {
+        const res = await doRequest(
+          {
+            type: pluginType,
+            typeName: scope.form.type,
+            action: "onUploadCert",
+            input,
+            record,
+            data: {
+              pipelineId: pipeline?.value?.id,
+              ...form,
+            },
+          },
+          {
+            // onError(err: any) {
+            //   message.error(err.message);
+            // },
+            showErrorNotify: true,
+          }
+        );
+        message.success("上传成功");
+        emit("submit");
+      } finally {
+        loading.value = false;
+      }
+    },
+  });
+}
+</script>
+<style lang="less">
+.upload-cert {
+  display: flex;
+  align-items: center;
+}
+</style>

packages/ui/certd-client/src/components/tutorial/tutorial-steps.vue

@@ -4,7 +4,7 @@
 
     <div class="step-item overflow-hidden">
       <div class="text">
-        <h3 class="title">{{ number }} {{ currentStepItem.title }}</h3>
+        <h3 class="title font-bold">{{ number }} {{ currentStepItem.title }}</h3>
         <div class="description mt-5">
           <div v-for="(desc, index) of currentStepItem.descriptions" :key="index">{{ desc }}</div>
         </div>
@@ -247,6 +247,7 @@ function previewMask() {
 
 <style lang="less">
 .tutorial-steps {
+  display: flex;
   .step-item {
     display: flex !important;
     flex-direction: row;

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

@@ -251,7 +251,7 @@ function openUpgrade() {
     class: "vip-modal",
     maskClosable: true,
     okText: t("vip.close"),
-    width: 1100,
+    width: 1180,
     content: () => {
       return <VipModalContent placeholder={placeholder} isPlus={isPlus} productInfo={productInfo} goBuyPlusPage={goBuyPlusPage} goBuyCommPage={goBuyCommPage} openStarModal={openStarModal} modalRef={modalRef} />;
     },

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

@@ -65,6 +65,11 @@
               </div>
               <div class="get-show">
                 <template v-if="item.type === 'plus'">
+                  <span v-if="todayOrderCount.showVipTotal" class="mr-5">
+                    已有
+                    <span class="color-red"> {{ todayOrderCount.vipTotal }}</span>
+                    位伙伴支持
+                  </span>
                   <a-tooltip :title="t('vip.afdian_support_vip')">
                     <a-button size="small" type="primary" @click="goBuyPlusPage">
                       {{ t("vip.get_after_support") }}
@@ -204,13 +209,13 @@ const vipTypeDefine: any = {
     desc: t("vip.community_free_version"),
     type: "free",
     icon: "lucide:package-open",
-    privilege: [t("vip.unlimited_certificate_application"), t("vip.unlimited_domain_count"), t("vip.unlimited_certificate_pipelines"), t("vip.common_deployment_plugins"), t("vip.email_webhook_notifications")],
+    privilege: t("vip.free_privilege").split("\n"),
   },
   plus: {
     title: t("vip.professional_edition"),
     desc: t("vip.open_source_support"),
     type: "plus",
-    privilege: [t("vip.vip_group_priority"), t("vip.unlimited_site_certificate_monitoring"), t("vip.more_notification_methods"), t("vip.plugins_fully_open")],
+    privilege: t("vip.plus_privilege").split("\n"),
     trial: {
       title: t("vip.click_to_get_7_day_trial"),
       click: () => {
@@ -227,7 +232,7 @@ const vipTypeDefine: any = {
     desc: t("vip.commercial_license"),
     type: "comm",
     icon: "vaadin:handshake",
-    privilege: [t("vip.all_pro_privileges"), t("vip.allow_commercial_use_modify_logo_title"), t("vip.data_statistics"), t("vip.plugin_management"), t("vip.unlimited_multi_users"), t("vip.support_user_payment")],
+    privilege: t("vip.comm_privilege").split("\n"),
     priceText: props.productInfo.comm.priceText || `¥${props.productInfo.comm.price}/${t("vip.years")}`,
     discountText: props.productInfo.comm.discountText || `¥${props.productInfo.comm.price3}/3${t("vip.years")}`,
     tooltip: props.productInfo.comm.tooltip,
@@ -260,12 +265,16 @@ const todayOrderCount = computed(() => {
   const lastStage = countInfo?.stages?.[countInfo?.stages?.length - 1] || {};
   lastStage.orderCount = orderCount;
 
+  const vipTotal = countInfo?.vipTotal || 0;
+  const showVipTotal = countInfo?.showVipTotal || false;
+  const userTotal = countInfo?.userTotal || 0;
   const stages: any = [];
   stages.push({
     title: countInfo.title,
     vipTotal: countInfo?.vipTotal || 0,
     orderCount: orderCount,
     bg: lastStage.bg,
+    showVipTotal: showVipTotal,
   });
   if (lastStage.orderCount > 0) {
     stages.push(lastStage);
@@ -273,6 +282,9 @@ const todayOrderCount = computed(() => {
   return {
     enabled: enabled,
     stages: stages,
+    showVipTotal: showVipTotal,
+    vipTotal: vipTotal,
+    userTotal: userTotal,
   };
 });
 

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

@@ -221,6 +221,7 @@ export default {
     projectJoin: "Join Project",
     currentProject: "Current Project",
     projectMemberManager: "Project Member",
+    domainMonitorSetting: "Domain Monitor Settings",
   },
   certificateRepo: {
     title: "Certificate Repository",

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

@@ -64,10 +64,41 @@ export default {
     dnsServerHelper: "Use a custom domain name resolution server, such as: 1.1.1.1 , support multiple",
     certValidDays: "Certificate Valid Days",
     certValidDaysHelper: "Number of days before expiration to send a notification",
+
+    domain: {
+      monitorSettings: "Domain Monitor Settings",
+      enabled: "Enable Domain Monitor",
+      enabledHelper: "Enable to monitor all domain registration expiration time",
+      notificationChannel: "Notification Channel",
+      setNotificationChannel: "Set the notification channel",
+      willExpireDays: "Will Expire Days",
+      willExpireDaysHelper: "Number of days before expiration to send a notification",
+      monitorCronSetting: "Monitoring Schedule",
+      cronTrigger: "Scheduled trigger for monitoring",
+    },
   },
   cert: {
     expired: "Expired",
     expiring: "Expiring",
     noExpired: "Not Expired",
   },
+  history: {
+    title: "Monitoring Execution Records",
+    description: "Monitoring execution records",
+    resultTitle: "Status",
+    contentTitle: "Content",
+    titleTitle: "Title",
+    jobTypeTitle: "Job Type",
+    startAtTitle: "Start Time",
+    endAtTitle: "End Time",
+    jobResultTitle: "Result",
+    jobResult: {
+      done: "Done",
+      start: "Start",
+    },
+    jobType: {
+      domainExpirationCheck: "Domain Expiration Check",
+      siteCertMonitor: "Site Certificate Monitor",
+    },
+  },
 };

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

@@ -53,6 +53,7 @@ export default {
   unlimited_certificate_pipelines: "Unlimited certificate pipelines",
   common_deployment_plugins: "Common host, cloud platform, CDN, Baota, 1Panel deployment plugins",
   email_webhook_notifications: "Email, webhook notification methods",
+  free_privilege: "Unlimited certificate applications\nUnlimited domain count\nUnlimited certificate pipelines\nCommon host, cloud platform, CDN, Baota, 1Panel deployment plugins\nEmail, webhook notification methods",
 
   professional_edition: "Professional Edition",
   open_source_support: "Open source requires your sponsorship support",
@@ -60,10 +61,11 @@ export default {
   unlimited_site_certificate_monitoring: "Unlimited site certificate monitoring",
   more_notification_methods: "More notification methods",
   plugins_fully_open: "All plugins open, including Synology and more",
+  plus_privilege: "Access to VIP group, your requests will have priority\nUnlimited site certificate monitoring\nMore notification methods\nAll plugins open, including Synology and more",
   click_to_get_7_day_trial: "Click to get 7-day trial",
   years: "years",
   afdian_support_vip: "Obtain the permanent professional version coupon",
-  get_after_support: "Get after sponsoring",
+  get_after_support: "sponsoring",
 
   business_edition: "Business Edition",
   commercial_license: "Commercial license, allowed for external operation",
@@ -73,6 +75,7 @@ export default {
   plugin_management: "Plugin management",
   unlimited_multi_users: "Unlimited multi-users",
   support_user_payment: "Supports user payments",
+  comm_privilege: "All professional edition privileges\nAllows commercial use, can modify logo and title\nData statistics\nPlugin management\nUnlimited multi-users\nSupports user payments",
   contact_author_for_trial: "Buy It Now",
   activate: "Activate",
   get_pro_code_after_support: "Go to sponsoring",

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

@@ -226,6 +226,8 @@ export default {
     projectJoin: "加入项目",
     currentProject: "当前项目",
     projectMemberManager: "项目成员管理",
+    domainMonitorSetting: "域名监控设置",
+    jobHistory: "监控执行记录",
   },
   certificateRepo: {
     title: "证书仓库",

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

@@ -33,7 +33,7 @@ export default {
       activateCertDesc2: "让证书生效",
       taskSuccessTitle: "部署任务添加成功",
       taskSuccessDesc: "现在可以运行",
-      pluginsTitle: "本系统提供茫茫多的部署插件",
+      pluginsTitle: "本系统提供海量的部署插件",
       pluginsDesc: "您可以根据自身需求将证书部署到各种应用和平台",
     },
   },

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

@@ -68,10 +68,40 @@ export default {
     dnsServerHelper: "使用自定义的域名解析服务器，如：1.1.1.1 , 支持多个",
     certValidDays: "证书到期前天数",
     certValidDaysHelper: "证书到期前多少天发送通知",
+    domain: {
+      monitorSettings: "域名监控设置",
+      enabled: "启用域名监控",
+      enabledHelper: "启用后，监控“域名管理”中域名的过期时间，到期前通知提醒",
+      notificationChannel: "通知渠道",
+      setNotificationChannel: "设置通知渠道",
+      willExpireDays: "到期前天数",
+      willExpireDaysHelper: "域名有效期到期前多少天发送通知",
+      monitorCronSetting: "监控定时设置",
+      cronTrigger: "定时触发监控",
+    },
   },
   cert: {
     expired: "已过期",
     expiring: "即将过期",
     noExpired: "未过期",
   },
+  history: {
+    title: "监控执行记录",
+    description: "站点证书、域名等监控任务的执行记录",
+    resultTitle: "状态",
+    contentTitle: "内容",
+    titleTitle: "标题",
+    jobTypeTitle: "任务类型",
+    startAtTitle: "开始时间",
+    endAtTitle: "结束时间",
+    jobResultTitle: "任务结果",
+    jobResult: {
+      done: "完成",
+      start: "开始",
+    },
+    jobType: {
+      domainExpirationCheck: "域名到期检查",
+      siteCertMonitor: "站点证书监控",
+    },
+  },
 };

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

@@ -53,6 +53,7 @@ export default {
   unlimited_certificate_pipelines: "证书流水线数量无限制",
   common_deployment_plugins: "常用的主机、云平台、cdn、宝塔、1Panel等部署插件",
   email_webhook_notifications: "邮件、webhook通知方式",
+  free_privilege: "证书申请无限制\n域名数量无限制\n证书流水线数量无限制\n常用的主机、云平台、cdn、宝塔、1Panel等部署插件\n邮件、webhook通知方式",
 
   professional_edition: "专业版",
   open_source_support: "开源需要您的赞助支持，个人和企业内部使用",
@@ -60,6 +61,7 @@ export default {
   unlimited_site_certificate_monitoring: "站点证书监控无限制",
   more_notification_methods: "更多通知方式",
   plugins_fully_open: "插件全开放，群晖等更多插件",
+  plus_privilege: "可加VIP群，您的需求将优先实现\n站点证书监控无限制\n更多通知方式\n插件全开放，群晖等更多插件\n企业模式，项目管理\n域名到期监控\n第三方登录，PassKey登录",
   click_to_get_7_day_trial: "点击获取7天试用",
   years: "年",
   afdian_support_vip: "新用户开通永久专业版立享50优惠券",
@@ -73,6 +75,7 @@ export default {
   plugin_management: "插件管理",
   unlimited_multi_users: "多用户无限制",
   support_user_payment: "支持用户支付（购买套餐，按流水线条数、域名数量、部署次数计费）",
+  comm_privilege: "拥有专业版所有特权\n允许商用，可修改logo、标题\n数据统计\n插件管理\n多用户无限制\n支持用户支付（购买套餐，按流水线条数、域名数量、部署次数计费）",
   activate: "激活",
   get_pro_code_after_support: "前往获取",
   business_contact_author: "",

packages/ui/certd-client/src/router/source/modules/certd.ts

@@ -241,6 +241,28 @@ export const certdResources = [
               isMenu: true,
             },
           },
+          {
+            title: "certd.sysResources.domainMonitorSetting",
+            name: "DomainMonitorSetting",
+            path: "/certd/cert/domain/setting",
+            component: "/certd/cert/domain/setting/index.vue",
+            meta: {
+              icon: "ion:stopwatch-outline",
+              auth: true,
+              isMenu: true,
+            },
+          },
+          {
+            title: "certd.sysResources.jobHistory",
+            name: "JobHistory",
+            path: "/certd/monitor/history",
+            component: "/certd/monitor/history/index.vue",
+            meta: {
+              icon: "ion:barcode-outline",
+              auth: true,
+              isMenu: true,
+            },
+          },
           {
             title: "certd.userSecurity",
             name: "UserSecurity",

packages/ui/certd-client/src/views/certd/access/access-selector/index.vue

@@ -21,7 +21,8 @@ import { defineComponent, reactive, ref, watch, inject } from "vue";
 import CertAccessModal from "./access/index.vue";
 import { createAccessApi } from "../api";
 import { message } from "ant-design-vue";
-
+import { useUserStore } from "/@/store/user";
+import { useProjectStore } from "/@/store/project";
 export default defineComponent({
   name: "AccessSelector",
   components: { CertAccessModal },
@@ -71,11 +72,27 @@ export default defineComponent({
       emitValue(null);
     }
 
+    const userStore = useUserStore();
+    const projectStore = useProjectStore();
+
     async function emitValue(value) {
-      if (pipeline && pipeline?.value && target?.value && pipeline.value.userId !== target.value.userId) {
+      const userId = userStore.userInfo.id;
-        message.error("对不起，您不能修改他人流水线的授权");
+      const isEnterprice = projectStore.isEnterprise;
-        return;
+      if (pipeline?.value) {
+        if (isEnterprice) {
+          const projectId = projectStore.currentProjectId;
+          if (pipeline?.value?.projectId !== projectId) {
+            message.error(`对不起，您不能修改其他项目流水线的授权`);
+            return;
+          }
+        } else {
+          if (pipeline?.value && pipeline.value.userId !== userId) {
+            message.error(`对不起，您不能修改他人流水线的授权`);
+            return;
+          }
+        }
       }
+
       if (value == null) {
         selectedId.value = "";
         target.value = null;

packages/ui/certd-client/src/views/certd/addon/addon-selector/index.vue

@@ -48,6 +48,7 @@ import createCrudOptions from "../crud";
 import { addonProvide } from "../common";
 import { useUserStore } from "/@/store/user";
 import { useI18n } from "/src/locales";
+import { useProjectStore } from "/@/store/project";
 
 const { t } = useI18n();
 
@@ -127,13 +128,24 @@ function clear() {
 }
 
 const userStore = useUserStore();
-
+const projectStore = useProjectStore();
 async function emitValue(value: any) {
   // target.value = optionsDictRef.dataMap[value];
-  const userId = userStore.userInfo.id;
+  if (pipeline.value) {
-  if (pipeline?.value && pipeline.value.userId !== userId) {
+    const userId = userStore.userInfo.id;
-    message.error(`对不起，您不能修改他人流水线的${props.addonType}设置`);
+    const isEnterprice = projectStore.isEnterprise;
-    return;
+    if (isEnterprice) {
+      const projectId = projectStore.currentProjectId;
+      if (pipeline?.value?.projectId !== projectId) {
+        message.error(`对不起，您不能修改其他项目流水线的${props.addonType}设置`);
+        return;
+      }
+    } else {
+      if (pipeline?.value && pipeline.value.userId !== userId) {
+        message.error(`对不起，您不能修改他人流水线的${props.addonType}设置`);
+        return;
+      }
+    }
   }
   emit("change", value);
   emit("update:modelValue", value);

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

@@ -128,6 +128,18 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               }, 2000);
             },
           },
+          monitorSettingSave: {
+            show: hasActionPermission("write"),
+            title: "域名过期监控设置",
+            type: "primary",
+            icon: "ion:save-outline",
+            text: "域名过期监控设置",
+            click: async () => {
+              router.push({
+                path: "/certd/cert/domain/setting",
+              });
+            },
+          },
         },
       },
       columns: {

packages/ui/certd-client/src/views/certd/cert/domain/setting/api.ts

@@ -0,0 +1,27 @@
+// @ts-ignore
+import { request } from "/src/api/service";
+const apiPrefix = "/cert/domain/setting";
+export type UserDomainMonitorSetting = {
+  enabled?: boolean;
+  notificationId?: number;
+  cron?: string;
+  willExpireDays?: number;
+};
+
+export async function DomainMonitorSettingsGet() {
+  const res = await request({
+    url: apiPrefix + "/get",
+    method: "post",
+  });
+  if (!res) {
+    return {};
+  }
+  return res as UserDomainMonitorSetting;
+}
+export async function DomainMonitorSettingsSave(data: UserDomainMonitorSetting) {
+  await request({
+    url: apiPrefix + "/save",
+    method: "post",
+    data: data,
+  });
+}

packages/ui/certd-client/src/views/certd/cert/domain/setting/index.vue

@@ -0,0 +1,100 @@
+<template>
+  <fs-page class="page-user-settings page-domain-monitor-setting">
+    <template #header>
+      <div class="title">{{ t("monitor.setting.domain.monitorSettings") }}</div>
+    </template>
+    <div class="user-settings-form settings-form">
+      <a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off">
+        <a-form-item :label="t('monitor.setting.domain.enabled')" :name="['enabled']">
+          <div class="flex flex-baseline">
+            <a-switch v-model:checked="formState.enabled" :disabled="!settingsStore.isPlus" />
+            <vip-button class="ml-5" mode="button"></vip-button>
+          </div>
+          <div class="helper">{{ t("monitor.setting.domain.enabledHelper") }}</div>
+        </a-form-item>
+        <a-form-item v-if="formState.enabled" :label="t('monitor.setting.domain.notificationChannel')" :name="['notificationId']">
+          <div class="flex">
+            <NotificationSelector v-model="formState.notificationId" />
+          </div>
+          <div class="helper">{{ t("monitor.setting.domain.setNotificationChannel") }}</div>
+        </a-form-item>
+        <a-form-item v-if="formState.enabled" :label="t('monitor.setting.domain.willExpireDays')" :name="['willExpireDays']">
+          <div class="flex">
+            <a-input-number v-model:value="formState.willExpireDays" />
+          </div>
+          <div class="helper">{{ t("monitor.setting.domain.willExpireDaysHelper") }}</div>
+        </a-form-item>
+        <a-form-item v-if="formState.enabled" :label="t('monitor.setting.domain.monitorCronSetting')" :name="['cron']">
+          <div class="flex flex-baseline">
+            <cron-editor v-model="formState.cron" :disabled="!settingsStore.isPlus" :allow-every-min="userStore.isAdmin" />
+            <vip-button class="ml-5" mode="button"></vip-button>
+          </div>
+          <div class="helper">{{ t("monitor.setting.domain.cronTrigger") }}</div>
+        </a-form-item>
+        <a-form-item label=" " :colon="false" :wrapper-col="{ span: 16 }">
+          <loading-button type="primary" html-type="button" :click="doSave" :disabled="!hasActionPermission('write')">{{ t("certd.save") }}</loading-button>
+        </a-form-item>
+      </a-form>
+    </div>
+  </fs-page>
+</template>
+
+<script setup lang="tsx">
+import { notification } from "ant-design-vue";
+import { merge } from "lodash-es";
+import { reactive } from "vue";
+import * as api from "./api";
+import { UserDomainMonitorSetting } from "./api";
+import { useUserStore } from "/@/store/user";
+import { utils } from "/@/utils";
+import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
+import { useI18n } from "/src/locales";
+import { useSettingStore } from "/src/store/settings";
+import { useCrudPermission } from "/@/plugin/permission";
+
+const { t } = useI18n();
+
+const settingsStore = useSettingStore();
+const userStore = useUserStore();
+defineOptions({
+  name: "DomainMonitorSetting",
+});
+
+const randomHour = Math.floor(Math.random() * 9);
+const randomMin = Math.floor(Math.random() * 59);
+const randomCron = `0 ${randomMin} ${randomHour} * * *`;
+
+const formState = reactive<Partial<UserDomainMonitorSetting>>({
+  enabled: false,
+  notificationId: 0,
+  cron: randomCron,
+  willExpireDays: 30,
+});
+
+async function loadUserSettings() {
+  const data: any = await api.DomainMonitorSettingsGet();
+  merge(formState, data);
+}
+
+const { hasActionPermission } = useCrudPermission({ permission: { isProjectPermission: true } });
+
+loadUserSettings();
+const doSave = async (form: any) => {
+  await utils.sleep(300);
+  await api.DomainMonitorSettingsSave({
+    ...formState,
+  });
+  notification.success({
+    message: t("certd.saveSuccess"),
+  });
+};
+</script>
+
+<style lang="less">
+.page-domain-monitor-setting {
+  .settings-form {
+    width: 700px;
+    margin: 20px;
+  }
+}
+</style>

packages/ui/certd-client/src/views/certd/monitor/history/api.ts

@@ -0,0 +1,37 @@
+import { request } from "/src/api/service";
+
+const apiPrefix = "/monitor/job-history";
+
+export const jobHistoryApi = {
+  async GetList(query: any) {
+    return await request({
+      url: apiPrefix + "/page",
+      method: "post",
+      data: query,
+    });
+  },
+
+  async DelObj(id: number) {
+    return await request({
+      url: apiPrefix + "/delete",
+      method: "post",
+      params: { id },
+    });
+  },
+
+  async BatchDelObj(ids: number[]) {
+    return await request({
+      url: apiPrefix + "/batchDelete",
+      method: "post",
+      data: { ids },
+    });
+  },
+
+  async GetObj(id: number) {
+    return await request({
+      url: apiPrefix + "/info",
+      method: "post",
+      params: { id },
+    });
+  },
+};

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

@@ -0,0 +1,257 @@
+// @ts-ignore
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { message, Modal } from "ant-design-vue";
+import { ref } from "vue";
+import { createGroupDictRef } from "../../basic/group/api";
+import { useDicts } from "../../dicts";
+import { jobHistoryApi } from "./api";
+import { useCrudPermission } from "/@/plugin/permission";
+import { useProjectStore } from "/@/store/project";
+import { useI18n } from "/src/locales";
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const { t } = useI18n();
+  const api = jobHistoryApi;
+  const { crudBinding } = crudExpose;
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetList(query);
+  };
+  const editRequest = async (req: EditReq) => {};
+  const delRequest = async (req: DelReq) => {
+    const { row } = req;
+    return await api.DelObj(row.id);
+  };
+
+  const addRequest = async (req: AddReq) => {};
+  const { myProjectDict } = useDicts();
+
+  const historyResultDict = dict({
+    data: [
+      { label: t("monitor.history.jobResult.done"), value: "done", color: "green" },
+      { label: t("monitor.history.jobResult.start"), value: "start", color: "blue" },
+    ],
+  });
+
+  const jobTypeDict = dict({
+    data: [
+      { label: t("monitor.history.jobType.domainExpirationCheck"), value: "domainExpirationCheck", color: "green" },
+      { label: t("monitor.history.jobType.siteCertMonitor"), value: "siteCertMonitor", color: "blue" },
+    ],
+  });
+
+  const selectedRowKeys = ref([]);
+
+  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;
+
+  const GroupTypeSite = "site";
+  const groupDictRef = createGroupDictRef(GroupTypeSite);
+
+  function getDefaultGroupId() {
+    const searchFrom = crudExpose.getSearchValidatedFormData();
+    if (searchFrom.groupId) {
+      return searchFrom.groupId;
+    }
+  }
+
+  const projectStore = useProjectStore();
+  const { hasActionPermission } = useCrudPermission({ permission: context.permission });
+  return {
+    id: "jobHistoryCrud",
+    crudOptions: {
+      request: {
+        pageRequest,
+        addRequest,
+        editRequest,
+        delRequest,
+      },
+      // tabs: {
+      //   name: "groupId",
+      //   show: true,
+      // },
+      toolbar: {
+        buttons: {
+          export: {
+            show: true,
+          },
+        },
+      },
+      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宽度
+          span: null,
+          style: {
+            width: "100px",
+          },
+        },
+        col: {
+          span: 22,
+        },
+        wrapper: {
+          width: 600,
+        },
+      },
+      actionbar: {
+        buttons: {
+          add: {
+            show: false,
+          },
+        },
+      },
+      rowHandle: {
+        fixed: "right",
+        width: 280,
+        buttons: {
+          edit: {
+            show: false,
+          },
+        },
+      },
+      // tabs: {
+      //   name: "disabled",
+      //   show: true,
+      // },
+      search: {
+        initialForm: {
+          ...projectStore.getSearchForm(),
+        },
+      },
+      columns: {
+        id: {
+          title: "ID",
+          key: "id",
+          type: "number",
+          search: {
+            show: false,
+          },
+          column: {
+            width: 80,
+            align: "center",
+          },
+          form: {
+            show: false,
+          },
+        },
+        type: {
+          title: t("monitor.history.jobTypeTitle"),
+          search: {
+            show: true,
+          },
+          type: "dict-select",
+          dict: jobTypeDict,
+          form: {
+            show: false,
+          },
+          column: {
+            width: 120,
+          },
+        },
+        title: {
+          title: t("monitor.history.titleTitle"),
+          search: {
+            show: true,
+          },
+          type: "text",
+          column: {
+            width: 200,
+          },
+        },
+        content: {
+          title: t("monitor.history.contentTitle"),
+          search: {
+            show: true,
+          },
+          type: "text",
+          column: {
+            width: 460,
+            ellipsis: true,
+          },
+        },
+        result: {
+          title: t("monitor.history.resultTitle"),
+          search: {
+            show: false,
+          },
+          type: "dict-select",
+          dict: historyResultDict,
+          form: {
+            show: false,
+          },
+          column: {
+            width: 100,
+            align: "center",
+            sorter: true,
+            cellRender({ value, row }) {
+              return (
+                <a-tooltip title={row.error}>
+                  <fs-values-format v-model={value} dict={historyResultDict}></fs-values-format>
+                </a-tooltip>
+              );
+            },
+          },
+        },
+        startAt: {
+          title: t("monitor.history.startAtTitle"),
+          search: {
+            show: true,
+          },
+          type: "datetime",
+          column: {
+            width: 160,
+          },
+        },
+        endAt: {
+          title: t("monitor.history.endAtTitle"),
+          search: {
+            show: true,
+          },
+          type: "datetime",
+          column: {
+            width: 160,
+          },
+        },
+        projectId: {
+          title: t("certd.fields.projectName"),
+          type: "dict-select",
+          dict: myProjectDict,
+          form: {
+            show: false,
+          },
+        },
+      },
+    },
+  };
+}

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

@@ -0,0 +1,48 @@
+<template>
+  <fs-page>
+    <template #header>
+      <div class="title flex items-center">
+        {{ t("monitor.history.title") }}
+        <div class="sub flex-1">
+          <div>
+            {{ t("monitor.history.description") }}
+          </div>
+        </div>
+      </div>
+    </template>
+    <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 { useFs } from "@fast-crud/fast-crud";
+import { onActivated, onMounted } from "vue";
+import createCrudOptions from "./crud";
+import { useI18n } from "/src/locales";
+const { t } = useI18n();
+defineOptions({
+  name: "JobHistory",
+});
+const context: any = {
+  permission: {
+    isProjectPermission: true,
+  },
+};
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
+
+const handleBatchDelete = context.handleBatchDelete;
+
+// 页面打开后获取列表数据
+onMounted(() => {
+  crudExpose.doRefresh();
+});
+onActivated(() => {
+  crudExpose.doRefresh();
+});
+</script>

packages/ui/certd-client/src/views/certd/notification/notification-selector/index.vue

@@ -42,6 +42,7 @@ import createCrudOptions from "../crud";
 import { notificationProvide } from "/@/views/certd/notification/common";
 import { useUserStore } from "/@/store/user";
 import { useI18n } from "/src/locales";
+import { useProjectStore } from "/@/store/project";
 
 const { t } = useI18n();
 
@@ -127,14 +128,27 @@ function clear() {
 }
 
 const userStore = useUserStore();
-
+const projectStore = useProjectStore();
 async function emitValue(value: any) {
   // target.value = optionsDictRef.dataMap[value];
   const userId = userStore.userInfo.id;
-  if (pipeline?.value && pipeline.value.userId !== userId) {
+  const isEnterprice = projectStore.isEnterprise;
-    message.error("对不起，您不能修改他人流水线的通知");
+
-    return;
+  if (pipeline?.value) {
+    if (isEnterprice) {
+      const projectId = projectStore.currentProjectId;
+      if (pipeline?.value?.projectId !== projectId) {
+        message.error("对不起，您不能修改其他项目流水线的通知");
+        return;
+      }
+    } else {
+      if (pipeline?.value?.userId !== userId) {
+        message.error("对不起，您不能修改他人流水线的通知");
+        return;
+      }
+    }
   }
+
   emit("change", value);
   emit("update:modelValue", value);
 }

packages/ui/certd-client/src/views/certd/project/detail/use.tsx

@@ -118,6 +118,10 @@ export function useTransfer() {
               <div class="text-2xl font-bold"> 迁移到→ </div>
               <div>项目："{projectStore.currentProject?.name}"</div>
             </div>
+            <div class="text-center m-4">
+              <p class="text-red-500">注意；此操作不可逆，一旦迁移，数据将无法还原回个人用户名下。</p>
+            </div>
+
             <div class="flex flex-row items-center justify-center w-full">
               <a-button type="primary" onClick={doTransfer}>
                 确认迁移

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

@@ -9,6 +9,7 @@ import yaml from "js-yaml";
 import { usePluginImport } from "./use-import";
 import { usePluginConfig } from "./use-config";
 import { useSettingStore } from "/src/store/settings/index";
+import { usePluginStore } from "/@/store/plugin";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
@@ -43,6 +44,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const { openConfigDialog } = usePluginConfig();
 
   const settingStore = useSettingStore();
+  const pluginStore = usePluginStore();
   return {
     crudOptions: {
       settings: {
@@ -83,6 +85,15 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
         },
       },
+      table: {
+        rowKey: "name",
+        remove: {
+          afterRemove: async context => {
+            await pluginStore.reload();
+          },
+          confirmMessage: "确定要删除吗？如果该插件已被使用，删除可能会导致流水线执行失败！",
+        },
+      },
       rowHandle: {
         show: true,
         minWidth: 200,
@@ -142,9 +153,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
         },
       },
-      table: {
-        rowKey: "name",
-      },
       tabs: {
         name: "type",
         show: true,

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

@@ -29,7 +29,7 @@ import { SysSettings } from "/@/views/sys/settings/api";
 import * as api from "/@/views/sys/settings/api";
 import { merge } from "lodash-es";
 import { useSettingStore } from "/@/store/settings";
-import { notification } from "ant-design-vue";
+import { Modal, notification } from "ant-design-vue";
 import { useI18n } from "/src/locales";
 import { dict } from "@fast-crud/fast-crud";
 import { useProjectStore } from "/@/store/project";
@@ -80,6 +80,24 @@ const onFinish = async (form: any) => {
     notification.success({
       message: t("certd.saveSuccess"),
     });
+
+    if (formState.public.adminMode === "enterprise") {
+      Modal.confirm({
+        title: "数据迁移",
+        okText: "去迁移",
+        content: () => {
+          return (
+            <div>
+              <div>设置为企业模式之后，之前创建的个人数据不会显示</div>
+              <div>是否前往迁移数据到项目? </div>
+            </div>
+          );
+        },
+        onOk: () => {
+          goCurrentProject();
+        },
+      });
+    }
   } finally {
     saveLoading.value = false;
   }

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.9](https://github.com/certd/certd/compare/v1.39.8...v1.39.9) (2026-04-05)
+
+### Bug Fixes
+
+*  修复cn域名获取不到到期时间的问题 ([73b8e85](https://github.com/certd/certd/commit/73b8e859766097b5251fc4e5051593d686669eb2))
+
+### Performance Improvements
+
+* 腾讯云CLB大区增加台北 ([6b109d1](https://github.com/certd/certd/commit/6b109d172f0c7b6ce6ec164dc196d646a65f529f))
+* 优化腾讯云CLB插件支持选择证书id ([c875971](https://github.com/certd/certd/commit/c875971b71dc6d392e56f0a7605281c40d9bb405))
+* 支持域名到期时间监控通知 ([c6628e7](https://github.com/certd/certd/commit/c6628e7311d6c43c2a784581fb25ec37b29c168d))
+* **monitor:** 支持查看监控执行记录 ([b5cc794](https://github.com/certd/certd/commit/b5cc794061c11b7200b669473c25c4bbfc944b61))
+* **plugin-dnsmgr:** 添加彩虹DNS插件支持 ([af50344](https://github.com/certd/certd/commit/af503442b8298c5b89d11cf2ea351d62e66a609e))
+* **spaceship:** 新增Spaceship DNS插件和授权模块 ([21aec77](https://github.com/certd/certd/commit/21aec77e5c3307b5973d4185baba33edcb28926f))
+
 ## [1.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
 
 ### Bug Fixes

packages/ui/certd-server/db/migration-mysql/v10042__job_history.sql

@@ -0,0 +1,24 @@
+
+CREATE TABLE `cd_job_history`
+(
+  `id`          bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `user_id`     bigint      NOT NULL,
+  `project_id`  bigint      ,
+  `type`        varchar(100) NOT NULL,
+  `title`       varchar(512) NOT NULL,
+  `related_id`  varchar(100),
+  `result`      varchar(100) NOT NULL,
+  `content`     longtext         ,
+  `start_at`    bigint      NOT NULL,
+  `end_at`      bigint      ,
+  `create_time` timestamp     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time` timestamp     NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+
+
+CREATE INDEX `index_job_history_user_id` ON `cd_job_history` (`user_id`);
+CREATE INDEX `index_job_history_project_id` ON `cd_job_history` (`project_id`);
+CREATE INDEX `index_job_history_type` ON `cd_job_history` (`type`);
+
+ALTER TABLE `cd_job_history` ENGINE = InnoDB;

packages/ui/certd-server/db/migration-pg/v10042__job_history.sql

@@ -0,0 +1,22 @@
+
+CREATE TABLE "cd_job_history"
+(
+  "id"          bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "user_id"     bigint      NOT NULL,
+  "project_id"  bigint      ,
+  "type"        varchar(100) NOT NULL,
+  "title"       varchar(512) NOT NULL,
+  "related_id"  varchar(100),
+  "result"      varchar(100) NOT NULL,
+  "content"     text         ,
+  "start_at"    bigint      NOT NULL,
+  "end_at"      bigint      ,
+  "create_time" timestamp     NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time" timestamp     NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+
+
+
+CREATE INDEX "index_job_history_user_id" ON "cd_job_history" ("user_id");
+CREATE INDEX "index_job_history_project_id" ON "cd_job_history" ("project_id");
+CREATE INDEX "index_job_history_type" ON "cd_job_history" ("type");

packages/ui/certd-server/db/migration/v10042__job_history.sql

@@ -0,0 +1,22 @@
+
+CREATE TABLE "cd_job_history"
+(
+  "id"          integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"     integer      NOT NULL,
+  "project_id"  integer      ,
+  "type"        varchar(100) NOT NULL,
+  "title"       varchar(512) NOT NULL,
+  "related_id"  varchar(100),
+  "result"      varchar(100) NOT NULL,
+  "content"     text         ,
+  "start_at"    integer      NOT NULL,
+  "end_at"      integer      ,
+  "create_time" datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time" datetime     NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+
+
+
+CREATE INDEX "index_job_history_user_id" ON "cd_job_history" ("user_id");
+CREATE INDEX "index_job_history_project_id" ON "cd_job_history" ("project_id");
+CREATE INDEX "index_job_history_type" ON "cd_job_history" ("type");

packages/ui/certd-server/metadata/access_dnsmgr.yaml

@@ -0,0 +1,32 @@
+name: dnsmgr
+title: 彩虹DNS
+icon: clarity:plugin-line
+desc: 彩虹DNS管理系统授权
+input:
+  endpoint:
+    title: 系统地址
+    component:
+      name: a-input
+      allowClear: true
+      placeholder: https://dnsmgr.example.com
+    required: true
+  uid:
+    title: 用户ID
+    component:
+      name: a-input
+      allowClear: true
+      placeholder: '123456'
+    required: true
+  key:
+    title: API密钥
+    required: true
+    encrypt: true
+  testRequest:
+    title: 测试
+    component:
+      name: api-test
+      action: TestRequest
+    helper: 点击测试接口是否正常
+pluginType: access
+type: builtIn
+scriptFilePath: /plugins/plugin-dnsmgr/access.js

packages/ui/certd-server/metadata/access_spaceship.yaml

@@ -0,0 +1,29 @@
+name: spaceship
+title: Spaceship.com 授权
+icon: clarity:plugin-line
+desc: Spaceship.com API 授权插件
+input:
+  apiKey:
+    title: API Key
+    component:
+      placeholder: 请输入 API Key
+    required: true
+    encrypt: true
+    helper: 前往 [获取 API Key](https://www.spaceship.com/application/api-manager/)
+  apiSecret:
+    title: API Secret
+    component:
+      name: a-input-password
+      vModel: value
+      placeholder: 请输入 API Secret
+    required: true
+    encrypt: true
+  testRequest:
+    title: 测试
+    component:
+      name: api-test
+      action: TestRequest
+    helper: 测试 API 连接是否正常
+pluginType: access
+type: builtIn
+scriptFilePath: /plugins/plugin-spaceship/access.js

packages/ui/certd-server/metadata/deploy_DeployCertToTencentCLB.yaml

@@ -8,6 +8,24 @@ icon: svg:icon-tencentcloud
 group: tencent
 desc: 暂时只支持单向认证证书，暂时只支持通用负载均衡
 input:
+  cert:
+    title: 域名证书
+    helper: 请选择前置任务输出的域名证书
+    component:
+      name: output-selector
+      from:
+        - ':cert:'
+        - UploadCertToTencent
+    required: true
+    order: 0
+  accessId:
+    title: Access提供者
+    helper: access授权
+    component:
+      name: access-selector
+      type: tencent
+    required: true
+    order: 0
   region:
     title: 大区
     component:
@@ -33,14 +51,12 @@ input:
         - value: na-siliconvalley
         - value: na-toronto
         - value: sa-saopaulo
+        - value: ap-taipei
+      helper: 如果列表中没有，您可以手动输入
     required: true
     order: 0
-  certName:
-    title: 证书名称前缀
-    order: 0
   loadBalancerId:
     title: 负载均衡ID
-    helper: 如果没有配置，则根据域名匹配负载均衡下的监听器（根据域名匹配时暂时只支持前100个）
     required: true
     order: 0
   listenerId:
@@ -57,22 +73,8 @@ input:
       mode: tags
     helper: 如果开启了sni，则此项必须填写，未开启，则不要填写
     order: 0
-  cert:
+  certName:
-    title: 域名证书
+    title: 证书名称前缀
-    helper: 请选择前置任务输出的域名证书
-    component:
-      name: output-selector
-      from:
-        - ':cert:'
-    required: true
-    order: 0
-  accessId:
-    title: Access提供者
-    helper: access授权
-    component:
-      name: access-selector
-      type: tencent
-    required: true
     order: 0
 output: {}
 pluginType: deploy

packages/ui/certd-server/metadata/dnsProvider_dnsmgr.yaml

@@ -0,0 +1,9 @@
+name: dnsmgr
+title: 彩虹DNS
+desc: 彩虹DNS管理系统
+icon: clarity:plugin-line
+accessType: dnsmgr
+order: 99
+pluginType: dnsProvider
+type: builtIn
+scriptFilePath: /plugins/plugin-dnsmgr/dns-provider.js

packages/ui/certd-server/metadata/dnsProvider_spaceship.yaml

@@ -0,0 +1,9 @@
+name: spaceship
+title: Spaceship
+desc: Spaceship 域名解析
+icon: clarity:plugin-line
+accessType: spaceship
+order: 99
+pluginType: dnsProvider
+type: builtIn
+scriptFilePath: /plugins/plugin-spaceship/dns-provider.js

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.39.8",
+  "version": "1.39.9",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -50,20 +50,20 @@
     "@aws-sdk/client-route-53": "^3.964.0",
     "@aws-sdk/client-s3": "^3.964.0",
     "@aws-sdk/client-sts": "^3.990.0",
-    "@certd/acme-client": "^1.39.8",
+    "@certd/acme-client": "^1.39.9",
-    "@certd/basic": "^1.39.8",
+    "@certd/basic": "^1.39.9",
-    "@certd/commercial-core": "^1.39.8",
+    "@certd/commercial-core": "^1.39.9",
     "@certd/cv4pve-api-javascript": "^8.4.2",
-    "@certd/jdcloud": "^1.39.8",
+    "@certd/jdcloud": "^1.39.9",
-    "@certd/lib-huawei": "^1.39.8",
+    "@certd/lib-huawei": "^1.39.9",
-    "@certd/lib-k8s": "^1.39.8",
+    "@certd/lib-k8s": "^1.39.9",
-    "@certd/lib-server": "^1.39.8",
+    "@certd/lib-server": "^1.39.9",
-    "@certd/midway-flyway-js": "^1.39.8",
+    "@certd/midway-flyway-js": "^1.39.9",
-    "@certd/pipeline": "^1.39.8",
+    "@certd/pipeline": "^1.39.9",
-    "@certd/plugin-cert": "^1.39.8",
+    "@certd/plugin-cert": "^1.39.9",
-    "@certd/plugin-lib": "^1.39.8",
+    "@certd/plugin-lib": "^1.39.9",
-    "@certd/plugin-plus": "^1.39.8",
+    "@certd/plugin-plus": "^1.39.9",
-    "@certd/plus-core": "^1.39.8",
+    "@certd/plus-core": "^1.39.9",
     "@google-cloud/publicca": "^1.3.0",
     "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.185",
     "@huaweicloud/huaweicloud-sdk-core": "^3.1.185",
@@ -141,6 +141,7 @@
     "typeorm": "^0.3.20",
     "uuid": "^10.0.0",
     "wechatpay-node-v3": "^2.2.1",
+    "whoiser": "2.0.0-beta.10",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {

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

@@ -58,7 +58,8 @@ export class PluginController extends CrudController<PluginService> {
 
   @Post('/delete', { description: 'sys:settings:edit' })
   async delete(@Query('id') id: number) {
-    return super.deleteByIds([id]);
+    const res = await this.service.deleteByIds([id]);
+    return this.ok(res);
   }
 
   @Post('/deleteByIds', { description: 'sys:settings:edit' })

packages/ui/certd-server/src/controller/user/cert/domain-controller.ts

@@ -20,7 +20,7 @@ export class DomainController extends CrudController<DomainService> {
 
   @Post('/page', { description: Constants.per.authOnly, summary: "查询域名分页列表" })
   async page(@Body(ALL) body: any) {
-    const {projectId,userId} = await this.getProjectUserIdRead();
+    const { projectId, userId } = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
     body.query.projectId = projectId;
     body.query.userId = userId;
@@ -44,7 +44,7 @@ export class DomainController extends CrudController<DomainService> {
 
   @Post('/list', { description: Constants.per.authOnly, summary: "查询域名列表" })
   async list(@Body(ALL) body: any) {
-    const {projectId,userId} = await this.getProjectUserIdRead();
+    const { projectId, userId } = await this.getProjectUserIdRead();
     body.query = body.query ?? {};
     body.query.projectId = projectId;
     body.query.userId = userId;
@@ -54,7 +54,7 @@ export class DomainController extends CrudController<DomainService> {
 
   @Post('/add', { description: Constants.per.authOnly, summary: "添加域名" })
   async add(@Body(ALL) bean: any) {
-    const {projectId,userId} = await this.getProjectUserIdRead();
+    const { projectId, userId } = await this.getProjectUserIdRead();
     bean.projectId = projectId;
     bean.userId = userId;
     return super.add(bean);
@@ -82,7 +82,7 @@ export class DomainController extends CrudController<DomainService> {
 
   @Post('/deleteByIds', { description: Constants.per.authOnly, summary: "批量删除域名" })
   async deleteByIds(@Body(ALL) body: any) {
-    const {projectId,userId} = await this.getProjectUserIdRead();
+    const { projectId, userId } = await this.getProjectUserIdRead();
     await this.service.delete(body.ids, {
       userId: userId,
       projectId: projectId,
@@ -94,10 +94,10 @@ export class DomainController extends CrudController<DomainService> {
   @Post('/import/start', { description: Constants.per.authOnly, summary: "开始域名导入任务" })
   async importStart(@Body(ALL) body: any) {
     checkPlus();
-    const {projectId,userId} = await this.getProjectUserIdRead();
+    const { projectId, userId } = await this.getProjectUserIdRead();
     const { key } = body;
     const req = {
-      key, 
+      key,
       userId: userId,
       projectId: projectId,
     }
@@ -107,7 +107,7 @@ export class DomainController extends CrudController<DomainService> {
 
   @Post('/import/status', { description: Constants.per.authOnly, summary: "查询域名导入任务状态" })
   async importStatus() {
-    const {projectId,userId} = await this.getProjectUserIdRead();
+    const { projectId, userId } = await this.getProjectUserIdRead();
     const req = {
       userId: userId,
       projectId: projectId,
@@ -119,7 +119,7 @@ export class DomainController extends CrudController<DomainService> {
 
   @Post('/import/delete', { description: Constants.per.authOnly, summary: "删除域名导入任务" })
   async importDelete(@Body(ALL) body: any) {
-    const {projectId,userId} = await this.getProjectUserIdRead();
+    const { projectId, userId } = await this.getProjectUserIdRead();
     const { key } = body;
     const req = {
       userId: userId,
@@ -133,12 +133,12 @@ export class DomainController extends CrudController<DomainService> {
   @Post('/import/save', { description: Constants.per.authOnly, summary: "保存域名导入任务" })
   async importSave(@Body(ALL) body: any) {
     checkPlus();
-    const {projectId,userId} = await this.getProjectUserIdRead();
+    const { projectId, userId } = await this.getProjectUserIdRead();
     const { dnsProviderType, dnsProviderAccessId, key } = body;
     const req = {
       userId: userId,
       projectId: projectId,
-      dnsProviderType, dnsProviderAccessId,  key
+      dnsProviderType, dnsProviderAccessId, key
     }
     const item = await this.service.saveDomainImportTask(req);
     return this.ok(item);
@@ -147,7 +147,7 @@ export class DomainController extends CrudController<DomainService> {
 
   @Post('/sync/expiration/start', { description: Constants.per.authOnly, summary: "开始同步域名过期时间任务" })
   async syncExpirationStart(@Body(ALL) body: any) {
-    const {projectId,userId} = await this.getProjectUserIdRead();
+    const { projectId, userId } = await this.getProjectUserIdRead();
     await this.service.startSyncExpirationTask({
       userId: userId,
       projectId: projectId,
@@ -156,7 +156,7 @@ export class DomainController extends CrudController<DomainService> {
   }
   @Post('/sync/expiration/status', { description: Constants.per.authOnly, summary: "查询同步域名过期时间任务状态" })
   async syncExpirationStatus(@Body(ALL) body: any) {
-    const {projectId,userId} = await this.getProjectUserIdRead();
+    const { projectId, userId } = await this.getProjectUserIdRead();
     const status = await this.service.getSyncExpirationTaskStatus({
       userId: userId,
       projectId: projectId,
@@ -165,4 +165,26 @@ export class DomainController extends CrudController<DomainService> {
   }
 
 
+
+  @Post('/setting/save', { description: Constants.per.authOnly, summary: "保存域名监控设置" })
+  async settingSave(@Body(ALL) body: any) {
+    const { projectId, userId } = await this.getProjectUserIdWrite();
+    await this.service.monitorSettingSave({
+      userId: userId,
+      projectId: projectId,
+      setting: {...body},
+    })
+    return this.ok();
+  }
+
+  @Post('/setting/get', { description: Constants.per.authOnly, summary: "查询域名监控设置" })
+  async settingGet() {
+    const { projectId, userId } = await this.getProjectUserIdRead();
+    const setting = await this.service.monitorSettingGet({
+      userId: userId,
+      projectId: projectId,
+    })
+    return this.ok(setting);
+  }
+
 }

packages/ui/certd-server/src/controller/user/monitor/job-history-controller.ts

@@ -0,0 +1,65 @@
+import { Constants, CrudController } from "@certd/lib-server";
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
+import { ApiTags } from "@midwayjs/swagger";
+import { SiteInfoService } from "../../../modules/monitor/index.js";
+import { JobHistoryService } from "../../../modules/monitor/service/job-history-service.js";
+import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
+
+/**
+ */
+@Provide()
+@Controller('/api/monitor/job-history')
+@ApiTags(['monitor'])
+export class JobHistoryController extends CrudController<JobHistoryService> {
+  @Inject()
+  service: JobHistoryService;
+  @Inject()
+  authService: AuthService;
+  @Inject()
+  siteInfoService: SiteInfoService;
+
+  getService(): JobHistoryService {
+    return this.service;
+  }
+
+  @Post('/page', { description: Constants.per.authOnly, summary: "查询监控运行历史分页列表" })
+  async page(@Body(ALL) body: any) {
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    body.query = body.query ?? {};
+    body.query.userId = userId;
+    body.query.projectId = projectId
+    const res = await this.service.page({
+      query: body.query,
+      page: body.page,
+      sort: body.sort,
+    });
+    return this.ok(res);
+  }
+
+  @Post('/list', { description: Constants.per.authOnly, summary: "查询监控运行历史列表" })
+  async list(@Body(ALL) body: any) {
+    body.query = body.query ?? {};
+    const { projectId, userId } = await this.getProjectUserIdRead()
+    body.query.userId = userId;
+    body.query.projectId = projectId
+    return await super.list(body);
+  }
+
+  @Post('/info', { description: Constants.per.authOnly, summary: "查询监控运行历史详情" })
+  async info(@Query('id') id: number) {
+    await this.checkOwner(this.service,id,"read");
+    return await super.info(id);
+  }
+
+  @Post('/delete', { description: Constants.per.authOnly, summary: "删除监控运行历史" })
+  async delete(@Query('id') id: number) {
+    await this.checkOwner(this.service,id,"write");
+    return await super.delete(id);
+  }
+    @Post('/batchDelete', { description: Constants.per.authOnly, summary: "批量删除监控运行历史" })
+  async batchDelete(@Body('ids') ids: number[]) {
+    const { projectId, userId } = await this.getProjectUserIdWrite()
+    await this.service.batchDelete(ids,userId,projectId);
+    return this.ok();
+  }
+}

packages/ui/certd-server/src/modules/auto/auto-c-register-cron.ts

@@ -67,6 +67,7 @@ export class AutoCRegisterCron {
     await this.registerUserExpireCheckCron();
 
     await this.registerDomainExpireCheckCron();
+
   }
 
   async registerSiteMonitorCron() {
@@ -211,11 +212,11 @@ export class AutoCRegisterCron {
     if (!isPlus()){
       return
     }
-    // 添加域名即将到期检查任务
+    // 添加域名即将到期同步任务
     const randomWeek = Math.floor(Math.random() * 7) + 1
     const randomHour = Math.floor(Math.random() * 24)
     const randomMinute = Math.floor(Math.random() * 60)
-    logger.info(`注册域名注册过期时间检查任务，每周${randomWeek} ${randomHour}:${randomMinute}检查一次`)
+    logger.info(`注册域名注册过期时间同步任务，每周${randomWeek} ${randomHour}:${randomMinute}检查一次`)
     this.cron.register({
       name: 'domain-expire-check',
       cron: `0 ${randomMinute} ${randomHour} ? * ${randomWeek}`, // 每周随机一天检查一次

packages/ui/certd-server/src/modules/cert/service/domain-service.ts

@@ -1,20 +1,24 @@
 import { http, logger, utils } from '@certd/basic';
-import { AccessService, BaseService } from '@certd/lib-server';
+import { AccessService, BaseService, isEnterprise } from '@certd/lib-server';
 import { doPageTurn, Pager, PageRes } from '@certd/pipeline';
 import { DomainVerifiers } from "@certd/plugin-cert";
-import { createDnsProvider, dnsProviderRegistry, DomainParser, parseDomainByPsl } from "@certd/plugin-lib";
+import { createDnsProvider, dnsProviderRegistry, DomainParser } from "@certd/plugin-lib";
 import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import dayjs from 'dayjs';
-import { In, Not, Repository } from 'typeorm';
+import { merge } from 'lodash-es';
+import { In, LessThan, Not, Repository } from 'typeorm';
 import { BackTask, taskExecutor } from '../../basic/service/task-executor.js';
 import { CnameRecordEntity } from "../../cname/entity/cname-record.js";
 import { CnameRecordService } from '../../cname/service/cname-record-service.js';
-import { UserDomainImportSetting } from '../../mine/service/models.js';
+import { Cron } from '../../cron/cron.js';
+import { UserDomainImportSetting, UserDomainMonitorSetting } from '../../mine/service/models.js';
 import { UserSettingsService } from '../../mine/service/user-settings-service.js';
+import { JobHistoryService } from '../../monitor/service/job-history-service.js';
 import { TaskServiceBuilder } from '../../pipeline/service/getter/task-service-getter.js';
 import { SubDomainService } from "../../pipeline/service/sub-domain-service.js";
 import { DomainEntity } from '../entity/domain.js';
+import { TldClient } from './tld-client.js';
 
 export interface SyncFromProviderReq {
   userId: number;
@@ -27,6 +31,8 @@ export interface SyncFromProviderReq {
 const DOMAIN_IMPORT_TASK_TYPE = 'domainImportTask'
 const DOMAIN_EXPIRE_TASK_TYPE = 'domainExpirationSyncTask'
 
+const DOMAIN_EXPIRE_CHECK_TYPE = 'domainExpirationCheck'
+
 
 /**
  *
@@ -51,6 +57,14 @@ export class DomainService extends BaseService<DomainEntity> {
   @Inject()
   userSettingService: UserSettingsService;
 
+  @Inject()
+  jobHistoryService: JobHistoryService;
+
+  @Inject()
+  cron: Cron;
+
+
+
   //@ts-ignore
   getRepository() {
     return this.repository;
@@ -320,9 +334,9 @@ export class DomainService extends BaseService<DomainEntity> {
     logger.info(`从域名提供商${dnsProviderType}导入域名完成(${key})，共导入${task.total}个域名，跳过${task.getSkipCount()}个域名，成功${task.getSuccessCount()}个域名，失败${task.getErrorCount()}个域名`)
   }
 
-  async getDomainImportTaskStatus(req: { userId?: number ,projectId?: number}) {
+  async getDomainImportTaskStatus(req: { userId?: number, projectId?: number }) {
     const userId = req.userId || 0
-    const projectId = req.projectId 
+    const projectId = req.projectId
 
     const setting = await this.userSettingService.getSetting<UserDomainImportSetting>(userId, projectId, UserDomainImportSetting)
     const list = setting?.domainImportList || []
@@ -429,8 +443,6 @@ export class DomainService extends BaseService<DomainEntity> {
       await this.deleteDomainImportTask({ userId, projectId, key })
     }
 
-
-
     return await this.addDomainImportTask({ userId, projectId, dnsProviderType, dnsProviderAccessId, index })
   }
 
@@ -441,7 +453,7 @@ export class DomainService extends BaseService<DomainEntity> {
     const userId = req.userId ?? 'all'
     const projectId = req.projectId
     let key = `user_${userId}`
-    if (projectId!=null) {
+    if (projectId != null) {
       key += `_${projectId}`
     }
     const task = taskExecutor.get(DOMAIN_EXPIRE_TASK_TYPE, key)
@@ -452,7 +464,7 @@ export class DomainService extends BaseService<DomainEntity> {
     const userId = req.userId
     const projectId = req.projectId
     let key = `user_${userId ?? 'all'}`
-    if (projectId!=null) {
+    if (projectId != null) {
       key += `_${projectId}`
     }
     taskExecutor.start(new BackTask({
@@ -461,61 +473,22 @@ export class DomainService extends BaseService<DomainEntity> {
       title: `同步注册域名过期时间(${key}))`,
       run: async (task: BackTask) => {
         await this._syncDomainsExpirationDate({ userId, projectId, task })
+        if (userId != null) {
+          await this.startCheckDomainExpiration({ userId, projectId })
+        }
       }
     }))
   }
 
   private async _syncDomainsExpirationDate(req: { userId?: number, projectId?: number, task: BackTask }) {
+
     //同步所有域名的过期时间
     const pager = new Pager({
       pageNo: 1,
       pageSize: 100,
     })
 
-    const dnsJson = await http.request({
+    const tldClient = new TldClient();
-      url: "https://data.iana.org/rdap/dns.json",
-      method: "GET",
-    })
-    const rdapMap: Record<string, string> = {}
-    for (const item of dnsJson.services) {
-      //  [["store","work"], ["https://rdap.centralnic.com/store/"]],
-      const suffixes = item[0]
-      const urls = item[1]
-      for (const suffix of suffixes) {
-        rdapMap[suffix] = urls[0]
-      }
-    }
-
-    const getDomainExpirationDate = async (domain: string) => {
-      const parsed = parseDomainByPsl(domain)
-      const mainDomain = parsed.domain || ''
-      if (mainDomain !== domain) {
-        req.task.addError(`【${domain}】为子域名，跳过同步`)
-        return
-      }
-      const suffix = parsed.tld || ''
-      const rdapUrl = rdapMap[suffix]
-      if (!rdapUrl) {
-        req.task.addError(`【${domain}】未找到${suffix}的rdap地址`)
-        return
-      }
-      // https://rdap.nic.work/domain/handsfree.work
-      const rdap = await http.request({
-        url: `${rdapUrl}domain/${domain}`,
-        method: "GET",
-      })
-
-      let res: any = {}
-      const events = rdap.events || []
-      for (const item of events) {
-        if (item.eventAction === 'expiration') {
-          res.expirationDate = dayjs(item.eventDate).valueOf()
-        } else if (item.eventAction === 'registration') {
-          res.registrationDate = dayjs(item.eventDate).valueOf()
-        }
-      }
-      return res
-    }
     const query: any = {
       challengeType: "dns",
     }
@@ -546,10 +519,7 @@ export class DomainService extends BaseService<DomainEntity> {
     const itemHandle = async (item: any) => {
       req.task.incrementCurrent()
       try {
-        const res = await getDomainExpirationDate(item.domain)
+        const res = await tldClient.getDomainExpirationDate(item.domain)
-        if (!res) {
-          return
-        }
         const { expirationDate, registrationDate } = res
         if (!expirationDate) {
           req.task.addError(`【${item.domain}】获取域名${item.domain}过期时间失败`)
@@ -566,6 +536,7 @@ export class DomainService extends BaseService<DomainEntity> {
       } catch (error) {
         const errorMsg = `【${item.domain}】${error.message ?? error}`
         req.task.addError(errorMsg)
+        logger.error(errorMsg)
       } finally {
         await utils.sleep(1000)
       }
@@ -573,7 +544,151 @@ export class DomainService extends BaseService<DomainEntity> {
 
     await doPageTurn({ pager, getPage: getDomainPage, itemHandle: itemHandle })
     const key = `user_${req.userId || 'all'}`
-    logger.info(`同步用户(${key})注册域名过期时间完成(${req.task.getSuccessCount()}个成功，${req.task.getErrorCount()}个失败)`)
+    const log = `同步用户(${key})注册域名过期时间完成(${req.task.getSuccessCount()}个成功，${req.task.getErrorCount()}个失败)`
+    logger.info(log)
   }
 
+
+  public async startCheckDomainExpiration(req: { userId?: number, projectId?: number }) {
+    const { userId, projectId } = req
+    if (userId == null) {
+      throw new Error('userId is required');
+    }
+
+    if (projectId && !isEnterprise()) {
+      logger.warn(`当前未开启企业模式，跳过检查项目(${projectId})的域名过期时间`)
+      return
+    }
+
+    const setting = await this.monitorSettingGet({ userId, projectId })
+    if (!setting || !setting.enabled) {
+      return
+    }
+
+    const jobHistory: any = {
+      userId,
+      projectId,
+      type: DOMAIN_EXPIRE_CHECK_TYPE,
+      title: `检查注册域名过期时间`,
+      startAt: dayjs().valueOf(),
+      result: "start",
+    }
+    await this.jobHistoryService.add(jobHistory)
+
+    const expireDays = setting.willExpireDays || 30
+    const ltTime = dayjs().add(expireDays, 'day').valueOf()
+
+    const total = await this.repository.count({
+      where:{
+        userId,
+        projectId,
+        disabled: false,
+      }
+    })
+    //开始检查域名过期时间
+    const list = await this.repository.find({
+      where: {
+        userId,
+        projectId,
+        disabled: false,
+        expirationDate: LessThan(ltTime)
+      }
+    })
+
+    const now = dayjs().valueOf()
+    let willExpireDomains = []
+    let hasExpireDomains = []
+
+    for (const item of list) {
+      const { expirationDate } = item
+      const leftDays = dayjs(expirationDate).diff(dayjs(), 'day')
+      //@ts-ignore
+      item.leftDays = leftDays
+      if (expirationDate < now) {
+        hasExpireDomains.push(item)
+      } else {
+        willExpireDomains.push(item)
+      }
+    }
+
+    const title = `域名过期检查：即将过期 ${willExpireDomains.length} 个域名，已过期 ${hasExpireDomains.length} 个域名，共 ${total} 个域名`
+
+    try {
+      await this.jobHistoryService.update({
+        id: jobHistory.id,
+        content: title,
+        result: "done",
+        endAt: dayjs().valueOf(),
+      })
+
+    } catch (error) {
+      logger.error(`更新域名过期检查任务状态失败:${error.message ?? error}`)
+    }
+
+    if (list.length == 0) {
+      //没有过期域名  不发通知
+      return
+    }
+
+    //发送通知
+    const willExpireDomainsStr = willExpireDomains.map(item => `${item.domain} (剩余${item.leftDays}天)`).join('\n  ')
+    const hasExpireDomainsStr = hasExpireDomains.map(item => `${item.domain} (已过期${item.leftDays}天)`).join('\n  ')
+    const content = `您有域名即将过期，请尽快续费
+
+即将过期域名: ${willExpireDomains.length} 个 (有效期<${expireDays}天)
+  ${willExpireDomainsStr}
+
+已过期域名: ${hasExpireDomains.length} 个
+  ${hasExpireDomainsStr}`
+    const taskService = this.taskServiceBuilder.create({ userId: userId, projectId: projectId });
+
+    const notificationService = await taskService.getNotificationService()
+    const url = await notificationService.getBindUrl("#/certd/cert/domain");
+    await notificationService.send({
+      id: setting.notificationId,
+      useDefault: true,
+      logger: logger,
+      body: {
+        title: title,
+        content: content,
+        url: url,
+        errorMessage: title,
+        notificationType: DOMAIN_EXPIRE_CHECK_TYPE,
+        willExpireDomains,
+        hasExpireDomains,
+      }
+    })
+
+  }
+
+
+  public async monitorSettingGet(req: { userId?: number, projectId?: number }) {
+    const { userId, projectId } = req
+    const setting = await this.userSettingService.getSetting<UserDomainMonitorSetting>(userId, projectId, UserDomainMonitorSetting)
+    return setting || {}
+  }
+
+  public async monitorSettingSave(req: { userId?: number, projectId?: number, setting?: any }) {
+    const { userId, projectId, setting } = req
+    const bean: UserDomainMonitorSetting = new UserDomainMonitorSetting()
+    merge(bean, setting)
+    await this.userSettingService.saveSetting<UserDomainMonitorSetting>(userId, projectId, bean)
+    await this.registerMonitorCron({ userId, projectId })
+  }
+
+  public async registerMonitorCron(req: { userId?: number, projectId?: number }) {
+    const { userId, projectId } = req
+    const setting = await this.monitorSettingGet(req)
+    const key = `${DOMAIN_EXPIRE_CHECK_TYPE}:${userId}_${projectId || ''}`
+    this.cron.remove(key)
+    if (setting.enabled) {
+      this.cron.register({
+        cron: setting.cron,
+        name: key,
+        job: async () => {
+          await this.startCheckDomainExpiration({ userId, projectId })
+        },
+      })
+    }
+  }
 }

packages/ui/certd-server/src/modules/cert/service/tld-client.ts

@@ -0,0 +1,128 @@
+
+import { http, logger } from '@certd/basic';
+import { parseDomainByPsl } from "@certd/plugin-lib";
+import dayjs from 'dayjs';
+
+export interface DomainInfo {
+  expirationDate?: number;
+  registrationDate?: number;
+}
+
+export class TldClient {
+  private rdapMap: Record<string, string> = {}
+  private isInitialized = false;
+
+  constructor() {
+  }
+
+  async init() {
+    if (this.isInitialized) {
+      return;
+    }
+    const dnsJson = await http.request({
+      url: "https://data.iana.org/rdap/dns.json",
+      method: "GET",
+    })
+    for (const item of dnsJson.services) {
+      const suffixes = item[0]
+      const urls = item[1]
+      for (const suffix of suffixes) {
+        this.rdapMap[suffix] = urls[0]
+      }
+    }
+    this.isInitialized = true;
+  }
+
+  async getDomainExpirationDate(domain: string): Promise<DomainInfo> {
+    await this.init();
+    
+    const parsed = parseDomainByPsl(domain)
+    const mainDomain = parsed.domain || ''
+    if (mainDomain !== domain) {
+      const message= `【${domain}】为子域名，无法获取过期时间`
+      logger.warn(message)
+      throw new Error(message)
+    }
+    
+    try {
+      return await this.getDomainExpirationByRdap(domain, parsed.tld || '')
+    } catch (error) {
+      logger.error(error.message)
+      return await this.getDomainExpirationByWhoiser(domain)
+    }
+  }
+
+  private async getDomainExpirationByRdap(domain: string, suffix: string): Promise<DomainInfo> {
+    const rdapUrl = this.rdapMap[suffix]
+    if (!rdapUrl) {
+      throw new Error(`【${domain}】未找到${suffix}的rdap地址`)
+    }
+    
+    const rdap = await http.request({
+      url: `${rdapUrl}domain/${domain}`,
+      method: "GET",
+    })
+
+    let res: DomainInfo = {}
+    const events = rdap.events || []
+    for (const item of events) {
+      if (item.eventAction === 'expiration') {
+        res.expirationDate = dayjs(item.eventDate).valueOf()
+      } else if (item.eventAction === 'registration') {
+        res.registrationDate = dayjs(item.eventDate).valueOf()
+      }
+    }
+    return res
+  }
+
+  private async getDomainExpirationByWhoiser(domain: string): Promise<DomainInfo> {
+    const whoiser = await import("whoiser")
+    const result = await whoiser.whoisDomain(domain, {
+      follow: 2,
+      timeout: 5000
+    })
+    
+    let res: DomainInfo = {}
+    /**
+     * {
+  "Domain Status": [
+    "ok",
+  ],
+  "Name Server": [
+    "dns21.hichina.com",
+    "dns22.hichina.com",
+  ],
+  text: [
+    "",
+  ],
+  "Domain Name": "docmirror.cn",
+  ROID: "20200907s10001s31265717-cn",
+  "Registrant Name": "肖君诺",
+  "Registrant Email": "252959493@qq.com",
+  Registrar: "阿里巴巴云计算（北京）有限公司",
+  "Created Date": "2020-09-07 09:22:54",
+  "Expiry Date": "2026-09-07 09:22:54",
+  DNSSEC: "unsigned",
+}
+     */
+    
+    for (const server in result) {
+      const data = result[server] as any
+      if (data['Expiry Date']) {
+        res.expirationDate = dayjs(data['Expiry Date']).valueOf()
+      }
+      if (data['Created Date']) {
+        res.registrationDate = dayjs(data['Created Date']).valueOf()
+      }
+      if (res.expirationDate && res.registrationDate) {
+        break
+      }
+    }
+    
+    if (!res.expirationDate) {
+      throw new Error(`【${domain}】whois查询未找到过期时间`)
+    }
+    
+    return res
+  }
+}

packages/ui/certd-server/src/modules/cron/configuration.ts

@@ -1,6 +1,5 @@
-import { Config, Configuration, Logger } from '@midwayjs/core';
+import { logger } from '@certd/basic';
-import { ILogger } from '@midwayjs/logger';
+import { Config, Configuration, IMidwayContainer } from '@midwayjs/core';
-import { IMidwayContainer } from '@midwayjs/core';
 import { Cron } from './cron.js';
 
 // ... (see below) ...
@@ -11,18 +10,15 @@ import { Cron } from './cron.js';
 export class CronConfiguration {
   @Config()
   config;
-  @Logger()
-  logger: ILogger;
-
   cron: Cron;
   async onReady(container: IMidwayContainer) {
-    this.logger.info('cron start');
+    logger.info('cron start');
     this.cron = new Cron({
-      logger: this.logger,
+      logger: logger,
       ...this.config,
     });
     container.registerObject('cron', this.cron);
     this.cron.start();
-    this.logger.info('cron started');
+    logger.info('cron started');
   }
 }

packages/ui/certd-server/src/modules/mine/service/models.ts

@@ -31,6 +31,18 @@ export class UserSiteMonitorSetting extends BaseSettings {
   certValidDays?:number = 14;
 }
 
+
+export class UserDomainMonitorSetting extends BaseSettings {
+  static __title__ = "域名到期监控设置";
+  static __key__ = "user.domain.monitor";
+
+  enabled?:boolean = false;
+  notificationId?:number= 0;
+  cron?:string = undefined;
+  willExpireDays?:number = 30;
+}
+
+
 export class UserEmailSetting extends BaseSettings {
   static __title__ = "用户邮箱设置";
   static __key__ = "user.email";

packages/ui/certd-server/src/modules/monitor/entity/job-history.ts

@@ -0,0 +1,52 @@
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { PipelineEntity } from '../../pipeline/entity/pipeline.js';
+
+@Entity('cd_job_history')
+export class JobHistoryEntity {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ name: 'user_id', comment: '用户id' })
+  userId: number;
+
+  @Column({ name: 'project_id', comment: '项目id' })
+  projectId: number;
+
+  
+  @Column({ name: 'type', comment: '类型' })
+  type: string;
+
+  @Column({ name: 'title', comment: '标题' })
+  title: string;
+
+  @Column({ name: 'content', comment: '内容' })
+  content: string;
+
+  @Column({ name: 'related_id', comment: '关联id' })
+  relatedId: string;
+
+  @Column({ name: 'result', comment: '结果' })
+  result: string;
+
+  @Column({ name: 'start_at', comment: '开始时间' })
+  startAt: number;
+
+  @Column({ name: 'end_at', comment: '结束时间' })
+  endAt: number;
+
+  @Column({
+    name: 'create_time',
+    comment: '创建时间',
+    default: () => 'CURRENT_TIMESTAMP',
+  })
+  createTime: Date;
+
+  @Column({
+    name: 'update_time',
+    comment: '修改时间',
+    default: () => 'CURRENT_TIMESTAMP',
+  })
+  updateTime: Date;
+
+  pipeline?: PipelineEntity;
+}

packages/ui/certd-server/src/modules/monitor/service/job-history-service.ts

@@ -0,0 +1,23 @@
+import { BaseService } from "@certd/lib-server";
+import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { InjectEntityModel } from "@midwayjs/typeorm";
+import { Repository } from "typeorm";
+import { UserSettingsService } from "../../mine/service/user-settings-service.js";
+import { JobHistoryEntity } from "../entity/job-history.js";
+
+
+@Provide()
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
+export class JobHistoryService extends BaseService<JobHistoryEntity> {
+  @InjectEntityModel(JobHistoryEntity)
+  repository: Repository<JobHistoryEntity>;
+
+
+  @Inject()
+  userSettingsService: UserSettingsService;
+
+  //@ts-ignore
+  getRepository() {
+    return this.repository;
+  }
+}

packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts

@@ -17,6 +17,8 @@ import {SiteIpEntity} from "../entity/site-ip.js";
 import {Cron} from "../../cron/cron.js";
 import { dnsContainer } from "./dns-custom.js";
 import { merge } from "lodash-es";
+import { JobHistoryService } from "./job-history-service.js";
+import { JobHistoryEntity } from "../entity/job-history.js";
 
 @Provide()
 @Scope(ScopeEnum.Request, {allowDowngrade: true})
@@ -39,6 +41,9 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
   @Inject()
   siteIpService: SiteIpService;
 
+  @Inject()
+  jobHistoryService: JobHistoryService;
+
 
   @Inject()
   cron: Cron;
@@ -352,10 +357,11 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
     if (userId==null) {
       throw new Error("userId is required");
     }
-    const sites = await this.repository.find({
+    // const sites = await this.repository.find({
-      where: {userId,projectId}
+    //   where: {userId,projectId}
-    });
+    // });
-    this.checkList(sites,false);
+    // this.checkList(sites,false);
+    await this.triggerJobOnce(userId,projectId);
   }
 
   async checkList(sites: SiteInfoEntity[],isCommon: boolean) {
@@ -516,6 +522,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
   async triggerJobOnce(userId?:number,projectId?:number) {
     logger.info(`站点证书检查开始执行[${userId??'所有用户'}_${projectId??'所有项目'}]`);
     const query:any = { disabled: false };
+    let jobEntity :Partial<JobHistoryEntity> = null;
     if(userId!=null){
       query.userId = userId;
       if(projectId){
@@ -523,12 +530,22 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
       }
       //判断是否已关闭
       const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(userId,projectId, UserSiteMonitorSetting);
-      if (!setting.cron) {
+      if (setting && !setting.cron) {
         return;
       }
+      jobEntity  =  {
+        userId,
+        projectId,
+        type:"siteCertMonitor",
+        title: '站点证书检查',
+        result:"start",
+        startAt:new Date().getTime(),
+      }
+      await this.jobHistoryService.add(jobEntity);
     }
     let offset = 0;
     const limit = 50;
+    let count = 0;
     while (true) {
       const res = await this.page({
         query: query,
@@ -541,10 +558,20 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
       }
       offset += records.length;
       const isCommon = !userId;
+      count += records.length;
       await this.checkList(records,isCommon);
     }
 
     logger.info(`站点证书检查完成[${userId??'所有用户'}_${projectId??'所有项目'}]`);
+    if(jobEntity){
+      await this.jobHistoryService.update({
+        id: jobEntity.id,
+        result: "done",
+        content:`共检查${count}个站点`,
+        endAt:new Date().getTime(),
+        updateTime:new Date(),
+      });
+    }
   }
 
   async batchDelete(ids: number[], userId: number,projectId?:number): Promise<void> {

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

@@ -0,0 +1,32 @@
+import { CertInfo, CertReader, ICertInfoGetter } from '@certd/plugin-lib';
+import { CertInfoService } from '../../../monitor/index.js';
+
+export class CertInfoGetter implements ICertInfoGetter  {
+  userId: number;
+  projectId: number;
+  certInfoService: CertInfoService;
+  constructor(userId: number, projectId: number, certInfoService: CertInfoService) {
+    this.userId = userId;
+    this.projectId = projectId;
+    this.certInfoService = certInfoService;
+  }
+  async getByPipelineId(pipelineId: number): Promise<CertInfo> {
+    if (!pipelineId) {
+      throw new Error(`流水线id不能为空`)
+    }
+    const query :any= {
+        pipelineId,
+        userId: this.userId,
+    }
+    if (this.projectId) {
+       query.projectId = this.projectId
+    }
+    const entity =  await this.certInfoService.findOne({
+      where:query
+    })
+    if (!entity || !entity.certInfo) {
+      throw new Error(`流水线(${pipelineId})还未生成证书，请先运行一次流水线`)
+    }
+    return new CertReader(JSON.parse(entity.certInfo)).cert;
+  }
+}

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

@@ -23,4 +23,8 @@ export class NotificationGetter implements INotificationService {
   async send(req: NotificationSendReq): Promise<void> {
     return await this.notificationService.send(req, this.userId, this.projectId);
   }
+
+  async getBindUrl(url: string) {
+    return await this.notificationService.getBindUrl(url);
+  }
 }

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

@@ -9,6 +9,9 @@ import { SubDomainsGetter } from "./sub-domain-getter.js";
 import { DomainVerifierGetter } from "./domain-verifier-getter.js";
 import { DomainService } from "../../../cert/service/domain-service.js";
 import { SubDomainService } from "../sub-domain-service.js";
+import { CertInfoGetter } from "./cert-info-getter.js";
+import { CertInfoService } from "../../../monitor/index.js";
+import { ICertInfoGetter } from "@certd/plugin-lib";
 
 const serviceNames = [
   'ocrService',
@@ -34,6 +37,8 @@ export class TaskServiceGetter implements IServiceGetter{
       return await this.getNotificationService() as T
     } else if (serviceName === 'domainVerifierGetter') {
       return await this.getDomainVerifierGetter() as T
+    } else if (serviceName === 'certInfoGetter') {
+      return await this.getCertInfoGetter() as T
     }else{
       if(!serviceNames.includes(serviceName)){
         throw new Error(`${serviceName} not in whitelist`)
@@ -51,6 +56,11 @@ export class TaskServiceGetter implements IServiceGetter{
     return new SubDomainsGetter(this.userId,this.projectId, subDomainsService,domainService)
   }
 
+  async getCertInfoGetter(): Promise<ICertInfoGetter> {
+    const certInfoService:CertInfoService = await  this.appCtx.getAsync("certInfoService")
+    return new CertInfoGetter(this.userId, this.projectId, certInfoService)
+  }
+
   async getAccessService(): Promise<AccessGetter> {
     const accessService:AccessService = await  this.appCtx.getAsync("accessService")
     return new AccessGetter(this.userId, this.projectId, accessService.getById.bind(accessService));

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

@@ -524,15 +524,12 @@ export class PluginService extends BaseService<PluginEntity> {
       id: pluginEntity.id
     };
   }
-
-
   async deleteByIds(ids: any[]) {
+    ids = this.filterIds(ids);
     for (const id of ids) {
-      await this.unRegisterById(id)
+      await this.unRegisterById(id);
       await this.delete(id);
     }
-   
   }
 
-
 }

packages/ui/certd-server/src/plugins/index.ts

@@ -44,4 +44,5 @@
 // export * from './plugin-lib/index.js'
 // export * from './plugin-plus/index.js'
 // export * from './plugin-cert/index.js'
-// export * from './plugin-zenlayer/index.js'
+// export * from './plugin-zenlayer/index.js'
+export * from './plugin-dnsmgr/index.js'

packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base.ts

@@ -156,7 +156,7 @@ export abstract class CertApplyBasePlugin extends CertApplyBaseConvertPlugin {
       if(maxDays < 2){
         maxDays = 2;
       }
-      this.logger.warn(`为避免每次运行都更新证书，更新天数自动减半，调整为${maxDays}`);
+      this.logger.warn(`为避免每次运行都更新证书，更新天数自动减半（即证书最大时长${totalDays}天减半），调整为${maxDays}`);
     }
    
     return {

packages/ui/certd-server/src/plugins/plugin-dnsmgr/access.ts

@@ -0,0 +1,144 @@
+import { AccessInput, BaseAccess, IsAccess, Pager, PageRes, PageSearch } from '@certd/pipeline';
+import { DomainRecord } from '@certd/plugin-lib';
+
+@IsAccess({
+  name: 'dnsmgr',
+  title: '彩虹DNS',
+  icon: 'clarity:plugin-line',
+  desc: '彩虹DNS管理系统授权',
+})
+export class DnsmgrAccess extends BaseAccess {
+  @AccessInput({
+    title: '系统地址',
+    component: {
+      name: "a-input",
+      allowClear: true,
+      placeholder: 'https://dnsmgr.example.com',
+    },
+    required: true,
+  })
+  endpoint = '';
+
+  @AccessInput({
+    title: '用户ID',
+    component: {
+      name: "a-input",
+      allowClear: true,
+      placeholder: '123456',
+    },
+    required: true,
+  })
+  uid = '';
+
+  @AccessInput({
+    title: 'API密钥',
+    required: true,
+    encrypt: true,
+  })
+  key = '';
+
+  @AccessInput({
+    title: "测试",
+    component: {
+      name: "api-test",
+      action: "TestRequest"
+    },
+    helper: "点击测试接口是否正常"
+  })
+  testRequest = true;
+
+  async onTestRequest() {
+    await this.GetDomainList({});
+    return "ok";
+  }
+
+  async GetDomainList(req: PageSearch): Promise<PageRes<DomainRecord>> {
+    this.ctx.logger.info(`获取域名列表，req:${JSON.stringify(req)}`);
+    const pager = new Pager(req);
+    const resp = await this.doRequest({
+      url: '/api/domain',
+      data: {
+        offset: pager.getOffset(),
+        limit: pager.pageSize,
+        kw: req.searchKey,
+      },
+    });
+    const total = resp?.total || 0;
+    let list = resp?.rows?.map((item: any) => {
+      return {
+        domain: item.name,
+        ...item,
+      };
+    });
+    return {
+      total,
+      list,
+    };
+  }
+
+
+
+  async createDnsRecord(domainId: string, record: string, value: string, type: string, domain: string) {
+    this.ctx.logger.info(`创建DNS记录：${record} ${type} ${value}`);
+    const resp = await this.doRequest({
+      url: `/api/record/add/${domainId}`,
+      data: {
+        name: record.replace(`.${domain}`, ''),
+        type,
+        value,
+        line: 'default',
+        ttl: 600,
+      },
+    });
+    return resp;
+  }
+
+  async getDnsRecords(domainId: string, type?: string, name?: string, value?: string) {
+    this.ctx.logger.info(`获取DNS记录列表：domainId=${domainId}, type=${type}, name=${name}`);
+    const resp = await this.doRequest({
+      url: `/api/record/data/${domainId}`,
+      data: {
+        type,
+        subdomain: name,
+        value,
+      },
+    });
+    return resp;
+  }
+
+  async deleteDnsRecord(domainId: string, recordId: string) {
+    this.ctx.logger.info(`删除DNS记录：domainId=${domainId}, recordId=${recordId}`);
+    const resp = await this.doRequest({
+      url: `/api/record/delete/${domainId}`,
+      data: {
+        recordid: recordId,
+      },
+    });
+    return resp;
+  }
+
+  async doRequest(req: { url: string; data?: any }) {
+    const timestamp = Math.floor(Date.now() / 1000);
+    const sign = this.ctx.utils.hash.md5(`${this.uid}${timestamp}${this.key}`);
+    const url = `${this.endpoint}${req.url}`;
+    
+    const res = await this.ctx.http.request({
+      url,
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      },
+      data: {
+        uid: this.uid,
+        timestamp,
+        sign,
+        ...req.data,
+      },
+    });
+
+    if (res.code !== undefined && res.code !== 0) {
+      throw new Error(res.msg || '请求失败');
+    }
+    return res;
+  }
+}