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 018da9e1d..bd27ae862 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", + ipCheckHelper: "Enable to check certificate expiration time on each IP (or source site domain) ", ipSyncAuto: "Enable IP Sync Auto", ipSyncMode: "IP Sync Mode", ipIgnoreCoherence: "Ignore Certificate Coherence", @@ -519,7 +520,7 @@ export default { notificationCheckSubmittedPleaseRefresh: "Check task submitted, please refresh later", columnId: "ID", columnIp: "IP", - helperIpCname: "Supports entering CNAME domain name", + helperIpCname: "Supports entering CNAME domain name or source site domain name", ruleIpRequired: "Please enter IP", columnCertDomains: "Certificate Domains", columnCertProvider: "Issuer", 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 17030ec5b..7dfac1316 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检查", + ipCheckHelper: "开启后,会检查IP(或源站)上的证书有效期", ipSyncAuto: "自动同步IP", ipSyncMode: "IP同步模式", ipSyncModeHelper: "选择仅检查IPv4或IPv6,或检查所有IP", @@ -529,7 +530,7 @@ export default { notificationCheckSubmittedPleaseRefresh: "检查任务已提交,请稍后刷新查看结果", columnId: "ID", columnIp: "IP", - helperIpCname: "也支持填写CNAME域名", + helperIpCname: "也支持填写CNAME域名,源站域名", ruleIpRequired: "请输入IP", columnCertDomains: "证书域名", columnCertProvider: "颁发机构", 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 713c6b5ec..70142a1e3 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 @@ -660,6 +660,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat ], }), form: { + helper: t("certd.monitor.ipCheckHelper"), value: false, rules: [{ required: true, message: t("certd.monitor.selectRequired") }], }, diff --git a/packages/ui/certd-server/db/migration-mysql/v10036__ipcheck.sql b/packages/ui/certd-server/db/migration-mysql/v10036__ipcheck.sql new file mode 100644 index 000000000..b6565a8d8 --- /dev/null +++ b/packages/ui/certd-server/db/migration-mysql/v10036__ipcheck.sql @@ -0,0 +1,8 @@ +ALTER TABLE cd_site_info ADD COLUMN ip_sync_auto boolean; +ALTER TABLE cd_site_info ADD COLUMN ip_sync_mode varchar(20); +ALTER TABLE cd_site_info ADD COLUMN ip_ignore_coherence boolean; + +ALTER TABLE pi_pipeline ADD COLUMN webhook_key varchar(100); +ALTER TABLE pi_pipeline ADD COLUMN trigger_count bigint DEFAULT 0; + +CREATE INDEX `index_pipeline_webhook_key` ON `pi_pipeline` (`webhook_key`); diff --git a/packages/ui/certd-server/db/migration-pg/v10036__ipcheck.sql b/packages/ui/certd-server/db/migration-pg/v10036__ipcheck.sql new file mode 100644 index 000000000..4b45b7be3 --- /dev/null +++ b/packages/ui/certd-server/db/migration-pg/v10036__ipcheck.sql @@ -0,0 +1,8 @@ +ALTER TABLE cd_site_info ADD COLUMN ip_sync_auto boolean; +ALTER TABLE cd_site_info ADD COLUMN ip_sync_mode varchar(20); +ALTER TABLE cd_site_info ADD COLUMN ip_ignore_coherence boolean; + +ALTER TABLE pi_pipeline ADD COLUMN webhook_key varchar(100); +ALTER TABLE pi_pipeline ADD COLUMN trigger_count bigint DEFAULT (0); + +CREATE INDEX "index_pipeline_webhook_key" ON "pi_pipeline" ("webhook_key");