From 07f0d3b4d626628a0e3dfc7e5c52e8c4a98bad47 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Thu, 17 Sep 2026 23:23:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(config):=20=E4=BF=AE=E5=A4=8D=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 重构loadDotEnv方法,支持指定加载的env文件路径,增加文件存在校验 2. 跳过注释和空行的环境变量加载,添加加载日志 3. 在默认配置中加载对应环境的env文件 4. 更新开发和生产环境的env配置项 --- packages/ui/certd-server/.env | 2 +- packages/ui/certd-server/.env.production | 3 ++- .../ui/certd-server/src/config/config.default.ts | 1 + packages/ui/certd-server/src/config/loader.ts | 12 ++++++++++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/ui/certd-server/.env b/packages/ui/certd-server/.env index 253a849b1..8c60e6886 100644 --- a/packages/ui/certd-server/.env +++ b/packages/ui/certd-server/.env @@ -4,4 +4,4 @@ certd_plugin_loadmode=dev # certd_koa_port=7004 # certd_https_port=7005 -#certd_release_mode=stable +# certd_release_mode=stable diff --git a/packages/ui/certd-server/.env.production b/packages/ui/certd-server/.env.production index 3e755de5e..dcb13bd8e 100644 --- a/packages/ui/certd-server/.env.production +++ b/packages/ui/certd-server/.env.production @@ -1 +1,2 @@ -certd_plugin_loadmode=metadata +certd_plugin_loadmode=dev +# certd_release_mode=dev \ No newline at end of file diff --git a/packages/ui/certd-server/src/config/config.default.ts b/packages/ui/certd-server/src/config/config.default.ts index 30b4fe196..1cfe6c724 100644 --- a/packages/ui/certd-server/src/config/config.default.ts +++ b/packages/ui/certd-server/src/config/config.default.ts @@ -249,6 +249,7 @@ const development = { ], }, } as MidwayConfig; +loadDotEnv(`.env.${env}`); loadDotEnv(); mergeConfig(development, "development"); diff --git a/packages/ui/certd-server/src/config/loader.ts b/packages/ui/certd-server/src/config/loader.ts index 915b1f7a4..9eb3d8e2e 100644 --- a/packages/ui/certd-server/src/config/loader.ts +++ b/packages/ui/certd-server/src/config/loader.ts @@ -47,10 +47,18 @@ export function mergeConfig(config: any, envType: string) { return config; } -export function loadDotEnv() { - const envStr = fs.readFileSync(".env").toString(); +export function loadDotEnv(envName= ".env") { + if (!fs.existsSync(envName)) { + return; + } + logger.info("load env file:", envName); + const envStr = fs.readFileSync(envName).toString(); envStr.split("\n").forEach(line => { const [key, value] = line.trim().split("="); + if (key.trim().startsWith("#") || key.trim() === "") { + return; + } + logger.info("load env var:", key, value); const oldValue = process.env[key]; if (!oldValue) { process.env[key] = value; From 3f5ba14fdea385ea4fcd34eafb690d84368b79d6 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Thu, 17 Sep 2026 23:26:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ci(workflow):=20=E4=BF=AE=E6=AD=A3stable-re?= =?UTF-8?q?lease.yml=E9=87=8C=E7=89=88=E6=9C=AC=E5=8F=B7=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将版本号示例的v前缀移除,和输入要求保持一致 --- .github/workflows/stable-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index a431afd9f..0dd3acad2 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: inputs: version: - description: "版本号(如 v1.42.5)" + description: "版本号(如 1.42.5)" required: true type: string