From 442f9647a25dc04b012ef4004646a108d4a5bad4 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 28 May 2025 23:01:55 +0800 Subject: [PATCH] chore: --- .../plugins/plugin-lib/src/common/util.ts | 2 +- .../plugins/common/remote-select.vue | 2 +- .../db/migration-mysql/v10023__site_ip.sql | 29 +++++++++++++++++++ .../db/migration-pg/v10023__site_ip.sql | 28 ++++++++++++++++++ .../monitor/service/site-info-service.ts | 3 ++ .../monitor/service/site-ip-service.ts | 2 +- 6 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 packages/ui/certd-server/db/migration-mysql/v10023__site_ip.sql create mode 100644 packages/ui/certd-server/db/migration-pg/v10023__site_ip.sql diff --git a/packages/plugins/plugin-lib/src/common/util.ts b/packages/plugins/plugin-lib/src/common/util.ts index ba060170..beaf1585 100644 --- a/packages/plugins/plugin-lib/src/common/util.ts +++ b/packages/plugins/plugin-lib/src/common/util.ts @@ -51,7 +51,7 @@ export function createRemoteSelectInputDefine(opts?: { const watches = opts?.watches || []; const helper = opts?.helper || "请选择"; const search = opts?.search ?? false; - const pager = opts?.pager ?? true; + const pager = opts?.pager ?? false; let mode = "tags"; if (opts.multi === false) { mode = undefined; diff --git a/packages/ui/certd-client/src/components/plugins/common/remote-select.vue b/packages/ui/certd-client/src/components/plugins/common/remote-select.vue index 05c24ffe..377a2162 100644 --- a/packages/ui/certd-client/src/components/plugins/common/remote-select.vue +++ b/packages/ui/certd-client/src/components/plugins/common/remote-select.vue @@ -20,7 +20,7 @@ -
+
diff --git a/packages/ui/certd-server/db/migration-mysql/v10023__site_ip.sql b/packages/ui/certd-server/db/migration-mysql/v10023__site_ip.sql new file mode 100644 index 00000000..a1a18d9c --- /dev/null +++ b/packages/ui/certd-server/db/migration-mysql/v10023__site_ip.sql @@ -0,0 +1,29 @@ + +ALTER TABLE cd_site_info ADD COLUMN `ip_check` boolean; +ALTER TABLE cd_site_info ADD COLUMN `ip_count` bigint; +ALTER TABLE cd_site_info ADD COLUMN `ip_error_count` bigint; +ALTER TABLE cd_site_info MODIFY COLUMN `error` longtext NULL; + + +CREATE TABLE `cd_site_ip` +( + `id` bigint PRIMARY KEY AUTO_INCREMENT NOT NULL, + `user_id` bigint, + `site_id` bigint, + `ip_address` varchar(100), + `cert_domains` varchar(10240), + `cert_provider` varchar(100), + `cert_status` varchar(100), + `cert_expires_time` bigint, + `last_check_time` bigint, + `check_status` varchar(100), + `error` longtext, + `remark` varchar(4096), + `from` varchar(100), + `disabled` boolean NOT NULL DEFAULT false, + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP +); + +CREATE INDEX `index_site_ip_user_id` ON `cd_site_ip` (`user_id`); +CREATE INDEX `index_site_ip_site_id` ON `cd_site_ip` (`site_id`); diff --git a/packages/ui/certd-server/db/migration-pg/v10023__site_ip.sql b/packages/ui/certd-server/db/migration-pg/v10023__site_ip.sql new file mode 100644 index 00000000..41b186bc --- /dev/null +++ b/packages/ui/certd-server/db/migration-pg/v10023__site_ip.sql @@ -0,0 +1,28 @@ + +ALTER TABLE cd_site_info ADD COLUMN "ip_check" boolean; +ALTER TABLE cd_site_info ADD COLUMN "ip_count" bigint; +ALTER TABLE cd_site_info ADD COLUMN "ip_error_count" bigint; +alter table cd_site_info alter column error type text using error::text; + +CREATE TABLE "cd_site_ip" +( + "id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, + "user_id" bigint, + "site_id" bigint, + "ip_address" varchar(100), + "cert_domains" varchar(10240), + "cert_provider" varchar(100), + "cert_status" varchar(100), + "cert_expires_time" bigint, + "last_check_time" bigint, + "check_status" varchar(100), + "error" text, + "remark" varchar(4096), + "from" varchar(100), + "disabled" boolean NOT NULL DEFAULT (false), + "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), + "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP) +); + +CREATE INDEX "index_site_ip_user_id" ON "cd_site_ip" ("user_id"); +CREATE INDEX "index_site_ip_site_id" ON "cd_site_ip" ("site_id"); 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 baf6b94a..183dc359 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 @@ -173,6 +173,9 @@ export class SiteInfoService extends BaseService { let errorCount = 0 let errorMessage = "" for (const item of list) { + if (!item) { + continue; + } errorCount++ if(item.error){ errorMessage += `${item.ipAddress}：${item.error}； \n` diff --git a/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts b/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts index b6f7bf68..6c89975f 100644 --- a/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts +++ b/packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts @@ -180,7 +180,7 @@ export class SiteIpService extends BaseService { } Promise.all(promiseList).then((res)=>{ const finished = res.filter(item=>{ - return item + return item!=null }) if (finished.length > 0) { onFinish && onFinish(finished)