From 1f42f933f07860b27aa3d016e40916ff2b063eac Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 14 Oct 2025 23:24:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=9B=91=E6=8E=A7=EF=BC=8C=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E6=9B=B4=E6=96=B0=E5=88=B0=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=BA=86=EF=BC=8C=E4=BB=8D=E7=84=B6=E5=8F=91?= =?UTF-8?q?=E5=87=BA=E8=AD=A6=E5=91=8A=E9=80=9A=E7=9F=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/monitor/service/site-info-service.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts index a131eee7..13f415df 100644 --- a/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts +++ b/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts @@ -169,8 +169,9 @@ export class SiteInfoService extends BaseService { if (!notify) { return; } + try { - await this.sendExpiresNotify(site); + await this.sendExpiresNotify(site.id); } catch (e) { logger.error("send notify error", e); } @@ -186,7 +187,7 @@ export class SiteInfoService extends BaseService { return; } try { - await this.sendCheckErrorNotify(site); + await this.sendCheckErrorNotify(site.id); } catch (e) { logger.error("send notify error", e); } @@ -231,8 +232,7 @@ export class SiteInfoService extends BaseService { ipErrorCount: errorCount }); try { - site = await this.info(site.id); - await this.sendCheckErrorNotify(site, true); + await this.sendCheckErrorNotify(site.id, true); } catch (e) { logger.error("send notify error", e); } @@ -254,7 +254,8 @@ export class SiteInfoService extends BaseService { return await this.doCheck(site, notify, retryTimes); } - async sendCheckErrorNotify(site: SiteInfoEntity, fromIpCheck = false) { + async sendCheckErrorNotify(siteId: number, fromIpCheck = false) { + const site = await this.info(siteId); const url = await this.notificationService.getBindUrl("#/certd/monitor/site"); const setting = await this.userSettingsService.getSetting(site.userId, UserSiteMonitorSetting) // 发邮件 @@ -274,7 +275,8 @@ export class SiteInfoService extends BaseService { ); } - async sendExpiresNotify(site: SiteInfoEntity) { + async sendExpiresNotify(siteId: number) { + const site = await this.info(siteId); const setting = await this.userSettingsService.getSetting(site.userId, UserSiteMonitorSetting) const tipDays = setting?.certValidDays || 10;