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

View File

@ -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;
}

View File

@ -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},测试访问成功`);

View File

@ -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">

View File

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