github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修复站点证书监控，证书已经更新到最新日期了，仍然发出警告通知的bug

v2
xiaojunnuo 2025-10-14 23:24:47 +08:00
parent 6c533d225b
commit 1f42f933f0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
View File

@ -169,8 +169,9 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
if (!notify) { if (!notify) {
return; return;
} }
try { try {
await this.sendExpiresNotify(site); await this.sendExpiresNotify(site.id);
} catch (e) { } catch (e) {
logger.error("send notify error", e); logger.error("send notify error", e);
} }
@ -186,7 +187,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
return; return;
} }
try { try {
await this.sendCheckErrorNotify(site); await this.sendCheckErrorNotify(site.id);
} catch (e) { } catch (e) {
logger.error("send notify error", e); logger.error("send notify error", e);
} }
@ -231,8 +232,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
ipErrorCount: errorCount ipErrorCount: errorCount
}); });
try { try {
site = await this.info(site.id); await this.sendCheckErrorNotify(site.id, true);
await this.sendCheckErrorNotify(site, true);
} catch (e) { } catch (e) {
logger.error("send notify error", e); logger.error("send notify error", e);
} }
@ -254,7 +254,8 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
return await this.doCheck(site, notify, retryTimes); 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 url = await this.notificationService.getBindUrl("#/certd/monitor/site");
const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(site.userId, UserSiteMonitorSetting) const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(site.userId, UserSiteMonitorSetting)
// 发邮件 // 发邮件
@ -274,7 +275,8 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
); );
} }
async sendExpiresNotify(site: SiteInfoEntity) { async sendExpiresNotify(siteId: number) {
const site = await this.info(siteId);
const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(site.userId, UserSiteMonitorSetting) const setting = await this.userSettingsService.getSetting<UserSiteMonitorSetting>(site.userId, UserSiteMonitorSetting)
const tipDays = setting?.certValidDays || 10; const tipDays = setting?.certValidDays || 10;