From d3f694b10b23448f5f38ca8d410b977a7ee6b2ae Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Sat, 23 Apr 2022 17:00:29 +0800
Subject: [PATCH] =?UTF-8?q?=20envar-base-custom.js=20=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=20envar-base-basic.js=20=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=20production=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/index.js b/index.js
index f48895c..3acd0da 100644
--- a/index.js
+++ b/index.js
@@ -28,6 +28,13 @@ module.exports = {
         console.warn(`  - ${configFile} is missing.`)
       }
       
+      global.envar.prodev = global.envar.prodev || process.env.NODE_ENV || 'development' // server = require('express')(); server.get('env') === server.settings.env === process.env.NODE_ENV
+      if (global.envar.prodev === 'production' && global.envar.production) {
+        console.info('  - Loading Production Configuration (加载生产环境配置)')
+        global.envar = deepmerge(global.envar, global.envar.production)
+        delete global.envar.production
+      }
+
       if (fs.existsSync((configFile = path.join(process.cwd(), './envar-base-custom.js')))) {
         // 如果存在，覆盖掉 envar-base-basic.js 里的默认参数
         global.envar = deepmerge(global.envar, require(configFile)) // 注意，objectMerge后，产生了一个新的对象，而不是在原来的Config里添加
@@ -47,13 +54,6 @@ module.exports = {
       }
       global.envar = global.envar || {}
 
-      global.envar.prodev = commander.prodev || global.envar.prodev || process.env.NODE_ENV || 'development' // server = require('express')(); server.get('env') === server.settings.env === process.env.NODE_ENV
-      if (global.envar.prodev === 'production' && global.envar.production) {
-        console.info('  - Loading Production Configuration (加载生产环境配置)')
-        global.envar = deepmerge(global.envar, global.envar.production)
-      }
-      delete global.envar.production
-
       console.info('(2) Loading Command Line Parameters (载入命令行参数)')
       commander.version(global.envar.Base_Version || '0.0.1', '-v, --version') // 默认是 -V。如果要 -v，就要加 '-v --version'
       for (let [key, param, desc] of global.envar.Commander_Option_List || []) {