diff --git a/packages/core/acme-client/src/verify.js b/packages/core/acme-client/src/verify.js index bcf854846..22fbc63f5 100644 --- a/packages/core/acme-client/src/verify.js +++ b/packages/core/acme-client/src/verify.js @@ -92,7 +92,6 @@ async function walkDnsChallengeRecord(recordName, resolver = dns,deep = 0) { try { log(`检查域名 ${recordName} 的TXT记录`); const txtRecords = await resolver.resolveTxt(recordName); - if (txtRecords && txtRecords.length) { log(`找到 ${txtRecords.length} 条 TXT记录( ${recordName})`); log(`TXT records: ${JSON.stringify(txtRecords)}`); @@ -149,6 +148,7 @@ async function walkDnsChallengeRecord(recordName, resolver = dns,deep = 0) { /* Authoritative DNS resolver */ log(`从域名权威服务器获取TXT解析记录`); const authoritativeResolver = await util.getAuthoritativeDnsResolver(recordName,log); + resolver.setTimeout(10000); const res = await walkDnsChallengeRecord(recordName, authoritativeResolver,deep); if (res && res.length > 0) { for (const item of res) { diff --git a/packages/ui/certd-client/src/views/certd/pipeline/template/use.tsx b/packages/ui/certd-client/src/views/certd/pipeline/template/use.tsx index c2157f90f..a447384dd 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/template/use.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/template/use.tsx @@ -7,7 +7,7 @@ import GroupSelector from "/@/views/certd/pipeline/group/group-selector.vue"; import { ref } from "vue"; import { fillPipelineByDefaultForm } from "/@/views/certd/pipeline/certd-form/use"; import { cloneDeep } from "lodash-es"; -import { useI18n } from "vue-i18n"; +import { $t } from "/@/locales"; export function createExtraColumns() { const groupDictRef = dict({ @@ -15,7 +15,7 @@ export function createExtraColumns() { value: "id", label: "name", }); - const { t } = useI18n(); + const t = $t; const randomHour = Math.floor(Math.random() * 6); const randomMin = Math.floor(Math.random() * 60); return {