From 506385e5a2600887fe30854e0713583caaa2e689 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sat, 13 Sep 2025 23:59:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=89=98=E7=AE=A1=E6=97=B6=E6=96=B0=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E7=9A=84=E8=AF=81=E4=B9=A6=E6=97=A0=E6=95=88=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin-cert/src/plugin/cert-plugin/custom/index.ts | 8 ++++++-- .../db/migration-mysql/v10029__cert_effective_time.sql | 2 -- .../db/migration-pg/v10029__cert_effective_time.sql | 2 -- .../db/migration/{v10029__addon.sql => v10030__addon.sql} | 0 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 packages/ui/certd-server/db/migration-mysql/v10029__cert_effective_time.sql delete mode 100644 packages/ui/certd-server/db/migration-pg/v10029__cert_effective_time.sql rename packages/ui/certd-server/db/migration/{v10029__addon.sql => v10030__addon.sql} (100%) diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/custom/index.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/custom/index.ts index d11a719c..841b8914 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/custom/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/custom/index.ts @@ -118,7 +118,7 @@ export class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin { } async execute(): Promise { - const certReader = await this.getCertFromStore(); + let certReader = await this.getCertFromStore(); const crtMd5 = this.ctx.utils.hash.md5(certReader.cert.crt); const leftDays = dayjs(certReader.expires).diff(dayjs(), "day"); @@ -141,9 +141,13 @@ export class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin { this.logger.info("输入参数有变化，重新部署"); } + certReader = new CertReader(this.uploadCert); this.clearLastStatus(); //输出证书MD5 - this.certMd5 = crtMd5; + this.certMd5 = this.ctx.utils.hash.md5(certReader.cert.crt); + const newLeftDays = dayjs(certReader.expires).diff(dayjs(), "day"); + this.logger.info(`新证书过期时间${dayjs(certReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${newLeftDays}天`); + await this.output(certReader, true); //必须output之后执行 diff --git a/packages/ui/certd-server/db/migration-mysql/v10029__cert_effective_time.sql b/packages/ui/certd-server/db/migration-mysql/v10029__cert_effective_time.sql deleted file mode 100644 index b38feb3c..00000000 --- a/packages/ui/certd-server/db/migration-mysql/v10029__cert_effective_time.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE cd_cert_info ADD COLUMN effective_time INTEGER; -ALTER TABLE cd_site_info ADD COLUMN cert_effective_time INTEGER; diff --git a/packages/ui/certd-server/db/migration-pg/v10029__cert_effective_time.sql b/packages/ui/certd-server/db/migration-pg/v10029__cert_effective_time.sql deleted file mode 100644 index b38feb3c..00000000 --- a/packages/ui/certd-server/db/migration-pg/v10029__cert_effective_time.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE cd_cert_info ADD COLUMN effective_time INTEGER; -ALTER TABLE cd_site_info ADD COLUMN cert_effective_time INTEGER; diff --git a/packages/ui/certd-server/db/migration/v10029__addon.sql b/packages/ui/certd-server/db/migration/v10030__addon.sql similarity index 100% rename from packages/ui/certd-server/db/migration/v10029__addon.sql rename to packages/ui/certd-server/db/migration/v10030__addon.sql