diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts index b1e61e0b..d0494570 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts @@ -321,7 +321,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin { name: "a-input-number", vModel: "value", }, - helper: "等待解析生效时长(秒)", + helper: "等待解析生效时长(秒),如果使用CNAME方式校验,本地验证失败,可以尝试延长此时间(比如5-10分钟)", }) waitDnsDiffuseTime = 30; diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts index a43e1e5d..edea9e27 100644 --- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts @@ -273,8 +273,7 @@ export default { monitorCronSetting: "Monitoring Schedule", cronTrigger: "Scheduled trigger for monitoring", dnsServer: "DNS Server", - // dnsServerHelper: "使用自定义的域名解析服务器,如:1.1.1.1,8.8.8.8", - dnsServerHelper: "Use a custom domain name resolution server, such as: 1.1.1.1,8.8.8.8", + dnsServerHelper: "Use a custom domain name resolution server, such as: 1.1.1.1 , support multiple", }, }, checkStatus: { diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts index 696acd15..7470c947 100644 --- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts @@ -278,7 +278,7 @@ export default { monitorCronSetting: "监控定时设置", cronTrigger: "定时触发监控", dnsServer: "DNS服务器", - dnsServerHelper: "使用自定义的域名解析服务器,如:1.1.1.1,8.8.8.8", + dnsServerHelper: "使用自定义的域名解析服务器,如:1.1.1.1 , 支持多个", }, }, checkStatus: { diff --git a/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts b/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts index ffaa4bea..a94a5bbb 100644 --- a/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts +++ b/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts @@ -100,7 +100,7 @@ export class CnameRecordService extends BaseService { } param.hostRecord = hostRecord; - const cnameKey = utils.id.simpleNanoId(); + const cnameKey = utils.id.simpleNanoId().toLowerCase(); const safeDomain = param.domain.replaceAll('.', '-'); param.recordValue = `${safeDomain}.${cnameKey}.${cnameProvider.domain}`; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8bb9f7f8..84e984dc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -46,7 +46,7 @@ importers: packages/core/acme-client: dependencies: '@certd/basic': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../basic '@peculiar/x509': specifier: ^1.11.0 @@ -207,7 +207,7 @@ importers: packages/core/pipeline: dependencies: '@certd/basic': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../basic '@certd/plus-core': specifier: ^1.36.1 @@ -415,7 +415,7 @@ importers: packages/libs/lib-k8s: dependencies: '@certd/basic': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/basic '@kubernetes/client-node': specifier: 0.21.0 @@ -455,13 +455,13 @@ importers: packages/libs/lib-server: dependencies: '@certd/acme-client': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/pipeline '@certd/plus-core': specifier: ^1.36.1 @@ -607,16 +607,16 @@ importers: packages/plugins/plugin-cert: dependencies: '@certd/acme-client': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/pipeline '@certd/plugin-lib': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../plugin-lib '@google-cloud/publicca': specifier: ^1.3.0 @@ -698,10 +698,10 @@ importers: specifier: ^3.787.0 version: 3.810.0(aws-crt@1.26.2) '@certd/basic': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/pipeline '@kubernetes/client-node': specifier: 0.21.0 @@ -789,19 +789,19 @@ importers: packages/pro/commercial-core: dependencies: '@certd/basic': - specifier: ^1.36.0 + specifier: ^1.36.1 version: link:../../core/basic '@certd/lib-server': - specifier: ^1.36.0 + specifier: ^1.36.1 version: link:../../libs/lib-server '@certd/pipeline': - specifier: ^1.36.0 + specifier: ^1.36.1 version: link:../../core/pipeline '@certd/plugin-plus': - specifier: ^1.36.0 + specifier: ^1.36.1 version: link:../plugin-plus '@certd/plus-core': - specifier: ^1.36.0 + specifier: ^1.36.1 version: link:../plus-core '@midwayjs/core': specifier: ~3.20.3 @@ -886,22 +886,22 @@ importers: specifier: ^1.0.2 version: 1.0.3 '@certd/basic': - specifier: ^1.36.0 + specifier: ^1.36.1 version: link:../../core/basic '@certd/lib-k8s': - specifier: ^1.36.0 + specifier: ^1.36.1 version: link:../../libs/lib-k8s '@certd/pipeline': - specifier: ^1.36.0 + specifier: ^1.36.1 version: link:../../core/pipeline '@certd/plugin-cert': - specifier: ^1.36.0 + specifier: ^1.36.1 version: link:../../plugins/plugin-cert '@certd/plugin-lib': - specifier: ^1.36.0 + specifier: ^1.36.1 version: link:../../plugins/plugin-lib '@certd/plus-core': - specifier: ^1.36.0 + specifier: ^1.36.1 version: link:../plus-core ali-oss: specifier: ^6.21.0 @@ -1004,7 +1004,7 @@ importers: packages/pro/plus-core: dependencies: '@certd/basic': - specifier: ^1.36.0 + specifier: ^1.36.1 version: link:../../core/basic dayjs: specifier: ^1.11.7 @@ -1294,10 +1294,10 @@ importers: version: 0.1.3(zod@3.24.4) devDependencies: '@certd/lib-iframe': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../libs/lib-iframe '@certd/pipeline': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/pipeline '@rollup/plugin-commonjs': specifier: ^25.0.7 @@ -1480,10 +1480,10 @@ importers: specifier: ^3.705.0 version: 3.810.0(aws-crt@1.26.2) '@certd/acme-client': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/basic '@certd/commercial-core': specifier: ^1.36.1 @@ -1492,28 +1492,28 @@ importers: specifier: ^8.4.1 version: 8.4.1 '@certd/jdcloud': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../libs/lib-jdcloud '@certd/lib-huawei': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../libs/lib-huawei '@certd/lib-k8s': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../libs/lib-k8s '@certd/lib-server': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../libs/lib-server '@certd/midway-flyway-js': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../libs/midway-flyway-js '@certd/pipeline': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../core/pipeline '@certd/plugin-cert': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../plugins/plugin-cert '@certd/plugin-lib': - specifier: ^1.36.1 + specifier: ^1.36.2 version: link:../../plugins/plugin-lib '@certd/plugin-plus': specifier: ^1.36.1