From 31f09ab117e75d9bf77502638c9e048002da4b4e Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 19 Dec 2025 11:30:01 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20ip=E8=AF=81=E4=B9=A6=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vitepress/config.ts | 1 + docs/guide/qa/use.md | 8 ++++++++ docs/guide/use/cert/index.md | 10 ---------- docs/guide/use/cert/ip.md | 11 +++++++++++ .../plugin-cert/src/plugin/cert-plugin/base.ts | 2 +- .../plugin-cert/src/plugin/cert-plugin/index.ts | 2 +- .../ui/certd-client/src/locales/langs/en-US/guide.ts | 2 +- .../ui/certd-client/src/locales/langs/zh-CN/guide.ts | 2 +- .../src/modules/pipeline/service/pipeline-service.ts | 2 +- .../plugin/delete-expiring-cert/index.ts | 4 ++-- 10 files changed, 27 insertions(+), 17 deletions(-) delete mode 100644 docs/guide/use/cert/index.md create mode 100644 docs/guide/use/cert/ip.md diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts index b7f900b5b..faca8d25e 100644 --- a/docs/.vitepress/config.ts +++ b/docs/.vitepress/config.ts @@ -122,6 +122,7 @@ export default defineConfig({ {text: "宝塔动态IP白名单", link: "/guide/use/baota/white_list.md"}, {text: "子域名托管", link: "/guide/use/cert/subdomain.md"}, {text: "流水线有效期", link: "/guide/use/pipeline/valid.md"}, + {text: "IP证书申请", link: "/guide/use/cert/ip.md"}, ] }, { diff --git a/docs/guide/qa/use.md b/docs/guide/qa/use.md index 6bc289d99..535262748 100644 --- a/docs/guide/qa/use.md +++ b/docs/guide/qa/use.md @@ -43,4 +43,12 @@ service: certd_koa_hostname: 0.0.0.0 ``` +## 6. DNS记录问题 + +1. DNS 不要设置CAA记录，删除即可 + +2. DNSSEC相关报错，DNSSEC管理中删除即可 + +3. DNS 有其他平台申请过的_acme-challenge记录，删除即可 + diff --git a/docs/guide/use/cert/index.md b/docs/guide/use/cert/index.md deleted file mode 100644 index 5ee385bf7..000000000 --- a/docs/guide/use/cert/index.md +++ /dev/null @@ -1,10 +0,0 @@ -# 证书申请失败情况 - - -## DNS记录问题 - -1. DNS 不要设置CAA记录，删除即可 - -2. DNSSEC相关报错，DNSSEC管理中删除即可 - -3. DNS 有其他平台申请过的_acme-challenge记录，删除即可 diff --git a/docs/guide/use/cert/ip.md b/docs/guide/use/cert/ip.md new file mode 100644 index 000000000..b6cf1ddb9 --- /dev/null +++ b/docs/guide/use/cert/ip.md @@ -0,0 +1,11 @@ +# IP证书申请 +certd已支持IP证书申请 + +> 注意：IP证书有效期只有7天。 + +## 申请方式 +相比普通的域名证书申请方式区别在于： +1. 域名栏填写IP +2. 校验方式选择HTTP（只能HTTP） +3. 证书颁发机构选择默认的Let's Encrypt +4. 过期更新天数改成2天 \ No newline at end of file diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts index 0547cc56b..8c84f271a 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts @@ -20,7 +20,7 @@ export abstract class CertApplyBasePlugin extends CertApplyBaseConvertPlugin { @TaskInput({ title: "更新天数", - value: 35, + value: 18, component: { name: "a-input-number", vModel: "value", 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 7774cda01..928ea4ad4 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts @@ -93,7 +93,7 @@ const preferredChainMergeScript = (() => { desc: "免费通配符域名证书申请，支持多个域名打到同一个证书上", default: { input: { - renewDays: 35, + renewDays: 18, forceUpdate: false, }, strategy: { diff --git a/packages/ui/certd-client/src/locales/langs/en-US/guide.ts b/packages/ui/certd-client/src/locales/langs/en-US/guide.ts index d74edfb7b..773a743e4 100644 --- a/packages/ui/certd-client/src/locales/langs/en-US/guide.ts +++ b/packages/ui/certd-client/src/locales/langs/en-US/guide.ts @@ -61,7 +61,7 @@ export default { description: "Automatic running", setSchedule: "Set Scheduled Execution", pipelineSuccessThenSchedule: "Pipeline tests succeed, then configure scheduled triggers so it runs automatically daily", - recommendDailyRun: "Recommend configuring to run once daily; new certs requested 35 days before expiry and auto-skipped otherwise", + recommendDailyRun: "Recommend configuring to run once daily; new certs requested 18 days before expiry and auto-skipped otherwise", setEmailNotification: "Set Email Notifications", suggestErrorAndRecoveryEmails: "Suggest listening for 'On Error' and 'Error to Success' to quickly troubleshoot failures (basic version requires mail server setup)", tutorialEndTitle: "Tutorial End", diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/guide.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/guide.ts index ee186675e..28af8a22e 100644 --- a/packages/ui/certd-client/src/locales/langs/zh-CN/guide.ts +++ b/packages/ui/certd-client/src/locales/langs/zh-CN/guide.ts @@ -61,7 +61,7 @@ export default { description: "自动运行", setSchedule: "设置定时执行", pipelineSuccessThenSchedule: "流水线测试成功，接下来配置定时触发，以后每天定时执行就不用管了", - recommendDailyRun: "推荐配置每天运行一次，默认到期前35天会重新申请新证书并部署，没到期前会自动跳过，不会重复申请。", + recommendDailyRun: "推荐配置每天运行一次，默认到期前18天会重新申请新证书并部署，没到期前会自动跳过，不会重复申请。", setEmailNotification: "设置邮件通知", suggestErrorAndRecoveryEmails: "建议选择监听'错误时'和'错误转成功'两种即可，在意外失败时可以尽快去排查问题", tutorialEndTitle: "教程结束", diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts index f2544a408..cc56c52a7 100644 --- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts +++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts @@ -996,7 +996,7 @@ export class PipelineService extends BaseService { title: "申请证书", runnableType: "step", input: { - renewDays: 35, + renewDays: 18, domains: req.domains, email: req.email, "challengeType": "auto", diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/delete-expiring-cert/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/delete-expiring-cert/index.ts index 5dd12b59e..f414c5229 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/delete-expiring-cert/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/delete-expiring-cert/index.ts @@ -54,8 +54,8 @@ export class TencentDeleteExpiringCert extends AbstractPlusTaskPlugin { @TaskInput({ title: '即将过期天数', helper: - '仅删除有效期小于此天数的证书,\n注意：`1.26.14`版本之前Certd创建的证书流水线默认是到期前20天才更新证书，需要将之前创建的证书申请任务的更新天数改为35天，保证删除之前就已经替换掉即将过期证书', - value: 30, + '仅删除有效期小于此天数的证书', + value: 18, component: { name: 'a-input-number', vModel: 'value',