From 45d6347f5b6199493b11aabdd74177f6dca2cea4 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Mon, 23 Dec 2024 13:27:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/basic/src/utils/util.env.ts | 2 +- packages/core/pipeline/src/plugin/api.ts | 2 +- packages/ui/certd-client/package.json | 1 + .../src/views/certd/suite/order-modal.vue | 93 ++++++++++++++----- ...env.commpro.yaml => .env.dev-commpro.yaml} | 0 ....env.mysqldev.yaml => .env.dev-mysql.yaml} | 0 .../{.env.devnew.yaml => .env.dev-new.yaml} | 0 .../{.env.pgdev.yaml => .env.dev-pg.yaml} | 0 .../{.env.pgpl.yaml => .env.dev-pgpl.yaml} | 0 ...localplus.yaml => .env.dev-pluslocal.yaml} | 0 .../db/migration/v10018__suite.sql | 1 + packages/ui/certd-server/package.json | 16 ++-- .../certd-server/src/modules/auto/auto-z.ts | 14 ++- 13 files changed, 94 insertions(+), 35 deletions(-) rename packages/ui/certd-server/{.env.commpro.yaml => .env.dev-commpro.yaml} (100%) rename packages/ui/certd-server/{.env.mysqldev.yaml => .env.dev-mysql.yaml} (100%) rename packages/ui/certd-server/{.env.devnew.yaml => .env.dev-new.yaml} (100%) rename packages/ui/certd-server/{.env.pgdev.yaml => .env.dev-pg.yaml} (100%) rename packages/ui/certd-server/{.env.pgpl.yaml => .env.dev-pgpl.yaml} (100%) rename packages/ui/certd-server/{.env.localplus.yaml => .env.dev-pluslocal.yaml} (100%) diff --git a/packages/core/basic/src/utils/util.env.ts b/packages/core/basic/src/utils/util.env.ts index 65983bcac..f92f5fc91 100644 --- a/packages/core/basic/src/utils/util.env.ts +++ b/packages/core/basic/src/utils/util.env.ts @@ -1,4 +1,4 @@ export function isDev() { const nodeEnv = process.env.NODE_ENV || ''; - return nodeEnv === 'development' || nodeEnv.indexOf('local') >= 0; + return nodeEnv === 'development' || nodeEnv.indexOf('local') >= 0 || nodeEnv.includes('dev'); } diff --git a/packages/core/pipeline/src/plugin/api.ts b/packages/core/pipeline/src/plugin/api.ts index e303a1dd2..d2590422a 100644 --- a/packages/core/pipeline/src/plugin/api.ts +++ b/packages/core/pipeline/src/plugin/api.ts @@ -184,7 +184,7 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin { return; } - abstract execute(): Promise; + abstract execute(): Promise; appendTimeSuffix(name?: string) { if (name == null) { diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index f28c0d98f..80e21742d 100644 --- a/packages/ui/certd-client/package.json +++ b/packages/ui/certd-client/package.json @@ -56,6 +56,7 @@ "pinia": "2.1.7", "psl": "^1.9.0", "qiniu-js": "^3.4.2", + "qrcode": "^1.5.4", "sortablejs": "^1.15.2", "vue": "^3.4.21", "vue-cropperjs": "^5.0.0", 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 1a935f2c5..2106fa616 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 @@ -1,39 +1,39 @@ - + diff --git a/packages/ui/certd-server/.env.commpro.yaml b/packages/ui/certd-server/.env.dev-commpro.yaml similarity index 100% rename from packages/ui/certd-server/.env.commpro.yaml rename to packages/ui/certd-server/.env.dev-commpro.yaml diff --git a/packages/ui/certd-server/.env.mysqldev.yaml b/packages/ui/certd-server/.env.dev-mysql.yaml similarity index 100% rename from packages/ui/certd-server/.env.mysqldev.yaml rename to packages/ui/certd-server/.env.dev-mysql.yaml diff --git a/packages/ui/certd-server/.env.devnew.yaml b/packages/ui/certd-server/.env.dev-new.yaml similarity index 100% rename from packages/ui/certd-server/.env.devnew.yaml rename to packages/ui/certd-server/.env.dev-new.yaml diff --git a/packages/ui/certd-server/.env.pgdev.yaml b/packages/ui/certd-server/.env.dev-pg.yaml similarity index 100% rename from packages/ui/certd-server/.env.pgdev.yaml rename to packages/ui/certd-server/.env.dev-pg.yaml diff --git a/packages/ui/certd-server/.env.pgpl.yaml b/packages/ui/certd-server/.env.dev-pgpl.yaml similarity index 100% rename from packages/ui/certd-server/.env.pgpl.yaml rename to packages/ui/certd-server/.env.dev-pgpl.yaml diff --git a/packages/ui/certd-server/.env.localplus.yaml b/packages/ui/certd-server/.env.dev-pluslocal.yaml similarity index 100% rename from packages/ui/certd-server/.env.localplus.yaml rename to packages/ui/certd-server/.env.dev-pluslocal.yaml diff --git a/packages/ui/certd-server/db/migration/v10018__suite.sql b/packages/ui/certd-server/db/migration/v10018__suite.sql index 4450d0c16..52286cb9b 100644 --- a/packages/ui/certd-server/db/migration/v10018__suite.sql +++ b/packages/ui/certd-server/db/migration/v10018__suite.sql @@ -53,6 +53,7 @@ CREATE TABLE "cd_user_suite" "title" varchar(100), "content" text, "duration" integer, + "product_type" varchar(50), "deploy_count_used" integer, "is_present" boolean, "is_bootstrap" boolean, diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index e9673b215..0eae82e5c 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -7,14 +7,14 @@ "scripts": { "start": "cross-env NODE_ENV=production node ./bootstrap.js", "dev": "cross-env NODE_ENV=local mwtsc --watch --run @midwayjs/mock/app", - "commdev": "cross-env NODE_ENV=commdev mwtsc --watch --run @midwayjs/mock/app", - "commpro": "cross-env NODE_ENV=commpro mwtsc --watch --run @midwayjs/mock/app", - "pgdev": "cross-env NODE_ENV=pgdev mwtsc --watch --run @midwayjs/mock/app", - "mysqldev": "cross-env NODE_ENV=mysqldev mwtsc --watch --run @midwayjs/mock/app", - "local-plus": "cross-env NODE_ENV=localplus mwtsc --watch --run @midwayjs/mock/app", - "pgpl": "cross-env NODE_ENV=pgpl mwtsc --watch --run @midwayjs/mock/app", - "dev-new": "cross-env NODE_ENV=devnew mwtsc --watch --run @midwayjs/mock/app", - "rm-db-new": "rimraf ./data/db-new.sqlite", + "dev-commlocal": "cross-env NODE_ENV=dev-commlocal mwtsc --watch --run @midwayjs/mock/app", + "dev-commpro": "cross-env NODE_ENV=dev-commpro mwtsc --watch --run @midwayjs/mock/app", + "dev-pgd": "cross-env NODE_ENV=dev-pgd mwtsc --watch --run @midwayjs/mock/app", + "dev-mysql": "cross-env NODE_ENV=dev-mysql 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", + "rm-newdb": "rimraf ./data/db-new.sqlite", "test": "cross-env NODE_ENV=unittest mocha", "cov": "cross-env c8 --all --reporter=text --reporter=lcovonly npm run test", "lint": "mwts check", diff --git a/packages/ui/certd-server/src/modules/auto/auto-z.ts b/packages/ui/certd-server/src/modules/auto/auto-z.ts index 4fa2bd3c2..373a239f0 100644 --- a/packages/ui/certd-server/src/modules/auto/auto-z.ts +++ b/packages/ui/certd-server/src/modules/auto/auto-z.ts @@ -1,6 +1,6 @@ import { App, Autoload, Config, Init, Inject, Scope, ScopeEnum } from '@midwayjs/core'; import { getPlusInfo, isPlus } from '@certd/plus-core'; -import { logger } from '@certd/basic'; +import { isDev, logger } from '@certd/basic'; import { SysInstallInfo, SysSettingsService } from '@certd/lib-server'; import { getVersion } from '../../utils/version.js'; @@ -36,6 +36,18 @@ export class AutoZPrint { } logger.info('Certd已启动'); logger.info('========================================='); + if (isDev()) { + this.startHeapLog(); + } + } + + startHeapLog() { + function format(bytes: any) { + return (bytes / 1024 / 1024).toFixed(2) + ' MB'; + } + setInterval(() => { + logger.info(`heapUsed: ${format(process.memoryUsage().heapUsed)}`); + }, 60000); } async startHttpsServer() {