diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts index 20351c23a..4c949b63a 100644 --- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts @@ -281,6 +281,7 @@ export default { lastCheckTime: "Last Check Time", disabled: "Enable/Disable", ipCheck: "Enable IP Check", + ipSyncAuto: "Enable IP Sync Auto", selectRequired: "Please select", ipCheckConfirm: "Are you sure to {status} IP check?", ipCount: "IP Count", diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts index 7d41eb38b..02e874e5b 100644 --- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts @@ -285,6 +285,7 @@ export default { lastCheckTime: "上次检查时间", disabled: "禁用启用", ipCheck: "开启IP检查", + ipSyncAuto: "自动同步IP", selectRequired: "请选择", ipCheckConfirm: "确定{status}IP检查?", ipCount: "IP数量", diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx index 006010ee4..f48fca630 100644 --- a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx @@ -651,14 +651,20 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat }, }, } as ColumnCompositionProps, - ipCount: { - title: t("certd.monitor.ipCount"), - search: { - show: false, - }, - type: "text", + ipSyncAuto: { + title: t("certd.monitor.ipSyncAuto"), + type: "dict-switch", + dict: dict({ + data: [ + { label: t("common.enabled"), value: true, color: "green" }, + { label: t("common.disabled"), value: false, color: "gray" }, + ], + }), form: { - show: false, + value: true, + show: compute(({ form }) => { + return form.ipCheck; + }), }, column: { width: 100, diff --git a/packages/ui/certd-server/db/migration/v10036__ipcheck.sql b/packages/ui/certd-server/db/migration/v10036__ipcheck.sql index b354ce961..1b4549e24 100644 --- a/packages/ui/certd-server/db/migration/v10036__ipcheck.sql +++ b/packages/ui/certd-server/db/migration/v10036__ipcheck.sql @@ -1,4 +1,4 @@ -ALTER TABLE cd_site_info ADD COLUMN ip_scan boolean DEFAULT (0); +ALTER TABLE cd_site_info ADD COLUMN ip_sync_auto boolean DEFAULT (0); ALTER TABLE pi_pipeline ADD COLUMN webhook_key varchar(100); ALTER TABLE pi_pipeline ADD COLUMN trigger_count integer DEFAULT (0); diff --git a/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts b/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts index 3882d406a..36591f6a5 100644 --- a/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts +++ b/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts @@ -46,8 +46,8 @@ export class SiteInfoEntity { @Column({ name: 'ip_check', comment: '是否检查IP' }) ipCheck: boolean; - @Column({ name: 'ip_scan', comment: '是否自动获取IP' }) - ipScan: boolean; + @Column({ name: 'ip_sync_auto', comment: '是否自动同步IP' }) + ipSyncAuto: boolean; @Column({ name: 'ip_count', comment: 'ip数量' }) ipCount: number 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 4bbca791f..5aae1cf71 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 @@ -237,7 +237,12 @@ export class SiteInfoService extends BaseService { logger.error("send notify error", e); } }; - await this.siteIpService.syncAndCheck(site, retryTimes,onFinished); + if (!site.ipSyncAuto) { + await this.siteIpService.checkAll(site, retryTimes,onFinished); + }else{ + await this.siteIpService.syncAndCheck(site, retryTimes,onFinished); + } + } /**