github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: 1

pull/148/head
xiaojunnuo 2024-08-04 02:49:40 +08:00
parent 59897c4cea
commit 5362df55f4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts
View File

@ -138,7 +138,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
const cert: CertInfo = certReader.toCertInfo(); const cert: CertInfo = certReader.toCertInfo();
this.cert = cert; 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) { if (isNew) {
const applyTime = dayjs(certReader.detail.validity.notBefore).format("YYYYMMDD_HHmmss"); const applyTime = dayjs(certReader.detail.validity.notBefore).format("YYYYMMDD_HHmmss");

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

@ -229,9 +229,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
async run(id: number, triggerId: string) { async run(id: number, triggerId: string) {
const entity: PipelineEntity = await this.info(id); const entity: PipelineEntity = await this.info(id);
if (entity.disabled) {
return;
}
const pipeline = JSON.parse(entity.content); const pipeline = JSON.parse(entity.content);
if (!pipeline.stages || pipeline.stages.length === 0) { if (!pipeline.stages || pipeline.stages.length === 0) {
@ -243,6 +241,12 @@ export class PipelineService extends BaseService<PipelineEntity> {
return; return;
} }
if (triggerType === 'timer') {
if (entity.disabled) {
return;
}
}
const onChanged = async (history: RunHistory) => { const onChanged = async (history: RunHistory) => {
//保存执行历史 //保存执行历史
try { try {