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

fix: 修复站点监控通知渠道设置无效的bug

pull/436/head
xiaojunnuo 2025-06-06 16:12:30 +08:00
parent 2eb0e54909
commit a00453c83a
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,9 +239,11 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
async sendCheckErrorNotify(site: SiteInfoEntity, fromIpCheck = false) { async sendCheckErrorNotify(site: SiteInfoEntity, fromIpCheck = false) {
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)
// 发邮件 // 发邮件
await this.notificationService.send( await this.notificationService.send(
{ {
id: setting?.notificationId,
useDefault: true, useDefault: true,
logger: logger, logger: logger,
body: { body: {
@ -262,11 +264,13 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
const expires = site.certExpiresTime; const expires = site.certExpiresTime;
const validDays = dayjs(expires).diff(dayjs(), "day"); const validDays = dayjs(expires).diff(dayjs(), "day");
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 content = `站点名称： ${site.name} \n站点域名： ${site.domain} \n证书域名： ${site.certDomains} \n颁发机构： ${site.certProvider} \n过期时间： ${dayjs(site.certExpiresTime).format("YYYY-MM-DD")} \n`; const content = `站点名称： ${site.name} \n站点域名： ${site.domain} \n证书域名： ${site.certDomains} \n颁发机构： ${site.certProvider} \n过期时间： ${dayjs(site.certExpiresTime).format("YYYY-MM-DD")} \n`;
if (validDays >= 0 && validDays < tipDays) { if (validDays >= 0 && validDays < tipDays) {
// 发通知 // 发通知
await this.notificationService.send( await this.notificationService.send(
{ {
id: setting?.notificationId,
useDefault: true, useDefault: true,
logger: logger, logger: logger,
body: { body: {
@ -281,6 +285,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
//发过期通知 //发过期通知
await this.notificationService.send( await this.notificationService.send(
{ {
id: setting?.notificationId,
useDefault: true, useDefault: true,
logger: logger, logger: logger,
body: { body: {