From 67af67b92daccf964dc3147a9c934a194be0feb4 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 27 Dec 2024 22:40:07 +0800
Subject: [PATCH] chore:

---
 .../plugins/plugin-cert/src/plugin/cert-plugin/base.ts   | 2 +-
 .../src/modules/monitor/service/cert-info-service.ts     | 9 +++++++++
 .../src/modules/pipeline/service/pipeline-service.ts     | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts
index cf52be995..7dd3696f2 100644
--- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts
+++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts
@@ -321,7 +321,7 @@ cert.jks：jks格式证书文件，java服务器使用
     // 检查有效期
     const leftDays = dayjs(expires).diff(dayjs(), "day");
     return {
-      isWillExpire: leftDays < maxDays,
+      isWillExpire: leftDays <= maxDays,
       leftDays,
     };
   }
diff --git a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
index 87bc04529..b58c62a11 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts
@@ -59,4 +59,13 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
 
     await this.addOrUpdate(bean);
   }
+
+  async deleteByPipelineId(id: number) {
+    if (!id) {
+      return;
+    }
+    await this.repository.delete({
+      pipelineId: id,
+    });
+  }
 }
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index 3bf8deef2..94a11e742 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -348,6 +348,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     await super.delete([id]);
     await this.historyService.deleteByPipelineId(id);
     await this.historyLogService.deleteByPipelineId(id);
+    await this.certInfoService.deleteByPipelineId(id);
   }
 
   async clearTriggers(id: number) {