From 69443261871741a5ec7fd5ad8ff57696354b21d0 Mon Sep 17 00:00:00 2001 From: "luk.lu" Date: Tue, 25 Dec 2018 15:21:02 +0800 Subject: [PATCH] ConfigSys => ConfigBasic, ConfigUser => ConfigCustom --- ConfigSys.js => ConfigBasic.js | 0 ConfigUser.js => ConfigCustom.js | 0 server.js | 14 +++++++------- 3 files changed, 7 insertions(+), 7 deletions(-) rename ConfigSys.js => ConfigBasic.js (100%) rename ConfigUser.js => ConfigCustom.js (100%) diff --git a/ConfigSys.js b/ConfigBasic.js similarity index 100% rename from ConfigSys.js rename to ConfigBasic.js diff --git a/ConfigUser.js b/ConfigCustom.js similarity index 100% rename from ConfigUser.js rename to ConfigCustom.js diff --git a/server.js b/server.js index 74e5a51..6d87e8b 100644 --- a/server.js +++ b/server.js @@ -9,15 +9,15 @@ function config(){ // 读取配置文件 try { - if (fs.existsSync('./ConfigSys.js')) { - Config=require('./ConfigSys.js') - console.info('ConfigSys loaded') + if (fs.existsSync('./ConfigBasic.js')) { + Config=require('./ConfigBasic.js') + console.info('ConfigBasic loaded') } - if (fs.existsSync('./ConfigUser.js')) { // 如果存在,覆盖掉 ConfigSys 里的默认参数 - Config=deepmerge(Config, require('./ConfigUser.js')) // 注意,objectMerge后,产生了一个新的对象,而不是在原来的Config里添加 - console.info('ConfigUser loaded') + if (fs.existsSync('./ConfigCustom.js')) { // 如果存在,覆盖掉 ConfigBasic 里的默认参数 + Config=deepmerge(Config, require('./ConfigCustom.js')) // 注意,objectMerge后,产生了一个新的对象,而不是在原来的Config里添加 + console.info('ConfigCustom loaded') } - if (fs.existsSync('./ConfigSecret.js')) { // 如果存在,覆盖掉 ConfigSys 和 ConfigUser 里的参数 + if (fs.existsSync('./ConfigSecret.js')) { // 如果存在,覆盖掉 ConfigBasic 和 ConfigCustom 里的参数 Config=deepmerge(Config, require('./ConfigSecret.js')) console.info('ConfigSecret loaded') }