From c26ad4c8075f0606d45b8da13915737968d6191a Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 2 Sep 2025 10:37:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dmysql=E4=B8=8B?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E5=A5=97=E9=A4=90=E5=8A=A0=E9=87=8F=E5=8C=85?= =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certd-client/src/locales/langs/en-US/certd.ts | 1 + .../certd-client/src/locales/langs/zh-CN/certd.ts | 1 + .../src/views/certd/suite/order-modal.vue | 1 + packages/ui/certd-server/.env.dev-mysql-comm.yaml | 15 +++++++++++++++ .../db/migration-mysql/v10028__fix_suite.sql | 3 +++ .../db/migration-pg/v10028__fix_suite.sql | 2 ++ .../db/migration/v10028__fix_suite.sql | 1 + packages/ui/certd-server/package.json | 1 + 8 files changed, 25 insertions(+) create mode 100644 packages/ui/certd-server/.env.dev-mysql-comm.yaml create mode 100644 packages/ui/certd-server/db/migration-mysql/v10028__fix_suite.sql create mode 100644 packages/ui/certd-server/db/migration-pg/v10028__fix_suite.sql create mode 100644 packages/ui/certd-server/db/migration/v10028__fix_suite.sql 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 af8aac99..63390d5f 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 @@ -21,6 +21,7 @@ export default { pipeline: "Pipeline", domain: "Domain", deployTimes: "Deployments", + monitorCount: "DomainMonitors", duration: "Duration", price: "Price", paymentMethod: "Payment Method", 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 ed5b7207..4b667d64 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 @@ -25,6 +25,7 @@ export default { pipeline: "流水线", domain: "域名", deployTimes: "部署次数", + monitorCount: "域名监控数", duration: "时长", price: "价格", paymentMethod: "支付方式", diff --git a/packages/ui/certd-client/src/views/certd/suite/order-modal.vue b/packages/ui/certd-client/src/views/certd/suite/order-modal.vue index 276a3021..dd988142 100644 --- a/packages/ui/certd-client/src/views/certd/suite/order-modal.vue +++ b/packages/ui/certd-client/src/views/certd/suite/order-modal.vue @@ -13,6 +13,7 @@ {{ $t("certd.order.pipeline") }} {{ $t("certd.order.domain") }} {{ $t("certd.order.deployTimes") }} + {{ $t("certd.order.monitorCount") }} diff --git a/packages/ui/certd-server/.env.dev-mysql-comm.yaml b/packages/ui/certd-server/.env.dev-mysql-comm.yaml new file mode 100644 index 00000000..739a45c3 --- /dev/null +++ b/packages/ui/certd-server/.env.dev-mysql-comm.yaml @@ -0,0 +1,15 @@ +flyway: + scriptDir: './db/migration-mysql' + +typeorm: + dataSource: + default: + type: mysql # mariadb + host: localhost + port: 3309 + logging: true + username: root + password: root + database: certd_comm + + diff --git a/packages/ui/certd-server/db/migration-mysql/v10028__fix_suite.sql b/packages/ui/certd-server/db/migration-mysql/v10028__fix_suite.sql new file mode 100644 index 00000000..27a43765 --- /dev/null +++ b/packages/ui/certd-server/db/migration-mysql/v10028__fix_suite.sql @@ -0,0 +1,3 @@ +update cd_user_suite set is_empty = false where is_empty is null; + +ALTER TABLE cd_user_suite MODIFY COLUMN `is_empty` boolean default false ; diff --git a/packages/ui/certd-server/db/migration-pg/v10028__fix_suite.sql b/packages/ui/certd-server/db/migration-pg/v10028__fix_suite.sql new file mode 100644 index 00000000..6eaf3a99 --- /dev/null +++ b/packages/ui/certd-server/db/migration-pg/v10028__fix_suite.sql @@ -0,0 +1,2 @@ +update cd_user_suite set is_empty = false where is_empty is null; +ALTER TABLE "cd_user_suite" ALTER COLUMN "is_empty" SET DEFAULT false; diff --git a/packages/ui/certd-server/db/migration/v10028__fix_suite.sql b/packages/ui/certd-server/db/migration/v10028__fix_suite.sql new file mode 100644 index 00000000..521d76e8 --- /dev/null +++ b/packages/ui/certd-server/db/migration/v10028__fix_suite.sql @@ -0,0 +1 @@ +update cd_user_suite set is_empty = false where is_empty is null; diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index 2f9e3cf0..af21a922 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -11,6 +11,7 @@ "dev-commpro": "cross-env NODE_ENV=dev-commpro mwtsc --watch --run @midwayjs/mock/app", "dev-pg": "cross-env NODE_ENV=dev-pg mwtsc --watch --run @midwayjs/mock/app", "dev-mysql": "cross-env NODE_ENV=dev-mysql mwtsc --watch --run @midwayjs/mock/app", + "dev-mysql-comm": "cross-env NODE_ENV=dev-mysql-comm mwtsc --watch --run @midwayjs/mock/app", "dev-localplus": "cross-env NODE_ENV=dev-localplus mwtsc --watch --run @midwayjs/mock/app", "dev-pgpl": "cross-env NODE_ENV=dev-pgpl mwtsc --watch --run @midwayjs/mock/app", "dev-new": "cross-env NODE_ENV=dev-new mwtsc --watch --run @midwayjs/mock/app",