diff --git a/packages/core/pipeline/src/core/executor.ts b/packages/core/pipeline/src/core/executor.ts index 6786f78e..98eae03b 100644 --- a/packages/core/pipeline/src/core/executor.ts +++ b/packages/core/pipeline/src/core/executor.ts @@ -288,17 +288,17 @@ export class Executor { let subject = ""; let content = ""; if (when === "start") { - subject = `【CertD】开始执行,${this.pipeline.title}, buildId:${this.runtime.id}`; - content = subject; + subject = `【CertD】开始执行,【${this.pipeline.id}】${this.pipeline.title}`; + content = `buildId:${this.runtime.id}`; } else if (when === "success") { - subject = `【CertD】执行成功,${this.pipeline.title}, buildId:${this.runtime.id}`; - content = subject; + subject = `【CertD】执行成功,【${this.pipeline.id}】${this.pipeline.title}`; + content = `buildId:${this.runtime.id}`; } else if (when === "turnToSuccess") { - subject = `【CertD】执行成功(错误转成功),${this.pipeline.title}, buildId:${this.runtime.id}`; - content = subject; + subject = `【CertD】执行成功(错误转成功),【${this.pipeline.id}】${this.pipeline.title}`; + content = `buildId:${this.runtime.id}`; } else if (when === "error") { - subject = `【CertD】执行失败,${this.pipeline.title}, buildId:${this.runtime.id}`; - content = `
${error.message}`; + subject = `【CertD】执行失败,【${this.pipeline.id}】${this.pipeline.title}`; + content = `buildId:${this.runtime.id}\nerror:${error.message}`; } else { return; } diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts index 169bed72..d94fa515 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts @@ -308,10 +308,10 @@ export class AcmeService { await utils.http({ url: directoryUrl, method: "GET", - timeout: 5000, + timeout: 10000, }); } catch (e) { - this.logger.error(`${directoryUrl},测试访问失败`, e); + this.logger.error(`${directoryUrl},测试访问失败`, e.stack); return false; } this.logger.info(`${directoryUrl},测试访问成功`); diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue index ef52ee98..ad73f89f 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue @@ -87,8 +87,14 @@