From 563a069bd5512243609de4a35da43e3ebb50094e Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Tue, 26 Jan 2021 20:01:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=98=AF=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=85=8D=E7=BD=AE=E5=AF=B9=E8=B1=A1=EF=BC=8C?=
 =?UTF-8?q?=E8=80=8C=E6=98=AF=E8=BF=94=E5=9B=9E=E4=B8=80=E4=B8=AA=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=8E=A5=E5=8F=97=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=8E=9F=E5=A7=8B=E9=85=8D=E7=BD=AE=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E5=8F=82=E6=95=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/index.js b/index.js
index 03bf3c5..f722e7f 100644
--- a/index.js
+++ b/index.js
@@ -3,8 +3,9 @@ const path = require('path')
 const commander = require('commander')
 const deepmerge = require('deepmerge')
 
-module.exports = (function () {
+module.exports = function (rawConfig) {
   if (!global.SysConfig) {
+    global.SysConfig = rawConfig
     // 不知为何，必须定义成全局变量，才能保证多次require只执行一次。
     console.info('★★★★★★★★ Starting System Configuration (开始系统配置：依次载入基础配置、用户配置、机密配置、命令行参数) ★★★★★★★★')
 
@@ -17,7 +18,7 @@ module.exports = (function () {
     console.info('  -- Loading Configuration Files (读取配置文件)')
     let configFile
     if (fs.existsSync((configFile = path.join(process.cwd(), './ConfigBasic.js')))) {
-      global.SysConfig = deepmerge({}, require(configFile))
+      global.SysConfig = deepmerge(global.SysConfig, require(configFile))
       console.info(`${configFile} loaded`)
     } else {
       console.info(`    Missing and omitting ${configFile}`)
@@ -62,4 +63,4 @@ module.exports = (function () {
   console.log('Final Configuration: ', global.SysConfig)
   console.log('######## Completed System Configuration ########')
   return global.SysConfig
-})()
+}