From 5362df55f48bd1e892a4007f1cdf39f4cf450789 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 4 Aug 2024 02:49:40 +0800
Subject: [PATCH] chore: 1

---
 .../plugins/plugin-cert/src/plugin/cert-plugin/base.ts |  2 +-
 .../src/modules/pipeline/service/pipeline-service.ts   | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

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 26a9af40b..527b01888 100644
--- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts
+++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts
@@ -138,7 +138,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
     const cert: CertInfo = certReader.toCertInfo();
     this.cert = cert;
 
-    this._result.pipelineVars.certExpiresTime = dayjs(certReader.detail.validity.notAfter).unix();
+    this._result.pipelineVars.certExpiresTime = dayjs(certReader.detail.validity.notAfter).valueOf();
 
     if (isNew) {
       const applyTime = dayjs(certReader.detail.validity.notBefore).format("YYYYMMDD_HHmmss");
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 8ad742b8f..33cbb310b 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
@@ -229,9 +229,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
 
   async run(id: number, triggerId: string) {
     const entity: PipelineEntity = await this.info(id);
-    if (entity.disabled) {
-      return;
-    }
+
     const pipeline = JSON.parse(entity.content);
 
     if (!pipeline.stages || pipeline.stages.length === 0) {
@@ -243,6 +241,12 @@ export class PipelineService extends BaseService<PipelineEntity> {
       return;
     }
 
+    if (triggerType === 'timer') {
+      if (entity.disabled) {
+        return;
+      }
+    }
+
     const onChanged = async (history: RunHistory) => {
       //保存执行历史
       try {