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

chore:

pull/189/head
xiaojunnuo 2024-09-04 11:26:56 +08:00
parent ff46771d8d
commit 28a32aed7d
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/pipeline/src/core/executor.ts
View File

@ -288,17 +288,17 @@ export class Executor {
let subject = ""; let subject = "";
let content = ""; let content = "";
if (when === "start") { if (when === "start") {
subject = `【CertD】开始执行，${this.pipeline.title}, buildId:${this.runtime.id}`; subject = `【CertD】开始执行，【${this.pipeline.id}】${this.pipeline.title}`;
content = subject; content = `buildId:${this.runtime.id}`;
} else if (when === "success") { } else if (when === "success") {
subject = `【CertD】执行成功，${this.pipeline.title}, buildId:${this.runtime.id}`; subject = `【CertD】执行成功，【${this.pipeline.id}】${this.pipeline.title}`;
content = subject; content = `buildId:${this.runtime.id}`;
} else if (when === "turnToSuccess") { } else if (when === "turnToSuccess") {
subject = `【CertD】执行成功（错误转成功），${this.pipeline.title}, buildId:${this.runtime.id}`; subject = `【CertD】执行成功（错误转成功），【${this.pipeline.id}】${this.pipeline.title}`;
content = subject; content = `buildId:${this.runtime.id}`;
} else if (when === "error") { } else if (when === "error") {
subject = `【CertD】执行失败，${this.pipeline.title}, buildId:${this.runtime.id}`; subject = `【CertD】执行失败，【${this.pipeline.id}】${this.pipeline.title}`;
content = `<pre>${error.message}</pre>`; content = `buildId:${this.runtime.id}\nerror:${error.message}`;
} else { } else {
return; return;
} }

4
packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts
View File

@ -308,10 +308,10 @@ export class AcmeService {
await utils.http({ await utils.http({
url: directoryUrl, url: directoryUrl,
method: "GET", method: "GET",
timeout: 5000, timeout: 10000,
}); });
} catch (e) { } catch (e) {
this.logger.error(`${directoryUrl}，测试访问失败`, e); this.logger.error(`${directoryUrl}，测试访问失败`, e.stack);
return false; return false;
} }
this.logger.info(`${directoryUrl}，测试访问成功`); this.logger.info(`${directoryUrl}，测试访问成功`);

10
packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
View File

@ -87,8 +87,14 @@
<template #content> <template #content>
<div v-for="(item, index) of task.steps" class="flex-o w-100"> <div v-for="(item, index) of task.steps" class="flex-o w-100">
<span class="ellipsis flex-1">{{ index + 1 }}. {{ item.title }} </span> <span class="ellipsis flex-1">{{ index + 1 }}. {{ item.title }} </span>
<pi-status-show :status="item.status?.result"></pi-status-show> <pi-status-show v-if="!editMode" :status="item.status?.result"></pi-status-show>
<fs-icon class="pointer color-blue" title="重新运行此步骤" icon="SyncOutlined" @click="run(item.id)"></fs-icon> <fs-icon
v-if="!editMode"
class="pointer color-blue ml-2"
title="重新运行此步骤"
icon="SyncOutlined"
@click="run(item.id)"
></fs-icon>
</div> </div>
</template> </template>
<span class="flex-o w-100"> <span class="flex-o w-100">

2
packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/dnspod-dns-provider.ts
View File

@ -37,7 +37,7 @@ export class DnspodDnsProvider extends AbstractDnsProvider {
lang: 'cn', lang: 'cn',
error_on_empty: 'no', error_on_empty: 'no',
}, },
timeout: 5000, timeout: 10000,
}; };
_.merge(config, options); _.merge(config, options);