Merge branch 'v2-dev' into v2_client

.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
 

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

packages/ui/certd-server/.env.production

@@ -1 +1,2 @@
-certd_plugin_loadmode=metadata
+certd_plugin_loadmode=dev
+# certd_release_mode=dev

packages/ui/certd-server/src/config/config.default.ts

@@ -249,6 +249,7 @@ const development = {
     ],
   },
 } as MidwayConfig;
+loadDotEnv(`.env.${env}`);
 loadDotEnv();
 
 mergeConfig(development, "development");

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;