From 92c9ac382692e6c84140ff787759ab6d39ccbe96 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 3 Mar 2026 14:35:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(cert-plugin):=20=E4=BC=98=E5=8C=96=E5=8F=88?= =?UTF-8?q?=E6=8B=8D=E4=BA=91=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E5=BD=93=E5=9F=9F?= =?UTF-8?q?=E5=90=8D=E5=B7=B2=E7=BB=91=E5=AE=9A=E8=AF=81=E4=B9=A6=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/plugin-cert/plugin/cert-plugin/base.ts | 2 +- .../plugin-cert/plugin/cert-plugin/lego/index.ts | 2 +- .../certd-server/src/plugins/plugin-upyun/client.ts | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base.ts b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base.ts index 24499090e..ca6622d81 100644 --- a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base.ts +++ b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base.ts @@ -133,7 +133,7 @@ export abstract class CertApplyBasePlugin extends CertApplyBaseConvertPlugin { } /** - * 检查是否过期,默认提前35天 + * 检查是否过期,默认提前15天 * @param expires * @param maxDays */ diff --git a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/lego/index.ts b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/lego/index.ts index 2f9e84942..93f617952 100644 --- a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/lego/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/lego/index.ts @@ -16,7 +16,7 @@ import { PrivateKeyType } from "./dns.js"; desc: "支持海量DNS解析提供商,推荐使用,一样的免费通配符域名证书申请,支持多个域名打到同一个证书上", default: { input: { - renewDays: 35, + renewDays: 15, forceUpdate: false, }, strategy: { diff --git a/packages/ui/certd-server/src/plugins/plugin-upyun/client.ts b/packages/ui/certd-server/src/plugins/plugin-upyun/client.ts index be86799cd..5d33c1811 100644 --- a/packages/ui/certd-server/src/plugins/plugin-upyun/client.ts +++ b/packages/ui/certd-server/src/plugins/plugin-upyun/client.ts @@ -71,11 +71,18 @@ export class UpyunClient { Cookie: req.cookie } }); + let errorMessage = null; if (res.msg?.errors?.length > 0) { - throw new Error(JSON.stringify(res.msg)); + errorMessage = JSON.stringify(res.msg); } if(res.data?.error_code){ - throw new Error(res.data?.message); + errorMessage = res.data?.message; + } + if(errorMessage){ + if (errorMessage.includes("domain has been bound to this certificate")) { + return res; + } + throw new Error(errorMessage); } return res; }