From 28a32aed7d5e97d49ca14fef15cf42bdd9222ee3 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 4 Sep 2024 11:26:56 +0800
Subject: [PATCH] chore:

---
 packages/core/pipeline/src/core/executor.ts      | 16 ++++++++--------
 .../plugin-cert/src/plugin/cert-plugin/acme.ts   |  4 ++--
 .../src/views/certd/pipeline/pipeline/index.vue  | 10 ++++++++--
 .../dns-provider/dnspod-dns-provider.ts          |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

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 = `<pre>${error.message}</pre>`;
+      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 @@
                           <template #content>
                             <div v-for="(item, index) of task.steps" class="flex-o w-100">
                               <span class="ellipsis flex-1">{{ index + 1 }}. {{ item.title }} </span>
-                              <pi-status-show :status="item.status?.result"></pi-status-show>
-                              <fs-icon class="pointer color-blue" title="重新运行此步骤" icon="SyncOutlined" @click="run(item.id)"></fs-icon>
+                              <pi-status-show v-if="!editMode" :status="item.status?.result"></pi-status-show>
+                              <fs-icon
+                                v-if="!editMode"
+                                class="pointer color-blue ml-2"
+                                title="重新运行此步骤"
+                                icon="SyncOutlined"
+                                @click="run(item.id)"
+                              ></fs-icon>
                             </div>
                           </template>
                           <span class="flex-o w-100">
diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/dnspod-dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/dnspod-dns-provider.ts
index 126712c3..a94a3447 100644
--- a/packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/dnspod-dns-provider.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/dnspod-dns-provider.ts
@@ -37,7 +37,7 @@ export class DnspodDnsProvider extends AbstractDnsProvider {
         lang: 'cn',
         error_on_empty: 'no',
       },
-      timeout: 5000,
+      timeout: 10000,
     };
     _.merge(config, options);