From a7e45dace0013147e36469939658179247abf56c Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sun, 19 Jan 2025 23:27:39 +0800 Subject: [PATCH] chore: --- .../src/router/source/modules/sys.ts | 2 +- .../src/views/sys/settings/email/index.vue | 2 +- .../db/migration-mysql/v10020__open.sql | 16 ++++++++++++++++ .../db/migration-pg/v10020__open.sql | 16 ++++++++++++++++ .../modules/monitor/service/cert-info-service.ts | 7 +++---- 5 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 packages/ui/certd-server/db/migration-mysql/v10020__open.sql create mode 100644 packages/ui/certd-server/db/migration-pg/v10020__open.sql diff --git a/packages/ui/certd-client/src/router/source/modules/sys.ts b/packages/ui/certd-client/src/router/source/modules/sys.ts index b633464f..ab8827dd 100644 --- a/packages/ui/certd-client/src/router/source/modules/sys.ts +++ b/packages/ui/certd-client/src/router/source/modules/sys.ts @@ -49,7 +49,7 @@ export const sysResources = [ } }, { - title: "邮箱设置", + title: "邮件服务器设置", name: "EmailSetting", path: "/sys/settings/email", component: "/sys/settings/email/index.vue", diff --git a/packages/ui/certd-client/src/views/sys/settings/email/index.vue b/packages/ui/certd-client/src/views/sys/settings/email/index.vue index 955f7cb4..624bd4f8 100644 --- a/packages/ui/certd-client/src/views/sys/settings/email/index.vue +++ b/packages/ui/certd-client/src/views/sys/settings/email/index.vue @@ -2,7 +2,7 @@ diff --git a/packages/ui/certd-server/db/migration-mysql/v10020__open.sql b/packages/ui/certd-server/db/migration-mysql/v10020__open.sql new file mode 100644 index 00000000..6c221aec --- /dev/null +++ b/packages/ui/certd-server/db/migration-mysql/v10020__open.sql @@ -0,0 +1,16 @@ +CREATE TABLE `cd_open_key` +( + `id` bigint PRIMARY KEY AUTO_INCREMENT NOT NULL, + `user_id` bigint, + `key_id` varchar(50), + `key_secret` varchar(100), + `scope` varchar(50), + `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_open_key_user_id` ON `cd_open_key` (`user_id`); +CREATE INDEX `index_open_key_key_id` ON `cd_open_key` (`key_id`); diff --git a/packages/ui/certd-server/db/migration-pg/v10020__open.sql b/packages/ui/certd-server/db/migration-pg/v10020__open.sql new file mode 100644 index 00000000..2c6f85ad --- /dev/null +++ b/packages/ui/certd-server/db/migration-pg/v10020__open.sql @@ -0,0 +1,16 @@ +CREATE TABLE "cd_open_key" +( + "id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, + "user_id" bigint, + "key_id" varchar(50), + "key_secret" varchar(100), + "scope" varchar(50), + "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_open_key_user_id" ON "cd_open_key" ("user_id"); +CREATE INDEX "index_open_key_key_id" ON "cd_open_key" ("key_id"); diff --git a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts index 13b919f4..9c8482bd 100644 --- a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts +++ b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts @@ -131,11 +131,10 @@ export class CertInfoService extends BaseService { pipelineId, }, }); - if (!found) { - return; - } const bean = new CertInfoEntity(); - bean.id = found.id; + if (found) { + bean.id = found.id; + } const certInfo = certReader.toCertInfo(); bean.certInfo = JSON.stringify(certInfo); bean.applyTime = new Date().getTime();